Merge branch 'network-sync'
authorMarcus Eggenberger <egs@quassel-irc.org>
Sat, 12 Jul 2008 13:21:49 +0000 (15:21 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Sat, 12 Jul 2008 13:21:49 +0000 (15:21 +0200)
30 files changed:
CMakeLists.txt
INSTALL
cmake/modules/FindQt4.cmake
cmake/modules/QuasselGenerateTranslations.cmake [new file with mode: 0644]
cmake/modules/README
i18n/README.Translations
i18n/i18n.qrc [deleted file]
i18n/quassel.qm [deleted file]
i18n/quassel_da.qm [deleted file]
i18n/quassel_de.qm [deleted file]
i18n/quassel_de.ts
i18n/quassel_fr.qm [deleted file]
i18n/quassel_fr.ts
i18n/quassel_nb_NO.ts [new file with mode: 0644]
src/client/networkmodel.cpp
src/client/networkmodel.h
src/client/treemodel.cpp
src/client/treemodel.h
src/common/network.cpp
src/common/network.h
src/core/CMakeLists.txt
src/core/core.cpp
src/core/coresession.cpp
src/core/ircserverhandler.cpp
src/core/userinputhandler.cpp
src/qtui/ui/mainwin.ui
src/uisupport/bufferview.cpp
src/uisupport/inputline.cpp
src/uisupport/inputline.h
src/uisupport/tabcompleter.cpp

index 16dac30..29fd963 100644 (file)
@@ -14,9 +14,9 @@ project(QuasselIRC)
 # Target scopes don't work in older versions
 cmake_minimum_required(VERSION 2.4.7 FATAL_ERROR)
 
-# This would suppress annoying warnings on cmake-2.6, but we can't use it 
-# with 2.4, so... DUH!
-# cmake_policy(SET CMP0003 OLD)  # suppress linker warnings
+if(COMMAND cmake_policy)
+   cmake_policy(SET CMP0003 OLD)  # suppress linker warnings
+endif(COMMAND cmake_policy)
 
 # Use our own (well, KDE's) version of some modules
 # In particular cmake's FindQt4 and FindOpenSSL are quite buggy
@@ -32,7 +32,8 @@ option(DEPLOY        "Mac OS X only! Adds required libs to bundle resources and
 option(SPUTDEV       "Do not use!" OFF)
 
 set(QT "" CACHE STRING "Path to a Qt installation to use instead of the system Qt")
-
+set(LINGUAS "" CACHE STRING "Space-separated List of locales specifying languages that should be compiled")
 if(STATIC)
   set(CMAKE_BUILD_TYPE Release)
 endif(STATIC)
@@ -69,6 +70,9 @@ endif(SPUTDEV)
 
 # Set up OpenSSL
 find_package(OpenSSL)
+if(NOT OPENSSL_FOUND)
+  add_definitions(-DQT_NO_OPENSSL)
+endif(NOT OPENSSL_FOUND)
 
 # Select a Qt installation here, if you don't want to use system Qt
 if(QT)
@@ -111,8 +115,11 @@ endif(WANT_QTCLIENT OR WANT_MONO)
 # Make sure version.gen exists before building mod_common
 add_dependencies(mod_common genversion_run)
 
+# Generate binary translation files
+include(QuasselGenerateTranslations)
+quassel_generate_i18n_resource(RC_I18N ${LINGUAS})
+
 # Add resources
-qt4_add_resources(RC_I18N i18n/i18n.qrc)
 qt4_add_resources(RC_ICONS src/icons/icons.qrc)
 qt4_add_resources(RC_QUASSEL_ICONS src/icons/quassel-icons.qrc)
 qt4_add_resources(RC_SQL src/core/sql.qrc)
diff --git a/INSTALL b/INSTALL
index e6c74be..a473938 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -40,6 +40,11 @@ Quassel recognizes the following options:
 -DWANT_(CORE|QTCLIENT|MONO)=(ON|OFF)
     Allow to choose which Quassel binaries to build.
 
+-DLINGUAS="<languages">
+    Allow to choose which languages should be compiled into the binary.
+    <languages> is a space-separated list of language codes.
+    Example: -DLINGUAS="de en_US"
+
 -DQT=/path/to/qt
     Use a non-system Qt installation. This is for example useful if you have a static
     Qt installed in some local dir.
index d778da6..dc4969b 100644 (file)
@@ -1142,10 +1142,20 @@ IF (QT4_QMAKE_FOUND)
 
   ENDMACRO(QT4_GET_MOC_INC_DIRS)
 
+  # Added by Sput to provide definitions to moc calls
+  MACRO (QT4_GET_MOC_DEFINES _moc_DEFINES)
+     SET(${_moc_DEFINES})
+     GET_DIRECTORY_PROPERTY(_defines COMPILE_DEFINITIONS)
+     FOREACH(_current ${_defines})
+        SET(${_moc_DEFINES} ${${_moc_DEFINES}} -D${_current})
+     ENDFOREACH(_current ${_defines})
+
+  ENDMACRO(QT4_GET_MOC_DEFINES)
 
   MACRO (QT4_GENERATE_MOC infile outfile )
   # get include dirs
-     QT4_GET_MOC_INC_DIRS(moc_includes)
+     # QT4_GET_MOC_INC_DIRS(moc_includes) # Not needed...
+     QT4_GET_MOC_DEFINES(moc_defines)
 
      GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
 
@@ -1161,7 +1171,7 @@ IF (QT4_QMAKE_FOUND)
      ELSE (MSVC_IDE)
         ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
            COMMAND ${QT_MOC_EXECUTABLE}
-           ARGS ${moc_includes} -o ${outfile} ${abs_infile}
+           ARGS ${moc_includes} ${moc_defines} -o ${outfile} ${abs_infile}
            DEPENDS ${abs_infile})
      ENDIF (MSVC_IDE)
 
@@ -1175,7 +1185,8 @@ IF (QT4_QMAKE_FOUND)
 
   MACRO (QT4_WRAP_CPP outfiles )
     # get include dirs
-    QT4_GET_MOC_INC_DIRS(moc_includes)
+    # QT4_GET_MOC_INC_DIRS(moc_includes) # Not needed
+    QT4_GET_MOC_DEFINES(moc_defines)
     QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
 
     FOREACH (it ${moc_files})
@@ -1185,7 +1196,7 @@ IF (QT4_QMAKE_FOUND)
       SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
         COMMAND ${QT_MOC_EXECUTABLE}
-        ARGS ${moc_includes} ${moc_options} -o ${outfile} ${it}
+        ARGS ${moc_includes} ${moc_defines} ${moc_options} -o ${outfile} ${it}
         DEPENDS ${it})
       SET(${outfiles} ${${outfiles}} ${outfile})
     ENDFOREACH(it)
@@ -1343,7 +1354,9 @@ IF (QT4_QMAKE_FOUND)
   ENDMACRO(QT4_ADD_DBUS_ADAPTOR)
 
    MACRO(QT4_AUTOMOC)
-      QT4_GET_MOC_INC_DIRS(_moc_INCS)
+      # QT4_GET_MOC_INC_DIRS(_moc_INCS)
+      QT4_GET_MOC_DEFINES(_moc_DEFINES)
+
 
       SET(_matching_FILES )
       FOREACH (_current_FILE ${ARGN})
@@ -1375,7 +1388,7 @@ IF (QT4_QMAKE_FOUND)
                   SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
                   ADD_CUSTOM_COMMAND(OUTPUT ${_moc}
                      COMMAND ${QT_MOC_EXECUTABLE}
-                     ARGS ${_moc_INCS} ${_header} -o ${_moc}
+                     ARGS ${_moc_INCS} ${_moc_DEFINES} ${_header} -o ${_moc}
                      DEPENDS ${_header}
                   )
 
@@ -1456,6 +1469,11 @@ IF (QT4_QMAKE_FOUND)
     # Trolltech said they'd consider exporting it for all platforms in future releases.
     SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_SHARED)
   ENDIF(NOT QT_CONFIG MATCHES "static")
+
+  # OpenSSL
+  IF(NOT QT_QCONFIG MATCHES "openssl")
+    SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_NO_OPENSSL)
+  ENDIF(NOT QT_QCONFIG MATCHES "openssl")
   
   ## system png
   IF(QT_QCONFIG MATCHES "system-png")
diff --git a/cmake/modules/QuasselGenerateTranslations.cmake b/cmake/modules/QuasselGenerateTranslations.cmake
new file mode 100644 (file)
index 0000000..99c87a3
--- /dev/null
@@ -0,0 +1,68 @@
+# This file contains macros dealing with translation
+# files for Quassel IRC.
+
+# Copyright (C) 2008 by the Quassel Project, devel@quassel-irc.org
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+macro(quassel_generate_qm outvar basename)
+  set(input ${CMAKE_SOURCE_DIR}/i18n/${basename}.ts)
+  set(output ${CMAKE_CURRENT_BINARY_DIR}/${basename}.qm)
+  add_custom_command(OUTPUT ${output}
+          COMMAND ${QT_LRELEASE_EXECUTABLE}
+          ARGS ${input}
+               -qm ${output}
+               -silent -compress
+          DEPENDS ${CMAKE_SOURCE_DIR}/i18n/${basename}.ts)
+  set(${outvar} ${output})
+endmacro(quassel_generate_qm outvar basename)
+
+macro(quassel_generate_i18n_resource outvar)
+  set(linguas ${ARGN})
+  if(QT_LRELEASE_EXECUTABLE)
+    # We always include quassel.ts
+    quassel_generate_qm(QM quassel)
+    set(outfiles ${QM})
+
+    # Find more languages
+    file(GLOB avail_tsfiles ${CMAKE_SOURCE_DIR}/i18n/quassel_*.ts)
+    foreach(TS_FILE ${avail_tsfiles})
+      get_filename_component(basename ${TS_FILE} NAME_WE)
+      string(REGEX REPLACE "quassel_(.+)$" "\\1" lang ${basename})
+      # test if we want this
+      set(flg 1)
+      if(linguas)
+        string(REGEX MATCH "${lang}" flg ${linguas})
+      endif(linguas)
+      if(flg)
+        quassel_generate_qm(QM ${basename})
+        set(outfiles ${outfiles} ${QM})
+        set(gen_linguas "${gen_linguas} ${lang}")
+      endif(flg)
+    endforeach(TS_FILE ${avail_tsfiles})
+
+    # Write resource file
+    set(resfile ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc)
+    file(WRITE ${resfile} "<!DOCTYPE RCC><RCC version=\"1.0\">\n"
+                          "<qresource prefix=\"/i18n\">\n")
+    foreach(file ${outfiles})
+      get_filename_component(file ${file} NAME)
+      file(APPEND ${resfile} "    <file>${file}</file>\n")
+    endforeach(file ${outfiles})
+    file(APPEND ${resfile} "</qresource>\n</RCC>\n")
+    add_custom_command(OUTPUT ${resfile} DEPENDS ${outfiles})
+    set_directory_properties(PROPERTIES
+          ADDITIONAL_MAKE_CLEAN_FILES "${outfiles} i18n.qrc")
+
+    # Generate resource
+    qt4_add_resources(RC_OUT ${resfile})
+    set(${outvar} ${RC_OUT})
+
+    message(STATUS "Including languages:${gen_linguas}")
+  else(QT_LRELEASE_EXECUTABLE)
+    message(STATUS "WARNING: lrelease not found, you won't have translations!")
+  endif(QT_LRELEASE_EXECUTABLE)
+endmacro(quassel_generate_i18n_resource outvar)
+
index a9d951b..fa122a8 100644 (file)
@@ -1,7 +1,11 @@
 These modules have been copied from KDE's repository as of 2008-06-17.
 
 FindQt4 has been adjusted to still contain the library deps and Qt config
-stuff from the original FindQt4 (of cmake 2.4.7).
+stuff from the original FindQt4 (of cmake 2.4.7). Also, I've fixed OpenSSL
+detection (actually setting -DQT_NO_OPENSSL if it's not present) and
+also provide -D to moc rather than -I.
+
+Files starting with Quassel* are solely created by us.
 
 Below is the contents of KDE's original README:
 
index e4d36dc..1a65654 100644 (file)
@@ -16,10 +16,13 @@ You can open these XML files with the Qt Linguist and add/edit translated string
 The *.ts files can and should be kept in sync with the source code by running
 lupdate regularly (existing translations won't be removed).
 
-Qt itself does not use the *.ts files, but a compact binary format (*.qm). In order
-to create these files from new or updated *.ts files, run
+Qt itself does not use the *.ts files, but a compact binary format (*.qm). 
+These files will automatically be generated at build time. By default, all
+languages will be built. To select languages, add -DLINGUAS="<languages>"
+to your cmake call, where <languages> is a space-separated list of language
+codes as explained above.
 
-lrelease *.ts
+NOTE: You'll need lrelease installed with your Qt in order to generate
+      translation files. Some distributions don't package that tool;
+      in that case you won't get translations.
 
-In addition, new languages need to be added to i18n/i18n.qrc, since we are using Qt's
-resource system for loading the translations.
diff --git a/i18n/i18n.qrc b/i18n/i18n.qrc
deleted file mode 100644 (file)
index 23a4915..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/i18n">
-   <file>quassel.qm</file>
-   <file>quassel_fr.qm</file>
-   <file>quassel_da.qm</file>
-<!--   <file>quassel_de.qm</file> -->
-</qresource>
-</RCC>
diff --git a/i18n/quassel.qm b/i18n/quassel.qm
deleted file mode 100644 (file)
index 903d387..0000000
Binary files a/i18n/quassel.qm and /dev/null differ
diff --git a/i18n/quassel_da.qm b/i18n/quassel_da.qm
deleted file mode 100644 (file)
index 8eb74a9..0000000
Binary files a/i18n/quassel_da.qm and /dev/null differ
diff --git a/i18n/quassel_de.qm b/i18n/quassel_de.qm
deleted file mode 100644 (file)
index 8f30dc6..0000000
Binary files a/i18n/quassel_de.qm and /dev/null differ
index cd8b099..72d0e5f 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="de">
+<defaultcodec></defaultcodec>
 <context>
     <name>AboutDlg</name>
     <message>
         <location filename="../src/qtopia/ui/aboutdlg.ui" line="13"/>
         <source>About</source>
-        <translation type="unfinished"></translation>
+        <translation>Ãœber</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/aboutdlg.ui" line="19"/>
@@ -33,22 +34,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
         <source>Quassel IRC is mainly developed by:</source>
-        <translation type="unfinished"></translation>
+        <translation>Quassel IRC wird hauptsächlich entwickelt von:</translation>
     </message>
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="69"/>
         <source>We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wir möchten den folgenden Unterstützern (in alphabetischer Reihenfolge) und allen, die wir hier vergessen haben zu erwähnen, danken:</translation>
     </message>
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="95"/>
         <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for great artwork and the Quassel logo/icon&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the other shiny icons you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more&lt;/dd&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Besonderer Dank geht an:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für großartige Gestaltungsarbeit und das Quassel-Logo/-Symbol&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Das Oxygen-Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für die Erstellungen der meisten anderen schnieken Symbole, die Sie in Quassel sehen&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für die Erstellung von Qt und Qtopia und für die Förderung von Quasseltopia mit Greenphones und mehr&lt;/dd&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/aboutdlg.ui" line="16"/>
         <source>About Quassel</source>
-        <translation type="unfinished"></translation>
+        <translation>Ãœber Quassel</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/aboutdlg.ui" line="61"/>
@@ -56,7 +57,7 @@ p, li { white-space: pre-wrap; }
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:15pt; font-weight:600; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Quassel IRC&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/aboutdlg.ui" line="77"/>
@@ -64,107 +65,98 @@ p, li { white-space: pre-wrap; }
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Version 0.2.0-pre, Build &amp;gt;= 474 (2008-02-08)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/aboutdlg.ui" line="119"/>
         <source>&amp;About</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ãœber</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/aboutdlg.ui" line="147"/>
         <source>A&amp;uthors</source>
-        <translation type="unfinished"></translation>
+        <translation>A&amp;utoren</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/aboutdlg.ui" line="175"/>
         <source>&amp;Contributors</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Unterstützer</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/aboutdlg.ui" line="203"/>
         <source>&amp;Thanks To</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dank an</translation>
     </message>
 </context>
-<context>
-    <name>AccountManagementSettingsPage</name>
-</context>
-<context>
-    <name>AdminUserPage</name>
-</context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="29"/>
         <source>Appearance</source>
-        <translation type="unfinished"></translation>
+        <translation>Erscheinungsbild</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="29"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Allgemein</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
         <source>Client style:</source>
-        <translation type="unfinished"></translation>
+        <translation>Client-Stil:</translation>
     </message>
 </context>
-<context>
-    <name>Buffer</name>
-</context>
 <context>
     <name>BufferItem</name>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="157"/>
         <source>Status Buffer</source>
-        <translation type="unfinished"></translation>
+        <translation>Statuspuffer</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="295"/>
         <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Statuspuffer von %1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="299"/>
         <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Kanal %1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="302"/>
         <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Benutzer:&lt;/b&gt; %1</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="312"/>
         <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Thema:&lt;/b&gt; %1</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="318"/>
         <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Modus:&lt;/b&gt; %1</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="321"/>
         <source>Not active &lt;br /&gt; Double-click to join</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht aktiv &lt;br /&gt; Doppelklicken zum Beitreten</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="325"/>
         <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Dialog mit %1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="326"/>
         <source>Away Message: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Abwesenheitsmeldung: %1</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="329"/>
@@ -177,116 +169,110 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>BufferManagementSettingsPage</name>
-</context>
-<context>
-    <name>BufferTreeModel</name>
-</context>
 <context>
     <name>BufferView</name>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="51"/>
         <source>Show Channel List</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige Kanalliste</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="52"/>
         <source>Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinden</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="53"/>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Trennen</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="484"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="488"/>
         <source>Join Channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanal beitreten</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="56"/>
         <source>Join</source>
-        <translation type="unfinished"></translation>
+        <translation>Beitreten</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="57"/>
         <source>Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Verlassen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="58"/>
         <source>Hide buffers</source>
-        <translation type="unfinished"></translation>
+        <translation>Puffer ausblenden</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="59"/>
         <source>Hide buffers permanently</source>
-        <translation type="unfinished"></translation>
+        <translation>Puffer permanent ausblenden</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="60"/>
         <source>Delete buffer</source>
-        <translation type="unfinished"></translation>
+        <translation>Puffer löschen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="61"/>
         <source>Ignore list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ignorieren-Liste</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="63"/>
         <source>Join Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Beitrittsmeldungen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="64"/>
         <source>Part Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Verlassensmeldungen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="65"/>
         <source>Kill Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kill-Meldungen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="66"/>
         <source>Quit Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Beendigungsmeldungen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="67"/>
         <source>Mode Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Modusmeldungen</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="393"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="395"/>
         <source>Hide Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Meldungen ausblenden</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="484"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="488"/>
         <source>Input channel name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Eingabekanalname:</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="516"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="520"/>
         <source>Remove buffer permanently?</source>
-        <translation type="unfinished"></translation>
+        <translation>Puffer permanent ausblenden?</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="518"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="522"/>
         <source>Do you want to delete the buffer &quot;%1&quot; permanently? This will delete all related data, including all backlog data, from the core&apos;s database!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Möchten Sie den Puffer &quot;%1&quot; permanent löschen? Hierdurch werden alle in Verbindung stehenden Daten - inklusive des gesamten Rückspeichers - aus der Kerndatenbank gelöscht!</translation>
     </message>
 </context>
 <context>
     <name>BufferViewDock</name>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="586"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="590"/>
         <source>All Buffers</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Puffer</translation>
     </message>
 </context>
 <context>
@@ -294,17 +280,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/buffervieweditdlg.ui" line="13"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/buffervieweditdlg.ui" line="21"/>
         <source>Please enter a name for the buffer view:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte geben Sie einen Namen für diese Pufferansicht ein:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="461"/>
         <source>Add Buffer View</source>
-        <translation type="unfinished"></translation>
+        <translation>Pufferansicht hinzufügen</translation>
     </message>
 </context>
 <context>
@@ -312,122 +298,122 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="34"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Allgemein</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="34"/>
         <source>Buffer Views</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pufferansichten</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="294"/>
         <source>Delete Buffer View?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pufferansicht löschen?</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="295"/>
         <source>Do you really want to delete the buffer view &quot;%1&quot;?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wollen Sie die Pufferansicht &quot;%1&quot; wirklich löschen?</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Formular</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="30"/>
         <source>Re&amp;name...</source>
-        <translation type="unfinished"></translation>
+        <translation>Umbe&amp;nennen...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="46"/>
         <source>&amp;Add...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Hinzufügen...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="68"/>
         <source>De&amp;lete</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Löschen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="80"/>
         <source>Buffer View  Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Pufferansichtseinstellungen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="88"/>
         <source>Network:</source>
-        <translation type="unfinished"></translation>
+        <translation>Netzwerk:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="96"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="106"/>
         <source>Restrict Buffers to:</source>
-        <translation type="unfinished"></translation>
+        <translation>Puffer begrenzen auf:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="112"/>
         <source>Status Buffers</source>
-        <translation type="unfinished"></translation>
+        <translation>Statuspuffer</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="119"/>
         <source>Channel Buffers</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanalpuffer</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="126"/>
         <source>Query Buffers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dialogpuffer</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="136"/>
         <source>Hide inactive Buffers</source>
-        <translation type="unfinished"></translation>
+        <translation>Inaktive Puffer verstecken</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="143"/>
         <source>Add new Buffers automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Puffer automatisch hinzufügen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="150"/>
         <source>Sort alphabetically</source>
-        <translation type="unfinished"></translation>
+        <translation>Alphabetisch sortieren</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="157"/>
         <source>Minimum Activity:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktivitätsminimum:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="165"/>
         <source>No Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Aktivität</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="170"/>
         <source>Other Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Andere Aktivitität</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="175"/>
         <source>New Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Meldung</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="180"/>
         <source>Highlight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hervorhebung</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="206"/>
         <source>Preview:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorschau:</translation>
     </message>
 </context>
 <context>
@@ -435,17 +421,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/ui/bufferviewwidget.ui" line="27"/>
         <source>BufferView</source>
-        <translation type="unfinished"></translation>
+        <translation>Pufferansicht</translation>
     </message>
     <message>
         <location filename="../src/qtopia/bufferviewwidget.cpp" line="37"/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <location filename="../src/qtopia/bufferviewwidget.cpp" line="38"/>
         <source>Chans</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanäle</translation>
     </message>
     <message>
         <location filename="../src/qtopia/bufferviewwidget.cpp" line="39"/>
@@ -455,12 +441,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtopia/bufferviewwidget.cpp" line="40"/>
         <source>Nets</source>
-        <translation type="unfinished"></translation>
+        <translation>Netze</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/bufferviewwidget.ui" line="13"/>
         <source>Select Buffer</source>
-        <translation type="unfinished"></translation>
+        <translation>Puffer auswählen</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/bufferviewwidget.ui" line="29"/>
@@ -486,33 +472,30 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/ui/channellistdlg.ui" line="13"/>
         <source>Channel List</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanalliste</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/channellistdlg.ui" line="37"/>
         <source>Search Pattern:</source>
-        <translation type="unfinished"></translation>
+        <translation>Suchmuster:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/channellistdlg.ui" line="47"/>
         <source>Search Channels</source>
-        <translation type="unfinished"></translation>
+        <translation>Suche Kanäle</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/channellistdlg.ui" line="71"/>
         <source>Filter:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
-<context>
-    <name>ChannelWidget</name>
-</context>
 <context>
     <name>Client</name>
     <message>
         <location filename="../src/client/client.cpp" line="287"/>
         <source>Identity already exists in client!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Identität im Client schon vorhanden!</translation>
     </message>
 </context>
 <context>
@@ -520,37 +503,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/client/clientsyncer.cpp" line="55"/>
         <source>The Quassel Core you try to connect to is too old! Please consider upgrading.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Der Quasselkern, zu dem Sie eine Verbindung herzustellen versuchen, ist veraltet! Bitte ziehen Sie eine Aktualisierung in Betracht.</translation>
     </message>
     <message>
         <location filename="../src/client/clientsyncer.cpp" line="80"/>
         <source>&lt;b&gt;Invalid data received from core!&lt;/b&gt;&lt;br&gt;Disconnecting.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Ungültige Daten vom Kern erhalten!&lt;/b&gt;&lt;br&gt;Verbindungsabbruch.</translation>
     </message>
     <message>
         <location filename="../src/client/clientsyncer.cpp" line="112"/>
         <source>Internal connections not yet supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Interne Verbindungen noch nicht unterstützt.</translation>
     </message>
     <message>
         <location filename="../src/client/clientsyncer.cpp" line="130"/>
         <source>&lt;b&gt;This client is built without SSL Support!&lt;/b&gt;&lt;br /&gt;Disable the usage of SSL in the account settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Dieser Client wurde ohne SSL-Unterstützung gebaut!&lt;/b&gt;&lt;br /&gt;Schalten Sie die SSL-Benutzung in den Kontoeinstellungen ab.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="192"/>
+        <location filename="../src/client/clientsyncer.cpp" line="194"/>
         <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least core/client protocol v%1 to connect.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Der Quasselkern, zu dem Sie eine Verbindung herzustellen versuchen, ist veraltet!&lt;/b&gt;&lt;br&gt;Benötige mindestens Kern/Client-Protokoll v%1 zum Verbinden.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="208"/>
+        <location filename="../src/client/clientsyncer.cpp" line="210"/>
         <source>&lt;b&gt;The Quassel Core you are trying to connect to does not support SSL!&lt;/b&gt;&lt;br /&gt;If you want to connect anyways, disable the usage of SSL in the account settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Der Quasselkern, zu dem Sie eine Verbindung herzustellen versuchen, unterstützt kein SSL!&lt;/b&gt;&lt;br /&gt;Wenn Sie dennoch eine Verbindung herstellen wollen, schalten Sie die SSL-Benutzung in den Kontoeinstellungen ab.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="238"/>
+        <location filename="../src/client/clientsyncer.cpp" line="240"/>
         <source>Logging in...</source>
-        <translation type="unfinished"></translation>
+        <translation>Anmelden...</translation>
     </message>
 </context>
 <context>
@@ -558,406 +541,399 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="33"/>
         <source>Appearance</source>
-        <translation type="unfinished"></translation>
+        <translation>Erscheinungsbild</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="33"/>
         <source>Color settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbeinstellungen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="19"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="29"/>
         <source>Bufferview</source>
-        <translation type="unfinished"></translation>
+        <translation>Pufferansicht</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="35"/>
         <source>Activities:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktivitäten:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1489"/>
         <source>FG</source>
-        <translation type="unfinished"></translation>
+        <translation>VG</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1499"/>
         <source>BG</source>
-        <translation type="unfinished"></translation>
+        <translation>HG</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1509"/>
         <source>Use BG</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutze HG</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="71"/>
         <source>Default:</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="120"/>
         <source>Inactive:</source>
-        <translation type="unfinished"></translation>
+        <translation>Inaktiv:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="160"/>
         <source>Highlight:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="197"/>
         <source>New Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Meldung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="234"/>
         <source>Other Activity:</source>
-        <translation type="unfinished"></translation>
+        <translation>Andere Aktivität:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1612"/>
         <source>Preview:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorschau:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1619"/>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="319"/>
         <source>Chatview</source>
-        <translation type="unfinished"></translation>
+        <translation>Chatansicht</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="335"/>
         <source>Server Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Serveraktivität</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="885"/>
         <source>Foreground</source>
-        <translation type="unfinished"></translation>
+        <translation>Vordergrund</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="895"/>
         <source>Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Hintergrund</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="371"/>
         <source>Error Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehlermeldung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="411"/>
         <source>Notice Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Notizmeldung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="451"/>
         <source>Plain Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Einfache Meldung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="491"/>
         <source>Server Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Servermeldung</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="531"/>
         <source>Highlight Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Highlight-Meldung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="562"/>
         <source>User Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzeraktivität</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="598"/>
         <source>Action Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktionsmeldung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="638"/>
         <source>Join Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Beitrittsmeldung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="678"/>
         <source>Kick Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rauswurfsmeldung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="718"/>
         <source>Mode Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Modusmeldung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="758"/>
         <source>Part Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Verlassensmeldung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="798"/>
         <source>Quit Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Beendigungsmeldung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="838"/>
         <source>Rename Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Umbenennungsmeldung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="879"/>
         <source>Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Meldung</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="915"/>
         <source>Timestamp:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeitstempel:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="955"/>
         <source>Sender:</source>
-        <translation type="unfinished"></translation>
+        <translation>Absender:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="995"/>
         <source>Nick:</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitzname:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1035"/>
         <source>Hostmask:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechnermaske:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1075"/>
         <source>Channelname:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanalname:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1115"/>
         <source>Mode flags:</source>
-        <translation type="unfinished"></translation>
+        <translation>Modusschalter:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1155"/>
         <source>Url:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1218"/>
         <source>Mirc Color Codes</source>
-        <translation type="unfinished"></translation>
+        <translation>Mirc-Farbkodierungen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1230"/>
         <source>Color Codes</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbkodierungen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1236"/>
         <source>Color 0:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 0:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1257"/>
         <source>Color 1:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 1:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1278"/>
         <source>Color 2:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 2:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1299"/>
         <source>Color 3:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 3:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1320"/>
         <source>Color 4:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 4:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1341"/>
         <source>Color 5:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 5:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1362"/>
         <source>Color 6:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 6:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1383"/>
         <source>Color 7:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 7:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1404"/>
         <source>Color 8:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 8:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1411"/>
         <source>Color 14:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 14:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1418"/>
         <source>Color 15:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 15:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1425"/>
         <source>Color 13:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 13:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1432"/>
         <source>Color 12:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 12:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1439"/>
         <source>Color 11:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 11:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1446"/>
         <source>Color 10:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 10:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
         <source>Color 9:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe 9:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1477"/>
         <source>Nickview</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamenansicht</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1483"/>
         <source>Nick status:</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamensstatus:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1519"/>
         <source>Online:</source>
-        <translation type="unfinished"></translation>
+        <translation>Angemeldet:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1559"/>
         <source>Away:</source>
-        <translation type="unfinished"></translation>
+        <translation>Abwesend:</translation>
     </message>
 </context>
-<context>
-    <name>ConclusionPage</name>
-</context>
-<context>
-    <name>ConfigWizard</name>
-</context>
-<context>
-    <name>ConnectionSettingsPage</name>
-</context>
 <context>
     <name>Core</name>
     <message>
         <location filename="../src/core/core.cpp" line="57"/>
         <source>Could not initialize any storage backend! Exiting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte keinen Speichermechanismus initialisieren! Beende...</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="60"/>
         <source>Currently, Quassel only supports SQLite3. You need to build your
 Qt library with the sqlite plugin enabled in order for quasselcore
 to work.</source>
-        <translation type="unfinished"></translation>
+        <translation>Quassel unterstützt momentan ausschließlich SQLite3.
+Die Qt-Bibliothek mit eingeschaltetem SQLite-Plugin
+wird benötigt, damit der Quassel-Kern funktioniert.</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="117"/>
         <source>Calling restoreState() even though active sessions exist!</source>
-        <translation type="unfinished"></translation>
+        <translation>restoreState() aufgerufen, obwohl aktive Sitzungen vorhanden sind!</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="145"/>
         <source>Admin user or password not set.</source>
-        <translation type="unfinished"></translation>
+        <translation>Administrativbenutzer oder Passwort nicht gesetzt.</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="148"/>
         <source>Could not setup storage!</source>
-        <translation type="unfinished"></translation>
+        <translation>Speicher konnte nicht eingerichtet werden!</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="152"/>
         <source>Creating admin user...</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstelle Administrativbenutzer...</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="388"/>
         <source>Antique client trying to connect... refusing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Antiquierter Client versucht zu verbinden... lehne ab.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="402"/>
+        <location filename="../src/core/core.cpp" line="404"/>
         <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client/core protocol version %1.&lt;br&gt;Please consider upgrading your client.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Ihr Quasselclient ist zu alt!&lt;/b&gt;&lt;br&gt;Dieser Kern benötigt mindestens Client-/Kern-Protokollversion %1.&lt;br&gt;Bitte ziehen Sie in Erwägung, Ihren Client zu aktualisieren.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="404"/>
+        <location filename="../src/core/core.cpp" line="406"/>
         <source>Client %1 too old, rejecting.</source>
-        <translation type="unfinished"></translation>
+        <translation>Client %1 zu alt, lehne ab.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="419"/>
+        <location filename="../src/core/core.cpp" line="421"/>
         <source>&lt;b&gt;Quassel Core Version %1&lt;/b&gt;&lt;br&gt;Built: %2&lt;br&gt;Up %3d%4h%5m (since %6)</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Quassel-Kern Version %1&lt;/b&gt;&lt;br&gt;Gebaut: %2&lt;br&gt;An %3T%4S%5M (seit %6)</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="482"/>
+        <location filename="../src/core/core.cpp" line="484"/>
         <source>&lt;b&gt;Client not initialized!&lt;/b&gt;&lt;br&gt;You need to send an init message before trying to login.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Client nicht initialisiert!&lt;/b&gt;&lt;br&gt;Sie müssen vor dem Anmeldungsversuch eine init-Meldung senden.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="484"/>
+        <location filename="../src/core/core.cpp" line="486"/>
         <source>Client %1 did not send an init message before trying to login, rejecting.</source>
-        <translation type="unfinished"></translation>
+        <translation>Client %1 hat vor dem Anmeldungsversuch keine init-Meldung gesendet, lehne ab.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="504"/>
+        <location filename="../src/core/core.cpp" line="506"/>
         <source>&lt;b&gt;Invalid username or password!&lt;/b&gt;&lt;br&gt;The username/password combination you supplied could not be found in the database.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Ungültiger Benutzername oder Passwort!&lt;/b&gt;&lt;br&gt;Die angegebene Benutzername/Passwort-Kombination konnte in der Datenbank nicht gefunden werden.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="510"/>
+        <location filename="../src/core/core.cpp" line="512"/>
         <source>Client %1 initialized and authenticated successfully as &quot;%2&quot; (UserId: %3).</source>
-        <translation type="unfinished"></translation>
+        <translation>Client %1 erfolgreich als &quot;%2&quot; (BenutzerId: %3) initialisiert und authentifziert.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="522"/>
+        <location filename="../src/core/core.cpp" line="523"/>
         <source>Non-authed client disconnected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht-authentifizierter Client getrennt.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="545"/>
+        <location filename="../src/core/core.cpp" line="568"/>
         <source>Could not initialize session for client %1!</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte Sitzung für Client %1 nicht initialisieren!</translation>
     </message>
 </context>
 <context>
@@ -965,127 +941,127 @@ to work.</source>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="492"/>
         <source>Add Core Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Kernkonto hinzufügen</translation>
     </message>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="289"/>
         <source>Missing information</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehlende Daten</translation>
     </message>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="290"/>
         <source>Please enter all required information or discard changes to return to account selection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte geben Sie alle benötigten Daten ein oder verwerfen Sie Ihre Ã„nderungen, um zurück zur Kontoauswahl zu gelangen.</translation>
     </message>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="297"/>
         <source>Non-unique account name</source>
-        <translation type="unfinished"></translation>
+        <translation>Uneindeutiger Kontoname</translation>
     </message>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="299"/>
         <source>Account names need to be unique. Please enter a different name or discard all changes to return to account selection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontonamen müssen eindeutig sein. Bitte geben Sie einen anderen Namen ein oder verwerfen Sie alle Ã„nderungen, um zurück zur Kontoauswahl zu gelangen.</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="13"/>
         <source>Edit Core Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Kernkonto Ã¤ndern</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="86"/>
         <source>Port:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="40"/>
         <source>Host:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechner:</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="47"/>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort:</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="63"/>
         <source>Account:</source>
-        <translation type="unfinished"></translation>
+        <translation>Konto:</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="90"/>
         <source>User:</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzer:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="21"/>
         <source>Account Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontodetails</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="29"/>
         <source>Account Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontoname:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="56"/>
         <source>Use built-in Quassel Core</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutze integrierten Quassel-Kern</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="76"/>
         <source>Remote host:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gegenstelle:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="109"/>
         <source>Use secure connection (SSL)</source>
-        <translation type="unfinished"></translation>
+        <translation>Gesicherte Verbindung (SSL) benutzen</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="124"/>
         <source>Use a proxy:</source>
-        <translation type="unfinished"></translation>
+        <translation>Einen Proxy benutzen:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="136"/>
         <source>Proxy Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy-Art:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="144"/>
         <source>Socks 5</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="149"/>
         <source>HTTP</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="157"/>
         <source>Proxy Host:</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy-Rechner:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="164"/>
         <source>Proxy Port:</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy-Port:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="171"/>
         <source>localhost</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="188"/>
         <source>Proxy Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy-Benutzername:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="198"/>
         <source>Proxy Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy-Passwort:</translation>
     </message>
 </context>
 <context>
@@ -1093,22 +1069,22 @@ to work.</source>
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="60"/>
         <source>Core Configuration Wizard</source>
-        <translation type="unfinished"></translation>
+        <translation>Kernkonfigurationshelfer</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="79"/>
         <source>Your core has been successfully configured. Logging you in...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihr Kern wurde erfolgreich konfiguriert. Melde Sie an...</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="90"/>
         <source>Core configuration failed:&lt;br&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;Press &lt;em&gt;Next&lt;/em&gt; to start over.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kernkonfiguration fehlgeschlagen:&lt;br&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;Zum Neustarten &lt;em&gt;Weiter&lt;/em&gt; wählen.</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="107"/>
         <source>Your are now logged into your freshly configured Quassel Core!&lt;br&gt;Please remember to configure your identities and networks now.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie sind jetzt bei Ihrem frisch konfigurierten Quasselkern angemeldet!&lt;br&gt;Bitte denken Sie daran, jetzt Identitäten und Netzwerke zu konfigurieren.</translation>
     </message>
 </context>
 <context>
@@ -1116,27 +1092,27 @@ to work.</source>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="21"/>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzername:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="31"/>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="45"/>
         <source>Repeat password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort wiederholen:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="59"/>
         <source>Remember password</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort merken</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="68"/>
@@ -1154,12 +1130,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardintropage.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardintropage.ui" line="19"/>
         <source>This wizard will guide you through the setup of your Quassel Core.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieser Helfer wird Sie durch die Einrichtung Ihres Quasselkerns führen.</translation>
     </message>
 </context>
 <context>
@@ -1167,12 +1143,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="138"/>
         <source>Create Admin User</source>
-        <translation type="unfinished"></translation>
+        <translation>Administrativbenutzer erstellen</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="139"/>
         <source>First, we will create a user on the core. This first user will have administrator privileges.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuerst werden wir einen Benutzer im Kern anlegen. Der erste Benutzer wird administrative Privilegien besitzen.</translation>
     </message>
 </context>
 <context>
@@ -1180,7 +1156,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="123"/>
         <source>Introduction</source>
-        <translation type="unfinished"></translation>
+        <translation>Einleitung</translation>
     </message>
 </context>
 <context>
@@ -1188,12 +1164,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="167"/>
         <source>Select Storage Backend</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichermechanismus auswählen</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="168"/>
         <source>Please select a database backend for the Quassel Core storage to store the backlog and other data in.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bitte wählen Sie einen Datenbankmechanismus für den Quassel-Kern-Speicher, der zum Speichern von Rückspeicher und anderen Daten verwendet wird.</translation>
     </message>
 </context>
 <context>
@@ -1201,12 +1177,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="197"/>
         <source>Storing Your Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichere Ihre Einstellungen</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="198"/>
         <source>Your settings are now stored in the core, and you will be logged in automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihre Einstellungen sind jetzt im Kern gespeichert und Sie werden automatisch angemeldet.</translation>
     </message>
 </context>
 <context>
@@ -1214,17 +1190,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardstorageselectionpage.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardstorageselectionpage.ui" line="21"/>
         <source>Storage Backend:</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichermechanismus:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardstorageselectionpage.ui" line="56"/>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschreibung</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardstorageselectionpage.ui" line="62"/>
@@ -1237,17 +1213,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="19"/>
         <source>Your Choices</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihre Auswahl</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="35"/>
         <source>Admin User:</source>
-        <translation type="unfinished"></translation>
+        <translation>Administrativbenutzer:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="42"/>
@@ -1257,7 +1233,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="55"/>
         <source>Storage Backend:</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichermechanismus:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="62"/>
@@ -1267,7 +1243,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="102"/>
         <source>Please wait while your settings are being transmitted to the core...</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte warten Sie, bis Ihre Einstellungen zum Kern Ã¼bermittelt wurden...</translation>
     </message>
 </context>
 <context>
@@ -1275,132 +1251,132 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="50"/>
         <source>Connect to Quassel Core</source>
-        <translation type="unfinished"></translation>
+        <translation>Mit Quassel-Kern verbinden</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="88"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="303"/>
         <source>User:</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzer:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="317"/>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="331"/>
         <source>Remember</source>
-        <translation type="unfinished"></translation>
+        <translation>Merken</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="118"/>
         <source>Always use this account</source>
-        <translation type="unfinished"></translation>
+        <translation>Diesen Account immer benutzen</translation>
     </message>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="46"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="87"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="48"/>
         <source>Properties...</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen...</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="21"/>
         <source>Select Core Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Kernkonto auswählen</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="39"/>
         <source>Available Quassel Core accounts:</source>
-        <translation type="unfinished"></translation>
+        <translation>Verfügbare Quassel-Kernkonten:</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="128"/>
         <source>Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinden</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="174"/>
         <source>Remove Account Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontoeinstellungen entfernen</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="176"/>
         <source>Do you really want to remove your local settings for this Quassel Core account?&lt;br&gt;Note: This will &lt;em&gt;not&lt;/em&gt; remove or change any data on the Core itself!</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie wirklich Ihre lokalen Einstellungen für dieses Quassel-Kernkonto löschen?&lt;br&gt;Anmerkung: Dies wird die Daten im Kern selbst &lt;em&gt;nicht&lt;/em&gt; entfernen oder Ã¤ndern!</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="221"/>
         <source>Connect to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Mit %1 verbinden</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="238"/>
         <source>&lt;div style=color:red;&gt;Connection to %1 failed!&lt;/div&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;div style=color:red;&gt;Verbindung zu %1 fehlgeschlagen!&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="262"/>
         <source>Not connected to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht mit %1 verbunden.</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="263"/>
         <source>Looking up %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlage %1 nach...</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="264"/>
         <source>Connecting to %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinde mit %1...</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="265"/>
         <source>Connected to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbunden mit %1</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="266"/>
         <source>Unknown connection state to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannter Verbindungsstatus zu %1</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="318"/>
         <source>Logging in...</source>
-        <translation type="unfinished"></translation>
+        <translation>Anmelden...</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="292"/>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation>Anmeldung</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="65"/>
         <source>Edit...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ändern...</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="76"/>
         <source>Add...</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinzufügen...</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="155"/>
         <source>Initializing your connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Initialisiere Ihre Verbindung</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="179"/>
@@ -1418,52 +1394,52 @@ space</source>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="361"/>
         <source>Configure your Quassel Core</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihren Quassel-Kern konfigurieren</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="367"/>
         <source>The Quassel Core you are connected to is not configured yet. You may now launch a configuration wizard that helps you setting up your Core.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Quassel-Kern, mit dem Sie eine Verbindung herstellen möchten, ist noch unkonfiguriert. Sie können jetzt einen Konfigurationshelfer starten, der Ihnen bei der Konfiguration Ihres Kerns behilflich ist.</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="395"/>
         <source>Launch Wizard</source>
-        <translation type="unfinished"></translation>
+        <translation>Helfer starten</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="469"/>
         <source>Initializing your session...</source>
-        <translation type="unfinished"></translation>
+        <translation>Initialisiere Ihre Sitzung...</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="477"/>
         <source>&lt;b&gt;Please be patient while your client synchronizes with the Quassel Core!&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Bitte haben Sie etwas Geduld während Ihr Client sich mit dem Quassel-Kern synchronisiert!&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="492"/>
         <source>Session state:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sitzungsstatus:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="509"/>
         <source>Network states:</source>
-        <translation type="unfinished"></translation>
+        <translation>Netzwerkstati:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="565"/>
         <source>0/0</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="529"/>
         <source>Channel states:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanalstati:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="549"/>
         <source>User states:</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzerstati:</translation>
     </message>
 </context>
 <context>
@@ -1471,37 +1447,37 @@ space</source>
     <message>
         <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="13"/>
         <source>Connection Progress</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindungsfortschritt</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="19"/>
         <source>Connecting to core...</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinde mit Kern...</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="34"/>
         <source>Session</source>
-        <translation type="unfinished"></translation>
+        <translation>Sitzung</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="98"/>
         <source>%p%</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="54"/>
         <source>Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>Netzwerke</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="71"/>
         <source>Channels</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanäle</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="88"/>
         <source>Users</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzer</translation>
     </message>
 </context>
 <context>
@@ -1509,12 +1485,12 @@ space</source>
     <message>
         <location filename="../src/core/coresession.cpp" line="153"/>
         <source>Default Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardidentität</translation>
     </message>
     <message>
         <location filename="../src/core/coresession.cpp" line="241"/>
         <source>Client %1 disconnected (UserId: %2).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Client %1 hat Verbindung getrennt (BenutzerId: %2).</translation>
     </message>
     <message>
         <location filename="../src/core/coresession.cpp" line="410"/>
@@ -1527,30 +1503,27 @@ space</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>CoreSettingsPage</name>
-</context>
 <context>
     <name>CreateIdentityDlg</name>
     <message>
         <location filename="../src/qtui/settingspages/createidentitydlg.ui" line="16"/>
         <source>Create New Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Identität anlegen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/createidentitydlg.ui" line="24"/>
         <source>Identity name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Identitätsname:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/createidentitydlg.ui" line="36"/>
         <source>Create blank identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Leere Identität erstellen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/createidentitydlg.ui" line="48"/>
         <source>Duplicate:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Duplizieren:</translation>
     </message>
 </context>
 <context>
@@ -1558,27 +1531,27 @@ space</source>
     <message>
         <location filename="../src/core/ctcphandler.cpp" line="166"/>
         <source>Received CTCP PING request from %1</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP PING-Anfrage von %1 erhalten</translation>
     </message>
     <message>
         <location filename="../src/core/ctcphandler.cpp" line="180"/>
         <source>Received CTCP VERSION request by %1</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP VERSION-Anfrage von %1 erhalten</translation>
     </message>
     <message>
         <location filename="../src/core/ctcphandler.cpp" line="191"/>
         <source>Received unknown CTCP %1 by %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannte CTCP-Anfrage %1 von %2 erhalten</translation>
     </message>
     <message>
         <location filename="../src/core/ctcphandler.cpp" line="171"/>
         <source>Received CTCP PING answer from %1 with %2 seconds round trip time</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP PING-Antwort von %1 mit einer Umlaufzeit von %2 Sekunden erhalten</translation>
     </message>
     <message>
         <location filename="../src/core/ctcphandler.cpp" line="183"/>
         <source>Received CTCP VERSION answer from %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP VERSION-Antwort von %1: %2</translation>
     </message>
 </context>
 <context>
@@ -1586,22 +1559,22 @@ space</source>
     <message>
         <location filename="../src/qtui/ui/debugconsole.ui" line="13"/>
         <source>Debug Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehlerkonsole</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/debugconsole.ui" line="52"/>
         <source>local</source>
-        <translation type="unfinished"></translation>
+        <translation>lokal</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/debugconsole.ui" line="62"/>
         <source>core</source>
-        <translation type="unfinished"></translation>
+        <translation>Kern</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/debugconsole.ui" line="90"/>
         <source>Evaluate!</source>
-        <translation type="unfinished"></translation>
+        <translation>Auswerten!</translation>
     </message>
 </context>
 <context>
@@ -1609,32 +1582,32 @@ space</source>
     <message>
         <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="13"/>
         <source>Edit Core Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Kernkonto Ã¤ndern</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="33"/>
         <source>Port:</source>
-        <translation type="unfinished"></translation>
+        <translation>Port:</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="40"/>
         <source>Host:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechner:</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="47"/>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort:</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="63"/>
         <source>Account:</source>
-        <translation type="unfinished"></translation>
+        <translation>Konto:</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="90"/>
         <source>User:</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzer:</translation>
     </message>
 </context>
 <context>
@@ -1642,52 +1615,52 @@ space</source>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.cpp" line="29"/>
         <source>Appearance</source>
-        <translation type="unfinished"></translation>
+        <translation>Erscheinungsbild</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.cpp" line="29"/>
         <source>Fonts</source>
-        <translation type="unfinished"></translation>
+        <translation>Schriftarten</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="24"/>
         <source>Custom Application Fonts</source>
-        <translation type="unfinished"></translation>
+        <translation>Angepasste Anwendungsschriften</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="303"/>
         <source>General:</source>
-        <translation type="unfinished"></translation>
+        <translation>Allgemein:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="392"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Schrift</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="408"/>
         <source>Choose...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="82"/>
         <source>Topic:</source>
-        <translation type="unfinished"></translation>
+        <translation>Thema:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="133"/>
         <source>Buffer Views:</source>
-        <translation type="unfinished"></translation>
+        <translation>Pufferansichten:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="187"/>
         <source>Nick List:</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzerliste:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="295"/>
@@ -1697,133 +1670,130 @@ space</source>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="415"/>
         <source>Nicks:</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamen:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="425"/>
         <source>Timestamp:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeitstempel:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="445"/>
         <source>Some of these settings require a restart of the Quassel Client in order to take effect. We intend to fix this.</source>
-        <translation type="unfinished"></translation>
+        <translation>Einige dieser Einstellungen erforden einen Neustart des Quassel-Clients um wirksam zu werden. Wir beabsichtigen, dies zu beheben.</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="238"/>
         <source>Inputline:</source>
-        <translation type="unfinished"></translation>
+        <translation>Eingabezeile:</translation>
     </message>
 </context>
-<context>
-    <name>Form</name>
-</context>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation type="unfinished"></translation>
+        <translation>Verhalten</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Allgemein</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="19"/>
         <source>Use system tray icon:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zu Systemleistensymbol minimieren:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="28"/>
         <source>Minimize to tray on minimize button</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">bei &quot;Minimieren&quot;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="35"/>
         <source>Minimize to tray on close button</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">bei &quot;Schließen&quot;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="45"/>
         <source>Tray icon:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Systemleistensymbol:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="51"/>
         <source>Show system tray icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zeigt Systemleistensymbol</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="64"/>
         <source>User Notification:</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzerbenachrichtigung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="70"/>
         <source>Animate tray icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Systemleistensymbol animieren</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="80"/>
         <source>Display pop-up messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pop-Up-Meldungen anzeigen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="93"/>
         <source>Display user related messages and private Notices:</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzerbezogene Meldungen und private Notizen anzeigen:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="102"/>
         <source>in status buffer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">im Statuspuffer</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="115"/>
         <source>in query buffer (if exists)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">im Dialogpuffer (falls vorhanden)</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="125"/>
         <source>in current buffer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">im aktuellen Puffer</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="135"/>
         <source>Buffer view:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pufferansicht:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="141"/>
         <source>Display topic in tooltip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Thema in Hinweisfläche anzeigen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="148"/>
         <source>Mouse wheel changes displayed buffers</source>
-        <translation type="unfinished"></translation>
+        <translation>Mausrad Ã¤ndert angezeigten Puffer</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="161"/>
         <source>The suffix appended to a nick on completion via TAB. Default is &quot;: &quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Das einem Spitznamen durch Tabulatorvervollständigung angehängte Suffix. Standard ist &quot;: &quot;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="164"/>
         <source>Input Line:</source>
-        <translation type="unfinished"></translation>
+        <translation>Eingabezeile:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="172"/>
         <source>Completion suffix:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vervollständigungssuffix:</translation>
     </message>
 </context>
 <context>
@@ -1831,291 +1801,285 @@ space</source>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
         <source>Behaviour</source>
-        <translation type="unfinished"></translation>
+        <translation>Verhalten</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="32"/>
         <source>Highlight</source>
-        <translation type="unfinished"></translation>
+        <translation>Hervorhebung</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="157"/>
         <source>this shouldn&apos;t be empty</source>
-        <translation type="unfinished"></translation>
+        <translation>dies sollte nicht leer sein</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.h" line="45"/>
         <source>highlight rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Highlight-Regel</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="19"/>
         <source>Highlight list</source>
-        <translation type="unfinished"></translation>
+        <translation>Hervorhebungsliste</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="37"/>
         <source>RegEx</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="42"/>
         <source>CS</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="47"/>
         <source>Enable</source>
-        <translation type="unfinished"></translation>
+        <translation>Einschalten</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="55"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinzufügen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="62"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="85"/>
         <source>Highlight nicks</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamen hervorheben</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="91"/>
         <source>All nicks from identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Spitznamen der Identität</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="98"/>
         <source>Current nick</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktueller Spitzname</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="108"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kein(e)</translation>
     </message>
 </context>
-<context>
-    <name>IdentitiesDlg</name>
-</context>
-<context>
-    <name>IdentitiesEditDlg</name>
-</context>
 <context>
     <name>IdentitiesSettingsPage</name>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="56"/>
         <source>Add...</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinzufügen...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="268"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="110"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Allgemein</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="118"/>
         <source>Real Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Realname:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="134"/>
         <source>Nicknames</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="173"/>
         <source>&amp;Add...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Hinzufügen...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="219"/>
         <source>Re&amp;name...</source>
-        <translation type="unfinished"></translation>
+        <translation>Umbe&amp;nennen...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="251"/>
         <source>Move upwards in list</source>
-        <translation type="unfinished"></translation>
+        <translation>In Liste nach oben verschieben</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="265"/>
         <source>Move downwards in list</source>
-        <translation type="unfinished"></translation>
+        <translation>In Liste nach unten verschieben</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="321"/>
         <source>A&amp;way</source>
-        <translation type="unfinished"></translation>
+        <translation>Ab&amp;wesend</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="452"/>
         <source>Away Reason</source>
-        <translation type="unfinished"></translation>
+        <translation>Abwesenheitsgrund</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="445"/>
         <source>Return Message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zurück-Meldung</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="370"/>
         <source>Away Nick</source>
-        <translation type="unfinished"></translation>
+        <translation>Abwesenheitsspitzname</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="379"/>
         <source>Auto Away</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-Abwesenheit</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="405"/>
         <source>Auto away after</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-abwesend nach</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="415"/>
         <source>minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>Minuten</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="492"/>
         <source>Advanced</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweitert</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="500"/>
         <source>Ident:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="516"/>
         <source>Messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Meldungen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="530"/>
         <source>Part Reason:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Verlassensgrund:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="543"/>
         <source>Quit Reason:</source>
-        <translation type="unfinished"></translation>
+        <translation>Beendigungsgrund:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="553"/>
         <source>Kick Reason:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rauswurfsgrund:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="29"/>
         <source>Identities</source>
-        <translation type="unfinished"></translation>
+        <translation>Identitäten</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="173"/>
         <source>&lt;b&gt;The following problems need to be corrected before your changes can be applied:&lt;/b&gt;&lt;ul&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Die folgenden Probleme müssen behoben werden, bevor Ihre Ã„nderungen angewendet werden können:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="174"/>
         <source>&lt;li&gt;All identities need an identity name set&lt;/li&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;li&gt;Alle Identitäten benötigen einen Identitätsnamen&lt;/li&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="175"/>
         <source>&lt;li&gt;Every identity needs at least one nickname defined&lt;/li&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;li&gt;Bei jeder Identität muss mindestens ein Spitzname angegeben werden&lt;/li&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="176"/>
         <source>&lt;li&gt;You need to specify a real name for every identity&lt;/li&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;li&gt;Sie müssen einen Realnamen für jede Identität angeben&lt;/li&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="177"/>
         <source>&lt;li&gt;You need to specify an ident for every identity&lt;/li&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;li&gt;Sie müssen einen Ident für jede Identität angeben&lt;/li&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="178"/>
         <source>&lt;/ul&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="179"/>
         <source>One or more identities are invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>Eine oder mehrere Identitäten sind ungültig</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="342"/>
         <source>Delete Identity?</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität löschen?</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="343"/>
         <source>Do you really want to delete identity &quot;%1&quot;?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wollen Sie wirklich Identität &quot;%1&quot; löschen?</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="216"/>
         <source>Rename Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität umbenennen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="355"/>
         <source>Please enter a new name for the identity &quot;%1&quot;!</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte geben Sie einen neuen Namen für die Identität &quot;%1&quot; an!</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="53"/>
         <source>Add Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität hinzufügen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="76"/>
         <source>Remove Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität entfernen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="125"/>
         <source>The &quot;Real Name&quot; is shown in /whois.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der &quot;Realname&quot; wird im /whois angezeigt.</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="170"/>
         <source>Add Nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamen hinzufügen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="196"/>
         <source>Remove Nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamen entfernen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="199"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Etnfernen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="507"/>
         <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der &quot;Ident&quot; bildet zusammen mit Ihrer Rechneradresse die Rechnermaske und identifiziert sie so eindeutig im IRC-Netzwerk.</translation>
     </message>
 </context>
 <context>
@@ -2123,42 +2087,42 @@ space</source>
     <message>
         <location filename="../src/common/identity.cpp" line="62"/>
         <source>&lt;empty&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;leer&gt;</translation>
     </message>
     <message>
         <location filename="../src/common/identity.cpp" line="63"/>
         <source>Quassel IRC User</source>
-        <translation type="unfinished"></translation>
+        <translation>Quassel-IRC-Benutzer</translation>
     </message>
     <message>
         <location filename="../src/common/identity.cpp" line="69"/>
         <source>Gone fishing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mit&apos;m Fahrrad Sahne holen.</translation>
     </message>
     <message>
         <location filename="../src/common/identity.cpp" line="71"/>
         <source>Brought fish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sahne geholt.</translation>
     </message>
     <message>
         <location filename="../src/common/identity.cpp" line="75"/>
         <source>Not here. No, really. not here!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht da. Nein, ehrlich. Nicht da!</translation>
     </message>
     <message>
         <location filename="../src/common/identity.cpp" line="77"/>
         <source>Back in action again!</source>
-        <translation type="unfinished"></translation>
+        <translation>Wieder im Rennen!</translation>
     </message>
     <message>
         <location filename="../src/common/identity.cpp" line="80"/>
         <source>Kindergarten is elsewhere!</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Kindergarten ist woanders!</translation>
     </message>
     <message>
         <location filename="../src/common/identity.cpp" line="82"/>
         <source>http://quassel-irc.org - Chat comfortably. Anywhere.</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -2166,28 +2130,25 @@ space</source>
     <message>
         <location filename="../src/qtui/ui/inputwidget.ui" line="19"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
 </context>
-<context>
-    <name>IntroPage</name>
-</context>
 <context>
     <name>IrcListModel</name>
     <message>
         <location filename="../src/client/irclistmodel.cpp" line="60"/>
         <source>Channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanal</translation>
     </message>
     <message>
         <location filename="../src/client/irclistmodel.cpp" line="61"/>
         <source>Users</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzer</translation>
     </message>
     <message>
         <location filename="../src/client/irclistmodel.cpp" line="61"/>
         <source>Topic</source>
-        <translation type="unfinished"></translation>
+        <translation>Thema</translation>
     </message>
 </context>
 <context>
@@ -2195,160 +2156,165 @@ space</source>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="411"/>
         <source>%1 has changed topic for %2 to: &quot;%3&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 hat das Thema für %2 geändert zu: &quot;%3&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="777"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="784"/>
         <source>No topic is set for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Für %1 ist kein Thema gesetzt.</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="789"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="796"/>
         <source>Topic for %1 is &quot;%2&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Thema für %1 ist &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="800"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="807"/>
         <source>Topic set by %1 on %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Thema in %2 gesetzt von %1</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="480"/>
         <source>%1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="515"/>
         <source>[Whois] %1 is away: &quot;%2&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>[Whois] %1 ist abwesend: &quot;%2&quot;</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="526"/>
         <source>%1 is away: &quot;%2&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ist abwesend: &quot;%2&quot;</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="723"/>
         <source>[Whois] %1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="597"/>
         <source>[Whois] %1 is %2 (%3)</source>
-        <translation type="unfinished"></translation>
+        <translation>[Whois] %1 ist %2 (%3)</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="612"/>
         <source>%1 is online via %2 (%3)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ist angemeldet Ã¼ber %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="864"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="871"/>
         <source>[Whowas] %1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="642"/>
         <source>[Whowas] %1 was %2 (%3)</source>
-        <translation type="unfinished"></translation>
+        <translation>[Whowas] %1 war %2 (%3)</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="656"/>
         <source>[Who] End of /WHO list for %1</source>
-        <translation type="unfinished"></translation>
+        <translation>[Who] Ende der /WHO Liste für %1</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="676"/>
         <source>[Whois] %1 is logged in since %2</source>
-        <translation type="unfinished"></translation>
+        <translation>[Whois] %1 ist seit %2 angemeldet</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="678"/>
         <source>[Whois] %1 is idling for %2 (%3)</source>
-        <translation type="unfinished"></translation>
+        <translation>[Whois] %1 ist seit %2 (%3) inaktiv</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="681"/>
         <source>[Whois] idle message: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>[Whois] Inaktivmeldung: %1</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="713"/>
         <source>[Whois] %1 is a user on channels: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>[Whois] %1 ist Benutzer in den Kanälen: %2</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="715"/>
         <source>[Whois] %1 has voice on channels: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>[Whois] %1 hat Voice in den Kanälen: %2</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="717"/>
         <source>[Whois] %1 is an operator on channels: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>[Whois] %1 ist Operator in den Kanälen: %2</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="745"/>
         <source>Channel %1 has %2 users. Topic is: %3</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanal %1 hat %2 Benutzer. Thema ist: %3</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="754"/>
         <source>End of channel list</source>
-        <translation type="unfinished"></translation>
+        <translation>Ende der Kanalliste</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="823"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="830"/>
         <source>[Who] %1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="877"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="884"/>
         <source>There is a nickname in your identity&apos;s nicklist which contains illegal characters</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein Spitzname der Spitznamensliste Ihrer Identität enthält ungültige Zeichen</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="878"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="885"/>
         <source>Due to a bug in Unreal IRCd (and maybe other irc-servers too) we&apos;re unable to determine the erroneous nick</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf Grund eines Fehlers im Unreal IRCs (und evtl. auch anderen IRC-Servern) können wir den fehlerhaften Spitznamen nicht ermitteln</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="879"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="886"/>
         <source>Please use: /nick &lt;othernick&gt; to continue or clean up your nicklist</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte benutzen Sie: /nick &lt;andererSpitzname&gt; zum Fortfahren oder säubern Sie Ihre Spitznamensliste</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="882"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="889"/>
         <source>Nick %1 contains illegal characters</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitzname %1 enthält ungültige Zeichen</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="894"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="901"/>
         <source>Nick already in use: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitzname bereits in Benutzung: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="917"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="924"/>
         <source>No free and valid nicks in nicklist found. use: /nick &lt;othernick&gt; to continue</source>
+        <translation>Keine freien und gültigen Spitznamen in Spitznamensliste gefunden. Benutze: /nick &lt;andererSpitzname&gt; zum Fortfahren</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="773"/>
+        <source>[Whois] %1 %3 %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IrcUserItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="606"/>
+        <location filename="../src/client/networkmodel.cpp" line="608"/>
         <source>idling since %1</source>
-        <translation type="unfinished"></translation>
+        <translation>nichtstuend seit %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="609"/>
+        <location filename="../src/client/networkmodel.cpp" line="611"/>
         <source>login time: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Anmeldezeitpunkt: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="612"/>
+        <location filename="../src/client/networkmodel.cpp" line="614"/>
         <source>server: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Server: %1</translation>
     </message>
 </context>
 <context>
@@ -2356,7 +2322,7 @@ space</source>
     <message>
         <location filename="../src/qtopia/ui/mainwidget.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/mainwidget.ui" line="56"/>
@@ -2379,17 +2345,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="88"/>
         <source>Waiting for core...</source>
-        <translation type="unfinished"></translation>
+        <translation>Warte auf Kern...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="485"/>
+        <location filename="../src/qtui/mainwin.cpp" line="468"/>
         <source>Not connected to core.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht mit Kern verbunden.</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/mainwin.ui" line="13"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
+        <translation>Hauptfenster</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/mainwin.ui" line="54"/>
@@ -2422,174 +2388,189 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Core</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="107"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="116"/>
         <source>&amp;Network List...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Netzwerkliste...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="110"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="119"/>
         <source>F2</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="118"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="127"/>
         <source>Quick &amp;Connect...</source>
-        <translation type="unfinished"></translation>
+        <translation>S&amp;chnell verbinden...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="229"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="238"/>
         <source>Disconnect</source>
-        <translation type="unfinished">Trennen</translation>
+        <translation>Trennen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="134"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="143"/>
         <source>Reconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiederverbinden</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="142"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="151"/>
         <source>Join Channel...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanal beitreteten...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="153"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="162"/>
         <source>Set Away globally</source>
-        <translation type="unfinished"></translation>
+        <translation>Global abwesend setzen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="165"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="174"/>
         <source>Quit...</source>
-        <translation type="unfinished"></translation>
+        <translation>Beenden...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="173"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="182"/>
         <source>Edit Identities...</source>
-        <translation type="unfinished"></translation>
+        <translation>Identitäten Ã¤ndern...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="182"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="191"/>
         <source>Configure Quassel...</source>
-        <translation type="unfinished"></translation>
+        <translation>Quassel konfigurieren...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="185"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="194"/>
         <source>F7</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="197"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="206"/>
         <source>Manage Views...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ansichten verwalten...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="202"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="211"/>
         <source>About Qt...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ãœber Qt...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="214"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="223"/>
         <source>About Quassel IRC...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ãœber Quassel IRC...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="219"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="228"/>
         <source>Import Backlog</source>
-        <translation type="unfinished"></translation>
+        <translation>Rückspeicher importieren</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="224"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="233"/>
         <source>Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinden</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="234"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="243"/>
         <source>Internal</source>
-        <translation type="unfinished"></translation>
+        <translation>Intern</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="246"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="255"/>
         <source>Disconnect from Core</source>
-        <translation type="unfinished"></translation>
+        <translation>Von Kern trennen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="258"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="267"/>
         <source>Connect to Core...</source>
-        <translation type="unfinished"></translation>
+        <translation>Mit Kern verbinden...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="426"/>
+        <location filename="../src/qtui/mainwin.cpp" line="416"/>
         <source>Connected to core.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mit Kern verbunden.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="169"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="303"/>
         <source>Edit &amp;Networks...</source>
-        <translation type="unfinished"></translation>
+        <translation>N&amp;etzwerke Ã¤ndern...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="264"/>
+        <location filename="../src/qtui/mainwin.cpp" line="255"/>
         <source>Nicks</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="283"/>
+        <location filename="../src/qtui/mainwin.cpp" line="274"/>
         <source>Chat Monitor</source>
-        <translation type="unfinished"></translation>
+        <translation>Chatmonitor</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="305"/>
+        <location filename="../src/qtui/mainwin.cpp" line="296"/>
         <source>Inputline</source>
-        <translation type="unfinished"></translation>
+        <translation>Eingabezeile</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="322"/>
+        <location filename="../src/qtui/mainwin.cpp" line="313"/>
         <source>Topic</source>
-        <translation type="unfinished"></translation>
+        <translation>Thema</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="343"/>
+        <location filename="../src/qtui/mainwin.cpp" line="334"/>
         <source>Statusbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Statusleiste</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/mainwin.ui" line="50"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Datei</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/mainwin.ui" line="54"/>
         <source>&amp;Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Netzwerke</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="69"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="70"/>
         <source>&amp;Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein&amp;stellungen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="75"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="76"/>
         <source>&amp;Views</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ansichten</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="82"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="91"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="263"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="272"/>
         <source>Debug &amp;Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler&amp;konsole</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="268"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="277"/>
         <source>Disconnect from Network...</source>
-        <translation type="unfinished"></translation>
+        <translation>Von Netzwerk trennen...</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/mainwin.ui" line="276"/>
         <source>&amp;Edit Networks...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">N&amp;etzwerke Ã¤ndern...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="80"/>
+        <source>Buffer Views</source>
+        <translation>Pufferansichten</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="286"/>
+        <source>Manage Buffer Views</source>
+        <translation>Pufferansichten verwalten</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="294"/>
+        <source>Lock Dock Positions</source>
+        <translation>Andockerpositionen sperren</translation>
     </message>
 </context>
 <context>
@@ -2597,127 +2578,127 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/message.cpp" line="105"/>
         <source>%DT[%1]</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="110"/>
         <source>%DS&lt;%1&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="110"/>
         <source>%D0%1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="114"/>
         <source>%Ds*</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="114"/>
         <source>%Ds%1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="116"/>
         <source>%De*</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="151"/>
         <source>%De%1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="118"/>
         <source>%Dj--&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="120"/>
         <source>%Dp&lt;--</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="124"/>
         <source>%Dq&lt;--</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="124"/>
         <source>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit</source>
-        <translation type="unfinished"></translation>
+        <translation>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH beendet</translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="128"/>
         <source>%Dk&lt;-*</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="137"/>
         <source>%Dr&lt;-&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="138"/>
         <source>%DrYou are now known as %DN%1%DN</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%DrSie sind jetzt als %DN%1%DN bekannt</translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="142"/>
         <source>%Dm***</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="143"/>
         <source>%DmUser mode: %DM%1%DM</source>
-        <translation type="unfinished"></translation>
+        <translation>%DmBenutzermodus: %DM%1%DM</translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="147"/>
         <source>%Da-*-</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="152"/>
         <source>%De[%1]</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="112"/>
         <source>%Dn[%1]</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="112"/>
         <source>%Dn%1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="118"/>
         <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
-        <translation type="unfinished"></translation>
+        <translation>%Dj%DN%1%DN %DH(%2@%3)%DH ist %DC%4%DC beigetreten</translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="120"/>
         <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
-        <translation type="unfinished"></translation>
+        <translation>%Dp%DN%1%DN %DH(%2@%3)%DH hat %DC%4%DC verlassen</translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="132"/>
         <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
-        <translation type="unfinished"></translation>
+        <translation>%Dk%DN%1%DN hat %DN%2%DN aus %DC%3%DC geworfen</translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="139"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
-        <translation type="unfinished"></translation>
+        <translation>%Dr%DN%1%DN ist jetzt als %DN%2%DN bekannt</translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="144"/>
         <source>%DmMode %DM%1%DM by %DN%2%DN</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%DmModus %DM%1%DM von %DN%2%DN</translation>
     </message>
     <message>
         <location filename="../src/common/message.cpp" line="148"/>
@@ -2730,27 +2711,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/core/networkconnection.cpp" line="190"/>
         <source>Connection failed. Cycling to next Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung fehlgeschlagen. Wechsle zum nächsten Server</translation>
     </message>
     <message>
         <location filename="../src/core/networkconnection.cpp" line="200"/>
         <source>Connecting to %1:%2...</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinde mint %1:%2...</translation>
     </message>
     <message>
         <location filename="../src/core/networkconnection.cpp" line="253"/>
         <source>Disconnecting.</source>
-        <translation type="unfinished"></translation>
+        <translation>Trenne Verbindung.</translation>
     </message>
     <message>
         <location filename="../src/core/networkconnection.cpp" line="276"/>
         <source>Could not connect to %1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte nicht mit %1 (%2) verbinden</translation>
     </message>
     <message>
         <location filename="../src/core/networkconnection.cpp" line="278"/>
         <source>Connection failure: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindungsfehler: %1</translation>
     </message>
 </context>
 <context>
@@ -2758,35 +2739,35 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/networkeditdlg.ui" line="13"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkeditdlg.ui" line="21"/>
         <source>Please enter a network name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte geben Sie einen Netzwerknamen ein:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="636"/>
         <source>Add Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Netzwerk hinzufügen</translation>
     </message>
 </context>
 <context>
     <name>NetworkModel</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="637"/>
+        <location filename="../src/client/networkmodel.cpp" line="639"/>
         <source>Buffer</source>
-        <translation type="unfinished"></translation>
+        <translation>Puffer</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="637"/>
+        <location filename="../src/client/networkmodel.cpp" line="639"/>
         <source>Topic</source>
-        <translation type="unfinished"></translation>
+        <translation>Thema</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="637"/>
+        <location filename="../src/client/networkmodel.cpp" line="639"/>
         <source>Nick Count</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamenzähler</translation>
     </message>
 </context>
 <context>
@@ -2794,205 +2775,208 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="33"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Allgemein</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="33"/>
         <source>Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>Netzwerke</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="144"/>
         <source>&lt;b&gt;The following problems need to be corrected before your changes can be applied:&lt;/b&gt;&lt;ul&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Die folgenden Probleme müssen behoben werden, bevor Ihre Ã„nderungen angewendet werden können:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="145"/>
         <source>&lt;li&gt;All networks need at least one server defined&lt;/li&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;li&gt;Jedes Netzwerk benötigt die Angabe mindestens eines Servers&lt;/li&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="146"/>
         <source>&lt;/ul&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="147"/>
         <source>Invalid Network Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültige Netzwerkeinstellungen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="184"/>
         <source>Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinde</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="187"/>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Trenne Verbindung</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="191"/>
         <source>Apply first!</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuerst anwenden!</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="533"/>
         <source>Delete Network?</source>
-        <translation type="unfinished"></translation>
+        <translation>Netzwerk löschen?</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="534"/>
         <source>Do you really want to delete the network &quot;%1&quot; and all related settings, including the backlog?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wollen Sie das Netzwerk &quot;%1&quot; und alle damit verbundenen Einstellungen inklusive des Rückspeichers wirklich löschen?</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="37"/>
         <source>Re&amp;name...</source>
-        <translation type="unfinished"></translation>
+        <translation>Umbe&amp;nennen...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="225"/>
         <source>&amp;Add...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hinzufügen...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="242"/>
         <source>De&amp;lete</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Löschen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="110"/>
         <source>Connect now</source>
-        <translation type="unfinished"></translation>
+        <translation>Jetzt verbinden</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="130"/>
         <source>Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Netzwerkdetails</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="138"/>
         <source>Identity:</source>
-        <translation type="unfinished"></translation>
+        <translation>Indentität:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="178"/>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Server</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="181"/>
         <source>Manage servers for this network</source>
-        <translation type="unfinished"></translation>
+        <translation>Server für dieses Netzwerk verwalten</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="207"/>
         <source>&amp;Edit...</source>
-        <translation type="unfinished"></translation>
+        <translation>Änd&amp;ern...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="268"/>
         <source>Move upwards in list</source>
-        <translation type="unfinished"></translation>
+        <translation>In Liste nach oben verschieben</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="285"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="282"/>
         <source>Move downwards in list</source>
-        <translation type="unfinished"></translation>
+        <translation>In Liste nach unten verschieben</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="331"/>
         <source>Choose random server for connecting</source>
-        <translation type="unfinished"></translation>
+        <translation>Zur Verbindung zufälligen Server wählen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="347"/>
         <source>Perform</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausführen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="350"/>
         <source>Configure automatic identification or misc. commands to be executed after connecting to a server</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatische Identifikation oder verschiedene Befehle zur Ausführung nach Herstellen der Serververbindung konfigurieren</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="356"/>
         <source>Commands to execute on connect:</source>
-        <translation type="unfinished"></translation>
+        <translation>Beim Verbinden auszuführende Befehle:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="366"/>
         <source>Specify a list of IRC commands to be executed upon connect.
 Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie eine Liste von IRC-Befehlen an, die beim Verbinden ausgeführt werden.
+Berücksichtigen Sie, dass Quassel IRC Kanälen automatisch erneut beitritt. /join wird hier daher selten benötigt!</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="380"/>
         <source>Auto Identify</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-Identifizieren</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="395"/>
         <source>NickServ</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="412"/>
         <source>Service:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="422"/>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="441"/>
         <source>Advanced</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweitert</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="444"/>
         <source>Configure advanced settings such as message encodings and automatic reconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterte Einstellungen wie Meldungskodierung und automatisches Wiederverbinden konfigurieren</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="453"/>
         <source>Control encodings for in- and outgoing messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Kodierung für ein- und abgehende Meldungen kontrollieren</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="456"/>
         <source>Encodings</source>
-        <translation type="unfinished"></translation>
+        <translation>Kodierungen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="484"/>
         <source>Specify which encoding your messages will be sent in.
 UTF-8 should be a sane choice for most networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie an, mit welcher Kodierung Ihre Meldungen gesendet werden sollen.
+UTF-8 sollte für die meisten Netzwerke eine sinnvolle Wahl sein.</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="468"/>
         <source>Send messages in:</source>
-        <translation type="unfinished"></translation>
+        <translation>Meldungen senden in:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="515"/>
         <source>Incoming messages encoded in Utf8 will always be treated as such.
 This setting defines the encoding for messages that are not Utf8.</source>
-        <translation type="unfinished"></translation>
+        <translation>In UTF-8 kodierte eingehende Meldungen werden immer als solche behandelt.
+Diese Einstellung bestimmt die Kodierung für Meldungen, die nicht UTF-8-kodiert sind.</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="499"/>
@@ -3003,57 +2987,58 @@ This setting defines the encoding for messages that are not Utf8.</source>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="540"/>
         <source>This specifies how control messages, nicks and servernames are encoded.
 Unless you *really* know what you do, leave this as ISO-8859-1!</source>
-        <translation type="unfinished"></translation>
+        <translation>Dies gibt an, wie Kontrolmeldungen, Spitznamen und Servernamen kodiert sind.
+Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was Sie tun!</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="530"/>
         <source>Server encoding:</source>
-        <translation type="unfinished"></translation>
+        <translation>Serverkodierung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="553"/>
         <source>Use default settings for encodings (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardeinstellungen für Kodierungen verwenden (empfohlen)</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="556"/>
         <source>Use defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Standards benutzen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="572"/>
         <source>Control automatic reconnect to the network</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisches Wiederverbinden zum Netzwerk kontrollieren</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="575"/>
         <source>Automatic Reconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisches Wiederverbinden</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="586"/>
         <source>Interval:</source>
-        <translation type="unfinished"></translation>
+        <translation>Intervall:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="593"/>
         <source> s</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="609"/>
         <source>Retries:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiederversuche:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="629"/>
         <source>Unlimited</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbegrenzt</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="641"/>
         <source>Rejoin all channels on reconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Allen Kanälen beim Wiederverbinden erneut beitreten</translation>
     </message>
 </context>
 <context>
@@ -3061,22 +3046,22 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="501"/>
         <source>Add Nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamen hinzufügen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/nickeditdlg.ui" line="13"/>
         <source>Edit Nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamen Ã¤ndern</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/nickeditdlg.ui" line="19"/>
         <source>Please enter a valid nickname:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte geben Sie einen gültigen Spitznamen ein:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/nickeditdlg.ui" line="32"/>
         <source>A valid nickname may contain letters from the English alphabet, digits, and the special characters {, }, [, ], \, |, `, ^, _ and -.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein gültiger Spitzname darf die Zeichen des englischen Alphabets, Ziffern und die Sonderzeichen {, }, [, ], \, |, `, ^, _ sowie - enthalten.</translation>
     </message>
 </context>
 <context>
@@ -3084,93 +3069,90 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtopia/ui/nicklistwidget.ui" line="13"/>
         <source>Nicks in Channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamen im Kanal</translation>
     </message>
 </context>
-<context>
-    <name>NickModel</name>
-</context>
 <context>
     <name>NickView</name>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="114"/>
         <source>WHOIS</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="115"/>
         <source>VERSION</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="116"/>
         <source>PING</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="120"/>
         <source>Modes</source>
-        <translation type="unfinished"></translation>
+        <translation>Modi</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="121"/>
         <source>Op %1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="122"/>
         <source>Deop %1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="123"/>
         <source>Voice %1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="124"/>
         <source>Devoice %1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="126"/>
         <source>Kick/Ban</source>
-        <translation type="unfinished"></translation>
+        <translation>Rauswerfen/Verbannen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="127"/>
         <source>Kick %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 rauswerfen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="128"/>
         <source>Ban %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 verbannen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="129"/>
         <source>Kickban %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 rauswerfen und verbannen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="130"/>
         <source>Ignore</source>
-        <translation type="unfinished"></translation>
+        <translation>Ignorieren</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="135"/>
         <source>Query</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dialog</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="136"/>
         <source>DCC-Chat</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="138"/>
         <source>Send file</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei senden</translation>
     </message>
 </context>
 <context>
@@ -3178,37 +3160,37 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtopia/qtopiamainwin.cpp" line="74"/>
         <source>Show Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Werkzeugleiste zeigen</translation>
     </message>
     <message>
         <location filename="../src/qtopia/qtopiamainwin.cpp" line="106"/>
         <source>Quit Quassel IRC?</source>
-        <translation type="unfinished"></translation>
+        <translation>Quassel IRC beenden?</translation>
     </message>
     <message>
         <location filename="../src/qtopia/qtopiamainwin.cpp" line="106"/>
         <source>Do you really want to quit Quassel IRC?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wollen Sie Quassel IRC wirklich beenden?</translation>
     </message>
     <message>
         <location filename="../src/qtopia/qtopiamainwin.cpp" line="108"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>Beenden</translation>
     </message>
     <message>
         <location filename="../src/qtopia/qtopiamainwin.cpp" line="119"/>
         <source>Show Buffers</source>
-        <translation type="unfinished"></translation>
+        <translation>Puffer zeigen</translation>
     </message>
     <message>
         <location filename="../src/qtopia/qtopiamainwin.cpp" line="120"/>
         <source>Show Nicks</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamen zeigen</translation>
     </message>
     <message>
         <location filename="../src/qtopia/qtopiamainwin.cpp" line="129"/>
         <source>About...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ãœber...</translation>
     </message>
 </context>
 <context>
@@ -3216,48 +3198,45 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/common/util.cpp" line="165"/>
         <source>year</source>
-        <translation type="unfinished"></translation>
+        <translation>Jahr</translation>
     </message>
     <message>
         <location filename="../src/common/util.cpp" line="166"/>
         <source>day</source>
-        <translation type="unfinished"></translation>
+        <translation>Tag</translation>
     </message>
     <message>
         <location filename="../src/common/util.cpp" line="167"/>
         <source>h</source>
-        <translation type="unfinished"></translation>
+        <translation>S</translation>
     </message>
     <message>
         <location filename="../src/common/util.cpp" line="168"/>
         <source>min</source>
-        <translation type="unfinished"></translation>
+        <translation>Min</translation>
     </message>
     <message>
         <location filename="../src/common/util.cpp" line="169"/>
         <source>sec</source>
-        <translation type="unfinished"></translation>
+        <translation>Sek</translation>
     </message>
 </context>
-<context>
-    <name>RenameIdentityDlg</name>
-</context>
 <context>
     <name>SaveIdentitiesDlg</name>
     <message>
         <location filename="../src/qtui/settingspages/saveidentitiesdlg.ui" line="13"/>
         <source>Sync With Core</source>
-        <translation type="unfinished"></translation>
+        <translation>Mit Kern synchronisieren</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/saveidentitiesdlg.ui" line="21"/>
         <source>Syncing data with core, please wait...</source>
-        <translation type="unfinished"></translation>
+        <translation>Synchronisiere Daten mit Kern, bitte warten...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/saveidentitiesdlg.ui" line="81"/>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -3265,38 +3244,35 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingspages/servereditdlg.ui" line="21"/>
         <source>Server address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Serveradresse:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/servereditdlg.ui" line="28"/>
         <source>Port:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/servereditdlg.ui" line="13"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/servereditdlg.ui" line="55"/>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/servereditdlg.ui" line="77"/>
         <source>Use SSL</source>
-        <translation type="unfinished"></translation>
+        <translation>SSL benutzen</translation>
     </message>
 </context>
-<context>
-    <name>ServerListDlg</name>
-</context>
 <context>
     <name>SessionThread</name>
     <message>
         <location filename="../src/core/sessionthread.cpp" line="73"/>
         <source>Could not initialize session!</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte Sitzung nicht initialisieren!</translation>
     </message>
 </context>
 <context>
@@ -3304,42 +3280,42 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/ui/settingsdlg.ui" line="49"/>
         <source>Settings</source>
-        <translation type="unfinished">Einstellungen</translation>
+        <translation>Einstellungen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingsdlg.cpp" line="71"/>
         <source>Save changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen speichern</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingsdlg.cpp" line="72"/>
         <source>There are unsaved changes on the current configuration page. Would you like to apply your changes now?</source>
-        <translation type="unfinished"></translation>
+        <translation>Es gibt nicht gespeicherte Ã„nderungen auf der aktuellen Konfigurationsseite. Möchten Sie diese Ã„nderungen jetzt anwenden?</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingsdlg.cpp" line="147"/>
         <source>Reload Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen neu laden</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingsdlg.cpp" line="147"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie die Einstellungen neu laden, die Ã„nderungen auf dieser Seite zurücknehmen?</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
         <source>Restore Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Standards wiederherstellen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
         <source>Do you like to restore the default values for this page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie die Standardwerte für diese Seite wiederherstellen?</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/settingsdlg.ui" line="13"/>
         <source>Configure Quassel</source>
-        <translation type="unfinished"></translation>
+        <translation>Quassel konfigurieren</translation>
     </message>
 </context>
 <context>
@@ -3347,32 +3323,32 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
         <source>Reload Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen neu laden</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie die Einstellungen neu laden, die Ã„nderungen auf dieser Seite zurücknehmen?</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
         <source>Restore Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Standards wiederherstellen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
         <source>Do you like to restore the default values for this page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie die Standardwerte für diese Seite wiederherstellen?</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/settingspagedlg.ui" line="13"/>
         <source>Configure Quassel</source>
-        <translation type="unfinished"></translation>
+        <translation>Quassel konfigurieren</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/settingspagedlg.ui" line="29"/>
         <source>Settings</source>
-        <translation type="unfinished">Einstellungen</translation>
+        <translation>Einstellungen</translation>
     </message>
 </context>
 <context>
@@ -3380,21 +3356,15 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/core/sqlitestorage.cpp" line="49"/>
         <source>SQLite is a file-based database engine that does not require any setup. It is suitable for small and medium-sized databases that do not require access via network. Use SQLite if your Quassel Core should store its data on the same machine it is running on, and if you only expect a few users to use your core.</source>
-        <translation type="unfinished"></translation>
+        <translation>SQLite ist ein dateibasiertes Datenbanksystem, das keiner Einrichtung bedarf. Es ist für kleine bis mittelgroße Datenbanken, die keinen Netzwerkzugriff benötigen, geeignet. Verwenden Sie SQListe, wenn der Quassel-Kern seine Daten auf dem selben Rechner, auf dem er auch läuft, speichern soll und Sie nur mit ein paar Benutzern auf Ihrem Kern rechnen.</translation>
     </message>
 </context>
-<context>
-    <name>StorageDetailsPage</name>
-</context>
-<context>
-    <name>StorageSelectionPage</name>
-</context>
 <context>
     <name>TopicLabel</name>
     <message>
         <location filename="../src/qtui/topiclabel.cpp" line="43"/>
         <source>Drag to scroll the topic!</source>
-        <translation type="unfinished"></translation>
+        <translation>Ziehen um das Thema zu verschieben!</translation>
     </message>
 </context>
 <context>
@@ -3402,7 +3372,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/ui/topicwidget.ui" line="31"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
 </context>
 <context>
@@ -3415,127 +3385,127 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="278"/>
         <source>%DS&lt;%1&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="278"/>
         <source>%D0%1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="280"/>
         <source>%Dn[%1]</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="280"/>
         <source>%Dn%1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="282"/>
         <source>%Ds*</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="282"/>
         <source>%Ds%1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="284"/>
         <source>%De*</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="319"/>
         <source>%De%1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="286"/>
         <source>%Dj--&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="286"/>
         <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
-        <translation type="unfinished"></translation>
+        <translation>%Dj%DN%1%DN %DH(%2@%3)%DH ist %DC%4%DC beigetreten</translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="288"/>
         <source>%Dp&lt;--</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="288"/>
         <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
-        <translation type="unfinished"></translation>
+        <translation>%Dp%DN%1%DN %DH(%2@%3)%DH hat %DC%4%DC verlassen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="292"/>
         <source>%Dq&lt;--</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="292"/>
         <source>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit</source>
-        <translation type="unfinished"></translation>
+        <translation>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH wurde beendet</translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="296"/>
         <source>%Dk&lt;-*</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="300"/>
         <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
-        <translation type="unfinished"></translation>
+        <translation>%Dk%DN%1%DN hat %DN%2%DN aus %DC%3%DC geworfen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="305"/>
         <source>%Dr&lt;-&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="306"/>
         <source>%DrYou are now known as %DN%1%DN</source>
-        <translation type="unfinished"></translation>
+        <translation>%DrSie sind jetzt als %DN%1%DN bekannt</translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="307"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
-        <translation type="unfinished"></translation>
+        <translation>%Dr%DN%1%DN ist jetzt als %DN%2%DN bekannt</translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="310"/>
         <source>%Dm***</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="311"/>
         <source>%DmUser mode: %DM%1%DM</source>
-        <translation type="unfinished"></translation>
+        <translation>%DmBenutzermodus: %DM%1%DM</translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="312"/>
         <source>%DmMode %DM%1%DM by %DN%2%DN</source>
-        <translation type="unfinished"></translation>
+        <translation>%DmModus %DM%1%DM durch %DN%2%DN</translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="315"/>
         <source>%Da-*-</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="316"/>
         <source>%Da%DN%1%DN %2</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="320"/>
         <source>%De[%1]</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -3543,15 +3513,15 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message numerus="yes">
         <location filename="../src/client/networkmodel.cpp" line="489"/>
         <source>%n Owner(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n Besitzer</numerusform>
+            <numerusform>%n Besitzer</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location filename="../src/client/networkmodel.cpp" line="490"/>
         <source>%n Admin(s)</source>
-        <translation type="unfinished">
+        <translation>
             <numerusform></numerusform>
             <numerusform></numerusform>
         </translation>
@@ -3559,15 +3529,15 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message numerus="yes">
         <location filename="../src/client/networkmodel.cpp" line="491"/>
         <source>%n Operator(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n Operator</numerusform>
+            <numerusform>%n Operator</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location filename="../src/client/networkmodel.cpp" line="492"/>
         <source>%n Half-Op(s)</source>
-        <translation type="unfinished">
+        <translation>
             <numerusform></numerusform>
             <numerusform></numerusform>
         </translation>
@@ -3575,7 +3545,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message numerus="yes">
         <location filename="../src/client/networkmodel.cpp" line="493"/>
         <source>%n Voiced</source>
-        <translation type="unfinished">
+        <translation>
             <numerusform></numerusform>
             <numerusform></numerusform>
         </translation>
@@ -3583,18 +3553,18 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message numerus="yes">
         <location filename="../src/client/networkmodel.cpp" line="494"/>
         <source>%n User(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n Benutzer</numerusform>
+            <numerusform>%n Benutzer</numerusform>
         </translation>
     </message>
 </context>
 <context>
     <name>UserInputHandler</name>
     <message>
-        <location filename="../src/core/userinputhandler.cpp" line="113"/>
+        <location filename="../src/core/userinputhandler.cpp" line="114"/>
         <source>sending CTCP-%1 request</source>
-        <translation type="unfinished"></translation>
+        <translation>sende CTCP-%1-Anfrage</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/quassel_fr.qm b/i18n/quassel_fr.qm
deleted file mode 100644 (file)
index 515e52f..0000000
Binary files a/i18n/quassel_fr.qm and /dev/null differ
index d1a7b61..4b30652 100644 (file)
@@ -51,7 +51,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="47"/>
         <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; on &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC is dual-licensed under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; and &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Most icons are &amp;copy; by the &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; and used under the &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Please use &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; to report bugs.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Un Client IRC distribué et moderne&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 par le Projet Quassel&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; sur &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC est sous double licence &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; et &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;La majorité des icones proviennent &amp;copy; de l&apos;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Equipe Oxygen&lt;/a&gt; et sont utilisés sous la &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Merci d&apos;utiliser &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; pour transmettre les bogues.</translation>
     </message>
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
@@ -61,51 +61,51 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="69"/>
         <source>We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nous voulons aussi remercier les contributeurs suivants (par ordre alphabétique) et toute personne que nous avons oublié de mentionner ici:</translation>
     </message>
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="95"/>
         <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for great artwork and the Quassel logo/icon&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the other shiny icons you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more&lt;/dd&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Remerciements particuliers Ã :&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;pour le beau travail artistique et le logo Quassel &lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;L&apos;Equipe Oxygen&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;pour avoir créé la majorité des belles icones que vous voyez dans Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;pour avoir créé Qt et Qtopia, et pour le soutien du developpement de Quasseltopia avec Greenphones entre autres&lt;/dd&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="16"/>
+        <location filename="../src/qtui/ui_aboutdlg.h" line="195"/>
         <source>About Quassel</source>
         <translation>À propos de Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="61"/>
+        <location filename="../src/qtui/ui_aboutdlg.h" line="200"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:15pt; font-weight:600; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Quassel IRC&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:15pt; font-weight:600; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Quassel IRC&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="77"/>
+        <location filename="../src/qtui/ui_aboutdlg.h" line="204"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Version 0.2.0-pre, Build &amp;gt;= 474 (2008-02-08)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Version 0.2.0-pre, Build &amp;gt;= 474 (2008-02-08)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="119"/>
+        <location filename="../src/qtui/ui_aboutdlg.h" line="205"/>
         <source>&amp;About</source>
         <translation>&amp;À Propos</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="147"/>
+        <location filename="../src/qtui/ui_aboutdlg.h" line="206"/>
         <source>A&amp;uthors</source>
         <translation>A&amp;uteurs</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="175"/>
+        <location filename="../src/qtui/ui_aboutdlg.h" line="207"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Contributeurs</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="203"/>
+        <location filename="../src/qtui/ui_aboutdlg.h" line="208"/>
         <source>&amp;Thanks To</source>
         <translation>&amp;Remerciements</translation>
     </message>
@@ -197,14 +197,14 @@ p, li { white-space: pre-wrap; }
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="13"/>
+        <location filename="../src/qtui/ui_appearancesettingspage.h" line="65"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
+        <location filename="../src/qtui/ui_appearancesettingspage.h" line="66"/>
         <source>Client style:</source>
-        <translation type="unfinished"></translation>
+        <translation>Style du Client:</translation>
     </message>
 </context>
 <context>
@@ -212,57 +212,57 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/client/networkmodel.cpp" line="157"/>
         <source>Status Buffer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Etat du Buffer</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="295"/>
         <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Etat du buffer %1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="299"/>
         <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Canal %1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="302"/>
         <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Utilisateurs:&lt;/b&gt; %1</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="312"/>
         <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Sujet:&lt;/b&gt; %1</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="318"/>
         <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Mode:&lt;/b&gt; %1</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="321"/>
         <source>Not active &lt;br /&gt; Double-click to join</source>
-        <translation type="unfinished"></translation>
+        <translation>Inactif &lt;br /&gt; Double-cliquez pour rejoindre</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="325"/>
         <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Demande Ã  %1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="326"/>
         <source>Away Message: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Message d&apos;absence: %1</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="329"/>
         <source>%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - %2</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="333"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -363,7 +363,7 @@ Lines:     1234
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="51"/>
         <source>Show Channel List</source>
-        <translation type="unfinished"></translation>
+        <translation>Voir la liste des canaux</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="52"/>
@@ -376,110 +376,110 @@ Lines:     1234
         <translation>Déconnecter</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="484"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="488"/>
         <source>Join Channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Rejoindre le Canal</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="56"/>
         <source>Join</source>
-        <translation type="unfinished"></translation>
+        <translation>Rejoindre</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="57"/>
         <source>Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Partir</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="58"/>
         <source>Hide buffers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cacher les buffers</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="59"/>
         <source>Hide buffers permanently</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cacher les buffers en permanence</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="60"/>
         <source>Delete buffer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer le Buffer</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="61"/>
         <source>Ignore list</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste d&apos;ignorés</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="63"/>
         <source>Join Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Avis d&apos;entrée</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="64"/>
         <source>Part Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Avis de départ</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="65"/>
         <source>Kill Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Avis de Kill</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="66"/>
         <source>Quit Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Avis de Sortie</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="67"/>
         <source>Mode Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Avis de Mode</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="393"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="395"/>
         <source>Hide Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Cacher les Avis</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="484"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="488"/>
         <source>Input channel name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrez le nom du canal:</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="516"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="520"/>
         <source>Remove buffer permanently?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer le buffer définitivement ?</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="518"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="522"/>
         <source>Do you want to delete the buffer &quot;%1&quot; permanently? This will delete all related data, including all backlog data, from the core&apos;s database!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Voules vous supprimer le buffer &quot;%1&quot; de manière permanente ? Cela supprimera toutes les données correspondantes, y compris celles sauvées dans l&apos;historique contenu dans la base de données du noyau !</translation>
     </message>
 </context>
 <context>
     <name>BufferViewDock</name>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="586"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="590"/>
         <source>All Buffers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tous Buffers</translation>
     </message>
 </context>
 <context>
     <name>BufferViewEditDlg</name>
     <message>
-        <location filename="../src/qtui/settingspages/buffervieweditdlg.ui" line="13"/>
+        <location filename="../src/qtui/ui_buffervieweditdlg.h" line="79"/>
         <source>Dialog</source>
         <translation>Fenêtre</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/buffervieweditdlg.ui" line="21"/>
+        <location filename="../src/qtui/ui_buffervieweditdlg.h" line="80"/>
         <source>Please enter a name for the buffer view:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Merci de saisir un nom pour la vue buffer:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="461"/>
         <source>Add Buffer View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter une vue buffer</translation>
     </message>
 </context>
 <context>
@@ -492,125 +492,125 @@ Lines:     1234
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="34"/>
         <source>Buffer Views</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vues buffer</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="294"/>
         <source>Delete Buffer View?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer la vue buffer ?</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="295"/>
         <source>Do you really want to delete the buffer view &quot;%1&quot;?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Voulez vous réellement supprimer la vue buffer &quot;%1&quot; ?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="13"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="204"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="30"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="205"/>
         <source>Re&amp;name...</source>
         <translation>&amp;Renommer...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="46"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="206"/>
         <source>&amp;Add...</source>
         <translation>&amp;Ajouter...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="68"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="207"/>
         <source>De&amp;lete</source>
         <translation>&amp;Supprimer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="80"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="208"/>
         <source>Buffer View  Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Paramètres de la vue buffer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="88"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="209"/>
         <source>Network:</source>
         <translation>Réseau:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="96"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="212"/>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="106"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="213"/>
         <source>Restrict Buffers to:</source>
         <translation>Limiters les Buffers Ã :</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="112"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="214"/>
         <source>Status Buffers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Buffers d&apos;états</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="119"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="215"/>
         <source>Channel Buffers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Buffers de canaux</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="126"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="216"/>
         <source>Query Buffers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Buffers de requêtes</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="136"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="217"/>
         <source>Hide inactive Buffers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cacher les buffers inactifs</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="143"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="218"/>
         <source>Add new Buffers automatically</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter un nouveau buffer automatiquement</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="150"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="219"/>
         <source>Sort alphabetically</source>
-        <translation type="unfinished"></translation>
+        <translation>Trier alphabétiquement</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="157"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="220"/>
         <source>Minimum Activity:</source>
-        <translation type="unfinished"></translation>
+        <translation>Activité minimum:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="165"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="223"/>
         <source>No Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Pas d&apos;activité</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="170"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="224"/>
         <source>Other Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Autre activité</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="175"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="225"/>
         <source>New Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Nouveau message</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="180"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="226"/>
         <source>Highlight</source>
-        <translation type="unfinished">Surlignage</translation>
+        <translation>Surlignage</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="206"/>
+        <location filename="../src/qtui/ui_bufferviewsettingspage.h" line="227"/>
         <source>Preview:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aperçu:</translation>
     </message>
 </context>
 <context>
     <name>BufferViewWidget</name>
     <message>
-        <location filename="../src/qtui/ui/bufferviewwidget.ui" line="27"/>
+        <location filename="../src/qtui/ui_bufferviewwidget.h" line="58"/>
         <source>BufferView</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vue Buffer</translation>
     </message>
     <message>
         <location filename="../src/qtopia/bufferviewwidget.cpp" line="37"/>
@@ -630,12 +630,12 @@ Lines:     1234
     <message>
         <location filename="../src/qtopia/bufferviewwidget.cpp" line="40"/>
         <source>Nets</source>
-        <translation type="unfinished"></translation>
+        <translation>Réseaux</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/bufferviewwidget.ui" line="13"/>
         <source>Select Buffer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Selectionner le Buffer</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/bufferviewwidget.ui" line="29"/>
@@ -660,37 +660,37 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;Quassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chatter simplement. Partout.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/bufferwidget.ui" line="75"/>
+        <location filename="../src/qtui/ui_bufferwidget.h" line="104"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/quassel/96x96/apps/quassel.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/quassel/96x96/apps/quassel.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chatter facilement. Partout.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
 <context>
     <name>ChannelListDlg</name>
     <message>
-        <location filename="../src/qtui/ui/channellistdlg.ui" line="13"/>
+        <location filename="../src/qtui/ui_channellistdlg.h" line="113"/>
         <source>Channel List</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste des canaux</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/channellistdlg.ui" line="37"/>
+        <location filename="../src/qtui/ui_channellistdlg.h" line="114"/>
         <source>Search Pattern:</source>
-        <translation type="unfinished"></translation>
+        <translation>Chaine Ã  rechercher:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/channellistdlg.ui" line="47"/>
+        <location filename="../src/qtui/ui_channellistdlg.h" line="115"/>
         <source>Search Channels</source>
-        <translation type="unfinished"></translation>
+        <translation>Recherche des Canaux</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/channellistdlg.ui" line="71"/>
+        <location filename="../src/qtui/ui_channellistdlg.h" line="116"/>
         <source>Filter:</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtre:</translation>
     </message>
 </context>
 <context>
@@ -774,7 +774,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/client/client.cpp" line="287"/>
         <source>Identity already exists in client!</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;Identité existe déjà dans le client!</translation>
     </message>
 </context>
 <context>
@@ -782,37 +782,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/client/clientsyncer.cpp" line="55"/>
         <source>The Quassel Core you try to connect to is too old! Please consider upgrading.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le Noyau Quassel auquel vous vous connectez est trop vieux ! Pensez Ã  le mettre Ã  jour.</translation>
     </message>
     <message>
         <location filename="../src/client/clientsyncer.cpp" line="80"/>
         <source>&lt;b&gt;Invalid data received from core!&lt;/b&gt;&lt;br&gt;Disconnecting.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Données invalides reçues du noyau !&lt;/b&gt;&lt;br&gt;Déconnexion.</translation>
     </message>
     <message>
         <location filename="../src/client/clientsyncer.cpp" line="112"/>
         <source>Internal connections not yet supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Les connections internes ne sont pas encore supportées.</translation>
     </message>
     <message>
         <location filename="../src/client/clientsyncer.cpp" line="130"/>
         <source>&lt;b&gt;This client is built without SSL Support!&lt;/b&gt;&lt;br /&gt;Disable the usage of SSL in the account settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Ce client n&apos;a pas compilé avec le support SSL !&lt;/b&gt;&lt;br /&gt;Suppression de l&apos;utilisation de SSL dans les paramètres de compte.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="192"/>
+        <location filename="../src/client/clientsyncer.cpp" line="194"/>
         <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least core/client protocol v%1 to connect.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Le Noyau auquel vous essayez de vous connecter est trop vieux !&lt;/b&gt;&lt;br&gt;Vous devez au minimum avoir le protocole noyau/client n°%1 pour vous connecter.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="208"/>
+        <location filename="../src/client/clientsyncer.cpp" line="210"/>
         <source>&lt;b&gt;The Quassel Core you are trying to connect to does not support SSL!&lt;/b&gt;&lt;br /&gt;If you want to connect anyways, disable the usage of SSL in the account settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Le Noyau Quassel auquel vous essayez de vous conneter ne supporte pas le SSL!&lt;/b&gt;&lt;br /&gt;Si vous voulez vous connect malgré tout, désactivez l&apos;usage du SSL dans vos paramètres de compte.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="238"/>
+        <location filename="../src/client/clientsyncer.cpp" line="240"/>
         <source>Logging in...</source>
-        <translation type="unfinished"></translation>
+        <translation>Authentification...</translation>
     </message>
 </context>
 <context>
@@ -820,312 +820,312 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="33"/>
         <source>Appearance</source>
-        <translation type="unfinished">Apparence</translation>
+        <translation>Apparence</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="33"/>
         <source>Color settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Options de Couleur</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="19"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1272"/>
         <source>Form</source>
-        <translation type="unfinished">Formulaire</translation>
+        <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="29"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1299"/>
         <source>Bufferview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vue Buffer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="35"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1273"/>
         <source>Activities:</source>
-        <translation type="unfinished"></translation>
+        <translation>Activitées:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1489"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1423"/>
         <source>FG</source>
-        <translation type="unfinished"></translation>
+        <translation>Avant</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1499"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1424"/>
         <source>BG</source>
-        <translation type="unfinished"></translation>
+        <translation>Fd</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1509"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1425"/>
         <source>Use BG</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser le Fond</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="71"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1277"/>
         <source>Default:</source>
-        <translation type="unfinished"></translation>
+        <translation>Défaut:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="120"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1281"/>
         <source>Inactive:</source>
-        <translation type="unfinished"></translation>
+        <translation>Inactif:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="160"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1285"/>
         <source>Highlight:</source>
-        <translation type="unfinished"></translation>
+        <translation>Surlignage:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="197"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1289"/>
         <source>New Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nouveau message:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="234"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1293"/>
         <source>Other Activity:</source>
-        <translation type="unfinished"></translation>
+        <translation>Autre activité:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1612"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1434"/>
         <source>Preview:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aperçu:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1619"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1435"/>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="319"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1387"/>
         <source>Chatview</source>
-        <translation type="unfinished"></translation>
+        <translation>Moniteur de Chat</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="335"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1321"/>
         <source>Server Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Activité du serveur</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="885"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1354"/>
         <source>Foreground</source>
-        <translation type="unfinished"></translation>
+        <translation>Devant</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="895"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1355"/>
         <source>Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Fond</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="371"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1303"/>
         <source>Error Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Message d&apos;erreur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="411"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1307"/>
         <source>Notice Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Message d&apos;information:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="451"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1311"/>
         <source>Plain Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Message normal:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="491"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1315"/>
         <source>Server Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Message du serveur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="531"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1319"/>
         <source>Highlight Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Message surligné:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="562"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1353"/>
         <source>User Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Activité utilisateur</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="598"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1325"/>
         <source>Action Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Message d&apos;action:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="638"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1329"/>
         <source>Join Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Message d&apos;entrée:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="678"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1333"/>
         <source>Kick Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Message de kick:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="718"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1337"/>
         <source>Mode Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Message de mode:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="758"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1341"/>
         <source>Part Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Message de sortie:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="798"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1345"/>
         <source>Quit Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Message de départ:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="838"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1349"/>
         <source>Rename Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Message de changement de pseudo:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="879"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1385"/>
         <source>Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Message</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="915"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1357"/>
         <source>Timestamp:</source>
-        <translation type="unfinished">Format d&apos;heure:</translation>
+        <translation>Format d&apos;heure:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="955"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1361"/>
         <source>Sender:</source>
-        <translation type="unfinished"></translation>
+        <translation>Emetteur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="995"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1365"/>
         <source>Nick:</source>
-        <translation type="unfinished"></translation>
+        <translation>Pseudo:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1035"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1369"/>
         <source>Hostmask:</source>
-        <translation type="unfinished"></translation>
+        <translation>Masque de l&apos;hôte:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1075"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1373"/>
         <source>Channelname:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom du Canal:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1115"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1377"/>
         <source>Mode flags:</source>
-        <translation type="unfinished"></translation>
+        <translation>Drapeaux de Mode:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1155"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1381"/>
         <source>Url:</source>
-        <translation type="unfinished"></translation>
+        <translation>Url:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1218"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1421"/>
         <source>Mirc Color Codes</source>
-        <translation type="unfinished"></translation>
+        <translation>Codes Couleur Mirc</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1230"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1388"/>
         <source>Color Codes</source>
-        <translation type="unfinished"></translation>
+        <translation>Codes de Couleur</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1236"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1389"/>
         <source>Color 0:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 0:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1257"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1392"/>
         <source>Color 1:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 1:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1278"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1395"/>
         <source>Color 2:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 2:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1299"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1398"/>
         <source>Color 3:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 3:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1320"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1401"/>
         <source>Color 4:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 4:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1341"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1404"/>
         <source>Color 5:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 5:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1362"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1407"/>
         <source>Color 6:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 6:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1383"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1410"/>
         <source>Color 7:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 7:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1404"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1413"/>
         <source>Color 8:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 8:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1411"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1414"/>
         <source>Color 14:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 14:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1418"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1415"/>
         <source>Color 15:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 15:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1425"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1416"/>
         <source>Color 13:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 13:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1432"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1417"/>
         <source>Color 12:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 12:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1439"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1418"/>
         <source>Color 11:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 11:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1446"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1419"/>
         <source>Color 10:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 10:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1420"/>
         <source>Color 9:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couleur 9:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1477"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1436"/>
         <source>Nickview</source>
-        <translation type="unfinished"></translation>
+        <translation>Vue des pseudos</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1483"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1422"/>
         <source>Nick status:</source>
-        <translation type="unfinished"></translation>
+        <translation>Etat des pseudos:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1519"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1426"/>
         <source>Online:</source>
-        <translation type="unfinished"></translation>
+        <translation>En ligne:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1559"/>
+        <location filename="../src/qtui/ui_colorsettingspage.h" line="1430"/>
         <source>Away:</source>
-        <translation type="unfinished"></translation>
+        <translation>Absent:</translation>
     </message>
 </context>
 <context>
@@ -1172,84 +1172,86 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/core/core.cpp" line="57"/>
         <source>Could not initialize any storage backend! Exiting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de créer aucune base de stockage ! Fin de l&apos;opération...</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="117"/>
         <source>Calling restoreState() even though active sessions exist!</source>
-        <translation type="unfinished"></translation>
+        <translation>Appel de restoreState() alors que des sessions actives existent !</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="145"/>
         <source>Admin user or password not set.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;idnetifiant et le mot de passe administrateur ne sont pas saisis.</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="148"/>
         <source>Could not setup storage!</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de paramétrer la base de données !</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="152"/>
         <source>Creating admin user...</source>
-        <translation type="unfinished"></translation>
+        <translation>Création de l&apos;utilisateur administrateur...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="388"/>
+        <location filename="../src/core/core.cpp" line="399"/>
         <source>Antique client trying to connect... refusing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Un antique client essaye de se connecter... refusé.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="402"/>
+        <location filename="../src/core/core.cpp" line="415"/>
         <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client/core protocol version %1.&lt;br&gt;Please consider upgrading your client.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Le Noyau auquel vous essayez de vous connecter est trop vieux !&lt;/b&gt;&lt;br&gt;Vous devez au minimum avoir la version %1 du protocole noyau/client.&lt;br&gt; Veuillez mettre Ã  jour votre client.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="404"/>
+        <location filename="../src/core/core.cpp" line="417"/>
         <source>Client %1 too old, rejecting.</source>
-        <translation type="unfinished"></translation>
+        <translation>Client %1 trop vieux, rejeté.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="419"/>
+        <location filename="../src/core/core.cpp" line="432"/>
         <source>&lt;b&gt;Quassel Core Version %1&lt;/b&gt;&lt;br&gt;Built: %2&lt;br&gt;Up %3d%4h%5m (since %6)</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Quassel Noyau Version %1&lt;/b&gt;&lt;br&gt;Compilée le: %2&lt;br&gt;Fonctionne depuis %3d%4h%5m (soit le %6)</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="482"/>
+        <location filename="../src/core/core.cpp" line="495"/>
         <source>&lt;b&gt;Client not initialized!&lt;/b&gt;&lt;br&gt;You need to send an init message before trying to login.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Client non créé !&lt;/b&gt;&lt;br&gt;Vous devez envoyer un message de création avant d&apos;essayer de vous connecter.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="484"/>
+        <location filename="../src/core/core.cpp" line="497"/>
         <source>Client %1 did not send an init message before trying to login, rejecting.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le client %1 n&apos;a pas envoyé de message de création avant d&apos;essayer de se connecter, rejet de la demande.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="504"/>
+        <location filename="../src/core/core.cpp" line="517"/>
         <source>&lt;b&gt;Invalid username or password!&lt;/b&gt;&lt;br&gt;The username/password combination you supplied could not be found in the database.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;identifiant ou mot de passe invalide !&lt;/b&gt;&lt;br&gt;La combinaison identifiant/mot de passe que vous avez fournie ne peut Ãªtre trouvée dans la base de données.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="510"/>
+        <location filename="../src/core/core.cpp" line="523"/>
         <source>Client %1 initialized and authenticated successfully as &quot;%2&quot; (UserId: %3).</source>
-        <translation type="unfinished"></translation>
+        <translation>Client %1 crée et identifié avec succès comme &quot;%2&quot; (IdUtilisateur: %3).</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="522"/>
+        <location filename="../src/core/core.cpp" line="534"/>
         <source>Non-authed client disconnected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Client non-identifié déconnecté.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="545"/>
+        <location filename="../src/core/core.cpp" line="579"/>
         <source>Could not initialize session for client %1!</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de lancer la session pour le client %1 !</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="60"/>
         <source>Currently, Quassel only supports SQLite3. You need to build your
 Qt library with the sqlite plugin enabled in order for quasselcore
 to work.</source>
-        <translation type="unfinished"></translation>
+        <translation>Actuellement, Quassel supporte uniquement SQLite3. Vous devez
+construire votre librairie Qt avec le plugin sqlite activé pour que le 
+noyau quassel fonctionne.</translation>
     </message>
 </context>
 <context>
@@ -1280,12 +1282,12 @@ to work.</source>
         <translation>Les noms de compte doivent Ãªtre uniques. Merci de saisir un nom différent ou de supprimer les changements pour revenir au choix du compte.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="13"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="242"/>
         <source>Edit Core Account</source>
         <translation>Modifier le compte noyau</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="86"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="249"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
@@ -1310,72 +1312,72 @@ to work.</source>
         <translation>Utilisateur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="21"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="243"/>
         <source>Account Details</source>
         <translation>Détails du Compte</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="29"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="244"/>
         <source>Account Name:</source>
         <translation>Nom du Compte:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="56"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="246"/>
         <source>Use built-in Quassel Core</source>
         <translation>Utiliser le noyau intégré de Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="76"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="248"/>
         <source>Remote host:</source>
         <translation>Hôte distant:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="109"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="250"/>
         <source>Use secure connection (SSL)</source>
         <translation>Utiliser une connection sécurisée (SSL)</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="124"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="251"/>
         <source>Use a proxy:</source>
         <translation>Utiliser un proxy:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="136"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="252"/>
         <source>Proxy Type:</source>
         <translation>Type de Proxy:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="144"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="255"/>
         <source>Socks 5</source>
         <translation>Socks 5</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="149"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="256"/>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="157"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="257"/>
         <source>Proxy Host:</source>
         <translation>Hôte du proxy:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="164"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="258"/>
         <source>Proxy Port:</source>
         <translation>Port du Proxy:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="171"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="259"/>
         <source>localhost</source>
         <translation>localhost</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="188"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="260"/>
         <source>Proxy Username:</source>
         <translation>Nom d&apos;Utiilisateur du proxy:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="198"/>
+        <location filename="../src/qtui/ui_coreaccounteditdlg.h" line="261"/>
         <source>Proxy Password:</source>
         <translation>Mot de Passe du Proxy:</translation>
     </message>
@@ -1406,27 +1408,27 @@ to work.</source>
 <context>
     <name>CoreConfigWizardAdminUserPage</name>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="13"/>
+        <location filename="../src/qtui/ui_coreconfigwizardadminuserpage.h" line="110"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="21"/>
+        <location filename="../src/qtui/ui_coreconfigwizardadminuserpage.h" line="111"/>
         <source>Username:</source>
         <translation>Nom d&apos;Utiilisateur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="31"/>
+        <location filename="../src/qtui/ui_coreconfigwizardadminuserpage.h" line="112"/>
         <source>Password:</source>
         <translation>Mot de Passe:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="45"/>
+        <location filename="../src/qtui/ui_coreconfigwizardadminuserpage.h" line="113"/>
         <source>Repeat password:</source>
         <translation>Répéter le mot de passe:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="59"/>
+        <location filename="../src/qtui/ui_coreconfigwizardadminuserpage.h" line="114"/>
         <source>Remember password</source>
         <translation>Mémoriser le mot de passe</translation>
     </message>
@@ -1441,25 +1443,25 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Note: Ajouter plus d&apos;utilisateurs et changer votre nom/mot de passe n&apos;est pas encore possible par l&apos;interface Quassel.&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-style:italic;&quot;&gt;Si vous avez besoin de faire cela regarder le script manageusers.py qui est dans le dossier /scripts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="68"/>
+        <location filename="../src/qtui/ui_coreconfigwizardadminuserpage.h" line="120"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;Note: &lt;/span&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Adding more users and changing your username/password is not possible via Quassel&apos;s interface yet.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:10pt;&quot;&gt;If you need to do these things have a look at the manageusers.py script which is located in the /scripts directory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;PS: &lt;/span&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt; Ajouter plus d&apos;utilisateurs et changer votre nom/mot de passe n&apos;est pas encore possible par l&apos;interface Quassel.&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:10pt;&quot;&gt;Si vous avez besoin de faire cela regarder le script manageusers.py qui est dans le dossier /scripts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
 <context>
     <name>CoreConfigWizardIntroPage</name>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardintropage.ui" line="13"/>
+        <location filename="../src/qtui/ui_coreconfigwizardintropage.h" line="50"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardintropage.ui" line="19"/>
+        <location filename="../src/qtui/ui_coreconfigwizardintropage.h" line="51"/>
         <source>This wizard will guide you through the setup of your Quassel Core.</source>
         <translation>Cet assistant va vous guider dans le processus de paramétrage de votre Noyau Qassel.</translation>
     </message>
@@ -1503,33 +1505,33 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="197"/>
         <source>Storing Your Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauver vos paramètres</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="198"/>
         <source>Your settings are now stored in the core, and you will be logged in automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vos paramètres sont maintenant sauvés dans le coeur, et vous serez connecté automatiquement.</translation>
     </message>
 </context>
 <context>
     <name>CoreConfigWizardStorageSelectionPage</name>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardstorageselectionpage.ui" line="13"/>
+        <location filename="../src/qtui/ui_coreconfigwizardstorageselectionpage.h" line="98"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardstorageselectionpage.ui" line="21"/>
+        <location filename="../src/qtui/ui_coreconfigwizardstorageselectionpage.h" line="99"/>
         <source>Storage Backend:</source>
         <translation>Base de données:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardstorageselectionpage.ui" line="56"/>
+        <location filename="../src/qtui/ui_coreconfigwizardstorageselectionpage.h" line="100"/>
         <source>Description</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardstorageselectionpage.ui" line="62"/>
+        <location filename="../src/qtui/ui_coreconfigwizardstorageselectionpage.h" line="101"/>
         <source>Foobar</source>
         <translation>Pied</translation>
     </message>
@@ -1537,37 +1539,37 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>CoreConfigWizardSyncPage</name>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="13"/>
+        <location filename="../src/qtui/ui_coreconfigwizardsyncpage.h" line="115"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="19"/>
+        <location filename="../src/qtui/ui_coreconfigwizardsyncpage.h" line="116"/>
         <source>Your Choices</source>
         <translation>Vos choix</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="35"/>
+        <location filename="../src/qtui/ui_coreconfigwizardsyncpage.h" line="117"/>
         <source>Admin User:</source>
         <translation>Utilisateur Administrateur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="42"/>
+        <location filename="../src/qtui/ui_coreconfigwizardsyncpage.h" line="118"/>
         <source>foo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="55"/>
+        <location filename="../src/qtui/ui_coreconfigwizardsyncpage.h" line="119"/>
         <source>Storage Backend:</source>
         <translation>Base de données:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="62"/>
+        <location filename="../src/qtui/ui_coreconfigwizardsyncpage.h" line="120"/>
         <source>bar</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="102"/>
+        <location filename="../src/qtui/ui_coreconfigwizardsyncpage.h" line="121"/>
         <source>Please wait while your settings are being transmitted to the core...</source>
         <translation>Merci d&apos;attente un instant vos paramètres sont transmis au noyau...</translation>
     </message>
@@ -1656,7 +1658,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&lt;b&gt;Impossible de se connecter au Noyau Quassel !&lt;/b&gt;&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="50"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="485"/>
         <source>Connect to Quassel Core</source>
         <translation>Connecté au noyau Quassel</translation>
     </message>
@@ -1691,22 +1693,22 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Port:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="303"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="499"/>
         <source>User:</source>
         <translation>Utilisateur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="317"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="501"/>
         <source>Password:</source>
         <translation>Mot de Passe:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="331"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="502"/>
         <source>Remember</source>
         <translation>Mémoriser</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="118"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="489"/>
         <source>Always use this account</source>
         <translation>Toujours utiliser ce compte</translation>
     </message>
@@ -1741,7 +1743,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="87"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="488"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
@@ -1773,17 +1775,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="176"/>
         <source>Do you really want to remove your local settings for this Quassel Core account?&lt;br&gt;Note: This will &lt;em&gt;not&lt;/em&gt; remove or change any data on the Core itself!</source>
-        <translation type="unfinished"></translation>
+        <translation>Voules vous réellement supprimer les données locals pour ce compte Quassel Noyau ?&lt;br&gt;Notez que cela &lt;em&gt;ne&lt;/em&gt; supprimera ou changera &lt;em&gt;aucun&lt;/em&gt; paramètre dans le Noyau lui-même !</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="221"/>
         <source>Connect to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Connexion Ã  %1</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="238"/>
         <source>&lt;div style=color:red;&gt;Connection to %1 failed!&lt;/div&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;div style=color:red;&gt;Echec de la connexion Ã  %1 !&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="262"/>
@@ -1813,88 +1815,91 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="318"/>
         <source>Logging in...</source>
-        <translation type="unfinished"></translation>
+        <translation>Authentification...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="292"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="498"/>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilisateur</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="65"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="486"/>
         <source>Edit...</source>
         <translation>Modifier...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="76"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="487"/>
         <source>Add...</source>
         <translation>Ajouter...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="155"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="490"/>
         <source>Initializing your connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Lancement de votre connexion</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="179"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="492"/>
         <source>Connected to apollo.mindpool.net.</source>
         <translation>Connecté Ã  apollo.mindpool.net.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="211"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="496"/>
         <source>Core Info
 reserve
 some
 space</source>
-        <translation type="unfinished"></translation>
+        <translation>Infos du Noyau
+reserver
+un peu
+d&apos;espace</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="361"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="503"/>
         <source>Configure your Quassel Core</source>
         <translation>Configurer votre noyau Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="367"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="504"/>
         <source>The Quassel Core you are connected to is not configured yet. You may now launch a configuration wizard that helps you setting up your Core.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le Noyau Quassel auquel vous essayez de vous connecter n&apos;est pas encore configuré. Vous pouvez maintenant lancer l&apos;assistant de configuration qui vous aide Ã  paramétrer votre Noyau.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="395"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="505"/>
         <source>Launch Wizard</source>
         <translation>Lancer l&apos;Assistant</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="469"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="506"/>
         <source>Initializing your session...</source>
         <translation>Lancement de votre session...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="477"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="507"/>
         <source>&lt;b&gt;Please be patient while your client synchronizes with the Quassel Core!&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Merci de patienter le temps que votre client se synchronise avec le Noyau Quassel !&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="492"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="508"/>
         <source>Session state:</source>
         <translation>Etat de la Session:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="509"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="509"/>
         <source>Network states:</source>
         <translation>Etats du réseau:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="565"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="514"/>
         <source>0/0</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="529"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="511"/>
         <source>Channel states:</source>
         <translation>Etats du Canal:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="549"/>
+        <location filename="../src/qtui/ui_coreconnectdlg.h" line="513"/>
         <source>User states:</source>
         <translation>Etats de l&apos;utilisateur:</translation>
     </message>
@@ -1973,12 +1978,12 @@ space</source>
     <message>
         <location filename="../src/core/coresession.cpp" line="410"/>
         <source>CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!</source>
-        <translation type="unfinished"></translation>
+        <translation>CoreSession::createNetwork(): Le noyau a renvoyé idRéseau invalide lors de la création du réseau %1!</translation>
     </message>
     <message>
         <location filename="../src/core/coresession.cpp" line="425"/>
         <source>CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!</source>
-        <translation type="unfinished"></translation>
+        <translation>CoreSession::createNetwork(): Essai de création d&apos;un réseau dejà existant, mise Ã  jour réalisée !</translation>
     </message>
 </context>
 <context>
@@ -1992,22 +1997,22 @@ space</source>
 <context>
     <name>CreateIdentityDlg</name>
     <message>
-        <location filename="../src/qtui/settingspages/createidentitydlg.ui" line="16"/>
+        <location filename="../src/qtui/ui_createidentitydlg.h" line="115"/>
         <source>Create New Identity</source>
         <translation>Créer une nouvelle identité</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/createidentitydlg.ui" line="24"/>
+        <location filename="../src/qtui/ui_createidentitydlg.h" line="116"/>
         <source>Identity name:</source>
         <translation>Nom de l&apos;identité:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/createidentitydlg.ui" line="36"/>
+        <location filename="../src/qtui/ui_createidentitydlg.h" line="117"/>
         <source>Create blank identity</source>
         <translation>Créer un identité vide</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/createidentitydlg.ui" line="48"/>
+        <location filename="../src/qtui/ui_createidentitydlg.h" line="118"/>
         <source>Duplicate:</source>
         <translation>Copier:</translation>
     </message>
@@ -2043,24 +2048,24 @@ space</source>
 <context>
     <name>DebugConsole</name>
     <message>
-        <location filename="../src/qtui/ui/debugconsole.ui" line="13"/>
+        <location filename="../src/qtui/ui_debugconsole.h" line="99"/>
         <source>Debug Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Console d&apos;Erreurs</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/debugconsole.ui" line="52"/>
+        <location filename="../src/qtui/ui_debugconsole.h" line="100"/>
         <source>local</source>
-        <translation type="unfinished"></translation>
+        <translation>local</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/debugconsole.ui" line="62"/>
+        <location filename="../src/qtui/ui_debugconsole.h" line="101"/>
         <source>core</source>
-        <translation type="unfinished"></translation>
+        <translation>noyau</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/debugconsole.ui" line="90"/>
+        <location filename="../src/qtui/ui_debugconsole.h" line="102"/>
         <source>Evaluate!</source>
-        <translation type="unfinished"></translation>
+        <translation>Evaluer!</translation>
     </message>
 </context>
 <context>
@@ -2129,69 +2134,69 @@ space</source>
         <translation>Polices</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="13"/>
+        <location filename="../src/qtui/ui_fontssettingspage.h" line="336"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="24"/>
+        <location filename="../src/qtui/ui_fontssettingspage.h" line="337"/>
         <source>Custom Application Fonts</source>
         <translation>Polices personnalisées pour l&apos;interface</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="303"/>
+        <location filename="../src/qtui/ui_fontssettingspage.h" line="354"/>
         <source>General:</source>
         <translation>Général:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="392"/>
+        <location filename="../src/qtui/ui_fontssettingspage.h" line="359"/>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="408"/>
+        <location filename="../src/qtui/ui_fontssettingspage.h" line="360"/>
         <source>Choose...</source>
         <translation>Choisir...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="82"/>
+        <location filename="../src/qtui/ui_fontssettingspage.h" line="340"/>
         <source>Topic:</source>
         <translation>Sujet:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="133"/>
+        <location filename="../src/qtui/ui_fontssettingspage.h" line="343"/>
         <source>Buffer Views:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vues des buffers:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="187"/>
+        <location filename="../src/qtui/ui_fontssettingspage.h" line="346"/>
         <source>Nick List:</source>
         <translation>Liste des Pseudos:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="295"/>
+        <location filename="../src/qtui/ui_fontssettingspage.h" line="353"/>
         <source>Chat Widget</source>
-        <translation type="unfinished"></translation>
+        <translation>Fenêtre de Chat</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="415"/>
+        <location filename="../src/qtui/ui_fontssettingspage.h" line="361"/>
         <source>Nicks:</source>
         <translation>Pseudos:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="425"/>
+        <location filename="../src/qtui/ui_fontssettingspage.h" line="362"/>
         <source>Timestamp:</source>
         <translation>Format d&apos;heure:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="445"/>
+        <location filename="../src/qtui/ui_fontssettingspage.h" line="363"/>
         <source>Some of these settings require a restart of the Quassel Client in order to take effect. We intend to fix this.</source>
         <translation>Certains de ces paramètres nécessitent le redémarrage du client Quassel pour prendre effet. Nous allons régler celà.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="238"/>
+        <location filename="../src/qtui/ui_fontssettingspage.h" line="349"/>
         <source>Inputline:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligne de Saisie:</translation>
     </message>
 </context>
 <context>
@@ -2325,99 +2330,99 @@ space</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="13"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="205"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="19"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="206"/>
         <source>Use system tray icon:</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser l&apos;icône système:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="28"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="207"/>
         <source>Minimize to tray on minimize button</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimiser en icône en appuyant sur le bouton minimiser</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="35"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="208"/>
         <source>Minimize to tray on close button</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimiser en icône en appuyant sur le bouton fermer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="45"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="209"/>
         <source>Tray icon:</source>
-        <translation type="unfinished"></translation>
+        <translation>Icône système:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="51"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="210"/>
         <source>Show system tray icon</source>
         <translation>Voir l&apos;icône système</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="64"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="211"/>
         <source>User Notification:</source>
-        <translation type="unfinished"></translation>
+        <translation>Notification Ã  l&apos;Utilisateur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="70"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="212"/>
         <source>Animate tray icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Animer l&apos;icone</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="80"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="213"/>
         <source>Display pop-up messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher les messages d&apos;aide</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="93"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="214"/>
         <source>Display user related messages and private Notices:</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher les messages des utilisateurs et les messages privés:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="102"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="215"/>
         <source>in status buffer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">dans le buffer d&apos;état</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="115"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="216"/>
         <source>in query buffer (if exists)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">dans le buffer de requête (s&apos;il existe)</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="125"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="217"/>
         <source>in current buffer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">dans le buffer courant</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="135"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="218"/>
         <source>Buffer view:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vue Buffer:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="141"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="219"/>
         <source>Display topic in tooltip</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher le sujet en bulle</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="148"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="220"/>
         <source>Mouse wheel changes displayed buffers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">La roulette de la souris change de buffer affiché</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="161"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="223"/>
         <source>The suffix appended to a nick on completion via TAB. Default is &quot;: &quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Le suffixe ajouté au pseudo lorsqu&apos;il est terminé par TAB est par défaut &quot;: &quot;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="164"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="226"/>
         <source>Input Line:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligne de Saisie:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="172"/>
+        <location filename="../src/qtui/ui_generalsettingspage.h" line="227"/>
         <source>Completion suffix:</source>
-        <translation type="unfinished"></translation>
+        <translation>Suffixe pour compléter:</translation>
     </message>
 </context>
 <context>
@@ -2428,7 +2433,7 @@ space</source>
         <translation>Comportement</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="32"/>
+        <location filename="../src/qtui/ui_highlightsettingspage.h" line="120"/>
         <source>Highlight</source>
         <translation>Surlignage</translation>
     </message>
@@ -2443,57 +2448,57 @@ space</source>
         <translation>règle de surlignage</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="13"/>
+        <location filename="../src/qtui/ui_highlightsettingspage.h" line="118"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="19"/>
+        <location filename="../src/qtui/ui_highlightsettingspage.h" line="119"/>
         <source>Highlight list</source>
         <translation>Liste de soulignement</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="37"/>
+        <location filename="../src/qtui/ui_highlightsettingspage.h" line="121"/>
         <source>RegEx</source>
         <translation>Expression régulière</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="42"/>
+        <location filename="../src/qtui/ui_highlightsettingspage.h" line="122"/>
         <source>CS</source>
         <translation>SC</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="47"/>
+        <location filename="../src/qtui/ui_highlightsettingspage.h" line="123"/>
         <source>Enable</source>
         <translation>Activé</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="55"/>
+        <location filename="../src/qtui/ui_highlightsettingspage.h" line="130"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="62"/>
+        <location filename="../src/qtui/ui_highlightsettingspage.h" line="131"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="85"/>
+        <location filename="../src/qtui/ui_highlightsettingspage.h" line="132"/>
         <source>Highlight nicks</source>
         <translation>Surlignage des pseudos</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="91"/>
+        <location filename="../src/qtui/ui_highlightsettingspage.h" line="133"/>
         <source>All nicks from identity</source>
         <translation>Tous les pseudos de l&apos;identité</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="98"/>
+        <location filename="../src/qtui/ui_highlightsettingspage.h" line="134"/>
         <source>Current nick</source>
         <translation>Pseudo courant</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="108"/>
+        <location filename="../src/qtui/ui_highlightsettingspage.h" line="135"/>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
@@ -2679,37 +2684,37 @@ space</source>
         <translation type="obsolete">Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="56"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="531"/>
         <source>Add...</source>
         <translation>Ajouter...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="268"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="574"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="110"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="575"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="118"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="538"/>
         <source>Real Name:</source>
         <translation>Nom Réel:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="134"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="544"/>
         <source>Nicknames</source>
         <translation>Pseudos</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="173"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="550"/>
         <source>&amp;Add...</source>
         <translation>&amp;Ajouter...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="219"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="562"/>
         <source>Re&amp;name...</source>
         <translation>&amp;Renommer...</translation>
     </message>
@@ -2719,77 +2724,77 @@ space</source>
         <translation type="obsolete">&amp;Supprimer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="251"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="565"/>
         <source>Move upwards in list</source>
         <translation>Monter dans la liste</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="265"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="571"/>
         <source>Move downwards in list</source>
         <translation>Descendre dans la liste</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="321"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="584"/>
         <source>A&amp;way</source>
         <translation>A&amp;bsent</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="452"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="583"/>
         <source>Away Reason</source>
         <translation>Motif d&apos;absence</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="445"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="582"/>
         <source>Return Message</source>
         <translation>Message de retour</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="370"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="578"/>
         <source>Away Nick</source>
         <translation>Pseudo d&apos;absence</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="379"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="579"/>
         <source>Auto Away</source>
         <translation>Absence Automatique</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="405"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="580"/>
         <source>Auto away after</source>
         <translation>Absence Automatique après</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="415"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="581"/>
         <source>minutes</source>
         <translation>minutes</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="492"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="595"/>
         <source>Advanced</source>
         <translation>Expert</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="500"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="585"/>
         <source>Ident:</source>
         <translation>Ident:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="516"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="591"/>
         <source>Messages</source>
         <translation>Messages</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="530"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="592"/>
         <source>Part Reason:</source>
         <translation>Modif de Départ:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="543"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="593"/>
         <source>Quit Reason:</source>
         <translation>Motif de Sortie:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="553"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="594"/>
         <source>Kick Reason:</source>
         <translation>Motif de Kick:</translation>
     </message>
@@ -2801,27 +2806,27 @@ space</source>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="173"/>
         <source>&lt;b&gt;The following problems need to be corrected before your changes can be applied:&lt;/b&gt;&lt;ul&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Les problèmes suivants doivent Ãªtre corrigés avant que vos changements soient appliqués:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="174"/>
         <source>&lt;li&gt;All identities need an identity name set&lt;/li&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;li&gt;Toutes les identitées ont besoin qu&apos;un nom d&apos;identité soit saisi&lt;/li&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="175"/>
         <source>&lt;li&gt;Every identity needs at least one nickname defined&lt;/li&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;li&gt;Chaque identité doit avoir au moins un pseudo défini&lt;/li&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="176"/>
         <source>&lt;li&gt;You need to specify a real name for every identity&lt;/li&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;li&gt;Vous devez saisir un nom réel pour chaque identité&lt;/li&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="177"/>
         <source>&lt;li&gt;You need to specify an ident for every identity&lt;/li&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;li&gt;Vous devez saisir un ident pour chaque identité&lt;/li&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="178"/>
@@ -2831,7 +2836,7 @@ space</source>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="179"/>
         <source>One or more identities are invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>Une ou plusieurs identités sont invalides</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="342"/>
@@ -2844,7 +2849,7 @@ space</source>
         <translation>Voulez vous vraiment supprimer l&apos;identité &quot;%1&quot;?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="216"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="559"/>
         <source>Rename Identity</source>
         <translation>Renommer l&apos;identité</translation>
     </message>
@@ -2854,37 +2859,37 @@ space</source>
         <translation>Merci de saisir un nom pour l&apos;identité &quot;%1&quot;!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="53"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="528"/>
         <source>Add Identity</source>
         <translation>Ajoute l&apos;identité</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="76"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="534"/>
         <source>Remove Identity</source>
         <translation>Supprimer l&apos;identité</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="125"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="541"/>
         <source>The &quot;Real Name&quot; is shown in /whois.</source>
         <translation>Le &quot;Nom Réel&quot; est montré dans le /whois.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="170"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="547"/>
         <source>Add Nickname</source>
         <translation>Ajouter un pseudo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="196"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="553"/>
         <source>Remove Nickname</source>
         <translation>Supprimer un pseudo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="199"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="556"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="507"/>
+        <location filename="../src/qtui/ui_identitiessettingspage.h" line="588"/>
         <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
         <translation>L&apos; &quot;ident&quot; fait partie de votre masque d&apos;hôte et ,conjointement avec votre hôte, identifie vous identifie de manière unique au réseau IRC.</translation>
     </message>
@@ -2935,7 +2940,7 @@ space</source>
 <context>
     <name>InputWidget</name>
     <message>
-        <location filename="../src/qtui/ui/inputwidget.ui" line="19"/>
+        <location filename="../src/qtui/ui_inputwidget.h" line="62"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
@@ -3076,12 +3081,12 @@ space</source>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="715"/>
         <source>[Whois] %1 has voice on channels: %2</source>
-        <translation>[Whois] %1a voix sur les canaux: %2</translation>
+        <translation>[Whois] %1 a voix sur les canaux: %2</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="717"/>
         <source>[Whois] %1 is an operator on channels: %2</source>
-        <translation>[Whois] %1est opérateur sur les canaux: %2</translation>
+        <translation>[Whois] %1 est opérateur sur les canaux: %2</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="745"/>
@@ -3126,7 +3131,7 @@ space</source>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="917"/>
         <source>No free and valid nicks in nicklist found. use: /nick &lt;othernick&gt; to continue</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun pseudo libre et valide n&apos;a Ã©té trouvé dans la liste. Utiliser: /nick &lt;autrepseudo&gt; pour continuer</translation>
     </message>
 </context>
 <context>
@@ -3134,12 +3139,12 @@ space</source>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="606"/>
         <source>idling since %1</source>
-        <translation type="unfinished"></translation>
+        <translation>inactif depuis %1</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="609"/>
         <source>login time: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>durée de connexion: %1</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="612"/>
@@ -3178,7 +3183,7 @@ p, li { white-space: pre-wrap; }
         <translation>Attente du noyau...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="485"/>
+        <location filename="../src/qtui/mainwin.cpp" line="468"/>
         <source>Not connected to core.</source>
         <translation>Déconnecté au noyau.</translation>
     </message>
@@ -3198,7 +3203,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Tous les réseaux</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="13"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="203"/>
         <source>MainWindow</source>
         <translation>Fenêtre principale</translation>
     </message>
@@ -3233,157 +3238,157 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Noyau</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="107"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="204"/>
         <source>&amp;Network List...</source>
         <translation>Liste des &amp;Réseaux...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="110"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="205"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="118"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="206"/>
         <source>Quick &amp;Connect...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Quick &amp;Connecte...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="229"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="220"/>
         <source>Disconnect</source>
         <translation>Déconnecter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="134"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="208"/>
         <source>Reconnect</source>
         <translation>Reconnecter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="142"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="209"/>
         <source>Join Channel...</source>
         <translation>Rejoindre le Canal...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="153"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="210"/>
         <source>Set Away globally</source>
         <translation>Mettre Absent partout</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="165"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="211"/>
         <source>Quit...</source>
         <translation>Quitter...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="173"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="212"/>
         <source>Edit Identities...</source>
         <translation>Editer les identités...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="182"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="213"/>
         <source>Configure Quassel...</source>
         <translation>Configurer Quassel...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="185"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="214"/>
         <source>F7</source>
         <translation>F7</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="197"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="215"/>
         <source>Manage Views...</source>
         <translation>Gérer les Vues...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="202"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="216"/>
         <source>About Qt...</source>
         <translation>À propos de Qt...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="214"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="217"/>
         <source>About Quassel IRC...</source>
         <translation>À propos de Quassel IRC...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="219"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="218"/>
         <source>Import Backlog</source>
         <translation>Importer l&apos;historique</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="224"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="219"/>
         <source>Connect</source>
         <translation>Connecter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="234"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="221"/>
         <source>Internal</source>
         <translation>Interne</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="246"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="222"/>
         <source>Disconnect from Core</source>
         <translation>Déconnecter du Noyau</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="258"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="223"/>
         <source>Connect to Core...</source>
         <translation>Connecter au Noyau...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="426"/>
+        <location filename="../src/qtui/mainwin.cpp" line="416"/>
         <source>Connected to core.</source>
         <translation>Connecté au noyau.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="169"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="303"/>
         <source>Edit &amp;Networks...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Modifier les réseaux...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="264"/>
+        <location filename="../src/qtui/mainwin.cpp" line="255"/>
         <source>Nicks</source>
         <translation>Pseudos</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="283"/>
+        <location filename="../src/qtui/mainwin.cpp" line="274"/>
         <source>Chat Monitor</source>
         <translation>Moniteur de Chat</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="305"/>
+        <location filename="../src/qtui/mainwin.cpp" line="296"/>
         <source>Inputline</source>
         <translation>Ligne de Saisie</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="322"/>
+        <location filename="../src/qtui/mainwin.cpp" line="313"/>
         <source>Topic</source>
         <translation>Sujet</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="343"/>
+        <location filename="../src/qtui/mainwin.cpp" line="334"/>
         <source>Statusbar</source>
         <translation>Barre d&apos;état</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="50"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="227"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="54"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="228"/>
         <source>&amp;Networks</source>
         <translation>&amp;Réseaux</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="69"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="229"/>
         <source>&amp;Settings</source>
         <translation>&amp;Paramètres</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="75"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="230"/>
         <source>&amp;Views</source>
         <translation>&amp;Vues</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="82"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="231"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
@@ -3393,20 +3398,35 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&amp;Debug</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="263"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="224"/>
         <source>Debug &amp;Console</source>
-        <translation></translation>
+        <translation>&amp;Console et Déboguage</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="268"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="225"/>
         <source>Disconnect from Network...</source>
         <translation>Déconnecter du Réseau...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="276"/>
+        <location filename="../src/qtui/ui_mainwin.h" line="226"/>
         <source>&amp;Edit Networks...</source>
         <translation>&amp;Modifier les réseaux...</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="80"/>
+        <source>Buffer Views</source>
+        <translation type="unfinished">Vues Buffer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="286"/>
+        <source>Manage Buffer Views</source>
+        <translation type="unfinished">Gérer les Vues Buffer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="294"/>
+        <source>Lock Dock Positions</source>
+        <translation>Bloquer les positions des fenêtres</translation>
+    </message>
 </context>
 <context>
     <name>Message</name>
@@ -3702,12 +3722,12 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Ces commandes sont exécutées après connexion.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkeditdlg.ui" line="13"/>
+        <location filename="../src/qtui/ui_networkeditdlg.h" line="79"/>
         <source>Dialog</source>
         <translation>Fenêtre</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkeditdlg.ui" line="21"/>
+        <location filename="../src/qtui/ui_networkeditdlg.h" line="80"/>
         <source>Please enter a network name:</source>
         <translation>Merci de saisir un nom de réseau:</translation>
     </message>
@@ -3722,7 +3742,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/client/networkmodel.cpp" line="637"/>
         <source>Buffer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Buffer</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="637"/>
@@ -3750,17 +3770,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="144"/>
         <source>&lt;b&gt;The following problems need to be corrected before your changes can be applied:&lt;/b&gt;&lt;ul&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Les problèmes suivants doivent Ãªtre corrigés avant que vos changements soient appliqués:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="145"/>
         <source>&lt;li&gt;All networks need at least one server defined&lt;/li&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;li&gt;Chaque réseau doit avoir au moins un serveur défini&lt;/li&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="146"/>
         <source>&lt;/ul&gt;</source>
-        <translation type="unfinished">&lt;/ul&gt;</translation>
+        <translation>&lt;/ul&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="147"/>
@@ -3790,214 +3810,216 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="534"/>
         <source>Do you really want to delete the network &quot;%1&quot; and all related settings, including the backlog?</source>
-        <translation type="unfinished"></translation>
+        <translation>Voulez vous vraiment détruire le réseau &quot;%1&quot; et tous les paramètres correspondants, ainsi que l&apos;historique?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="13"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="480"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="37"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="481"/>
         <source>Re&amp;name...</source>
         <translation>&amp;Renommer...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="225"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="493"/>
         <source>&amp;Add...</source>
         <translation>&amp;Ajouter...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="242"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="494"/>
         <source>De&amp;lete</source>
         <translation>&amp;Supprimer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="110"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="484"/>
         <source>Connect now</source>
         <translation>Connecter maintenant</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="130"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="485"/>
         <source>Network Details</source>
         <translation>Détails du Réseau</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="138"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="486"/>
         <source>Identity:</source>
         <translation>Identité:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="178"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="508"/>
         <source>Servers</source>
         <translation>Serveurs</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="181"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="509"/>
         <source>Manage servers for this network</source>
-        <translation type="unfinished"></translation>
+        <translation>Gérer les serveurs de ce réseau</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="207"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="492"/>
         <source>&amp;Edit...</source>
         <translation>&amp;Modifier...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="268"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="497"/>
         <source>Move upwards in list</source>
         <translation>Monter dans la liste</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="285"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="506"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="282"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="503"/>
         <source>Move downwards in list</source>
         <translation>Descendre dans la liste</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="331"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="507"/>
         <source>Choose random server for connecting</source>
         <translation>Choisir un serveur aléatoire pour se connecter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="347"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="521"/>
         <source>Perform</source>
         <translation>Exécuter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="350"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="522"/>
         <source>Configure automatic identification or misc. commands to be executed after connecting to a server</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuration automatique identification et autres commandes qui doivent Ãªtre exécutées après la connexion au serveur</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="356"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="510"/>
         <source>Commands to execute on connect:</source>
         <translation>Commandes Ã  exécuter Ã  la connexion:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="366"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="514"/>
         <source>Specify a list of IRC commands to be executed upon connect.
 Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!</source>
-        <translation type="unfinished"></translation>
+        <translation>Précisez la liste des commandes IRC Ã  exécuter lors de la connection
+Notez que Quassel IRC rejoint automatiquement les canaux, aussi /join ne sera que rarmeent nécessaire ici !</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="380"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="517"/>
         <source>Auto Identify</source>
         <translation>Auto Identification</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="395"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="518"/>
         <source>NickServ</source>
         <translation>NickServ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="412"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="519"/>
         <source>Service:</source>
         <translation>Service:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="422"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="520"/>
         <source>Password:</source>
         <translation>Mot de Passe:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="441"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="585"/>
         <source>Advanced</source>
         <translation>Expert</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="444"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="586"/>
         <source>Configure advanced settings such as message encodings and automatic reconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurer les paramètres avancés tels que l&apos;encodage des messages et la reconnexion automatique</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="453"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="525"/>
         <source>Control encodings for in- and outgoing messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Contrôle les encodages pour les messages entrants et sortants</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="456"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="528"/>
         <source>Encodings</source>
         <translation>Encodages</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="484"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="539"/>
         <source>Specify which encoding your messages will be sent in.
 UTF-8 should be a sane choice for most networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Préciser sous quel encodage vos messages seront envoyés.
+UTF-8 devrait Ãªtre un choix normal pour la majorité des réseaux.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="468"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="535"/>
         <source>Send messages in:</source>
-        <translation type="unfinished"></translation>
+        <translation>Envoyer les messages en:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="515"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="552"/>
         <source>Incoming messages encoded in Utf8 will always be treated as such.
 This setting defines the encoding for messages that are not Utf8.</source>
-        <translation type="unfinished"></translation>
+        <translation>Les messages entrants arrivant en Utf8 seront toujourstraités comme tels. Ce paramètre définit l&apos;encodage des messages qui ne sont pas en Utf8.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="499"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="548"/>
         <source>Receive fallback:</source>
-        <translation type="unfinished"></translation>
+        <translation>Réception de repli:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="540"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="565"/>
         <source>This specifies how control messages, nicks and servernames are encoded.
 Unless you *really* know what you do, leave this as ISO-8859-1!</source>
-        <translation type="unfinished"></translation>
+        <translation>Ceci précise comment les messages de contrôles, les pseudos et les noms des serveurs sont encodés.A moins de *réellement* savoir ce que vous faites, laissez cela en ISO-8859-1 !</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="530"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="561"/>
         <source>Server encoding:</source>
-        <translation type="unfinished"></translation>
+        <translation>Encodage du serveur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="553"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="570"/>
         <source>Use default settings for encodings (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser les paramètres par défaut pour l&apos;encodage (recommandé)</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="556"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="573"/>
         <source>Use defaults</source>
         <translation>Utiliser les paramètres par défauts</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="572"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="576"/>
         <source>Control automatic reconnect to the network</source>
-        <translation type="unfinished"></translation>
+        <translation>Contrôle de la reconnection automatique au réseau</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="575"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="579"/>
         <source>Automatic Reconnect</source>
         <translation>Connexion automatique</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="586"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="580"/>
         <source>Interval:</source>
         <translation>Intervalle:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="593"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="581"/>
         <source> s</source>
-        <translation type="unfinished"></translation>
+        <translation>s</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="609"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="582"/>
         <source>Retries:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tentatives:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="629"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="583"/>
         <source>Unlimited</source>
         <translation>Illimité</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="641"/>
+        <location filename="../src/qtui/ui_networkssettingspage.h" line="584"/>
         <source>Rejoin all channels on reconnect</source>
         <translation>Rejoindre tous les canaux Ã  la reconnexion</translation>
     </message>
@@ -4020,17 +4042,17 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>Ajouter un pseudo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/nickeditdlg.ui" line="13"/>
+        <location filename="../src/qtui/ui_nickeditdlg.h" line="75"/>
         <source>Edit Nickname</source>
         <translation>Editer le Pseudo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/nickeditdlg.ui" line="19"/>
+        <location filename="../src/qtui/ui_nickeditdlg.h" line="76"/>
         <source>Please enter a valid nickname:</source>
         <translation>Merci de saisir un pseudo valide:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/nickeditdlg.ui" line="32"/>
+        <location filename="../src/qtui/ui_nickeditdlg.h" line="79"/>
         <source>A valid nickname may contain letters from the English alphabet, digits, and the special characters {, }, [, ], \, |, `, ^, _ and -.</source>
         <translation>Un pseudo valide peut contenir des lettres de l&apos;alphabet anglais, chiffres, et les caractères spéciaux {, }, [, ], \, |, `, ^, _ et -.</translation>
     </message>
@@ -4269,17 +4291,17 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>SaveIdentitiesDlg</name>
     <message>
-        <location filename="../src/qtui/settingspages/saveidentitiesdlg.ui" line="13"/>
+        <location filename="../src/qtui/ui_saveidentitiesdlg.h" line="105"/>
         <source>Sync With Core</source>
         <translation>Syncro avec le noyau</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/saveidentitiesdlg.ui" line="21"/>
+        <location filename="../src/qtui/ui_saveidentitiesdlg.h" line="106"/>
         <source>Syncing data with core, please wait...</source>
         <translation>Synchronisation des données avec le noyau, merci de patienter...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/saveidentitiesdlg.ui" line="81"/>
+        <location filename="../src/qtui/ui_saveidentitiesdlg.h" line="107"/>
         <source>Abort</source>
         <translation>Abandonner</translation>
     </message>
@@ -4292,27 +4314,27 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation type="obsolete">Saisissez les infos du Serveur</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="21"/>
+        <location filename="../src/qtui/ui_servereditdlg.h" line="129"/>
         <source>Server address:</source>
         <translation>Adresse du Serveur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="28"/>
+        <location filename="../src/qtui/ui_servereditdlg.h" line="130"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="13"/>
+        <location filename="../src/qtui/ui_servereditdlg.h" line="128"/>
         <source>Dialog</source>
         <translation>Fenêtre</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="55"/>
+        <location filename="../src/qtui/ui_servereditdlg.h" line="131"/>
         <source>Password:</source>
         <translation>Mot de Passe:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="77"/>
+        <location filename="../src/qtui/ui_servereditdlg.h" line="132"/>
         <source>Use SSL</source>
         <translation>Utilise SSL</translation>
     </message>
@@ -4381,7 +4403,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation type="obsolete">Fenêtre</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/settingsdlg.ui" line="49"/>
+        <location filename="../src/qtui/ui_settingsdlg.h" line="111"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
@@ -4393,30 +4415,30 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingsdlg.cpp" line="72"/>
         <source>There are unsaved changes on the current configuration page. Would you like to apply your changes now?</source>
-        <translation type="unfinished"></translation>
+        <translation>Il y a des changements non sauvegardés sur cette page de configuration. Voulez vous appliquer vos changements maintenant ?</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingsdlg.cpp" line="147"/>
         <source>Reload Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Recharger les paramètres</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingsdlg.cpp" line="147"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Voulez vous recharger les paramètres, et annuler vos changements sur cette page ?</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
         <source>Restore Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Restaurer les valeurs par défaut</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
         <source>Do you like to restore the default values for this page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Voulez-vous restaurer les paramètres par défaut de cette page?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/settingsdlg.ui" line="13"/>
+        <location filename="../src/qtui/ui_settingsdlg.h" line="109"/>
         <source>Configure Quassel</source>
         <translation>Configurer Quassel</translation>
     </message>
@@ -4426,22 +4448,22 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
         <source>Reload Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Recharger les paramètres</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Voulez vous recharger les paramètres, et annuler vos changements sur cette page ?</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
         <source>Restore Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Restaurer les valeurs par défaut</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
         <source>Do you like to restore the default values for this page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Voulez-vous restaurer les paramètres par défaut de cette page?</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/settingspagedlg.ui" line="13"/>
@@ -4449,14 +4471,14 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation type="obsolete">Fenêtre</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/settingspagedlg.ui" line="29"/>
+        <location filename="../src/qtui/ui_settingspagedlg.h" line="89"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/settingspagedlg.ui" line="13"/>
+        <location filename="../src/qtui/ui_settingspagedlg.h" line="88"/>
         <source>Configure Quassel</source>
-        <translation type="unfinished">Configurer Quassel</translation>
+        <translation>Configurer Quassel</translation>
     </message>
 </context>
 <context>
@@ -4479,7 +4501,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/core/sqlitestorage.cpp" line="49"/>
         <source>SQLite is a file-based database engine that does not require any setup. It is suitable for small and medium-sized databases that do not require access via network. Use SQLite if your Quassel Core should store its data on the same machine it is running on, and if you only expect a few users to use your core.</source>
-        <translation type="unfinished"></translation>
+        <translation>SQLite est un moteur de base de données par fichiers qui ne nécessite aucun paramétrage. C&apos;est pratique pour les petites et moyennes base de données qui n&apos;ont pas besoin d&apos;être consultées par réseau. Utiliser SQLite si votre Noyau Quassel doit sauver ses données sur la même machine qu&apos;il utilise, et si vous pensez Ãªtre peu Ã  utiliser votre noyau.</translation>
     </message>
 </context>
 <context>
@@ -4553,13 +4575,13 @@ Click to edit!</source>
     <message>
         <location filename="../src/qtui/topiclabel.cpp" line="43"/>
         <source>Drag to scroll the topic!</source>
-        <translation type="unfinished"></translation>
+        <translation>Tirer pour dérouler le sujet!</translation>
     </message>
 </context>
 <context>
     <name>TopicWidget</name>
     <message>
-        <location filename="../src/qtui/ui/topicwidget.ui" line="31"/>
+        <location filename="../src/qtui/ui_topicwidget.h" line="79"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
diff --git a/i18n/quassel_nb_NO.ts b/i18n/quassel_nb_NO.ts
new file mode 100644 (file)
index 0000000..d0d86b1
--- /dev/null
@@ -0,0 +1,3787 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="nb_NO">
+<defaultcodec></defaultcodec>
+<context>
+    <name>AboutDlg</name>
+    <message>
+        <location filename="../src/qtopia/ui/aboutdlg.ui" line="13"/>
+        <source>About</source>
+        <translation>Om</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/aboutdlg.ui" line="19"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Quassel IRC&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt; font-weight:600;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:400;&quot;&gt;mobile edition&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:5pt;&quot;&gt; &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;(C) 2005-2007 by&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt; font-weight:600;&quot;&gt;The Quassel IRC Team&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;Manuel Nickschas&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;Marcus Eggenberger&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;Marco Genise&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;&lt;span style=&quot; font-size:4pt;&quot;&gt; &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;&amp;lt;http://quassel-irc.org&amp;gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;&amp;lt;devel@quassel-irc.org&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Quassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt; font-weight:600;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:400;&quot;&gt;mobil utgave&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:5pt;&quot;&gt; &lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;(C) 2005-2007 by&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt; font-weight:600;&quot;&gt;The Quassel IRC Team&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;Manuel Nickschas&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;Marcus Eggenberger&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;Marco Genise&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;&lt;span style=&quot; font-size:4pt;&quot;&gt; &lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;&amp;lt;http://quassel-irc.org&amp;gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;&amp;lt;devel@quassel-irc.org&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="47"/>
+        <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; on &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC is dual-licensed under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; and &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Most icons are &amp;copy; by the &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; and used under the &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Please use &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; to report bugs.</source>
+        <translation>&lt;b&gt;En moderne, distribuert IRC Klient&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; pÃ¥ &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC er dobbelt-lisensiert under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; og &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;De fleste ikonene er &amp;copy; &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; og benyttet under &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Vennligst benytt &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; til Ã¥ rapportere bugs.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
+        <source>Quassel IRC is mainly developed by:</source>
+        <translation>Quassel IRC er hovedsakelig utviklet av:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="69"/>
+        <source>We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:</source>
+        <translation>Vi vil takke følgende bidragsytere (i alfabetisk rekkefølge) og alle vi glemte Ã¥ nevne her:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="89"/>
+        <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the shiny icons you see throughout Quassel&lt;/dd&gt;&lt;br&gt;&lt;dt&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more&lt;/dd&gt;</source>
+        <translation type="obsolete">En spesiell takk gÃ¥r til:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for Ã¥ lage de fleste av de skinnende ikonene du ser i  Quassel&lt;/dd&gt;&lt;br&gt;&lt;dt&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for Ã¥ ha laget Qt og Qtopia, og for sponsingen av utvikling av Quasseltopia med  Greenphones og mer&lt;/dd&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="16"/>
+        <source>About Quassel</source>
+        <translation>Om Quassel</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="22"/>
+        <source>background:white;</source>
+        <translation type="obsolete">background:white:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="61"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:15pt; font-weight:600; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Quassel IRC&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:15pt; font-weight:600; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Quassel IRC&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="77"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Version 0.2.0-pre, Build &amp;gt;= 474 (2008-02-08)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Versjon 0.2.0-pre, Build &amp;gt;= 474 (2008-02-08)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="119"/>
+        <source>&amp;About</source>
+        <translation>&amp;Om</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="173"/>
+        <source>QTextBrowser { background:transparent;}</source>
+        <translation type="obsolete">QTextBrowser { background:transparent;}</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="147"/>
+        <source>A&amp;uthors</source>
+        <translation>&amp;Utviklere</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="175"/>
+        <source>&amp;Contributors</source>
+        <translation>&amp;Bidragsytere</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="203"/>
+        <source>&amp;Thanks To</source>
+        <translation>&amp;Takk til</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="95"/>
+        <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for great artwork and the Quassel logo/icon&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the other shiny icons you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more&lt;/dd&gt;</source>
+        <translation>En spesiell takk til:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for flott utseende arbeid ogQuassel logoen/ikoner&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for Ã¥ ha laget de fleste av de flotte ikonene i Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for Ã¥ lage Qt og Qtopia, og for Ã¥ sponse utviklingen av Quasseltopia med Greenphones og mer&lt;/dd&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>AdminUserPage</name>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="65"/>
+        <source>Setup Admin User</source>
+        <translation type="obsolete">Setup administrasjonbruker</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="66"/>
+        <source>Please enter credentials for the admin user.</source>
+        <translation type="obsolete">Vennligst skriv inn bruker-legitimasjonen for administrasjonsbrukeren.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="68"/>
+        <source>Name:</source>
+        <translation type="obsolete">Navn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="72"/>
+        <source>Password:</source>
+        <translation type="obsolete">Passord:</translation>
+    </message>
+</context>
+<context>
+    <name>AppearanceSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="29"/>
+        <source>Appearance</source>
+        <translation>Utseende</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="29"/>
+        <source>General</source>
+        <translation>Generelt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
+        <source>Client style:</source>
+        <translation>Klient stil:</translation>
+    </message>
+</context>
+<context>
+    <name>BufferItem</name>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="157"/>
+        <source>Status Buffer</source>
+        <translation>Status buffer</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="295"/>
+        <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Status buffer av %1&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="299"/>
+        <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Kanal %1&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="302"/>
+        <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
+        <translation>&lt;b&gt;Brukere:&lt;/b&gt; %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="312"/>
+        <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
+        <translation>&lt;b&gt;Emne:&lt;/b&gt; %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="321"/>
+        <source>Not active &lt;br /&gt; Double-click to join</source>
+        <translation>Ikke aktive &lt;br/&gt; Dobbelt-klikk for Ã¥ bli med</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="325"/>
+        <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Spørring med %1&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="326"/>
+        <source>Away Message: %1</source>
+        <translation>Fraværs melding: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="329"/>
+        <source>%1 - %2</source>
+        <translation>%1 - %2</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="333"/>
+        <source>&lt;p&gt; %1 &lt;/p&gt;</source>
+        <translation>&lt;p&gt; %1 &lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="318"/>
+        <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
+        <translation>&lt;b&gt;Modus:&lt;/b&gt; %1</translation>
+    </message>
+</context>
+<context>
+    <name>BufferView</name>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="52"/>
+        <source>Connect</source>
+        <translation>Koble til</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="53"/>
+        <source>Disconnect</source>
+        <translation>Koble fra</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="488"/>
+        <source>Join Channel</source>
+        <translation>Bli med i kanal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="56"/>
+        <source>Join</source>
+        <translation>Bli med</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="57"/>
+        <source>Part</source>
+        <translation>Forlate</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="60"/>
+        <source>Delete buffer</source>
+        <translation>Slett buffer</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="395"/>
+        <source>Hide Events</source>
+        <translation>Skjul hendelser</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="63"/>
+        <source>Join Events</source>
+        <translation>Bli med hendelser</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="64"/>
+        <source>Part Events</source>
+        <translation>Forlate hendelser</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="65"/>
+        <source>Kill Events</source>
+        <translation>Slett hendelser</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="66"/>
+        <source>Quit Events</source>
+        <translation>Avslutt hendelser</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="67"/>
+        <source>Mode Events</source>
+        <translation>Mouds hendelser</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="61"/>
+        <source>Ignore list</source>
+        <translation>Ignorerings liste</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="194"/>
+        <source>WHO</source>
+        <translation type="obsolete">WHO</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="488"/>
+        <source>Input channel name:</source>
+        <translation>Skriv inn kanal navnet:</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="520"/>
+        <source>Remove buffer permanently?</source>
+        <translation>Slette buffer permanent?</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="522"/>
+        <source>Do you want to delete the buffer &quot;%1&quot; permanently? This will delete all related data, including all backlog data, from the core&apos;s database!</source>
+        <translation>Vil do slette bufferen &quot;%1&quot; permanent? Dette vil slette alle relaterte data, inkludert all historikk-data, fra Kjernens database!</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="51"/>
+        <source>Show Channel List</source>
+        <translation>Vis Kanal listen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="58"/>
+        <source>Hide buffers</source>
+        <translation>Skjul Buffere</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="59"/>
+        <source>Hide buffers permanently</source>
+        <translation>Skjuler Buffere permanent</translation>
+    </message>
+</context>
+<context>
+    <name>BufferViewDock</name>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="590"/>
+        <source>All Buffers</source>
+        <translation>Alle Buffere</translation>
+    </message>
+</context>
+<context>
+    <name>BufferViewEditDlg</name>
+    <message>
+        <location filename="../src/qtui/settingspages/buffervieweditdlg.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/buffervieweditdlg.ui" line="21"/>
+        <source>Please enter a name for the buffer view:</source>
+        <translation>Vennligst skriv inn navnet pÃ¥ buffer visningen:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="461"/>
+        <source>Add Buffer View</source>
+        <translation>Legg til buffer visning</translation>
+    </message>
+</context>
+<context>
+    <name>BufferViewSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="34"/>
+        <source>General</source>
+        <translation>Generelt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="34"/>
+        <source>Buffer Views</source>
+        <translation>Buffer visninger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="30"/>
+        <source>Re&amp;name...</source>
+        <translation>&amp;Omdøp...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="46"/>
+        <source>&amp;Add...</source>
+        <translation>&amp;Legg til...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="68"/>
+        <source>De&amp;lete</source>
+        <translation>&amp;Slett</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="80"/>
+        <source>Buffer View  Settings</source>
+        <translation>Buffer visning  innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="88"/>
+        <source>Show only Buffers from:</source>
+        <translation type="obsolete">Vis kun Buffere fra:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="106"/>
+        <source>Restrict Buffers to:</source>
+        <translation>Begrens Buffere til:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="112"/>
+        <source>Status Buffers</source>
+        <translation>Status buffere</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="119"/>
+        <source>Channel Buffers</source>
+        <translation>Kanal buffere</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="126"/>
+        <source>Query Buffers</source>
+        <translation>Spørrings buffere</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="143"/>
+        <source>Add new Buffers automatically</source>
+        <translation>Legg til nye Buffere automatisk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="137"/>
+        <source>Sort Buffers alphabetically</source>
+        <translation type="obsolete">Sorter Buffere alfabetisk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="294"/>
+        <source>Delete Buffer View?</source>
+        <translation>Slette Buffer visning?</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="295"/>
+        <source>Do you really want to delete the buffer view &quot;%1&quot;?</source>
+        <translation>Vil du virkelig slette Buffer visningen &quot;%1&quot;?</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="88"/>
+        <source>Network:</source>
+        <translation>Nettverk:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="96"/>
+        <source>All</source>
+        <translation>Alle</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="136"/>
+        <source>Hide inactive Buffers</source>
+        <translation>Skjule inaktive Buffere</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="150"/>
+        <source>Sort alphabetically</source>
+        <translation>Sorter alfabetisk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="157"/>
+        <source>Minimum Activity:</source>
+        <translation>Minimum Aktivitet:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="165"/>
+        <source>No Activity</source>
+        <translation>Ingen Aktivitet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="170"/>
+        <source>Other Activity</source>
+        <translation>Annen Aktivitet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="175"/>
+        <source>New Message</source>
+        <translation>Ny beskjed</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="180"/>
+        <source>Highlight</source>
+        <translation>Uthev</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="206"/>
+        <source>Preview:</source>
+        <translation>ForhÃ¥ndsvisning:</translation>
+    </message>
+</context>
+<context>
+    <name>BufferViewWidget</name>
+    <message>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="37"/>
+        <source>All</source>
+        <translation>Alle</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="38"/>
+        <source>Chans</source>
+        <translation>Kanaler</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="39"/>
+        <source>Queries</source>
+        <translation>Spørringer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="40"/>
+        <source>Nets</source>
+        <translation>Nett</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/bufferviewwidget.ui" line="13"/>
+        <source>Select Buffer</source>
+        <translation>Velg Buffer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/bufferviewwidget.ui" line="29"/>
+        <source>Tab 1</source>
+        <translation>Arkfane 1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/bufferviewwidget.ui" line="27"/>
+        <source>BufferView</source>
+        <translation>BufferVisning</translation>
+    </message>
+</context>
+<context>
+    <name>BufferWidget</name>
+    <message>
+        <location filename="../src/qtui/ui/bufferwidget.ui" line="106"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;Quassel IRC&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="obsolete">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;Quassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat komfortabelt. Hvor som helst.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/bufferwidget.ui" line="75"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/quassel/96x96/apps/quassel.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/quassel/96x96/apps/quassel.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ChannelListDlg</name>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="13"/>
+        <source>Channel List</source>
+        <translation>Kanal liste</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="37"/>
+        <source>Search Pattern:</source>
+        <translation>Søke mønster:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="47"/>
+        <source>Search Channels</source>
+        <translation>Søk i Kanalene</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="71"/>
+        <source>Filter:</source>
+        <translation>Filter:</translation>
+    </message>
+</context>
+<context>
+    <name>Client</name>
+    <message>
+        <location filename="../src/client/client.cpp" line="287"/>
+        <source>Identity already exists in client!</source>
+        <translation>Identen finnes allerede i klienten!</translation>
+    </message>
+</context>
+<context>
+    <name>ClientSyncer</name>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="55"/>
+        <source>The Quassel Core you try to connect to is too old! Please consider upgrading.</source>
+        <translation>Quassel Kjernen du forsøker Ã¥ koble til er for gammel! Vennligst vurder Ã¥ oppgradere.</translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="80"/>
+        <source>&lt;b&gt;Invalid data received from core!&lt;/b&gt;&lt;br&gt;Disconnecting.</source>
+        <translation>&lt;b&gt;Invalide data mottatt fra kjernen!&lt;/b&gt;&lt;br&gt;Kobler fra.</translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="112"/>
+        <source>Internal connections not yet supported.</source>
+        <translation>Interne tilkoblinger er enda ikke støttet.</translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="130"/>
+        <source>&lt;b&gt;This client is built without SSL Support!&lt;/b&gt;&lt;br /&gt;Disable the usage of SSL in the account settings.</source>
+        <translation>&lt;b&gt;Denne klienten er bygget uten SSL støtte!&lt;/b&gt;&lt;br /&gt;Deaktiver bruken av SSL i konto innstillingene.</translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="185"/>
+        <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least a Core Version %1 (Build &gt;= %2) to connect.</source>
+        <translation type="obsolete">&lt;b&gt;Quassel Kjernen du forsøker Ã¥ koble til er for gammel!&lt;/b&gt;&lt;br&gt;Trenger minst Kjerne versjon %1 (Build &gt;= %2) for Ã¥ koble til.</translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="210"/>
+        <source>&lt;b&gt;The Quassel Core you are trying to connect to does not support SSL!&lt;/b&gt;&lt;br /&gt;If you want to connect anyways, disable the usage of SSL in the account settings.</source>
+        <translation>&lt;b&gt;Quassel Kjernen du forsøker Ã¥ koble til, støtter ikke SSL!&lt;/b&gt;&lt;br /&gt;Hvis du alikevel Ã¸nsker Ã¥ koble til, deaktiver bruken av SSL i konto innstillingene.</translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="240"/>
+        <source>Logging in...</source>
+        <translation>Logger inn...</translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="194"/>
+        <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least core/client protocol v%1 to connect.</source>
+        <translation>&lt;b&gt;Quassel Kjernen du forsøker Ã¥ koble til er for gammel!&lt;/b&gt;&lt;br&gt;Trenger minst Kjerne/Klient protokoll v%1 for Ã¥ koble til.</translation>
+    </message>
+</context>
+<context>
+    <name>ColorSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="33"/>
+        <source>Appearance</source>
+        <translation>Utseende</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="33"/>
+        <source>Color settings</source>
+        <translation>Farge innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="19"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="29"/>
+        <source>Bufferview</source>
+        <translation>Buffervisning</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="35"/>
+        <source>Activities:</source>
+        <translation>Aktiviteter:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1489"/>
+        <source>FG</source>
+        <translation>FG</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1499"/>
+        <source>BG</source>
+        <translation>BG</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1509"/>
+        <source>Use BG</source>
+        <translation>Bruk BG</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="71"/>
+        <source>Default:</source>
+        <translation>Standard:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="120"/>
+        <source>Inactive:</source>
+        <translation>Inaktiv:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="160"/>
+        <source>Highlight:</source>
+        <translation>Uthev:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="197"/>
+        <source>New Message:</source>
+        <translation>Ny beskjed:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="234"/>
+        <source>Other Activity:</source>
+        <translation>Andre aktiviteter:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1612"/>
+        <source>Preview:</source>
+        <translation>ForhÃ¥ndsvisning:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1619"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="319"/>
+        <source>Chatview</source>
+        <translation>Chatvisning</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="335"/>
+        <source>Server Activity</source>
+        <translation>Server Aktivitet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="885"/>
+        <source>Foreground</source>
+        <translation>Forgrunn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="895"/>
+        <source>Background</source>
+        <translation>Bakgrunn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="371"/>
+        <source>Error Message:</source>
+        <translation>Feilmelding:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="411"/>
+        <source>Notice Message:</source>
+        <translation>Informativ beskjed:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="451"/>
+        <source>Plain Message:</source>
+        <translation>Enkel Beskjed:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="491"/>
+        <source>Server Message:</source>
+        <translation>Server Beskjed:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="531"/>
+        <source>Highlight Message:</source>
+        <translation>Uthevet Beskjed:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="562"/>
+        <source>User Activity</source>
+        <translation>Bruker Aktivitet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="598"/>
+        <source>Action Message:</source>
+        <translation>Handlings Beskjed:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="638"/>
+        <source>Join Message:</source>
+        <translation>Bli med Beskjed:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="678"/>
+        <source>Kick Message:</source>
+        <translation>Spark Beskjed:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="718"/>
+        <source>Mode Message:</source>
+        <translation>Modus Beskjed:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="758"/>
+        <source>Part Message:</source>
+        <translation>Forlate Beskjed:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="798"/>
+        <source>Quit Message:</source>
+        <translation>Avslutt Beskjed:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="838"/>
+        <source>Rename Message:</source>
+        <translation>Omdøp Beskjed:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="879"/>
+        <source>Message</source>
+        <translation>Beskjed:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="915"/>
+        <source>Timestamp:</source>
+        <translation>Tidsstempel:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="955"/>
+        <source>Sender:</source>
+        <translation>Avsender:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="995"/>
+        <source>Nick:</source>
+        <translation>Kallenavn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1035"/>
+        <source>Hostmask:</source>
+        <translation>Vertsmaske:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1075"/>
+        <source>Channelname:</source>
+        <translation>Kanalnavn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1115"/>
+        <source>Mode flags:</source>
+        <translation>Modus flagg:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1155"/>
+        <source>Url:</source>
+        <translation>Url:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1218"/>
+        <source>Mirc Color Codes</source>
+        <translation>Mirc farge koder</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1230"/>
+        <source>Color Codes</source>
+        <translation>Farge Koder</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1236"/>
+        <source>Color 0:</source>
+        <translation>Farge 0:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1257"/>
+        <source>Color 1:</source>
+        <translation>Farge 1:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1278"/>
+        <source>Color 2:</source>
+        <translation>Farge 2:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1299"/>
+        <source>Color 3:</source>
+        <translation>Farge 3:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1320"/>
+        <source>Color 4:</source>
+        <translation>Farge 4:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1341"/>
+        <source>Color 5:</source>
+        <translation>Farge 5:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1362"/>
+        <source>Color 6:</source>
+        <translation>Farge 6:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1383"/>
+        <source>Color 7:</source>
+        <translation>Farge 7:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1404"/>
+        <source>Color 8:</source>
+        <translation>Farge 8:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1411"/>
+        <source>Color 14:</source>
+        <translation>Farge 14:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1418"/>
+        <source>Color 15:</source>
+        <translation>Farge 15:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1425"/>
+        <source>Color 13:</source>
+        <translation>Farge 13:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1432"/>
+        <source>Color 12:</source>
+        <translation>Farge 12:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1439"/>
+        <source>Color 11:</source>
+        <translation>Farge 11:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1446"/>
+        <source>Color 10:</source>
+        <translation>Farge 10:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
+        <source>Color 9:</source>
+        <translation>Farge 9:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1477"/>
+        <source>Nickview</source>
+        <translation>Kallenavnvisning</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1483"/>
+        <source>Nick status:</source>
+        <translation>Kallenavn status:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1519"/>
+        <source>Online:</source>
+        <translation>Tilgjengelig:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1559"/>
+        <source>Away:</source>
+        <translation>Borte:</translation>
+    </message>
+</context>
+<context>
+    <name>ConclusionPage</name>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="170"/>
+        <source>Conclusion</source>
+        <translation type="obsolete">Konklusjon</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="171"/>
+        <source>You chose the following configuration:</source>
+        <translation type="obsolete">Du velger følgende konfigurasjon:</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigWizard</name>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="44"/>
+        <source>Core Configuration Wizard</source>
+        <translation type="obsolete">Veiviser for Kjerne Konfigurasjon</translation>
+    </message>
+</context>
+<context>
+    <name>Core</name>
+    <message>
+        <location filename="../src/core/core.cpp" line="57"/>
+        <source>Could not initialize any storage backend! Exiting...</source>
+        <translation>Kunne ikke initiere noen lagrings motor! Avslutter...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="117"/>
+        <source>Calling restoreState() even though active sessions exist!</source>
+        <translation>Kaller restoreState() selv om aktive sesjoner eksisterer!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="120"/>
+        <source>Core state too old, ignoring...</source>
+        <translation type="obsolete">Kjerne status for gammel, ignorerer...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="145"/>
+        <source>Admin user or password not set.</source>
+        <translation>Administrasjons bruker, eller passord er ikke satt.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="148"/>
+        <source>Could not setup storage!</source>
+        <translation>Kunne ikke konfigurere lagring!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="152"/>
+        <source>Creating admin user...</source>
+        <translation>Oppretter administrasjons bruker...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="388"/>
+        <source>Antique client trying to connect... refusing.</source>
+        <translation>Antikk klient forsøker Ã¥ koble til... Nekter.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="384"/>
+        <source>&lt;b&gt;Quassel Core Version %1 (Build &amp;ge; %2)&lt;/b&gt;&lt;br&gt;Up %3d%4h%5m (since %6)</source>
+        <translation type="obsolete">&lt;b&gt;Quassel Kjerne Versjon %1 (Build &amp;ge; %2)&lt;/b&gt;&lt;br&gt;Oppe %3d%4h%5m (siden %6)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="405"/>
+        <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client version %1 (Build &gt;= %2).&lt;br&gt;Please consider upgrading your client.</source>
+        <translation type="obsolete">&lt;b&gt;Din Quassel Klient er for gammel!&lt;/b&gt;&lt;br&gt;Denne Kjernen krever minst klient versjon %1 (Build &gt;= %2).&lt;br&gt;Vennligst vurder Ã¥ oppgradere klienten din.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="406"/>
+        <source>Client %1 too old, rejecting.</source>
+        <translation>Klient %1 for gammel, avviser.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="484"/>
+        <source>&lt;b&gt;Client not initialized!&lt;/b&gt;&lt;br&gt;You need to send an init message before trying to login.</source>
+        <translation>&lt;b&gt;Klienten er ikke initialisert!&lt;/b&gt;&lt;br&gt;Du trenger Ã¥ sende en init beskjed før du forsøker Ã¥ logge inn.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="486"/>
+        <source>Client %1 did not send an init message before trying to login, rejecting.</source>
+        <translation>Klient %1 sendte ikke en init beskjed før den forsøkte Ã¥ logge inn, avviser.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="506"/>
+        <source>&lt;b&gt;Invalid username or password!&lt;/b&gt;&lt;br&gt;The username/password combination you supplied could not be found in the database.</source>
+        <translation>&lt;b&gt;Ugyldig brukernavn, eller passord!&lt;/b&gt;&lt;br&gt;Brukernavn/passord kombinasjonen du oppga kunne ikke bli funnet i databasen.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="471"/>
+        <source>Client %1 initialized and authentificated successfully as &quot;%2&quot; (UserId: %3).</source>
+        <translation type="obsolete">Klient %1 initialisert og autentisiert suksessfullt som &quot;%2&quot; (Brukerid: %3).</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="523"/>
+        <source>Non-authed client disconnected.</source>
+        <translation>Uautorisert klient frakoblet.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="568"/>
+        <source>Could not initialize session for client %1!</source>
+        <translation>Kunne ikke initiere sesjonen for klient %1!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="60"/>
+        <source>Currently, Quassel only supports SQLite3. You need to build your
+Qt library with the sqlite plugin enabled in order for quasselcore
+to work.</source>
+        <translation>Quassel supporterer for Ã¸yeblikket kun SQLite3. Du trenger Ã¥
+kompilere ditt Qt bibliotek med sqlite aktivert for Ã¥ fÃ¥ Quassel
+Kjernen til Ã¥ virke.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="404"/>
+        <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client/core protocol version %1.&lt;br&gt;Please consider upgrading your client.</source>
+        <translation>&lt;b&gt;Din Quassel Klient er for gammel!&lt;/b&gt;&lt;br&gt;Denne Kjernen trenger minst Klient/Kjerne protokoll versjon %1.&lt;br&gt;Vennligst vurder Ã¥ oppgradere klienten din.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="421"/>
+        <source>&lt;b&gt;Quassel Core Version %1&lt;/b&gt;&lt;br&gt;Built: %2&lt;br&gt;Up %3d%4h%5m (since %6)</source>
+        <translation>&lt;b&gt;Quassel Kjerne Versjon %1&lt;/b&gt;&lt;br&gt;Bygget: %2&lt;br&gt;Oppe %3d%4h%5m (siden %6)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="512"/>
+        <source>Client %1 initialized and authenticated successfully as &quot;%2&quot; (UserId: %3).</source>
+        <translation>Klient %1 initialisert og autentisiert suksessfullt som &quot;%2&quot; (BrukerID: %3).</translation>
+    </message>
+</context>
+<context>
+    <name>CoreAccountEditDlg</name>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="492"/>
+        <source>Add Core Account</source>
+        <translation>Legg til Kjerne Konto</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="289"/>
+        <source>Missing information</source>
+        <translation>Manglende informasjon</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="290"/>
+        <source>Please enter all required information or discard changes to return to account selection.</source>
+        <translation>Vennligst skriv inn all pÃ¥krevd informasjon, eller forkast endringene for Ã¥ returnere til valg av konto.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="297"/>
+        <source>Non-unique account name</source>
+        <translation>Ikke-unikt konto navn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="299"/>
+        <source>Account names need to be unique. Please enter a different name or discard all changes to return to account selection.</source>
+        <translation>Konto navn mÃ¥ være unike. Vennligst forsøk et annet navn, eller forkast alle endringene for Ã¥ returnere til valg av konto.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="13"/>
+        <source>Edit Core Account</source>
+        <translation>Rediger Kjerne Konto</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="86"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="40"/>
+        <source>Host:</source>
+        <translation>Vert:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="47"/>
+        <source>Password:</source>
+        <translation>Passord:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="63"/>
+        <source>Account:</source>
+        <translation>Konto:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="90"/>
+        <source>User:</source>
+        <translation>Bruker:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="21"/>
+        <source>Account Details</source>
+        <translation>Konto detaljer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="29"/>
+        <source>Account Name:</source>
+        <translation>Konto Navn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="56"/>
+        <source>Use built-in Quassel Core</source>
+        <translation>Bruk innebygd Quassel Kjerne</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="76"/>
+        <source>Remote host:</source>
+        <translation>Ekstern vert:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="109"/>
+        <source>Use secure connection (SSL)</source>
+        <translation>Bruk sikker tilkobling (SSL)</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="124"/>
+        <source>Use a proxy:</source>
+        <translation>Bruk en proxy: </translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="136"/>
+        <source>Proxy Type:</source>
+        <translation>Proxy Type:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="144"/>
+        <source>Socks 5</source>
+        <translation>Socks 5</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="149"/>
+        <source>HTTP</source>
+        <translation>HTTP</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="157"/>
+        <source>Proxy Host:</source>
+        <translation>Proxy Vert:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="164"/>
+        <source>Proxy Port:</source>
+        <translation>Proxy Port:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="171"/>
+        <source>localhost</source>
+        <translation>localhost</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="188"/>
+        <source>Proxy Username:</source>
+        <translation>Proxy Brukernavn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="198"/>
+        <source>Proxy Password:</source>
+        <translation>Proxy Passord:</translation>
+    </message>
+</context>
+<context>
+    <name>CoreConfigWizard</name>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="60"/>
+        <source>Core Configuration Wizard</source>
+        <translation>Veiviser for Kjerne Konfigurasjon</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="79"/>
+        <source>Your core has been successfully configured. Logging you in...</source>
+        <translation>Din Kjerne har blitt suksessfullt konfigurert. Logger deg inn...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="90"/>
+        <source>Core configuration failed:&lt;br&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;Press &lt;em&gt;Next&lt;/em&gt; to start over.</source>
+        <translation>Kjerne konfigurasjonen feilet:&lt;br&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;Trykk &lt;em&gt;Neste&lt;/em&gt; for Ã¥ starte pÃ¥ nytt.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="107"/>
+        <source>Your are now logged into your freshly configured Quassel Core!&lt;br&gt;Please remember to configure your identities and networks now.</source>
+        <translation>Du er nÃ¥ logget inn i din nylig konfigurerte Quassel Kjerne!&lt;br&gt;Vennligst husk Ã¥ konfigurere dine identiteter og nettverk nÃ¥.</translation>
+    </message>
+</context>
+<context>
+    <name>CoreConfigWizardAdminUserPage</name>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="13"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="21"/>
+        <source>Username:</source>
+        <translation>Brukernavn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="31"/>
+        <source>Password:</source>
+        <translation>Passord:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="45"/>
+        <source>Repeat password:</source>
+        <translation>Gjenta passordet:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="59"/>
+        <source>Remember password</source>
+        <translation>Husk passord</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="68"/>
+        <source>&lt;em&gt;Note: Adding more users and changing your username/password has not been implemented yet.</source>
+        <translation type="obsolete">&lt;em&gt;Merk: Ã… legge til flere brukere og endre ditt brukernavn/passord er ikke implementert enda.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="68"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;Note: &lt;/span&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Adding more users and changing your username/password is not possible via Quassel&apos;s interface yet.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:10pt;&quot;&gt;If you need to do these things have a look at the manageusers.py script which is located in the /scripts directory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;Note: &lt;/span&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Legge til flere brukere, eller endre ditt brukernavn/passord er ikke mulig via Quassel sitt grensesnitt enda.&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:10pt;&quot;&gt;Hvis du trenger Ã¥ gjøre dette, ta en titt pÃ¥ manageusers.py skriptet som du finner i /scripts katalogen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>CoreConfigWizardIntroPage</name>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardintropage.ui" line="13"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardintropage.ui" line="19"/>
+        <source>This wizard will guide you through the setup of your Quassel Core.</source>
+        <translation>Denne veiviseren vil guide deg gjennom konfigureringen av din Quassel Kjerne.</translation>
+    </message>
+</context>
+<context>
+    <name>CoreConfigWizardPages::AdminUserPage</name>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="138"/>
+        <source>Create User Account</source>
+        <translation type="obsolete">Opprett Bruker Konto</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="139"/>
+        <source>First, we will create a user account on the core. This first user will have administrator privileges.</source>
+        <translation type="obsolete">Først oppretter vi en bruker konto i Kjernen. Den første brukeren vil ha administrative rettigheter.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="138"/>
+        <source>Create Admin User</source>
+        <translation>Opprett Admin bruker</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="139"/>
+        <source>First, we will create a user on the core. This first user will have administrator privileges.</source>
+        <translation>Først mÃ¥ det opprettes en bruker pÃ¥ Kjernen. Denne brukeren vil ha administrative rettigheter.</translation>
+    </message>
+</context>
+<context>
+    <name>CoreConfigWizardPages::IntroPage</name>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="123"/>
+        <source>Introduction</source>
+        <translation>Introduksjon</translation>
+    </message>
+</context>
+<context>
+    <name>CoreConfigWizardPages::StorageSelectionPage</name>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="167"/>
+        <source>Select Storage Backend</source>
+        <translation>Velg lagrings motor</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="168"/>
+        <source>Please select a database backend for the Quassel Core storage to store the backlog and other data in.</source>
+        <translation>Vennligst velg en database motor for Quassel Kjerne lagring, for Ã¥ lagre historikk og andre data i.</translation>
+    </message>
+</context>
+<context>
+    <name>CoreConfigWizardPages::SyncPage</name>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="197"/>
+        <source>Storing Your Settings</source>
+        <translation>Lagrer dine innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="198"/>
+        <source>Your settings are now stored in the core, and you will be logged in automatically.</source>
+        <translation>Dine innstillinger er nÃ¥ lagret i kjernen, og du vil bli logget inn automatisk.</translation>
+    </message>
+</context>
+<context>
+    <name>CoreConfigWizardStorageSelectionPage</name>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardstorageselectionpage.ui" line="13"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardstorageselectionpage.ui" line="21"/>
+        <source>Storage Backend:</source>
+        <translation>Lagrings Motor:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardstorageselectionpage.ui" line="56"/>
+        <source>Description</source>
+        <translation>Beskrivelse</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardstorageselectionpage.ui" line="62"/>
+        <source>Foobar</source>
+        <translation>Foobar</translation>
+    </message>
+</context>
+<context>
+    <name>CoreConfigWizardSyncPage</name>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="13"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="19"/>
+        <source>Your Choices</source>
+        <translation>Dine valg</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="35"/>
+        <source>Admin User:</source>
+        <translation>Administrasjons Bruker:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="42"/>
+        <source>foo</source>
+        <translation>foo</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="55"/>
+        <source>Storage Backend:</source>
+        <translation>Lagrings Motor:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="62"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardsyncpage.ui" line="102"/>
+        <source>Please wait while your settings are being transmitted to the core...</source>
+        <translation>Vennligst vent mens dine innstillinger blir overført til kjernen...</translation>
+    </message>
+</context>
+<context>
+    <name>CoreConnectDlg</name>
+    <message>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="46"/>
+        <source>New</source>
+        <translation>Ny</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="87"/>
+        <source>Delete</source>
+        <translation>Slett</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="48"/>
+        <source>Properties...</source>
+        <translation>Egenskaper...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="174"/>
+        <source>Remove Account Settings</source>
+        <translation>Fjern Konto Innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="176"/>
+        <source>Do you really want to remove your local settings for this Quassel Core account?&lt;br&gt;Note: This will &lt;em&gt;not&lt;/em&gt; remove or change any data on the Core itself!</source>
+        <translation>Vil du virkelig fjerne dine lokale innstillinger for denne Quassel Kjerne kontoen?&lt;br&gt;Merk: Dette vil &lt;em&gt;ikke&lt;/em&gt; fjerne, eller endre noen data i selve Kjernen!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="21"/>
+        <source>Select Core Account</source>
+        <translation>Velg Kjerne Konto</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="39"/>
+        <source>Available Quassel Core accounts:</source>
+        <translation>Tilgjengelige Quassel Kjerne kontoer:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="88"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="128"/>
+        <source>Connect</source>
+        <translation>Koble til</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="221"/>
+        <source>Connect to %1</source>
+        <translation>Koblet til %1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="238"/>
+        <source>&lt;div style=color:red;&gt;Connection to %1 failed!&lt;/div&gt;</source>
+        <translation>&lt;div style=color:red;&gt;Tilkobling til %1 feilet!&lt;/div&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="262"/>
+        <source>Not connected to %1.</source>
+        <translation>Ikke tilkoblet %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="263"/>
+        <source>Looking up %1...</source>
+        <translation>SlÃ¥r opp %1...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="264"/>
+        <source>Connecting to %1...</source>
+        <translation>Kobler til %1...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="265"/>
+        <source>Connected to %1</source>
+        <translation>Tilkoblet %1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="266"/>
+        <source>Unknown connection state to %1</source>
+        <translation>Ukjent tilkoblings tilstand til %1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="318"/>
+        <source>Logging in...</source>
+        <translation>Logger inn...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="292"/>
+        <source>Login</source>
+        <translation>Logg inn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="50"/>
+        <source>Connect to Quassel Core</source>
+        <translation>Koble til Quassel Kjerne</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="65"/>
+        <source>Edit...</source>
+        <translation>Rediger...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="76"/>
+        <source>Add...</source>
+        <translation>Legg til...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="118"/>
+        <source>Always use this account</source>
+        <translation>Alltid bruk denne kontoen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="155"/>
+        <source>Initializing your connection</source>
+        <translation>Initialiserer tilkoblingen din</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="179"/>
+        <source>Connected to apollo.mindpool.net.</source>
+        <translation>Tilkoblet apollo.mindpool.net.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="211"/>
+        <source>Core Info
+reserve
+some
+space</source>
+        <translation>Kjerne InfoReserveLedigPlass</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="303"/>
+        <source>User:</source>
+        <translation>Bruker:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="317"/>
+        <source>Password:</source>
+        <translation>Passord:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="331"/>
+        <source>Remember</source>
+        <translation>Husk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="361"/>
+        <source>Configure your Quassel Core</source>
+        <translation>Konfigurer Quassel Kjernen din</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="367"/>
+        <source>The Quassel Core you are connected to is not configured yet. You may now launch a configuration wizard that helps you setting up your Core.</source>
+        <translation>Quassel Kjernen du er koblet til er ikke konfigurert enda. Du kan nÃ¥ stater en konfigurasjons veiviser som vil hjelpe deg Ã¥ konfigurere Kjernen din.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="395"/>
+        <source>Launch Wizard</source>
+        <translation>Start Veiviser</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="469"/>
+        <source>Initializing your session...</source>
+        <translation>Initierer sesjonen din...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="477"/>
+        <source>&lt;b&gt;Please be patient while your client synchronizes with the Quassel Core!&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Vennligst vær tÃ¥lmodig mens klienten din synkroniseres med Quassel Kjernen!&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="492"/>
+        <source>Session state:</source>
+        <translation>Sesjons tilstand:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="509"/>
+        <source>Network states:</source>
+        <translation>Nettverks tilstander:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="565"/>
+        <source>0/0</source>
+        <translation>0/0</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="529"/>
+        <source>Channel states:</source>
+        <translation>Kanal tilstander:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="549"/>
+        <source>User states:</source>
+        <translation>Bruker tilstander:</translation>
+    </message>
+</context>
+<context>
+    <name>CoreConnectProgressDlg</name>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="13"/>
+        <source>Connection Progress</source>
+        <translation>Tilkoblings Fremdrift</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="19"/>
+        <source>Connecting to core...</source>
+        <translation>Kobler til kjernen...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="34"/>
+        <source>Session</source>
+        <translation>Sesjon</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="98"/>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="54"/>
+        <source>Networks</source>
+        <translation>Nettverk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="71"/>
+        <source>Channels</source>
+        <translation>Kanaler</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="88"/>
+        <source>Users</source>
+        <translation>Brukere</translation>
+    </message>
+</context>
+<context>
+    <name>CoreSession</name>
+    <message>
+        <location filename="../src/core/coresession.cpp" line="153"/>
+        <source>Default Identity</source>
+        <translation>Standard Identitet</translation>
+    </message>
+    <message>
+        <location filename="../src/core/coresession.cpp" line="241"/>
+        <source>Client %1 disconnected (UserId: %2).</source>
+        <translation>Klient %1 frakoblet (BrukerId: %2).</translation>
+    </message>
+    <message>
+        <location filename="../src/core/coresession.cpp" line="410"/>
+        <source>CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!</source>
+        <translation>CoreSession::createNetwork(): Fikk ugyldig nettverks ID fra Kjernen under forsøket pÃ¥ Ã¥ opprette nettverket %1!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/coresession.cpp" line="425"/>
+        <source>CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!</source>
+        <translation>CoreSession::createNetwork(): Forsøker Ã¥ opprette et nettverk som allerede eksisterer, oppdaterer i stedet for!</translation>
+    </message>
+</context>
+<context>
+    <name>CreateIdentityDlg</name>
+    <message>
+        <location filename="../src/qtui/settingspages/createidentitydlg.ui" line="16"/>
+        <source>Create New Identity</source>
+        <translation>Opprett Ny Identitet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/createidentitydlg.ui" line="24"/>
+        <source>Identity name:</source>
+        <translation>Identitets navn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/createidentitydlg.ui" line="36"/>
+        <source>Create blank identity</source>
+        <translation>Opprett tom identitet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/createidentitydlg.ui" line="48"/>
+        <source>Duplicate:</source>
+        <translation>Dupliser:</translation>
+    </message>
+</context>
+<context>
+    <name>CtcpHandler</name>
+    <message>
+        <location filename="../src/core/ctcphandler.cpp" line="166"/>
+        <source>Received CTCP PING request from %1</source>
+        <translation>Mottok CTCP PING forespørsel fra %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ctcphandler.cpp" line="171"/>
+        <source>Received CTCP PING answer from %1 with %2 seconds round trip time</source>
+        <translation>Mottok CTCP PING svar fra %1 med %2 sekunders rund-reise tid</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ctcphandler.cpp" line="180"/>
+        <source>Received CTCP VERSION request by %1</source>
+        <translation>Mottok CTCP VERSION forespørsel fra %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ctcphandler.cpp" line="183"/>
+        <source>Received CTCP VERSION answer from %1: %2</source>
+        <translation>Mottok CTCP VERSION svar fra %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ctcphandler.cpp" line="191"/>
+        <source>Received unknown CTCP %1 by %2</source>
+        <translation>Mottok ukjent CTCP %1 fra %2</translation>
+    </message>
+</context>
+<context>
+    <name>DebugConsole</name>
+    <message>
+        <location filename="../src/qtui/ui/debugconsole.ui" line="13"/>
+        <source>Debug Console</source>
+        <translation>Debug konsoll</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/debugconsole.ui" line="52"/>
+        <source>local</source>
+        <translation>lokal</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/debugconsole.ui" line="62"/>
+        <source>core</source>
+        <translation>kjerne</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/debugconsole.ui" line="90"/>
+        <source>Evaluate!</source>
+        <translation>Evaluer!</translation>
+    </message>
+</context>
+<context>
+    <name>EditCoreAcctDlg</name>
+    <message>
+        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="13"/>
+        <source>Edit Core Account</source>
+        <translation>Rediger Kjerne Konto</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="33"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="40"/>
+        <source>Host:</source>
+        <translation>Vert:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="47"/>
+        <source>Password:</source>
+        <translation>Passord:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="63"/>
+        <source>Account:</source>
+        <translation>Konto:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="90"/>
+        <source>User:</source>
+        <translation>Bruker:</translation>
+    </message>
+</context>
+<context>
+    <name>FontsSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.cpp" line="29"/>
+        <source>Appearance</source>
+        <translation>Utseende</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.cpp" line="29"/>
+        <source>Fonts</source>
+        <translation>Skrift</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="24"/>
+        <source>Custom Application Fonts</source>
+        <translation>Tilpasset Applikasjons Skrifter</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="392"/>
+        <source>Font</source>
+        <translation>Skrift</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="408"/>
+        <source>Choose...</source>
+        <translation>Velg...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="82"/>
+        <source>Topic:</source>
+        <translation>Emne:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="133"/>
+        <source>Buffer Views:</source>
+        <translation>Buffer Visninger:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="187"/>
+        <source>Nick List:</source>
+        <translation>Kallenavn Liste:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="238"/>
+        <source>Inputline:</source>
+        <translation>Skrivefelt:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="303"/>
+        <source>General:</source>
+        <translation>Generelt:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="295"/>
+        <source>Chat Widget</source>
+        <translation>Chat Widget</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="415"/>
+        <source>Nicks:</source>
+        <translation>Kallenavn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="425"/>
+        <source>Timestamp:</source>
+        <translation>Tidsstempel:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="445"/>
+        <source>Some of these settings require a restart of the Quassel Client in order to take effect. We intend to fix this.</source>
+        <translation>Noen av disse innstillingene krever en restart av Quassel Klienten for Ã¥ virke. Vi vil fikse dette.</translation>
+    </message>
+</context>
+<context>
+    <name>GeneralSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
+        <source>Behaviour</source>
+        <translation>Oppførsel</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
+        <source>General</source>
+        <translation>Generelt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="19"/>
+        <source>Use system tray icon:</source>
+        <translation>Bruk system kurv ikon:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="28"/>
+        <source>Minimize to tray on minimize button</source>
+        <translation>Minimer til kurv etter minimer knapp</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="35"/>
+        <source>Minimize to tray on close button</source>
+        <translation>Mimimer til kurv ved lukk knapp</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="45"/>
+        <source>Tray icon:</source>
+        <translation>Kurv ikon:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="51"/>
+        <source>Show system tray icon</source>
+        <translation>Vis system kurv ikon</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="64"/>
+        <source>User Notification:</source>
+        <translation>Bruk notifisering:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="70"/>
+        <source>Animate tray icon</source>
+        <translation>Animer kurv ikon</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="80"/>
+        <source>Display pop-up messages</source>
+        <translation>Vis pop-up beskjeder</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="93"/>
+        <source>Display user related messages and private Notices:</source>
+        <translation>Vi bruker relaterte beskjeder og private Merknader:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="102"/>
+        <source>in status buffer</source>
+        <translation>i status buffer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="115"/>
+        <source>in query buffer (if exists)</source>
+        <translation>i spørrings bugger (hvis den eksisterer)</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="125"/>
+        <source>in current buffer</source>
+        <translation>i nÃ¥værende buffer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="135"/>
+        <source>Buffer view:</source>
+        <translation>Buffer visning:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="141"/>
+        <source>Display topic in tooltip</source>
+        <translation>Vis emne i verktøytips</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="148"/>
+        <source>Mouse wheel changes displayed buffers</source>
+        <translation>Rulleknappen pÃ¥ musen endrer viste buffere</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="161"/>
+        <source>The suffix appended to a nick on completion via TAB. Default is &quot;: &quot;</source>
+        <translation>Endelsen tillagt et kallenavn ved fullføring via TAB. Standard er &quot;: &quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="164"/>
+        <source>Input Line:</source>
+        <translation>Innskrivningslinje:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="172"/>
+        <source>Completion suffix:</source>
+        <translation>Fullførings suffiks:</translation>
+    </message>
+</context>
+<context>
+    <name>HighlightSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
+        <source>Behaviour</source>
+        <translation>Oppførsel</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="32"/>
+        <source>Highlight</source>
+        <translation>Uthev</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="157"/>
+        <source>this shouldn&apos;t be empty</source>
+        <translation>Denne burde ikke være tom</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.h" line="45"/>
+        <source>highlight rule</source>
+        <translation>Uthev regel</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="19"/>
+        <source>Highlight list</source>
+        <translation>Uthev list</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="37"/>
+        <source>RegEx</source>
+        <translation>RegEx</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="42"/>
+        <source>CS</source>
+        <translation>CS</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="47"/>
+        <source>Enable</source>
+        <translation>Aktiver</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="55"/>
+        <source>Add</source>
+        <translation>Legg til</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="62"/>
+        <source>Remove</source>
+        <translation>Fjern</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="85"/>
+        <source>Highlight nicks</source>
+        <translation>Uthev kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="91"/>
+        <source>All nicks from identity</source>
+        <translation>Alle kallenavn fra identitet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="98"/>
+        <source>Current nick</source>
+        <translation>NÃ¥værende kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="108"/>
+        <source>None</source>
+        <translation>Ingen</translation>
+    </message>
+</context>
+<context>
+    <name>IdentitiesSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="110"/>
+        <source>General</source>
+        <translation>Generelt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="29"/>
+        <source>Identities</source>
+        <translation>Identiteter</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="173"/>
+        <source>&lt;b&gt;The following problems need to be corrected before your changes can be applied:&lt;/b&gt;&lt;ul&gt;</source>
+        <translation>&lt;b&gt;Følgende problemer trengs Ã¥ bli rettet før endringene dine kan bli pÃ¥ført:&lt;/b&gt;&lt;ul&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="174"/>
+        <source>&lt;li&gt;All identities need an identity name set&lt;/li&gt;</source>
+        <translation>&lt;li&gt;Alle identiteter trenger et identitets navnesett&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="175"/>
+        <source>&lt;li&gt;Every identity needs at least one nickname defined&lt;/li&gt;</source>
+        <translation>&lt;li&gt;Hver identitet trenger minst ett kallenavn definert&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="176"/>
+        <source>&lt;li&gt;You need to specify a real name for every identity&lt;/li&gt;</source>
+        <translation>&lt;li&gt;Du mÃ¥ spesifiere et ekte navn for hver identitet&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="177"/>
+        <source>&lt;li&gt;You need to specify an ident for every identity&lt;/li&gt;</source>
+        <translation>&lt;li&gt;Du mÃ¥ spesifisere en ident for hver identitet&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="178"/>
+        <source>&lt;/ul&gt;</source>
+        <translation>&lt;/ul&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="179"/>
+        <source>One or more identities are invalid</source>
+        <translation>En, eller flere identiteter er ugyldig</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="342"/>
+        <source>Delete Identity?</source>
+        <translation>Slette identitet?</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="343"/>
+        <source>Do you really want to delete identity &quot;%1&quot;?</source>
+        <translation>Vil du virkelig slette identiteten &quot;%1&quot;?</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="216"/>
+        <source>Rename Identity</source>
+        <translation>Omdøp Identitet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="355"/>
+        <source>Please enter a new name for the identity &quot;%1&quot;!</source>
+        <translation>Vennligst skriv inn navnet for identiteten &quot;%1&quot;!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="268"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="53"/>
+        <source>Add Identity</source>
+        <translation>Legg til Identitet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="56"/>
+        <source>Add...</source>
+        <translation>Legg til...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="76"/>
+        <source>Remove Identity</source>
+        <translation>Fjern Identitet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="118"/>
+        <source>Real Name:</source>
+        <translation>Ekte Navn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="125"/>
+        <source>The &quot;Real Name&quot; is shown in /whois.</source>
+        <translation>Det &quot;ekte navnet&quot; blir vist i /whois.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="134"/>
+        <source>Nicknames</source>
+        <translation>Kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="170"/>
+        <source>Add Nickname</source>
+        <translation>Legg til Kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="173"/>
+        <source>&amp;Add...</source>
+        <translation>&amp;Legg til...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="196"/>
+        <source>Remove Nickname</source>
+        <translation>Fjern Kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="199"/>
+        <source>Remove</source>
+        <translation>Fjern</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="219"/>
+        <source>Re&amp;name...</source>
+        <translation>&amp;Omdøp...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="251"/>
+        <source>Move upwards in list</source>
+        <translation>Flytt oppover i listen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="265"/>
+        <source>Move downwards in list</source>
+        <translation>Flytt nedover i listen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="321"/>
+        <source>A&amp;way</source>
+        <translation>&amp;Borte</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="452"/>
+        <source>Away Reason</source>
+        <translation>Borte grunn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="445"/>
+        <source>Return Message</source>
+        <translation>Tilbake beskjed</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="370"/>
+        <source>Away Nick</source>
+        <translation>Borte Kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="379"/>
+        <source>Auto Away</source>
+        <translation>Auto Borte</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="405"/>
+        <source>Auto away after</source>
+        <translation>Auto Borte etter</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="415"/>
+        <source>minutes</source>
+        <translation>minutter</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="492"/>
+        <source>Advanced</source>
+        <translation>Avansert</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="500"/>
+        <source>Ident:</source>
+        <translation>Ident:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="507"/>
+        <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
+        <translation>&quot;Ident&quot; er en del av vertsmasken, og sammen med din vert, vil den identifisere deg unikt innenfor IRC nettverket.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="516"/>
+        <source>Messages</source>
+        <translation>Beskjeder</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="530"/>
+        <source>Part Reason:</source>
+        <translation>Forlat Grunn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="543"/>
+        <source>Quit Reason:</source>
+        <translation>Avslutt Grunn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="553"/>
+        <source>Kick Reason:</source>
+        <translation>Spark Grunn:</translation>
+    </message>
+</context>
+<context>
+    <name>Identity</name>
+    <message>
+        <location filename="../src/common/identity.cpp" line="62"/>
+        <source>&lt;empty&gt;</source>
+        <translation>&lt;empty&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="63"/>
+        <source>Quassel IRC User</source>
+        <translation>Quassel IRC Bruker</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="69"/>
+        <source>Gone fishing.</source>
+        <translation>PÃ¥ fisketur.</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="71"/>
+        <source>Brought fish.</source>
+        <translation>Kjøpte fisk.</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="75"/>
+        <source>Not here. No, really. not here!</source>
+        <translation>Ikke her. Nei, virkelig ikke her!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="77"/>
+        <source>Back in action again!</source>
+        <translation>Tilbake i aksjon igjen!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="80"/>
+        <source>Kindergarten is elsewhere!</source>
+        <translation>Barnehagen finner du andre steder!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="82"/>
+        <source>http://quassel-irc.org - Chat comfortably. Anywhere.</source>
+        <translation>http://quassel-irc.org - Chat komfortabelt. Hvor som helst.</translation>
+    </message>
+</context>
+<context>
+    <name>InputWidget</name>
+    <message>
+        <location filename="../src/qtui/ui/inputwidget.ui" line="19"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+</context>
+<context>
+    <name>IntroPage</name>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="49"/>
+        <source>Introduction</source>
+        <translation type="obsolete">Introduksjon</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="51"/>
+        <source>This wizard will guide you through the setup process for your shiny new Quassel IRC Client.</source>
+        <translation type="obsolete">Denne veiviseren vil guide deg gjennom innstillings prosessen for din skinnende nye Quassel IRC Klient.</translation>
+    </message>
+</context>
+<context>
+    <name>IrcListModel</name>
+    <message>
+        <location filename="../src/client/irclistmodel.cpp" line="60"/>
+        <source>Channel</source>
+        <translation>Kanal</translation>
+    </message>
+    <message>
+        <location filename="../src/client/irclistmodel.cpp" line="61"/>
+        <source>Users</source>
+        <translation>Brukere</translation>
+    </message>
+    <message>
+        <location filename="../src/client/irclistmodel.cpp" line="61"/>
+        <source>Topic</source>
+        <translation>Emne</translation>
+    </message>
+</context>
+<context>
+    <name>IrcServerHandler</name>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="194"/>
+        <source>Received invalid MODE from %s: %s</source>
+        <translation type="obsolete">Mottok ugyldig MODE fra %s: %s</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="411"/>
+        <source>%1 has changed topic for %2 to: &quot;%3&quot;</source>
+        <translation>%1 har endret emne for %2 til: &quot;%3&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="515"/>
+        <source>[Whois] %1 is away: &quot;%2&quot;</source>
+        <translation>[Whois] %1 er borte: &quot;%2&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="526"/>
+        <source>%1 is away: &quot;%2&quot;</source>
+        <translation>%1 er borte: &quot;%2&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="597"/>
+        <source>[Whois] %1 is %2 (%3)</source>
+        <translation>[Whois] %1 er %2 (%3)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="612"/>
+        <source>%1 is online via %2 (%3)</source>
+        <translation>%1 is online via %2 (%3)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="723"/>
+        <source>[Whois] %1</source>
+        <translation>[Whois] %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="864"/>
+        <source>[Whowas] %1</source>
+        <translation>[Whowas] %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="642"/>
+        <source>[Whowas] %1 was %2 (%3)</source>
+        <translation>[Whowas] %1 var %2 (%3)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="656"/>
+        <source>[Who] End of /WHO list for %1</source>
+        <translation>[Who] Slutt pÃ¥ /WHO listen for %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="676"/>
+        <source>[Whois] %1 is logged in since %2</source>
+        <translation>[Whois] %1 er logget inn siden %2</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="678"/>
+        <source>[Whois] %1 is idling for %2 (%3)</source>
+        <translation>[Whois] %1 har vært inaktiv for %2 (%3)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="681"/>
+        <source>[Whois] idle message: %1</source>
+        <translation>[Whois] inaktiv beskjed: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="713"/>
+        <source>[Whois] %1 is a user on channels: %2</source>
+        <translation>[Whois] %1 er en bruker pÃ¥ kanalene: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="715"/>
+        <source>[Whois] %1 has voice on channels: %2</source>
+        <translation>[Whois] %1 har stemme pÃ¥ kanalene: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="717"/>
+        <source>[Whois] %1 is an operator on channels: %2</source>
+        <translation>[Whois] %1 er en operatør pÃ¥ kanalene: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="777"/>
+        <source>No topic is set for %1.</source>
+        <translation>Inget emne satt for %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="789"/>
+        <source>Topic for %1 is &quot;%2&quot;</source>
+        <translation>Emne for %1 er &quot;%2&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="800"/>
+        <source>Topic set by %1 on %2</source>
+        <translation>Emne satt av %1 pÃ¥ %2</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="823"/>
+        <source>[Who] %1</source>
+        <translation>[Who] %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="877"/>
+        <source>There is a nickname in your identity&apos;s nicklist which contains illegal characters</source>
+        <translation>Det er et Kallenavn i din identitets kallanavnsliste som inneholder ugyldige karakterer</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="878"/>
+        <source>Due to a bug in Unreal IRCd (and maybe other irc-servers too) we&apos;re unable to determine the erroneous nick</source>
+        <translation>Grunnet en bug i Unreal IRCd (og kanskje andre irc-servere ogsÃ¥) klarte vi ikke Ã¥ avgjøre et feilbetjenings kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="879"/>
+        <source>Please use: /nick &lt;othernick&gt; to continue or clean up your nicklist</source>
+        <translation>Vennligst bruk: /nick &lt;annet_kallenavn&gt; for Ã¥ fortsette, eller rydd opp i kallenavnslisten din</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="882"/>
+        <source>Nick %1 contains illegal characters</source>
+        <translation>Kallenavn %1 inneholder ugyldige karakterer</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="894"/>
+        <source>Nick already in use: %1</source>
+        <translation>Kallenavnet er allerede i bruk: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="917"/>
+        <source>No free and valid nicks in nicklist found. use: /nick &lt;othernick&gt; to continue</source>
+        <translation>Ingen ledige, eller gyldige kallenavn i kallanavnslisten ble funnet. Bruk /nick &lt;annet_kallenavn&gt; for Ã¥ fortsette</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="480"/>
+        <source>%1</source>
+        <translation>%1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="745"/>
+        <source>Channel %1 has %2 users. Topic is: %3</source>
+        <translation>Kanal %1 har %2 brukere. Emnet er: %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="754"/>
+        <source>End of channel list</source>
+        <translation>Slutt pÃ¥ Kanal listen</translation>
+    </message>
+</context>
+<context>
+    <name>IrcUserItem</name>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="606"/>
+        <source>idling since %1</source>
+        <translation>inaktiv siden %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="609"/>
+        <source>login time: %1</source>
+        <translation>Tid for pÃ¥logging: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="612"/>
+        <source>server: %1</source>
+        <translation>server: %1</translation>
+    </message>
+</context>
+<context>
+    <name>MainWidget</name>
+    <message>
+        <location filename="../src/qtopia/ui/mainwidget.ui" line="13"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/mainwidget.ui" line="56"/>
+        <source>background-color: rgba(220, 220, 255, 40%)</source>
+        <translation>background-color: rgba(220, 220, 255, 40%)</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/mainwidget.ui" line="62"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:29pt; color:#00008b;&quot;&gt;Quassel IRC&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:29pt; color:#7fff00;&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#00008b;&quot;&gt;mobile edition&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:29pt; color:#483d8b;&quot;&gt;&lt;span style=&quot; font-size:6pt; color:#000000;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:29pt; color:#00008b;&quot;&gt;Quassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:29pt; color:#7fff00;&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#00008b;&quot;&gt;mobil utgave&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:29pt; color:#483d8b;&quot;&gt;&lt;span style=&quot; font-size:6pt; color:#000000;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>MainWin</name>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="88"/>
+        <source>Waiting for core...</source>
+        <translation>Venter pÃ¥ kjernen...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="468"/>
+        <source>Not connected to core.</source>
+        <translation>Ikke tilkoblet kjernen.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="303"/>
+        <source>Edit &amp;Networks...</source>
+        <translation>Rediger &amp;Nettverk...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="177"/>
+        <source>All Buffers</source>
+        <translation type="obsolete">Alle Buffere</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="178"/>
+        <source>All Channels</source>
+        <translation type="obsolete">Alle Kanaler</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="179"/>
+        <source>All Queries</source>
+        <translation type="obsolete">Alle Spørringer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="180"/>
+        <source>All Networks</source>
+        <translation type="obsolete">Alle Nettverk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="181"/>
+        <source>Full Custom</source>
+        <translation type="obsolete">Full tilpassning</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="255"/>
+        <source>Nicks</source>
+        <translation>Kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="274"/>
+        <source>Chat Monitor</source>
+        <translation>Chat Monitor</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="296"/>
+        <source>Inputline</source>
+        <translation>Skrivelinje</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="313"/>
+        <source>Topic</source>
+        <translation>Emne</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="416"/>
+        <source>Connected to core.</source>
+        <translation>Tilkoblet kjernen.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="13"/>
+        <source>MainWindow</source>
+        <translation>HovedVindu</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="50"/>
+        <source>&amp;File</source>
+        <translation>&amp;Fil</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="54"/>
+        <source>&amp;Networks</source>
+        <translation>&amp;Nettverk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="70"/>
+        <source>&amp;Settings</source>
+        <translation>&amp;Innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="76"/>
+        <source>&amp;Views</source>
+        <translation>&amp;Visninger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="91"/>
+        <source>&amp;Help</source>
+        <translation>&amp;Hjelp</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="94"/>
+        <source>&amp;Debug</source>
+        <translation type="obsolete">Feil&amp;søk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="116"/>
+        <source>&amp;Network List...</source>
+        <translation>&amp;Nettverks liste...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="119"/>
+        <source>F2</source>
+        <translation>F2</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="127"/>
+        <source>Quick &amp;Connect...</source>
+        <translation>Hurtig&amp;tilkobling...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="238"/>
+        <source>Disconnect</source>
+        <translation>Koble fra</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="143"/>
+        <source>Reconnect</source>
+        <translation>Koble til pÃ¥ nytt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="151"/>
+        <source>Join Channel...</source>
+        <translation>Bli med i Kanal...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="162"/>
+        <source>Set Away globally</source>
+        <translation>Sett Borte globalt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="174"/>
+        <source>Quit...</source>
+        <translation>Avslutt...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="182"/>
+        <source>Edit Identities...</source>
+        <translation>Rediger identiteter...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="191"/>
+        <source>Configure Quassel...</source>
+        <translation>Konfigurere Quassel...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="194"/>
+        <source>F7</source>
+        <translation>F7</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="206"/>
+        <source>Manage Views...</source>
+        <translation>Administrer Visninger...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="211"/>
+        <source>About Qt...</source>
+        <translation>Om Qt...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="223"/>
+        <source>About Quassel IRC...</source>
+        <translation>Om Quassel IRC...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="228"/>
+        <source>Import Backlog</source>
+        <translation>Importer Historikk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="233"/>
+        <source>Connect</source>
+        <translation>Koble til</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="243"/>
+        <source>Internal</source>
+        <translation>Internt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="255"/>
+        <source>Disconnect from Core</source>
+        <translation>Koble fra Kjernen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="267"/>
+        <source>Connect to Core...</source>
+        <translation>Koble til Kjerne...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="272"/>
+        <source>Debug &amp;Console</source>
+        <translation>Feilsøkings&amp;konsoll</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="277"/>
+        <source>Disconnect from Network...</source>
+        <translation>Koble fra Nettverk...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="281"/>
+        <source>&amp;Edit Networks...</source>
+        <translation type="obsolete">&amp;Rediger Nettverk...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="334"/>
+        <source>Statusbar</source>
+        <translation>Statuslinje</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="80"/>
+        <source>Buffer Views</source>
+        <translation>Buffer visninger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="286"/>
+        <source>Manage Buffer Views</source>
+        <translation>Administrer Buffer visninger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="294"/>
+        <source>Lock Dock Positions</source>
+        <translation>LÃ¥s Dock posisjonene</translation>
+    </message>
+</context>
+<context>
+    <name>Message</name>
+    <message>
+        <location filename="../src/common/message.cpp" line="105"/>
+        <source>%DT[%1]</source>
+        <translation>%DT[%1]</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="110"/>
+        <source>%DS&lt;%1&gt;</source>
+        <translation>%DS&lt;%1&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="110"/>
+        <source>%D0%1</source>
+        <translation>%D0%1</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="112"/>
+        <source>%Dn[%1]</source>
+        <translation>%Dn[%1]</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="112"/>
+        <source>%Dn%1</source>
+        <translation>%Dn%1</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="114"/>
+        <source>%Ds*</source>
+        <translation>%Ds*</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="114"/>
+        <source>%Ds%1</source>
+        <translation>%Ds%1</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="116"/>
+        <source>%De*</source>
+        <translation>%De*</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="151"/>
+        <source>%De%1</source>
+        <translation>%De%1</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="118"/>
+        <source>%Dj--&gt;</source>
+        <translation>%Dj--&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="118"/>
+        <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
+        <translation>%Dj%DN%1%DN %DH(%2@%3)%DH har blitt med i %DC%4%DC</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="120"/>
+        <source>%Dp&lt;--</source>
+        <translation>%Dp&lt;--</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="120"/>
+        <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
+        <translation>%Dp%DN%1%DN %DH(%2@%3)%DH har forlatt %DC%4%DC</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="124"/>
+        <source>%Dq&lt;--</source>
+        <translation>%Dq&lt;--</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="124"/>
+        <source>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit</source>
+        <translation>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH har avsluttet</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="128"/>
+        <source>%Dk&lt;-*</source>
+        <translation>%Dk&lt;-*</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="132"/>
+        <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
+        <translation>%Dk%DN%1%DN har sparket %DN%2%DN fra %DC%3%DC</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="137"/>
+        <source>%Dr&lt;-&gt;</source>
+        <translation>%Dr&lt;-&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="138"/>
+        <source>%DrYou are now known as %DN%1%DN</source>
+        <translation>%DrDu er nÃ¥ kjent som %DN%1%DN</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="139"/>
+        <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
+        <translation>%Dr%DN%1%DN er nÃ¥ kjent som %DN%2%DN</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="142"/>
+        <source>%Dm***</source>
+        <translation>%Dm***</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="143"/>
+        <source>%DmUser mode: %DM%1%DM</source>
+        <translation>%DmBruker modus: %DM%1%DM</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="144"/>
+        <source>%DmMode %DM%1%DM by %DN%2%DN</source>
+        <translation>%DmModus %DM%1%DM av %DN%2%DN</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="147"/>
+        <source>%Da-*-</source>
+        <translation>%Da-*-</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="148"/>
+        <source>%Da%DN%1%DN %2</source>
+        <translation>%Da%DN%1%DN %2</translation>
+    </message>
+    <message>
+        <location filename="../src/common/message.cpp" line="152"/>
+        <source>%De[%1]</source>
+        <translation>%De[%1]</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkConnection</name>
+    <message>
+        <location filename="../src/core/networkconnection.cpp" line="190"/>
+        <source>Connection failed. Cycling to next Server</source>
+        <translation>Tilkobling feilet. Forsøker med neste Server</translation>
+    </message>
+    <message>
+        <location filename="../src/core/networkconnection.cpp" line="200"/>
+        <source>Connecting to %1:%2...</source>
+        <translation>Kobler til %1:%2...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/networkconnection.cpp" line="253"/>
+        <source>Disconnecting.</source>
+        <translation>Kobler fra.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/networkconnection.cpp" line="276"/>
+        <source>Could not connect to %1 (%2)</source>
+        <translation>Kunne ikke koble til %1 (%2)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/networkconnection.cpp" line="278"/>
+        <source>Connection failure: %1</source>
+        <translation>Tilkoblingsfeil: %1</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkEditDlg</name>
+    <message>
+        <location filename="../src/qtui/settingspages/networkeditdlg.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkeditdlg.ui" line="21"/>
+        <source>Please enter a network name:</source>
+        <translation>Vennligst skriv inn et nettverksnavn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="636"/>
+        <source>Add Network</source>
+        <translation>Legg til Nettverk</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkModel</name>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="637"/>
+        <source>Buffer</source>
+        <translation>Buffer</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="637"/>
+        <source>Topic</source>
+        <translation>Emne</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="637"/>
+        <source>Nick Count</source>
+        <translation>Antall Kallenavn</translation>
+    </message>
+</context>
+<context>
+    <name>NetworksSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="33"/>
+        <source>General</source>
+        <translation>Generelt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="33"/>
+        <source>Networks</source>
+        <translation>Nettverk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="144"/>
+        <source>&lt;b&gt;The following problems need to be corrected before your changes can be applied:&lt;/b&gt;&lt;ul&gt;</source>
+        <translation>&lt;b&gt;Følgende problemer mÃ¥ bli rettet før dine endringer kan blir pÃ¥ført:&lt;/b&gt;&lt;ul&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="145"/>
+        <source>&lt;li&gt;All networks need at least one server defined&lt;/li&gt;</source>
+        <translation>&lt;li&gt;Alle nettverk trenger minst en server definert&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="146"/>
+        <source>&lt;/ul&gt;</source>
+        <translation>&lt;/ul&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="147"/>
+        <source>Invalid Network Settings</source>
+        <translation>Ugyldige Nettverksinnstillinger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="184"/>
+        <source>Connect</source>
+        <translation>Koble til</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="187"/>
+        <source>Disconnect</source>
+        <translation>Koble fra</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="191"/>
+        <source>Apply first!</source>
+        <translation>Bruk først!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="533"/>
+        <source>Delete Network?</source>
+        <translation>Slette Nettverk?</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="534"/>
+        <source>Do you really want to delete the network &quot;%1&quot; and all related settings, including the backlog?</source>
+        <translation>Vil du virkelig slette nettverket &quot;%1&quot; og alle relaterte innstillinger, inkludert historikken?</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="37"/>
+        <source>Re&amp;name...</source>
+        <translation>Om&amp;døp...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="225"/>
+        <source>&amp;Add...</source>
+        <translation>&amp;Legg til...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="242"/>
+        <source>De&amp;lete</source>
+        <translation>&amp;Slett</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="110"/>
+        <source>Connect now</source>
+        <translation>Koble til nÃ¥</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="130"/>
+        <source>Network Details</source>
+        <translation>Nettverksdetaljer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="138"/>
+        <source>Identity:</source>
+        <translation>Identitet:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="540"/>
+        <source>This specifies how control messages, nicks and servernames are encoded.
+Unless you *really* know what you do, leave this as ISO-8859-1!</source>
+        <translation>Dette spesifiserer hvordan kontrollbeskjeder, kallenavn og servernavn blir kodet.
+Med mindre du *virkelig* vet hva du gjør, la denne stÃ¥ til ISO-8859-1!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="178"/>
+        <source>Servers</source>
+        <translation>Servere</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="207"/>
+        <source>&amp;Edit...</source>
+        <translation>&amp;Rediger...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="268"/>
+        <source>Move upwards in list</source>
+        <translation>Flytt opp i listen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="285"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="282"/>
+        <source>Move downwards in list</source>
+        <translation>Flytt ned i listen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="331"/>
+        <source>Choose random server for connecting</source>
+        <translation>Velg tilfeldig server for tilkobling</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="347"/>
+        <source>Perform</source>
+        <translation>Utfør</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="356"/>
+        <source>Commands to execute on connect:</source>
+        <translation>Kommandoer som skal utføres ved tilkobling:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="380"/>
+        <source>Auto Identify</source>
+        <translation>Autoidentifiser</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="412"/>
+        <source>Service:</source>
+        <translation>Tjeneste:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="395"/>
+        <source>NickServ</source>
+        <translation>NickServ</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="422"/>
+        <source>Password:</source>
+        <translation>Passord:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="441"/>
+        <source>Advanced</source>
+        <translation>Avansert</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="456"/>
+        <source>Encodings</source>
+        <translation>Koding</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="468"/>
+        <source>Send messages in:</source>
+        <translation>Send beskjeder i:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="431"/>
+        <source>Incoming messages encoded in Utf8 will always be treated as such. This setting defines the encoding for messages that are not Utf8.</source>
+        <translation type="obsolete">Innkommende beskjeder kodet i UTF8 vil alltid blir behandlet slik. Denne innstillinger definerer kodingen av beskjeder som ikke er UTF8.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="499"/>
+        <source>Receive fallback:</source>
+        <translation>Motta tilbakefall:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="530"/>
+        <source>Server encoding:</source>
+        <translation>Server koding:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="556"/>
+        <source>Use defaults</source>
+        <translation>Bruk standard</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="575"/>
+        <source>Automatic Reconnect</source>
+        <translation>Automatisk gjenoppkobling</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="586"/>
+        <source>Interval:</source>
+        <translation>Intervall:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="593"/>
+        <source> s</source>
+        <translation> s</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="609"/>
+        <source>Retries:</source>
+        <translation>Forsøk:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="629"/>
+        <source>Unlimited</source>
+        <translation>Ubegrenset</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="641"/>
+        <source>Rejoin all channels on reconnect</source>
+        <translation>gjenoppkoble medlemskapet i alle kanaler ved gjenoppkobling</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="181"/>
+        <source>Manage servers for this network</source>
+        <translation>Administrer servere for dette nettverket</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="350"/>
+        <source>Configure automatic identification or misc. commands to be executed after connecting to a server</source>
+        <translation>Konfigurer automatisk identifikasjon, eller forskjellige kommandoer som skal kjøres etter tilkoblin til en server</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="366"/>
+        <source>Specify a list of IRC commands to be executed upon connect.
+Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!</source>
+        <translation>Spesifiser en list av IRC kommandoer som skal kjøres ved tilkobling.
+Husk at Quassel IRC automatisk gjenoppkobler til kanaler, sÃ¥ /join trengs sjeldent her!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="444"/>
+        <source>Configure advanced settings such as message encodings and automatic reconnect</source>
+        <translation>Konfigurer avanserte innstillinger, slik som beskjed koding og automatisk gjenoppkobling</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="453"/>
+        <source>Control encodings for in- and outgoing messages</source>
+        <translation>Kontroller koding for inn- og utgÃ¥ende beskjeder</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="484"/>
+        <source>Specify which encoding your messages will be sent in.
+UTF-8 should be a sane choice for most networks.</source>
+        <translation>Spefiser hvilken koding dine beskjed skal bli sendt i.
+UTF-8 burde være det fornuftigste for de fleste nettverk.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="515"/>
+        <source>Incoming messages encoded in Utf8 will always be treated as such.
+This setting defines the encoding for messages that are not Utf8.</source>
+        <translation>Innkommende beskjeder som er kodet i Utf8 vil alltid bli behandlet slik.
+Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="553"/>
+        <source>Use default settings for encodings (recommended)</source>
+        <translation>Bruk standard innstillinger for kodinger (anbefalt)</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="572"/>
+        <source>Control automatic reconnect to the network</source>
+        <translation>Kontroller automatisk gjenoppkobling til nettverket</translation>
+    </message>
+</context>
+<context>
+    <name>NickEditDlg</name>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="501"/>
+        <source>Add Nickname</source>
+        <translation>Legg til Kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/nickeditdlg.ui" line="13"/>
+        <source>Edit Nickname</source>
+        <translation>Rediger Kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/nickeditdlg.ui" line="19"/>
+        <source>Please enter a valid nickname:</source>
+        <translation>Vennligst skriv inn et gyldig kallenavn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/nickeditdlg.ui" line="32"/>
+        <source>A valid nickname may contain letters from the English alphabet, digits, and the special characters {, }, [, ], \, |, `, ^, _ and -.</source>
+        <translation>Et gyldig kallenavn kan inneholde bokstaver fra det engelske alfabetet, tall, og spesialtegnene {, }, [, ], \, |, `, ^, _ og -.</translation>
+    </message>
+</context>
+<context>
+    <name>NickListWidget</name>
+    <message>
+        <location filename="../src/qtopia/ui/nicklistwidget.ui" line="13"/>
+        <source>Nicks in Channel</source>
+        <translation>Kallenavn i Kanal</translation>
+    </message>
+</context>
+<context>
+    <name>NickView</name>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="114"/>
+        <source>WHOIS</source>
+        <translation>WHOIS</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="115"/>
+        <source>VERSION</source>
+        <translation>VERSION</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="116"/>
+        <source>PING</source>
+        <translation>PING</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="120"/>
+        <source>Modes</source>
+        <translation>Modes</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="121"/>
+        <source>Op %1</source>
+        <translation>Op %1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="122"/>
+        <source>Deop %1</source>
+        <translation>Deop %1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="123"/>
+        <source>Voice %1</source>
+        <translation>Voice %1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="124"/>
+        <source>Devoice %1</source>
+        <translation>Devoice %1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="126"/>
+        <source>Kick/Ban</source>
+        <translation>Kick/Ban</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="127"/>
+        <source>Kick %1</source>
+        <translation>Kick %1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="129"/>
+        <source>Kickban %1</source>
+        <translation>Kickban %1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="130"/>
+        <source>Ignore</source>
+        <translation>Ignore</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="135"/>
+        <source>Query</source>
+        <translation>Query</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="136"/>
+        <source>DCC-Chat</source>
+        <translation>DCC-Chat</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="138"/>
+        <source>Send file</source>
+        <translation>Send fil</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="128"/>
+        <source>Ban %1</source>
+        <translation>Ban %1</translation>
+    </message>
+</context>
+<context>
+    <name>QtopiaMainWin</name>
+    <message>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="74"/>
+        <source>Show Toolbar</source>
+        <translation>Vis Verktøylinje</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="106"/>
+        <source>Quit Quassel IRC?</source>
+        <translation>Avslutte Quassel IRC?</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="106"/>
+        <source>Do you really want to quit Quassel IRC?</source>
+        <translation>Vil du virkelig avslutte Quassel IRC?</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="108"/>
+        <source>Quit</source>
+        <translation>Avslutt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="119"/>
+        <source>Show Buffers</source>
+        <translation>Vis Buffere</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="120"/>
+        <source>Show Nicks</source>
+        <translation>Vis Kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="129"/>
+        <source>About...</source>
+        <translation>Om...</translation>
+    </message>
+</context>
+<context>
+    <name>Quassel::secondsToString()</name>
+    <message>
+        <location filename="../src/common/util.cpp" line="165"/>
+        <source>year</source>
+        <translation>Ã¥r</translation>
+    </message>
+    <message>
+        <location filename="../src/common/util.cpp" line="166"/>
+        <source>day</source>
+        <translation>dag</translation>
+    </message>
+    <message>
+        <location filename="../src/common/util.cpp" line="167"/>
+        <source>h</source>
+        <translation>t</translation>
+    </message>
+    <message>
+        <location filename="../src/common/util.cpp" line="168"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../src/common/util.cpp" line="169"/>
+        <source>sec</source>
+        <translation>sek</translation>
+    </message>
+</context>
+<context>
+    <name>SaveIdentitiesDlg</name>
+    <message>
+        <location filename="../src/qtui/settingspages/saveidentitiesdlg.ui" line="13"/>
+        <source>Sync With Core</source>
+        <translation>Synk med Kjerne</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/saveidentitiesdlg.ui" line="21"/>
+        <source>Syncing data with core, please wait...</source>
+        <translation>Synkroniserer data med Kjernen, vennligst vent...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/saveidentitiesdlg.ui" line="81"/>
+        <source>Abort</source>
+        <translation>Avbryt</translation>
+    </message>
+</context>
+<context>
+    <name>ServerEditDlg</name>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="21"/>
+        <source>Server address:</source>
+        <translation>Server adresse:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="28"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="55"/>
+        <source>Password:</source>
+        <translation>Passord:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="77"/>
+        <source>Use SSL</source>
+        <translation>Bruk SSL</translation>
+    </message>
+</context>
+<context>
+    <name>SessionThread</name>
+    <message>
+        <location filename="../src/core/sessionthread.cpp" line="73"/>
+        <source>Could not initialize session!</source>
+        <translation>Kunne ikke initialisere sesjonen!</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDlg</name>
+    <message>
+        <location filename="../src/qtui/settingsdlg.cpp" line="71"/>
+        <source>Save changes</source>
+        <translation>Lagre endringer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingsdlg.cpp" line="72"/>
+        <source>There are unsaved changes on the current configuration page. Would you like to apply your changes now?</source>
+        <translation>Det er ikke-lagrede endringer i nÃ¥værende konfigurasjonsside. Vil du pÃ¥føre endringene nÃ¥?</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingsdlg.cpp" line="147"/>
+        <source>Reload Settings</source>
+        <translation>Gjeninnles innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingsdlg.cpp" line="147"/>
+        <source>Do you like to reload the settings, undoing your changes on this page?</source>
+        <translation>Vil du gjeninnlese innstillingene og angre dine endringer pÃ¥ denne siden?</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
+        <source>Restore Defaults</source>
+        <translation>Gjenopprett standard</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
+        <source>Do you like to restore the default values for this page?</source>
+        <translation>Vil du gjenopprette standard verdier for denne siden?</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/settingsdlg.ui" line="13"/>
+        <source>Configure Quassel</source>
+        <translation>Konfigurer Quassel</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/settingsdlg.ui" line="49"/>
+        <source>Settings</source>
+        <translation>Innstillinger</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsPageDlg</name>
+    <message>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
+        <source>Reload Settings</source>
+        <translation>Gjeninnles Innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
+        <source>Do you like to reload the settings, undoing your changes on this page?</source>
+        <translation>Vil du gjeninnlese innstillingene og angre endringene dine pÃ¥ denne siden?</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
+        <source>Restore Defaults</source>
+        <translation>Gjenopprett Standard</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
+        <source>Do you like to restore the default values for this page?</source>
+        <translation>Vil du gjenopprette standard verdier for denne siden?</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/settingspagedlg.ui" line="13"/>
+        <source>Dialog</source>
+        <translation type="obsolete">Dialog</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/settingspagedlg.ui" line="29"/>
+        <source>Settings</source>
+        <translation>Innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/settingspagedlg.ui" line="13"/>
+        <source>Configure Quassel</source>
+        <translation>Konfigurer Quassel</translation>
+    </message>
+</context>
+<context>
+    <name>SqliteStorage</name>
+    <message>
+        <location filename="../src/core/sqlitestorage.cpp" line="49"/>
+        <source>SQLite is a file-based database engine that does not require any setup. It is suitable for small and medium-sized databases that do not require access via network. Use SQLite if your Quassel Core should store its data on the same machine it is running on, and if you only expect a few users to use your core.</source>
+        <translation>SQLite er en filbasert database motor som ikke krever konfigurering. Den passer for smÃ¥ og medium store databaser som ikke krever tilgang fra nettverk. Bruk SQLite hvis din Quassel Kjerne skal lagre dataene pÃ¥ den samme maskinen som den kjører pÃ¥, og kun hvis du forventer at et fÃ¥tall personer skal benytte din Kjerne.</translation>
+    </message>
+</context>
+<context>
+    <name>StorageDetailsPage</name>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="118"/>
+        <source>Setup Storage Provider</source>
+        <translation type="obsolete">Konfigurer Lagringsleverandør</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="119"/>
+        <source>Please enter credentials for the selected storage provider.</source>
+        <translation type="obsolete">Vennligst skriv inn autentisieringsdetaljene for valgt lagrings leverandør.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="121"/>
+        <source>Host:</source>
+        <translation type="obsolete">Vert:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="125"/>
+        <source>Port:</source>
+        <translation type="obsolete">Port:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="131"/>
+        <source>Database:</source>
+        <translation type="obsolete">Database:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="135"/>
+        <source>User:</source>
+        <translation type="obsolete">Bruker:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="139"/>
+        <source>Password:</source>
+        <translation type="obsolete">Passord:</translation>
+    </message>
+</context>
+<context>
+    <name>StorageSelectionPage</name>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="94"/>
+        <source>Select Storage Provider</source>
+        <translation type="obsolete">Velg Lagringsleverandør</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="95"/>
+        <source>Please select the storage provider you want to use.</source>
+        <translation type="obsolete">Vennligst velg lagringsleverandøren du Ã¸nsker Ã¥ benytte.</translation>
+    </message>
+</context>
+<context>
+    <name>TopicButton</name>
+    <message>
+        <location filename="../src/qtui/topicbutton.cpp" line="39"/>
+        <source>Click to edit!</source>
+        <translation type="obsolete">Klikk for Ã¥ redigere!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/topicbutton.cpp" line="80"/>
+        <source>%1
+
+Click to edit!</source>
+        <translation type="obsolete">%1Klikk for Ã¥ redigere!</translation>
+    </message>
+</context>
+<context>
+    <name>TopicLabel</name>
+    <message>
+        <location filename="../src/qtui/topiclabel.cpp" line="43"/>
+        <source>Drag to scroll the topic!</source>
+        <translation>Dra for Ã¥ rulle emnet!</translation>
+    </message>
+</context>
+<context>
+    <name>TopicWidget</name>
+    <message>
+        <location filename="../src/qtui/ui/topicwidget.ui" line="31"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/topicwidget.ui" line="65"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+</context>
+<context>
+    <name>UiStyle</name>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="273"/>
+        <source>%DT[%1]</source>
+        <translation>%DT[%1]</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="278"/>
+        <source>%DS&lt;%1&gt;</source>
+        <translation>%DS&lt;%1&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="278"/>
+        <source>%D0%1</source>
+        <translation>%D0%1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="280"/>
+        <source>%Dn[%1]</source>
+        <translation>%Dn[%1]</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="280"/>
+        <source>%Dn%1</source>
+        <translation>%Dn%1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="282"/>
+        <source>%Ds*</source>
+        <translation>%Ds*</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="282"/>
+        <source>%Ds%1</source>
+        <translation>%Ds%1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="284"/>
+        <source>%De*</source>
+        <translation>%De*</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="319"/>
+        <source>%De%1</source>
+        <translation>%De%1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="286"/>
+        <source>%Dj--&gt;</source>
+        <translation>%Dj--&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="286"/>
+        <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
+        <translation>%Dj%DN%1%DN %DH(%2@%3)%DH har blitt med i %DC%4%DC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="288"/>
+        <source>%Dp&lt;--</source>
+        <translation>%Dp&lt;--</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="288"/>
+        <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
+        <translation>%Dp%DN%1%DN %DH(%2@%3)%DH har forlatt %DC%4%DC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="292"/>
+        <source>%Dq&lt;--</source>
+        <translation>%Dq&lt;--</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="292"/>
+        <source>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit</source>
+        <translation>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH har avsluttet</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="296"/>
+        <source>%Dk&lt;-*</source>
+        <translation>%Dk&lt;-*</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="300"/>
+        <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
+        <translation>%Dk%DN%1%DN har sparket %DN%2%DN fra %DC%3%DC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="305"/>
+        <source>%Dr&lt;-&gt;</source>
+        <translation>%Dr&lt;-&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="306"/>
+        <source>%DrYou are now known as %DN%1%DN</source>
+        <translation>%DrDu er nÃ¥ kjent som %DN%1%DN</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="307"/>
+        <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
+        <translation>%Dr%DN%1%DN er nÃ¥ kjent som %DN%2%DN</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="310"/>
+        <source>%Dm***</source>
+        <translation>%Dm***</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="311"/>
+        <source>%DmUser mode: %DM%1%DM</source>
+        <translation>%DmBruker modus: %DM%1%DM</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="312"/>
+        <source>%DmMode %DM%1%DM by %DN%2%DN</source>
+        <translation>%DmModus %DM%1%DM av %DN%2%DN</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="315"/>
+        <source>%Da-*-</source>
+        <translation>%Da-*-</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="316"/>
+        <source>%Da%DN%1%DN %2</source>
+        <translation>%Da%DN%1%DN %2</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="320"/>
+        <source>%De[%1]</source>
+        <translation>%De[%1]</translation>
+    </message>
+</context>
+<context>
+    <name>UserCategoryItem</name>
+    <message numerus="yes">
+        <location filename="../src/client/networkmodel.cpp" line="489"/>
+        <source>%n Owner(s)</source>
+        <translation>
+            <numerusform>%n Owner</numerusform>
+            <numerusform>%n Owners</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/networkmodel.cpp" line="490"/>
+        <source>%n Admin(s)</source>
+        <translation>
+            <numerusform>%n Admin</numerusform>
+            <numerusform>%n Admins</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/networkmodel.cpp" line="491"/>
+        <source>%n Operator(s)</source>
+        <translation>
+            <numerusform>%n Operator</numerusform>
+            <numerusform>%n Operators</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/networkmodel.cpp" line="492"/>
+        <source>%n Half-Op(s)</source>
+        <translation>
+            <numerusform>%n Half-Op</numerusform>
+            <numerusform>%n Half-Ops</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/networkmodel.cpp" line="493"/>
+        <source>%n Voiced</source>
+        <translation>
+            <numerusform>%n Voiced</numerusform>
+            <numerusform>%n Voiced</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/networkmodel.cpp" line="494"/>
+        <source>%n User(s)</source>
+        <translation>
+            <numerusform>%n User</numerusform>
+            <numerusform>%n Users</numerusform>
+        </translation>
+    </message>
+</context>
+<context>
+    <name>UserInputHandler</name>
+    <message>
+        <location filename="../src/core/userinputhandler.cpp" line="113"/>
+        <source>sending CTCP-%1 request</source>
+        <translation>Sender CTCP-%1 forespørsel</translation>
+    </message>
+</context>
+</TS>
index 2c2a038..6b155a0 100644 (file)
 #include "util.h" // get rid of this (needed for isChannelName)
 
 /*****************************************
-*  Fancy Buffer Items
+*  Network Items
 *****************************************/
-BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
-  : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
-    _bufferInfo(bufferInfo),
-    _bufferName(bufferInfo.bufferName()),
-    _activity(Buffer::NoActivity),
-    _ircChannel(0)
+NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
+  : PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
+    _networkId(netid)
 {
-  Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
-  if(bufferType() == BufferInfo::QueryBuffer)
-    flags |= Qt::ItemIsDropEnabled;
+  setFlags(Qt::ItemIsEnabled);
+}
 
-  if(bufferType() == BufferInfo::StatusBuffer) {
-    NetworkItem *networkItem = qobject_cast<NetworkItem *>(parent);
-    connect(networkItem, SIGNAL(dataChanged()), this, SIGNAL(dataChanged()));
+QVariant NetworkItem::data(int column, int role) const {
+  switch(role) {
+  case NetworkModel::NetworkIdRole:
+    return qVariantFromValue(_networkId);
+  case NetworkModel::ItemTypeRole:
+    return NetworkModel::NetworkItemType;
+  case NetworkModel::ItemActiveRole:
+    return isActive();
+  default:
+    return PropertyMapItem::data(column, role);
   }
-  setFlags(flags);
 }
 
-quint64 BufferItem::id() const {
-  return qHash(bufferInfo().bufferId());
+BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
+  BufferItem *bufferItem = qobject_cast<BufferItem *>(childById(qHash(bufferInfo.bufferId())));
+  if(bufferItem)
+    return bufferItem;
+  
+  switch(bufferInfo.type()) {
+  case BufferInfo::StatusBuffer:
+    bufferItem = new StatusBufferItem(bufferInfo, this);
+    break;
+  case BufferInfo::ChannelBuffer:
+    bufferItem = new ChannelBufferItem(bufferInfo, this);
+    break;
+  case BufferInfo::QueryBuffer:
+    bufferItem = new QueryBufferItem(bufferInfo, this);
+    break;
+  default:
+    bufferItem = new BufferItem(bufferInfo, this);
+  }
+
+  newChild(bufferItem);
+  return bufferItem;
 }
 
-// bool BufferItem::isStatusBuffer() const {
-//   return bufferType() == BufferInfo::StatusBuffer;
-// }
+void NetworkItem::attachNetwork(Network *network) {
+  if(!network)
+    return;
+  
+  _network = network;
 
-bool BufferItem::isActive() const {
-  if(bufferType() == BufferInfo::ChannelBuffer)
-    return _ircChannel;
-  else
-    return qobject_cast<NetworkItem *>(parent())->isActive();
+  connect(network, SIGNAL(networkNameSet(QString)),
+         this, SLOT(setNetworkName(QString)));
+  connect(network, SIGNAL(currentServerSet(QString)),
+         this, SLOT(setCurrentServer(QString)));
+  connect(network, SIGNAL(ircChannelAdded(IrcChannel *)),
+         this, SLOT(attachIrcChannel(IrcChannel *)));
+  connect(network, SIGNAL(connectedSet(bool)),
+         this, SIGNAL(dataChanged()));
+  connect(network, SIGNAL(destroyed()),
+         this, SIGNAL(dataChanged()));
+  
+  emit dataChanged();
+}
+
+void NetworkItem::attachIrcChannel(IrcChannel *ircChannel) {
+  ChannelBufferItem *channelItem;
+  for(int i = 0; i < childCount(); i++) {
+    channelItem = qobject_cast<ChannelBufferItem *>(child(i));
+    if(!channelItem)
+      continue;
+
+    if(channelItem->bufferName().toLower() == ircChannel->name().toLower()) {
+      channelItem->attachIrcChannel(ircChannel);
+      break;
+    }
+  }
+}
+
+void NetworkItem::setNetworkName(const QString &networkName) {
+  Q_UNUSED(networkName);
+  emit dataChanged(0);
+}
+
+void NetworkItem::setCurrentServer(const QString &serverName) {
+  Q_UNUSED(serverName);
+  emit dataChanged(1);
+}
+
+
+QString NetworkItem::toolTip(int column) const {
+  Q_UNUSED(column);
+
+  QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
+  toolTip.append(QString("Server: %1").arg(currentServer()));
+  toolTip.append(QString("Users: %1").arg(nickCount()));
+
+  return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
+}
+
+/*****************************************
+*  Fancy Buffer Items
+*****************************************/
+BufferItem::BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent)
+  : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
+    _bufferInfo(bufferInfo),
+    _activity(Buffer::NoActivity)
+{
+  setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
 }
 
 void BufferItem::setActivityLevel(Buffer::ActivityLevel level) {
@@ -104,6 +180,7 @@ QVariant BufferItem::data(int column, int role) const {
 }
 
 bool BufferItem::setData(int column, const QVariant &value, int role) {
+  qDebug() << "BufferItem::setData(int column, const QVariant &value, int role):" << this << column << value << role;
   switch(role) {
   case NetworkModel::BufferActivityRole:
     setActivityLevel((Buffer::ActivityLevel)value.toInt());
@@ -114,10 +191,122 @@ bool BufferItem::setData(int column, const QVariant &value, int role) {
   return true;
 }
 
+void BufferItem::setBufferName(const QString &name) {
+  _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), name);
+  emit dataChanged(0);
+}
+
+QString BufferItem::toolTip(int column) const {
+  Q_UNUSED(column);
+  return tr("<p> %1 - %2 </p>").arg(bufferInfo().bufferId().toInt()).arg(bufferName());
+}
 
-void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
-  if(!ircChannel)
-    return;
+/*
+void BufferItem::setLastMsgInsert(QDateTime msgDate) {
+  if(msgDate.isValid() && msgDate > _lastMsgInsert)
+    _lastMsgInsert = msgDate;
+}
+*/
+/*
+// FIXME emit dataChanged()
+bool BufferItem::setLastSeen() {
+  if(_lastSeen > _lastMsgInsert)
+    return false;
+  
+  _lastSeen = _lastMsgInsert;
+  BufferSettings(bufferInfo().bufferId()).setLastSeen(_lastSeen);
+  return true;
+}
+
+QDateTime BufferItem::lastSeen() {
+  return _lastSeen;
+}
+*/
+
+/*****************************************
+*  StatusBufferItem
+*****************************************/
+StatusBufferItem::StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent)
+  : BufferItem(bufferInfo, parent)
+{
+  Q_ASSERT(parent);
+  connect(parent, SIGNAL(dataChanged()), this, SIGNAL(dataChanged()));
+}
+
+QString StatusBufferItem::toolTip(int column) const {
+  Q_UNUSED(column);
+  QStringList toolTip;
+
+  QString netName = Client::network(bufferInfo().networkId())->networkName();
+  toolTip.append(tr("<b>Status buffer of %1</b>").arg(netName));
+
+  return tr("<p> %1 </p>").arg(toolTip.join("<br />"));
+}
+
+/*****************************************
+*  QueryBufferItem
+*****************************************/
+QueryBufferItem::QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent)
+  : BufferItem(bufferInfo, parent)
+{
+  setFlags(flags() | Qt::ItemIsDropEnabled);
+}
+
+QString QueryBufferItem::toolTip(int column) const {
+  Q_UNUSED(column);
+  QStringList toolTip;
+
+  toolTip.append(tr("<b>Query with %1</b>").arg(bufferName()));
+  if(topic() != "") {
+    toolTip.append(tr("Away Message: %1").arg(topic()));
+  }
+
+  return tr("<p> %1 </p>").arg(toolTip.join("<br />"));
+}
+
+/*****************************************
+*  ChannelBufferItem
+*****************************************/
+ChannelBufferItem::ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent)
+  : BufferItem(bufferInfo, parent),
+    _ircChannel(0)
+{
+}
+
+QString ChannelBufferItem::toolTip(int column) const {
+  Q_UNUSED(column);
+  QStringList toolTip;
+
+  toolTip.append(tr("<b>Channel %1</b>").arg(bufferName()));
+  if(isActive()) {
+    //TODO: add channel modes 
+    toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
+    if(_ircChannel) {
+      QString channelMode = _ircChannel->channelModeString(); // channelModeString is compiled on the fly -> thus cache the result
+      if(!channelMode.isEmpty())
+       toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
+    }
+    
+    BufferSettings s;
+    bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();
+    if(showTopic) {
+      QString _topic = topic();
+      if(_topic != "") {
+       _topic.replace(QString("<"), QString("&lt;"));
+       _topic.replace(QString(">"), QString("&gt;"));
+       toolTip.append(QString("<font size='-2'>&nbsp;</font>"));
+       toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
+      }
+    }
+  } else {
+    toolTip.append(tr("Not active <br /> Double-click to join"));
+  }
+
+  return tr("<p> %1 </p>").arg(toolTip.join("<br />"));  
+}
+
+void ChannelBufferItem::attachIrcChannel(IrcChannel *ircChannel) {
+  Q_ASSERT(!_ircChannel && ircChannel);
   
   _ircChannel = ircChannel;
 
@@ -142,7 +331,7 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
   emit dataChanged();
 }
 
-void BufferItem::ircChannelDestroyed() {
+void ChannelBufferItem::ircChannelDestroyed() {
   Q_CHECK_PTR(_ircChannel);
   disconnect(_ircChannel, 0, this, 0);
   _ircChannel = 0;
@@ -150,48 +339,14 @@ void BufferItem::ircChannelDestroyed() {
   removeAllChilds();
 }
 
-QString BufferItem::bufferName() const {
-  if(bufferType() == BufferInfo::StatusBuffer)
-    return tr("Status Buffer");
-  else
-    return _bufferName;
-}
-
-void BufferItem::setBufferName(const QString &name) {
-  _bufferName = name;
-  // as long as we need those bufferInfos, we have to update that one aswell.
-  // pretty ugly though :/
-  _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), name);
-  emit dataChanged(0);
-}
-
-QString BufferItem::topic() const {
-  if(_ircChannel)
-    return _ircChannel->topic();
-  else
-    return QString();
-}
-
-void BufferItem::ircUserDestroyed() {
+void ChannelBufferItem::ircUserDestroyed() {
   // PRIVATE
   IrcUser *ircUser = static_cast<IrcUser *>(sender());
   removeUserFromCategory(ircUser);
   emit dataChanged(2);
 }
 
-int BufferItem::nickCount() const {
-  if(_ircChannel)
-    return _ircChannel->ircUsers().count();
-  else
-    return 0;
-}
-
-void BufferItem::setTopic(const QString &topic) {
-  Q_UNUSED(topic);
-  emit dataChanged(1);
-}
-
-void BufferItem::join(const QList<IrcUser *> &ircUsers) {
+void ChannelBufferItem::join(const QList<IrcUser *> &ircUsers) {
   addUsersToCategory(ircUsers);
 
   foreach(IrcUser *ircUser, ircUsers) {
@@ -203,18 +358,22 @@ void BufferItem::join(const QList<IrcUser *> &ircUsers) {
   emit dataChanged(2);
 }
 
-void BufferItem::addUserToCategory(IrcUser *ircUser) {
+void ChannelBufferItem::addUserToCategory(IrcUser *ircUser) {
   addUsersToCategory(QList<IrcUser *>() << ircUser);
 }
 
-void BufferItem::addUsersToCategory(const QList<IrcUser *> &ircUsers) {
+void ChannelBufferItem::addUsersToCategory(const QList<IrcUser *> &ircUsers) {
   Q_ASSERT(_ircChannel);
 
   QHash<UserCategoryItem *, QList<IrcUser *> > categories;
+
+  int categoryId = -1;
+  UserCategoryItem *categoryItem = 0;
+  
   foreach(IrcUser *ircUser, ircUsers) {
-    UserCategoryItem *categoryItem;
-    int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
-    if(!(categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId))))) {
+    categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
+    categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)));
+    if(!categoryItem) {
       categoryItem = new UserCategoryItem(categoryId, this);
       categories[categoryItem] = QList<IrcUser *>();
       newChild(categoryItem);
@@ -229,9 +388,9 @@ void BufferItem::addUsersToCategory(const QList<IrcUser *> &ircUsers) {
   }
 }
 
-void BufferItem::part(IrcUser *ircUser) {
+void ChannelBufferItem::part(IrcUser *ircUser) {
   if(!ircUser) {
-    qWarning() << bufferName() << "BufferItem::part(): unknown User" << ircUser;
+    qWarning() << bufferName() << "ChannelBufferItem::part(): unknown User" << ircUser;
     return;
   }
 
@@ -240,7 +399,7 @@ void BufferItem::part(IrcUser *ircUser) {
   emit dataChanged(2);
 }
 
-void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
+void ChannelBufferItem::removeUserFromCategory(IrcUser *ircUser) {
   if(!_ircChannel) {
     // If we parted the channel there might still be some ircUsers connected.
     // in that case we just ignore the call
@@ -248,224 +407,49 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
     return;
   }
 
-  bool success = false;
   UserCategoryItem *categoryItem = 0;
   for(int i = 0; i < childCount(); i++) {
     categoryItem = qobject_cast<UserCategoryItem *>(child(i));
-    if((success = categoryItem->removeUser(ircUser))) {
+    if(categoryItem->removeUser(ircUser)) {
       if(categoryItem->childCount() == 0)
        removeChild(i);
       break;
     }
   }
-
-//   if(!success) {
-//     qDebug() << "didn't find User:" << ircUser << qHash(ircUser);
-//     qDebug() << "==== Childlist for Item:" << this << id() << bufferName() << "====";
-//     for(int i = 0; i < childCount(); i++) {
-//       categoryItem = qobject_cast<UserCategoryItem *>(child(i));
-//       categoryItem->dumpChildList();
-//     }
-//     qDebug() << "==== End Of Childlist for Item:" << this << id() << bufferName() << "====";
-//   }
-//   Q_ASSERT(success);
 }
 
-void BufferItem::userModeChanged(IrcUser *ircUser) {
+void ChannelBufferItem::userModeChanged(IrcUser *ircUser) {
   Q_ASSERT(_ircChannel);
 
-  UserCategoryItem *categoryItem;
   int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
-  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById(qHash(ircUser)))
-    return; // already in the right category;
-  
-  removeUserFromCategory(ircUser);
-  addUserToCategory(ircUser);
-}
-
-QString BufferItem::toolTip(int column) const {
-  Q_UNUSED(column);
-  QStringList toolTip;
-
-  switch(bufferType()) {
-    case BufferInfo::StatusBuffer: {
-      QString netName = Client::network(bufferInfo().networkId())->networkName();
-      toolTip.append(tr("<b>Status buffer of %1</b>").arg(netName));
-      break;
-    }
-    case BufferInfo::ChannelBuffer:
-      toolTip.append(tr("<b>Channel %1</b>").arg(bufferName()));
-      if(isActive()) {
-        //TODO: add channel modes 
-        toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
-
-        BufferSettings s;
-        bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();
-        if(showTopic) {
-          QString _topic = topic();
-          if(_topic != "") {
-            _topic.replace(QString("<"), QString("&lt;"));
-            _topic.replace(QString(">"), QString("&gt;"));
-            toolTip.append(QString("<font size='-2'>&nbsp;</font>"));
-            toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
-          }
-        }
-       if(_ircChannel) {
-         QString channelMode = _ircChannel->channelModeString(); // channelModeString is compiled on the fly -> thus cache the result
-         if(!channelMode.isEmpty())
-           toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
-       }
-      } else {
-        toolTip.append(tr("Not active <br /> Double-click to join"));
-      }
-      break;
-    case BufferInfo::QueryBuffer:
-      toolTip.append(tr("<b>Query with %1</b>").arg(bufferName()));
-      if(topic() != "") toolTip.append(tr("Away Message: %1").arg(topic()));
-      break;
-    default: //this should not happen
-      toolTip.append(tr("%1 - %2").arg(bufferInfo().bufferId().toInt()).arg(bufferName()));
-      break;
-  }
-
-  return tr("<p> %1 </p>").arg(toolTip.join("<br />"));
-}
-
-/*
-void BufferItem::setLastMsgInsert(QDateTime msgDate) {
-  if(msgDate.isValid() && msgDate > _lastMsgInsert)
-    _lastMsgInsert = msgDate;
-}
-*/
-/*
-// FIXME emit dataChanged()
-bool BufferItem::setLastSeen() {
-  if(_lastSeen > _lastMsgInsert)
-    return false;
-  
-  _lastSeen = _lastMsgInsert;
-  BufferSettings(bufferInfo().bufferId()).setLastSeen(_lastSeen);
-  return true;
-}
-
-QDateTime BufferItem::lastSeen() {
-  return _lastSeen;
-}
-*/
-/*****************************************
-*  Network Items
-*****************************************/
-NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
-  : PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
-    _networkId(netid)
-{
-  setFlags(Qt::ItemIsEnabled);
-}
-
-QVariant NetworkItem::data(int column, int role) const {
-  switch(role) {
-  case NetworkModel::NetworkIdRole:
-    return qVariantFromValue(_networkId);
-  case NetworkModel::ItemTypeRole:
-    return NetworkModel::NetworkItemType;
-  case NetworkModel::ItemActiveRole:
-    return isActive();
-  default:
-    return PropertyMapItem::data(column, role);
+  UserCategoryItem *categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)));
+    
+  if(categoryItem) {
+    if(categoryItem->childById(qHash(ircUser)))
+      return; // already in the right category;
+  } else {
+    categoryItem = new UserCategoryItem(categoryId, this);
+    newChild(categoryItem);
   }
-}
-
-quint64 NetworkItem::id() const {
-  return qHash(_networkId);
-}
-
-bool NetworkItem::isActive() const {
-  if(_network)
-    return _network->isConnected();
-  else
-    return false;
-}
-
-QString NetworkItem::networkName() const {
-  if(_network)
-    return _network->networkName();
-  else
-    return QString();
-}
-
-QString NetworkItem::currentServer() const {
-  if(_network)
-    return _network->currentServer();
-  else
-    return QString();
-}
-
-int NetworkItem::nickCount() const {
-  if(_network)
-    return _network->ircUsers().count();
-  else
-    return 0;
-}
 
-void NetworkItem::attachNetwork(Network *network) {
-  if(!network)
-    return;
-  
-  _network = network;
-
-  connect(network, SIGNAL(networkNameSet(QString)),
-         this, SLOT(setNetworkName(QString)));
-  connect(network, SIGNAL(currentServerSet(QString)),
-         this, SLOT(setCurrentServer(QString)));
-  connect(network, SIGNAL(ircChannelAdded(QString)),
-         this, SLOT(attachIrcChannel(QString)));
-  connect(network, SIGNAL(connectedSet(bool)),
-         this, SIGNAL(dataChanged()));
-  connect(network, SIGNAL(destroyed()),
-         this, SIGNAL(dataChanged()));
-  
-  emit dataChanged();
-}
-
-void NetworkItem::attachIrcChannel(const QString &channelName) {
-  IrcChannel *ircChannel = _network->ircChannel(channelName);
-  if(!ircChannel) {
-    qWarning() << "NetworkItem::attachIrcChannel(): unkown Channel" << channelName;
-    return;
-  }
-  
-  BufferItem *bufferItem;
+  // find the item that needs reparenting
+  IrcUserItem *ircUserItem = 0;
   for(int i = 0; i < childCount(); i++) {
-    bufferItem = qobject_cast<BufferItem *>(child(i));
-    if(bufferItem->bufferName().toLower() == ircChannel->name().toLower()) {
-      bufferItem->attachIrcChannel(ircChannel);
+    UserCategoryItem *categoryItem = qobject_cast<UserCategoryItem *>(child(i));
+    IrcUserItem *userItem = qobject_cast<IrcUserItem *>(categoryItem->childById(qHash(ircUser)));
+    if(userItem) {
+      ircUserItem = userItem;
       break;
     }
   }
-}
 
-void NetworkItem::setNetworkName(const QString &networkName) {
-  Q_UNUSED(networkName);
-  emit dataChanged(0);
-}
-
-void NetworkItem::setCurrentServer(const QString &serverName) {
-  Q_UNUSED(serverName);
-  emit dataChanged(1);
-}
-
-
-QString NetworkItem::toolTip(int column) const {
-  Q_UNUSED(column);
-
-  QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
-  toolTip.append(QString("Server: %1").arg(currentServer()));
-  toolTip.append(QString("Users: %1").arg(nickCount()));
-
-  return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
+  if(!ircUserItem) {
+    qWarning() << "ChannelBufferItem::userModeChanged(IrcUser *): unable to determine old category of" << ircUser;
+    return;
+  }
+  ircUserItem->reParent(categoryItem);
 }
 
-
 /*****************************************
 *  User Category Items (like @vh etc.)
 *****************************************/
@@ -477,7 +461,6 @@ UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "categoryName", parent),
     _category(category)
 {
-
 }
 
 // caching this makes no sense, since we display the user number dynamically
@@ -502,10 +485,14 @@ void UserCategoryItem::addUsers(const QList<IrcUser *> &ircUsers) {
   foreach(IrcUser *ircUser, ircUsers)
     userItems << new IrcUserItem(ircUser, this);
   newChilds(userItems);
+  emit dataChanged(0);
 }
 
 bool UserCategoryItem::removeUser(IrcUser *ircUser) {
-  return removeChildById(qHash(ircUser));
+  bool success = removeChildById(qHash(ircUser));
+  if(success)
+    emit dataChanged(0);
+  return success;
 }
 
 int UserCategoryItem::categoryFromModes(const QString &modes) {
@@ -588,8 +575,11 @@ QString IrcUserItem::toolTip(int column) const {
   Q_UNUSED(column);
   QStringList toolTip(QString("<b>%1</b>").arg(nickName()));
   if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes()));
-  if(_ircUser->isAway()) toolTip[0].append(" is away");
-  if(!_ircUser->awayMessage().isEmpty()) toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
+  if(_ircUser->isAway()) {
+    toolTip[0].append(" is away");
+    if(!_ircUser->awayMessage().isEmpty())
+      toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
+  }
   if(!_ircUser->realName().isEmpty()) toolTip.append(_ircUser->realName());
   if(!_ircUser->ircOperator().isEmpty()) toolTip.append(QString("%1 %2").arg(nickName()).arg(_ircUser->ircOperator()));
   if(!_ircUser->suserHost().isEmpty()) toolTip.append(_ircUser->suserHost());
@@ -693,15 +683,8 @@ BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) {
 }
 
 BufferItem *NetworkModel::bufferItem(const BufferInfo &bufferInfo) {
-  BufferItem *bufItem = existsBufferItem(bufferInfo);
-  if(bufItem == 0) {
-    NetworkItem *netItem = networkItem(bufferInfo.networkId());
-    bufItem = new BufferItem(bufferInfo, netItem);
-    netItem->newChild(bufItem);
-  }
-
-  Q_ASSERT(bufItem);
-  return bufItem;
+  NetworkItem *netItem = networkItem(bufferInfo.networkId());
+  return netItem->bufferItem(bufferInfo);
 }
 
 QStringList NetworkModel::mimeTypes() const {
index 8dceb5a..014cab1 100644 (file)
@@ -33,12 +33,52 @@ class BufferInfo;
 #include "selectionmodelsynchronizer.h"
 #include "modelpropertymapper.h"
 #include "clientsettings.h"
+#include "ircchannel.h"
 #include "ircuser.h"
+#include "network.h"
 
 class MappedSelectionModel;
 class QAbstractItemView;
-class Network;
-class IrcChannel;
+class BufferItem;
+
+/*****************************************
+ *  Network Items
+ *****************************************/
+class NetworkItem : public PropertyMapItem {
+  Q_OBJECT
+  Q_PROPERTY(QString networkName READ networkName)
+  Q_PROPERTY(QString currentServer READ currentServer)
+  Q_PROPERTY(int nickCount READ nickCount)
+    
+public:
+  NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
+
+  virtual quint64 id() const { return qHash(_networkId); }
+  virtual QVariant data(int column, int row) const;
+
+  inline bool isActive() const { return (bool)_network ? _network->isConnected() : false; }
+
+  inline const NetworkId &networkId() const { return _networkId; }
+  inline QString networkName() const { return (bool)_network ? _network->networkName() : QString(); }
+  inline QString currentServer() const { return (bool)_network ? _network->currentServer() : QString(); }
+  inline int nickCount() const { return (bool)_network ? _network->ircUsers().count() : 0; }
+
+  virtual QString toolTip(int column) const;
+
+  BufferItem *bufferItem(const BufferInfo &bufferInfo);
+
+public slots:
+  void setNetworkName(const QString &networkName);
+  void setCurrentServer(const QString &serverName);
+
+  void attachNetwork(Network *network);
+  void attachIrcChannel(IrcChannel *channel);
+
+private:
+  NetworkId _networkId;
+
+  QPointer<Network> _network;
+};
 
 /*****************************************
  *  Fancy Buffer Items
@@ -50,26 +90,22 @@ class BufferItem : public PropertyMapItem {
   Q_PROPERTY(int nickCount READ nickCount)
 
 public:
-  BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent = 0);
+  BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent = 0);
 
   inline const BufferInfo &bufferInfo() const { return _bufferInfo; }
-  virtual quint64 id() const;
+  virtual inline quint64 id() const { return qHash(_bufferInfo.bufferId()); }
   virtual QVariant data(int column, int role) const;
   virtual bool setData(int column, const QVariant &value, int role);
 
-  void attachIrcChannel(IrcChannel *ircChannel);
-
-  QString bufferName() const;
   inline BufferId bufferId() const { return _bufferInfo.bufferId(); }
   inline BufferInfo::Type bufferType() const { return _bufferInfo.type(); }
 
   void setBufferName(const QString &name);
-  QString topic() const;
-  int nickCount() const;
-
-  // bool isStatusBuffer() const;
+  virtual inline QString bufferName() const { return _bufferInfo.bufferName(); }
+  virtual inline QString topic() const { return QString(); }
+  virtual inline int nickCount() const { return 0; }
 
-  bool isActive() const;
+  virtual inline bool isActive() const { return qobject_cast<NetworkItem *>(parent())->isActive(); }
 
   inline Buffer::ActivityLevel activityLevel() const { return _activity; }
   void setActivityLevel(Buffer::ActivityLevel level);
@@ -82,63 +118,70 @@ public:
   virtual QString toolTip(int column) const;
 
 public slots:
-  void setTopic(const QString &topic);
-  void join(const QList<IrcUser *> &ircUsers);
-  void part(IrcUser *ircUser);
-
-  void addUserToCategory(IrcUser *ircUser);
-  void addUsersToCategory(const QList<IrcUser *> &ircUser);
-  void removeUserFromCategory(IrcUser *ircUser);
-  void userModeChanged(IrcUser *ircUser);
-
-private slots:
-  void ircChannelDestroyed();
-  void ircUserDestroyed();
+  virtual inline void setTopic(const QString &) { emit dataChanged(1); }
 
 private:
   BufferInfo _bufferInfo;
-  QString _bufferName;
   Buffer::ActivityLevel _activity;
-
-  IrcChannel *_ircChannel;
 };
 
+/*****************************************
+*  StatusBufferItem
+*****************************************/
+class StatusBufferItem : public BufferItem {
+  Q_OBJECT
+
+public:
+  StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
+
+  virtual QString toolTip(int column) const;
+  virtual inline QString bufferName() const { return tr("Status Buffer"); }
+};
 
 /*****************************************
- *  Network Items
- *****************************************/
-class NetworkItem : public PropertyMapItem {
+*  QueryBufferItem
+*****************************************/
+class QueryBufferItem : public BufferItem {
   Q_OBJECT
-  Q_PROPERTY(QString networkName READ networkName)
-  Q_PROPERTY(QString currentServer READ currentServer)
-  Q_PROPERTY(int nickCount READ nickCount)
-    
+
 public:
-  NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
+  QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
 
-  virtual quint64 id() const;
-  virtual QVariant data(int column, int row) const;
+  virtual QString toolTip(int column) const;
+};
 
-  bool isActive() const;
+/*****************************************
+*  ChannelBufferItem
+*****************************************/
+class ChannelBufferItem : public BufferItem {
+  Q_OBJECT
 
-  inline const NetworkId &networkId() const { return _networkId; }
-  QString networkName() const;
-  QString currentServer() const;
-  int nickCount() const;
+public:
+  ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent);
 
+  virtual inline bool isActive() const { return (bool)_ircChannel; }
   virtual QString toolTip(int column) const;
 
+  virtual inline QString topic() const { return (bool)_ircChannel ? _ircChannel->topic() : QString(); }
+  virtual inline int nickCount() const { return (bool)_ircChannel ? _ircChannel->ircUsers().count() : 0; }
+  
+  void attachIrcChannel(IrcChannel *ircChannel);
+
 public slots:
-  void setNetworkName(const QString &networkName);
-  void setCurrentServer(const QString &serverName);
+  void join(const QList<IrcUser *> &ircUsers);
+  void part(IrcUser *ircUser);
 
-  void attachNetwork(Network *network);
-  void attachIrcChannel(const QString &channelName);
+  void addUserToCategory(IrcUser *ircUser);
+  void addUsersToCategory(const QList<IrcUser *> &ircUser);
+  void removeUserFromCategory(IrcUser *ircUser);
+  void userModeChanged(IrcUser *ircUser);
 
-private:
-  NetworkId _networkId;
+private slots:
+  void ircChannelDestroyed();
+  void ircUserDestroyed();
 
-  QPointer<Network> _network;
+private:
+  IrcChannel *_ircChannel;
 };
 
 /*****************************************
index 6fc0c25..c61cf9e 100644 (file)
@@ -131,6 +131,31 @@ void AbstractTreeItem::removeAllChilds() {
   emit endRemoveChilds();
 }
 
+bool AbstractTreeItem::reParent(AbstractTreeItem *newParent) {
+  // currently we support only re parenting if the child that's about to be
+  // adopted does not have any children itself.
+  if(childCount() != 0) {
+    qDebug() << "AbstractTreeItem::reParent(): cannot reparent"  << this << "with children.";
+    return false;
+  }
+
+  int oldRow = row();
+  if(oldRow == -1)
+    return false;
+  
+  emit parent()->beginRemoveChilds(oldRow, oldRow);
+  parent()->_childItems.removeAt(oldRow);
+  emit parent()->endRemoveChilds();
+
+  setParent(newParent);
+
+  bool success = newParent->newChild(this);
+  if(!success)
+    qWarning() << "AbstractTreeItem::reParent(): failed to attach to new parent after removing from old parent! this:" << this << "new parent:" << newParent;
+
+  return success;
+}
+
 AbstractTreeItem *AbstractTreeItem::child(int row) const {
   if(childCount() <= row)
     return 0;
@@ -155,10 +180,15 @@ int AbstractTreeItem::childCount(int column) const {
 }
 
 int AbstractTreeItem::row() const {
-  if(!parent())
+  if(!parent()) {
+    qWarning() << "AbstractTreeItem::row():" << this << "has no parent AbstractTreeItem as it's parent! parent is" << QObject::parent();
     return -1;
-  else
-    return parent()->_childItems.indexOf(const_cast<AbstractTreeItem *>(this));
+  }
+  
+  int row_ = parent()->_childItems.indexOf(const_cast<AbstractTreeItem *>(this));
+  if(row_ == -1)
+    qWarning() << "AbstractTreeItem::row():" << this << "is not in the child list of" << QObject::parent();
+  return row_;
 }
 
 AbstractTreeItem *AbstractTreeItem::parent() const {
index 8caffdd..6dd6ed8 100644 (file)
@@ -49,6 +49,8 @@ public:
 
   virtual quint64 id() const;
 
+  bool reParent(AbstractTreeItem *newParent);
+    
   AbstractTreeItem *child(int row) const;
   AbstractTreeItem *childById(const quint64 &id) const;
 
index bab066b..ead100d 100644 (file)
@@ -208,6 +208,7 @@ void Network::ircUserDestroyed() {
   QHash<QString, IrcUser *>::iterator ircUserIter = _ircUsers.begin();
   while(ircUserIter != _ircUsers.end()) {
     if(ircUser == *ircUserIter) {
+      emit deletedIrcUserRemoved(ircUserIter.key());
       ircUserIter = _ircUsers.erase(ircUserIter);
       break;
     }
@@ -215,6 +216,30 @@ void Network::ircUserDestroyed() {
   }
 }
 
+void Network::removeDeletedIrcUser(const QString &username) {
+  // DO NOT CALL THIS SLOT EVER!!!
+  
+  // this slots purpose is only to remove deleted users that haven't been synced yet.
+  // Reason:
+  // as a user parting a channel results in it's deletion if it is no longer in any known channel
+  // this action can only be communicated if the slaves are allready in sync.
+  // so if such a deleted user isn't synced in slave mode, we kill and remove it.
+
+  Q_ASSERT(proxy());
+
+  if(!_ircUsers.contains(username))
+    return;
+
+  IrcUser *ircUser = _ircUsers[username];
+
+  if(ircUser->isInitialized())
+    return;
+
+  _ircUsers.remove(username);
+  emit ircUserRemoved(username);
+  emit ircUserRemoved(ircUser);
+}
+
 void Network::removeIrcUser(IrcUser *ircuser) {
   QString nick = _ircUsers.key(ircuser);
   if(nick.isNull())
index 2ff0a36..e2c5ec8 100644 (file)
@@ -204,6 +204,7 @@ public slots:
 
   inline void addIrcUser(const QString &hostmask) { newIrcUser(hostmask); }
   inline void addIrcChannel(const QString &channel) { newIrcChannel(channel); }
+  void removeDeletedIrcUser(const QString &username);
   void removeIrcUser(const QString &nick);
   void removeIrcChannel(const QString &channel);
 
@@ -276,6 +277,7 @@ signals:
   void ircChannelAdded(const QString &channelname);
   void ircChannelAdded(IrcChannel *);
 
+  void deletedIrcUserRemoved(const QString &username);
   void ircUserRemoved(const QString &nick);
   void ircChannelRemoved(const QString &channel);
 
index 1400710..c80336c 100644 (file)
@@ -48,14 +48,11 @@ set(HEADERS
     coresettings.h
     coreusersettings.h)
 
-# QT_DEFINITIONS actually does not work, stuff gets included always.
-# Funny enough that does not seem to be harmful, but we should still find a way to figure out
-# if we have openssl in Qt...
-if(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "-DQT_NO_OPENSSL")
+if(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
   set(SOURCES ${SOURCES} sslserver.cpp)
   set(MOC_HDRS ${MOC_HDRS} sslserver.h)
   include_directories(${OPENSSL_INCLUDE_DIR})
-endif(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "-DQT_NO_OPENSSL")
+endif(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
 
 QT4_WRAP_CPP(MOC ${MOC_HDRS})
 
index 1833927..4b4aa72 100644 (file)
@@ -89,8 +89,8 @@ void Core::init() {
 }
 
 Core::~Core() {
-  foreach(QTcpSocket *socket, blocksizes.keys()) { qDebug() << "disconnecting" << socket << blocksizes.keys();
-    socket->disconnectFromHost();  // disconnect local (i.e. non-authed) clients
+  foreach(QTcpSocket *socket, blocksizes.keys()) {
+    socket->disconnectFromHost();  // disconnect non authed clients
   }
   qDeleteAll(sessions);
   qDeleteAll(_storageBackends);
@@ -340,12 +340,23 @@ QHash<BufferId, MsgId> Core::bufferLastSeenMsgIds(UserId user) {
 /*** Network Management ***/
 
 bool Core::startListening(uint port) {
-  if(!server.listen(QHostAddress::Any, port)) {
+  bool success = false;
+
+  // let's see if ipv6 is available
+  success = server.listen(QHostAddress::AnyIPv6, port);
+
+  if(!success && server.serverError() == QAbstractSocket::UnsupportedSocketOperationError) {
+    // fall back to v4
+    success = server.listen(QHostAddress::Any, port);
+  }
+
+  if(!success) {
     qWarning("%s", qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString())));
-    return false;
+  } else {
+    qDebug() << "Listening for GUI clients on port" << server.serverPort();
   }
-  qDebug() << "Listening for GUI clients on port" << server.serverPort();
-  return true;
+  
+  return success;
 }
 
 void Core::stopListening() {
@@ -362,7 +373,7 @@ void Core::incomingConnection() {
     
     QVariantMap clientInfo;
     blocksizes.insert(socket, (quint32)0);
-    qDebug() << "Client connected from"  << qPrintable(socket->peerAddress().toString());
+    qDebug() << qPrintable(tr("Client connected from"))  << qPrintable(socket->peerAddress().toString());
 
     if (!configured) {
       server.close();
@@ -403,7 +414,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
       "This core needs at least client/core protocol version %1.<br>"
       "Please consider upgrading your client.").arg(Global::coreNeedsProtocol);
       SignalProxy::writeDataToDevice(socket, reply);
-      qWarning() << qPrintable(tr("Client %1 too old, rejecting.").arg(socket->peerAddress().toString()));
+      qWarning() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("too old, rejecting."));
       socket->close(); return;
     }
 
@@ -463,7 +474,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
 #ifndef QT_NO_OPENSSL
     // after we told the client that we are ssl capable we switch to ssl mode
     if(supportSsl && msg["UseSsl"].toBool()) {
-      qDebug() << "Starting TLS for Client:" << qPrintable(socket->peerAddress().toString());
+      qDebug() << qPrintable(tr("Starting TLS for Client:"))  << qPrintable(socket->peerAddress().toString());
       connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
       sslSocket->startServerEncryption();
     }
@@ -483,7 +494,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
       reply["MsgType"] = "ClientLoginReject";
       reply["Error"] = tr("<b>Client not initialized!</b><br>You need to send an init message before trying to login.");
       SignalProxy::writeDataToDevice(socket, reply);
-      qWarning() << qPrintable(tr("Client %1 did not send an init message before trying to login, rejecting.").arg(socket->peerAddress().toString()));
+      qWarning() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("did not send an init message before trying to login, rejecting."));
       socket->close(); return;
     }
     if(msg["MsgType"] == "CoreSetupData") {
@@ -509,7 +520,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
       }
       reply["MsgType"] = "ClientLoginAck";
       SignalProxy::writeDataToDevice(socket, reply);
-      qDebug() << qPrintable(tr("Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3).").arg(socket->peerAddress().toString(), msg["User"].toString()).arg(uid.toInt()));
+      qDebug() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("initialized and authenticated successfully as \"%1\" (UserId: %2).").arg(msg["User"].toString()).arg(uid.toInt()));
       setupClientSession(socket, uid);
     }
   }
@@ -517,13 +528,34 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
 
 // Potentially called during the initialization phase (before handing the connection off to the session)
 void Core::clientDisconnected() {
-  QTcpSocket *socket = dynamic_cast<QTcpSocket*>(sender());  // Note: This might be a QObject* already (if called by ~Core())!
-  Q_ASSERT(socket);
-  blocksizes.remove(socket);
-  clientInfo.remove(socket);
-  qDebug() << qPrintable(tr("Non-authed client disconnected."));
-  socket->deleteLater();
-  socket = 0;
+  QTcpSocket *socket = qobject_cast<QTcpSocket *>(sender());
+  if(socket) {
+    // here it's safe to call methods on socket!
+    qDebug() << qPrintable(tr("Non-authed client disconnected.")) << qPrintable(socket->peerAddress().toString());
+    socket->deleteLater();
+  } else {
+    // we have to crawl through the hashes and see if we find a victim to remove
+
+    // DO NOT CALL ANY METHODS ON socket!!
+    socket = static_cast<QTcpSocket *>(sender());
+    
+    QHash<QTcpSocket *, quint32>::iterator blockSizeIter = blocksizes.begin();
+    while(blockSizeIter != blocksizes.end()) {
+      if(blockSizeIter.key() == socket) {
+       blocksizes.erase(blockSizeIter);
+      }
+      blockSizeIter++;
+    }
+
+    QHash<QTcpSocket *, QVariantMap>::iterator clientInfoIter = clientInfo.begin();
+    while(clientInfoIter != clientInfo.end()) {
+      if(clientInfoIter.key() == socket) {
+       clientInfo.erase(clientInfoIter);
+      }
+      clientInfoIter++;
+    }
+  }
+
 
   // make server listen again if still not configured
   if (!configured) {
@@ -544,7 +576,7 @@ void Core::setupClientSession(QTcpSocket *socket, UserId uid) {
   blocksizes.remove(socket);
   clientInfo.remove(socket);
   if(!sess) {
-    qWarning() << qPrintable(tr("Could not initialize session for client %1!").arg(socket->peerAddress().toString()));
+    qWarning() << qPrintable(tr("Could not initialize session for client:")) << qPrintable(socket->peerAddress().toString());
     socket->close();
   }
   sess->addClient(socket);
index 07ba5a1..bbb78b3 100644 (file)
@@ -238,7 +238,7 @@ void CoreSession::removeClient(QIODevice *iodev) {
   // no checks for validity check - privateslot...
   QTcpSocket *socket = qobject_cast<QTcpSocket *>(iodev);
   if(socket)
-    qDebug() << qPrintable(tr("Client %1 disconnected (UserId: %2).").arg(socket->peerAddress().toString()).arg(user().toInt()));
+    qDebug() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt()));
   else
     qDebug() << "Local client disconnedted.";
   disconnect(socket, 0, this, 0);
index 9bdb3c6..288a8ab 100644 (file)
@@ -108,8 +108,7 @@ void IrcServerHandler::handleServerMsg(QByteArray msg) {
 
 void IrcServerHandler::defaultHandler(QString cmd, const QString &prefix, const QList<QByteArray> &rawparams) {
   // we assume that all this happens in server encoding
-  QStringList params;
-  foreach(QByteArray r, rawparams) params << serverDecode(r);
+  QStringList params = serverDecode(rawparams);
   uint num = cmd.toUInt();
   if(num) {
     // A lot of server messages don't really need their own handler because they don't do much.
@@ -150,7 +149,12 @@ void IrcServerHandler::defaultHandler(QString cmd, const QString &prefix, const
 
       // Everything else will be marked in red, so we can add them somewhere.
       default:
-        emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", cmd + " " + params.join(" "), prefix);
+       if(_whois) {
+         // many nets define their own WHOIS fields. we fetch those not in need of special attention here:
+         emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", "[Whois] " + params.join(" "), prefix);
+       } else {
+         emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", cmd + " " + params.join(" "), prefix);
+       }
     }
     //qDebug() << prefix <<":"<<cmd<<params;
   } else {
@@ -432,14 +436,16 @@ void IrcServerHandler::handle001(const QString &prefix, const QList<QByteArray>
 void IrcServerHandler::handle005(const QString &prefix, const QList<QByteArray> &params) {
   Q_UNUSED(prefix);
   const int numParams = params.size();
-  if(numParams < 1) {
-    qWarning() << "IrcServerHandler::handle005(): received RPL_ISUPPORT (005) with too few parameters:" << serverDecode(params);
+  if(numParams == 0) {
+    emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Received RPL_ISUPPORT (005) without parameters!"), prefix);
+    return;
   }
 
+  emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", serverDecode(params).join(" "), prefix);
+
   QString rpl_isupport_suffix = serverDecode(params.last());
-  if(!rpl_isupport_suffix.toLower().contains("supported")) {
-    qWarning() << "Received invalid RPL_ISUPPORT! Suffix is:" << rpl_isupport_suffix << "Excpected: are supported by this server";
-    return;
+  if(!rpl_isupport_suffix.toLower().contains("are supported by this server")) {
+    emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!"), prefix);
   }
 
   QString rawSupport;
index c42c475..1bd29bd 100644 (file)
@@ -57,13 +57,16 @@ void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &m
   Q_UNUSED(bufferInfo)
 
   QString awayMsg = msg;
+  IrcUser *me = network()->me();
+
   // if there is no message supplied we have to check if we are already away or not
   if(msg.isEmpty()) {
-    IrcUser *me = network()->me();
     if(me && !me->isAway())
       awayMsg = networkConnection()->identity()->awayReason();
   }
-
+  if(me)
+    me->setAwayMessage(awayMsg);
+  
   putCmd("AWAY", serverEncode(awayMsg));
 }
 
index 9fd8c73..6fd7abd 100644 (file)
    <property name="shortcut" >
     <string>F7</string>
    </property>
+   <property name="menuRole" >
+    <enum>QAction::PreferencesRole</enum>
+   </property>
   </action>
   <action name="actionManageViews2" >
    <property name="enabled" >
    <property name="text" >
     <string>About Qt...</string>
    </property>
+   <property name="menuRole" >
+    <enum>QAction::AboutQtRole</enum>
+   </property>
   </action>
   <action name="actionAboutQuassel" >
    <property name="enabled" >
    <property name="text" >
     <string>About Quassel IRC...</string>
    </property>
+   <property name="menuRole" >
+    <enum>QAction::AboutRole</enum>
+   </property>
   </action>
   <action name="actionImportBacklog" >
    <property name="text" >
index 62060db..5422172 100644 (file)
@@ -324,7 +324,7 @@ void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bott
     return;
 
   for(int i = topLeft.row(); i <= bottomRight.row(); i++) {
-    QModelIndex networkIdx = topLeft.sibling(topLeft.row(), 0);
+    QModelIndex networkIdx = topLeft.sibling(i, 0);
     if(model()->rowCount(networkIdx) == 0)
       continue;
 
index 6ea156a..521613f 100644 (file)
@@ -35,30 +35,67 @@ InputLine::~InputLine() {
 }
 
 void InputLine::keyPressEvent(QKeyEvent * event) {
-  if(event->key() == Qt::Key_Up) {
-    if(idx > 0) { idx--; setText(history[idx]); }
+  switch(event->key()) {
+  case Qt::Key_Up:
     event->accept();
-  } else if(event->key() == Qt::Key_Down) {
-    if(idx < history.count()) idx++;
-    if(idx < history.count()) setText(history[idx]);
-    else if(!text().isEmpty()) {
-      history << text();
-      idx = history.count();
-      setText("");
+
+    if(addToHistory(text())) {
+      clear();
+      break;
+    }
+    
+    if(idx > 0) {
+      idx--;
+      setText(history[idx]);
     }
+
+    break;
+    
+  case Qt::Key_Down:
     event->accept();
-  } else if(event->key() == Qt::Key_Select) {  // for Qtopia
+
+    if(addToHistory(text())) {
+      clear();
+      break;
+    }
+    
+    if(idx < history.count())
+      idx++;
+
+    if(idx < history.count())
+      setText(history[idx]);
+    else
+      clear();
+
+    break;
+    
+  case Qt::Key_Select:         // for Qtopia
     emit returnPressed();
-    QLineEdit::keyPressEvent(event);
-  } else {
+
+  default:
     QLineEdit::keyPressEvent(event);
   }
+}
 
+bool InputLine::addToHistory(const QString &text) {
+  if(text.isEmpty())
+    return false;
+
+  Q_ASSERT(0 <= idx && idx <= history.count());
+  
+  if(history.isEmpty() || text != history[idx - (int)(idx == history.count())]) {
+    // if we change an entry of the history the changed entry is appended to the list and we seek to the end
+    // we could also easily change the entry in the history... per setting maybe?
+    history << text;
+    idx = history.count();
+    return true;
+  } else {
+    return false;
+  }
 }
 
 void InputLine::on_returnPressed() {
-  history << text();
-  idx = history.count();
+  addToHistory(text());
   emit sendText(text());
   clear();
 }
index de4206d..453f286 100644 (file)
@@ -40,6 +40,8 @@ private slots:
   void on_returnPressed();
   void on_textChanged(QString newText);
 
+  bool addToHistory(const QString &text);
+
 signals:
   void sendText(QString text);
 
index 33c0dfb..b9a6fe2 100644 (file)
@@ -41,43 +41,49 @@ TabCompleter::TabCompleter(InputLine *inputLine_)
 }
 
 void TabCompleter::buildCompletionList() {
+  // ensure a safe state in case we return early.
   completionMap.clear();
+  nextCompletion = completionMap.begin();
+
   // this is the first time tab is pressed -> build up the completion list and it's iterator
   QModelIndex currentIndex = Client::bufferModel()->currentIndex();
-  if(!currentIndex.data(NetworkModel::BufferIdRole).isValid()) {
-    nextCompletion = completionMap.begin();
+  if(!currentIndex.data(NetworkModel::BufferIdRole).isValid())
     return;
-  }
   
   NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();
-  QString channelName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
+  QString bufferName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
 
   const Network *network = Client::network(networkId);
   if(!network)
     return;
 
-  IrcChannel *channel = network->ircChannel(channelName);
-  if(!channel)
-    return;
-
-  // FIXME commented for debugging
-  /*
-  disconnect(this, SLOT(ircUserJoinedOrParted(IrcUser *)));
-  connect(channel, SIGNAL(ircUserJoined(IrcUser *)),
-         this, SLOT(ircUserJoinedOrParted(IrcUser *)));
-  connect(channel, SIGNAL(ircUserParted(IrcUser *)),
-         this, SLOT(ircUserJoinedOrParted(IrcUser *)));
-  */
 
   QString tabAbbrev = inputLine->text().left(inputLine->cursorPosition()).section(' ',-1,-1);
   QRegExp regex(QString("^[^a-zA-Z]*").append(QRegExp::escape(tabAbbrev)), Qt::CaseInsensitive);
 
-  foreach(IrcUser *ircUser, channel->ircUsers()) {
-    if(regex.indexIn(ircUser->nick()) > -1) {
-      completionMap[ircUser->nick().toLower()] = ircUser->nick();
+  switch(static_cast<BufferInfo::Type>(currentIndex.data(NetworkModel::BufferTypeRole).toInt())) {
+  case BufferInfo::ChannelBuffer:
+    { // scope is needed for local var declaration
+      IrcChannel *channel = network->ircChannel(bufferName);
+      if(!channel)
+       return;
+      foreach(IrcUser *ircUser, channel->ircUsers()) {
+       if(regex.indexIn(ircUser->nick()) > -1)
+         completionMap[ircUser->nick().toLower()] = ircUser->nick();
+      }
     }
+    break;
+  case BufferInfo::QueryBuffer:
+    if(regex.indexIn(bufferName) > -1)
+      completionMap[bufferName.toLower()] = bufferName;
+  case BufferInfo::StatusBuffer:
+    if(!network->myNick().isEmpty() && regex.indexIn(network->myNick()) > -1)
+      completionMap[network->myNick().toLower()] = network->myNick();
+    break;
+  default:
+    return;
   }
-
+  
   nextCompletion = completionMap.begin();
   lastCompletionLength = tabAbbrev.length();
 }