From d94c232a71c78fec8c3c8242f093a1559ddeb823 Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
Date: Wed, 25 Jul 2012 13:44:20 -0400
Subject: [PATCH] [ #13801 ] Fix licensing issues, better translation, minor
 fixes

---
 kde/data/sflphone-client-kde.desktop          |   2 +-
 kde/man/CMakeLists.txt                        |   2 +-
 kde/plasma/plasmoid-qml/CMakeLists.txt        |   2 +-
 .../package/contents/ui/.TabBar.qml.kate-swp  | Bin 174 -> 0 bytes
 .../package/contents/ui/BookmarkTab.qml       |  17 +++
 .../package/contents/ui/CallTab.qml           |  19 ++-
 .../package/contents/ui/ContactTab.qml        |  17 +++
 .../package/contents/ui/DialPad.qml           |  17 +++
 .../package/contents/ui/HistoryTab.qml        |  17 +++
 .../contents/ui/ListSectiondelegate.qml       |  19 ++-
 .../package/contents/ui/NumberOverlay.qml     |  19 ++-
 .../package/contents/ui/Settingstab.qml       |  19 ++-
 .../package/contents/ui/TabBar.qml            |  19 ++-
 .../package/contents/ui/TransferOverlay.qml   |  19 ++-
 .../plasmoid-qml/package/contents/ui/main.qml |  17 +++
 kde/src/AccountWizard.cpp                     |  10 +-
 kde/src/AccountWizard.h                       |   4 +-
 kde/src/ActionSetAccountFirst.cpp             |   4 +-
 kde/src/ActionSetAccountFirst.h               |   4 +-
 kde/src/CallView.cpp                          |   4 +-
 kde/src/CallView.h                            |   4 +-
 kde/src/Codec.cpp                             |   4 +-
 kde/src/Codec.h                               |   4 +-
 kde/src/KSpeechInterfaceSingleton.cpp         |   4 +-
 kde/src/KSpeechInterfaceSingleton.h           |   4 +-
 kde/src/SFLPhone.cpp                          |   4 +-
 kde/src/SFLPhone.h                            |   4 +-
 kde/src/SFLPhoneAccessibility.cpp             |   4 +-
 kde/src/SFLPhoneAccessibility.h               |   4 +-
 kde/src/SFLPhoneView.cpp                      |   4 +-
 kde/src/SFLPhoneView.h                        |   4 +-
 kde/src/SFLPhoneapplication.cpp               |   4 +-
 kde/src/SFLPhoneapplication.h                 |   4 +-
 kde/src/conf/ConfigurationDialog.cpp          |  37 +++--
 kde/src/conf/ConfigurationDialog.h            |  37 +++--
 kde/src/conf/dlgaccessibility.cpp             |  37 +++--
 kde/src/conf/dlgaccessibility.h               |  35 +++--
 kde/src/conf/dlgaccessibility.ui              |   2 +-
 kde/src/conf/dlgaccounts.cpp                  |  37 +++--
 kde/src/conf/dlgaccounts.h                    |  36 +++--
 kde/src/conf/dlgaccountsbase.ui               | 142 ++++++++++--------
 kde/src/conf/dlgaddressbook.cpp               |  37 +++--
 kde/src/conf/dlgaddressbook.h                 |  37 +++--
 kde/src/conf/dlgaddressbookbase.ui            |   2 +-
 kde/src/conf/dlgaudio.cpp                     |  37 +++--
 kde/src/conf/dlgaudio.h                       |  37 +++--
 kde/src/conf/dlgaudiobase.ui                  |   2 +-
 kde/src/conf/dlgdisplay.cpp                   |  37 +++--
 kde/src/conf/dlgdisplay.h                     |  37 +++--
 kde/src/conf/dlgdisplaybase.ui                |   2 +-
 kde/src/conf/dlggeneral.cpp                   |  37 +++--
 kde/src/conf/dlggeneral.h                     |  37 +++--
 kde/src/conf/dlggeneralbase.ui                |  18 +--
 kde/src/conf/dlghooks.cpp                     |  37 +++--
 kde/src/conf/dlghooks.h                       |  37 +++--
 kde/src/conf/dlghooksbase.ui                  |   4 +-
 kde/src/conf/dlgvideo.cpp                     |  35 +++--
 kde/src/conf/dlgvideo.h                       |  35 +++--
 kde/src/conf/dlgvideobase.ui                  |   2 +-
 kde/src/klib/AkonadiBackend.cpp               |  35 +++--
 kde/src/klib/AkonadiBackend.h                 |  37 +++--
 kde/src/klib/ConfigurationSkeleton.cpp        |  37 +++--
 kde/src/klib/ConfigurationSkeleton.h          |  37 +++--
 kde/src/klib/HelperFunctions.cpp              |  37 +++--
 kde/src/klib/HelperFunctions.h                |  37 +++--
 kde/src/klib/SortableDockCommon.cpp           |  37 +++--
 kde/src/klib/SortableDockCommon.h             |  37 +++--
 kde/src/klib/SortableDockCommon.hpp           |  37 +++--
 kde/src/klib/dataengine/sflphonEngine.cpp     |  37 +++--
 kde/src/klib/dataengine/sflphonEngine.h       |  42 +++---
 kde/src/klib/dataengine/sflphoneService.cpp   |  37 +++--
 kde/src/klib/dataengine/sflphoneService.h     |  37 +++--
 kde/src/klib/sflphone-client-kde.kcfg         |  25 +--
 kde/src/lib/Account.cpp                       |  37 +++--
 kde/src/lib/Account.h                         |  37 +++--
 kde/src/lib/AccountList.cpp                   |  37 +++--
 kde/src/lib/AccountList.h                     |  37 +++--
 kde/src/lib/AudioCodecModel.cpp               |  35 +++--
 kde/src/lib/AudioCodecModel.h                 |  35 +++--
 kde/src/lib/Call.cpp                          |  37 +++--
 kde/src/lib/Call.h                            |  37 +++--
 kde/src/lib/CallModel.cpp                     |  37 +++--
 kde/src/lib/CallModel.h                       |  37 +++--
 kde/src/lib/CallModel.hpp                     |  37 +++--
 kde/src/lib/Contact.cpp                       |  37 +++--
 kde/src/lib/Contact.h                         |  37 +++--
 kde/src/lib/ContactBackend.h                  |  37 +++--
 kde/src/lib/CredentialModel.cpp               |  35 +++--
 kde/src/lib/CredentialModel.h                 |  35 +++--
 kde/src/lib/HistoryModel.cpp                  |  35 +++--
 kde/src/lib/HistoryModel.h                    |  35 +++--
 kde/src/lib/InstantMessagingModel.cpp         |  35 +++--
 kde/src/lib/InstantMessagingModel.h           |  41 +++--
 kde/src/lib/VideoCodecModel.cpp               |  35 +++--
 kde/src/lib/VideoCodecModel.h                 |  35 +++--
 kde/src/lib/VideoDevice.cpp                   |  35 +++--
 kde/src/lib/VideoDevice.h                     |  35 +++--
 kde/src/lib/VideoModel.cpp                    |  44 +++---
 kde/src/lib/VideoModel.h                      |  35 +++--
 kde/src/lib/VideoRenderer.cpp                 |  35 +++--
 kde/src/lib/VideoRenderer.h                   |  35 +++--
 .../lib/callmanager_interface_singleton.cpp   |  37 +++--
 kde/src/lib/callmanager_interface_singleton.h |  37 +++--
 ...nfigurationmanager_interface_singleton.cpp |  37 +++--
 ...configurationmanager_interface_singleton.h |  37 +++--
 kde/src/lib/dbus/metatypes.h                  |  18 +++
 kde/src/lib/instance_interface_singleton.cpp  |  37 +++--
 kde/src/lib/instance_interface_singleton.h    |  37 +++--
 kde/src/lib/sflphone_const.h                  |  37 +++--
 kde/src/lib/typedefs.h                        |  37 +++--
 kde/src/lib/video_interface_singleton.cpp     |  35 +++--
 kde/src/lib/video_interface_singleton.h       |  35 +++--
 kde/src/main.cpp                              |   4 +-
 kde/src/test/CMakeLists.txt                   |   2 +-
 kde/src/test/account_test.cpp                 |  19 ++-
 kde/src/test/call_test.cpp                    |  19 ++-
 kde/src/test/dbus_test.cpp                    |  19 ++-
 kde/src/ui/SFLPhoneView_base.ui               |   2 +-
 kde/src/widgets/AcceleratedVideoWidget.cpp    |   4 +-
 kde/src/widgets/AcceleratedVideoWidget.h      |   4 +-
 kde/src/widgets/BookmarkDock.cpp              |   4 +-
 kde/src/widgets/BookmarkDock.h                |   4 +-
 kde/src/widgets/CallTreeItem.cpp              |   4 +-
 kde/src/widgets/CallTreeItem.h                |   4 +-
 kde/src/widgets/CategorizedTreeWidget.cpp     |   6 +-
 kde/src/widgets/CategorizedTreeWidget.h       |   8 +-
 kde/src/widgets/CategoryDrawer.cpp            |   6 +-
 kde/src/widgets/CategoryDrawer.h              |   8 +-
 kde/src/widgets/ConferenceBox.cpp             |   6 +-
 kde/src/widgets/ConferenceBox.h               |  12 +-
 kde/src/widgets/ContactDock.cpp               |   4 +-
 kde/src/widgets/ContactDock.h                 |   4 +-
 kde/src/widgets/ContactItemWidget.cpp         |   4 +-
 kde/src/widgets/ContactItemWidget.h           |   4 +-
 kde/src/widgets/Dialpad.cpp                   |   4 +-
 kde/src/widgets/Dialpad.h                     |   4 +-
 kde/src/widgets/HistoryDock.cpp               |   4 +-
 kde/src/widgets/HistoryDock.h                 |   4 +-
 kde/src/widgets/HistoryTreeItem.cpp           |   4 +-
 kde/src/widgets/HistoryTreeItem.h             |   4 +-
 kde/src/widgets/IMManager.cpp                 |   4 +-
 kde/src/widgets/IMManager.h                   |   4 +-
 kde/src/widgets/IMTab.cpp                     |   4 +-
 kde/src/widgets/IMTab.h                       |   4 +-
 kde/src/widgets/SFLPhoneTray.cpp              |   4 +-
 kde/src/widgets/SFLPhoneTray.h                |   5 +-
 kde/src/widgets/TranslucentButtons.cpp        |  17 +++
 kde/src/widgets/TranslucentButtons.h          |  17 +++
 kde/src/widgets/VideoDock.cpp                 |  35 +++--
 kde/src/widgets/VideoDock.h                   |  35 +++--
 kde/src/widgets/VideoWidget.cpp               |  35 +++--
 kde/src/widgets/VideoWidget.h                 |  35 +++--
 152 files changed, 1764 insertions(+), 1638 deletions(-)
 delete mode 100644 kde/plasma/plasmoid-qml/package/contents/ui/.TabBar.qml.kate-swp

diff --git a/kde/data/sflphone-client-kde.desktop b/kde/data/sflphone-client-kde.desktop
index 1b74b87e51..2eaa801ca1 100755
--- a/kde/data/sflphone-client-kde.desktop
+++ b/kde/data/sflphone-client-kde.desktop
@@ -7,6 +7,6 @@ Name=SFLphone VoIP KDE4 client
 GenericName=Telephone
 Comment=Call and receive calls with SIP or IAX protocols
 Exec=sflphone-client-kde
-Icon=sflphone.svg
+Icon=sflphone
 StartupNotify=true
 Categories=Network;Telephony;
diff --git a/kde/man/CMakeLists.txt b/kde/man/CMakeLists.txt
index a31fcbfd97..ebb3af684a 100755
--- a/kde/man/CMakeLists.txt
+++ b/kde/man/CMakeLists.txt
@@ -3,4 +3,4 @@
 #
 kde4_create_manpage(sflphone-client-kde.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
 
-# kde4_create_manpage(sflphone.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
\ No newline at end of file
+# kde4_create_manpage(sflphone.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
diff --git a/kde/plasma/plasmoid-qml/CMakeLists.txt b/kde/plasma/plasmoid-qml/CMakeLists.txt
index ca220e06a3..356b4d96b2 100644
--- a/kde/plasma/plasmoid-qml/CMakeLists.txt
+++ b/kde/plasma/plasmoid-qml/CMakeLists.txt
@@ -8,4 +8,4 @@ install(DIRECTORY package/
         DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.plasma.applet.sflphone)
 
 install(FILES package/metadata.desktop
-        DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-sflphone.desktop)
\ No newline at end of file
+        DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-sflphone.desktop)
diff --git a/kde/plasma/plasmoid-qml/package/contents/ui/.TabBar.qml.kate-swp b/kde/plasma/plasmoid-qml/package/contents/ui/.TabBar.qml.kate-swp
deleted file mode 100644
index 44bb20e16ce8c1b5117460a8e57a98a6de92ae6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 174
zcmZQzV36@nEJ;-eE>A2_aLdd|RnS!kOD!tS%+FIW)H4Y7WME(jW`F=@eSHO2xQG-3
y0|R3|f-eo?mm&BvAbu)>FAL%qA^372ehz{!58@}f1_wcH1evb@<A5B%><R#~sux87

diff --git a/kde/plasma/plasmoid-qml/package/contents/ui/BookmarkTab.qml b/kde/plasma/plasmoid-qml/package/contents/ui/BookmarkTab.qml
index 4a8a3f2e49..9bdfdc8f6c 100644
--- a/kde/plasma/plasmoid-qml/package/contents/ui/BookmarkTab.qml
+++ b/kde/plasma/plasmoid-qml/package/contents/ui/BookmarkTab.qml
@@ -1,3 +1,20 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 import QtQuick 1.1
 import org.kde.plasma.components 0.1 as Plasma
 import org.kde.plasma.core       0.1 as PlasmaCore
diff --git a/kde/plasma/plasmoid-qml/package/contents/ui/CallTab.qml b/kde/plasma/plasmoid-qml/package/contents/ui/CallTab.qml
index e4ad54ab60..788fb7abe5 100644
--- a/kde/plasma/plasmoid-qml/package/contents/ui/CallTab.qml
+++ b/kde/plasma/plasmoid-qml/package/contents/ui/CallTab.qml
@@ -1,3 +1,20 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 import QtQuick 1.1
 import org.kde.plasma.components 0.1 as Plasma
 import org.kde.plasma.core       0.1 as PlasmaCore
@@ -396,4 +413,4 @@ Plasma.Page {
          when: (requestNumberOverlay == true)
       }
    ]
-}
\ No newline at end of file
+}
diff --git a/kde/plasma/plasmoid-qml/package/contents/ui/ContactTab.qml b/kde/plasma/plasmoid-qml/package/contents/ui/ContactTab.qml
index 497a9f2130..b5bc1cf576 100644
--- a/kde/plasma/plasmoid-qml/package/contents/ui/ContactTab.qml
+++ b/kde/plasma/plasmoid-qml/package/contents/ui/ContactTab.qml
@@ -1,3 +1,20 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 import QtQuick 1.1
 import org.kde.plasma.components 0.1 as Plasma
 import org.kde.plasma.core       0.1 as PlasmaCore
diff --git a/kde/plasma/plasmoid-qml/package/contents/ui/DialPad.qml b/kde/plasma/plasmoid-qml/package/contents/ui/DialPad.qml
index 662a47f84e..56f5f2a50e 100644
--- a/kde/plasma/plasmoid-qml/package/contents/ui/DialPad.qml
+++ b/kde/plasma/plasmoid-qml/package/contents/ui/DialPad.qml
@@ -1,3 +1,20 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 import QtQuick 1.1
 import org.kde.plasma.components 0.1 as Plasma
 
diff --git a/kde/plasma/plasmoid-qml/package/contents/ui/HistoryTab.qml b/kde/plasma/plasmoid-qml/package/contents/ui/HistoryTab.qml
index beabd14424..0d438340d0 100644
--- a/kde/plasma/plasmoid-qml/package/contents/ui/HistoryTab.qml
+++ b/kde/plasma/plasmoid-qml/package/contents/ui/HistoryTab.qml
@@ -1,3 +1,20 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 import QtQuick 1.1
 import org.kde.plasma.components 0.1 as Plasma
 import org.kde.plasma.core       0.1 as PlasmaCore
diff --git a/kde/plasma/plasmoid-qml/package/contents/ui/ListSectiondelegate.qml b/kde/plasma/plasmoid-qml/package/contents/ui/ListSectiondelegate.qml
index d6a4d95d54..c89d932d30 100644
--- a/kde/plasma/plasmoid-qml/package/contents/ui/ListSectiondelegate.qml
+++ b/kde/plasma/plasmoid-qml/package/contents/ui/ListSectiondelegate.qml
@@ -1,3 +1,20 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 import QtQuick 1.1
 import org.kde.plasma.components 0.1 as Plasma
 import org.kde.plasma.core       0.1 as PlasmaCore
@@ -21,4 +38,4 @@ Rectangle {
       text: section
       color:theme.buttonTextColor
    }
-}
\ No newline at end of file
+}
diff --git a/kde/plasma/plasmoid-qml/package/contents/ui/NumberOverlay.qml b/kde/plasma/plasmoid-qml/package/contents/ui/NumberOverlay.qml
index e7b6fecf6a..4af314624e 100644
--- a/kde/plasma/plasmoid-qml/package/contents/ui/NumberOverlay.qml
+++ b/kde/plasma/plasmoid-qml/package/contents/ui/NumberOverlay.qml
@@ -1,3 +1,20 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 import QtQuick 1.1
 import org.kde.plasma.components 0.1 as Plasma
 import org.kde.plasma.core       0.1 as PlasmaCore
@@ -80,4 +97,4 @@ Rectangle {
          //PropertyChanges {target: clearButton;width:parent.width}
       }
    ]
-}
\ No newline at end of file
+}
diff --git a/kde/plasma/plasmoid-qml/package/contents/ui/Settingstab.qml b/kde/plasma/plasmoid-qml/package/contents/ui/Settingstab.qml
index 18f1d545a6..168c4ed4da 100644
--- a/kde/plasma/plasmoid-qml/package/contents/ui/Settingstab.qml
+++ b/kde/plasma/plasmoid-qml/package/contents/ui/Settingstab.qml
@@ -1,3 +1,20 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 import QtQuick 1.1
 import org.kde.plasma.components 0.1 as Plasma
 import org.kde.plasma.core       0.1 as PlasmaCore
@@ -151,4 +168,4 @@ Plasma.Page {
          width:parent.width
       }
    }
-}
\ No newline at end of file
+}
diff --git a/kde/plasma/plasmoid-qml/package/contents/ui/TabBar.qml b/kde/plasma/plasmoid-qml/package/contents/ui/TabBar.qml
index 8c0ed1d374..317f222152 100644
--- a/kde/plasma/plasmoid-qml/package/contents/ui/TabBar.qml
+++ b/kde/plasma/plasmoid-qml/package/contents/ui/TabBar.qml
@@ -1,3 +1,20 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 import QtQuick 1.1
 import org.kde.plasma.components 0.1 as Plasma
 
@@ -96,4 +113,4 @@ Plasma.TabBar {
       }
    }
 }
-//}
\ No newline at end of file
+//}
diff --git a/kde/plasma/plasmoid-qml/package/contents/ui/TransferOverlay.qml b/kde/plasma/plasmoid-qml/package/contents/ui/TransferOverlay.qml
index f5677c3293..282254b4b2 100644
--- a/kde/plasma/plasmoid-qml/package/contents/ui/TransferOverlay.qml
+++ b/kde/plasma/plasmoid-qml/package/contents/ui/TransferOverlay.qml
@@ -1,3 +1,20 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 import QtQuick 1.1
 import org.kde.plasma.components 0.1 as Plasma
 import org.kde.plasma.core       0.1 as PlasmaCore
@@ -121,4 +138,4 @@ Rectangle {
          //PropertyChanges {target: clearButton;width:parent.width}
       }
    ]
-}
\ No newline at end of file
+}
diff --git a/kde/plasma/plasmoid-qml/package/contents/ui/main.qml b/kde/plasma/plasmoid-qml/package/contents/ui/main.qml
index 5c79fb46ef..c4e4bb24a5 100644
--- a/kde/plasma/plasmoid-qml/package/contents/ui/main.qml
+++ b/kde/plasma/plasmoid-qml/package/contents/ui/main.qml
@@ -1,3 +1,20 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 import QtQuick 1.1
 import org.kde.plasma.components 0.1 as Plasma
 import org.kde.plasma.core       0.1 as PlasmaCore
diff --git a/kde/src/AccountWizard.cpp b/kde/src/AccountWizard.cpp
index b8807f873f..d14d9120ab 100755
--- a/kde/src/AccountWizard.cpp
+++ b/kde/src/AccountWizard.cpp
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "AccountWizard.h"
 
@@ -129,7 +127,7 @@ int sendRequest(QString host, int port, QString req, QString & ret)
       if (strncasecmp(buf, status_h, strlen(status_h)) == 0)
          status = atoi(buf + strlen(status_h) + 1);
    }
-   for (i = 0; i < length; i++)
+   for (i = -1; i < length; ++i)
       ret[i] = fgetc(f);
 
    if (status != 200) {
@@ -242,10 +240,10 @@ void AccountWizard::accept()
       if(acc.success) {
          ret += i18n("This assistant is now finished.") + '\n';
          field( FIELD_SIP_ALIAS     ) = QString( acc.user) + '@' + SFL_ACCOUNT_HOST;
-         field( FIELD_SIP_VOICEMAIL ) = QString(                                  );
          field( FIELD_SIP_SERVER    ) = QString( SFL_ACCOUNT_HOST                 );
          field( FIELD_SIP_PASSWORD  ) = QString( acc.passwd                       );
          field( FIELD_SIP_USER      ) = QString( acc.user                         );
+         field( FIELD_SIP_VOICEMAIL ).clear();
 
          protocol = QString( ACCOUNT_TYPE_SIP          );
          server   = QString( SFL_ACCOUNT_HOST          );
@@ -300,7 +298,7 @@ void AccountWizard::accept()
       }
       else {
          stun_enabled = QString(REGISTRATION_ENABLED_FALSE);
-         stun_server  = QString();
+         stun_server.clear();
       }
 
       if(field(FIELD_ZRTP_ENABLED).toBool()) {
diff --git a/kde/src/AccountWizard.h b/kde/src/AccountWizard.h
index 06ef12e771..1bc870b57f 100755
--- a/kde/src/AccountWizard.h
+++ b/kde/src/AccountWizard.h
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 #ifndef ACCOUNTWIZARD_H
diff --git a/kde/src/ActionSetAccountFirst.cpp b/kde/src/ActionSetAccountFirst.cpp
index 29a8fdb480..60931f5749 100755
--- a/kde/src/ActionSetAccountFirst.cpp
+++ b/kde/src/ActionSetAccountFirst.cpp
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/ActionSetAccountFirst.h b/kde/src/ActionSetAccountFirst.h
index b3884d65a6..8170cf47a3 100755
--- a/kde/src/ActionSetAccountFirst.h
+++ b/kde/src/ActionSetAccountFirst.h
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 #ifndef ACTION_SET_ACCOUNT_FIRST_H
diff --git a/kde/src/CallView.cpp b/kde/src/CallView.cpp
index 3c515b0133..9714c918cd 100644
--- a/kde/src/CallView.cpp
+++ b/kde/src/CallView.cpp
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/CallView.h b/kde/src/CallView.h
index 0c5fb68cbf..38d8438463 100644
--- a/kde/src/CallView.h
+++ b/kde/src/CallView.h
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #ifndef CALL_VIEW
 #define CALL_VIEW
diff --git a/kde/src/Codec.cpp b/kde/src/Codec.cpp
index 797e36cb38..3ba4503ae9 100755
--- a/kde/src/Codec.cpp
+++ b/kde/src/Codec.cpp
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/Codec.h b/kde/src/Codec.h
index ef1bf2b54e..878a3845c2 100755
--- a/kde/src/Codec.h
+++ b/kde/src/Codec.h
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #ifndef CODEC_H
 #define CODEC_H
diff --git a/kde/src/KSpeechInterfaceSingleton.cpp b/kde/src/KSpeechInterfaceSingleton.cpp
index 9aab1a96b9..311b797fa8 100644
--- a/kde/src/KSpeechInterfaceSingleton.cpp
+++ b/kde/src/KSpeechInterfaceSingleton.cpp
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "KSpeechInterfaceSingleton.h"
 
diff --git a/kde/src/KSpeechInterfaceSingleton.h b/kde/src/KSpeechInterfaceSingleton.h
index 24b3197c30..6054454d56 100644
--- a/kde/src/KSpeechInterfaceSingleton.h
+++ b/kde/src/KSpeechInterfaceSingleton.h
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #ifndef KSPEECH_INTERFACE_SINGLETON_H
 #define KSPEECH_INTERFACE_SINGLETON_H
diff --git a/kde/src/SFLPhone.cpp b/kde/src/SFLPhone.cpp
index a06053009c..11c0edb908 100755
--- a/kde/src/SFLPhone.cpp
+++ b/kde/src/SFLPhone.cpp
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/SFLPhone.h b/kde/src/SFLPhone.h
index 2aad310a48..3825c1e56c 100755
--- a/kde/src/SFLPhone.h
+++ b/kde/src/SFLPhone.h
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 #ifndef SFLPHONE_H
diff --git a/kde/src/SFLPhoneAccessibility.cpp b/kde/src/SFLPhoneAccessibility.cpp
index 879fcdb276..2cdb8f0a49 100644
--- a/kde/src/SFLPhoneAccessibility.cpp
+++ b/kde/src/SFLPhoneAccessibility.cpp
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "SFLPhoneAccessibility.h"
 #include "KSpeechInterfaceSingleton.h"
diff --git a/kde/src/SFLPhoneAccessibility.h b/kde/src/SFLPhoneAccessibility.h
index d5e33e59af..02bb138f87 100644
--- a/kde/src/SFLPhoneAccessibility.h
+++ b/kde/src/SFLPhoneAccessibility.h
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #ifndef SFLPHONE_ACCESSIBILITY_H
 #define SFLPHONE_ACCESSIBILITY_H
diff --git a/kde/src/SFLPhoneView.cpp b/kde/src/SFLPhoneView.cpp
index 279aa189b7..4ea8532483 100755
--- a/kde/src/SFLPhoneView.cpp
+++ b/kde/src/SFLPhoneView.cpp
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/SFLPhoneView.h b/kde/src/SFLPhoneView.h
index 961af3d628..d7b299e082 100755
--- a/kde/src/SFLPhoneView.h
+++ b/kde/src/SFLPhoneView.h
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 #ifndef SFLPHONEVIEW_H
diff --git a/kde/src/SFLPhoneapplication.cpp b/kde/src/SFLPhoneapplication.cpp
index 92b36a2fb7..410520ee36 100755
--- a/kde/src/SFLPhoneapplication.cpp
+++ b/kde/src/SFLPhoneapplication.cpp
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/SFLPhoneapplication.h b/kde/src/SFLPhoneapplication.h
index 37479e42b1..d9c28b0b85 100755
--- a/kde/src/SFLPhoneapplication.h
+++ b/kde/src/SFLPhoneapplication.h
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 #ifndef SFLPHONEAPPLICATION_H
diff --git a/kde/src/conf/ConfigurationDialog.cpp b/kde/src/conf/ConfigurationDialog.cpp
index e4fa1fdc65..99f5ac8ff6 100755
--- a/kde/src/conf/ConfigurationDialog.cpp
+++ b/kde/src/conf/ConfigurationDialog.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #include "ConfigurationDialog.h"
 
 //KDE
diff --git a/kde/src/conf/ConfigurationDialog.h b/kde/src/conf/ConfigurationDialog.h
index 4f882477ef..ceb0ff5114 100755
--- a/kde/src/conf/ConfigurationDialog.h
+++ b/kde/src/conf/ConfigurationDialog.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef CONFIGURATIONDIALOG_H
 #define CONFIGURATIONDIALOG_H
diff --git a/kde/src/conf/dlgaccessibility.cpp b/kde/src/conf/dlgaccessibility.cpp
index 2296fbce53..f6a2e823da 100644
--- a/kde/src/conf/dlgaccessibility.cpp
+++ b/kde/src/conf/dlgaccessibility.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "dlgaccessibility.h"
 #include "klib/ConfigurationSkeleton.h"
diff --git a/kde/src/conf/dlgaccessibility.h b/kde/src/conf/dlgaccessibility.h
index 0b4810d3f3..dcba188cca 100644
--- a/kde/src/conf/dlgaccessibility.h
+++ b/kde/src/conf/dlgaccessibility.h
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C)  2012 by Savoir-Faire Linux                                      *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C)  2012 by Savoir-Faire Linux                              *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef DLGACCESSIBILITY_H
 #define DLGACCESSIBILITY_H
diff --git a/kde/src/conf/dlgaccessibility.ui b/kde/src/conf/dlgaccessibility.ui
index 64c35e45dc..be9ab36d36 100644
--- a/kde/src/conf/dlgaccessibility.ui
+++ b/kde/src/conf/dlgaccessibility.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Accessibility settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/kde/src/conf/dlgaccounts.cpp b/kde/src/conf/dlgaccounts.cpp
index 1925312498..a0f6ea0e4c 100755
--- a/kde/src/conf/dlgaccounts.cpp
+++ b/kde/src/conf/dlgaccounts.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "dlgaccounts.h"
 
diff --git a/kde/src/conf/dlgaccounts.h b/kde/src/conf/dlgaccounts.h
index f226b328d7..e2476aee91 100755
--- a/kde/src/conf/dlgaccounts.h
+++ b/kde/src/conf/dlgaccounts.h
@@ -1,22 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef DLGACCOUNTS_H
 #define DLGACCOUNTS_H
diff --git a/kde/src/conf/dlgaccountsbase.ui b/kde/src/conf/dlgaccountsbase.ui
index 999bc45efe..cc6cf84c4e 100755
--- a/kde/src/conf/dlgaccountsbase.ui
+++ b/kde/src/conf/dlgaccountsbase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">Form</string>
+   <string notr="true">Account configuration dialog</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -59,6 +59,34 @@
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QGridLayout" name="gridLayout_13">
+         <item row="1" column="2">
+          <widget class="QToolButton" name="button_accountAdd">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="sizeIncrement">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>Add a new account</string>
+           </property>
+           <property name="whatsThis">
+            <string>This button enables you to initialize a new account. You will then be able to edit it using the form on the right.</string>
+           </property>
+           <property name="text">
+            <string comment="Add new account">Add</string>
+           </property>
+           <property name="shortcut">
+            <string notr="true">+</string>
+           </property>
+          </widget>
+         </item>
          <item row="1" column="0">
           <widget class="QToolButton" name="button_accountUp">
            <property name="toolTip">
@@ -68,7 +96,7 @@
             <string>By default, when you place a call, sflphone will use the first account in this list which is &quot;registered&quot;. Change the order of the accounts using the &quot;Up&quot; and &quot;Down&quot; arrows.</string>
            </property>
            <property name="text">
-            <string>Up</string>
+            <string comment="Move account up">Up</string>
            </property>
            <property name="shortcut">
             <string notr="true">Up, PgUp</string>
@@ -84,38 +112,38 @@
             <string>By default, when you place a call, sflphone will use the first account in this list which is &quot;registered&quot;. Change the order of the accounts using the &quot;Up&quot; and &quot;Down&quot; arrows.</string>
            </property>
            <property name="text">
-            <string>Down</string>
+            <string comment="Move account down">Down</string>
            </property>
            <property name="shortcut">
             <string notr="true">Down, PgDown</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="2">
-          <widget class="QToolButton" name="button_accountAdd">
+         <item row="0" column="0" colspan="5">
+          <widget class="QListView" name="listView_accountList">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="sizeIncrement">
+           <property name="minimumSize">
             <size>
-             <width>0</width>
+             <width>150</width>
              <height>0</height>
             </size>
            </property>
-           <property name="toolTip">
-            <string>Add a new account</string>
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>16777215</height>
+            </size>
            </property>
            <property name="whatsThis">
-            <string>This button enables you to initialize a new account. You will then be able to edit it using the form on the right.</string>
-           </property>
-           <property name="text">
-            <string>Add</string>
+            <string>By default, when you place a call, sflphone will use the first account in this list which is &quot;registered&quot;. Change the order of the accounts using the &quot;Up&quot; and &quot;Down&quot; arrows. Enable/disable them by checking/unchecking them on the left of the item. Add or remove some with &quot;Plus&quot; and &quot;Sub&quot; buttons. Edit the selected account with the form on the right.</string>
            </property>
-           <property name="shortcut">
-            <string notr="true">+</string>
+           <property name="dragEnabled">
+            <bool>true</bool>
            </property>
           </widget>
          </item>
@@ -137,7 +165,7 @@
             <string/>
            </property>
            <property name="text">
-            <string>Remove</string>
+            <string comment="Remove selected account">Remove</string>
            </property>
            <property name="shortcut">
             <string notr="true">-, Del, Backspace</string>
@@ -157,39 +185,11 @@
            </property>
           </spacer>
          </item>
-         <item row="0" column="0" colspan="5">
-          <widget class="QListView" name="listView_accountList">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>150</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <property name="whatsThis">
-            <string>By default, when you place a call, sflphone will use the first account in this list which is &quot;registered&quot;. Change the order of the accounts using the &quot;Up&quot; and &quot;Down&quot; arrows. Enable/disable them by checking/unchecking them on the left of the item. Add or remove some with &quot;Plus&quot; and &quot;Sub&quot; buttons. Edit the selected account with the form on the right.</string>
-           </property>
-           <property name="dragEnabled">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
       </item>
       <item>
-       <widget class="QTabWidget" name="frame2_editAccounts">
+       <widget class="KTabWidget" name="frame2_editAccounts">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
           <horstretch>3</horstretch>
@@ -207,7 +207,7 @@
         </property>
         <widget class="QWidget" name="tab_basic">
          <attribute name="title">
-          <string>Basic</string>
+          <string comment="Basic settings">Basic</string>
          </attribute>
          <layout class="QFormLayout" name="formLayout">
           <property name="fieldGrowthPolicy">
@@ -266,7 +266,7 @@
           <item row="2" column="0">
            <widget class="QLabel" name="label3_server">
             <property name="text">
-             <string>Server</string>
+             <string comment="SIP server">Server</string>
             </property>
             <property name="buddy">
              <cstring>edit3_server</cstring>
@@ -285,8 +285,11 @@
           </item>
           <item row="3" column="0">
            <widget class="QLabel" name="label4_user">
+            <property name="accessibleDescription">
+             <string comment="Account username"/>
+            </property>
             <property name="text">
-             <string>Username</string>
+             <string comment="Account username">Username</string>
             </property>
             <property name="buddy">
              <cstring>edit4_user</cstring>
@@ -299,7 +302,7 @@
           <item row="4" column="0">
            <widget class="QLabel" name="label5_password">
             <property name="text">
-             <string>Password</string>
+             <string comment="Account password">Password</string>
             </property>
             <property name="buddy">
              <cstring>edit5_password</cstring>
@@ -309,14 +312,14 @@
           <item row="4" column="1">
            <widget class="KLineEdit" name="edit5_password">
             <property name="echoMode">
-             <enum>KLineEdit::Password</enum>
+             <enum>QLineEdit::Normal</enum>
             </property>
            </widget>
           </item>
           <item row="5" column="0">
            <widget class="QLabel" name="label6_mailbox">
             <property name="text">
-             <string>Voicemail</string>
+             <string comment="Account voice mail address">Voicemail</string>
             </property>
             <property name="buddy">
              <cstring>edit6_mailbox</cstring>
@@ -355,7 +358,7 @@
           <item row="7" column="1">
            <widget class="QCheckBox" name="m_pDefaultAccount">
             <property name="text">
-             <string>Default account</string>
+             <string>Default account for contact with only extensions as phone number</string>
             </property>
            </widget>
           </item>
@@ -363,7 +366,7 @@
         </widget>
         <widget class="QWidget" name="tab_advanced">
          <attribute name="title">
-          <string>Advanced</string>
+          <string comment="Advanced settings">Advanced</string>
          </attribute>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
@@ -589,7 +592,7 @@
                 <string>By default, when you place a call, sflphone will use the first account in this list which is &quot;registered&quot;. Change the order of the accounts using the &quot;Up&quot; and &quot;Down&quot; arrows.</string>
                </property>
                <property name="text">
-                <string>Up</string>
+                <string comment="Move audio codec up">Up</string>
                </property>
                <property name="shortcut">
                 <string notr="true">Up, PgUp</string>
@@ -642,7 +645,7 @@
                 <string>By default, when you place a call, sflphone will use the first account in this list which is &quot;registered&quot;. Change the order of the accounts using the &quot;Up&quot; and &quot;Down&quot; arrows.</string>
                </property>
                <property name="text">
-                <string>Down</string>
+                <string comment="Move audio codec down">Down</string>
                </property>
                <property name="shortcut">
                 <string notr="true">Down, PgDown</string>
@@ -694,14 +697,14 @@
              <item row="1" column="4">
               <widget class="QToolButton" name="m_pVCodecDownPB">
                <property name="text">
-                <string>Down</string>
+                <string comment="Move video codec down">Down</string>
                </property>
               </widget>
              </item>
              <item row="1" column="3">
               <widget class="QToolButton" name="m_pVCodecUpPB">
                <property name="text">
-                <string>Up</string>
+                <string comment="Move video codec up">Up</string>
                </property>
               </widget>
              </item>
@@ -797,7 +800,7 @@
                 <bool>false</bool>
                </property>
                <property name="echoMode">
-                <enum>KLineEdit::Password</enum>
+                <enum>QLineEdit::Normal</enum>
                </property>
               </widget>
              </item>
@@ -823,14 +826,14 @@
           <item row="2" column="1">
            <widget class="QToolButton" name="button_add_credential">
             <property name="text">
-             <string>Add</string>
+             <string comment="Add new credential">Add</string>
             </property>
            </widget>
           </item>
           <item row="2" column="2">
            <widget class="QToolButton" name="button_remove_credential">
             <property name="text">
-             <string>Remove</string>
+             <string comment="Remove selected credential">Remove</string>
             </property>
            </widget>
           </item>
@@ -978,7 +981,7 @@
                   <widget class="KComboBox" name="combo_tls_method">
                    <item>
                     <property name="text">
-                     <string>Default</string>
+                     <string comment="Default TLS method">Default</string>
                     </property>
                    </item>
                    <item>
@@ -1173,7 +1176,7 @@
                    </property>
                    <item>
                     <property name="text">
-                     <string>Disabled</string>
+                     <string comment="Disabled security">Disabled</string>
                     </property>
                    </item>
                    <item>
@@ -1276,9 +1279,14 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>KComboBox</class>
+   <extends>QComboBox</extends>
+   <header>kcombobox.h</header>
+  </customwidget>
   <customwidget>
    <class>KLineEdit</class>
-   <extends>KLineEdit</extends>
+   <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
@@ -1291,6 +1299,12 @@
    <extends>QFrame</extends>
    <header>kurlrequester.h</header>
   </customwidget>
+  <customwidget>
+   <class>KTabWidget</class>
+   <extends>QTabWidget</extends>
+   <header>ktabwidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../qrc/resources.qrc"/>
diff --git a/kde/src/conf/dlgaddressbook.cpp b/kde/src/conf/dlgaddressbook.cpp
index ef7f81994e..770cefe1db 100755
--- a/kde/src/conf/dlgaddressbook.cpp
+++ b/kde/src/conf/dlgaddressbook.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "dlgaddressbook.h"
 
diff --git a/kde/src/conf/dlgaddressbook.h b/kde/src/conf/dlgaddressbook.h
index 6ee981adc4..26677ba014 100755
--- a/kde/src/conf/dlgaddressbook.h
+++ b/kde/src/conf/dlgaddressbook.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef DLGADDRESSBOOK_H
 #define DLGADDRESSBOOK_H
diff --git a/kde/src/conf/dlgaddressbookbase.ui b/kde/src/conf/dlgaddressbookbase.ui
index 1d05c89fcc..d49369616c 100755
--- a/kde/src/conf/dlgaddressbookbase.ui
+++ b/kde/src/conf/dlgaddressbookbase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">Form</string>
+   <string notr="true">Addressbook settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/kde/src/conf/dlgaudio.cpp b/kde/src/conf/dlgaudio.cpp
index 8e0141e8b8..0552cfd9af 100755
--- a/kde/src/conf/dlgaudio.cpp
+++ b/kde/src/conf/dlgaudio.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "dlgaudio.h"
 
diff --git a/kde/src/conf/dlgaudio.h b/kde/src/conf/dlgaudio.h
index 92361eb88b..75eb3f5e9f 100755
--- a/kde/src/conf/dlgaudio.h
+++ b/kde/src/conf/dlgaudio.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef DLGAUDIO_H
 #define DLGAUDIO_H
diff --git a/kde/src/conf/dlgaudiobase.ui b/kde/src/conf/dlgaudiobase.ui
index f5d00c4b4b..2aa5c1b6d5 100755
--- a/kde/src/conf/dlgaudiobase.ui
+++ b/kde/src/conf/dlgaudiobase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">Form</string>
+   <string notr="true">Audio settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/kde/src/conf/dlgdisplay.cpp b/kde/src/conf/dlgdisplay.cpp
index 75ee2069e1..03bd3fe16f 100755
--- a/kde/src/conf/dlgdisplay.cpp
+++ b/kde/src/conf/dlgdisplay.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "dlgdisplay.h"
 
diff --git a/kde/src/conf/dlgdisplay.h b/kde/src/conf/dlgdisplay.h
index 81799771b5..878ddd8550 100755
--- a/kde/src/conf/dlgdisplay.h
+++ b/kde/src/conf/dlgdisplay.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef DLGDISPLAY_H
 #define DLGDISPLAY_H
diff --git a/kde/src/conf/dlgdisplaybase.ui b/kde/src/conf/dlgdisplaybase.ui
index 8b120b6e2f..581e11ae2b 100755
--- a/kde/src/conf/dlgdisplaybase.ui
+++ b/kde/src/conf/dlgdisplaybase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">Form</string>
+   <string notr="true">Display settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/kde/src/conf/dlggeneral.cpp b/kde/src/conf/dlggeneral.cpp
index 3c2231797a..56ce575eb0 100755
--- a/kde/src/conf/dlggeneral.cpp
+++ b/kde/src/conf/dlggeneral.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "dlggeneral.h"
 #include <QToolButton>
diff --git a/kde/src/conf/dlggeneral.h b/kde/src/conf/dlggeneral.h
index 7c18c4e39b..250df7b6d7 100755
--- a/kde/src/conf/dlggeneral.h
+++ b/kde/src/conf/dlggeneral.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef DLGGENERAL_H
 #define DLGGENERAL_H
diff --git a/kde/src/conf/dlggeneralbase.ui b/kde/src/conf/dlggeneralbase.ui
index ff3dc4c3ca..9d5445ac67 100755
--- a/kde/src/conf/dlggeneralbase.ui
+++ b/kde/src/conf/dlggeneralbase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">Form</string>
+   <string notr="true">General settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -40,28 +40,28 @@
           </widget>
          </item>
          <item>
-          <widget class="QLabel" name="label">
+          <widget class="KIntSpinBox" name="kcfg_historyMax">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="text">
-            <string>days</string>
+           <property name="minimum">
+            <number>-8</number>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="KIntSpinBox" name="kcfg_historyMax">
+          <widget class="QLabel" name="label">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="minimum">
-            <number>-8</number>
+           <property name="text">
+            <string comment="Keep my history for at least *** days">days</string>
            </property>
           </widget>
          </item>
diff --git a/kde/src/conf/dlghooks.cpp b/kde/src/conf/dlghooks.cpp
index ee5d6f4b5c..92dc780bff 100755
--- a/kde/src/conf/dlghooks.cpp
+++ b/kde/src/conf/dlghooks.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "dlghooks.h"
 
diff --git a/kde/src/conf/dlghooks.h b/kde/src/conf/dlghooks.h
index 7f5819c853..3f682e8b30 100755
--- a/kde/src/conf/dlghooks.h
+++ b/kde/src/conf/dlghooks.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef DLGHOOKS_H
 #define DLGHOOKS_H
diff --git a/kde/src/conf/dlghooksbase.ui b/kde/src/conf/dlghooksbase.ui
index 558daf4440..f1454906e6 100755
--- a/kde/src/conf/dlghooksbase.ui
+++ b/kde/src/conf/dlghooksbase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">Form</string>
+   <string notr="true">Hook settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -65,7 +65,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QLineEdit" name="kcfg_hooksSIPHeader">
+          <widget class="KLineEdit" name="kcfg_hooksSIPHeader">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
              <horstretch>0</horstretch>
diff --git a/kde/src/conf/dlgvideo.cpp b/kde/src/conf/dlgvideo.cpp
index 4d1012899e..6dd05142cb 100644
--- a/kde/src/conf/dlgvideo.cpp
+++ b/kde/src/conf/dlgvideo.cpp
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "dlgvideo.h"
 #include "../lib/VideoDevice.h"
diff --git a/kde/src/conf/dlgvideo.h b/kde/src/conf/dlgvideo.h
index 8a30dc1372..73708a8ec1 100644
--- a/kde/src/conf/dlgvideo.h
+++ b/kde/src/conf/dlgvideo.h
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef DLG_VIDEO_H
 #define DLG_VIDEO_H
diff --git a/kde/src/conf/dlgvideobase.ui b/kde/src/conf/dlgvideobase.ui
index ecf144ec79..3919296715 100644
--- a/kde/src/conf/dlgvideobase.ui
+++ b/kde/src/conf/dlgvideobase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Video settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/kde/src/klib/AkonadiBackend.cpp b/kde/src/klib/AkonadiBackend.cpp
index b71d48fe68..1db00b7393 100644
--- a/kde/src/klib/AkonadiBackend.cpp
+++ b/kde/src/klib/AkonadiBackend.cpp
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2011 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2011 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 //Parent
 #include "AkonadiBackend.h"
diff --git a/kde/src/klib/AkonadiBackend.h b/kde/src/klib/AkonadiBackend.h
index 8a26dc336f..37aa12e9c7 100644
--- a/kde/src/klib/AkonadiBackend.h
+++ b/kde/src/klib/AkonadiBackend.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef AKONADI_BACKEND_H
 #define AKONADI_BACKEND_H
diff --git a/kde/src/klib/ConfigurationSkeleton.cpp b/kde/src/klib/ConfigurationSkeleton.cpp
index 774a88a98b..6910fc02f4 100755
--- a/kde/src/klib/ConfigurationSkeleton.cpp
+++ b/kde/src/klib/ConfigurationSkeleton.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "ConfigurationSkeleton.h"
 
diff --git a/kde/src/klib/ConfigurationSkeleton.h b/kde/src/klib/ConfigurationSkeleton.h
index 5c8792293d..e0d48f7797 100755
--- a/kde/src/klib/ConfigurationSkeleton.h
+++ b/kde/src/klib/ConfigurationSkeleton.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef CONFIGURATIONSKELETON_H
 #define CONFIGURATIONSKELETON_H
diff --git a/kde/src/klib/HelperFunctions.cpp b/kde/src/klib/HelperFunctions.cpp
index 15c9ea5fde..fb68f7b55b 100644
--- a/kde/src/klib/HelperFunctions.cpp
+++ b/kde/src/klib/HelperFunctions.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "HelperFunctions.h"
 
diff --git a/kde/src/klib/HelperFunctions.h b/kde/src/klib/HelperFunctions.h
index c5baf6ef9f..6500cdac4a 100644
--- a/kde/src/klib/HelperFunctions.h
+++ b/kde/src/klib/HelperFunctions.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef HELPER_FUNCTIONS
 #define HELPER_FUNCTIONS
diff --git a/kde/src/klib/SortableDockCommon.cpp b/kde/src/klib/SortableDockCommon.cpp
index 1295d07331..79c4a11532 100644
--- a/kde/src/klib/SortableDockCommon.cpp
+++ b/kde/src/klib/SortableDockCommon.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "SortableDockCommon.h"
 
diff --git a/kde/src/klib/SortableDockCommon.h b/kde/src/klib/SortableDockCommon.h
index 0ba4d99da0..a505bd0dc9 100644
--- a/kde/src/klib/SortableDockCommon.h
+++ b/kde/src/klib/SortableDockCommon.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef SORTABLE_DOCK_COMMON
 #define SORTABLE_DOCK_COMMON
diff --git a/kde/src/klib/SortableDockCommon.hpp b/kde/src/klib/SortableDockCommon.hpp
index 6640e0f307..553aac740a 100644
--- a/kde/src/klib/SortableDockCommon.hpp
+++ b/kde/src/klib/SortableDockCommon.hpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 //Qt
 #include <QtCore/QDateTime>
diff --git a/kde/src/klib/dataengine/sflphonEngine.cpp b/kde/src/klib/dataengine/sflphonEngine.cpp
index f0acfd3070..9f8da73eaf 100644
--- a/kde/src/klib/dataengine/sflphonEngine.cpp
+++ b/kde/src/klib/dataengine/sflphonEngine.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "sflphonEngine.h"
 
diff --git a/kde/src/klib/dataengine/sflphonEngine.h b/kde/src/klib/dataengine/sflphonEngine.h
index fcd0ad54df..fbc4f25998 100644
--- a/kde/src/klib/dataengine/sflphonEngine.h
+++ b/kde/src/klib/dataengine/sflphonEngine.h
@@ -1,28 +1,26 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
-#ifndef SFLPHONEENGINE_H
-#define SFLPHONEENGINE_H
+/****************************************************************************
+ *   Copyright (C) 2010 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
+#ifndef SFLPHONE_ENGINE_H
+#define SFLPHONE_ENGINE_H
 
 //Base
-#include "../SortableDockCommon.h"
 #include <Plasma/DataEngine>
+#include "../SortableDockCommon.h"
 
 //Qt
 #include <QHash>
diff --git a/kde/src/klib/dataengine/sflphoneService.cpp b/kde/src/klib/dataengine/sflphoneService.cpp
index 024d35ec7f..56fc67d179 100644
--- a/kde/src/klib/dataengine/sflphoneService.cpp
+++ b/kde/src/klib/dataengine/sflphoneService.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "sflphoneService.h"
 
diff --git a/kde/src/klib/dataengine/sflphoneService.h b/kde/src/klib/dataengine/sflphoneService.h
index bc65bd7195..71eef58bab 100644
--- a/kde/src/klib/dataengine/sflphoneService.h
+++ b/kde/src/klib/dataengine/sflphoneService.h
@@ -1,23 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
-
+/****************************************************************************
+ *   Copyright (C) 2010 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #ifndef SFLPHONE_SERVICE_H
 #define SFLPHONE_SERVICE_H
 
diff --git a/kde/src/klib/sflphone-client-kde.kcfg b/kde/src/klib/sflphone-client-kde.kcfg
index b87df0d429..abfa4f505c 100755
--- a/kde/src/klib/sflphone-client-kde.kcfg
+++ b/kde/src/klib/sflphone-client-kde.kcfg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
-<kcfg>
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+                          http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   <kcfgfile/>
   <group name="main">
 
@@ -50,7 +53,7 @@
       <label>The minimum number of pixel for a call item</label>
       <default> false </default>
    </entry>
-   <entry name="minimumRowHeight" type="int">
+   <entry name="minimumRowHeight" type="Int">
       <label>The minimum number of pixel for a call item</label>
       <default> 48 </default>
    </entry>
@@ -143,17 +146,17 @@
       <default>{Work,Home,Messenger,Preferred number,Voice,Mobile,Work,Video,Mailbox,Modem,Car,ISDN,PCS,Pager,Other...,Work}</default>
     </entry>
 
-    <entry name="displayOrganisation" type="bool">
+    <entry name="displayOrganisation" type="Bool">
       <label>Defines whether to display the organisation the the contact list item</label>
       <default>true</default>
     </entry>
 
-    <entry name="displayEmail" type="bool">
+    <entry name="displayEmail" type="Bool">
       <label>Defines whether to display the organisation the the contact list item</label>
       <default>false</default>
     </entry>
 
-    <entry name="alwaysShowPhoneNumber" type="bool">
+    <entry name="alwaysShowPhoneNumber" type="Bool">
       <label>Defines if the contact tree should be expanded by default to show all numbers</label>
       <default>false</default>
     </entry>
@@ -190,29 +193,29 @@
     </entry>
 
     <!-- Accessibility Settings -->
-    <entry name="enableVoiceFeedback" type="bool">
+    <entry name="enableVoiceFeedback" type="Bool">
       <label>Enable audio feedback from common actions</label>
       <default> false </default>
     </entry>
-    <entry name="enableReadLabel" type="bool">
+    <entry name="enableReadLabel" type="Bool">
       <label>Automatically read label when an overlay is being displayed</label>
       <default> false </default>
     </entry>
-    <entry name="enableReadDetails" type="bool">
+    <entry name="enableReadDetails" type="Bool">
       <label>Automattically read the call details when it is selected</label>
       <default> false </default>
     </entry>
 
    <!-- Dock settings -->
-    <entry name="displayContactDock" type="bool">
+    <entry name="displayContactDock" type="Bool">
       <label>Enable audio feedback from common actions</label>
       <default> true </default>
     </entry>
-    <entry name="displayHistoryDock" type="bool">
+    <entry name="displayHistoryDock" type="Bool">
       <label>Enable audio feedback from common actions</label>
       <default> true </default>
     </entry>
-    <entry name="displayBookmarkDock" type="bool">
+    <entry name="displayBookmarkDock" type="Bool">
       <label>Enable audio feedback from common actions</label>
       <default> true </default>
     </entry>
diff --git a/kde/src/lib/Account.cpp b/kde/src/lib/Account.cpp
index 005c4694a1..8b5061779d 100644
--- a/kde/src/lib/Account.cpp
+++ b/kde/src/lib/Account.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 //Parent
 #include "Account.h"
diff --git a/kde/src/lib/Account.h b/kde/src/lib/Account.h
index 2e66943fc9..0071dc45ed 100644
--- a/kde/src/lib/Account.h
+++ b/kde/src/lib/Account.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef ACCOUNT_H
 #define ACCOUNT_H
diff --git a/kde/src/lib/AccountList.cpp b/kde/src/lib/AccountList.cpp
index 6eee3b3cf8..854fff4dfb 100644
--- a/kde/src/lib/AccountList.cpp
+++ b/kde/src/lib/AccountList.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 //Parent
 #include "AccountList.h"
diff --git a/kde/src/lib/AccountList.h b/kde/src/lib/AccountList.h
index 5096ee0855..20936d7019 100644
--- a/kde/src/lib/AccountList.h
+++ b/kde/src/lib/AccountList.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef ACCOUNT_LIST_H
 #define ACCOUNT_LIST_H
diff --git a/kde/src/lib/AudioCodecModel.cpp b/kde/src/lib/AudioCodecModel.cpp
index c15254a980..80c6b23df1 100644
--- a/kde/src/lib/AudioCodecModel.cpp
+++ b/kde/src/lib/AudioCodecModel.cpp
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #include "AudioCodecModel.h"
 
 #include <QtCore/QDebug>
diff --git a/kde/src/lib/AudioCodecModel.h b/kde/src/lib/AudioCodecModel.h
index 52f753717d..5ff16cbfb0 100644
--- a/kde/src/lib/AudioCodecModel.h
+++ b/kde/src/lib/AudioCodecModel.h
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #ifndef AUDIO_CODEC_MODEL_H
 #define AUDIO_CODEC_MODEL_H
 
diff --git a/kde/src/lib/Call.cpp b/kde/src/lib/Call.cpp
index 816611bf6e..f9a2f18724 100644
--- a/kde/src/lib/Call.cpp
+++ b/kde/src/lib/Call.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 //Parent
 #include "Call.h"
diff --git a/kde/src/lib/Call.h b/kde/src/lib/Call.h
index aebfd2837e..1a12c8fff2 100644
--- a/kde/src/lib/Call.h
+++ b/kde/src/lib/Call.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 
 #ifndef CALL_H
diff --git a/kde/src/lib/CallModel.cpp b/kde/src/lib/CallModel.cpp
index 1815ec6c75..71404b362e 100644
--- a/kde/src/lib/CallModel.cpp
+++ b/kde/src/lib/CallModel.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 //Parent
 #include <CallModel.h>
diff --git a/kde/src/lib/CallModel.h b/kde/src/lib/CallModel.h
index b542f809fe..1de0c94540 100644
--- a/kde/src/lib/CallModel.h
+++ b/kde/src/lib/CallModel.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef CALL_MODEL_H
 #define CALL_MODEL_H
diff --git a/kde/src/lib/CallModel.hpp b/kde/src/lib/CallModel.hpp
index 825db10d4b..8cd53be609 100644
--- a/kde/src/lib/CallModel.hpp
+++ b/kde/src/lib/CallModel.hpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 //Qt
 #include <QtCore/QHash>
diff --git a/kde/src/lib/Contact.cpp b/kde/src/lib/Contact.cpp
index 7ec52e5107..dc3be4cdf0 100644
--- a/kde/src/lib/Contact.cpp
+++ b/kde/src/lib/Contact.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 //Parent
 #include "Contact.h"
diff --git a/kde/src/lib/Contact.h b/kde/src/lib/Contact.h
index ab9d67795f..c040922a50 100644
--- a/kde/src/lib/Contact.h
+++ b/kde/src/lib/Contact.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef CONTACT_H
 #define CONTACT_H
diff --git a/kde/src/lib/ContactBackend.h b/kde/src/lib/ContactBackend.h
index d755a92df1..0eb05e5a92 100644
--- a/kde/src/lib/ContactBackend.h
+++ b/kde/src/lib/ContactBackend.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef CONTACT_BACKEND_H
 #define CONTACT_BACKEND_H
diff --git a/kde/src/lib/CredentialModel.cpp b/kde/src/lib/CredentialModel.cpp
index 05e2fecdf7..ba967bf619 100644
--- a/kde/src/lib/CredentialModel.cpp
+++ b/kde/src/lib/CredentialModel.cpp
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #include "CredentialModel.h"
 
 #include <QtCore/QDebug>
diff --git a/kde/src/lib/CredentialModel.h b/kde/src/lib/CredentialModel.h
index ad19245a46..c51ca928db 100644
--- a/kde/src/lib/CredentialModel.h
+++ b/kde/src/lib/CredentialModel.h
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #ifndef CREDENTIAL_MODEL_H
 #define CREDENTIAL_MODEL_H
 
diff --git a/kde/src/lib/HistoryModel.cpp b/kde/src/lib/HistoryModel.cpp
index fbd09a1372..a2408f3cbb 100644
--- a/kde/src/lib/HistoryModel.cpp
+++ b/kde/src/lib/HistoryModel.cpp
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #include "HistoryModel.h"
 #include "callmanager_interface_singleton.h"
 #include "configurationmanager_interface_singleton.h"
diff --git a/kde/src/lib/HistoryModel.h b/kde/src/lib/HistoryModel.h
index d3b638fed4..657c8d2b48 100644
--- a/kde/src/lib/HistoryModel.h
+++ b/kde/src/lib/HistoryModel.h
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #ifndef HISTORY_MODEL_H
 #define HISTORY_MODEL_H
 //Base
diff --git a/kde/src/lib/InstantMessagingModel.cpp b/kde/src/lib/InstantMessagingModel.cpp
index e30a85d5f2..e3e983b833 100644
--- a/kde/src/lib/InstantMessagingModel.cpp
+++ b/kde/src/lib/InstantMessagingModel.cpp
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #include "InstantMessagingModel.h"
 
 #include "CallModel.h"
diff --git a/kde/src/lib/InstantMessagingModel.h b/kde/src/lib/InstantMessagingModel.h
index cf908c528e..25c9ad381d 100644
--- a/kde/src/lib/InstantMessagingModel.h
+++ b/kde/src/lib/InstantMessagingModel.h
@@ -1,24 +1,23 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
-#ifndef IM_MODEL_H
-#define IM_MODEL_H
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
+#ifndef INSTANTMESSAGINGMODELMANAGER_H
+#define INSTANTMESSAGINGMODELMANAGER_H
 
 #include <QtCore/QAbstractListModel>
 #include <QtCore/QModelIndex>
diff --git a/kde/src/lib/VideoCodecModel.cpp b/kde/src/lib/VideoCodecModel.cpp
index 8196ce25a2..5315080b40 100644
--- a/kde/src/lib/VideoCodecModel.cpp
+++ b/kde/src/lib/VideoCodecModel.cpp
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #include "VideoCodecModel.h"
 #include "Call.h"
 #include "Account.h"
diff --git a/kde/src/lib/VideoCodecModel.h b/kde/src/lib/VideoCodecModel.h
index d87f4638a7..da105cd988 100644
--- a/kde/src/lib/VideoCodecModel.h
+++ b/kde/src/lib/VideoCodecModel.h
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #ifndef VIDEO_CODEC_H
 #define VIDEO_CODEC_H
 
diff --git a/kde/src/lib/VideoDevice.cpp b/kde/src/lib/VideoDevice.cpp
index e43c56b3cc..1e6f8b46d3 100644
--- a/kde/src/lib/VideoDevice.cpp
+++ b/kde/src/lib/VideoDevice.cpp
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #include "VideoDevice.h"
 #include "video_interface_singleton.h"
 
diff --git a/kde/src/lib/VideoDevice.h b/kde/src/lib/VideoDevice.h
index 6fcebe1e4b..bae8a690db 100644
--- a/kde/src/lib/VideoDevice.h
+++ b/kde/src/lib/VideoDevice.h
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #ifndef VIDEO_DEVICE_H
 #define VIDEO_DEVICE_H
 
diff --git a/kde/src/lib/VideoModel.cpp b/kde/src/lib/VideoModel.cpp
index c150d79d16..d9f7df49eb 100644
--- a/kde/src/lib/VideoModel.cpp
+++ b/kde/src/lib/VideoModel.cpp
@@ -1,32 +1,22 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #include "VideoModel.h"
 
-//Posix
-// #include <sys/ipc.h>
-// #include <sys/sem.h>
-// #include <sys/shm.h>
-// #include <fcntl.h>
-// #include <unistd.h>
-// #include <sys/mman.h>
-// #include <semaphore.h>
-
 //SFLPhone
 #include "video_interface_singleton.h"
 #include "VideoDevice.h"
diff --git a/kde/src/lib/VideoModel.h b/kde/src/lib/VideoModel.h
index 8eb5652010..fee62da419 100644
--- a/kde/src/lib/VideoModel.h
+++ b/kde/src/lib/VideoModel.h
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 #ifndef VIDEO_MODEL_H
 #define VIDEO_MODEL_H
 //Base
diff --git a/kde/src/lib/VideoRenderer.cpp b/kde/src/lib/VideoRenderer.cpp
index ea510eeba2..f267a57b24 100644
--- a/kde/src/lib/VideoRenderer.cpp
+++ b/kde/src/lib/VideoRenderer.cpp
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #include "VideoRenderer.h"
 
 #include <QtCore/QDebug>
diff --git a/kde/src/lib/VideoRenderer.h b/kde/src/lib/VideoRenderer.h
index 5c647d38d1..828def3878 100644
--- a/kde/src/lib/VideoRenderer.h
+++ b/kde/src/lib/VideoRenderer.h
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #ifndef VIDEO_RENDERER_H
 #define VIDEO_RENDERER_H
 
diff --git a/kde/src/lib/callmanager_interface_singleton.cpp b/kde/src/lib/callmanager_interface_singleton.cpp
index 013442b51c..8525f085c2 100644
--- a/kde/src/lib/callmanager_interface_singleton.cpp
+++ b/kde/src/lib/callmanager_interface_singleton.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "callmanager_interface_singleton.h"
 
diff --git a/kde/src/lib/callmanager_interface_singleton.h b/kde/src/lib/callmanager_interface_singleton.h
index 2127a04f67..48536c066e 100644
--- a/kde/src/lib/callmanager_interface_singleton.h
+++ b/kde/src/lib/callmanager_interface_singleton.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef CALL_MANAGER_INTERFACE_SINGLETON_H
 #define CALL_MANAGER_INTERFACE_SINGLETON_H
diff --git a/kde/src/lib/configurationmanager_interface_singleton.cpp b/kde/src/lib/configurationmanager_interface_singleton.cpp
index 1a403adabd..de9ccc47b2 100644
--- a/kde/src/lib/configurationmanager_interface_singleton.cpp
+++ b/kde/src/lib/configurationmanager_interface_singleton.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
  
  #include "configurationmanager_interface_singleton.h"
 
diff --git a/kde/src/lib/configurationmanager_interface_singleton.h b/kde/src/lib/configurationmanager_interface_singleton.h
index fd7ee60726..a1ab9a32c7 100644
--- a/kde/src/lib/configurationmanager_interface_singleton.h
+++ b/kde/src/lib/configurationmanager_interface_singleton.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef CONFIGURATION_MANAGER_INTERFACE_SINGLETON_H
 #define CONFIGURATION_MANAGER_INTERFACE_SINGLETON_H
diff --git a/kde/src/lib/dbus/metatypes.h b/kde/src/lib/dbus/metatypes.h
index a059e542d1..4d69b57c4a 100644
--- a/kde/src/lib/dbus/metatypes.h
+++ b/kde/src/lib/dbus/metatypes.h
@@ -1,3 +1,21 @@
+/******************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *            Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>            *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 #ifndef METATYPES_H
 #define METATYPES_H
 
diff --git a/kde/src/lib/instance_interface_singleton.cpp b/kde/src/lib/instance_interface_singleton.cpp
index 429da445b6..3e5b52d6b0 100644
--- a/kde/src/lib/instance_interface_singleton.cpp
+++ b/kde/src/lib/instance_interface_singleton.cpp
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
  
 #include "instance_interface_singleton.h"
 
diff --git a/kde/src/lib/instance_interface_singleton.h b/kde/src/lib/instance_interface_singleton.h
index bc1d6df5f0..d95c19134d 100644
--- a/kde/src/lib/instance_interface_singleton.h
+++ b/kde/src/lib/instance_interface_singleton.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef INSTANCE_INTERFACE_SINGLETON_H
 #define INSTANCE_INTERFACE_SINGLETON_H
diff --git a/kde/src/lib/sflphone_const.h b/kde/src/lib/sflphone_const.h
index e8fe21c6d6..1c1f54da21 100644
--- a/kde/src/lib/sflphone_const.h
+++ b/kde/src/lib/sflphone_const.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef SFLPHONE_CONST_H
 #define SFLPHONE_CONST_H
diff --git a/kde/src/lib/typedefs.h b/kde/src/lib/typedefs.h
index e2241ae847..8eded997fa 100644
--- a/kde/src/lib/typedefs.h
+++ b/kde/src/lib/typedefs.h
@@ -1,22 +1,21 @@
-/************************************************************************************
- *   Copyright (C) 2009 by Savoir-Faire Linux                                       *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>                  *
- *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                               *
+ *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
+ *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef TYPEDEFS_H
 #define TYPEDEFS_H
diff --git a/kde/src/lib/video_interface_singleton.cpp b/kde/src/lib/video_interface_singleton.cpp
index 905eda9694..6a606cf02e 100644
--- a/kde/src/lib/video_interface_singleton.cpp
+++ b/kde/src/lib/video_interface_singleton.cpp
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #include "video_interface_singleton.h"
 
diff --git a/kde/src/lib/video_interface_singleton.h b/kde/src/lib/video_interface_singleton.h
index ea6192e0c1..874cf0f342 100644
--- a/kde/src/lib/video_interface_singleton.h
+++ b/kde/src/lib/video_interface_singleton.h
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/****************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 
 #ifndef VIDEO_INTERFACE_SINGLETON_H
 #define VIDEO_INTERFACE_SINGLETON_H
diff --git a/kde/src/main.cpp b/kde/src/main.cpp
index 9b8823c4cd..bb1978de5d 100755
--- a/kde/src/main.cpp
+++ b/kde/src/main.cpp
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //System
diff --git a/kde/src/test/CMakeLists.txt b/kde/src/test/CMakeLists.txt
index 93cb016032..c1754a267a 100644
--- a/kde/src/test/CMakeLists.txt
+++ b/kde/src/test/CMakeLists.txt
@@ -56,4 +56,4 @@ target_link_libraries( call
    ${KDE4_KDEUI_LIBS}
    ksflphone
    qtsflphone
-)
\ No newline at end of file
+)
diff --git a/kde/src/test/account_test.cpp b/kde/src/test/account_test.cpp
index 93f8b9cd91..fc5385f0e1 100644
--- a/kde/src/test/account_test.cpp
+++ b/kde/src/test/account_test.cpp
@@ -1,5 +1,22 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 #include <QtCore/QString>
-#include <QtTest/QtTest>
+#include <QtTest/QtTest/QtTest>
 //#include <QtCore>
 
 #include "../src/lib/configurationmanager_interface_singleton.h"
diff --git a/kde/src/test/call_test.cpp b/kde/src/test/call_test.cpp
index cd11661d84..ab09122f7e 100644
--- a/kde/src/test/call_test.cpp
+++ b/kde/src/test/call_test.cpp
@@ -1,5 +1,22 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 #include <QtCore/QString>
-#include <QtTest>
+#include <QtTest/QtTest>
 
 #include "../src/lib/configurationmanager_interface_singleton.h"
 #include "../src/lib/callmanager_interface_singleton.h"
diff --git a/kde/src/test/dbus_test.cpp b/kde/src/test/dbus_test.cpp
index 63c3ab9f0b..9134c5ff20 100644
--- a/kde/src/test/dbus_test.cpp
+++ b/kde/src/test/dbus_test.cpp
@@ -1,5 +1,22 @@
+/******************************************************************************
+ *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
+ *                                                                            *
+ *   This library is free software; you can redistribute it and/or            *
+ *   modify it under the terms of the GNU Lesser General Public               *
+ *   License as published by the Free Software Foundation; either             *
+ *   version 2.1 of the License, or (at your option) any later version.       *
+ *                                                                            *
+ *   This library is distributed in the hope that it will be useful,          *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+ *   Lesser General Public License for more details.                          *
+ *                                                                            *
+ *   You should have received a copy of the Lesser GNU General Public License *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *****************************************************************************/
 #include <QtCore/QString>
-#include <QtTest>
+#include <QtTest/QtTest>
 
 #include "../src/lib/configurationmanager_interface_singleton.h"
 #include "../src/lib/callmanager_interface_singleton.h"
diff --git a/kde/src/ui/SFLPhoneView_base.ui b/kde/src/ui/SFLPhoneView_base.ui
index 251520618a..847c69e5a0 100755
--- a/kde/src/ui/SFLPhoneView_base.ui
+++ b/kde/src/ui/SFLPhoneView_base.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">Form</string>
+   <string notr="true">SFLPhone KDE</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/kde/src/widgets/AcceleratedVideoWidget.cpp b/kde/src/widgets/AcceleratedVideoWidget.cpp
index fdbd639e45..0bf3aac41d 100644
--- a/kde/src/widgets/AcceleratedVideoWidget.cpp
+++ b/kde/src/widgets/AcceleratedVideoWidget.cpp
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "AcceleratedVideoWidget.h"
 #include <QPixmap>
diff --git a/kde/src/widgets/AcceleratedVideoWidget.h b/kde/src/widgets/AcceleratedVideoWidget.h
index 86b4e686e2..edb1ba3d10 100644
--- a/kde/src/widgets/AcceleratedVideoWidget.h
+++ b/kde/src/widgets/AcceleratedVideoWidget.h
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #ifndef ACCELERATEDVIDEOWIDGET_H
 #define ACCELERATEDVIDEOWIDGET_H
diff --git a/kde/src/widgets/BookmarkDock.cpp b/kde/src/widgets/BookmarkDock.cpp
index 1467e22b50..9b183c5252 100644
--- a/kde/src/widgets/BookmarkDock.cpp
+++ b/kde/src/widgets/BookmarkDock.cpp
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/widgets/BookmarkDock.h b/kde/src/widgets/BookmarkDock.h
index 2d6f89187f..16cbc340e7 100644
--- a/kde/src/widgets/BookmarkDock.h
+++ b/kde/src/widgets/BookmarkDock.h
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #ifndef BOOKMARK_DOCK_H
 #define BOOKMARK_DOCK_H
diff --git a/kde/src/widgets/CallTreeItem.cpp b/kde/src/widgets/CallTreeItem.cpp
index d4d6cc797b..dc65971c6a 100644
--- a/kde/src/widgets/CallTreeItem.cpp
+++ b/kde/src/widgets/CallTreeItem.cpp
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/widgets/CallTreeItem.h b/kde/src/widgets/CallTreeItem.h
index 51146638ef..5727c09449 100644
--- a/kde/src/widgets/CallTreeItem.h
+++ b/kde/src/widgets/CallTreeItem.h
@@ -16,9 +16,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #ifndef CALLTREE_ITEM_H
 #define CALLTREE_ITEM_H
diff --git a/kde/src/widgets/CategorizedTreeWidget.cpp b/kde/src/widgets/CategorizedTreeWidget.cpp
index 5f975c5626..fbd536e37b 100644
--- a/kde/src/widgets/CategorizedTreeWidget.cpp
+++ b/kde/src/widgets/CategorizedTreeWidget.cpp
@@ -11,10 +11,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       *
  * Library General Public License for more details.                        *
  *                                                                         *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to    *
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,    *
- * Boston, MA 02110-1301, USA.                                             *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 #include "CategorizedTreeWidget.h"
diff --git a/kde/src/widgets/CategorizedTreeWidget.h b/kde/src/widgets/CategorizedTreeWidget.h
index 29c27e1ece..da995dc8d5 100644
--- a/kde/src/widgets/CategorizedTreeWidget.h
+++ b/kde/src/widgets/CategorizedTreeWidget.h
@@ -14,12 +14,10 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
-#ifndef KATE_COLOR_TREE_WIDGET_H
-#define KATE_COLOR_TREE_WIDGET_H
+#ifndef CATEGORIZEDTREEWIDGET_H
+#define CATEGORIZEDTREEWIDGET_H
 
 #include <QtGui/QTreeWidget>
 
diff --git a/kde/src/widgets/CategoryDrawer.cpp b/kde/src/widgets/CategoryDrawer.cpp
index 813f99c15d..67ba7c9162 100644
--- a/kde/src/widgets/CategoryDrawer.cpp
+++ b/kde/src/widgets/CategoryDrawer.cpp
@@ -10,10 +10,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       *
  * Library General Public License for more details.                        *
  *                                                                         *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to    *
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,    *
- * Boston, MA 02110-1301, USA.                                             *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 // this code is taken from SystemSettings/icons/CategoryDrawer.{h,cpp}
diff --git a/kde/src/widgets/CategoryDrawer.h b/kde/src/widgets/CategoryDrawer.h
index ae8e07b340..5422e2d527 100644
--- a/kde/src/widgets/CategoryDrawer.h
+++ b/kde/src/widgets/CategoryDrawer.h
@@ -10,11 +10,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       *
  * Library General Public License for more details.                        *
  *                                                                         *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to    *
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,    *
- * Boston, MA 02110-1301, USA.                                             *
- ***************************************************************************/
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+ **************************************************************************/
 
 // this code is taken from SystemSettings/icons/CategoryDrawer.{h,cpp}
 // Rafael agreet to relicense it under LGPLv2 or LGPLv3, just as we need it,
diff --git a/kde/src/widgets/ConferenceBox.cpp b/kde/src/widgets/ConferenceBox.cpp
index f48d328c1e..68bde0d03f 100644
--- a/kde/src/widgets/ConferenceBox.cpp
+++ b/kde/src/widgets/ConferenceBox.cpp
@@ -10,10 +10,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       *
  * Library General Public License for more details.                        *
  *                                                                         *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to    *
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,    *
- * Boston, MA 02110-1301, USA.                                             *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 // this code is taken from SystemSettings/icons/CategoryDrawer.{h,cpp}
diff --git a/kde/src/widgets/ConferenceBox.h b/kde/src/widgets/ConferenceBox.h
index 473d0ef6f7..4b63f03705 100644
--- a/kde/src/widgets/ConferenceBox.h
+++ b/kde/src/widgets/ConferenceBox.h
@@ -10,13 +10,11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       *
  * Library General Public License for more details.                        *
  *                                                                         *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to    *
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,    *
- * Boston, MA 02110-1301, USA.                                             *
- ***************************************************************************/
-#ifndef CONFBOX_H
-#define CONFBOX_H
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+ **************************************************************************/
+#ifndef CONFERENCEBOX_H
+#define CONFERENCEBOX_H
 
 // this code is taken from SystemSettings/icons/CategoryDrawer.{h,cpp}
 // Rafael agreet to relicense it under LGPLv2 or LGPLv3, just as we need it,
diff --git a/kde/src/widgets/ContactDock.cpp b/kde/src/widgets/ContactDock.cpp
index b094a2fc85..83e8626a00 100644
--- a/kde/src/widgets/ContactDock.cpp
+++ b/kde/src/widgets/ContactDock.cpp
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/widgets/ContactDock.h b/kde/src/widgets/ContactDock.h
index 51775fba47..b4a1bd0ec6 100644
--- a/kde/src/widgets/ContactDock.h
+++ b/kde/src/widgets/ContactDock.h
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #ifndef CONTACT_DOCK_H
 #define CONTACT_DOCK_H
diff --git a/kde/src/widgets/ContactItemWidget.cpp b/kde/src/widgets/ContactItemWidget.cpp
index a26d06ecfc..b51afd01bb 100644
--- a/kde/src/widgets/ContactItemWidget.cpp
+++ b/kde/src/widgets/ContactItemWidget.cpp
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/widgets/ContactItemWidget.h b/kde/src/widgets/ContactItemWidget.h
index c0bf9198c0..a91d6d498b 100644
--- a/kde/src/widgets/ContactItemWidget.h
+++ b/kde/src/widgets/ContactItemWidget.h
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 #ifndef CONTACTITEMWIDGET_H
diff --git a/kde/src/widgets/Dialpad.cpp b/kde/src/widgets/Dialpad.cpp
index f3b99f7bbb..edfa5c16af 100755
--- a/kde/src/widgets/Dialpad.cpp
+++ b/kde/src/widgets/Dialpad.cpp
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/widgets/Dialpad.h b/kde/src/widgets/Dialpad.h
index 159af018ec..da9119395e 100755
--- a/kde/src/widgets/Dialpad.h
+++ b/kde/src/widgets/Dialpad.h
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #ifndef DIALPAD_H
 #define DIALPAD_H
diff --git a/kde/src/widgets/HistoryDock.cpp b/kde/src/widgets/HistoryDock.cpp
index 04764d2e8c..e94231ee33 100644
--- a/kde/src/widgets/HistoryDock.cpp
+++ b/kde/src/widgets/HistoryDock.cpp
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/widgets/HistoryDock.h b/kde/src/widgets/HistoryDock.h
index f4d2a6dfcc..c308108f68 100644
--- a/kde/src/widgets/HistoryDock.h
+++ b/kde/src/widgets/HistoryDock.h
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #ifndef HISTORY_DOCK_H
 #define HISTORY_DOCK_H
diff --git a/kde/src/widgets/HistoryTreeItem.cpp b/kde/src/widgets/HistoryTreeItem.cpp
index d10af7f64e..2927660bf2 100644
--- a/kde/src/widgets/HistoryTreeItem.cpp
+++ b/kde/src/widgets/HistoryTreeItem.cpp
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/widgets/HistoryTreeItem.h b/kde/src/widgets/HistoryTreeItem.h
index 0ce8c94176..d76efb7f6c 100644
--- a/kde/src/widgets/HistoryTreeItem.h
+++ b/kde/src/widgets/HistoryTreeItem.h
@@ -16,9 +16,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 /**
diff --git a/kde/src/widgets/IMManager.cpp b/kde/src/widgets/IMManager.cpp
index b8166650cc..9c7fcb28e7 100644
--- a/kde/src/widgets/IMManager.cpp
+++ b/kde/src/widgets/IMManager.cpp
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "IMManager.h"
 #include "../lib/InstantMessagingModel.h"
diff --git a/kde/src/widgets/IMManager.h b/kde/src/widgets/IMManager.h
index e3ebf5f151..607cf70bac 100644
--- a/kde/src/widgets/IMManager.h
+++ b/kde/src/widgets/IMManager.h
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 #ifndef IM_MANAGER_H
diff --git a/kde/src/widgets/IMTab.cpp b/kde/src/widgets/IMTab.cpp
index f6872e99be..d7d0bba801 100644
--- a/kde/src/widgets/IMTab.cpp
+++ b/kde/src/widgets/IMTab.cpp
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "IMTab.h"
 
diff --git a/kde/src/widgets/IMTab.h b/kde/src/widgets/IMTab.h
index a0477e6a1a..cb912e5999 100644
--- a/kde/src/widgets/IMTab.h
+++ b/kde/src/widgets/IMTab.h
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 #ifndef IM_TAB_H
diff --git a/kde/src/widgets/SFLPhoneTray.cpp b/kde/src/widgets/SFLPhoneTray.cpp
index 36e34a1502..a5918e8f77 100755
--- a/kde/src/widgets/SFLPhoneTray.cpp
+++ b/kde/src/widgets/SFLPhoneTray.cpp
@@ -14,9 +14,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
diff --git a/kde/src/widgets/SFLPhoneTray.h b/kde/src/widgets/SFLPhoneTray.h
index 825ca9eb0a..ebdcd9fcbd 100755
--- a/kde/src/widgets/SFLPhoneTray.h
+++ b/kde/src/widgets/SFLPhoneTray.h
@@ -14,11 +14,8 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
-
 #ifndef SFLPHONETRAY_H
 #define SFLPHONETRAY_H
 
diff --git a/kde/src/widgets/TranslucentButtons.cpp b/kde/src/widgets/TranslucentButtons.cpp
index 0b1ab5b9ec..27f5d8f7a8 100644
--- a/kde/src/widgets/TranslucentButtons.cpp
+++ b/kde/src/widgets/TranslucentButtons.cpp
@@ -1,3 +1,20 @@
+/***************************************************************************
+ *   Copyright (C) 2011 by Savoir-Faire Linux                              *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+ **************************************************************************/
 #include "TranslucentButtons.h"
 
 #include <QtGui/QPainter>
diff --git a/kde/src/widgets/TranslucentButtons.h b/kde/src/widgets/TranslucentButtons.h
index 9f45c068b1..ac3b19fd6f 100644
--- a/kde/src/widgets/TranslucentButtons.h
+++ b/kde/src/widgets/TranslucentButtons.h
@@ -1,3 +1,20 @@
+/***************************************************************************
+ *   Copyright (C) 2011 by Savoir-Faire Linux                              *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+ **************************************************************************/
 #ifndef TRANSLUCENTBUTTONS_H
 #define TRANSLUCENTBUTTONS_H
 #include <QtGui/QPushButton>
diff --git a/kde/src/widgets/VideoDock.cpp b/kde/src/widgets/VideoDock.cpp
index 5e82a588b7..a5ea0a2335 100644
--- a/kde/src/widgets/VideoDock.cpp
+++ b/kde/src/widgets/VideoDock.cpp
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/***************************************************************************
+ *   Copyright (C) 2011 by Savoir-Faire Linux                              *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+ **************************************************************************/
 #include "VideoDock.h"
 
 #include <QtGui/QSpacerItem>
diff --git a/kde/src/widgets/VideoDock.h b/kde/src/widgets/VideoDock.h
index 7ae7827f73..319476e6ea 100644
--- a/kde/src/widgets/VideoDock.h
+++ b/kde/src/widgets/VideoDock.h
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/***************************************************************************
+ *   Copyright (C) 2011 by Savoir-Faire Linux                              *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+ **************************************************************************/
 #ifndef VIDEO_DOCK_H
 #define VIDEO_DOCK_H
 
diff --git a/kde/src/widgets/VideoWidget.cpp b/kde/src/widgets/VideoWidget.cpp
index e0b06952b4..e9a0a629d8 100644
--- a/kde/src/widgets/VideoWidget.cpp
+++ b/kde/src/widgets/VideoWidget.cpp
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/***************************************************************************
+ *   Copyright (C) 2011 by Savoir-Faire Linux                              *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+ **************************************************************************/
 #include "VideoWidget.h"
 #include "../lib/VideoRenderer.h"
 #include <KDebug>
diff --git a/kde/src/widgets/VideoWidget.h b/kde/src/widgets/VideoWidget.h
index 0e603a01ee..3931189a8d 100644
--- a/kde/src/widgets/VideoWidget.h
+++ b/kde/src/widgets/VideoWidget.h
@@ -1,21 +1,20 @@
-/************************************************************************************
- *   Copyright (C) 2012 by Savoir-Faire Linux                                       *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>         *
- *                                                                                  *
- *   This library is free software; you can redistribute it and/or                  *
- *   modify it under the terms of the GNU Lesser General Public                     *
- *   License as published by the Free Software Foundation; either                   *
- *   version 2.1 of the License, or (at your option) any later version.             *
- *                                                                                  *
- *   This library is distributed in the hope that it will be useful,                *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of                 *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU              *
- *   Lesser General Public License for more details.                                *
- *                                                                                  *
- *   You should have received a copy of the GNU Lesser General Public               *
- *   License along with this library; if not, write to the Free Software            *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
- ***********************************************************************************/
+/***************************************************************************
+ *   Copyright (C) 2011 by Savoir-Faire Linux                              *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+ **************************************************************************/
 #ifndef VIDEO_WIDGET_H
 #define VIDEO_WIDGET_H
 
-- 
GitLab