Merge branch 'bufferviewoverlay'
authorMarcus Eggenberger <egs@quassel-irc.org>
Tue, 24 Mar 2009 16:36:06 +0000 (17:36 +0100)
committerMarcus Eggenberger <egs@quassel-irc.org>
Tue, 24 Mar 2009 16:36:06 +0000 (17:36 +0100)
Conflicts:

src/client/client.cpp
src/client/client.h

83 files changed:
CMakeLists.txt
data/CMakeLists.txt
data/scripts/inxi [new file with mode: 0755]
data/scripts/mpris [new file with mode: 0755]
dev-notes/obsolete/INSTALL.Qtopia [deleted file]
dev-notes/obsolete/README.Qtopia [deleted file]
dev-notes/obsolete/builtin_cmds.obsolete.cpp [deleted file]
dev-notes/obsolete/paulk-mainwindow.ui [deleted file]
dev-notes/obsolete/qtopia/bufferviewwidget.cpp [deleted file]
dev-notes/obsolete/qtopia/bufferviewwidget.h [deleted file]
dev-notes/obsolete/qtopia/chatline.cpp [deleted file]
dev-notes/obsolete/qtopia/chatline.h [deleted file]
dev-notes/obsolete/qtopia/chatwidget.cpp [deleted file]
dev-notes/obsolete/qtopia/chatwidget.h [deleted file]
dev-notes/obsolete/qtopia/coreconnectdlg.cpp [deleted file]
dev-notes/obsolete/qtopia/coreconnectdlg.h [deleted file]
dev-notes/obsolete/qtopia/mainwidget.cpp [deleted file]
dev-notes/obsolete/qtopia/mainwidget.h [deleted file]
dev-notes/obsolete/qtopia/nicklistwidget.cpp [deleted file]
dev-notes/obsolete/qtopia/nicklistwidget.h [deleted file]
dev-notes/obsolete/qtopia/qtopiamainwin.cpp [deleted file]
dev-notes/obsolete/qtopia/qtopiamainwin.h [deleted file]
dev-notes/obsolete/qtopia/qtopiaui.cpp [deleted file]
dev-notes/obsolete/qtopia/qtopiaui.h [deleted file]
dev-notes/obsolete/qtopia/qtopiauistyle.cpp [deleted file]
dev-notes/obsolete/qtopia/quasseltopia.desktop [deleted file]
dev-notes/obsolete/qtopia/topicbar.cpp [deleted file]
dev-notes/obsolete/qtopia/topicbar.h [deleted file]
dev-notes/obsolete/qtopia/ui/aboutdlg.ui [deleted file]
dev-notes/obsolete/qtopia/ui/bufferviewwidget.ui [deleted file]
dev-notes/obsolete/qtopia/ui/coreaccounteditdlg.ui [deleted file]
dev-notes/obsolete/qtopia/ui/coreconnectdlg.ui [deleted file]
dev-notes/obsolete/qtopia/ui/coreconnectprogressdlg.ui [deleted file]
dev-notes/obsolete/qtopia/ui/editcoreacctdlg.ui [deleted file]
dev-notes/obsolete/qtopia/ui/mainwidget.ui [deleted file]
dev-notes/obsolete/qtopia/ui/nicklistwidget.ui [deleted file]
i18n/quassel_cs.ts
i18n/quassel_de.ts
i18n/quassel_fr.ts
i18n/quassel_ru.ts
i18n/quassel_sl.ts
i18n/quassel_tr_TR.ts
src/client/CMakeLists.txt
src/client/client.cpp
src/client/client.h
src/client/clientaliasmanager.cpp [moved from dev-notes/obsolete/qtopia/qtopiauistyle.h with 82% similarity]
src/client/clientaliasmanager.h [moved from dev-notes/obsolete/qtopia/main.cpp with 75% similarity]
src/client/clientuserinputhandler.cpp
src/client/clientuserinputhandler.h
src/client/execwrapper.cpp [new file with mode: 0644]
src/client/execwrapper.h [new file with mode: 0644]
src/client/messagemodel.cpp
src/client/messagemodel.h
src/common/aliasmanager.cpp
src/common/aliasmanager.h
src/common/cliparser.cpp
src/common/main.cpp
src/common/quassel.cpp
src/common/quassel.h
src/core/core.cpp
src/core/corealiasmanager.cpp
src/core/corealiasmanager.h
src/core/corenetwork.cpp
src/core/corenetwork.h
src/core/postgresqlstorage.cpp
src/core/sqlitestorage.cpp
src/core/userinputhandler.cpp
src/core/userinputhandler.h
src/qtui/chatitem.cpp
src/qtui/inputwidget.cpp
src/qtui/mainwin.cpp
src/qtui/qtui.cpp
src/qtui/qtui.h
src/qtui/settingsdlg.cpp
src/qtui/settingspages/aliasesmodel.cpp
src/qtui/settingspages/aliasesmodel.h
src/qtui/settingspages/aliasessettingspage.cpp
src/qtui/settingspages/appearancesettingspage.cpp
src/uisupport/graphicalui.cpp
src/uisupport/graphicalui.h
src/uisupport/inputline.cpp
src/uisupport/inputline.h
src/uisupport/settingspage.cpp

index 00b4e66..6a2cf83 100644 (file)
@@ -75,6 +75,15 @@ if(WIN32)
   set(EMBED_DATA ON)
 endif(WIN32)
 
+# For static builds, arbitrary extra libs might need to be linked
+# Define a comma-separated list here
+# e.g. for pgsql, we need -DLINK_EXTRA=pq;crypt
+set(LINK_EXTRA "" CACHE STRING "Semicolon-separated list of libraries to be linked")
+if(LINK_EXTRA)
+  string(REPLACE "," ";" LINK_EXTRA ${LINK_EXTRA})
+  link_libraries(${LINK_EXTRA})
+endif(LINK_EXTRA)
+
 # Build Type
 # We need to make sure it's not empty
 # Supported: Release, RelWithDebugInfo, Debug, Debugfull
@@ -253,8 +262,6 @@ if(WIN32)
   if(HAVE_SSL)
      link_libraries(${OPENSSL_LIBRARIES} libeay32MD)
   endif(HAVE_SSL)
-
-  set(RC_WIN32 ../pics/win32.rc)  # for app icons on windows
 endif(WIN32)
 
 if(STATIC)
index 239e306..7a1839f 100644 (file)
@@ -20,4 +20,9 @@ if(WANT_MONO OR WANT_QTCLIENT)
   else(EMBED_DATA)
     install(FILES networks.ini DESTINATION ${DATA_INSTALL_DIR}/quassel)
   endif(EMBED_DATA)
+
+  if(NOT WIN32)
+    install(DIRECTORY scripts DESTINATION ${DATA_INSTALL_DIR}/quassel USE_SOURCE_PERMISSIONS)
+  endif(NOT WIN32)
+
 endif(WANT_MONO OR WANT_QTCLIENT)
diff --git a/data/scripts/inxi b/data/scripts/inxi
new file mode 100755 (executable)
index 0000000..30f9edd
--- /dev/null
@@ -0,0 +1,3447 @@
+#!/bin/bash
+########################################################################
+####  Script Name: inxi
+####  version: 1.0.8
+####  Date: 13 March 2009
+########################################################################
+####  SPECIAL THANKS
+########################################################################
+####  Special thanks to all those in lsc for their tireless dedication
+####  with helping test inxi modules
+########################################################################
+####  ABOUT INXI
+########################################################################
+####  inxi is a fork of infobash 3.02, the original bash sys info script by locsmif
+####  As time permits functionality improvements and recoding will occur.
+####
+####  inxi, the universal, portable, system info script for irc.
+####  Tested with Irssi, Xchat, Konversation, BitchX, KSirc, ircII,
+####  Gaim/Pidgin, Weechat, KVIrc and Kopete.
+####  Original infobash author and copyright holder:
+####  Copyright (C) 2005-2007  Michiel de Boer a.k.a. locsmif
+####  inxi version: Copyright (C) 2008-9 Scott Rogers & Harald Hope
+####  Further fixes (listed as known): Horst Tritremmel <hjt at sidux.com>
+####  Steven Barrett (aka: damentz) - usb audio patch; swap percent used patch
+####
+####  Current script home page: http://techpatterns.com/forums/about1131.html
+####  Script svn: http://code.google.com/p/inxi
+####
+####  This program is free software; you can redistribute it and/or modify
+####  it under the terms of the GNU General Public License as published by
+####  the Free Software Foundation; either version 3 of the License, or
+####  (at your option) any later version.
+####
+####  This program is distributed in the hope that it will be useful,
+####  but WITHOUT ANY WARRANTY; without even the implied warranty of
+####  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+####  GNU General Public License for more details.
+####
+####  You should have received a copy of the GNU General Public License
+####  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+####
+####  If you don't understand what Free Software is, please read (or reread)
+####  this page: http://www.gnu.org/philosophy/free-sw.html
+########################################################################
+####  DEPENDENCIES
+####  bash >=3.0(bash), df;readlink;stty;tr;uname;wc(coreutils),
+####  gawk(gawk), grep(grep), hostname(hostname), lspci(pciutils),
+####  ps;uptime(procps), glxinfo;xdpyinfo;xrandr(xbase-clients)
+####  Also the proc filesystem should be present and mounted
+####
+####   Apparently unpatched bash 3.0 has arrays broken; bug reports:
+####   http://ftp.gnu.org/gnu/bash/bash-3.0-patches/bash30-008
+####   http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00144.html
+####
+####   Arrays work in bash 2.05b, but "egrep -m" does not
+####
+####  RECOMMENDS (Needed to run certain features)
+####  For local interfaces/IP test: ifconfig (in net-tools for Debian systems)
+####  runlevel(sysvinit): to view current runlevel while not in X window system
+####  Bash 3.1 for proper array use
+########################################################################
+####  CONVENTIONS:
+####  Indentation: TABS
+####  Do not use `....`, those are totally non-reabable, use $(....)
+####  Do not use one liner flow controls. The ONLY time you should use ; is in
+####  this single case: if [[ condition ]];then (ie, never: [[ condition ]] && statement)
+####  Note: [[ -n $something ]] - double brackets do not require quotes: "$something" for variables
+####  Always use quotes, double or single, for all string values
+####
+####  All new code/methods must be in a function.
+####  For all boolean tests, use 'true' / 'false'. Do NOT use 0 or 1 unless
+####  it's a function return. Avoid complicated tests in the if condition itself.
+####
+####  For gawk: use always if ( num_of_cores > 1 ) { hanging { starter for all blocks
+####  This lets us use one method for all gawk structures, including BEGIN/END, if, for, etc
+####
+####  VARIABLE/FUNCTION NAMING:
+####  All variables should explain what they are, except counters like i, j
+####  All variables MUST be initialized / declared explicitly
+####, globals UPPER CASE, at top of script, SOME_VARIABLE='' (words separated by _ ).
+####  Locals always with: local some_variable= (lower case, words separated by _ )
+####  Locals that will be inherited by child functions: Some_Variable (so you know they are inherited)
+####  and at the top of the function.
+####
+####  Booleans should start with b_ or B_ and state clearly what is being tested
+####   Arrays should start with a_ or A_
+####  All functions should follow standard naming, ie, verb adjective noun, get_cpu_data
+####
+####  SPECIAL NOTES:
+####  The color variable ${C2} must always be followed by a space unless you know what
+####  character is going to be next for certain. Otherwise irc color codes can be accidentally
+####  activated or altered.
+####
+####  For native script konversation support (check distro for correct konvi scripts path):
+####  ln -s <path to inxi> /usr/share/apps/konversation/scripts/inxi
+####  DCOP doesn't like \n, so avoid using it for most output unless required, as in error messages.
+########################################################################
+####  Valuable Resources
+####  awk arrays: http://www.math.utah.edu/docs/info/gawk_12.html
+########################################################################
+####  TESTING FLAGS
+####  inxi supports advanced testing triggers to do various things, using -! <arg>
+####  -! 1 - triggers default B_TESTING_1='true' to trigger some test or other
+####  -! 2 - triggers default B_TESTING_2='true' to trigger some test or other
+####  -! 3 - triggers B_TESTING_1='true' and B_TESTING_2='true'
+####  -! 10 - triggers an update from the primary dev download server instead of svn
+####  -! 11 - triggers an update from svn branch one - if present, of course
+####  -! 12 - triggers an update from svn branch two - if present, of course
+####  -! 13 - triggers an update from svn branch three - if present, of course
+####  -! 14 - triggers an update from svn branch four - if present, of course
+####  -! <http://......> - Triggers an update from whatever server you list.
+########################################################################
+#### VARIABLES
+########################################################################
+
+## NOTE: we can use hwinfo if it's available in all systems, or most, to get
+## a lot more data and verbosity levels going
+
+### Variable initializations: null values
+CMDL_MAX=''
+COLOR_SCHEME=''
+COLOR_SCHEME_SET=''
+IRC_CLIENT=''
+IRC_CLIENT_VERSION=''
+
+### primary data array holders
+A_AUDIO_DATA=''
+A_CMDL=''
+A_CPU_CORE_DATA=''
+A_CPU_DATA=''
+A_CPU_TYPE_PCNT_CCNT=''
+A_DEBUG_BUFFER=''
+A_GFX_CARD_DATA=''
+A_GLX_DATA=''
+A_HDD_DATA=''
+A_INTERFACES_DATA=''
+A_NETWORK_DATA=''
+A_PARTITION_DATA=''
+A_X_DATA=''
+
+### Boolean true/false globals
+# flag to allow distro maintainers to turn off update features. If false, turns off
+# -U and -! testing/advanced update options, as well as removing the -U help menu item
+B_ALLOW_UPDATE='true'
+# triggers full display of cpu flags
+B_CPU_FLAGS_FULL='false'
+# Debug flood override: make 'true' to allow long debug output
+B_DEBUG_FLOOD='false'
+# show extra output data
+B_EXTRA_DATA='false'
+B_SHOW_DISK='false'
+# override certain errors due to currupted data
+B_HANDLE_CORRUPT_DATA='false'
+# Running in a shell? Defaults to false, and is determined later.
+B_RUNNING_IN_SHELL='false'
+# this sets the debug buffer
+B_SCRIPT_UP='false'
+# Show sound card data
+B_SHOW_AUDIO='false'
+B_SHOW_CPU='false'
+# Show full hard disk output
+B_SHOW_FULL_HDD='false'
+B_SHOW_GRAPHICS='false'
+# Set this to 'false' to avoid printing the hostname
+B_SHOW_HOST='true'
+B_SHOW_INFO='false'
+B_SHOW_IP='false'
+B_SHOW_LABELS='false'
+B_SHOW_NETWORK='false'
+# either -v > 3 or -P will show partitions
+B_SHOW_PARTITIONS='false'
+B_SHOW_PARTITIONS_FULL='false'
+# triggers only short inxi output
+B_SHOW_SHORT_OUTPUT='false'
+B_SHOW_SYSTEM='false'
+B_SHOW_UUIDS='false'
+# triggers various debugging and new option testing
+B_TESTING_1='false'
+B_TESTING_2='false'
+# Test for X running
+B_X_RUNNING='false'
+
+### Directory/file exist flags; test as [[ $(boolean) ]] not [[ $boolean ]]
+B_PROC='false'
+B_CPUINFO='false'
+B_MEMINFO='false'
+B_ASOUND_CARDS='false'
+B_ASOUND_VERSION='false'
+B_BASH_ARRAY='false'
+B_IFCONFIG='false'
+B_LSB_DIR='false'
+B_SCSI_DIR='false'
+B_MODULES_DIR='false' #
+B_MOUNTS_DIR='false'
+B_PARTITIONS_DIR='false' #
+
+### Directory's used when present
+DIR_CPUINFO='/proc/cpuinfo'
+DIR_MEMINFO='/proc/meminfo'
+DIR_ASOUND_DEVICE='/proc/asound/cards'
+DIR_ASOUND_VERSION='/proc/asound/version'
+DIR_LSB_RELEASE='/etc/lsb-release'
+DIR_SCSI='/proc/scsi/scsi'
+DIR_MODULES='/proc/modules' #
+DIR_MOUNTS='/proc/mounts'
+DIR_PARTITIONS='/proc/partitions' #
+DIR_IFCONFIG='/sbin/ifconfig'
+
+### Variable initializations: constants
+DCOPOBJ="default"
+DEBUG=0 # Set debug levels from 1-10
+# Debug Buffer Index, index into a debug buffer storing debug messages until inxi is 'all up'
+DEBUG_BUFFER_INDEX=0
+## note: the debugger rerouting to /dev/null has been moved to the end of the get_parameters function
+## so -@[number] debug levels can be set if there is a failure, otherwise you can't even see the errors
+
+# Defaults to 2, make this 1 for normal, 0 for no colorcodes at all. Set to any other valid scheme you like.
+# Same as runtime parameter.
+DEFAULT_SCHEME=2
+# Default indentation level
+INDENT=10
+# default to false, no konversation found, 1 is /cmd inxi start, 2 is native konvi script mode
+KONVI=0
+# NO_CPU_COUNT=0       # Wether or not the string "dual" or similar is found in cpuinfo output. If so, avoid dups.
+# This is a variable that controls how many parameters inxi will parse in a /proc/<pid>/cmdline file before stopping.
+PARAMETER_LIMIT=30
+SCHEME=0 # set default scheme
+# SHOW_IRC=1 to avoid showing the irc client version number, or SHOW_IRC=0 to disable client information completely.
+SHOW_IRC=2
+# Verbosity level defaults to 0, this can also be set with -v0, -v2, -v3, etc as a parameter.
+VERBOSITY_LEVEL=0
+# Supported number of verbosity levels, including 0
+VERBOSITY_LEVELS=5
+
+# Clear nullglob, because it creates unpredictable situations with IFS=$'\n' ARR=($VAR) IFS="$ORIGINAL_IFS"
+# type constructs. Stuff like [rev a1] is now seen as a glob expansion pattern, and fails, and
+# therefore results in nothing. Tricky as fuck.
+shopt -u nullglob
+## info on bash built in: $IFS - http://tldp.org/LDP/abs/html/internalvariables.html
+# Backup the current Internal Field Separator
+ORIGINAL_IFS="$IFS"
+# These two determine separators in single line output, to force irc clients not to break off sections
+SEP1='-'
+SEP2='~'
+
+### Script names/paths
+SCRIPT_NAME="inxi"
+SCRIPT_PATH=$( dirname $0 )
+SCRIPT_VERSION_NUMBER=$( grep -im 1 'version:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3}' )
+SCRIPT_DOWNLOAD='http://inxi.googlecode.com/svn/trunk/'
+SCRIPT_DOWNLOAD_BRANCH_1='http://inxi.googlecode.com/svn/branches/one/'
+SCRIPT_DOWNLOAD_BRANCH_2='http://inxi.googlecode.com/svn/branches/two/'
+SCRIPT_DOWNLOAD_BRANCH_3='http://inxi.googlecode.com/svn/branches/three/'
+SCRIPT_DOWNLOAD_BRANCH_4='http://inxi.googlecode.com/svn/branches/four/'
+SCRIPT_DOWNLOAD_DEV='http://smxi.org/test/'
+KONVI_CFG="konversation/scripts/$SCRIPT_NAME.conf" # relative path to $(kde-config --path data)
+
+### Script Localization
+# Make sure every program speaks English.
+LC_ALL="C"
+export LC_ALL
+
+### Output Colors
+# A more elegant way to have a scheme that doesn't print color codes (neither ANSI nor mIRC) at all. See below.
+unset EMPTY
+#         DGREY    BLACK    RED      DRED     GREEN    DGREEN   YELLOW   DYELLOW
+ANSI_COLORS="\e[1;30m \e[0;30m \e[1;31m \e[0;31m \e[1;32m \e[0;32m \e[1;33m \e[0;33m"
+IRC_COLORS="   \x0314   \x0301   \x0304   \x0305   \x0309   \x0303   \x0308   \x0307"
+#                 BLUE     DBLUE    MAGENTA  DMAGENTA CYAN     DCYAN    WHITE    GREY     NORMAL
+ANSI_COLORS="$ANSI_COLORS \e[1;34m \e[0;34m \e[1;35m \e[0;35m \e[1;36m \e[0;36m \e[1;37m \e[0;37m \e[0;37m"
+IRC_COLORS=" $IRC_COLORS    \x0312   \x0302   \x0313   \x0306   \x0311   \x0310   \x0300   \x0315   \x03"
+#ANSI_COLORS=($ANSI_COLORS); IRC_COLORS=($IRC_COLORS)
+A_COLORS_AVAILABLE=( DGREY BLACK RED DRED GREEN DGREEN YELLOW DYELLOW BLUE DBLUE MAGENTA DMAGENTA CYAN DCYAN WHITE GREY NORMAL )
+# See above for notes on EMPTY
+A_COLOR_SCHEMES=( EMPTY,EMPTY,EMPTY NORMAL,NORMAL,NORMAL BLUE,NORMAL,NORMAL GREEN,YELLOW,NORMAL DYELLOW,NORMAL,NORMAL CYAN,BLUE,NORMAL RED,NORMAL,NORMAL GREEN,NORMAL,NORMAL YELLOW,NORMAL,NORMAL GREEN,DGREEN,NORMAL BLUE,RED,NORMAL BLUE,NORMAL,RED YELLOW,WHITE,GREEN BLUE,NORMAL,GREEN DCYAN,NORMAL,DMAGENTA )
+## Actual color variables
+C1=''
+C2=''
+CN=''
+
+### Distro Data
+# In cases of derived distros where the version file of the base distro can also be found under /etc,
+# the derived distro's version file should go first. (Such as with Sabayon / Gentoo)
+DISTROS_DERIVED="antix-version kanotix-version knoppix-version mandrake-release pardus-release sabayon-release sidux-version turbolinux-release zenwalk-version"
+# debian_version excluded from DISTROS_PRIMARY so Debian can fall through to /etc/issue detection. Same goes for Ubuntu.
+DISTROS_EXCLUDE_LIST="debian_version ubuntu_version"
+DISTROS_PRIMARY="gentoo-release redhat-release slackware-version SuSE-release"
+DISTROS_LSB_GOOD="mandrake-release mandriva-release mandrakelinux-release"
+## Distros with known problems
+# DSL (Bash 2.05b: grep -m doesn't work; arrays won't work) --> unusable output
+# Puppy Linux 4.1.2 (Bash 3.0: arrays won't work) --> works partially
+
+### Bans Data
+# Precede a banword with $'\2' to prevent it from being subject to automated escaping by the make_ban_lists routine
+# $'\1' gets weird results :
+# user@host $ ARR=($'\x01'"one two" three four); echo ${ARR[0]} | hd -v
+# 00000000  01 01 6f 6e 65 20 74 77  6f 0a                    |..one two.|
+A_NORMAL_BANS=( corporation communications gmbh technologies technology group $'\2'"\<ltd\>" ltd. $'\2'"\<inc\>" inc. $'\2'\<co\> co. "(tm)" "(r)" "®" $'\2'"\(rev ..\)" )
+A_CPU_BANS=( @ cpu deca 'dual core' dual-core 'tri core' tri-core 'quad core' quad-core ennea genuine hepta hexa multi octa penta 'processor' processor single triple $'\2'"[0-9.]+ *[MmGg][Hh][Zz]" )
+# after processing, the ban arrays will be put into these:
+BAN_LIST_NORMAL=''
+BAN_LIST_CPU=''
+
+### Source global config overrides
+if [[ -s /etc/$SCRIPT_NAME.conf ]];then
+       source /etc/$SCRIPT_NAME.conf
+fi
+# Source user config overrides
+if [[ -s $HOME/.$SCRIPT_NAME ]];then
+       source $HOME/.$SCRIPT_NAME
+fi
+
+# WARNING: In the main part below (search for 'KONVI')
+# there's a check for Konversation-specific config files.
+# Any one of these can override the above if inxi is run
+# from Konversation!
+
+########################################################################
+#### MAIN: Where it all begins
+########################################################################
+main()
+{
+       # first init function must be set first for colors etc. Remember, no debugger
+       # stuff works on this function unless you set the debugging flag
+       # manually. Debugging flag -@ [number] will not work until get_parameters runs.
+       initialize_script_data
+
+       ## this needs to run before the KONVI stuff is set below
+       get_start_client
+
+       # Check for dependencies before running anything else except above functions
+       check_script_depends
+       check_script_suggested_apps
+
+       # note: this only works if it's run from inside konversation as a script builtin or something
+       # only do this if inxi has been started as a konversation script, otherwise bypass this
+       if [[ $KONVI -eq 1 ]];then
+               DCPORT="$1"
+               DCSERVER="$2"
+               DCTARGET="$3"
+               shift 3
+               # The section below is on request of Argonel from the Konversation developer team:
+               # it sources config files like $HOME/.kde/share/apps/konversation/scripts/inxi.conf
+               IFS=":"
+               for kde_config in $( kde-config --path data )
+               do
+                       if [[ -r ${kde_config}${KONVI_CFG} ]];then
+                               source "${kde_config}${KONVI_CFG}"
+                               break
+                       fi
+               done
+               IFS="$ORIGINAL_IFS"
+       fi
+       ## leave this for debugging dcop stuff if we get that working
+       #       print_screen_output "DCPORT: $DCPORT"
+       #       print_screen_output "DCSERVER: $DCSERVER"
+       #       print_screen_output "DCTARGET: $DCTARGET"
+
+       # "$@" passes every parameter separately quoted, "$*" passes all parameters as one quoted parameter.
+       # must be here to allow debugger and other flags to be set.
+       get_parameters "$@"
+
+       # If no colorscheme was set in the parameter handling routine, then set the default scheme
+       if [[ $COLOR_SCHEME_SET != 'true' ]];then
+               set_color_scheme "$DEFAULT_SCHEME"
+       fi
+
+       # all the pre-start stuff is in place now
+       B_SCRIPT_UP='true'
+       script_debugger "Debugger: $SCRIPT_NAME is up and running..."
+
+       # then create the output
+       print_it_out
+
+       ## last steps
+       if [[ $B_RUNNING_IN_SHELL == 'true' && $SCHEME -gt 0 ]];then
+               echo -n "\e[0m"
+       fi
+
+       # weechat's executor plugin forced me to do this, and rightfully so, because else the exit code
+       # from the last command is taken..
+       exit 0
+}
+
+#### -------------------------------------------------------------------
+#### basic tests: set script data, booleans, PATH
+#### -------------------------------------------------------------------
+
+# Set PATH data so we can access all programs as user. Set BAN lists.
+# initialize some boleans, these directories are used throughout the script
+# some apps are used for extended functions any directory used, should be
+# checked here first.
+initialize_script_data()
+{
+       local path='' sys_path='' added_path='' b_path_found=''
+       # Extra path variable to make execute failures less likely, merged below
+       local extra_paths="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+
+       # Fallback paths put into $extra_paths; This might, among others, help on gentoo.
+       # Now, create a difference of $PATH and $extra_paths and add that to $PATH:
+       IFS=":"
+       for path in $extra_paths
+       do
+               b_path_found='false'
+               for sys_path in $PATH
+               do
+                       if [[ $path == $sys_path ]];then
+                               b_path_found='true'
+                       fi
+               done
+               if [[ $b_path_found == 'false' ]];then
+                       added_path="$added_path:$path"
+               fi
+       done
+       IFS="$ORIGINAL_IFS"
+       PATH="${PATH}${added_path}"
+       ##echo "PATH='$PATH'"
+       ##/bin/sh -c 'echo "PATH in subshell=\"$PATH\""'
+
+       # Do this after sourcing of config overrides so user can customize banwords
+       BAN_LIST_NORMAL=$( make_ban_lists "${A_NORMAL_BANS[@]}" ) # Contrary to my previous belief, "${ARR[@]}" passes a quoted list, not one string
+       BAN_LIST_CPU=$( make_ban_lists "${A_CPU_BANS[@]}" )
+       ##echo "BAN_LIST_NORMAL='$BAN_LIST_NORMAL'"
+
+       # now set the script BOOLEANS for files required to run features
+       if [[ -d "/proc/" ]];then
+               B_PROC='true'
+       else
+               error_handler 6
+       fi
+
+       if [[ -e $DIR_CPUINFO ]]; then
+               B_CPUINFO='true'
+       fi
+
+       if [[ -e $DIR_MEMINFO ]];then
+               B_MEMINFO='true'
+       fi
+
+       if [[ -e $DIR_ASOUND_DEVICE ]];then
+               B_ASOUND_CARDS='true'
+       fi
+
+       if [[ -e $DIR_ASOUND_VERSION ]];then
+               B_ASOUND_VERSION='true'
+       fi
+
+       if [[ -f $DIR_LSB_RELEASE ]];then
+               B_LSB_DIR='true'
+       fi
+
+       if [[ -e $DIR_SCSI ]];then
+               B_SCSI_DIR='true'
+       fi
+
+       # lack of ifconfig will throw an error only upon it's usage
+       if [[ -x ifconfig ]]; then
+               B_IFCONFIG='true'
+               DIR_IFCONFIG='ifconfig' # change from full path to use $PATH
+       elif [[ -x $DIR_IFCONFIG ]];then
+               B_IFCONFIG='true'
+       else
+               A_INTERFACES_DATA=( "Interfaces tool requires missing app: $DIR_IFCONFIG" )
+       fi
+
+       if [[ -n $DISPLAY ]];then
+               B_X_RUNNING='true'
+       fi
+
+       if [[ -e $DIR_MODULES ]];then
+               B_MODULES_DIR='true'
+       fi
+
+       if [[ -e $DIR_MOUNTS ]];then
+               B_MOUNTS_DIR='true'
+       fi
+
+       if [[ -e $DIR_PARTITIONS ]];then
+               B_PARTITIONS_DIR='true'
+       fi
+}
+
+check_script_suggested_apps()
+{
+       local bash_array_test=( "one" "two" )
+
+       # check for array ability of bash, this is only good for the warning at this time
+       # the boolean could be used later
+       # bash version 2.05b is used in DSL
+       # bash version 3.0 is used in Puppy Linux
+       # versions older than 3.1 don't handle arrays
+       # distro's using below 2.05b are unknown, released in 2002
+       if [[ ${bash_array_test[1]} -eq "two" ]];then
+               B_BASH_ARRAY='true'
+       else
+               script_debugger "Suggestion: update to Bash v3.1 for optimal inxi output"
+       fi
+}
+
+# Determine if any of the absolutely necessary tools are absent
+check_script_depends()
+{
+       local app_name='' app_data=''
+       # bc removed from deps for now
+       local depends="df free gawk grep hostname lspci ps readlink tr uname uptime wc"
+
+       if [[ $B_X_RUNNING == 'true' ]];then
+               for app_name in xrandr xdpyinfo glxinfo
+               do
+                       app_data=$( type -p $app_name )
+                       if [[ -z $app_data ]];then
+                               script_debugger "Resuming in non X mode: $app_name not found in path"
+                               B_X_RUNNING='false'
+                               break
+                       fi
+               done
+       fi
+
+       app_name=''
+
+       for app_name in $depends
+       do
+               app_data=$( type -p $app_name )
+               if [[ -z $app_data ]];then
+                       error_handler 5 "$app_name"
+               fi
+       done
+}
+
+## note: this is now running inside each gawk sequence directly to avoid exiting gawk
+## looping in bash through arrays, then re-entering gawk to clean up, then writing back to array
+## in bash. For now I'll leave this here because there's still some interesting stuff to get re methods
+# Enforce boilerplate and buzzword filters
+# args: $1 - BAN_LIST_NORMAL/BAN_LIST_CPU; $2 - string to sanitize
+sanitize_characters()
+{
+       # Cannot use strong quotes to unquote a string with pipes in it!
+       # bash will interpret the |'s as usual and try to run a subshell!
+       # Using weak quotes instead, or use '"..."'
+       echo "$2" | gawk "
+       BEGIN {
+               IGNORECASE=1
+       }
+       {
+               gsub(/${!1}/,\"\")
+               gsub(/ [ ]+/,\" \")    ## ([ ]+) with (space)
+               gsub(/^ +| +$/,\"\")   ## (pipe char) with (nothing)
+               print                  ## prints (returns) cleaned input
+       }"
+}
+
+# Filter boilerplate & buzzwords.
+# args: $1 - quoted: "$@" array of ban terms
+make_ban_lists()
+{
+       local ban_list=''
+       # Iterate over $@
+       ## note: this is a weird, non-intuitive method, needs some documentation or rewriting
+       ## if you declare ban_string it stops working, have to read up on this
+       for ban_string
+       do
+               # echo "term=\"$ban_string\"" # >&2
+               if [[ ${ban_string:0:1} = $'\2' ]];then
+                       ban_list="${ban_list}${ban_list+|}${ban_string:1:${#ban_string}-1}"
+               else
+                       # Automatically escapes [ ] ( ) . and +
+                       ban_list="${ban_list}${ban_list+|}$( echo "$ban_string" | gawk '{
+                               gsub(/([\[\]+().])/,"\\\\&")
+                               print
+                       }' )"
+               fi
+       done
+
+       echo "$ban_list"
+}
+# make_ban_lists "${A_CPU_BANS[@]}";exit
+
+# Set the colorscheme
+# args: $1 = <scheme number>|<"none">
+set_color_scheme()
+{
+       local i='' script_colors='' color_codes=''
+
+       if [[ $1 -ge ${#A_COLOR_SCHEMES[@]} ]];then
+               set -- 1
+       fi
+       # Set a global variable to allow checking for chosen scheme later
+       SCHEME="$1"
+       if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
+               color_codes=( $ANSI_COLORS )
+       else
+               color_codes=( $IRC_COLORS )
+       fi
+       for (( i=0; i < ${#A_COLORS_AVAILABLE[@]}; i++ ))
+       do
+               eval "${A_COLORS_AVAILABLE[i]}=\"${color_codes[i]}\""
+       done
+       IFS=","
+       script_colors=( ${A_COLOR_SCHEMES[$1]} )
+       IFS="$ORIGINAL_IFS"
+       # then assign the colors globally
+       C1="${!script_colors[0]}"
+       C2="${!script_colors[1]}"
+       CN="${!script_colors[2]}"
+       # ((COLOR_SCHEME++)) ## note: why is this? ##
+}
+
+########################################################################
+#### UTILITY FUNCTIONS
+########################################################################
+
+#### -------------------------------------------------------------------
+#### error handler, debugger, script updater
+#### -------------------------------------------------------------------
+
+# Error handling
+# args: $1 - error number; $2 - optional, extra information
+error_handler()
+{
+       local error_message=''
+
+       # assemble the error message
+       case $1 in
+               2)      error_message="large flood danger, debug buffer full!"
+                       ;;
+               3)      error_message="unsupported color scheme number: $2"
+                       ;;
+               4)      error_message="unsupported verbosity level: $2"
+                       ;;
+               5)      error_message="dependency not met: $2 not found in path"
+                       ;;
+               6)      error_message="/proc not found! Quitting..."
+                       ;;
+               7)      error_message="One of the options you entered in your script parameters: $2\nIs not supported. For supported options, check the help menu: $SCRIPT_NAME -h"
+                       ;;
+               8)      error_message="the self-updater failed, wget exited with error: $2.\nYou probably need to be root.\nHint, to make for easy updates without being root, do: chown <user name> $SCRIPT_PATH/$SCRIPT_NAME"
+                       ;;
+               9)      error_message="unsupported debugging level: $2"
+                       ;;
+               10)
+                       error_message="the alt download url you provided: $2\nappears to be wrong, download aborted. Please note, the url\nneeds to end in /, without $SCRIPT_NAME, like: http://yoursite.com/downloads/"
+                       ;;
+               11)
+                       error_message="unsupported testing option argument: -! $2"
+                       ;;
+               12)
+                       error_message="the svn branch download url: $2\nappears to be empty currently. Make sure there is an actual svn branch version\nactive before you try this again. Check http://code.google.com/p/inxi\nto verify the branch status."
+                       ;;
+               *)      error_message="error unknown: $@"
+                       set -- 99
+                       ;;
+       esac
+       # then print it and exit
+       print_screen_output "Error $1: $error_message"
+       exit $1
+}
+
+# prior to script up set, pack the data into an array
+# then we'll print it out later.
+# args: $1 - $@ debugging string text
+script_debugger()
+{
+       if [[ $B_SCRIPT_UP == 'true' ]];then
+               # only return if debugger is off and no pre start up errors have occured
+               if [[ $DEBUG -eq 0 && $DEBUG_BUFFER_INDEX -eq 0 ]];then
+                       return 0
+               # print out the stored debugging information if errors occured
+               elif [[ $DEBUG_BUFFER_INDEX -gt 0 ]];then
+                       for (( DEBUG_BUFFER_INDEX=0; DEBUG_BUFFER_INDEX < ${#A_DEBUG_BUFFER[@]}; DEBUG_BUFFER_INDEX++ ))
+                       do
+                               print_screen_output "${A_DEBUG_BUFFER[$DEBUG_BUFFER_INDEX]}"
+                       done
+                       DEBUG_BUFFER_INDEX=0
+               fi
+               # or print out normal debugger messages if debugger is on
+               if [[ $DEBUG -gt 0 ]];then
+                       print_screen_output "$1"
+               fi
+       else
+               if [[ $B_DEBUG_FLOOD == 'true' && $DEBUG_BUFFER_INDEX -gt 10 ]];then
+                       error_handler 2
+               # this case stores the data for later printout, will print out only
+               # at B_SCRIPT_UP == 'true' if array index > 0
+               else
+                       A_DEBUG_BUFFER[$DEBUG_BUFFER_INDEX]="$1"
+                       # increment count for next pre script up debugging error
+                       (( DEBUG_BUFFER_INDEX++ ))
+               fi
+       fi
+}
+
+# args: $1 - download url, not including file name; $2 - string to print out
+# note that $1 must end in / to properly construct the url path
+script_self_updater()
+{
+       local wget_error=0
+       print_screen_output "Starting $SCRIPT_NAME self updater."
+       print_screen_output "Currently running $SCRIPT_NAME version number: $SCRIPT_VERSION_NUMBER"
+       print_screen_output "Updating $SCRIPT_NAME in $SCRIPT_PATH using $2 as download source..."
+       # first test if path is good, need to make sure it's good because we're -O overwriting file
+       wget -q --spider $1$SCRIPT_NAME || wget_error=$?
+       # then do the actual download
+       if [[ $wget_error -eq 0 ]];then
+               wget -q -O $SCRIPT_PATH/$SCRIPT_NAME $1$SCRIPT_NAME || wget_error=$?
+               if [[ $wget_error -eq 0 ]];then
+                       SCRIPT_VERSION_NUMBER=$( grep -im 1 'version:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3}' )
+                       print_screen_output "Successfully updated to $2 version: $SCRIPT_VERSION_NUMBER"
+                       print_screen_output "To run the new version, just start $SCRIPT_NAME again."
+                       exit 0
+               fi
+       fi
+       # now run the error handlers on any wget failure
+       if [[ $wget_error -gt 0 ]];then
+               if [[ $2 == 'svn server' ]];then
+                       error_handler 8 "$wget_error"
+               elif [[ $2 == 'alt server' ]];then
+                       error_handler 10 "$1"
+               else
+                       error_handler 12 "$1"
+               fi
+       fi
+}
+
+#### -------------------------------------------------------------------
+#### print / output cleaners
+#### -------------------------------------------------------------------
+
+# inxi speaks through here. When run by Konversation script alias mode, uses DCOP
+# for dcop to work, must use 'say' operator, AND colors must be evaluated by echo -e
+# note: dcop does not seem able to handle \n so that's being stripped out and replaced with space.
+print_screen_output()
+{
+       # the double quotes are needed to avoid losing whitespace in data when certain output types are used
+       local print_data="$( echo -e "$1" )"
+
+       if [[ $DEBUG -gt 5 ]];then
+               if [[ $KONVI -eq 1 ]];then
+                       # konvi doesn't seem to like \n characters, it just prints them literally
+                       print_data="$( tr '\n' ' ' <<< "$print_data" )"
+                       dcop "$DCPORT" "$DCOPOBJ" say "$DCSERVER" "$DCTARGET" "konvi='$KONVI' saying : '$print_data'"
+               elif [[ $KONVI -eq 2 ]];then
+                       echo "konvi='$KONVI' saying : '$print_data'"
+               else
+                       echo "printing out: '$print_data'"
+               fi
+       fi
+
+       if [[ $KONVI -eq 1 ]];then
+               print_data="$( tr '\n' ' ' <<< "$print_data" )"
+               dcop "$DCPORT" "$DCOPOBJ" say "$DCSERVER" "$DCTARGET" "$print_data"
+       else
+               # the -n is needed to avoid double spacing of output in terminal
+               echo -ne "$print_data\n"
+       fi
+}
+
+## this handles all verbose line construction with indentation/line starter
+## args: $1 - null (, actually: " ") or line starter; $2 - line content
+create_print_line()
+{
+       printf "${C1}%-${INDENT}s${C2} %s" "$1" "$2"
+}
+
+# this removes newline and pipes.
+# args: $1 - string to clean
+remove_erroneous_chars()
+{
+       ## RS is input record separator
+       ## gsub is substitute;
+       gawk '
+       BEGIN {
+               RS=""
+       }
+       {
+               gsub(/\n$/,"")         ## (newline; end of string) with (nothing)
+               gsub(/\n/," ");        ## (newline) with (space)
+               gsub(/^ *| *$/, "")    ## (pipe char) with (nothing)
+               gsub(/  +/, " ")       ## ( +) with (space)
+               gsub(/ [ ]+/, " ")     ## ([ ]+) with (space)
+               gsub(/^ +| +$/, "")    ## (pipe char) with (nothing)
+               printf $0
+       }' "$1"      ## prints (returns) cleaned input
+}
+
+#### -------------------------------------------------------------------
+#### parameter handling, print usage functions.
+#### -------------------------------------------------------------------
+
+# Get the parameters. Note: standard options should be lower case, advanced or testing, upper
+# args: $1 - full script startup args: $@
+get_parameters()
+{
+       local opt='' wget_test='' update_flags='U!:'
+       local use_short='true' # this is needed to trigger short output, every v/d/F/line trigger sets this false
+
+       if [[ $B_ALLOW_UPDATE == 'false' ]];then
+               update_flags=''
+       fi
+
+       # the short form only runs if no args output args are used
+       # no need to run through these if there are no args
+       if [[ -n $1 ]];then
+               while getopts Ac:CdDfFGhHiIlNpPSuv:Vx%@:${update_flags} opt
+               do
+                       case $opt in
+                       A)      B_SHOW_AUDIO='true'
+                               use_short='false'
+                               ;;
+                       c)      if [[ -n $( egrep '^[0-9][0-9]?$' <<< $OPTARG ) ]];then
+                                       COLOR_SCHEME_SET='true'
+                                       ## note: not sure about this, you'd think user values should be overridden, but
+                                       ## we'll leave this for now
+                                       if [[ -z $COLOR_SCHEME ]];then
+                                               set_color_scheme "$OPTARG"
+                                       fi
+                               else
+                                       error_handler 3 "$OPTARG"
+                               fi
+                               ;;
+                       C)      B_SHOW_CPU='true'
+                               use_short='false'
+                               ;;
+                       d)      VERBOSITY_LEVEL=1
+                               use_short='false'
+                               ;;
+                       D)      B_SHOW_DISK='true'
+                               use_short='false'
+                               ;;
+                       f)      B_SHOW_CPU='true'
+                               B_CPU_FLAGS_FULL='true'
+                               use_short='false'
+                               ;;
+                       F)      VERBOSITY_LEVEL=$VERBOSITY_LEVELS
+                               B_EXTRA_DATA='true'
+                               B_SHOW_DISK='true'
+                               B_SHOW_PARTITIONS='true'
+                               B_SHOW_AUDIO='true'
+                               use_short='false'
+                               ;;
+                       G)      B_SHOW_GRAPHICS='true'
+                               use_short='false'
+                               ;;
+                       i)      B_SHOW_IP='true'
+                               B_SHOW_NETWORK='true'
+                               use_short='false'
+                               ;;
+                       I)      B_SHOW_INFO='true'
+                               use_short='false'
+                               ;;
+                       l)      B_SHOW_LABELS='true'
+                               B_SHOW_PARTITIONS='true'
+                               use_short='false'
+                               ;;
+                       N)      B_SHOW_NETWORK='true'
+                               use_short='false'
+                               ;;
+                       p)      B_SHOW_PARTITIONS_FULL='true'
+                               B_SHOW_PARTITIONS='true'
+                               use_short='false'
+                               ;;
+                       P)      B_SHOW_PARTITIONS='true'
+                               use_short='false'
+                               ;;
+                       S)      B_SHOW_SYSTEM='true'
+                               use_short='false'
+                               ;;
+                       u)      B_SHOW_UUIDS='true'
+                               B_SHOW_PARTITIONS='true'
+                               use_short='false'
+                               ;;
+                       v)      if [[ -n $( egrep "^[0-9][0-9]?$" <<< $OPTARG ) && $OPTARG -le $VERBOSITY_LEVELS ]];then
+                                       VERBOSITY_LEVEL="$OPTARG"
+                                       if [[ $OPTARG -gt 0 ]];then
+                                               use_short='false'
+                                       fi
+                               else
+                                       error_handler 4 "$OPTARG"
+                               fi
+                               ;;
+                       U)      script_self_updater "$SCRIPT_DOWNLOAD" 'svn server'
+                               ;;
+                       V)      print_version_info
+                               exit 0
+                               ;;
+                       x)      B_EXTRA_DATA='true'
+                               ;;
+                       h)      show_options
+                               exit 0
+                               ;;
+                       H)      show_options 'full'
+                               exit 0
+                               ;;
+                       ## debuggers and testing tools
+                       %)      B_HANDLE_CORRUPT_DATA='true'
+                               ;;
+                       @)      if [[ -n $( egrep "^([1-9]|10)$" <<< $OPTARG ) ]];then
+                                       DEBUG=$OPTARG
+                                       exec 2>&1
+                               else
+                                       error_handler 9 "$OPTARG"
+                               fi
+                               ;;
+                       !)      # test for various supported methods
+                               case $OPTARG in
+                                       1)      B_TESTING_1='true'
+                                               ;;
+                                       2)      B_TESTING_2='true'
+                                               ;;
+                                       3)      B_TESTING_1='true'
+                                               B_TESTING_2='true'
+                                               ;;
+                                       10)
+                                               script_self_updater "$SCRIPT_DOWNLOAD_DEV" 'dev server'
+                                               ;;
+                                       11)
+                                               script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_1" 'svn: branch one server'
+                                               ;;
+                                       12)
+                                               script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_2" 'svn: branch two server'
+                                               ;;
+                                       13)
+                                               script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_3" 'svn: branch three server'
+                                               ;;
+                                       14)
+                                               script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_4" 'svn: branch four server'
+                                               ;;
+                                       http*)
+                                               script_self_updater "$OPTARG" 'alt server'
+                                               ;;
+                                       *)      error_handler 11 "$OPTARG"
+                                               ;;
+                               esac
+                               ;;
+                       *)      error_handler 7 "$1"
+                               ;;
+                       esac
+               done
+       fi
+       ## this must occur here so you can use the debugging flag to show errors
+       ## Reroute all error messages to the bitbucket (if not debugging)
+       if [[ $DEBUG -eq 0 ]];then
+               exec 2>/dev/null
+       fi
+       #((DEBUG)) && exec 2>&1 # This is for debugging konversation
+
+       # after all the args have been processed, if no long output args used, run short output
+       if [[ $use_short == 'true' ]];then
+               B_SHOW_SHORT_OUTPUT='true'
+       fi
+}
+
+## print out help menu, not including Testing or Debugger stuff because it's not needed
+show_options()
+{
+       local color_scheme_count=${#A_COLOR_SCHEMES[@]}
+
+       print_screen_output "$SCRIPT_NAME supports the following options. You can combine them, or list them"
+       print_screen_output "one by one: Examples: $SCRIPT_NAME -v4 -c6 OR $SCRIPT_NAME -dDc 6"
+       print_screen_output ""
+       print_screen_output "If you start $SCRIPT_NAME with no arguments, it will show the short form."
+       print_screen_output "The following options if used without -d or -v will show just that complete line:"
+       print_screen_output "A,C,D,G,I,N,P,S - you can use these together to show just the lines you want to see."
+       print_screen_output "If you use them with a -v level (or -d), it will show the full output for that line "
+       print_screen_output "along with the output for the chosen verbosity level."
+       print_screen_output "- - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
+       print_screen_output "Output Control Options:"
+       print_screen_output "-A  Show audio/sound card information."
+       print_screen_output "-c  Available color schemes. Scheme number is required."
+       print_screen_output "    Supported schemes: 0-$color_scheme_count Example: $SCRIPT_NAME -c 11"
+       print_screen_output "-C  Show full CPU output, including per CPU clockspeed."
+       print_screen_output "-d  Default output verbosity level, same as: $SCRIPT_NAME -v 1"
+       print_screen_output "-D  Show full hard disk info, not only model, ie: /dev/sda ST380817AS 80.0GB."
+       print_screen_output "-f  Show all cpu flags used, not just the short list. Not shown with -F to avoid spamming."
+       print_screen_output "-F  Show Full, all possible, output for $SCRIPT_NAME."
+       print_screen_output "-G  Show graphic card information (+ glx driver and version for non free video drivers)."
+       print_screen_output "-i  Show Wan IP address, and shows local interfaces (requires ifconfig network tool)."
+       print_screen_output "    Not shown with -F for user security reasons, you shouldn't paste your local/wan IP."
+       print_screen_output "-I  Show information: processes, uptime, memory, irc client, inxi version."
+       print_screen_output "-l  Show partition labels. Default: short partition -P. For full -p output, use: -pl (or -plu)."
+       print_screen_output "-N  Show network card information."
+       print_screen_output "-p  Show full partition information (-P plus all other detected partitions)."
+       print_screen_output "    If any of your partitions have spaces in their names, they will not show with -p"
+       print_screen_output "-P  Show partition information (shows what -v4 would show, but without extra data)."
+       print_screen_output "    Shows, if detected: / /boot /home /tmp /usr /var. Use -p for All partitions."
+       print_screen_output "-S  Show system information: host name, kernel, distro"
+       print_screen_output "-u  Show partition UUIDs. Default: short partition -P. For full -p output, use: -pu (or -plu)."
+       print_screen_output "-v  Script verbosity levels. Verbosity level number is required."
+       print_screen_output "    Supported levels: 0-${VERBOSITY_LEVELS} Example: $SCRIPT_NAME -v 4"
+       print_screen_output "    0 - short output, same as: $SCRIPT_NAME"
+       print_screen_output "    1 - basic verbose, same as: $SCRIPT_NAME -d"
+       print_screen_output "    2 - Also show networking card data"
+       print_screen_output "    3 - Also show hard disk names as detected."
+       print_screen_output "    4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot"
+       print_screen_output "    5 - For multicore systems, also show per core clock speeds; shows audio card."
+       print_screen_output "-x  Show extra data: bogomips on cpu; driver version (if available) for network/audio;"
+       print_screen_output "    direct rendering status for Graphics. Only works with verbose or line output."
+       print_screen_output ""
+       print_screen_output "Additional Options:"
+       print_screen_output "-h - this help menu."
+       if [[ $B_ALLOW_UPDATE == 'true' ]];then
+               print_screen_output "-U  Auto-update script. Note: if you installed as root, you"
+               print_screen_output "    must be root to update, otherwise user is fine."
+       fi
+       print_screen_output "-V  $SCRIPT_NAME version information. Prints information then exits."
+       print_screen_output "-%  Overrides defective or corrupted data."
+       print_screen_output "-@  Triggers debugger output. Requires debugging level 1-10."
+       if [[ $1 == 'full' ]];then
+               print_screen_output ""
+               print_screen_output "Developer and Testing Options (Advanced):"
+               print_screen_output "-! 1 - Sets testing flag B_TESTING_1='true' to trigger testing condition 1."
+               print_screen_output "-! 2 - Sets testing flag B_TESTING_2='true' to trigger testing condition 2."
+               print_screen_output "-! 3 - Sets flags B_TESTING_1='true' and B_TESTING_2='true'."
+               print_screen_output "-! 10 - Triggers an update from the primary dev download server instead of svn."
+               print_screen_output "-! 11 - Triggers an update from svn branch one - if present, of course."
+               print_screen_output "-! 12 - Triggers an update from svn branch two - if present, of course."
+               print_screen_output "-! 13 - Triggers an update from svn branch three - if present, of course."
+               print_screen_output "-! 14 - Triggers an update from svn branch four - if present, of course."
+               print_screen_output "-! <http://......> - Triggers an update from whatever server you list."
+               print_screen_output ""
+       fi
+       print_screen_output ""
+}
+
+## print out version information for -V/--version
+print_version_info()
+{
+       local last_modified=$( grep -im 1 'date:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3,$4,$5}' )
+
+       print_screen_output "$SCRIPT_NAME - the universal, portable, system info script for irc."
+       print_screen_output "Version: $SCRIPT_VERSION_NUMBER"
+       print_screen_output "Script Last Modified: $last_modified"
+       print_screen_output "Script Location: $SCRIPT_PATH"
+       print_screen_output ""
+       print_screen_output "Tested with Irssi, Xchat, Konversation, BitchX, KSirc, ircII,"
+       print_screen_output "Gaim/Pidgin, Weechat, KVIrc and Kopete."
+       print_screen_output ""
+       print_screen_output "This script is a fork of Infobash 3.02, which is:"
+       print_screen_output "Copyright (C) 2005-2007  Michiel de Boer a.k.a. locsmif"
+       print_screen_output "Subsequent changes and modifications (after Infobash 3.02) are:"
+       print_screen_output "Copyright (C) 2008-9 Scott Rogers, Harald Hope, aka trash80 & h2"
+       print_screen_output ""
+       print_screen_output "This program is free software; you can redistribute it and/or modify"
+       print_screen_output "it under the terms of the GNU General Public License as published by"
+       print_screen_output "the Free Software Foundation; either version 3 of the License, or"
+       print_screen_output "(at your option) any later version."
+}
+
+########################################################################
+#### MAIN FUNCTIONS
+########################################################################
+
+#### -------------------------------------------------------------------
+#### initial startup stuff
+#### -------------------------------------------------------------------
+
+# Determine where inxi was run from, set IRC_CLIENT and IRC_CLIENT_VERSION
+get_start_client()
+{
+       local irc_client_path='' irc_client_path_lower='' non_native_konvi='' i=''
+       local b_non_native_app='false' pppid='' app_working_name=''
+
+       if tty >/dev/null;then
+               IRC_CLIENT='Shell'
+               unset IRC_CLIENT_VERSION
+               B_RUNNING_IN_SHELL='true'
+       elif [[ -n $PPID && -f /proc/$PPID/exe ]];then
+               irc_client_path=$( readlink /proc/$PPID/exe )
+               irc_client_path_lower=$( tr '[:upper:]' '[:lower:]' <<< $irc_client_path )
+               app_working_name=$( basename $irc_client_path_lower )
+               # handles the xchat/sh/bash/dash cases, and the konversation/perl cases, where clients
+               # report themselves as perl or unknown shell. IE:  when konversation starts inxi
+               # from inside itself, as a script, the parent is konversation/xchat, not perl/bash etc
+               # note: perl can report as: perl5.10.0, so it needs wildcard handling
+               case $app_working_name in
+                       bash|dash|sh|perl*)     # We want to know who wrapped it into the shell or perl.
+                               pppid="$( ps -p $PPID -o ppid --no-headers | sed 's/ //g' )"
+                               if [[ -n $pppid && -f /proc/$pppid/exe ]];then
+                                       irc_client_path="$( readlink /proc/$pppid/exe )"
+                                       irc_client_path_lower="$( tr '[:upper:]' '[:lower:]' <<< $irc_client_path )"
+                                       app_working_name=$( basename $irc_client_path_lower )
+                                       b_non_native_app='true'
+                               fi
+                               ;;
+               esac
+               # replacing loose detection with tight detection, bugs will be handled with app names
+               # as they appear.
+               case $app_working_name in
+                       irssi-text|irssi)
+                               IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
+                                       print $2
+                               }' )"
+                               IRC_CLIENT="Irssi"
+                               ;;
+                       konversation)
+                               # this is necessary to avoid the dcop errors from starting inxi as a /cmd started script
+                               if [[ $b_non_native_app == 'true' ]];then
+                                       KONVI=2
+                               else
+                                       KONVI=1
+                               fi
+                               IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk '
+                               /Konversation:/ {
+                                       for ( i=2; i<=NF; i++ ) {
+                                               if (i == NF) {
+                                                       print $i
+                                               }
+                                               else {
+                                                       printf $i" "
+                                               }
+                                       }
+                                       exit
+                               }' )"
+
+                               T=($IRC_CLIENT_VERSION)
+                               if [[ ${T[0]} == *+* ]];then
+                                       # < Sho_> locsmif: The version numbers of SVN versions look like this:
+                                       #         "<version number of last release>+ #<build number", i.e. "1.0+ #3177" ...
+                                       #         for releases we remove the + and build number, i.e. "1.0" or soon "1.0.1"
+                                       IRC_CLIENT_VERSION=" CVS $IRC_CLIENT_VERSION"
+                                       T2="${T[0]/+/}"
+                               else
+                                       IRC_CLIENT_VERSION=" ${T[0]}"
+                                       T2="${T[0]}"
+                               fi
+                               # Remove any dots except the first, and make sure there are no trailing zeroes,
+                               T2=$( echo "$T2" | gawk '{
+                                       sub(/\./, " ")
+                                       gsub(/\./, "")
+                                       sub(/ /, ".")
+                                       printf("%g\n", $0)
+                               }' )
+                               # Since Konversation 1.0, the DCOP interface has changed a bit: dcop "$DCPORT" Konversation ..etc
+                               # becomes : dcop "$DCPORT" default ... or dcop "$DCPORT" irc ..etc. So we check for versions smaller
+                               # than 1 and change the DCOP parameter/object accordingly.
+                               if [[ ${T2} -lt 1 ]];then
+                                       DCOPOBJ="Konversation"
+                               fi
+                               IRC_CLIENT="Konversation"
+                               ;;
+                       xchat-gnome)
+                               IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
+                                       print $2
+                               }' )"
+                               IRC_CLIENT="X-Chat-Gnome"
+                               ;;
+                       xchat)
+                               IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
+                                       print $2
+                               }' )"
+                               IRC_CLIENT="X-Chat"
+                               ;;
+                       bitchx)
+                               IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk '
+                               /Version/ {
+                                       a=tolower($2)
+                                       gsub(/[()]|bitchx-/,"",a)
+                                       print a
+                                       exit
+                               }
+                               $2 == "version" {
+                                       a=tolower($3)
+                                       sub(/bitchx-/,"",a)
+                                       print a
+                                       exit
+                               }' )"
+                               IRC_CLIENT="BitchX"
+                               ;;
+                       ircii)
+                               IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
+                                       print $3
+                               }' )"
+                               IRC_CLIENT="ircII"
+                               ;;
+                       gaim)
+                               IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
+                                       print $2
+                               }' )"
+                               IRC_CLIENT="Gaim"
+                               ;;
+                       pidgin)
+                               IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
+                                       print $2
+                               }' )"
+                               IRC_CLIENT="Pidgin"
+                               ;;
+                       quassel*)
+                               # sample: quassel -v
+                               # Qt: 4.5.0
+                               # KDE: 4.2.65 (KDE 4.2.65 (KDE 4.3 >= 20090226))
+                               # Quassel IRC: v0.4.0 [+60] (git-22effe5)
+                               # note: early < 0.4.1 quassels do not have -v
+                               IRC_CLIENT_VERSION=" $( $irc_client_path -v 2>/dev/null | gawk -F ': ' '
+                               BEGIN {
+                                       IGNORECASE=1
+                                       clientVersion=""
+                               }
+                               /Quassel IRC/ {
+                                       clientVersion = $2
+                               }
+                               END {
+                                       # this handles pre 0.4.1 cases with no -v
+                                       if ( clientVersion == "" ) {
+                                               clientVersion = "(pre v0.4.1)"
+                                       }
+                                       print clientVersion
+                               }' )"
+                               # now handle primary, client, and core. quasselcore doesn't actually
+                               # handle scripts with exec, but it's here just to be complete
+                               case $app_working_name in
+                                       quassel)
+                                               IRC_CLIENT="Quassel [M]"
+                                               ;;
+                                       quasselclient)
+                                               IRC_CLIENT="Quassel"
+                                               ;;
+                                       quasselcore)
+                                               IRC_CLIENT="Quassel (core)"
+                                               ;;
+                               esac
+                               ;;
+                       weechat-curses)
+                               IRC_CLIENT_VERSION=" $( $irc_client_path -v ) "
+                               IRC_CLIENT="Weechat"
+                               ;;
+                       kvirc)
+                               IRC_CLIENT_VERSION=" $( $irc_client_path -v 2>&1 | gawk '{
+                                       for ( i=2; i<=NF; i++) {
+                                               if ( i == NF ) {
+                                                       print $i
+                                               }
+                                               else {
+                                                       printf $i" "
+                                               }
+                                       }
+                                       exit
+                                }' )"
+                               IRC_CLIENT="KVIrc"
+                               ;;
+                       kopete)
+                               IRC_CLIENT_VERSION=" $( kopete -v | gawk '
+                               /Kopete:/ {
+                                       print $2
+                                       exit
+                               }' )"
+                               IRC_CLIENT="Kopete"
+                               ;;
+                       perl*|ksirc|dsirc)
+                               unset IRC_CLIENT_VERSION
+                               # KSirc is one of the possibilities now. KSirc is a wrapper around dsirc, a perl client
+                               get_cmdline $PPID
+                               for (( i=0; i <= $CMDL_MAX; i++ ))
+                               do
+                                       case ${A_CMDL[i]} in
+                                               *dsirc*)
+                                               IRC_CLIENT="KSirc"
+                                               # Dynamic runpath detection is too complex with KSirc, because KSirc is started from
+                                               # kdeinit. /proc/<pid of the grandparent of this process>/exe is a link to /usr/bin/kdeinit
+                                               # with one parameter which contains parameters separated by spaces(??), first param being KSirc.
+                                               # Then, KSirc runs dsirc as the perl irc script and wraps around it. When /exec is executed,
+                                               # dsirc is the program that runs inxi, therefore that is the parent process that we see.
+                                               # You can imagine how hosed I am if I try to make inxi find out dynamically with which path
+                                               # KSirc was run by browsing up the process tree in /proc. That alone is straightjacket material.
+                                               # (KSirc sucks anyway ;)
+                                               IRC_CLIENT_VERSION=" $( ksirc -v | gawk '
+                                               /KSirc:/ {
+                                                       print $2
+                                                       exit
+                                               }' )"
+                                               break
+                                               ;;
+                                       esac
+                               done
+                               if [[ -z $IRC_CLIENT_VERSION ]];then
+                                       IRC_CLIENT="Unknown Perl client"
+                               fi
+                               ;;
+                       bash|dash|sh)
+                               unset IRC_CLIENT_VERSION
+                               IRC_CLIENT="Shell wrapper"
+                               ;;
+                       *)
+                               IRC_CLIENT="Unknown : ${irc_client_path##*/}"
+                               unset IRC_CLIENT_VERSION
+                               ;;
+               esac
+               if [[ $SHOW_IRC -lt 2 ]];then
+                       unset IRC_CLIENT_VERSION
+               fi
+       else
+               IRC_CLIENT="PPID=\"$PPID\" - empty?"
+               unset IRC_CLIENT_VERSION
+       fi
+}
+
+# Parse the null separated commandline under /proc/<pid passed in $1>/cmdline
+# args: $1 - $PPID
+get_cmdline()
+{
+       local i=0 ppid=$1
+
+       if [[ ! -e /proc/$ppid/cmdline ]];then
+               echo 0
+               return
+       fi
+       ##print_screen_output "Marker"
+       ##print_screen_output "\$ppid='$ppid' -=- $(< /proc/$ppid/cmdline)"
+       unset A_CMDL
+       ## note: need to figure this one out, and ideally clean it up and make it readable
+       while read -d $'\0' L && [[ $i -lt 32 ]]
+       do
+               A_CMDL[i++]="$L" ## note: make sure this is valid - What does L mean? ##
+       done < /proc/$ppid/cmdline
+       ##print_screen_output "\$i='$i'"
+       if [[ $i -eq 0 ]];then
+               A_CMDL[0]=$(< /proc/$ppid/cmdline)
+               if [[ -n ${A_CMDL[0]} ]];then
+                       i=1
+               fi
+       fi
+       CMDL_MAX=$i
+}
+
+#### -------------------------------------------------------------------
+#### get data types
+#### -------------------------------------------------------------------
+## create array of sound cards installed on system, and if found, use asound data as well
+get_audio_data()
+{
+       local i='' alsa_data='' alsa_driver='' device_count=''
+       local usb_proc_file='' array_count='' usb_id='' usb_data=''
+
+       IFS=$'\n'
+       # this first step handles the drivers for cases where the second step fails to find one
+       device_count=$( echo "$Lspci_Data" | egrep -ic '(multimedia audio controller|audio device)' )
+       if [[ $device_count -eq 1 ]] && [[ $B_ASOUND_CARDS == 'true' ]];then
+               alsa_driver=$( gawk -F ']: ' '
+               BEGIN {
+                       IGNORECASE=1
+               }
+               # filtering out modems and usb devices like webcams, this might get a
+               # usb audio card as well, this will take some trial and error
+               $0 !~ /modem/ || $0 !~ /usb/ {
+                       driver=gensub( /^(.+)( - )(.+)$/, "\\1", 1, $2 )
+                       gsub(/^ +| +$/,"",driver)
+                       if ( driver != "" ){
+                               print driver
+                       }
+               }'  $DIR_ASOUND_DEVICE )
+       fi
+
+       # this is to safeguard against line breaks from results > 1, which if inserted into following
+       # array will create a false array entry. This is a hack, not a permanent solution.
+       alsa_driver=$( echo $alsa_driver )
+       # now we'll build the main audio data, card name, driver, and port. If no driver is found,
+       # and if the first method above is not null, and one card is found, it will use that instead.
+       A_AUDIO_DATA=( $( echo "$Lspci_Data" | gawk -F ': ' -v alsaDriver="$alsa_driver" '
+       BEGIN {
+               IGNORECASE=1
+       }
+       /multimedia audio controller|audio device/ {
+               audioCard=gensub(/^[0-9a-f:.]+ [^:]+: (.+)$/,"\\1","g",$0)
+               # The doublequotes are necessary because of the pipes in the variable.
+               gsub(/'"$BAN_LIST_NORMAL"'/, "", audioCard)
+               gsub(/,/, " ", audioCard)
+               gsub(/^ +| +$/, "", audioCard)
+               gsub(/ [ \t]+/, " ", audioCard)
+
+               cards[audioCard]++
+
+               # loop until you get to the end of the data block
+               while (getline && !/^$/) {
+                       if (/driver in use/) {
+                               drivers[audioCard] = drivers[audioCard] gensub(/(.*): (.*)/,"\\2","g",$0) ""
+                       }
+                       else if (/kernel modules:/) {
+                               modules[audioCard] = modules[audioCard] gensub(/(.*): (.*)/,"\\2","g",$0) ""
+                       }
+                       else if (/I\/O/) {
+                               portsTemp = gensub(/\t*I\/O ports at (.*) \[.*\]/,"\\1","g",$0)
+                               ports[audioCard] = ports[audioCard] portsTemp " "
+                       }
+               }
+       }
+
+       END {
+               j=0
+               for (i in cards) {
+                       useDrivers=""
+                       useModules=""
+                       usePorts=""
+                       if (cards[i]>1) {
+                               a[j]=cards[i]"x "i
+                               if (drivers[i] != "") {
+                                       useDrivers=drivers[i]
+                               }
+                               if (ports[i] != "") {
+                                       usePorts = ports[i]
+                               }
+                               if (modules[i] != "" ) {
+                                       useModules = modules[i]
+                               }
+                       }
+                       else {
+                               a[j]=i
+                               # little trick here to try to catch the driver if there is
+                               # only one card and it was null, from the first test of asound/cards
+                               if (drivers[i] != "") {
+                                       useDrivers=drivers[i]
+                               }
+                               else if ( alsaDriver != "" ) {
+                                       useDrivers=alsaDriver
+                               }
+                               if (ports[i] != "") {
+                                       usePorts=ports[i]
+                               }
+                               if (modules[i] != "" ) {
+                                       useModules = modules[i]
+                               }
+                       }
+                       # create array primary item for master array
+                       print a[j] "," useDrivers "," usePorts "," useModules
+                       j++
+               }
+       }') )
+
+       # in case of failure of first check do this instead
+       if [[ ${#A_AUDIO_DATA[@]} -eq 0 ]] && [[ $B_ASOUND_CARDS == 'true' ]];then
+               A_AUDIO_DATA=( $( gawk -F ']: ' '
+               BEGIN {
+                       IGNORECASE=1
+               }
+               $1 !~ /modem/ && $2 !~ /modem/ {
+                       card=gensub( /^(.+)( - )(.+)$/, "\\3", 1, $2 )
+                       driver=gensub( /^(.+)( - )(.+)$/, "\\1", 1, $2 )
+                       if ( card != "" ){
+                               print card","driver
+                       }
+               }'  $DIR_ASOUND_DEVICE ) )
+       fi
+
+       # alsa usb detection by damentz
+       # for every sound card symlink in /proc/asound - display information about it
+       for usb_proc_file in /proc/asound/*
+       do
+               # if lsusb exists, the file is a symlink, and contains an important usb exclusive file: continue
+               if [[ -n $( which lsusb ) && -L $usb_proc_file && -e $usb_proc_file/usbid  ]]; then
+                       # send error messages of lsusb to /dev/null as it will display a bunch if not a super user
+                       # also, find the contents of usbid in lsusb and print everything after the 7th word on the
+                       # corresponding line. Finally, strip out commas as they will change the driver :)
+                       usb_id=$( cat $usb_proc_file/usbid )
+                       usb_data=$( lsusb -v 2>/dev/null | grep "$usb_id" )
+                       usb_data=$( gawk '{
+                               gsub( /,/, " ", $0 )
+                               for( i=7; i <= NF; i++ ) {
+                                       printf( $i " " )
+                               }
+                       }' <<< "$usb_data" )
+                       # this method is interesting, it shouldn't work but it does
+                       #A_AUDIO_DATA=( "${A_AUDIO_DATA[@]}" "$usb_data,snd-usb-audio,," )
+                       # but until we learn why the above worked, I'm using this one, which is safer
+                       if [[ -n $usb_data ]];then
+                               array_count=${#A_AUDIO_DATA[@]}
+                               A_AUDIO_DATA[$array_count]="$usb_data,snd-usb-audio,,"
+                       fi
+               fi
+       done
+       IFS="$ORIGINAL_IFS"
+
+       # handle cases where card detection fails, like in PS3, where lspci gives no output, or headless boxes..
+       if [[ ${#A_AUDIO_DATA[@]} -eq 0 ]];then
+               A_AUDIO_DATA[0]='Failed to Detect Sound Card!'
+       fi
+}
+
+get_audio_alsa_data()
+{
+       local alsa_data=''
+
+       # now we'll get the alsa data if the file exists
+       if [[ $B_ASOUND_VERSION == 'true' ]];then
+               alsa_data=$( gawk '
+                       BEGIN {
+                               IGNORECASE=1
+                       }
+                       # some alsa strings have the build date in (...)
+                       # remove trailing . and remove possible second line if compiled by user
+                       $0 !~ /compile/ {
+                               gsub( "Driver | [(].*[)]|\.$","",$0 )
+                               gsub(/,/, " ", $0)
+                               gsub(/^ +| +$/, "", $0)
+                               gsub(/ [ \t]+/, " ", $0)
+                               if ( $0 != "" ){
+                                       print $0
+                               }
+               }' $DIR_ASOUND_VERSION )
+       fi
+       echo "$alsa_data"
+}
+
+## create A_CPU_CORE_DATA, currently with two values: integer core count; core string text
+## return value cpu core count string, this helps resolve the multi redundant lines of old style output
+get_cpu_core_count()
+{
+       if [[ $B_CPUINFO == 'true' ]]; then
+               # load the A_CPU_TYPE_PCNT_CCNT core data array
+               get_cpu_ht_multicore_smp_data
+               ## Because of the upcoming release of cpus with core counts over 6, a count of cores is given after Deca (10)
+               # count the number of processors given
+               local cpu_physical_count=${A_CPU_TYPE_PCNT_CCNT[1]}
+               local cpu_core_count=${A_CPU_TYPE_PCNT_CCNT[2]}
+               local cpu_type=${A_CPU_TYPE_PCNT_CCNT[0]}
+
+               # match the numberic value to an alpha value
+               case $cpu_core_count in
+                       1) cpu_alpha_count='Single';;
+                       2) cpu_alpha_count='Dual';;
+                       3) cpu_alpha_count='Triple';;
+                       4) cpu_alpha_count='Quad';;
+                       5) cpu_alpha_count='Penta';;
+                       6) cpu_alpha_count='Hexa';;
+                       7) cpu_alpha_count='Hepta';;
+                       8) cpu_alpha_count='Octa';;
+                       9) cpu_alpha_count='Ennea';;
+                       10) cpu_alpha_count='Deca';;
+                       *) cpu_alpha_count='Multi';;
+               esac
+               # create array, core count integer; core count string
+               # A_CPU_CORE_DATA=( "$cpu_core_count" "$cpu_alpha_count Core$cpu_type" )
+               A_CPU_CORE_DATA=( "$cpu_physical_count" "$cpu_alpha_count" "$cpu_type" "$cpu_core_count" )
+       fi
+}
+
+## main cpu data collector
+get_cpu_data()
+{
+       local i='' j='' cpu_array_nu='' a_cpu_working='' multi_cpu='' bits=''
+
+       if [[ $B_CPUINFO == 'true' ]];then
+               IFS=$'\n'
+               A_CPU_DATA=( $( gawk -F': ' '
+               BEGIN {
+                       IGNORECASE=1
+               }
+               # TAKE STRONGER NOTE: \t+ does NOT always work, MUST be [ \t]+
+               # TAKE NOTE: \t+ will work for $DIR_CPUINFO, but SOME ARBITRARY FILE used for TESTING might contain SPACES!
+               # Therefore PATCH to use [ \t]+ when TESTING!
+               /^processor[ \t]+:/ {
+                       nr = $NF
+               }
+
+               /^model name|^cpu\t+:/ {
+                       gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF )
+                       gsub(/'"$BAN_LIST_CPU"'/, "", $NF )
+                       gsub(/,/, " ", $NF)
+                       gsub(/^ +| +$/, "", $NF)
+                       gsub(/ [ \t]+/, " ", $NF)
+                       cpu[nr, "model"] = $NF
+               }
+
+               /^cpu MHz|^clock\t+:/ {
+                       if (!min) {
+                               min = $NF
+                       }
+                       else {
+                               if ($NF < min) {
+                                       min = $NF
+                               }
+                       }
+
+                       if ($NF > max) {
+                               max = $NF
+                       }
+                       gsub(/MHZ/,"",$NF) ## clears out for cell cpu
+                       gsub(/.00[0]+$/,".00",$NF) ## clears out excessive zeros
+                       cpu[nr, "speed"] = $NF
+               }
+
+               /^cache size/ {
+                       cpu[nr, "cache"] = $NF
+               }
+
+               /^flags/ {
+                       cpu[nr, "flags"] = $NF
+               }
+
+               /^bogomips/ {
+                       cpu[nr, "bogomips"] = $NF
+               }
+
+               /vendor_id/ {
+                       gsub(/genuine|authentic/,"",$NF)
+                       cpu[nr, "vendor"] = tolower( $NF )
+               }
+
+               END {
+                       #if (!nr) { print ",,,"; exit } # <- should this be necessary or should bash handle that
+                       for ( i = 0; i <= nr; i++ ) {
+                               print cpu[i, "model"] "," cpu[i, "speed"] "," cpu[i, "cache"] "," cpu[i, "flags"] "," cpu[i, "bogomips"] ","  cpu[nr, "vendor"]
+                       }
+                       if (!min) {
+                               print "not found"
+                               exit
+                       }
+                       if (min != max) {
+                               printf("Min:%s%s Max:%s%s\n", min, "Mhz", max, "Mhz")
+                       }
+                       else {
+                               printf("%s %s\n", max, "Mhz")
+                       }
+               }' $DIR_CPUINFO ) )
+       fi
+
+       IFS="$ORIGINAL_IFS"
+#      echo getMainCpu: ${[@]}
+}
+
+## this is for counting processors and finding HT types
+get_cpu_ht_multicore_smp_data()
+{
+       # in /proc/cpuinfo
+       # if > 1 processor && processor id == core id then Hyperthreaded (HT)
+       # if > 1 processor && different processor ids then Multiple Processors (SMP)
+       # if > 1 processor && processor id != core id then Multi-Core Processors (MCP)
+       # if = 1 processor then single core/processor Uni-Processor (UP)
+
+       if [[ $B_CPUINFO == 'true' ]]; then
+               A_CPU_TYPE_PCNT_CCNT=( $(
+               gawk '
+               BEGIN {
+                       FS=": "
+                       IGNORECASE = 1
+                       core_count = 0
+                       i = 0
+                       index_temp = ""
+                       num_of_cores = 0
+                       physical_cpu_count = 0
+                       processor_logical_count = 0
+                       processors = 1
+                       type = "UP"
+               }
+               # counts logical processors, both HT and physical
+               /^processor/ {
+                       processor_logical_count = $NF + 1
+               }
+               # counts physical cores (not used currently)
+               /^cpu cores/ {
+                       num_of_cores = $NF
+               }
+               # array of physical cpus ids
+               /^physical/ {
+                       a_physical_id[i] = $NF
+               }
+               # array of core ids
+               /^core id/ {
+                       a_core_id[i] = $NF
+                       i++
+               }
+               END {
+                       # look for the largest id number, and assign it
+                       for ( j = 0; j < processor_logical_count; j++ ) {
+                               if ( a_core_id[j] > core_count ) {
+                                       core_count = a_core_id[j]
+                               }
+                       }
+                       core_count = core_count + 1
+                       # trick, set the index equal to value, if the same, it will overwrite
+                       # this lets us create the actual array of true cpu physical ids
+                       for ( j in a_physical_id ) {
+                               index_temp = a_physical_id[j]
+                               a_cpu_physical_working[index_temp] = a_physical_id[j]
+                       }
+                       # note that length() is a gawk >= 3.1.5 only method, better to do it manually
+                       for ( j in a_cpu_physical_working ) {
+                               ++physical_cpu_count
+                       }
+
+                       # looking at logical processor counts over 1, which means either HT, SMP or MCP
+                       # http://en.wikipedia.org/wiki/Symmetric_multiprocessing
+                       if ( processor_logical_count > 1 ) {
+                               if ( processor_logical_count > core_count && physical_cpu_count > 1 ) {
+                                       type = "SMP-HT" # could be Xeon/P4 HT dual cpu
+                               }
+                               else if ( processor_logical_count > core_count ) {
+                                       type = "HT"  # this is more than likely a P4 w/HT or an Atom 270
+                               }
+                               else {
+                                       type = "SMP"
+                               }
+                       }
+                       # make sure to handle up cpus too
+                       else {
+                               core_count = 1
+                               physical_cpu_count = 1
+                       }
+                       print type " " physical_cpu_count " " core_count
+               }
+               ' $DIR_CPUINFO
+               ) )
+       fi
+}
+
+# for more on distro id, please reference this python thread: http://bugs.python.org/issue1322
+## return distro name/id if found
+get_distro_data()
+{
+       local i='' j='' distro='' distro_file='' a_distro_glob=''
+
+       # get the wild carded array of release/version /etc files if present
+       shopt -s nullglob
+       cd /etc
+       a_distro_glob=(*[-_]{release,version})
+       cd "$OLDPWD"
+       shopt -u nullglob
+
+       if [[ ${#a_distro_glob[@]} -eq 1 ]];then
+               distro_file="${a_distro_glob}"
+       # use the file if it's in the known good lists
+       elif [[ ${#a_distro_glob[@]} -gt 1 ]];then
+               for i in $DISTROS_DERIVED $DISTROS_PRIMARY
+               do
+                       # Only echo works with ${var[@]}, not print_screen_output() or script_debugger()
+                       # This is a known bug, search for the word "strange" inside comments
+                       # echo "i='$i' a_distro_glob[@]='${a_distro_glob[@]}'"
+                       if [[ " ${a_distro_glob[@]} " == *" $i "* ]];then
+                               # Now lets see if the distro file is in the known-good working-lsb-list
+                               # if so, use lsb-release, if not, then just use the found file
+                               # this is for only those distro's with self named release/version files
+                               # because Mint does not use such, it must be done as below
+                               ## this if statement requires the spaces and * as it is, else it won't work
+                               ##
+                               if [[ " $DISTROS_LSB_GOOD " == *" ${i} "* ]] && [[ $B_LSB_DIR == 'true' ]];then
+                                       distro_file='lsb-release'
+                               else
+                                       distro_file="${i}"
+                               fi
+                               break
+                       fi
+               done
+       fi
+
+       # first test for the legacy antiX distro id file
+       if [[ -e /etc/antiX ]];then
+               distro="$( egrep -oi 'antix.*\.iso' <<< $( remove_erroneous_chars '/etc/antiX' ) | sed 's/\.iso//' )"
+       # this handles case where only one release/version file was found, and it's lsb-release. This would
+       # never apply for ubuntu or debian, which will filter down to the following conditions. In general
+       # if there's a specific distro release file available, that's to be preferred, but this is a good backup.
+       elif [[ $distro_file == 'lsb-release' ]];then
+               distro=$( get_distro_lsb_data )
+       # then if the distro id file was found and it's not in the exluded primary distro file list, read it
+       elif [[ -n $distro_file && -s /etc/$distro_file && " $DISTROS_EXCLUDE_LIST " != *" $distro_file "* ]];then
+               distro=$( remove_erroneous_chars "/etc/$distro_file" )
+       # otherwise try  the default debian/ubuntu /etc/issue file
+       elif [[ -f /etc/issue ]];then
+               # lsb gives more manageable and accurate output than issue, but mint should use issue for now
+               # some bashism, boolean must be in parenthesis to work correctly, ie [[ $(boolean) ]] not [[ $boolean ]]
+               if [[ $B_LSB_DIR == 'true' ]] && [[ -z $( grep -i 'mint' /etc/issue ) ]];then
+                       distro=$( get_distro_lsb_data )
+               else
+                       distro=$( gawk '
+                       BEGIN {
+                               RS=""
+                       }
+                       {
+                               gsub(/\\[a-z]/, "")
+                               gsub(/,/, " ")
+                               gsub(/^ +| +$/, "")
+                               gsub(/ [ \t]+/, " ")
+                               print
+                       }' /etc/issue )
+               fi
+       fi
+
+       if [[ ${#distro} -gt 80 ]] &&  [[ $B_HANDLE_CORRUPT_DATA != 'true' ]];then
+               distro="${RED}/etc/${distro_file} corrupted, use -% to override${NORMAL}"
+       fi
+       ## note: would like to actually understand the method even if it's not used
+       # : ${distro:=Unknown distro o_O}
+       ## test for /etc/lsb-release as a backup in case of failure, in cases where > one version/release file
+       ## were found but the above resulted in null distro value
+       if [[ -z $distro ]] && [[ $B_LSB_DIR == 'true' ]];then
+               distro=$( get_distro_lsb_data )
+       fi
+       ## finally, if all else has failed, give up
+       if [[ -z $distro ]];then
+               distro='Unknown distro o_O'
+       fi
+
+       # this handles an arch bug where /etc/arch-release is empty and /etc/issue is corrupted
+       if [[ -n $( grep -i 'arch linux' <<< $distro ) ]];then
+               distro='Arch Linux'
+       fi
+
+       echo "$distro"
+}
+
+# args: $1 - optional, app, uses the app test, not being used now
+get_distro_lsb_data()
+{
+       local distro=''
+
+       if [[ $B_LSB_DIR == 'true' ]] && [[ $1 != 'app' ]];then
+               distro=$( gawk -F '=' '
+               BEGIN {
+                       IGNORECASE=1
+               }
+               # note: adding the spacing directly to variable to make sure distro output is null if not found
+               /^DISTRIB_ID/ {
+                       gsub(/^ +| +$/, "", $NF)
+                       # this is needed because grep for "arch" is too loose to be safe
+                       if ( $NF == "arch" ) {
+                               distroId = "Arch Linux"
+                       }
+                       else if ( $NF != "n/a" ) {
+                               distroId = $NF " "
+                       }
+               }
+               /^DISTRIB_RELEASE/ {
+                       gsub(/^ +| +$/, "", $NF)
+                       if ( $NF != "n/a" ) {
+                               distroRelease = $NF " "
+                       }
+               }
+               /^DISTRIB_CODENAME/ {
+                       gsub(/^ +| +$/, "", $NF)
+                       if ( $NF != "n/a" ) {
+                               distroCodename = $NF " "
+                       }
+               }
+               END {
+                       print distroId distroRelease distroCodename
+               }' $DIR_LSB_RELEASE )
+       fi
+       # this is HORRIBLY slow, but I don't know why, it runs fast in shell
+#      if [[  -n $( which lsb_release ) && $1 == 'app' ]];then
+#              distro=$( echo "$( lsb_release -irc )" | gawk '
+#              { IGNORECASE=1 }
+#              /^Distributor ID/ {
+#                      gsub(/^ +| +$/, "", $NF)
+#                      distroId = $NF
+#              }
+#              /^Release/ {
+#                      gsub(/^ +| +$/, "", $NF)
+#                      distroRelease = $NF
+#              }
+#              /^Codename/ {
+#                      gsub(/^ +| +$/, "", $NF)
+#                      distroCodename = $NF
+#              }
+#              END {
+#                      print distroId " " distroRelease " (" distroCodename ")"
+#              }' )
+#      fi
+
+       echo $distro
+}
+
+## create array of gfx cards installed on system
+get_graphics_card_data()
+{
+       local i=''
+
+       IFS=$'\n'
+       A_GFX_CARD_DATA=( $( echo "$Lspci_Data" | gawk -F': ' '
+       BEGIN {
+               IGNORECASE=1
+       }
+       /vga compatible controller/ {
+               gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF)
+               gsub(/,/, " ", $NF)
+               gsub(/^ +| +$/, "", $NF)
+               gsub(/ [ \t]+/, " ", $NF)
+               print $NF
+       }' ) )
+       IFS="$ORIGINAL_IFS"
+#      for (( i=0; i < ${#A_GFX_CARD_DATA[@]}; i++ ))
+#      do
+#              A_GFX_CARD_DATA[i]=$( sanitize_characters BAN_LIST_NORMAL "${A_GFX_CARD_DATA[i]}" )
+#      done
+       # handle cases where card detection fails, like in PS3, where lspci gives no output, or headless boxes..
+       if [[ ${#A_GFX_CARD_DATA[@]} -eq 0 ]];then
+               A_GFX_CARD_DATA[0]='Failed to Detect Video Card!'
+       fi
+
+       # GFXMEM is UNUSED at the moment, because it shows AGP aperture size, which is not necessarily equal to GFX memory..
+       # GFXMEM="size=[$(echo "$Lspci_Data" | gawk '/VGA/{while (!/^$/) {getline;if (/size=[0-9][0-9]*M/) {size2=gensub(/.*\[size=([0-9]+)M\].*/,"\\1","g",$0);if (size<size2){size=size2}}}}END{print size2}')M]"
+}
+
+## create array of glx data
+get_graphics_glx_data()
+{
+       if [[ $B_X_RUNNING == 'true' ]];then
+               IFS=$'\n'
+               # A_GLX_DATA=( $( glxinfo | gawk -F ': ' '
+               # A_GLX_DATA=( $( cat ../../modules/data/glxinfo-atom-1r | gawk -F ': ' '
+               # A_GLX_DATA=( $( cat ../../modules/data/glxinfo-intel-sput | gawk -F ': ' '
+               # there are arch bugs that make glxinfo generate bad output errors
+               # A_GLX_DATA=( $( glxinfo | gawk -F ': ' '
+               # A_GLX_DATA=( $( cat ../../modules/data/glxinfo-bad-rendering | gawk -F ': ' '
+               A_GLX_DATA=( $( glxinfo | gawk -F ': ' '
+               # note: function declarations go before BEGIN? It appears so, confirm.
+               # the real question here though is why this function is even here, seems
+               # just to be a complicated way to pack/print a variable, but maybe the
+               # original idea was to handle > 1 cases of detections I guess
+               function join( arr, sep ) {
+                       s=""
+                       i=flag=0
+                       for ( i in arr ) {
+                               if ( flag++ ) {
+                                       s = s sep
+                               }
+                               s = s i
+                       }
+                       return s
+               }
+
+               BEGIN {
+                       IGNORECASE=1
+               }
+               /opengl renderer/ {
+                       if ( $2 ~ /mesa/ ) {
+                               # Allow all mesas
+#                              if ( $2 ~ / r[3-9][0-9][0-9] / ) {
+                                       gsub(/'"$BAN_LIST_NORMAL"'/, "", $2)
+                                       a[$2]
+                                       # this counter failed in one case, a bug, and is not needed now
+#                                      f++
+#                              }
+                               next
+                       }
+                       $2 && a[$2]
+               }
+               # dropping all conditions from this test to just show full mesa information
+               # there is a user case where not f and mesa apply, atom mobo
+               # /opengl version/ && ( f || $2 !~ /mesa/ ) {
+               /opengl version/ {
+                       $2 && b[$2]
+               }
+               /direct rendering/ {
+                       $2 && c[$2]
+               }
+               END {
+                       printf( "%s\n%s\n%s\n", join( a, ", " ), join( b, ", " ), join( c, ", " ) )
+               }' ) )
+               IFS="$ORIGINAL_IFS"
+
+               # GLXR=$(glxinfo | gawk -F ': ' 'BEGIN {IGNORECASE=1} /opengl renderer/ && $2 !~ /mesa/ {seen[$2]++} END {for (i in seen) {printf("%s ",i)}}')
+               #    GLXV=$(glxinfo | gawk -F ': ' 'BEGIN {IGNORECASE=1} /opengl version/ && $2 !~ /mesa/ {seen[$2]++} END {for (i in seen) {printf("%s ",i)}}')
+       fi
+}
+
+## return screen resolution / tty resolution
+get_graphics_res_data()
+{
+       local screen_resolution=''
+
+       if [[ $B_X_RUNNING == 'true' ]];then
+               # Added the two ?'s , because the resolution is now reported without spaces around the 'x', as in
+               # 1400x1050 instead of 1400 x 1050. Change as of X.org version 1.3.0
+               screen_resolution=$( xrandr | gawk '
+               /\*/ {
+                       res[++m] = gensub(/^.* ([0-9]+) ?x ?([0-9]+)[_ ].* ([0-9\.]+)\*.*$/,"\\1x\\2@\\3hz","g",$0)
+               }
+               END {
+                       for (n in res) {
+                               if (res[n] ~ /^[[:digit:]]+x[[:digit:]]+/) {
+                                       line = line ? line ", " res[n] : res[n]
+                               }
+                       }
+                       if (line) {
+                               print(line)
+                       }
+               }' )
+               if [[ -z $screen_resolution ]];then
+                       screen_resolution=$( xdpyinfo | gawk '
+                       /dimensions/ {
+                               print $2
+                       }' )
+               fi
+       else
+               screen_resolution=$( stty -F $( readlink /proc/$PPID/fd/0 ) size | gawk '{ print $2"x"$1 }' )
+       fi
+       echo "$screen_resolution"
+}
+
+## for possible future data, not currently used
+get_graphics_agp_data()
+{
+       local agp_module=''
+
+       if [[ B_MODULES_DIR == 'true' ]];then
+               ## not used currently
+               agp_module=$( gawk '
+               /agp/ && !/agpgart/ && $3 > 0 {
+                       print(gensub(/(.*)_agp.*/,"\\1","g",$1))
+               }' $DIR_MODULES )
+       fi
+}
+
+## create array of x vendor/version data
+get_graphics_x_data()
+{
+       local x_vendor='' x_version=''
+
+       if [[ $B_X_RUNNING == 'true' ]];then
+               # X vendor and version detection.
+               x_vendor=$( xdpyinfo | gawk -F': +' '
+               BEGIN {
+                       IGNORECASE=1
+               }
+               /vendor string/ {
+                       gsub(/the|inc|foundation|project|corporation/, "", $2)
+                       gsub(/,/, " ", $2)
+                       gsub(/^ +| +$/, "", $2)
+                       gsub(/ [ \t]+/, " ", $2)
+                       print $2
+               }' )
+
+               # new method added since radeon and X.org and the disappearance of <X server name> version : ...etc
+               # Later on, the normal textual version string returned, e.g. like: X.Org version: 6.8.2
+               # A failover mechanism is in place. (if $x_version is empty, the release number is parsed instead)
+               x_version=$( xdpyinfo | gawk '/version:/ { print $NF }' )
+               if [[ -z $x_version ]];then
+                       x_version=$(xdpyinfo | gawk -F': +' '
+                       BEGIN {
+                               IGNORECASE=1
+                       }
+                       /vendor release number/ {
+                               gsub(/0+$/, "", $2)
+                               gsub(/0+/, ".", $2)
+                               print $2
+                       }' )
+               fi
+               A_X_DATA[0]="$x_vendor"
+               A_X_DATA[1]="$x_version"
+
+               #X -version 2>&1 | gawk '/^X Window System Version/ { print $5 }'
+               #This method could be used in the future to detect X when X is not running,
+               #however currently inxi ignores X checks when X is not found.
+       fi
+}
+
+# this gets just the raw data, total space/percent used and disk/name/per disk capacity
+get_hdd_data_basic()
+{
+       local hdd_used=''
+
+       hdd_used=$( df --exclude-type=aufs --exclude-type=tmpfs --exclude-type=iso9660 | gawk '
+       # also handles odd dm-1 type, from lvm
+       /^\/dev\/(mapper\/|[hs]d[a-z][0-9]+|dm[-]?[0-9]+)/ {
+               # this handles the case where the first item is too long
+               # and makes df wrap output to next line, so here we advance
+               # it to the next line for that single case
+               if ( NF < 5 && $0 !~ /.*\%/ ) {
+                       getline
+               }
+               # if the first item caused a wrap, use one less than standard
+               # testing for the field with % in it, ie: 34%, then go down from there
+               # this also protects against cases where the mount point has a space in the
+               # file name, thus breaking going down from $NF directly.
+               if ( $4 ~ /.*\%/ ) {
+                       used += $2
+               }
+               # otherwise use standard
+               else if ( $5 ~ /.*\%/ ) {
+                       used += $3
+               }
+               # and if this is not detected, give up, we need user data to debug
+               else {
+                       next
+               }
+       }
+       END {
+               print used
+       }' )
+
+       if [[ -z $hdd_used ]];then
+               hdd_used='na'
+       fi
+
+       # create the initial array strings:
+       # disk-dev, capacity, name, usb or not
+       # final item is the total of the disk
+       IFS=$'\n'
+
+       if [[ $B_PARTITIONS_DIR == 'true' ]];then
+               A_HDD_DATA=( $(
+               gawk -v hddused="$hdd_used" '
+               /[hs]d[a-z]$/ {
+                       driveSize = $(NF - 1)*1024/1000**3
+                       gsub(/,/, " ", driveSize)
+                       gsub(/^ +| +$/, "", driveSize)
+                       printf( $NF",%.1fGB,,\n", driveSize )
+               }
+               # See http://lanana.org/docs/device-list/devices-2.6+.txt for major numbers used below
+               # $1 ~ /^(3|22|33|8)$/ && $2 % 16 == 0  {
+               #       size += $3
+               # }
+               # special case from this data: 8     0  156290904 sda
+               $1 ~ /^(3|22|33|8)$/ && $NF ~ /[hs]d[a-z]$/ && ( $2 % 16 == 0 || $2 % 16 == 8 ) {
+                       size += $3
+               }
+
+               END {
+                       size = size*1024/1000**3                   # calculate size in GB size
+                       workingUsed = hddused*1024/1000**3         # calculate workingUsed in GB used
+                       # this handles a special case with livecds where no hdd_used is detected
+                       if ( size > 0 && hddused == "na" ) {
+                               size = sprintf( "%.1f", size )
+                               print size "GB,-"
+                       }
+                       else if ( size > 0 && workingUsed > 0 ) {
+                               diskUsed = workingUsed*100/size  # calculate used percentage
+                               diskUsed = sprintf( "%.1f", diskUsed )
+                               size = sprintf( "%.1f", size )
+                               print size "GB," diskUsed "% used"
+                       }
+                       else {
+                               print "NA,-" # print an empty array, this will be further handled in the print out function
+                       }
+               }' $DIR_PARTITIONS
+               ) )
+       fi
+       IFS="$ORIGINAL_IFS"
+}
+
+## fills out the A_HDD_DATA array with disk names
+get_hard_drive_data_advanced()
+{
+       local a_temp_working='' a_temp_scsi='' temp_holder='' temp_name='' i='' j=''
+       local sd_ls_by_id='' ls_disk_by_id=''
+
+       ## check for all ide type drives, non libata, only do it if hdx is in array
+       if [[ -n $( egrep 'hd[a-z]' <<< ${A_HDD_DATA[@]} ) ]];then
+               # remember, we're using the last array item to store the total size of disks
+               for (( i=0; i < ${#A_HDD_DATA[@]} - 1; i++ ))
+               do
+                       IFS=","
+                       a_temp_working=( ${A_HDD_DATA[i]} )
+                       IFS="$ORIGINAL_IFS"
+                       if [[ -n $( egrep '^hd[a-z]' <<< ${a_temp_working[0]} ) ]];then
+                               if [[ -e /proc/ide/${a_temp_working[0]}/model ]];then
+                                       a_temp_working[2]="$( remove_erroneous_chars /proc/ide/${a_temp_working[0]}/model )"
+                               else
+                                       a_temp_working[2]="Name n/a"
+                               fi
+                               # these loops are to easily extend the cpu array created in the awk script above with more fields per cpu.
+                               for (( j=0; j < ${#a_temp_working[@]}; j++ ))
+                               do
+                                       if [[ $j -gt 0 ]];then
+                                               A_HDD_DATA[i]="${A_HDD_DATA[i]},${a_temp_working[$j]}"
+                                       else
+                                               A_HDD_DATA[i]="${a_temp_working[$j]}"
+                                       fi
+                               done
+                       fi
+               done
+       fi
+
+       ## then handle libata names
+       # first get the ata device names, put them into an array
+       IFS=$'\n'
+       if [[ $B_SCSI_DIR == 'true' ]]; then
+               a_temp_scsi=( $( gawk  '
+               BEGIN {
+                       IGNORECASE=1
+               }
+               /host/ {
+                       getline a[$0]
+                       getline b[$0]
+               }
+               END {
+                       for (i in a) {
+                               if (b[i] ~ / *type: *direct-access.*/) {
+                                       #c=gensub(/^ *vendor: (.+) +model: (.+) +rev: (.+)$/,"\\1 \\2 \\3","g",a[i])
+                                       #c=gensub( /^ *vendor: (.+) +model: (.+) +rev:.*$/,"\\1 \\2","g",a[i] )
+                                       # the vendor: string is useless, and is a bug, ATA is not a vendor for example
+                                       c=gensub( /^ *vendor: (.+) +model: (.+) +rev:.*$/, "\\2", "g", a[i] )
+                                       gsub(/,/, " ", c)
+                                       gsub(/^ +| +$/, "", c)
+                                       gsub(/ [ \t]+/, " ", c)
+                                       #print a[i]
+                                       # we actually want this data, so leaving this off for now
+#                                      if (c ~ /\<flash\>|\<pendrive\>|memory stick|memory card/) {
+#                                              continue
+#                                      }
+                                       print c
+                               }
+                       }
+               }' $DIR_SCSI ) )
+       fi
+       IFS="$ORIGINAL_IFS"
+
+       ## then we'll loop through that array looking for matches.
+       if [[ -n $( egrep 'sd[a-z]' <<< ${A_HDD_DATA[@]} ) ]];then
+               # first pack the main ls variable so we don't have to keep using ls /dev...
+               ls_disk_by_id="$( ls -l /dev/disk/by-id )"
+               for (( i=0; i < ${#A_HDD_DATA[@]} - 1; i++ ))
+               do
+                       if [[ -n $( egrep '^sd[a-z]' <<< ${A_HDD_DATA[$i]} ) ]];then
+                               IFS=","
+                               a_temp_working=( ${A_HDD_DATA[$i]} )
+                               IFS="$ORIGINAL_IFS"
+                               if [[ ${#a_temp_scsi[@]} -gt 0 ]];then
+                                       for (( j=0; j < ${#a_temp_scsi[@]}; j++ ))
+                                       do
+                                               ## ok, ok, it's incomprehensible, search /dev/disk/by-id for a line that contains the
+                                               # discovered disk name AND ends with the correct identifier, sdx
+                                               # get rid of whitespace for some drive names and ids, and extra data after - in name
+                                               temp_name=$( tr ' ' '_' <<< ${a_temp_scsi[$j]} | cut -d '-' -f 1 )
+                                               sd_ls_by_id=$( egrep -m1 ".*$temp_name.*${a_temp_working[0]}$" <<< "$ls_disk_by_id" )
+
+                                               if [[ -n $sd_ls_by_id ]];then
+                                                       a_temp_working[2]=${a_temp_scsi[$j]}
+                                                       if [[ -n $( grep 'usb-' <<< $sd_ls_by_id ) ]];then
+                                                               a_temp_working[3]='USB'
+                                                       fi
+                                                       break
+                                               else
+                                                       a_temp_working[2]="Name n/a"
+                                               fi
+                                       done
+                               else
+                                       a_temp_working[2]="Name n/a"
+                               fi
+
+                               # these loops are to easily extend the cpu array created in the awk script above with more fields per cpu.
+                               for (( j=0; j < ${#a_temp_working[@]}; j++ ))
+                               do
+                                       if [[ $j -gt 0 ]];then
+                                               A_HDD_DATA[i]="${A_HDD_DATA[i]},${a_temp_working[$j]}"
+                                       else
+                                               A_HDD_DATA[i]="${a_temp_working[$j]}"
+                                       fi
+                               done
+                       fi
+               done
+               unset ls_disk_by_id # and then let's dump the data we don't need
+       fi
+}
+
+get_lspci_data()
+{
+       echo "$( lspci -v | gawk '{
+               gsub(/\(prog-if[^)]*\)/,"")
+               print
+       }' )"
+}
+
+## return memory used/installed
+get_memory_data()
+{
+       local memory=''
+
+       memory=$( gawk '
+       /^MemTotal:/ {
+               tot = $2
+       }
+       /^(MemFree|Buffers|Cached):/ {
+               notused+=$2
+       }
+       END {
+               used = tot-notused
+               printf("%.1f/%.1fMB\n", used/1024, tot/1024)
+       }' $DIR_MEMINFO )
+
+       echo "$memory"
+}
+
+# process and return module version data
+get_module_version_number()
+{
+       local module_version=''
+
+       if [[ -n $( which modinfo ) ]];then
+               module_version=$( modinfo $1 | gawk '
+               BEGIN {
+                       IGNORECASE=1
+               }
+               /^version/ {
+                       gsub(/,/, " ", $2)
+                       gsub(/^ +| +$/, "", $2)
+                       gsub(/ [ \t]+/, " ", $2)
+                       print $2
+               }
+               ' )
+       fi
+
+       echo "$module_version"
+}
+
+## create array of network cards
+get_networking_data()
+{
+       IFS=$'\n'
+       A_NETWORK_DATA=( $( echo "$Lspci_Data" | gawk '
+       BEGIN {
+               IGNORECASE=1
+       }
+       /^[0-9a-f:.]+ (ethernet|network) (controller|bridge)/ || /^[0-9a-f:.]+ [^:]+: .*(ethernet|network).*$/ {
+               nic=gensub(/^[0-9a-f:.]+ [^:]+: (.+)$/,"\\1","g",$0)
+               gsub(/realtek semiconductor/, "Realtek", nic)
+               gsub(/davicom semiconductor/, "Davicom", nic)
+               # The doublequotes are necessary because of the pipes in the variable.
+               gsub(/'"$BAN_LIST_NORMAL"'/, "", nic)
+               gsub(/,/, " ", nic)
+               gsub(/^ +| +$/, "", nic)
+               gsub(/ [ \t]+/, " ", nic)
+
+               eth[nic]++
+               while (getline && !/^$/) {
+                       if (/I\/O/) {
+                               ports[nic] = ports[nic] $4 " "
+                       }
+                       if (/driver in use/) {
+                               drivers[nic] = drivers[nic] gensub(/(.*): (.*)/,"\\2","g",$0) ""
+                       }
+                       else if (/kernel modules/) {
+                               modules[nic] = modules[nic] gensub(/(.*): (.*)/,"\\2","g",$0) ""
+                       }
+               }
+       }
+
+       END {
+               j=0
+               for (i in eth) {
+                       useDrivers=""
+                       usePorts=""
+                       useModules=""
+                       if (eth[i]>1) {
+                               a[j]=eth[i]"x "i
+                               ## note: this loses the plural ports case, is it needed anyway?
+                               if (ports[i] != "") {
+                                       usePorts=ports[i]
+                               }
+                               if (drivers[i] != "") {
+                                       useDrivers=drivers[i]
+                               }
+                               if (modules[i] != "" ) {
+                                       useModules = modules[i]
+                               }
+                       }
+                       else {
+                               a[j]=i
+                               if (ports[i] != "") {
+                                       usePorts=ports[i]
+                               }
+                               if (drivers[i] != "") {
+                                       useDrivers=drivers[i]
+                               }
+                               if (modules[i] != "" ) {
+                                       useModules = modules[i]
+                               }
+                       }
+                       # create array primary item for master array
+                       print a[j] "," useDrivers "," usePorts "," useModules
+                       j++
+               }
+       }') )
+       IFS="$ORIGINAL_IFS"
+}
+
+get_networking_wan_ip_data()
+{
+       local ip=''
+
+       # get ip using wget redirect to stdout. This is a clean, text only IP output url.
+       ip=$( wget -q -O - http://smxi.org/opt/ip.php | awk -F 'is: ' '{
+               #gsub("\n","",$2")
+               print $2
+       }' )
+
+       if [[ -z $ip ]];then
+               ip='None Detected!'
+       fi
+       echo "$ip"
+}
+
+get_networking_local_ip_data()
+{
+       if [[ $B_IFCONFIG == 'true' ]];then
+               IFS=$'\n'
+               A_INTERFACES_DATA=( $( $DIR_IFCONFIG | gawk '
+               BEGIN {
+                       IGNORECASE=1
+               }
+               $0 !~ /^lo/ {
+                       # not clear on why inet is coming through, but this gets rid of it
+                       # as first line item.
+                       interface = $1
+                       gsub(/,/, " ", interface)
+                       gsub(/^ +| +$/, "", interface)
+                       gsub(/ [ \t]+/, " ", interface)
+
+                       aInterfaces[interface]++
+                       while (getline && !/^$/) {
+                               if (/inet addr:/) {
+                                       ipAddresses[interface] = gensub( /addr:([0-9\.]+)/, "\\1", "g", $2 )
+                               }
+                       }
+               }
+
+               END {
+                       j=0
+                       for (i in aInterfaces) {
+                               useInterfaceIp = ""
+                               a[j] = i
+                               if (ipAddresses[i] != "") {
+                                       useInterfaceIp = ipAddresses[i]
+                               }
+                               # create array primary item for master array
+                               # tested needed to avoid bad data from above, if null it is garbage
+                               # this is the easiest way to handle junk I found, improve if you want
+                               if ( useInterfaceIp != "" ) {
+                                       print a[j] "," useInterfaceIp
+                               }
+                               j++
+                       }
+               }') )
+               IFS="$ORIGINAL_IFS"
+       fi
+}
+
+get_partition_data()
+{
+       #local excluded_file_types='--exclude-type=aufs --exclude-type=tmpfs --exclude-type=iso9660'
+       # df doesn't seem to work in script with variables like at the command line
+
+       IFS=$'\n'
+       # sample line: /dev/sda2     ext3     15G  8.9G  4.9G  65% /home
+       # $NF = partition name; $(NF - 4) = partition size; $(NF - 3) = used, in gB; $(NF - 1) = percent used
+       ## note: by subtracting from the last field number NF, we avoid a subtle issue with LVM df output, where if
+       ## the first field is too long, it will occupy its own line, this way we are getting only the needed data
+       A_PARTITION_DATA=( $( df -h -T --exclude-type=aufs --exclude-type=tmpfs --exclude-type=iso9660 | gawk '
+       BEGIN {
+               IGNORECASE=1
+       }
+       # this has to be nulled for every iteration so it does not retain value from last iteration
+       devBase=""
+       # this is required because below we are subtracting from NF, so it has to be > 4
+       # the real issue is long file system names that force the wrap of df output: //fileserver/main
+       # but we still need to handle more dynamically long space containing file names, but later.
+       ( NF < 5 ) && ( $0 !~ /[0-9]+\%/ ) {
+               # set the dev location here for cases of wrapped output
+               if ( NF == 1 ){
+                       devBase=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
+               }
+               getline
+       }
+       # this handles yet another fredforfaen special case where a mounted drive
+       # has the search string in its name
+       $NF ~ /^\/$|^\/boot$|^\/var$|^\/home$|^\/tmp$|^\/usr$/ {
+               print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",main," devBase
+       }
+       # skip all these, including the first, header line. Use the --exclude-type
+       # to handle new filesystems types we do not want listed here
+       $NF !~ /^\/$|^\/boot$|^\/var$|^\/home$|^\/tmp$|^\/usr$|^filesystem/ {
+               # this is to avoid file systems with spaces in their names, that will make
+               # the test show the wrong data in each of the fields, if no x%, then do not use
+               # using 3 cases, first default, standard, 2nd, 3rd, handles one and two spaces in name
+               if ( $(NF - 1) ~ /[0-9]+\%/ ) {
+                       print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",secondary," devBase
+               }
+               # these two cases construct the space containing name
+               else if ( $(NF - 2) ~ /[0-9]+\%/ ) {
+                       print $(NF - 1) " " $NF "," $(NF - 5) "," $(NF - 4) "," $(NF - 2) ",secondary," devBase
+               }
+               else if ( $(NF - 3) ~ /[0-9]+\%/ ) {
+                       print $(NF - 2) " " $(NF - 1) " " $NF "," $(NF - 6) "," $(NF - 5) "," $(NF - 3) ",secondary," devBase
+               }
+       }
+       ' )
+       # now add the swap partition data, don't want to show swap files, just partitions,
+       # though this can include /dev/ramzswap0. Note: you can also use /proc/swaps for this
+       # data, it's the same exact output as swapon -s
+       $( swapon -s | gawk '
+       BEGIN {
+               swapCounter = 1
+       }
+       /^\/dev/ {
+               size = sprintf( "%.2f", $3*1024/1000**3 )
+               devBase = gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
+               used = sprintf( "%.2f", $4*1024/1000**3 )
+               percentUsed = sprintf( "%.0f", ( $4/$3 )*100 )
+               print "swap-" swapCounter "," size "GB," used "GB," percentUsed "\%,main," devBase
+               swapCounter = ++swapCounter
+       }' ) )
+       IFS="$ORIGINAL_IFS"
+
+       if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]];then
+               get_partition_data_advanced
+       fi
+}
+
+# first get the locations of the mount points for label/uuid detection
+get_partition_data_advanced()
+{
+       local a_partition_working='' dev_partition_data=''
+       local dev_disk_label='' dev_disk_uuid='' dev_item='' dev_label='' dev_uuid=''
+       local mount_point=''
+
+       if [[ -d /dev/disk/by-label ]];then
+               dev_disk_label="$( ls -l /dev/disk/by-label )"
+       fi
+       if [[ -d /dev/disk/by-uuid ]];then
+               dev_disk_uuid="$( ls -l /dev/disk/by-uuid )"
+       fi
+
+       if [[ $B_MOUNTS_DIR == 'true' ]];then
+               for (( i=0; i < ${#A_PARTITION_DATA[@]}; i++ ))
+               do
+                       IFS=","
+                       a_partition_working=( ${A_PARTITION_DATA[i]} )
+                       IFS="$ORIGINAL_IFS"
+                       # note: for swap this will already be set
+                       if [[ -z ${a_partition_working[5]} ]];then
+                               mount_point=$( sed 's|/|\\/|g'  <<< ${a_partition_working[0]} )
+                               #echo mount_point $mount_point
+                               dev_partition_data=$( gawk '
+                               BEGIN {
+                                       IGNORECASE = 1
+                                       partition = ""
+                                       partTemp = ""
+                               }
+                               # trying to handle space in name
+#                              gsub( /\\040/, " ", $0 )
+                               /[ \t]'$mount_point'[ \t]/ && $1 != "rootfs" {
+                                       # initialize the variables
+                                       label = ""
+                                       uuid = ""
+
+                                       # slice out the /dev
+                                       partition=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
+                                       # label and uuid can occur for root, set partition to null now
+                                       if ( partition ~ /by-label/ ) {
+                                               label=gensub( /^(\/dev\/disk\/by-label\/)(.+)$/, "\\2", 1, $1 )
+                                               partition = ""
+                                       }
+                                       if ( partition ~ /by-uuid/ ) {
+                                               uuid=gensub( /^(\/dev\/disk\/by-uuid\/)(.+)$/, "\\2", 1, $1 )
+                                               partition = ""
+                                       }
+
+                                       # handle /dev/root for / id
+                                       if ( partition == "root" ) {
+                                               # if this works, great, otherwise, just set this to null values
+                                               partTemp="'$( readlink /dev/root 2>/dev/null )'"
+                                               if ( partTemp != "" ) {
+                                                       if ( partTemp ~ /[hs]d[a-z][0-9]/ ) {
+                                                               partition=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, partTemp )
+                                                       }
+                                                       else if ( partTemp ~ /by-uuid/ ) {
+                                                               uuid=gensub( /^(\/dev\/disk\/by-uuid\/)(.+)$/, "\\2", 1, partTemp )
+                                                               partition="" # set null to let real location get discovered
+                                                       }
+                                                       else if ( partTemp ~ /by-label/ ) {
+                                                               label=gensub( /^(\/dev\/disk\/by-label\/)(.+)$/, "\\2", 1, partTemp )
+                                                               partition="" # set null to let real location get discovered
+                                                       }
+                                               }
+                                               else {
+                                                       partition = ""
+                                                       label = ""
+                                                       uuid = ""
+                                               }
+                                       }
+                                       print partition "," label "," uuid
+                               }'      $DIR_MOUNTS )
+
+#                              echo dev_partition_data: $dev_partition_data
+                               # assemble everything we could get for dev/h/dx, label, and uuid
+                               IFS=","
+                               A_PARTITION_DATA[i]=${a_partition_working[0]}","${a_partition_working[1]}","${a_partition_working[2]}","${a_partition_working[3]}","${a_partition_working[4]}","$dev_partition_data
+                               IFS="$ORIGINAL_IFS"
+                       fi
+                       ## now we're ready to proceed filling in the data
+                       IFS=","
+                       a_partition_working=( ${A_PARTITION_DATA[i]} )
+                       IFS="$ORIGINAL_IFS"
+
+                       dev_item=${a_partition_working[5]}
+                       dev_label=${a_partition_working[6]}
+                       dev_uuid=${a_partition_working[7]}
+
+                       # then if dev data/uuid is incomplete, try to get missing piece
+                       # it's more likely we'll get a uuid than a label. But this should get the
+                       # dev item set no matter what, so then we can get the rest of any missing data
+                       # first we'll get the dev_item if it's missing
+                       if [[ -n $dev_disk_uuid ]] && [[ -z $dev_item && -n $dev_uuid ]];then
+                               dev_item=$( echo "$dev_disk_uuid" | gawk '
+                                       /'$dev_uuid'/ {
+                                               item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
+                                               print item
+                                       }' )
+                       elif [[ -n $dev_disk_label ]] && [[ -z $dev_item && -n $dev_label ]];then
+                               dev_item=$( echo "$dev_disk_label" | gawk '
+                                       # first we need to change space x20 in by-label back to a real space
+                                       #gsub( /x20/, " ", $0 )
+                                       # then we can see if the string is there
+                                       /'$dev_label'/ {
+                                               item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
+                                               print item
+                                       }' )
+                       fi
+                       if [[ -n $dev_disk_uuid ]] && [[ -n $dev_item && -z $dev_uuid ]];then
+                               dev_uuid=$( echo "$dev_disk_uuid" | gawk '
+                               /'$dev_item'$/ {
+                                       print $(NF - 2)
+                               }' )
+                       fi
+                       if [[ -n $dev_disk_label ]] && [[ -n $dev_item && -z $dev_label ]];then
+                               dev_label=$( echo "$dev_disk_label" | gawk '
+                               /'$dev_item'/ {
+                                       print $(NF - 2)
+                               }' )
+
+                       fi
+                       # assemble everything we could get for dev/h/dx, label, and uuid
+                       IFS=","
+                       A_PARTITION_DATA[i]=${a_partition_working[0]}","${a_partition_working[1]}","${a_partition_working[2]}","${a_partition_working[3]}","${a_partition_working[4]}","$dev_item","$dev_label","$dev_uuid
+                       IFS="$ORIGINAL_IFS"
+               done
+       fi
+}
+
+## return uptime string
+get_uptime()
+{
+       ## note: removing gsub(/ /,"",a); to get get space back in there, goes right before print a
+       echo $( uptime | gawk '{
+               a = gensub(/^.*up *([^,]*).*$/,"\\1","g",$0)
+               print a
+       }' )
+}
+
+#### -------------------------------------------------------------------
+#### special data handling for specific options and conditions
+#### -------------------------------------------------------------------
+
+## multiply the core count by the data to be calculated, bmips, cache
+# args: $1 - string to handle; $2 - cpu count
+calculate_multicore_data()
+{
+       local string_number=$1 string_data=''
+
+       if [[ -n $( egrep -i '( mb| kb)' <<< $1 ) ]];then
+               string_data=" $( gawk '{print $2}' <<< $1 )" # add a space for output
+               string_number=$( gawk '{print $1}' <<< $1 )
+       fi
+       # handle weird error cases where it's not a number
+       if [[ -n $( egrep '^[0-9\.,]+$' <<< $string_number ) ]];then
+               string_number=$( echo $string_number $2 | gawk '{
+                       total = $1*$2
+                       print total
+               }' )
+       elif [[ $string_number == '' ]];then
+               string_number='Not Available'
+       else
+               # I believe that the above returns 'unknown' by default so no need for extra text
+               string_number="$string_number "
+       fi
+       echo "$string_number$string_data"
+}
+
+# prints out shortened list of flags, the main ones of interest
+# args: $1 - string of cpu flags to process
+process_cpu_flags()
+{
+       local cpu_flags="$1"
+
+       # nx = AMD stack protection extensions
+       # lm = Intel 64bit extensions
+       # sse, sse2, pni = sse1,2,3 gfx extensions
+       # svm = AMD pacifica virtualization extensions
+       # vmx = Intel IVT (vanderpool) virtualization extensions
+       cpu_flags=$( echo "$cpu_flags" | gawk '
+       BEGIN {
+               RS=" "
+               ssel["sse"] = 1
+               ssel["sse2"] = 2
+               ssel["pni"] = 3
+               sses[1] = "sse"
+               sses[2] = "sse2"
+               sses[3] = "sse3"
+       }
+       /^(nx|lm|svm|vmx)$/ {
+                       if (s) {
+                               s = s " " $0
+                       }
+                       else {
+                               s = $0
+                       }
+       }
+       /^(sse2?|pni)$/ {
+               if (ssel[$0] > sse) {
+                       sse = ssel[$0]
+               }
+       }
+       END {
+               if (sse) {
+                       if (s) {
+                               s = sses[sse] " " s
+                       }
+                       else {
+                               s = sses[sse]
+                       }
+               }
+               print s
+       }' )
+
+       #grep -oE '\<(nx|lm|sse[0-9]?|pni|svm|vmx)\>' | tr '\n' ' '))
+       if [[ -z $cpu_flags ]];then
+               cpu_flags="-"
+       fi
+       echo "$cpu_flags"
+}
+
+#### -------------------------------------------------------------------
+#### print and processing of output data
+#### -------------------------------------------------------------------
+
+#### MASTER PRINT FUNCTION - triggers all line item print functions
+## main function to print out, master for all sub print functions.
+print_it_out()
+{
+       # note that print_it_out passes local variable values on to its children,
+       # and in some cases, their children, with Lspci_Data
+       local Lspci_Data='' # only for verbose
+
+       if [[ $B_SHOW_SHORT_OUTPUT == 'true' ]];then
+               print_short_data
+       else
+               Lspci_Data="$( get_lspci_data )"
+               if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_SYSTEM == 'true' ]];then
+                       print_system_data
+               fi
+               if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_CPU == 'true' ]];then
+                       print_cpu_data
+               fi
+               if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_GRAPHICS == 'true' ]];then
+                       print_gfx_data
+               fi
+               if [[ $VERBOSITY_LEVEL -ge 5 || $B_SHOW_AUDIO == 'true' ]];then
+                       print_audio_data
+               fi
+               if [[ $VERBOSITY_LEVEL -ge 2 || $B_SHOW_NETWORK == 'true' ]];then
+                       print_networking_data
+               fi
+               if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_DISK == 'true' ]];then
+                       print_hard_disk_data
+               fi
+               if [[ $VERBOSITY_LEVEL -ge 4 || $B_SHOW_PARTITIONS == 'true' ]];then
+                       print_partition_data
+               fi
+               if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_INFO == 'true' ]];then
+                       print_info_data
+               fi
+       fi
+}
+
+#### SHORT OUTPUT PRINT FUNCTION, ie, verbosity 0
+# all the get data stuff is loaded here to keep execution time down for single line print commands
+# these will also be loaded in each relevant print function for long output
+print_short_data()
+{
+       local current_kernel=$( uname -rm ) # | gawk '{print $1,$3,$(NF-1)}' )
+       local processes="$(( $( ps aux | wc -l ) - 1 ))"
+       local short_data='' i='' b_background_black='false'
+       local memory=$( get_memory_data )
+       local up_time="$( get_uptime )"
+
+       # set A_CPU_CORE_DATA
+       get_cpu_core_count
+       local cpc_plural='' cpu_count_print='' model_plural=''
+       local cpu_physical_count=${A_CPU_CORE_DATA[0]}
+       local cpu_core_count=${A_CPU_CORE_DATA[3]}
+       local cpu_core_alpha=${A_CPU_CORE_DATA[1]}
+       local cpu_type=${A_CPU_CORE_DATA[2]}
+
+       if [[ $cpu_physical_count -gt 1 ]];then
+               cpc_plural='(s)'
+               model_plural='s'
+               cpu_count_print="$cpu_physical_count "
+       fi
+
+       local cpu_data_string="${cpu_count_print}${cpu_core_alpha} core"
+#      local cpu_core_count=${A_CPU_CORE_DATA[0]}
+
+       # load A_HDD_DATA
+       get_hdd_data_basic
+       ## note: if hdd_model is declared prior to use, whatever string you want inserted will
+       ## be inserted first. In this case, it's desirable to print out (x) before each disk found.
+       local a_hdd_data_count=$(( ${#A_HDD_DATA[@]} - 1 ))
+       IFS=","
+       local a_hdd_basic_working=( ${A_HDD_DATA[$a_hdd_data_count]} )
+       IFS="$ORIGINAL_IFS"
+       local hdd_capacity=${a_hdd_basic_working[0]}
+       local hdd_used=${a_hdd_basic_working[1]}
+
+       # load A_CPU_DATA
+       get_cpu_data
+
+       IFS=","
+       local a_cpu_working=(${A_CPU_DATA[0]})
+       IFS="$ORIGINAL_IFS"
+       local cpu_model="${a_cpu_working[0]}"
+       ## assemble data for output
+       local cpu_clock="${a_cpu_working[1]}" # old CPU3
+       # this gets that weird min/max final array item
+       local min_max_clock_nu=$(( ${#A_CPU_DATA[@]} - 1 ))
+       local min_max_clock=${A_CPU_DATA[$min_max_clock_nu]}
+
+       #set_color_scheme 12
+       if [[ $B_RUNNING_IN_SHELL == 'false' ]];then
+               for i in $C1 $C2 $CN
+               do
+                       case "$i" in
+                               "$GREEN"|"$WHITE"|"$YELLOW"|"$CYAN")
+                                       b_background_black='true'
+                                       ;;
+                       esac
+               done
+               if [[ $b_background_black == 'true' ]];then
+                       for i in C1 C2 CN
+                       do
+                               ## these need to be in quotes, don't know why
+                               if [[ ${!i} == $NORMAL ]];then
+                                       declare $i="${!i}15,1"
+                               else
+                                       declare $i="${!i},1"
+                               fi
+                       done
+                       #C1="${C1},1"; C2="${C2},1"; CN="${CN},1"
+               fi
+       fi
+       short_data="${C1}CPU$cpc_plural${CN}[${C2}${SEP1}${cpu_data_string} ${cpu_model}$model_plural (${cpu_type}) clocked at ${min_max_clock}${SEP1}${CN}] ${C1}Kernel${CN}[${C2}${SEP1}${current_kernel}${SEP1}${CN}] ${C1}Up${CN}[${C2}${SEP1}${up_time}${SEP1}${CN}] ${C1}Mem${CN}[${C2}${SEP1}${memory}${SEP1}${CN}] ${C1}HDD${CN}[${C2}${SEP1}${hdd_capacity}($hdd_used)${SEP1}${CN}] ${C1}Procs${CN}[${C2}${SEP1}${processes}${SEP1}${CN}]"
+
+       if [[ $SHOW_IRC -gt 0 ]];then
+               short_data="${short_data} ${C1}Client${CN}[${C2}${SEP1}${IRC_CLIENT}${IRC_CLIENT_VERSION}${SEP1}${CN}]"
+       fi
+       short_data="${short_data} ${C1}$SCRIPT_NAME${C2}${CN}[${C2}${SEP1}$SCRIPT_VERSION_NUMBER${SEP1}${CN}]"
+       if [[ $SCHEME -gt 0 ]];then
+               short_data="${short_data} $NORMAL"
+       fi
+       print_screen_output "$short_data"
+}
+
+#### LINE ITEM PRINT FUNCTIONS
+
+# print sound card data
+print_audio_data()
+{
+       local i='' card_one='Card-1 ' audio_data='' a_audio_data='' port_data=''
+       local a_audio_working='' alsa_driver='' alsa_data='' port_plural='' module_version=''
+       # set A_AUDIO_DATA and get alsa data
+       get_audio_data
+       alsa_data=$( get_audio_alsa_data )
+       IFS=","
+       a_audio_working=(${A_AUDIO_DATA[0]})
+       IFS="$ORIGINAL_IFS"
+
+       if [[ -n ${A_AUDIO_DATA[@]} ]];then
+               # slightly complicated because 2nd array item could be the alsa data
+               if [[ ${#A_AUDIO_DATA[@]} -le 1 ]];then
+                       card_one='Card '
+               fi
+
+#              if [[ -n ${a_audio_working[2]} ]];then
+#                      port_data=" ${C1}at port${C2} ${a_audio_working[2]}"
+#              fi
+               # this should only trigger if the $DIR_ASOUND_DEVICE data is used, not lspci -nn
+               if [[ -n ${a_audio_working[3]} && $B_EXTRA_DATA == 'true' ]];then
+                       module_version=$( print_module_version "${a_audio_working[3]}" )
+               fi
+               if [[ -n ${a_audio_working[1]} ]];then
+                       alsa_driver=" ${C1}driver${C2} ${a_audio_working[1]}$module_version"
+               fi
+               if [[ -n ${a_audio_working[2]} && $B_EXTRA_DATA == 'true' ]];then
+                       if [[ $( wc -w <<< ${a_audio_working[2]} ) -gt 1 ]];then
+                               port_plural='s'
+                       fi
+                       port_data=" ${C1}at port$port_plural${C2} ${a_audio_working[2]}"
+               fi
+               audio_data="${C1}$card_one${C2}${a_audio_working[0]}$alsa_driver$port_data"
+               audio_data=$( create_print_line "Audio:" "$audio_data" )
+               print_screen_output "$audio_data"
+               i=0 ## loop starts with 1 by auto-increment so it only shows cards > 1
+               while [[ -n ${A_AUDIO_DATA[++i]} ]]
+               do
+                       IFS=","
+                       a_audio_working=( ${A_AUDIO_DATA[i]} )
+                       IFS="$ORIGINAL_IFS"
+                       port_data=''
+                       alsa_driver=''
+                       port_plural=''
+                       module_version=''
+                       if [[ -n ${a_audio_working[3]} && $B_EXTRA_DATA == 'true' ]];then
+                               module_version=$( print_module_version "${a_audio_working[3]}" )
+                       fi
+                       # we're testing for the presence of the 2nd array item here, which is the driver name
+                       if [[ -n ${a_audio_working[1]} ]];then
+                               alsa_driver="${C1}driver${C2} ${a_audio_working[1]}"
+                       fi
+                       if [[ -n ${a_audio_working[2]} && $B_EXTRA_DATA == 'true' ]];then
+                               if [[ $( wc -w <<< ${a_audio_working[2]} ) -gt 1 ]];then
+                                       port_plural='s'
+                               fi
+                               port_data=" ${C1}at port$port_plural${C2} ${a_audio_working[2]}"
+                       fi
+                       if [[ -n ${a_audio_working[0]} ]];then
+                               audio_data="${C1}Card-$(( $i + 1 )) ${C2}${a_audio_working[0]}$alsa_driver$port_data"
+                       fi
+                       if [[ -n $audio_data ]];then
+                               audio_data=$( create_print_line " " "$audio_data" )
+                               print_screen_output "$audio_data"
+                       fi
+               done
+               # alsa driver data only prints out if sound card data is found
+               if [[ -n $alsa_data ]];then
+                       audio_data="${C1}Sound: ${C2}$alsa_data"
+                       audio_data=$( create_print_line " " "$audio_data" )
+                       print_screen_output "$audio_data"
+               fi
+       fi
+}
+
+print_cpu_data()
+{
+       local cpu_data='' i='' cpu_clock_speed='' cpu_multi_clock_data=''
+       local bmip_data='' cpu_cache='' cpu_vendor='' cpu_flags=''
+
+       ##print_screen_output "A_CPU_DATA[0]=\"${A_CPU_DATA[0]}\""
+       # Array A_CPU_DATA always has one extra element: max clockfreq found.
+       # that's why its count is one more than you'd think from cores/cpus alone
+       # load A_CPU_DATA
+       get_cpu_data
+
+       IFS=","
+       local a_cpu_working=(${A_CPU_DATA[0]})
+       IFS="$ORIGINAL_IFS"
+       local cpu_model="${a_cpu_working[0]}"
+       ## assemble data for output
+       local cpu_clock="${a_cpu_working[1]}"
+
+       cpu_vendor=${a_cpu_working[5]}
+
+       # set A_CPU_CORE_DATA
+       get_cpu_core_count
+       local cpc_plural='' cpu_count_print='' model_plural=''
+       local cpu_physical_count=${A_CPU_CORE_DATA[0]}
+       local cpu_core_count=${A_CPU_CORE_DATA[3]}
+       local cpu_core_alpha=${A_CPU_CORE_DATA[1]}
+       local cpu_type=${A_CPU_CORE_DATA[2]}
+
+       if [[ $cpu_physical_count -gt 1 ]];then
+               cpc_plural='(s)'
+               cpu_count_print="$cpu_physical_count "
+               model_plural='s'
+       fi
+
+       local cpu_data_string="${cpu_count_print}${cpu_core_alpha} core"
+       # Strange (and also some expected) behavior encountered. If print_screen_output() uses $1
+       # as the parameter to output to the screen, then passing "<text1> ${ARR[@]} <text2>"
+       # will output only <text1> and first element of ARR. That "@" splits in elements and "*" _doesn't_,
+       # is to be expected. However, that text2 is consecutively truncated is somewhat strange, so take note.
+       # This has been confirmed by #bash on freenode.
+       # The above mentioned only emerges when using the debugging markers below
+       ## print_screen_output "a_cpu_working=\"***${a_cpu_working[@]} $hostName+++++++\"----------"
+
+       if [[ -z ${a_cpu_working[2]} ]];then
+               a_cpu_working[2]="unknown"
+       fi
+
+       cpu_data=$( create_print_line "CPU$cpc_plural:" "${C1}${cpu_data_string}${C2} ${a_cpu_working[0]}$model_plural (${cpu_type})" )
+       if [[ $VERBOSITY_LEVEL -ge 3 || $B_SHOW_CPU == 'true' ]];then
+               # update for multicore, bogomips x core count.
+               if [[ $B_EXTRA_DATA == 'true' ]];then
+#                      if [[ $cpu_vendor != 'intel' ]];then
+                               bmip_data=$( calculate_multicore_data "${a_cpu_working[4]}" "$(( $cpu_core_count * $cpu_physical_count ))" )
+#                      else
+#                              bmip_data="${a_cpu_working[4]}"
+#                      fi
+                       bmip_data=" ${C1}bmips${C2} $bmip_data"
+               fi
+               ## note: this handles how intel reports L2, total instead of per core like AMD does
+               # note that we need to multiply by number of actual cpus here to get true cache size
+               if [[ $cpu_vendor != 'intel' ]];then
+                       cpu_cache=$( calculate_multicore_data "${a_cpu_working[2]}" "$(( $cpu_core_count * $cpu_physical_count ))"  )
+               else
+                       cpu_cache=$( calculate_multicore_data "${a_cpu_working[2]}" "$cpu_physical_count"  )
+               fi
+               # only print shortened list
+               if [[ $B_CPU_FLAGS_FULL != 'true' ]];then
+                       cpu_flags=$( process_cpu_flags "${a_cpu_working[3]}" )
+                       cpu_flags=" ${C1}flags${C2} ($cpu_flags)"
+               fi
+               cpu_data="$cpu_data${C2} ${C1}cache${C2} $cpu_cache$cpu_flags$bmip_data${CN}"
+       fi
+       # we don't this printing out extra line unless > 1 cpu core
+       if [[ ${#A_CPU_DATA[@]} -gt 2 ]] && [[ $B_SHOW_CPU == 'true' || $VERBOSITY_LEVEL -ge 5 ]];then
+               cpu_clock_speed='' # null < verbosity level 5
+       else
+               cpu_data="$cpu_data ${C1}clocked at${C2} ${a_cpu_working[1]} MHz${CN}"
+       fi
+
+       cpu_data="$cpu_data $cpu_clock_speed"
+       print_screen_output "$cpu_data"
+
+       # we don't this printing out extra line unless > 1 cpu core
+       if [[ ${#A_CPU_DATA[@]} -gt 2 ]] && [[ $B_SHOW_CPU == 'true' || $VERBOSITY_LEVEL -ge 5 ]];then
+               for (( i=0; i < ${#A_CPU_DATA[@]}-1; i++ ))
+               do
+                       IFS=","
+                       a_cpu_working=(${A_CPU_DATA[i]})
+                       IFS="$ORIGINAL_IFS"
+                       cpu_multi_clock_data="$cpu_multi_clock_data ${C1}($(( i + 1 )))${C2} ${a_cpu_working[1]} MHz${CN}"
+                       if [[ $i -gt 10 ]];then
+                               break
+                       fi
+               done
+               if [[ -n $cpu_multi_clock_data ]];then
+                       cpu_multi_clock_data=$( create_print_line " " "${C1}Clock Speeds:${C2}$cpu_multi_clock_data" )
+                       print_screen_output "$cpu_multi_clock_data"
+               fi
+       fi
+       if [[ $B_CPU_FLAGS_FULL == 'true' ]];then
+               print_cpu_flags_full "${a_cpu_working[3]}"
+       fi
+}
+
+# takes list of all flags, split them and prints x per line
+# args: $1 - cpu flag string
+print_cpu_flags_full()
+{
+       local cpu_flags_full="$1" a_cpu_flags='' line_starter=''
+       local i=0 counter=0 max_length=18 max_length_add=18 flag='' flag_data=''
+
+       # build the flag line array
+       for flag in $cpu_flags_full
+       do
+               a_cpu_flags[$counter]="${a_cpu_flags[$counter]}$flag "
+               if [[ $i -ge $max_length ]];then
+                       (( counter++ ))
+                       max_length=$(( $max_length + $max_length_add ))
+               fi
+               ((i++))
+       done
+       # then print it out
+       for (( i=0; i < ${#a_cpu_flags[@]};i++ ))
+       do
+               if [[ $i -eq 0 ]];then
+                       line_starter="${C1}CPU Flags${C2} "
+               else
+                       line_starter=''
+               fi
+               flag_data=$( create_print_line " " "$line_starter${a_cpu_flags[$i]}" )
+               print_screen_output "$flag_data"
+       done
+}
+
+print_gfx_data()
+{
+       local gfx_data='' i='' card_one='Card '
+       local screen_resolution="$( get_graphics_res_data )"
+       local b_is_mesa='false'
+
+       # set A_GFX_CARD_DATA
+       get_graphics_card_data
+       # set A_X_DATA
+       get_graphics_x_data
+       local x_vendor=${A_X_DATA[0]}
+       local x_version=${A_X_DATA[1]}
+       # set A_GLX_DATA
+       get_graphics_glx_data
+       local glx_renderer="${A_GLX_DATA[0]}"
+       local glx_version="${A_GLX_DATA[1]}"
+       # this can contain a long No case debugging message, so it's being sliced off
+       # note: using grep -ioE '(No|Yes)' <<< ${A_GLX_DATA[2]} did not work in Arch, no idea why
+       local glx_direct_render=$( gawk '{
+               print $1
+       }'  <<< "${A_GLX_DATA[2]}" )
+
+       if [[ ${#A_GFX_CARD_DATA[@]} -gt 1 ]];then
+               i=1
+               while [[ -n ${A_GFX_CARD_DATA[i]} && $i -le 3 ]]
+               do
+                       gfx_data=" ${C1}Card-$(($i+1))${C2} ${A_GFX_CARD_DATA[i]}"
+                       ((i++))
+               done
+               card_one='Card-1 '
+       fi
+       gfx_data=$( create_print_line "Graphics:" "${C1}$card_one${C2}${A_GFX_CARD_DATA[0]}${gfx_data}" )
+
+       if [[ $B_X_RUNNING == 'true' ]];then
+               gfx_data="${gfx_data} ${C1}$x_vendor${C2} $x_version ${C1}Res${C2} ${screen_resolution}"
+       else
+               gfx_data="${gfx_data} ${C1} tty resolution ${CN}(${C2} ${screen_resolution} ${CN})"
+       fi
+       print_screen_output "$gfx_data"
+
+#      if [[ -z $glx_renderer || -z $glx_version ]];then
+#              b_is_mesa='true'
+#      fi
+
+       ## note: if glx render or version have no content, then mesa is true
+       # if [[ $B_X_RUNNING == 'true' ]] && [[ $b_is_mesa != 'true' ]];then
+       if [[ $B_X_RUNNING == 'true' ]];then
+               gfx_data=$( create_print_line " " "${C1}GLX Renderer${C2} ${glx_renderer} ${C1}GLX Version${C2} ${glx_version}${CN}" )
+               if [[ $B_HANDLE_CORRUPT_DATA == 'true' || $B_EXTRA_DATA == 'true' ]];then
+                       gfx_data="$gfx_data ${C1}Direct Rendering${C2} ${glx_direct_render}${CN}"
+               fi
+               print_screen_output "$gfx_data"
+       fi
+}
+
+print_hard_disk_data()
+{
+       local hdd_data='' hdd_data_2='' a_hdd_working=''
+       local dev_data='' size_data='' hdd_model='' hdd_model_2='' hdd_model_3='' usb_data=''
+
+       # load A_HDD_DATA
+       get_hdd_data_basic
+       ## note: if hdd_model is declared prior to use, whatever string you want inserted will
+       ## be inserted first. In this case, it's desirable to print out (x) before each disk found.
+       local a_hdd_data_count=$(( ${#A_HDD_DATA[@]} - 1 ))
+       IFS=","
+       local a_hdd_basic_working=( ${A_HDD_DATA[$a_hdd_data_count]} )
+       IFS="$ORIGINAL_IFS"
+       local hdd_capacity=${a_hdd_basic_working[0]}
+       local hdd_used=${a_hdd_basic_working[1]}
+
+       if [[ $VERBOSITY_LEVEL -ge 3 ]] || [[ $B_SHOW_DISK == 'true' ]];then
+       ## note: the output part of this should be in the print hdd data function, not here
+               get_hard_drive_data_advanced
+               for (( i=0; i < ${#A_HDD_DATA[@]} - 1; i++ ))
+               do
+                       # this adds the (x) numbering in front of each disk found, and creates the full disk string
+                       IFS=","
+                       a_hdd_working=( ${A_HDD_DATA[i]} )
+                       IFS="$ORIGINAL_IFS"
+                       if [[ $B_SHOW_DISK == 'true' ]];then
+                               if [[ -n ${a_hdd_working[3]} ]];then
+                                       usb_data="${a_hdd_working[3]} "
+                               else
+                                       usb_data=''
+                               fi
+                               dev_data="/dev/${a_hdd_working[0]} "
+                               size_data=" ${a_hdd_working[1]}"
+                       fi
+                       # wrap to avoid long lines
+
+                       if [[ $i -gt 1 && $B_SHOW_DISK == 'true' ]] || [[ $i -gt 3 ]];then
+                               hdd_model_2="${hdd_model_2}${hdd_model_2+${C1}$(($i+1)):${C2}} $usb_data$dev_data${a_hdd_working[2]}$size_data "
+                       else
+                               hdd_model="${hdd_model}${hdd_model+ ${C1}$(($i+1)):${C2}} $usb_data$dev_data${a_hdd_working[2]}$size_data"
+                       fi
+               done
+               if [[ -z $hdd_model ]];then
+                       hdd_model=' None Detected'
+               fi
+               if [[ -n $hdd_model_2 ]];then
+                       hdd_data=$( create_print_line "Disks:" "${C1}HDD${C2} ${C1}Total Size:${C2} ${hdd_capacity} (${hdd_used})${hdd_model}" )
+                       hdd_data_2=$( create_print_line " " "${hdd_model_2}${CN}" )
+               else
+                       hdd_data=$( create_print_line "Disks:" "${C1}HDD${C2} ${C1}Total Size:${C2} ${hdd_capacity} (${hdd_used})${hdd_model}${CN}" )
+               fi
+       else
+               hdd_data=$( create_print_line "Disks:" "${C1}HDD Total Size:${C2} ${hdd_capacity} (${hdd_used})${CN}" )
+       fi
+       print_screen_output "$hdd_data"
+       if [[ -n $hdd_model_2 ]];then
+               print_screen_output "$hdd_data_2"
+       fi
+}
+
+print_info_data()
+{
+       local suggested_app="runlevel"
+       local info_data=''
+       local runlvl=''
+       local memory="$( get_memory_data )"
+       local processes="$(( $( ps aux | wc -l ) - 1 ))"
+       local up_time="$( get_uptime )"
+
+       # Some code could look superfluous but BitchX doesn't like lines not ending in a newline. F*&k that bitch!
+       # long_last=$( echo -ne "${C1}Processes${C2} ${processes}${CN} | ${C1}Uptime${C2} ${up_time}${CN} | ${C1}Memory${C2} ${MEM}${CN}" )
+       info_data=$( create_print_line "Info:" "${C1}Processes${C2} ${processes} ${C1}Uptime${C2} ${up_time} ${C1}Memory${C2} ${memory}${CN}" )
+
+       # this only triggers if no X data is present
+       if [[ $B_X_RUNNING != 'true' ]];then
+               if [[ -e $suggested_app ]];then
+                       runlvl="$( runlevel | gawk '{ print $2 }' )"
+                       info_data="${info_data} ${C1}Runlevel${C2} ${runlvl}${CN}"
+               fi
+       fi
+
+       if [[ $SHOW_IRC -gt 0 ]];then
+               info_data="${info_data} ${C1}Client${C2} ${IRC_CLIENT}${IRC_CLIENT_VERSION}${CN}"
+       fi
+       info_data="${info_data} ${C1}$SCRIPT_NAME${C2} $SCRIPT_VERSION_NUMBER${CN}"
+
+       if [[ $SCHEME -gt 0 ]];then
+               info_data="${info_data} ${NORMAL}"
+       fi
+       print_screen_output "$info_data"
+}
+
+# args: $1 - module name (could be > 1, so loop it )
+print_module_version()
+{
+       local module_versions='' module='' version=''
+
+       for module in $1
+       do
+               version=$( get_module_version_number $module )
+               if [[ -n $version ]];then
+                       module_versions="$module_versions $version"
+               fi
+       done
+
+       if [[ -n $module_versions ]];then
+               echo " ${C1}v:${C2}$module_versions"
+       fi
+}
+
+print_networking_data()
+{
+       local i='' card_one='Card-1' network_data='' a_network_working='' port_data='' driver_data=''
+       local card_string='' port_plural='' module_version=''
+       # set A_NETWORK_DATA
+       get_networking_data
+
+       IFS=","
+       a_network_working=(${A_NETWORK_DATA[0]})
+       IFS="$ORIGINAL_IFS"
+
+       # will never be null because null is handled in get_network_data, but in case we change
+       # that leaving this test in place.
+       if [[ -n ${A_NETWORK_DATA[@]} ]];then
+               if [[ ${#A_NETWORK_DATA[@]} -le 1 ]];then
+                       card_one='Card'
+               fi
+               if [[ -n ${a_network_working[3]} && $B_EXTRA_DATA == 'true' ]];then
+                       module_version=$( print_module_version "${a_network_working[3]}" )
+               fi
+               if [[ -n ${a_network_working[1]} ]];then
+                       driver_data=" ${C1}driver${C2} ${a_network_working[1]}$module_version"
+               fi
+               if [[ -n ${a_network_working[2]} && $B_EXTRA_DATA == 'true' ]];then
+                       if [[ $( wc -w <<< ${a_network_working[2]} ) -gt 1 ]];then
+                               port_plural='s'
+                       fi
+                       port_data=" ${C1}at port$port_plural${C2} ${a_network_working[2]}"
+               fi
+               card_string=''
+               network_data="${C1}$card_one${C2} ${a_network_working[0]}$driver_data$port_data"
+               network_data=$( create_print_line "Network:" "$network_data" )
+               print_screen_output "$network_data"
+               i=0 ## loop starts with 1 by auto-increment so it only shows cards > 1
+               while [[ -n ${A_NETWORK_DATA[++i]} ]]
+               do
+                       IFS=","
+                       a_network_working=( ${A_NETWORK_DATA[i]} )
+                       IFS="$ORIGINAL_IFS"
+                       port_data=''
+                       driver_data=''
+                       port_plural=''
+                       module_version=''
+                       if [[ -n ${a_network_working[3]} && $B_EXTRA_DATA == 'true' ]];then
+                               module_version=$( print_module_version "${a_network_working[3]}" )
+                       fi
+                       if [[ -n ${a_network_working[1]} ]];then
+                               driver_data=" ${C1}driver${C2} ${a_network_working[1]}$module_version"
+                       fi
+                       if [[ -n ${a_network_working[2]} && $B_EXTRA_DATA == 'true' ]];then
+                               if [[ $( wc -w <<< ${a_network_working[2]} ) -gt 1 ]];then
+                                       port_plural='s'
+                               fi
+                               port_data=" ${C1}at port$port_plural${C2} ${a_network_working[2]}"
+                       fi
+                       network_data="${C1}Card-$(( $i + 1 )) ${C2}${a_network_working[0]}$driver_data$port_data"
+                       network_data=$( create_print_line " " "$network_data" )
+                       print_screen_output "$network_data"
+               done
+       fi
+       if [[ $B_SHOW_IP == 'true' ]];then
+               print_networking_ip_data
+       fi
+}
+
+print_networking_ip_data()
+{
+       local ip=$( get_networking_wan_ip_data )
+       local ip_data='' a_interfaces_working='' interfaces='' interfaces_2='' i=''
+
+       # set A_INTERFACES_DATA
+       get_networking_local_ip_data
+       # first print output for wan ip line. Null is handled in the get function
+       ip_data=$( create_print_line " " "${C1}Wan IP:${C2} $ip" )
+
+       # then create the list of local interface/ip
+       interfaces=" ${C1}Interface:${C2}"
+       i=0 ## loop starts with 1 by auto-increment so it only shows cards > 1
+       while [[ -n ${A_INTERFACES_DATA[i]} ]]
+       do
+               IFS=","
+               a_interfaces_working=(${A_INTERFACES_DATA[i]})
+               IFS="$ORIGINAL_IFS"
+               if [[ $i -lt 3 ]];then
+                       if [[ -n ${a_interfaces_working[0]} ]];then
+                               interfaces="$interfaces ${C1}${a_interfaces_working[0]}${C2} ${a_interfaces_working[1]}"
+                       fi
+               else
+                       if [[ -n ${a_interfaces_working[0]} ]];then
+                               # space on end here for lining up with line starter
+                               interfaces_2="$interfaces_2${C1}${a_interfaces_working[0]}${C2} ${a_interfaces_working[1]} "
+                       fi
+               fi
+               ((i++))
+       done
+       print_screen_output "$ip_data$interfaces"
+       # then wrap it if needed
+       if [[ -n $interfaces_2 ]];then
+               interfaces_2=$( create_print_line " " "$interfaces_2" )
+               print_screen_output "$interfaces_2"
+       fi
+}
+
+print_partition_data()
+{
+       local a_partition_working='' partition_used='' partition_data=''
+       local counter=0 line_max=160  i=0 a_partition_data='' line_starter=''
+       local partitionIdClean='' part_dev='' full_dev='' part_label='' full_label=''
+       local part_uuid='' full_uuid='' dev_remote=''
+
+       # this handles the different, shorter, irc colors strings embedded in variable data
+       if [[ $B_RUNNING_IN_SHELL != 'true' ]];then
+               line_max=130
+       fi
+       # and no color string data at all
+       if [[ $SCHEME -eq 0 ]];then
+               line_max=75
+       fi
+       if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]];then
+               line_max=20
+       fi
+
+       # set A_PARTITION_DATA
+       get_partition_data
+
+       for (( i=0; i < ${#A_PARTITION_DATA[@]}; i++ ))
+       do
+               IFS=","
+               a_partition_working=(${A_PARTITION_DATA[i]})
+               IFS="$ORIGINAL_IFS"
+               full_label=''
+               full_uuid=''
+               if [[ $B_SHOW_PARTITIONS_FULL == 'true' ]] || [[ ${a_partition_working[4]} == 'main' ]];then
+                       if [[ -n ${a_partition_working[2]} ]];then
+                               partition_used=" ${C1}used:${C2} ${a_partition_working[2]} (${a_partition_working[3]})"
+                       else
+                               partition_used='' # reset partition used to null
+                       fi
+
+                       # don't show user names in output
+                       if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]];then
+                               if [[ -n ${a_partition_working[5]} ]];then
+                                       if [[ -z $( grep -E '(^//|:/)' <<< ${a_partition_working[5]} ) ]];then
+                                               part_dev="/dev/${a_partition_working[5]}"
+                                               dev_remote='dev'
+                                       else
+                                               part_dev="${a_partition_working[5]}"
+                                               dev_remote='remote'
+                                       fi
+                               else
+                                       dev_remote='dev'
+                                       part_dev='N/A'
+                               fi
+                               full_dev=" ${C1}$dev_remote:${C2} $part_dev"
+                               if [[ $B_SHOW_LABELS == 'true' && $dev_remote != 'remote' ]];then
+                                       if [[ -n ${a_partition_working[6]} ]];then
+                                               part_label="${a_partition_working[6]}"
+                                       else
+                                               part_label='N/A'
+                                       fi
+                                       full_label=" ${C1}label:${C2} $part_label"
+                               fi
+                               if [[ $B_SHOW_UUIDS == 'true' && $dev_remote != 'remote' ]];then
+                                       if [[ -n ${a_partition_working[7]} ]];then
+                                               part_uuid="${a_partition_working[7]}"
+                                       else
+                                               part_uuid='N/A'
+                                       fi
+                                       full_uuid=" ${C1}uuid:${C2} $part_uuid"
+                               fi
+                       fi
+                       partitionIdClean=$( sed -r 's|/home/(.*)/(.*)|/home/##/\2|' <<< ${a_partition_working[0]} )
+                       # because these lines can vary widely, using dynamic length handling here
+                       a_partition_data[$counter]="${a_partition_data[$counter]}${C1}ID:${C2}$partitionIdClean ${C1}size:${C2} ${a_partition_working[1]}$partition_used$full_dev$full_label$full_uuid "
+
+                       if [[ $( wc -c <<< ${a_partition_data[$counter]} ) -gt $line_max ]];then
+                               ((counter++))
+                       fi
+               fi
+       done
+       # print out all lines, line starter on first line
+       for (( i=0; i < ${#a_partition_data[@]};i++ ))
+       do
+               if [[ $i -eq 0 ]];then
+                       line_starter='Partition:'
+               else
+                       line_starter=' '
+               fi
+               partition_data=$( create_print_line "$line_starter" "${a_partition_data[$i]}" )
+               print_screen_output "$partition_data"
+       done
+}
+
+print_system_data()
+{
+       local system_data='' bits=''
+       local host_name=$( hostname )
+       local current_kernel=$( uname -rm ) # | gawk '{print $1,$3,$(NF-1)}' )
+       local distro="$( get_distro_data )"
+               # check for 64 bit first
+       if [[ -n $( uname -m | grep -o 'x86_64' ) ]];then
+               bits="(64 bit)"
+       else
+               bits="(32 bit)"
+       fi
+
+       if [[ $B_SHOW_HOST == 'true' ]];then
+               system_data=$( create_print_line "System:" "${C1}Host${C2} $host_name ${C1}Kernel${C2}" )
+       else
+               system_data=$( create_print_line "System:" "${C1}Kernel${C2}" )
+       fi
+       system_data="$system_data $current_kernel $bits ${C1}Distro${C2} $distro"
+       print_screen_output "$system_data"
+}
+
+########################################################################
+#### SCRIPT EXECUTION
+########################################################################
+
+main $@ ## From the End comes the Beginning
+
+## note: this EOF is needed for smxi handling, this is what triggers the full download ok
+###**EOF**###
diff --git a/data/scripts/mpris b/data/scripts/mpris
new file mode 100755 (executable)
index 0000000..28c9fe6
--- /dev/null
@@ -0,0 +1,47 @@
+#!/usr/bin/env perl
+# Copyright 2009 Sebastian Goth seezer@roath.org
+# 
+# Simple script to read metadata from mpris compatible mediaplayers via dbus.
+#
+# Run it like this:
+# mpris amarok
+#
+# The script fills all fields exported by the player's dbusinterface.
+# They are defined here: http://wiki.xmms2.xmms.se/wiki/MPRIS_Metadata
+#
+# To see which fields are actually available from your player,
+# call something like this from a terminal:
+#
+# qdbus org.mpris.amarok /Player GetMetadata
+# or
+# qdbus org.mpris.vlc /Player GetMetadata
+# etc.
+# 
+# Every field is available in the data hash 'd' via
+# $d{"NAME_OF_FIELD"}
+# To edit the output just change the marked line accordingly.
+
+use strict;
+my %d;
+
+if($#ARGV < 0) {
+ print STDERR "Usage: $0 playername\n";
+ exit 1;
+}
+
+die "Please don't use any special characters in playername." if($ARGV[0] =~ /[^\w\d_-]/);
+
+open(IN,"qdbus org.mpris.".$ARGV[0]." /Player GetMetadata|") or die "Couldn't get dbus result.";
+while(<IN>) {
+       $d{$1} = $2 if(/^([^:]+):\s+([^\n]+)/);
+}
+close IN;
+
+if(keys(%d)) {
+
+## change the following line to fit your needs ##
+print "I'm listening to ".$d{"title"}." by ".$d{"artist"};
+#################################################
+
+print "\n";
+}
diff --git a/dev-notes/obsolete/INSTALL.Qtopia b/dev-notes/obsolete/INSTALL.Qtopia
deleted file mode 100644 (file)
index f00e453..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-Quassel IRC Mobile Edition - Installation Notes
-===============================================
-
-NOTE: QuasselTopia is currently broken. You will not be able to compile it.
-
-We assume that you are familiar with application development on the
-Greenphone (or other Qtopia devices), so we won't go into detail here.
-
-The project file and related resources for QuasselTopia are to be found
-in qtopia-build/. Set up your development environment as usual (i.e. have
-the appropriate tools in $PATH and so on), and then:
-
-cd qtopia-build
-qtopiamake
-make
-
-This will build the binary called 'quasseltopia' in the build
-directory.  Then use the gph script to build and deploy the package:
-
-gph -p
-gph -i
-
-This should create a package and start installation on the Greenphone.
diff --git a/dev-notes/obsolete/README.Qtopia b/dev-notes/obsolete/README.Qtopia
deleted file mode 100644 (file)
index 1ec1e8e..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-Quassel IRC for Qtopia - Release Notes
-======================================
-
-NOTE: QuasselTopia is currently mostly broken even if it happens to build!
-
-We provide a Quassel IRC client that can be run on mobile devices running
-Trolltech's Qtopia. The name of this client version has not yet been
-determined; we like QuasselTopia, Quassel IRC Mobile Edition or maybe
-something else. We'll call it QuasselTopia here.
-
-QuasselTopia has only been tested with the Trolltech Greenphone. We sort of
-rely on its features being available, and we assume a screensize of 240x320.
-Of course, QuasselTopia might well run on other Qtopia-enabled devices as
-well; it's just not tested yet. We will eventually support general Qtopia
-devices as well.
-
-Note that QuasselTopia is just the client; it can't do IRC by
-itself. You'll need a Quassel core running on some server or PC for
-the phone to connect to.
-
-In its current state, QuasselTopia cannot do much except for
-connecting to a core and displaying the buffers you are in. Oh, and
-chatting of course.  But you cannot change any settings, create/edit
-identities or networks, you can't even connect to a network from the
-Greenphone. So in order to test QuasselTopia, it's a good idea to have
-a desktop Quassel client connected at the same time, so that you can
-do these things from your PC.
-
-QuasselTopia thus is in a very early state, merely a proof of concept
-rather than something for day-to-day use. It shows already though that
-a mobile Quassel version is feasible and usable, and QuasselTopia will
-evolve together with the desktop version.
-
-We still hope you have fun!
-
-Please refer to INSTALL.Qtopia for installation information.
-
-Thanks,
-~ The Quassel IRC Team
-
-  (Manuel Nickschas, Marcus Eggenberger, Marco Genise)
-  
\ No newline at end of file
diff --git a/dev-notes/obsolete/builtin_cmds.obsolete.cpp b/dev-notes/obsolete/builtin_cmds.obsolete.cpp
deleted file mode 100644 (file)
index 5a9acf6..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005/06 by The Quassel Team                             *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#error THIS CODE IS OBSOLETE!
-
-/* We are keeping this for further reference only.
- * This method of defining server commands sucked, but at least we have a quite complete list
- * of commands here.
- */
-
-/** This macro marks strings as translateable for Qt's linguist tools */
-#define _(str) QT_TR_NOOP(str)
-
-
-/** Defines the message codes according to RFCs 1495/281x.
- *  Named commands have a negative enum value.
- */
-
-BuiltinCmd builtins[] = {
-  { CMD_ADMIN, "admin", _("Get information about the administrator of a server."),
-    _("[server]"), _("server: Server"), 0, 0 },
-  { CMD_AME, "ame", "", "", "", 0, 0 },
-  { CMD_AMSG, "amsg", _("Send message to all channels of all connected servers."),
-    _("message"), _("message: Message to send"), 0, 0 },
-  { CMD_AWAY, "away", _("Toggle away status."),
-    _("[-all] [message]"), _("   -all: Toggle status on all connected servers\n"
-                             "message: Away message (away status is removed if no message is given)"), 0, 0 },
-  { CMD_BAN, "ban", _("Ban a nickname or hostmask."),
-    _("[channel] [nick [nick ...]]"), _("channel: Channel for ban (current of empty)\n"
-                                        "   nick: Nickname or hostmask. If no nicknames are given, /ban displays the current banlist."), 0, 0 },
-  { CMD_CTCP, "ctcp", _("Send a CTCP message (Client-To-Client Protocol)"),
-    _("target type [args]"), _("target: Nick or channel to send CTCP to\n"
-                               "  type: CTCP Type (e.g. VERSION, PING, CHAT...)\n"
-                               "  args: Arguments for CTCP"), 0, 0 },
-  { CMD_CYCLE, "cycle", "", "", "", 0, 0 },
-  { CMD_DEHALFOP, "dehalfop", "", "", "", 0, 0 },
-  { CMD_DEOP, "deop", "", "", "", 0, 0 },
-  { CMD_DEVOICE, "devoice", "", "", "", 0, 0 },
-  { CMD_DIE, "die", "", "", "", 0, 0 },
-  { CMD_ERROR, "error", "", "", "", 0, 0 },
-  { CMD_HALFOP, "halfop", "", "", "", 0, 0 },
-  { CMD_INFO, "info", "", "", "", 0, 0 },
-  { CMD_INVITE, "invite", "", "", "", 0, 0 },
-  { CMD_ISON, "ison", "", "", "", 0, 0 },
-  { CMD_JOIN, "join", "", "", "", 0, 0 },
-  { CMD_KICK, "kick", "", "", "", 0, 0 },
-  { CMD_KICKBAN, "kickban", "", "", "", 0, 0 },
-  { CMD_KILL, "kill", "", "", "", 0, 0 },
-  { CMD_LINKS, "links", "", "", "", 0, 0 },
-  { CMD_LIST, "list", "", "", "", 0, 0 },
-  { CMD_LUSERS, "lusers", "", "", "", 0, 0 },
-  { CMD_ME, "me", "", "", "", 0, 0 },
-  { CMD_MODE, "mode", "", "", "", 0, 0 },
-  { CMD_MOTD, "motd", "", "", "", 0, 0 },
-  { CMD_MSG, "msg", "", "", "", 0, 0 },
-  { CMD_NAMES, "names", "", "", "", 0, 0 },
-  { CMD_NICK, "nick", "", "", "", 0, 0 },
-  { CMD_NOTICE, "notice", _("Send notice message to user."),
-    _("nick message"), _("   nick: user to send notice to\n"
-                         "message: text to send"), 0, 0 },
-  { CMD_OP, "op", "", "", "", 0, 0 },
-  { CMD_OPER, "oper", "", "", "", 0, 0 },
-  { CMD_PART, "part", "", "", "", 0, 0 },
-  { CMD_PING, "ping", _("Ping a server."),
-    _("server1 [server2]"), _("server1: Server to ping\nserver2: Forward ping to this server"), 0, 0 },
-  { CMD_PONG, "pong", "", "", "", 0, 0 },
-  { CMD_PRIVMSG, "privmsg", "", "", "", 0, 0 },
-  { CMD_QUERY, "query", "", "", "", 0, 0 },
-  { CMD_QUIT, "quit", "", "", "", 0, 0 },
-  { CMD_QUOTE, "quote", "", "", "", 0, 0 },
-  { CMD_REHASH, "rehash", "", "", "", 0, 0 },
-  { CMD_RESTART, "restart", "", "", "", 0, 0 },
-  { CMD_SERVICE, "service", "", "", "", 0, 0 },
-  { CMD_SERVLIST, "servlist", "", "", "", 0, 0 },
-  { CMD_SQUERY, "squery", "", "", "", 0, 0 },
-  { CMD_SQUIT, "squit", "", "", "", 0, 0 },
-  { CMD_STATS, "stats", "", "", "", 0, 0 },
-  { CMD_SUMMON, "summon", "", "", "", 0, 0 },
-  { CMD_TIME, "time", "", "", "", 0, 0 },
-  { CMD_TOPIC, "topic", "", "", "", 0, 0 },
-  { CMD_TRACE, "trace", "", "", "", 0, 0 },
-  { CMD_UNBAN, "unban", "", "", "", 0, 0 },
-  { CMD_USERHOST, "userhost", "", "", "", 0, 0 },
-  { CMD_USERS, "users", "", "", "", 0, 0 },
-  { CMD_VERSION, "version", "", "", "", 0, 0 },
-  { CMD_VOICE, "voice", "", "", "", 0, 0 },
-  { CMD_WALLOPS, "wallops", "", "", "", 0, 0 },
-  { CMD_WHO, "who", "", "", "", 0, 0 },
-  { CMD_WHOIS, "whois", "", "", "", 0, 0 },
-  { CMD_WHOWAS, "whowas", "", "", "", 0, 0 },
-
-  { 0, 0, 0, 0, 0, 0, 0 }
-};
-
-
diff --git a/dev-notes/obsolete/paulk-mainwindow.ui b/dev-notes/obsolete/paulk-mainwindow.ui
deleted file mode 100644 (file)
index 81022bf..0000000
+++ /dev/null
@@ -1,310 +0,0 @@
-<ui version="4.0" >
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>644</width>
-    <height>566</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>MainWindow</string>
-  </property>
-  <widget class="QWidget" name="centralwidget" >
-   <widget class="QDockWidget" name="dockWidget_3" >
-    <property name="geometry" >
-     <rect>
-      <x>60</x>
-      <y>80</y>
-      <width>112</width>
-      <height>329</height>
-     </rect>
-    </property>
-    <property name="sizePolicy" >
-     <sizepolicy>
-      <hsizetype>5</hsizetype>
-      <vsizetype>5</vsizetype>
-      <horstretch>0</horstretch>
-      <verstretch>0</verstretch>
-     </sizepolicy>
-    </property>
-    <property name="windowTitle" >
-     <string>All Nets</string>
-    </property>
-    <widget class="QWidget" name="dockWidgetContents_3" >
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QTreeWidget" name="treeWidget_4" >
-        <column>
-         <property name="text" >
-          <string>All Nets</string>
-         </property>
-        </column>
-        <item>
-         <property name="text" >
-          <string>QuakeNet</string>
-         </property>
-         <item>
-          <property name="text" >
-           <string>Status</string>
-          </property>
-         </item>
-         <item>
-          <property name="text" >
-           <string>Channels</string>
-          </property>
-          <item>
-           <property name="text" >
-            <string>#quassel</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>#quadaver</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>#lolage</string>
-           </property>
-          </item>
-         </item>
-         <item>
-          <property name="text" >
-           <string>Queries</string>
-          </property>
-         </item>
-         <item>
-          <property name="text" >
-           <string>DCC</string>
-          </property>
-         </item>
-        </item>
-        <item>
-         <property name="text" >
-          <string>IrcNet</string>
-         </property>
-         <item>
-          <property name="text" >
-           <string>Status</string>
-          </property>
-         </item>
-        </item>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </widget>
-  </widget>
-  <widget class="QMenuBar" name="menubar" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>644</width>
-     <height>28</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuExtensions" >
-    <property name="title" >
-     <string>Extensions</string>
-    </property>
-   </widget>
-   <widget class="QMenu" name="menuAbout" >
-    <property name="title" >
-     <string>About</string>
-    </property>
-   </widget>
-   <widget class="QMenu" name="menuViews" >
-    <property name="title" >
-     <string>Views</string>
-    </property>
-    <addaction name="actionAll_Nets" />
-   </widget>
-   <widget class="QMenu" name="menuOptions" >
-    <property name="title" >
-     <string>Settings</string>
-    </property>
-   </widget>
-   <widget class="QMenu" name="menuFile" >
-    <property name="title" >
-     <string>Connection</string>
-    </property>
-    <addaction name="actionNets" />
-   </widget>
-   <addaction name="menuFile" />
-   <addaction name="menuOptions" />
-   <addaction name="menuViews" />
-   <addaction name="menuExtensions" />
-   <addaction name="menuAbout" />
-  </widget>
-  <widget class="QStatusBar" name="statusbar" />
-  <widget class="QDockWidget" name="dockWidget" >
-   <property name="windowTitle" >
-    <string>QuakeNet</string>
-   </property>
-   <attribute name="dockWidgetArea" >
-    <number>1</number>
-   </attribute>
-   <widget class="QWidget" name="dockWidgetContents" >
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>9</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item row="0" column="0" >
-      <widget class="QTreeWidget" name="treeWidget_2" >
-       <column>
-        <property name="text" >
-         <string>QuakeNet</string>
-        </property>
-       </column>
-       <item>
-        <property name="text" >
-         <string>Status</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>Channels</string>
-        </property>
-        <item>
-         <property name="text" >
-          <string>#quassel</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>#quadaver</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>#faecherstadt ohne AE.. doh</string>
-         </property>
-        </item>
-       </item>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
-  <widget class="QToolBar" name="toolBar" >
-   <property name="contextMenuPolicy" >
-    <enum>Qt::DefaultContextMenu</enum>
-   </property>
-   <property name="layoutDirection" >
-    <enum>Qt::LeftToRight</enum>
-   </property>
-   <property name="autoFillBackground" >
-    <bool>false</bool>
-   </property>
-   <property name="orientation" >
-    <enum>Qt::Vertical</enum>
-   </property>
-   <property name="toolButtonStyle" >
-    <enum>Qt::ToolButtonTextUnderIcon</enum>
-   </property>
-   <attribute name="toolBarArea" >
-    <number>2</number>
-   </attribute>
-   <addaction name="actionKickUser" />
-   <addaction name="actionSetAway" />
-  </widget>
-  <widget class="QDockWidget" name="dockWidget_2" >
-   <property name="sizePolicy" >
-    <sizepolicy>
-     <hsizetype>5</hsizetype>
-     <vsizetype>5</vsizetype>
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="windowTitle" >
-    <string>IrcNet</string>
-   </property>
-   <attribute name="dockWidgetArea" >
-    <number>1</number>
-   </attribute>
-   <widget class="QWidget" name="dockWidgetContents_2" >
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>9</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item row="0" column="0" >
-      <widget class="QTreeWidget" name="treeWidget_3" >
-       <column>
-        <property name="text" >
-         <string>IrcNet</string>
-        </property>
-       </column>
-       <item>
-        <property name="text" >
-         <string>Status</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>Channels</string>
-        </property>
-        <item>
-         <property name="text" >
-          <string>#quassel</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>#quadaver</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>#faecherstadt ohne AE.. doh</string>
-         </property>
-        </item>
-       </item>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
-  <action name="actionKickUser" >
-   <property name="icon" >
-    <iconset>../../../../screenshot.png</iconset>
-   </property>
-   <property name="text" >
-    <string>kickUser</string>
-   </property>
-  </action>
-  <action name="actionSetAway" >
-   <property name="text" >
-    <string>setAway</string>
-   </property>
-  </action>
-  <action name="actionAll_Nets" >
-   <property name="text" >
-    <string>All Nets</string>
-   </property>
-  </action>
-  <action name="actionNets" >
-   <property name="text" >
-    <string>Nets</string>
-   </property>
-  </action>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/dev-notes/obsolete/qtopia/bufferviewwidget.cpp b/dev-notes/obsolete/qtopia/bufferviewwidget.cpp
deleted file mode 100644 (file)
index 4ee2c98..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#include "bufferviewwidget.h"
-#include "client.h"
-#include "buffermodel.h"
-
-
-BufferViewWidget::BufferViewWidget(QWidget *parent) : QDialog(parent) {
-  ui.setupUi(this);
-  setModal(true);
-  //setStyleSheet("background-color: rgb(220, 220, 255, 70%); color: rgb(0, 0, 0); font-size: 5pt;");
-  //ui.tabWidget->tabBar()->setStyleSheet("font-size: 5pt;");
-
-  // get rid of the default tab page designer forces upon us :(
-  QWidget *w = ui.tabWidget->widget(0);
-  ui.tabWidget->removeTab(0);
-  delete w;
-
-  addPage(tr("All"), BufferViewFilter::AllNets, QList<NetworkId>());
-  addPage(tr("Chans"), BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList<NetworkId>());
-  addPage(tr("Queries"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList<NetworkId>());
-  addPage(tr("Nets"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList<NetworkId>());
-
-  // this sometimes deadlocks, so we have to hide the dialog from the outside:
-  //connect(Client::bufferModel()->standardSelectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(accept()));
-}
-
-BufferViewWidget::~BufferViewWidget() {
-
-
-}
-
-void BufferViewWidget::addPage(const QString &title, const BufferViewFilter::Modes &mode, const QList<NetworkId> &nets) {
-  BufferView *view = new BufferView(ui.tabWidget);
-  view->setStyleSheet("background-color: rgb(220, 220, 255, 70%); color: rgb(0, 0, 0); font-size: 5pt;");
-  view->setFilteredModel(Client::bufferModel(), mode, nets);
-  Client::bufferModel()->synchronizeView(view);
-  ui.tabWidget->addTab(view, title);
-}
-
-void BufferViewWidget::accept() {
-  QDialog::accept();
-}
diff --git a/dev-notes/obsolete/qtopia/bufferviewwidget.h b/dev-notes/obsolete/qtopia/bufferviewwidget.h
deleted file mode 100644 (file)
index 4aa0adf..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef _BUFFERVIEWWIDGET_H_
-#define _BUFFERVIEWWIDGET_H_
-
-#include "ui_bufferviewwidget.h"
-
-#include "bufferview.h"
-
-class BufferViewWidget : public QDialog {
-  Q_OBJECT
-
-
-  public:
-    BufferViewWidget(QWidget *parent = 0);
-    virtual ~BufferViewWidget();
-
-    virtual void accept();
-
-  private:
-    void addPage(const QString &title, const BufferViewFilter::Modes &mode, const QList<NetworkId> &nets);
-    Ui::BufferViewWidget ui;
-
-};
-
-#endif
diff --git a/dev-notes/obsolete/qtopia/chatline.cpp b/dev-notes/obsolete/qtopia/chatline.cpp
deleted file mode 100644 (file)
index 0a709c0..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#include <QtCore>
-
-#include "chatline.h"
-#include "qtopiaui.h"
-#include "qtopiauistyle.h"
-
-ChatLine::ChatLine(Message msg) {
-  _styledSender = QtopiaUi::style()->styleString(msg.formattedSender());
-  _styledContents = QtopiaUi::style()->styleString(msg.formattedText());
-  _timestamp = msg.timestamp();
-  _msgId = msg.msgId();
-  _bufferInfo = msg.bufferInfo();
-
-
-}
-
-QString ChatLine::sender() const {
-  return _sender;
-}
-
-QString ChatLine::text() const {
-  return _text;
-}
-
-MsgId ChatLine::msgId() const {
-  return _msgId;
-}
-
-BufferInfo ChatLine::bufferInfo() const {
-  return _bufferInfo;
-}
-
-QDateTime ChatLine::timestamp() const {
-  return _timestamp;
-}
-
-UiStyle::StyledText ChatLine::styledSender() const {
-  return _styledSender;
-}
-
-UiStyle::StyledText ChatLine::styledContents() const {
-  return _styledContents;
-}
-
-
-
-QString ChatLine::formattedToHtml(const QString &f) {
-   
-  return f;
-}
diff --git a/dev-notes/obsolete/qtopia/chatline.h b/dev-notes/obsolete/qtopia/chatline.h
deleted file mode 100644 (file)
index bdaf7d4..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef _CHATLINE_H_
-#define _CHATLINE_H_
-
-#include "quasselui.h"
-#include "uistyle.h"
-
-class ChatLine : public AbstractUiMsg {
-
-  public:
-    ChatLine(Message msg);
-    QString sender() const;
-    QString text() const;
-    MsgId msgId() const;
-    BufferInfo bufferInfo() const;
-    QDateTime timestamp() const;
-
-    UiStyle::StyledText styledSender() const;
-    UiStyle::StyledText styledContents() const;
-
-  private:
-    QString _sender, _text, _htmlSender, _htmlText, _htmlTimestamp;
-    UiStyle::StyledText _styledSender, _styledContents;
-    MsgId _msgId;
-    BufferInfo _bufferInfo;
-    QDateTime _timestamp;
-
-    QString formattedToHtml(const QString &);
-
-};
-
-#endif
diff --git a/dev-notes/obsolete/qtopia/chatwidget.cpp b/dev-notes/obsolete/qtopia/chatwidget.cpp
deleted file mode 100644 (file)
index b6950c6..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#include <QDebug>
-#include <QtGui>
-#include "chatwidget.h"
-
-ChatWidget::ChatWidget(QWidget *parent) : QTextEdit(parent), AbstractChatView() {
-  setStyleSheet("background-color: rgba(255, 255, 255, 60%)");
-  setTextInteractionFlags(Qt::TextBrowserInteraction);
-}
-
-void ChatWidget::setContents(const QList<AbstractUiMsg *> &lines) {
-  clear();
-  QList<ChatLine *> list;
-  foreach(AbstractUiMsg *msg, lines) list << static_cast<ChatLine*>(msg);
-  appendChatLines(list);
-
-}
-
-void ChatWidget::prependMsg(AbstractUiMsg *msg) {
-  ChatLine *line = static_cast<ChatLine*>(msg);
-  Q_ASSERT(line);
-  prependChatLine(line);
-}
-
-void ChatWidget::appendMsg(AbstractUiMsg *msg) {
-  ChatLine *line = static_cast<ChatLine*>(msg);
-  Q_ASSERT(line);
-  appendChatLine(line);
-}
-
-void ChatWidget::appendChatLine(ChatLine *line) {
-  QTextCursor cursor = textCursor();
-  moveCursor(QTextCursor::End);
-  if(!document()->isEmpty()) insertPlainText("\n");
-  insertStyledText(line->styledSender());
-  insertPlainText(" ");
-  insertStyledText(line->styledContents());
-  setTextCursor(cursor);
-}
-
-void ChatWidget::appendChatLines(QList<ChatLine *> list) {
-  foreach(ChatLine *line, list) {
-    appendChatLine(line);
-  }
-}
-
-void ChatWidget::prependChatLine(ChatLine *line) {
-  QTextCursor cursor = textCursor();
-  moveCursor(QTextCursor::Start);
-  bool flg = document()->isEmpty();
-  insertStyledText(line->styledSender());
-  insertPlainText(" ");
-  insertStyledText(line->styledContents());
-  if(!flg) insertPlainText("\n");
-  setTextCursor(cursor);
-}
-
-void ChatWidget::prependChatLines(QList<ChatLine *> list) {
-  foreach(ChatLine *line, list) {
-    prependChatLine(line);
-  }
-}
-
-void ChatWidget::insertChatLine(ChatLine *line) {
-  if(!document()->isEmpty()) insertPlainText("\n");
-  insertStyledText(line->styledSender());
-  insertPlainText(" ");
-  insertStyledText(line->styledContents());
-}
-
-void ChatWidget::insertStyledText(const QtopiaUiStyle::StyledText &stext) {
-  QTextCursor cursor = textCursor();
-  foreach(QTextLayout::FormatRange format, stext.formatList) {
-    cursor.setCharFormat(format.format);
-    setTextCursor(cursor);
-    insertPlainText(stext.plainText.mid(format.start, format.length));
-  }
-}
diff --git a/dev-notes/obsolete/qtopia/chatwidget.h b/dev-notes/obsolete/qtopia/chatwidget.h
deleted file mode 100644 (file)
index 3e1b37a..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef CHATWIDGET_H_
-#define CHATWIDGET_H_
-
-#include <QTextEdit>
-
-#include "abstractbuffercontainer.h"
-#include "chatline.h"
-#include "qtopiauistyle.h"
-#include "quasselui.h"
-
-class ChatWidget : public QTextEdit, public AbstractChatView {
-  Q_OBJECT
-
-  public:
-    ChatWidget(QWidget *parent = 0);
-
-  public slots:
-    void setContents(const QList<AbstractUiMsg *> &);
-    void appendMsg(AbstractUiMsg *);
-    void prependMsg(AbstractUiMsg *);
-
-    void prependChatLine(ChatLine *);
-    void appendChatLine(ChatLine *);
-    void prependChatLines(QList<ChatLine *>);
-    void appendChatLines(QList<ChatLine *>);
-
-  private:
-    void insertChatLine(ChatLine *);
-    void insertStyledText(const QtopiaUiStyle::StyledText &);
-
-};
-
-#endif
diff --git a/dev-notes/obsolete/qtopia/coreconnectdlg.cpp b/dev-notes/obsolete/qtopia/coreconnectdlg.cpp
deleted file mode 100644 (file)
index 9f09d91..0000000
+++ /dev/null
@@ -1,378 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-#define DEVELMODE
-#include <QtGui>
-#include <QSoftMenuBar>
-
-#include "coreconnectdlg.h"
-#include "client.h"
-#include "clientsettings.h"
-#include "clientsyncer.h"
-#include "global.h"
-
-CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialog(parent) {
-  ui.setupUi(this);
-
-  setAttribute(Qt::WA_DeleteOnClose);
-  setModal(true);
-
-  clientSyncer = new ClientSyncer(this);
-  connect(clientSyncer, SIGNAL(socketStateChanged(QAbstractSocket::SocketState)),this, SLOT(initPhaseSocketState(QAbstractSocket::SocketState)));
-  connect(clientSyncer, SIGNAL(connectionError(const QString &)), this, SLOT(initPhaseError(const QString &)));
-  connect(clientSyncer, SIGNAL(connectionMsg(const QString &)), this, SLOT(initPhaseMsg(const QString &)));
-  connect(clientSyncer, SIGNAL(startLogin()), this, SLOT(startLogin()));
-  connect(clientSyncer, SIGNAL(loginFailed(const QString &)), this, SLOT(loginFailed(const QString &)));
-  connect(clientSyncer, SIGNAL(loginSuccess()), this, SLOT(startSync()));
-  //connect(clientSyncer, SIGNAL(startCoreSetup(const QVariantList &)), this, SLOT(startCoreConfig(const QVariantList &)));
-
-  QMenu *menu = new QMenu(this);
-  newAccAction = new QAction(QIcon(":icon/new"), tr("New"), this);
-  delAccAction = new QAction(QIcon(":icon/trash"), tr("Delete"), this);
-  editAccAction = new QAction(QIcon(":icon/settings"), tr("Properties..."), this);
-  menu->addAction(newAccAction);
-  menu->addAction(delAccAction);
-  menu->addAction(editAccAction);
-  QSoftMenuBar::addMenuTo(this, menu);
-  QSoftMenuBar::setCancelEnabled(this, true);
-  ui.newAccount->setDefaultAction(newAccAction);
-  ui.delAccount->setDefaultAction(delAccAction);
-  ui.editAccount->setDefaultAction(editAccAction);
-  connect(newAccAction, SIGNAL(triggered()), this, SLOT(createAccount()));
-  connect(delAccAction, SIGNAL(triggered()), this, SLOT(removeAccount()));
-  connect(editAccAction, SIGNAL(triggered()), this, SLOT(editAccount()));
-  connect(ui.accountList, SIGNAL(itemSelectionChanged()), this, SLOT(setWidgetStates()));
-  connect(ui.doConnect, SIGNAL(clicked()), this, SLOT(doConnect()));
-
-  ui.accountList->setSelectionMode(QAbstractItemView::SingleSelection);
-  ui.accountList->setSortingEnabled(true);
-
-  CoreAccountSettings s;
-  AccountId lastacc = s.lastAccount();
-  autoConnectAccount = s.autoConnectAccount();
-  QListWidgetItem *currentItem = 0;
-  foreach(AccountId id, s.knownAccounts()) {
-    if(!id.isValid()) continue;
-    QVariantMap data = s.retrieveAccountData(id);
-    accounts[id] = data;
-    QListWidgetItem *item = new QListWidgetItem(data["AccountName"].toString(), ui.accountList);
-    item->setData(Qt::UserRole, QVariant::fromValue<AccountId>(id));
-    if(id == lastacc) currentItem = item;
-  }
-  if(currentItem) ui.accountList->setCurrentItem(currentItem);
-  else ui.accountList->setCurrentRow(0);
-  setWidgetStates();
-#ifdef DEVELMODE
-  doConnect(); // shortcut for development
-#endif
-}
-
-CoreConnectDlg::~CoreConnectDlg() {
-  //qDebug() << "destroy";
-}
-
-void CoreConnectDlg::setWidgetStates() {
-  editAccAction->setEnabled(ui.accountList->selectedItems().count());
-  delAccAction->setEnabled(ui.accountList->selectedItems().count());
-  ui.doConnect->setEnabled(ui.accountList->selectedItems().count());
-}
-
-void CoreConnectDlg::createAccount() {
-  QStringList existing;
-  for(int i = 0; i < ui.accountList->count(); i++) existing << ui.accountList->item(i)->text();
-  CoreAccountEditDlg dlg(0, QVariantMap(), existing, this);
-  if(dlg.exec() == QDialog::Accepted) {
-    // find free ID
-    AccountId id = accounts.count() + 1;
-    for(AccountId i = 1; i <= accounts.count(); i++) {
-      if(!accounts.keys().contains(i)) {
-        id = i;
-        break;
-      }
-    }
-    QVariantMap data = dlg.accountData();
-    data["AccountId"] = QVariant::fromValue<AccountId>(id);
-    accounts[id] = data;
-    CoreAccountSettings s;
-    s.storeAccountData(id, data);
-    QListWidgetItem *item = new QListWidgetItem(data["AccountName"].toString(), ui.accountList);
-    item->setData(Qt::UserRole, QVariant::fromValue<AccountId>(id));
-    ui.accountList->setCurrentItem(item);
-  }
-}
-
-void CoreConnectDlg::editAccount() {
-  QStringList existing;
-  for(int i = 0; i < ui.accountList->count(); i++) existing << ui.accountList->item(i)->text();
-  AccountId id = ui.accountList->currentItem()->data(Qt::UserRole).value<AccountId>();
-  QVariantMap acct = accounts[id];
-  CoreAccountEditDlg dlg(id, acct, existing, this);
-  if(dlg.exec() == QDialog::Accepted) {
-    QVariantMap data = dlg.accountData();
-    ui.accountList->currentItem()->setText(data["AccountName"].toString());
-    accounts[id] = data;
-    CoreAccountSettings s;
-    s.storeAccountData(id, data);
-  }
-}
-
-void CoreConnectDlg::removeAccount() {
-  AccountId id = ui.accountList->currentItem()->data(Qt::UserRole).value<AccountId>();
-  int ret = QMessageBox::question(this, tr("Remove Account Settings"),
-                                  tr("Do you really want to remove your local settings for this Quassel Core account?<br>"
-                                      "Note: This will <em>not</em> remove or change any data on the Core itself!"),
-                                      QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
-  if(ret == QMessageBox::Yes) {
-    int idx = ui.accountList->currentRow();
-    delete ui.accountList->takeItem(idx);
-    ui.accountList->setCurrentRow(qMin(idx, ui.accountList->count()-1));
-    CoreAccountSettings s;
-    s.removeAccount(id);
-    setWidgetStates();
-  }
-}
-
-void CoreConnectDlg::doConnect() {
-  // save accounts
-  CoreAccountSettings s;
-  foreach(QVariantMap acct, accounts.values()) {
-    AccountId id = acct["AccountId"].value<AccountId>();
-    if(acct.contains("Delete")) {
-      s.removeAccount(id);
-    } else {
-      s.storeAccountData(id, acct);
-    }
-  }
-  s.setAutoConnectAccount(autoConnectAccount);
-
-  //ui.stackedWidget->setCurrentWidget(ui.loginPage);
-  account = ui.accountList->currentItem()->data(Qt::UserRole).value<AccountId>();
-  accountData = accounts[account];
-  s.setLastAccount(account);
-  
-  clientSyncer->connectToCore(accountData);
-//  qDebug() << "logging in " << accountData["User"].toString() << accountData["Password"].toString();
-//  clientSyncer->loginToCore(accountData["User"].toString(), accountData["Password"].toString());
-//  qDebug() << "logged in";
-  //connectToCore();
-  //if(!ui.accountList->selectedItems().count()) return;
-//  AccountSettings s;
-//  QVariantMap connInfo; // = s.value(acc, "AccountData").toMap();
-  //connInfo["AccountName"] = acc;
-
-  progressDlg = new CoreConnectProgressDlg(clientSyncer, this);
-  connect(progressDlg, SIGNAL(accepted()), this, SLOT(connectionSuccess()));
-  connect(progressDlg, SIGNAL(rejected()), this, SLOT(connectionFailure()));
-  progressDlg->showMaximized();
- // progressDlg->connectToCore(connInfo);
-}
-
-void CoreConnectDlg::initPhaseError(const QString &error) {
-  qDebug() << "connection error:" << error;
-}
-
-void CoreConnectDlg::initPhaseMsg(const QString &msg) {
-
-}
-
-void CoreConnectDlg::initPhaseSocketState(QAbstractSocket::SocketState state) {
-  /*
-  QString s;
-  QString host = accountData["Host"].toString();
-  switch(state) {
-    case QAbstractSocket::UnconnectedState: s = tr("Not connected to %1.").arg(host); break;
-    case QAbstractSocket::HostLookupState: s = tr("Looking up %1...").arg(host); break;
-    case QAbstractSocket::ConnectingState: s = tr("Connecting to %1...").arg(host); break;
-    case QAbstractSocket::ConnectedState: s = tr("Connected to %1").arg(host); break;
-    default: s = tr("Unknown connection state to %1"); break;
-  }
-  ui.connectLabel->setText(s);
-  */
-}
-
-void CoreConnectDlg::restartPhaseNull() {
-  clientSyncer->disconnectFromCore();
-}
-
-/*********************************************************
- * Phase Two: Login
- *********************************************************/
-
-void CoreConnectDlg::startLogin() {
-  clientSyncer->loginToCore(accountData["User"].toString(), accountData["Password"].toString());
-}
-
-
-void CoreConnectDlg::loginFailed(const QString &error) {
-
-}
-
-void CoreConnectDlg::startSync() {
-  
-  
-}
-
-
-void CoreConnectDlg::connectionSuccess() {
-  /*
-  if(progressDlg->isConnected()) {
-    progressDlg->deleteLater();
-    accept();
-  } else {
-    connectionFailure();
-  }
-  */
-  accept();
-}
-
-void CoreConnectDlg::connectionFailure() {
-  progressDlg->deleteLater();
-  Client::instance()->disconnectFromCore();
-}
-
-QVariant CoreConnectDlg::getCoreState() {
-//  return coreState;
-}
-
-
-/****************************************************************************************************/
-
-CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, const QStringList &_existing, QWidget *parent) : QDialog(parent), account(acct) {
-  ui.setupUi(this);
-  setModal(true);
-  showMaximized();
-
-  existing = _existing;
-  account = acct;
-  if(id.isValid()) {
-    existing.removeAll(acct["AccountName"].toString());
-    ui.hostEdit->setText(acct["Host"].toString());
-    ui.port->setValue(acct["Port"].toUInt());
-    ui.accountEdit->setText(acct["AccountName"].toString());
-    ui.userEdit->setText(acct["User"].toString());
-    ui.passwdEdit->setText(acct["Password"].toString());
-    ui.hostEdit->setFocus();
-  } else {
-    ui.port->setValue(Global::defaultPort);
-    ui.accountEdit->setFocus();
-    setWindowTitle(tr("Add Core Account"));
-  }
-}
-
-QVariantMap CoreAccountEditDlg::accountData() {
-  account["AccountName"] = ui.accountEdit->text().trimmed();
-  account["Host"] = ui.hostEdit->text().trimmed();
-  account["Port"] = ui.port->value();
-  account["User"] = ui.userEdit->text();
-  account["Password"] = ui.passwdEdit->text();
-  return account;
-}
-
-void CoreAccountEditDlg::accept() {
-  if(ui.userEdit->text().isEmpty() || ui.hostEdit->text().isEmpty() || ui.accountEdit->text().isEmpty()) {
-    int res = QMessageBox::warning(this, tr("Missing information"),
-                                   tr("Please enter all required information or discard changes to return to account selection."),
-                                      QMessageBox::Discard|QMessageBox::Retry);
-    if(res != QMessageBox::Retry) reject();
-    return;
-  }
-  
-  if(existing.contains(ui.accountEdit->text())) {
-    int res = QMessageBox::warning(this, tr("Non-unique account name"),
-                                   tr("Account names need to be unique. Please enter a different name or discard all changes to "
-                                      "return to account selection."),
-                                      QMessageBox::Discard|QMessageBox::Retry);
-    if(res != QMessageBox::Retry) reject();
-    ui.accountEdit->setSelection(0, ui.accountEdit->text().length());
-    ui.accountEdit->setFocus();
-    return;
-  }
-  QDialog::accept();
-}
-
-/********************************************************************************************/
-
-CoreConnectProgressDlg::CoreConnectProgressDlg(ClientSyncer *clientSyncer, QDialog *parent) : QDialog(parent) {
-  ui.setupUi(this);
-
-  setModal(true);
-
-  connect(clientSyncer, SIGNAL(sessionProgress(quint32, quint32)), this, SLOT(coreSessionProgress(quint32, quint32)));
-  connect(clientSyncer, SIGNAL(networksProgress(quint32, quint32)), this, SLOT(coreNetworksProgress(quint32, quint32)));
-  connect(clientSyncer, SIGNAL(channelsProgress(quint32, quint32)), this, SLOT(coreChannelsProgress(quint32, quint32)));
-  connect(clientSyncer, SIGNAL(ircUsersProgress(quint32, quint32)), this, SLOT(coreIrcUsersProgress(quint32, quint32)));
-  connect(clientSyncer, SIGNAL(syncFinished()), this, SLOT(syncFinished()));
-
-  ui.sessionProgress->setRange(0, 1);
-  ui.sessionProgress->setValue(0);
-  ui.networksProgress->setRange(0, 1);
-  ui.networksProgress->setValue(0);
-  ui.channelsProgress->setRange(0, 1);
-  ui.channelsProgress->setValue(0);
-  ui.ircUsersProgress->setRange(0, 1);
-  ui.ircUsersProgress->setValue(0);
-}
-
-void CoreConnectProgressDlg::coreSessionProgress(quint32 val, quint32 max) {
-  ui.sessionProgress->setRange(0, max);
-  ui.sessionProgress->setValue(val);
-
-}
-
-void CoreConnectProgressDlg::coreNetworksProgress(quint32 val, quint32 max) {
-  if(max == 0) {
-    ui.networksProgress->setFormat("0/0");
-    ui.networksProgress->setRange(0, 1);
-    ui.networksProgress->setValue(1);
-  } else {
-    ui.networksProgress->setFormat("%v/%m");
-    ui.networksProgress->setRange(0, max);
-    ui.networksProgress->setValue(val);
-  }
-}
-
-void CoreConnectProgressDlg::coreChannelsProgress(quint32 val, quint32 max) {
-  if(max == 0) {
-    ui.channelsProgress->setFormat("0/0");
-    ui.channelsProgress->setRange(0, 1);
-    ui.channelsProgress->setValue(1);
-  } else {
-    ui.channelsProgress->setFormat("%v/%m");
-    ui.channelsProgress->setRange(0, max);
-    ui.channelsProgress->setValue(val);
-  }
-}
-
-void CoreConnectProgressDlg::coreIrcUsersProgress(quint32 val, quint32 max) {
-  if(max == 0) {
-    ui.ircUsersProgress->setFormat("0/0");
-    ui.ircUsersProgress->setRange(0, 1);
-    ui.ircUsersProgress->setValue(1);
-  } else {
-    if(val % 100) return;
-    ui.ircUsersProgress->setFormat("%v/%m");
-    ui.ircUsersProgress->setRange(0, max);
-    ui.ircUsersProgress->setValue(val);
-  }
-}
-
-void CoreConnectProgressDlg::syncFinished() {
-  accept();
-}
-
diff --git a/dev-notes/obsolete/qtopia/coreconnectdlg.h b/dev-notes/obsolete/qtopia/coreconnectdlg.h
deleted file mode 100644 (file)
index 36ce26f..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef _CORECONNECTDLG_H
-#define _CORECONNECTDLG_H
-
-#include <QAbstractSocket>
-
-#include "types.h"
-
-#include "ui_coreconnectdlg.h"
-#include "ui_coreconnectprogressdlg.h"
-#include "ui_coreaccounteditdlg.h"
-
-class ClientSyncer;
-class CoreConnectProgressDlg;
-
-class CoreConnectDlg : public QDialog {
-  Q_OBJECT
-
-  public:
-    CoreConnectDlg(QWidget *parent = 0, bool doAutoConnect = false);
-    ~CoreConnectDlg();
-    QVariant getCoreState();
-
-  private slots:
-    void createAccount();
-    void removeAccount();
-    void editAccount();
-    void setWidgetStates();
-    void doConnect();
-    void connectionSuccess();
-    void connectionFailure();
-
-    /*** Phase One: Connection ***/
-
-    void restartPhaseNull();
-    void initPhaseError(const QString &error);
-    void initPhaseMsg(const QString &msg);
-    void initPhaseSocketState(QAbstractSocket::SocketState);
-
-    /*** Phase Two: Login ***/
-    void startLogin();
-    void loginFailed(const QString &);
-
-    /*** Phase Three: Sync ***/
-    void startSync();
-
-  private:
-    Ui::CoreConnectDlg ui;
-    ClientSyncer *clientSyncer;
-
-    AccountId autoConnectAccount;
-    QHash<AccountId, QVariantMap> accounts;
-    QVariantMap accountData;
-    AccountId account;
-
-    void editAccount(QString);
-
-    QAction *newAccAction, *editAccAction, *delAccAction;
-
-    CoreConnectProgressDlg *progressDlg;
-};
-
-class CoreAccountEditDlg : public QDialog {
-  Q_OBJECT
-
-  public:
-    CoreAccountEditDlg(AccountId id, const QVariantMap &data, const QStringList &existing = QStringList(), QWidget *parent = 0);
-    QVariantMap accountData();
-
-  public slots:
-    void accept();
-
-  private slots:
-
-
-  private:
-    Ui::CoreAccountEditDlg ui;
-    QVariantMap account;
-    QStringList existing;
-
-};
-
-class CoreConnectProgressDlg : public QDialog {
-  Q_OBJECT
-
-  public:
-    CoreConnectProgressDlg(ClientSyncer *, QDialog *parent = 0);
-
-  private slots:
-
-    void syncFinished();
-
-    void coreSessionProgress(quint32, quint32);
-    void coreNetworksProgress(quint32, quint32);
-    void coreChannelsProgress(quint32, quint32);
-    void coreIrcUsersProgress(quint32, quint32);
-
-  private:
-    Ui::CoreConnectProgressDlg ui;
-
-};
-
-#endif
diff --git a/dev-notes/obsolete/qtopia/mainwidget.cpp b/dev-notes/obsolete/qtopia/mainwidget.cpp
deleted file mode 100644 (file)
index 4523195..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#include "mainwidget.h"
-
-#include "buffer.h"
-#include "chatwidget.h"
-#include "client.h"
-
-MainWidget::MainWidget(QWidget *parent) : AbstractBufferContainer(parent) {
-  ui.setupUi(this);
-  ui.inputLine->hide(); ui.topicBar->hide();
-  connect(ui.inputLine, SIGNAL(sendText(const QString &)), this, SLOT(userInput(const QString &)));
-  connect(this, SIGNAL(userInput(BufferInfo, QString)), Client::instance(), SIGNAL(sendInput(BufferInfo, QString)));
-}
-
-MainWidget::~MainWidget() {
-
-
-
-}
-
-AbstractChatView *MainWidget::createChatView(BufferId id) {
-  Q_UNUSED(id)
-  ChatWidget *widget = new ChatWidget(this);
-  AbstractChatView *chatView = static_cast<AbstractChatView *>(widget); // can't use dynamic_cast on some Qtopia devices
-  Q_ASSERT(chatView);
-  _chatViews[id] = widget;
-  ui.stack->addWidget(widget);
-  widget->setFocusProxy(this);
-  return chatView;
-}
-
-void MainWidget::removeChatView(BufferId id) {
-  ChatWidget *view = _chatViews.value(id, 0);
-  if(!view) return;
-  ui.stack->removeWidget(view);
-  view->deleteLater();
-}
-
-void MainWidget::showChatView(BufferId id) {
-  if(id.isValid()) currentBufferInfo = Client::buffer(id)->bufferInfo();
-  else currentBufferInfo = BufferInfo();
-  ChatWidget *widget = _chatViews.value(id, 0);
-  if(!widget) ui.stack->setCurrentIndex(0);
-  else {
-    ui.stack->setCurrentWidget(widget);
-    ui.inputLine->show(); ui.topicBar->show();
-    ui.inputLine->setFocus();
-  }
-}
-
-
-/*
-void MainWidget::setBuffer(Buffer *buf) {
-
-  if(!buf) {
-    ui.stack->setCurrentIndex(0);
-    currentBuffer = 0;
-    return;
-  }
-  //  TODO update topic if changed; handle status buffer display
-//  QString title = QString("%1 (%2): \"%3\"").arg(buf->bufferInfo().bufferName()).arg(buf->bufferInfo().networkName()).arg(buf->topic());
-  QString title = "foobar";
-  ui.topicBar->setContents(title);
-
-  //ui.chatWidget->setStyleSheet("div { color: #777777; }");
-  //ui.chatWidget->setHtml("<style type=\"text/css\">.foo { color: #777777; } .bar { font-style: italic }</style>"
-  //                       "<div class=\"foo\">foo</div> <div class=\"bar\">bar</div> baz");
-  //ui.chatWidget->moveCursor(QTextCursor::End);
-  //ui.chatWidget->insertHtml("<div class=\"foo\"> brumm</div>");
-
-  ChatWidget *chatWidget;
-  if(!chatWidgets.contains(buf)) {
-    chatWidget = new ChatWidget(this);
-    QList<ChatLine *> lines;
-    QList<AbstractUiMsg *> msgs = buf->contents();
-    foreach(AbstractUiMsg *msg, msgs) {
-      lines.append((ChatLine *)(msg));
-    }
-    chatWidget->setContents(lines);
-    connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatWidget, SLOT(appendMsg(AbstractUiMsg *)));
-    connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), chatWidget, SLOT(prependMsg(AbstractUiMsg *)));
-    connect(buf, SIGNAL(topicSet(QString)), this, SLOT(setTopic(QString)));
-    //connect(buf, SIGNAL(ownNickSet(QString)), this, SLOT(setOwnNick(QString)));
-    ui.stack->addWidget(chatWidget);
-    chatWidgets.insert(buf, chatWidget);
-    chatWidget->setFocusProxy(ui.inputLine);
-  } else chatWidget = chatWidgets[buf];
-  ui.inputLine->show(); ui.topicBar->show();
-  ui.stack->setCurrentWidget(chatWidget);
-  ui.inputLine->setFocus();
-  currentBuffer = buf;
-  
-}
-*/
-
-void MainWidget::userInput(const QString &input) {
-  if(!currentBufferInfo.isValid()) return;
-  QStringList lines = input.split('\n', QString::SkipEmptyParts);
-  foreach(QString msg, lines) {
-    if(msg.isEmpty()) continue;
-    emit userInput(currentBufferInfo, msg);
-  }
-  ui.inputLine->clear();
-}
diff --git a/dev-notes/obsolete/qtopia/mainwidget.h b/dev-notes/obsolete/qtopia/mainwidget.h
deleted file mode 100644 (file)
index 0c83ea0..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef _MAINWIDGET_H_
-#define _MAINWIDGET_H_
-
-#include "ui_mainwidget.h"
-
-#include "abstractbuffercontainer.h"
-#include "bufferinfo.h"
-
-class Buffer;
-class ChatWidget;
-
-class MainWidget : public AbstractBufferContainer {
-  Q_OBJECT
-
-  public:
-    MainWidget(QWidget *parent);
-    ~MainWidget();
-
-  signals:
-    void userInput(const BufferInfo &, const QString &);
-
-  protected:
-    virtual AbstractChatView *createChatView(BufferId);
-    virtual void removeChatView(BufferId);
-
-  protected slots:
-    virtual void showChatView(BufferId);
-
-  private slots:
-    void userInput(const QString &);
-
-  private:
-    Ui::MainWidget ui;
-    QHash<BufferId, ChatWidget *> _chatViews;
-    BufferInfo currentBufferInfo;
-
-};
-
-
-#endif
diff --git a/dev-notes/obsolete/qtopia/nicklistwidget.cpp b/dev-notes/obsolete/qtopia/nicklistwidget.cpp
deleted file mode 100644 (file)
index 5aa5c2d..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#include "nicklistwidget.h"
-
-#include "buffer.h"
-#include "nickview.h"
-
-// FIXME bring back nicks!
-
-NickListWidget::NickListWidget(QWidget *parent) : QDialog(parent) {
-  ui.setupUi(this);
-  setModal(true);
-  //setStyleSheet("background-color: rgba(220, 220, 255, 40%); color: rgb(0, 0, 0); font-size: 5pt;");
-
-
-}
-
-NickListWidget::~NickListWidget() {
-
-
-
-}
-
-void NickListWidget::setBuffer(BufferId id) {
-  if(!id.isValid()) {
-    ui.stackedWidget->setCurrentWidget(ui.emptyPage);
-    return;
-  }
-  /*
-  if(buf->bufferType() != Buffer::ChannelType) {
-    ui.stackedWidget->setCurrentWidget(ui.emptyPage);
-  } else {
-    if(nickViews.contains(buf)) {
-      ui.stackedWidget->setCurrentWidget(nickViews.value(buf));
-    } else {
-      NickView *view = new NickView(this);
-      view->setModel(buf->nickModel());
-      nickViews[buf] = view;
-      ui.stackedWidget->addWidget(view);
-      ui.stackedWidget->setCurrentWidget(view);
-      connect(buf, SIGNAL(destroyed(QObject *)), this, SLOT(bufferDestroyed(QObject *)));
-    }
-  }
-  */
-}
-
-void NickListWidget::reset() {
-  /*
-  foreach(NickView *view, nickViews.values()) {
-    ui.stackedWidget->removeWidget(view);
-    view->deleteLater();
-  }
-  nickViews.clear();
-  */
-}
-
-void NickListWidget::bufferDestroyed(QObject *buf) {
-  /*
-  if(nickViews.contains((Buffer *)buf)) {
-    NickView *view = nickViews.take((Buffer *)buf);
-    ui.stackedWidget->removeWidget(view);
-    view->deleteLater();
-  }
-  */
-}
-
diff --git a/dev-notes/obsolete/qtopia/nicklistwidget.h b/dev-notes/obsolete/qtopia/nicklistwidget.h
deleted file mode 100644 (file)
index 02ec4cb..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef _NICKLISTWIDGET_H_
-#define _NICKLISTWIDGET_H_
-
-#include <QDialog>
-
-#include "ui_nicklistwidget.h"
-
-class Buffer;
-class BufferId;
-class NickView;
-
-class NickListWidget : public QDialog {
-  Q_OBJECT
-
-  public:
-    NickListWidget(QWidget *parent = 0);
-    ~NickListWidget();
-
-  public slots:
-    void setBuffer(BufferId);
-    void reset();
-
-  private slots:
-    void bufferDestroyed(QObject *);
-
-  private:
-    Ui::NickListWidget ui;
-    QHash<Buffer *, NickView *> nickViews;
-
-};
-
-#endif
diff --git a/dev-notes/obsolete/qtopia/qtopiamainwin.cpp b/dev-notes/obsolete/qtopia/qtopiamainwin.cpp
deleted file mode 100644 (file)
index b927e72..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#include "qtopiamainwin.h"
-
-#include "networkmodel.h"
-#include "bufferviewwidget.h"
-#include "nicklistwidget.h"
-#include "chatline.h"
-#include "clientbacklogmanager.h"
-#include "coreconnectdlg.h"
-#include "global.h"
-#include "mainwidget.h"
-#include "message.h"
-#include "network.h"
-#include "qtopiaui.h"
-#include "signalproxy.h"
-
-#include "ui_aboutdlg.h"
-
-#include <Qtopia>
-#include <QSoftMenuBar>
-
-// This constructor is the first thing to be called for a Qtopia app, so we do the init stuff
-// here (rather than in a main.cpp).
-QtopiaMainWin::QtopiaMainWin(QWidget *parent, Qt::WFlags flags) : QMainWindow(parent, flags) {
-  Global::registerMetaTypes();
-
-#include "../../version.inc"
-
-  Global::runMode = Global::ClientOnly;
-  Global::defaultPort = 4242;
-  Global::DEBUG = true;
-
-  Network::setDefaultCodecForServer("ISO-8859-1");
-  Network::setDefaultCodecForEncoding("UTF-8");
-  Network::setDefaultCodecForDecoding("ISO-8859-15");
-
-  QCoreApplication::setOrganizationDomain("quassel-irc.org");
-  QCoreApplication::setApplicationName("Quassel IRC");
-  QCoreApplication::setOrganizationName("Quassel Project");
-
-  QtopiaUi *gui = new QtopiaUi(this);
-  Client::init(gui);
-
-  setWindowTitle("Quassel IRC");
-  setWindowIcon(QIcon(":icons/quassel-icon.png"));
-  setWindowIconText("Quassel IRC");
-
-  mainWidget = new MainWidget(this);
-  mainWidget->setModel(Client::bufferModel());
-  mainWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
-  setCentralWidget(mainWidget);
-
-  toolBar = new QToolBar(this);
-  toolBar->setIconSize(QSize(16, 16));
-  toolBar->setWindowTitle(tr("Show Toolbar"));
-  addToolBar(toolBar);
-
-  //bufferViewWidget = new BufferViewWidget(this);
-  bufferViewWidget = 0;  // delayed creation to avoid QPainter warnings
-  nickListWidget = new NickListWidget(this);
-
-  connect(mainWidget, SIGNAL(currentChanged(BufferId)), this, SLOT(showBuffer(BufferId)));
-
-  setupActions();
-
-  init();
-  //gui->init();
-
-}
-
-// at this point, client is fully initialized
-void QtopiaMainWin::init() {
-  showMaximized();
-  CoreConnectDlg *dlg = new CoreConnectDlg(this);
-  //setCentralWidget(dlg);
-  dlg->showMaximized();
-  dlg->exec();
-}
-
-QtopiaMainWin::~QtopiaMainWin() {
-
-
-}
-
-void QtopiaMainWin::closeEvent(QCloseEvent *event) {
-#ifndef DEVELMODE
-  QMessageBox *box = new QMessageBox(QMessageBox::Question, tr("Quit Quassel IRC?"), tr("Do you really want to quit Quassel IRC?"),
-                                     QMessageBox::Cancel, this);
-  QAbstractButton *quit = box->addButton(tr("Quit"), QMessageBox::AcceptRole);
-  box->exec();
-  if(box->clickedButton() == quit) event->accept();
-  else event->ignore();
-  box->deleteLater();
-#else
-  event->accept();
-#endif
-}
-
-void QtopiaMainWin::setupActions() {
-  showBuffersAction = toolBar->addAction(QIcon(":icon/options-hide"), tr("Show Buffers"), this, SLOT(showBufferView()));  // FIXME provide real icon
-  showNicksAction = toolBar->addAction(QIcon(":icon/list"), tr("Show Nicks"), this, SLOT(showNickList()));
-  showNicksAction->setEnabled(false);
-
-  QMenu *menu = new QMenu(this);
-  menu->addAction(showBuffersAction);
-  menu->addAction(showNicksAction);
-  menu->addSeparator();
-  menu->addAction(toolBar->toggleViewAction());
-  menu->addSeparator();
-  menu->addAction(tr("About..."), this, SLOT(showAboutDlg()));
-
-  QSoftMenuBar::addMenuTo(this, menu);
-}
-
-void QtopiaMainWin::connectedToCore() {
-  foreach(BufferInfo id, Client::allBufferInfos()) {
-    Client::backlogManager()->requestBacklog(id.bufferId(), 500, -1);
-  }
-}
-
-void QtopiaMainWin::disconnectedFromCore() {
-
-
-}
-
-AbstractUiMsg *QtopiaMainWin::layoutMsg(const Message &msg) {
-  return new ChatLine(msg);
-  //return 0;
-}
-
-void QtopiaMainWin::showBuffer(BufferId id) {
-  nickListWidget->setBuffer(id);
-  Buffer *b = Client::buffer(id);
-  //showNicksAction->setEnabled(b && b->bufferInfo().type() == BufferInfo::ChannelBuffer);  FIXME enable again when we have a nicklist!
-
-}
-
-void QtopiaMainWin::showBufferView() {
-  if(!bufferViewWidget) {
-    bufferViewWidget = new BufferViewWidget(this);
-    connect(mainWidget, SIGNAL(currentChanged(BufferId)), bufferViewWidget, SLOT(accept()));
-  }
-  bufferViewWidget->showMaximized();
-}
-
-void QtopiaMainWin::showNickList() {
-  nickListWidget->showMaximized();
-}
-
-void QtopiaMainWin::showAboutDlg() {
-  QDialog *dlg = new QDialog(this);
-  dlg->setAttribute(Qt::WA_DeleteOnClose);
-  Ui::AboutDlg ui;
-  ui.setupUi(dlg);
-  dlg->showMaximized();
-}
-
diff --git a/dev-notes/obsolete/qtopia/qtopiamainwin.h b/dev-notes/obsolete/qtopia/qtopiamainwin.h
deleted file mode 100644 (file)
index 1a59a58..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef _QTOPIAMAINWIN_H_
-#define _QTOPIAMAINWIN_H_
-
-#include <QtGui>
-
-#include "client.h"
-
-class BufferViewWidget;
-class MainWidget;
-class NickListWidget;
-
-class QtopiaMainWin : public QMainWindow {
-  Q_OBJECT
-
-  public:
-    QtopiaMainWin(QWidget *parent = 0, Qt::WFlags f = 0);
-    ~QtopiaMainWin();
-
-    AbstractUiMsg *layoutMsg(const Message &);
-
-  protected slots:
-    void connectedToCore();
-    void disconnectedFromCore();
-
-  signals:
-    void connectToCore(const QVariantMap &connInfo);
-    void disconnectFromCore();
-    void requestBacklog(BufferInfo, QVariant, QVariant);
-
-  private slots:
-    void showBuffer(BufferId);
-    void showBufferView();
-    void showNickList();
-    void showAboutDlg();
-
-  protected:
-    void closeEvent(QCloseEvent *);
-
-  private:
-    void init();
-    void setupActions();
-
-    MainWidget *mainWidget;
-    QToolBar *toolBar;
-    QAction *showBuffersAction, *showNicksAction;
-    BufferViewWidget *bufferViewWidget;
-    NickListWidget *nickListWidget;
-
-    friend class QtopiaUi;
-};
-
-#endif
diff --git a/dev-notes/obsolete/qtopia/qtopiaui.cpp b/dev-notes/obsolete/qtopia/qtopiaui.cpp
deleted file mode 100644 (file)
index fa856b4..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#include "qtopiaui.h"
-#include "qtopiamainwin.h"
-#include "qtopiauistyle.h"
-
-QtopiaUiStyle *QtopiaUi::_style;
-
-QtopiaUi::QtopiaUi(QtopiaMainWin *mw) : AbstractUi(), mainWin(mw) {
-  _style = new QtopiaUiStyle();
-  connect(mainWin, SIGNAL(connectToCore(const QVariantMap &)), this, SIGNAL(connectToCore(const QVariantMap &)));
-  connect(mainWin, SIGNAL(disconnectFromCore()), this, SIGNAL(disconnectFromCore()));
-
-
-}
-
-QtopiaUi::~QtopiaUi() {
-  delete _style;
-  delete mainWin;
-
-}
-
-void QtopiaUi::init() {
-
-}
-
-QtopiaUiStyle *QtopiaUi::style() {
-  return _style;
-}
-
-AbstractUiMsg *QtopiaUi::layoutMsg(const Message &msg) {
-  return mainWin->layoutMsg(msg);
-}
-
-void QtopiaUi::connectedToCore() {
-  mainWin->connectedToCore();
-}
-
-void QtopiaUi::disconnectedFromCore() {
-  mainWin->disconnectedFromCore();
-}
diff --git a/dev-notes/obsolete/qtopia/qtopiaui.h b/dev-notes/obsolete/qtopia/qtopiaui.h
deleted file mode 100644 (file)
index f1629fd..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef _QTOPIAGUI_H_
-#define _QTOPIAGUI_H_
-
-#include "quasselui.h"
-
-class QtopiaMainWin;
-class QtopiaUiStyle;
-
-//! This class encapsulates Quassel's GUI for Qtopia.
-class QtopiaUi : public AbstractUi {
-  Q_OBJECT
-
-  public:
-    QtopiaUi(QtopiaMainWin *mainWin);
-    ~QtopiaUi();
-    void init();
-    AbstractUiMsg *layoutMsg(const Message &);
-
-    static QtopiaUiStyle *style();
-
-  protected slots:
-    void connectedToCore();
-    void disconnectedFromCore();
-
-  private:
-    QtopiaMainWin *mainWin;
-    static QtopiaUiStyle *_style;
-};
-
-
-#endif
diff --git a/dev-notes/obsolete/qtopia/qtopiauistyle.cpp b/dev-notes/obsolete/qtopia/qtopiauistyle.cpp
deleted file mode 100644 (file)
index ba433dd..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#include "qtopiauistyle.h"
-#include "settings.h"
-
-QtopiaUiStyle::QtopiaUiStyle() : UiStyle("QtopiaUiStyle") {
-
-  QTextCharFormat def;
-  def.setForeground(QBrush("#000000"));
-  def.setFont(QFont("Verdana",5));
-  setFormat(None, def, Settings::Default);
-
-  // We need to just set our internal formats; everything else is done by the base class...
-
-  // Internal message formats
-
-  QTextCharFormat plainMsg;
-  plainMsg.setForeground(QBrush("#000000"));
-  setFormat(PlainMsg, plainMsg, Settings::Default);
-
-  QTextCharFormat notice;
-  notice.setForeground(QBrush("#000080"));
-  setFormat(NoticeMsg, notice, Settings::Default);
-
-  QTextCharFormat server;
-  server.setForeground(QBrush("#000080"));
-  setFormat(ServerMsg, server, Settings::Default);
-
-  QTextCharFormat error;
-  error.setForeground(QBrush("#ff0000"));
-  setFormat(ErrorMsg, error, Settings::Default);
-
-  QTextCharFormat join;
-  join.setForeground(QBrush("#008000"));
-  setFormat(JoinMsg, join, Settings::Default);
-
-  QTextCharFormat part;
-  part.setForeground(QBrush("#ff0000"));
-  setFormat(PartMsg, part, Settings::Default);
-
-  QTextCharFormat quit;
-  quit.setForeground(QBrush("#ff0000"));
-  setFormat(QuitMsg, quit, Settings::Default);
-
-  QTextCharFormat kick;
-  kick.setForeground(QBrush("#ff0000"));
-  setFormat(KickMsg, kick, Settings::Default);
-
-  QTextCharFormat nren;
-  nren.setForeground(QBrush("#6a5acd"));
-  setFormat(RenameMsg, nren, Settings::Default);
-
-  QTextCharFormat mode;
-  mode.setForeground(QBrush("#4682b4"));
-  setFormat(ModeMsg, mode, Settings::Default);
-
-  QTextCharFormat action;
-  action.setFontItalic(true);
-  action.setForeground(QBrush("#8b008b"));
-  setFormat(ActionMsg, action, Settings::Default);
-
-  // Internal message element formats
-  QTextCharFormat ts;
-  ts.setForeground(QBrush("#808080"));
-  setFormat(Timestamp, ts, Settings::Default);
-
-  QTextCharFormat sender;
-  sender.setAnchor(true);
-  sender.setForeground(QBrush("#000080"));
-  setFormat(Sender, sender, Settings::Default);
-
-  QTextCharFormat nick;
-  nick.setAnchor(true);
-  nick.setFontWeight(QFont::Bold);
-  setFormat(Nick, nick, Settings::Default);
-
-  QTextCharFormat hostmask;
-  hostmask.setFontItalic(true);
-  setFormat(Hostmask, hostmask, Settings::Default);
-
-  QTextCharFormat channel;
-  channel.setAnchor(true);
-  channel.setFontWeight(QFont::Bold);
-  setFormat(ChannelName, channel, Settings::Default);
-
-  QTextCharFormat flags;
-  flags.setFontWeight(QFont::Bold);
-  setFormat(ModeFlags, flags, Settings::Default);
-
-  QTextCharFormat url;
-  url.setFontUnderline(true);
-  url.setAnchor(true);
-  setFormat(Url, url, Settings::Default);
-
-}
-
-QtopiaUiStyle::~QtopiaUiStyle() {}
diff --git a/dev-notes/obsolete/qtopia/quasseltopia.desktop b/dev-notes/obsolete/qtopia/quasseltopia.desktop
deleted file mode 100644 (file)
index e1ca46d..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[Translation]
-#File=example-nct
-#Context=QuasselIRC
-
-[Desktop Entry]
-Comment[]=A Next-Gen IRC Client
-Exec=quasseltopia
-Icon=/pics/quasselirc/qirc-icon.png
-Type=Application
-Name[]=QuasselTopia
diff --git a/dev-notes/obsolete/qtopia/topicbar.cpp b/dev-notes/obsolete/qtopia/topicbar.cpp
deleted file mode 100644 (file)
index 724817f..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#include <QtGui>
-
-#include "topicbar.h"
-#include "client.h"
-
-
-TopicBar::TopicBar(QWidget *parent) : QPushButton(parent) {
-  setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
-
-  // Define the font and calculate the metrics for it
-  topicFont = font();
-  topicFont.setPointSize(5);
-
-  // frameWidth = style()->pixelMetric(QStyle::PM_ButtonMargin); // Nice idea, but Qtopia's buttons are just too large...
-  frameWidth = 3; // so we hardcode a more reasonable framewidth than 7
-  setFixedHeight(QFontMetrics(topicFont).height() + 2*frameWidth);
-
-  textWidth = 0;
-  fillText = " *** ";
-  oneshot = true;
-  timer = new QTimer(this);
-  timer->setInterval(25);
-  connect(timer, SIGNAL(timeout()), this, SLOT(updateOffset()));
-  connect(this, SIGNAL(clicked()), this, SLOT(startScrolling()));
-
-  _model = Client::bufferModel();
-  connect(_model, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
-          this, SLOT(dataChanged(QModelIndex, QModelIndex)));
-
-  _selectionModel = Client::bufferModel()->standardSelectionModel();
-  connect(_selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-          this, SLOT(currentChanged(QModelIndex, QModelIndex)));
-}
-
-TopicBar::~TopicBar() {
-
-
-}
-
-void TopicBar::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
-  Q_UNUSED(previous);
-  setContents(current.sibling(current.row(), 1).data().toString());
-}
-
-void TopicBar::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
-  QItemSelectionRange changedArea(topLeft, bottomRight);
-  QModelIndex currentTopicIndex = _selectionModel->currentIndex().sibling(_selectionModel->currentIndex().row(), 1);
-  if(changedArea.contains(currentTopicIndex))
-    setContents(currentTopicIndex.data().toString());
-};
-
-void TopicBar::resizeEvent(QResizeEvent *event) {
-  QPushButton::resizeEvent(event);
-  calcTextMetrics();
-}
-
-void TopicBar::calcTextMetrics() {
-  int w = width() - 2*frameWidth;
-  QRect boundingRect = QFontMetrics(topicFont).boundingRect(text);
-  textWidth = boundingRect.width();
-  if(textWidth <= w) {
-    offset = 0; fillTextStart = -1; secondTextStart = -1;
-    displayText = text;
-    timer->stop();
-  } else {
-    fillTextStart = textWidth;
-    boundingRect = QFontMetrics(topicFont).boundingRect(fillText);
-    secondTextStart = fillTextStart + boundingRect.width();
-    displayText = QString("%1%2%1").arg(text).arg(fillText);
-    offset = 0;
-    //timer->start();  // uncomment this to get autoscroll rather than on-demand
-  }
-}
-
-// TODO catch resizeEvent for scroll settings
-void TopicBar::setContents(QString t, bool _oneshot) {
-  text = t; oneshot = _oneshot;
-  calcTextMetrics();
-}
-
-void TopicBar::paintEvent(QPaintEvent *event) {
-  QPushButton::paintEvent(event);
-
-  QPainter painter(this);
-  painter.setFont(topicFont);
-  painter.setClipRect(frameWidth, frameWidth, rect().width() - 2*frameWidth, rect().height() - 2*frameWidth);
-  painter.drawText(QPoint(-offset + frameWidth, QFontMetrics(topicFont).ascent() + frameWidth), displayText);
-
-}
-
-void TopicBar::updateOffset() {
-  offset+=1;
-  if(offset >= secondTextStart) {
-    offset = 0;
-    if(oneshot) timer->stop(); // only scroll once!
-  }
-  update();
-}
-
-void TopicBar::startScrolling() {
-  if(displayText.length() > text.length()) {
-    //oneshot = false;
-    timer->start();
-  }
-}
-
-void TopicBar::stopScrolling() {
-  oneshot = true;
-}
diff --git a/dev-notes/obsolete/qtopia/topicbar.h b/dev-notes/obsolete/qtopia/topicbar.h
deleted file mode 100644 (file)
index 9f00f53..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef TOPICBAR_H_
-#define TOPICBAR_H_
-
-#include <QPushButton>
-#include <QTimeLine>
-
-#include "buffermodel.h"
-
-class QPixmap;
-class QTimer;
-
-class TopicBar : public QPushButton {
-  Q_OBJECT
-
-  public:
-    TopicBar(QWidget *parent = 0);
-    ~TopicBar();
-
-  public slots:
-    void setContents(QString text, bool oneshot = true);
-    void startScrolling();
-    void stopScrolling();
-
-  protected:
-    virtual void paintEvent(QPaintEvent *event);
-    virtual void resizeEvent (QResizeEvent *event);
-    
-
-  private slots:
-    void updateOffset();
-    void dataChanged(const QModelIndex &, const QModelIndex &);
-    void currentChanged(const QModelIndex &, const QModelIndex &);
-
-  private:
-    void calcTextMetrics();
-
-    BufferModel *_model;
-    QItemSelectionModel *_selectionModel;
-    
-    QTimer *timer;
-    int offset;
-    int fillTextStart, secondTextStart;
-    QString text, displayText;
-    QString fillText;
-    QFont topicFont;
-    int frameWidth;
-    int textWidth;
-    bool oneshot;
-};
-
-
-#endif
diff --git a/dev-notes/obsolete/qtopia/ui/aboutdlg.ui b/dev-notes/obsolete/qtopia/ui/aboutdlg.ui
deleted file mode 100644 (file)
index 7caac93..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<ui version="4.0" >
- <class>AboutDlg</class>
- <widget class="QDialog" name="AboutDlg" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>240</width>
-    <height>271</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>About</string>
-  </property>
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Trebuchet MS'; font-size:10pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Quassel IRC&lt;/span>&lt;/p>
-&lt;p style=" 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;">&lt;span style=" font-size:8pt; font-weight:400;">mobile edition&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:5pt;"> &lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;">(C) 2005-2007 by&lt;/p>
-&lt;p style=" 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;">The Quassel IRC Team&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;">Manuel Nickschas&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;">Marcus Eggenberger&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;">Marco Genise&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;">&lt;span style=" font-size:4pt;"> &lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;">&amp;lt;http://quassel-irc.org&amp;gt;&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;">&amp;lt;devel@quassel-irc.org&amp;gt;&lt;/p>&lt;/body>&lt;/html></string>
-     </property>
-     <property name="alignment" >
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="wordWrap" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/dev-notes/obsolete/qtopia/ui/bufferviewwidget.ui b/dev-notes/obsolete/qtopia/ui/bufferviewwidget.ui
deleted file mode 100644 (file)
index c387cb0..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<ui version="4.0" >
- <class>BufferViewWidget</class>
- <widget class="QDialog" name="BufferViewWidget" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>240</width>
-    <height>286</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Select Buffer</string>
-  </property>
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QTabWidget" name="tabWidget" >
-     <property name="tabPosition" >
-      <enum>QTabWidget::South</enum>
-     </property>
-     <property name="tabShape" >
-      <enum>QTabWidget::Rounded</enum>
-     </property>
-     <property name="currentIndex" >
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab" >
-      <attribute name="title" >
-       <string>Tab 1</string>
-      </attribute>
-      <layout class="QVBoxLayout" />
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/dev-notes/obsolete/qtopia/ui/coreaccounteditdlg.ui b/dev-notes/obsolete/qtopia/ui/coreaccounteditdlg.ui
deleted file mode 100644 (file)
index edd642e..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<ui version="4.0" >
- <class>CoreAccountEditDlg</class>
- <widget class="QDialog" name="CoreAccountEditDlg" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>193</width>
-    <height>241</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Edit Core Account</string>
-  </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <item>
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="portLabel" >
-       <property name="text" >
-        <string>Port:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="hostLabel" >
-       <property name="text" >
-        <string>Host:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0" >
-      <widget class="QLabel" name="passwdLabel" >
-       <property name="text" >
-        <string>Password:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" >
-      <widget class="QLineEdit" name="hostEdit" />
-     </item>
-     <item row="0" column="1" >
-      <widget class="QLineEdit" name="accountEdit" />
-     </item>
-     <item row="3" column="1" >
-      <widget class="QLineEdit" name="userEdit" />
-     </item>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="accountLabel" >
-       <property name="text" >
-        <string>Account:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1" >
-      <widget class="QLineEdit" name="passwdEdit" >
-       <property name="echoMode" >
-        <enum>QLineEdit::Password</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1" >
-      <widget class="QSpinBox" name="port" >
-       <property name="minimum" >
-        <number>1024</number>
-       </property>
-       <property name="maximum" >
-        <number>65535</number>
-       </property>
-       <property name="value" >
-        <number>4242</number>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0" >
-      <widget class="QLabel" name="userLabel" >
-       <property name="text" >
-        <string>User:</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>accountEdit</tabstop>
-  <tabstop>hostEdit</tabstop>
-  <tabstop>port</tabstop>
-  <tabstop>userEdit</tabstop>
-  <tabstop>passwdEdit</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/dev-notes/obsolete/qtopia/ui/coreconnectdlg.ui b/dev-notes/obsolete/qtopia/ui/coreconnectdlg.ui
deleted file mode 100644 (file)
index 330ad55..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-<ui version="4.0" >
- <class>CoreConnectDlg</class>
- <widget class="QDialog" name="CoreConnectDlg" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>188</width>
-    <height>283</height>
-   </rect>
-  </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>0</hsizetype>
-    <vsizetype>0</vsizetype>
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle" >
-   <string>Select Core Account</string>
-  </property>
-  <property name="windowIcon" >
-   <iconset/>
-  </property>
-  <property name="modal" >
-   <bool>false</bool>
-  </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="label_6" >
-     <property name="text" >
-      <string>Available Quassel Core accounts:</string>
-     </property>
-     <property name="textFormat" >
-      <enum>Qt::PlainText</enum>
-     </property>
-     <property name="wordWrap" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QListWidget" name="accountList" />
-     </item>
-     <item>
-      <layout class="QVBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QToolButton" name="newAccount" >
-         <property name="text" >
-          <string>...</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QToolButton" name="delAccount" >
-         <property name="text" >
-          <string>...</string>
-         </property>
-         <property name="icon" >
-          <iconset resource="../../images/icons.qrc" >:/default/edit_remove.png</iconset>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QToolButton" name="editAccount" >
-         <property name="text" >
-          <string>...</string>
-         </property>
-         <property name="icon" >
-          <iconset resource="../../images/icons.qrc" >:/default/edit.png</iconset>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QPushButton" name="doConnect" >
-     <property name="text" >
-      <string>Connect</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>accountList</tabstop>
-  <tabstop>doConnect</tabstop>
-  <tabstop>newAccount</tabstop>
-  <tabstop>delAccount</tabstop>
-  <tabstop>editAccount</tabstop>
-  <tabstop>delAccount</tabstop>
-  <tabstop>editAccount</tabstop>
-  <tabstop>accountList</tabstop>
-  <tabstop>newAccount</tabstop>
- </tabstops>
- <resources>
-  <include location="../../images/icons.qrc" />
- </resources>
- <connections/>
-</ui>
diff --git a/dev-notes/obsolete/qtopia/ui/coreconnectprogressdlg.ui b/dev-notes/obsolete/qtopia/ui/coreconnectprogressdlg.ui
deleted file mode 100644 (file)
index 909f822..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<ui version="4.0" >
- <class>CoreConnectProgressDlg</class>
- <widget class="QDialog" name="CoreConnectProgressDlg" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>168</width>
-    <height>212</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Connection Progress</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
-   <item>
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>Connecting to core...</string>
-     </property>
-     <property name="alignment" >
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="wordWrap" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QGridLayout" name="gridLayout" >
-     <item row="0" column="0" >
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
-        <string>Session</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1" >
-      <widget class="QProgressBar" name="sessionProgress" >
-       <property name="value" >
-        <number>0</number>
-       </property>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="format" >
-        <string>%p%</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
-        <string>Networks</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" >
-      <widget class="QProgressBar" name="networksProgress" >
-       <property name="value" >
-        <number>24</number>
-       </property>
-       <property name="format" >
-        <string>%p%</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="label_4" >
-       <property name="text" >
-        <string>Channels</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1" >
-      <widget class="QProgressBar" name="channelsProgress" >
-       <property name="value" >
-        <number>24</number>
-       </property>
-       <property name="format" >
-        <string>%p%</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0" >
-      <widget class="QLabel" name="label_5" >
-       <property name="text" >
-        <string>Users</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1" >
-      <widget class="QProgressBar" name="ircUsersProgress" >
-       <property name="value" >
-        <number>24</number>
-       </property>
-       <property name="format" >
-        <string>%p%</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>138</width>
-       <height>51</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/dev-notes/obsolete/qtopia/ui/editcoreacctdlg.ui b/dev-notes/obsolete/qtopia/ui/editcoreacctdlg.ui
deleted file mode 100644 (file)
index 92207ea..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<ui version="4.0" >
- <class>EditCoreAcctDlg</class>
- <widget class="QDialog" name="EditCoreAcctDlg" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>193</width>
-    <height>241</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Edit Core Account</string>
-  </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item>
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="portLabel" >
-       <property name="text" >
-        <string>Port:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="hostLabel" >
-       <property name="text" >
-        <string>Host:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0" >
-      <widget class="QLabel" name="passwdLabel" >
-       <property name="text" >
-        <string>Password:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" >
-      <widget class="QLineEdit" name="hostEdit" />
-     </item>
-     <item row="0" column="1" >
-      <widget class="QLineEdit" name="accountEdit" />
-     </item>
-     <item row="3" column="1" >
-      <widget class="QLineEdit" name="userEdit" />
-     </item>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="accountLabel" >
-       <property name="text" >
-        <string>Account:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1" >
-      <widget class="QLineEdit" name="passwdEdit" >
-       <property name="echoMode" >
-        <enum>QLineEdit::Password</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1" >
-      <widget class="QSpinBox" name="port" >
-       <property name="maximum" >
-        <number>65535</number>
-       </property>
-       <property name="minimum" >
-        <number>1024</number>
-       </property>
-       <property name="value" >
-        <number>4242</number>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0" >
-      <widget class="QLabel" name="userLabel" >
-       <property name="text" >
-        <string>User:</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>accountEdit</tabstop>
-  <tabstop>hostEdit</tabstop>
-  <tabstop>port</tabstop>
-  <tabstop>userEdit</tabstop>
-  <tabstop>passwdEdit</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/dev-notes/obsolete/qtopia/ui/mainwidget.ui b/dev-notes/obsolete/qtopia/ui/mainwidget.ui
deleted file mode 100644 (file)
index a4c192a..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-<ui version="4.0" >
- <class>MainWidget</class>
- <widget class="QWidget" name="MainWidget" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>240</width>
-    <height>320</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="TopicBar" name="topicBar" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="font" >
-      <font>
-       <pointsize>15</pointsize>
-      </font>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QStackedWidget" name="stack" >
-     <property name="currentIndex" >
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="page" >
-      <property name="styleSheet" >
-       <string>background-color: rgba(220, 220, 255, 40%)</string>
-      </property>
-      <layout class="QVBoxLayout" >
-       <item>
-        <widget class="QLabel" name="label" >
-         <property name="text" >
-          <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Trebuchet MS'; font-size:10pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:29pt; color:#00008b;">Quassel IRC&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:29pt; color:#7fff00;">&lt;span style=" font-size:10pt; color:#00008b;">mobile edition&lt;/span>&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:29pt; color:#483d8b;">&lt;span style=" font-size:6pt; color:#000000;">Chat comfortably. Anywhere.&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
-         </property>
-         <property name="scaledContents" >
-          <bool>true</bool>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="InputLine" name="inputLine" />
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>TopicBar</class>
-   <extends>QPushButton</extends>
-   <header>topicbar.h</header>
-  </customwidget>
-  <customwidget>
-   <class>InputLine</class>
-   <extends>QLineEdit</extends>
-   <header>inputline.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>inputLine</tabstop>
-  <tabstop>topicBar</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/dev-notes/obsolete/qtopia/ui/nicklistwidget.ui b/dev-notes/obsolete/qtopia/ui/nicklistwidget.ui
deleted file mode 100644 (file)
index 2287049..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<ui version="4.0" >
- <class>NickListWidget</class>
- <widget class="QDialog" name="NickListWidget" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>240</width>
-    <height>285</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Nicks in Channel</string>
-  </property>
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QStackedWidget" name="stackedWidget" >
-     <property name="currentIndex" >
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="emptyPage" />
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
index c77d97e..8da8e37 100644 (file)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="cs">
+<!DOCTYPE TS>
+<TS version="2.0" language="cs">
 <defaultcodec></defaultcodec>
 <context>
     <name></name>
     <message>
         <location filename="../src/common/message.h" line="68"/>
         <source>Day changed to %1</source>
-        <translation>A dnes máme:%1</translation>
+        <translation>A dnes máme: %1</translation>
     </message>
 </context>
 <context>
@@ -200,7 +201,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
@@ -1516,7 +1517,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="260"/>
         <source>&lt;div style=color:red;&gt;Connection to %1 failed!&lt;/div&gt;</source>
-        <translation type="unfinished">&lt;div style=color:red;&gt;Připojení k %1 selhalo!&lt;/div&gt;</translation>
+        <translation>&lt;div style=color:red;&gt;Připojení k %1 selhalo!&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="284"/>
@@ -1851,7 +1852,7 @@ SOME SPACE</source>
     <message>
         <location filename="../src/qtui/ui/debugconsole.ui" line="90"/>
         <source>Evaluate!</source>
-        <translation type="unfinished"></translation>
+        <translation>Posoudit!</translation>
     </message>
 </context>
 <context>
@@ -1872,47 +1873,47 @@ SOME SPACE</source>
     <message>
         <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulář</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="19"/>
         <source>Desktop Notification (via D-Bus)</source>
-        <translation type="unfinished"></translation>
+        <translation>Oznamovaní (skrze D-Bus)</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="33"/>
         <source>Timeout:</source>
-        <translation type="unfinished"></translation>
+        <translation>Časová prodleva:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="46"/>
         <source> s</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="76"/>
         <source>Position hint:</source>
-        <translation type="unfinished"></translation>
+        <translation>Pozice oznámení:</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="102"/>
         <source> px</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="89"/>
         <source>X: </source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="105"/>
         <source>Y: </source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="130"/>
         <source>Queue unread notifications</source>
-        <translation type="unfinished"></translation>
+        <translation>Řadit nepřečtená oznámení</translation>
     </message>
 </context>
 <context>
@@ -2106,47 +2107,47 @@ SOME SPACE</source>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
         <source>Behaviour</source>
-        <translation type="unfinished"></translation>
+        <translation>Chování</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="32"/>
         <source>Highlight</source>
-        <translation type="unfinished"></translation>
+        <translation>Zvýraznění</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="159"/>
         <source>this shouldn&apos;t be empty</source>
-        <translation type="unfinished"></translation>
+        <translation>toto by nemělo být prázdné</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.h" line="45"/>
         <source>highlight rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Pravidla zvýraznění</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulář</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="19"/>
         <source>Custom Highlights</source>
-        <translation type="unfinished"></translation>
+        <translation>Uživatelská zvýraznění</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="37"/>
         <source>RegEx</source>
-        <translation type="unfinished"></translation>
+        <translation>Regulerní výraz</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>Povolit</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="55"/>
@@ -2161,27 +2162,27 @@ SOME SPACE</source>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="85"/>
         <source>Highlight Nicks</source>
-        <translation type="unfinished"></translation>
+        <translation>Zvýrazňované přezdívky</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="91"/>
         <source>All nicks from identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Všechny přezdívky z identity</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="98"/>
         <source>Current nick</source>
-        <translation type="unfinished"></translation>
+        <translation>Současnou</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="108"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Žádnou</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="115"/>
         <source>Case sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>Citlivý na velikost písma</translation>
     </message>
 </context>
 <context>
@@ -3264,7 +3265,7 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="37"/>
@@ -3319,7 +3320,7 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="277"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="274"/>
@@ -3334,7 +3335,7 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="331"/>
         <source>Perform</source>
-        <translation type="unfinished"></translation>
+        <translation>Provést</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="334"/>
@@ -3360,7 +3361,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="379"/>
         <source>NickServ</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="396"/>
@@ -3453,7 +3454,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="569"/>
         <source> s</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="585"/>
@@ -3463,7 +3464,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="605"/>
         <source>Unlimited</source>
-        <translation type="unfinished"></translation>
+        <translation>Neomezeně</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="617"/>
@@ -3625,7 +3626,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <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="37"/>
@@ -3665,7 +3666,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingspages/servereditdlg.ui" line="162"/>
         <source>Do not change unless you&apos;re going to connect to a server not supporting SSLv3!</source>
-        <translation type="unfinished"></translation>
+        <translation>Tuto hodnotu měňte pouze za předpokladu, že se připojujete k serveru nepodporujícímu SSLv3!</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/servereditdlg.ui" line="166"/>
@@ -3705,12 +3706,12 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingspages/servereditdlg.ui" line="228"/>
         <source>Proxy Host:</source>
-        <translation type="unfinished"></translation>
+        <translation>Počítač:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/servereditdlg.ui" line="235"/>
         <source>localhost</source>
-        <translation>tento počítač (localhost)</translation>
+        <translation>localhost</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/servereditdlg.ui" line="266"/>
index 0d3c33d..33994c2 100644 (file)
@@ -19,7 +19,7 @@
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
         <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;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.</translation>
+        <translation type="obsolete">&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.</translation>
     </message>
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="63"/>
         <translation type="obsolete">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"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="17"/>
         <source>About Quassel</source>
         <translation>Über Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="61"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="59"/>
         <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;
@@ -53,7 +53,7 @@ p, li { white-space: pre-wrap; }
 &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.ui" line="75"/>
         <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;
@@ -64,22 +64,22 @@ p, li { white-space: pre-wrap; }
 &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="114"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="115"/>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="134"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="135"/>
         <source>A&amp;uthors</source>
         <translation>A&amp;utoren</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="154"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="155"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Unterstützer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="174"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="175"/>
         <source>&amp;Thanks To</source>
         <translation>&amp;Dank an</translation>
     </message>
@@ -91,16 +91,31 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="117"/>
         <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&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;Qt Software formerly known as 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;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s&lt;/dd&gt;</source>
-        <translation>Besonderen Dank geht an:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für großartige künstlerische Leistung und das Quassel Icon&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Dem Oxygen- Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für die meisten anderen Icons die in Quassel zu sehen sind&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software (früher: Trolltech)&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für Qt und Qtopia, und für die Unterstützung der Entwicklung von QuasselTopia auf Greenphones und mehr&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für die Aufnahme von Qt und für die Unterstützung der Entwicklung von Quassel Mobile für das N810&lt;/dd&gt;</translation>
+        <translation type="obsolete">Besonderen Dank geht an:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für großartige künstlerische Leistung und das Quassel Icon&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Dem Oxygen- Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für die meisten anderen Icons die in Quassel zu sehen sind&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software (früher: Trolltech)&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für Qt und Qtopia, und für die Unterstützung der Entwicklung von QuasselTopia auf Greenphones und mehr&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für die Aufnahme von Qt und für die Unterstützung der Entwicklung von Quassel Mobile für das N810&lt;/dd&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
+        <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 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;Ein moderner, dezentralisierter IRC-Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 durch das 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 ist dual-lizensiert &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; und &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Die meisten der Icons sind &amp;copy; durch das &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; und werden unter der &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt; benutzt.&lt;br&gt;&lt;br&gt;Bitte benutzen Sie &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; um Fehler zu melden.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="125"/>
+        <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/quassel-eye.png&quot;&gt;&amp;nbsp;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for the original Quassel icon - The All-Seeing Eye&lt;/dt&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/oxygen.png&quot;&gt;&amp;nbsp;&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 all the artwork you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/qt-logo-32.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software formerly known as 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;&lt;dt&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;&lt;img src=&quot;:/pics/nokia.png&quot;&gt;&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s&lt;/dd&gt;</source>
+        <translation>Besonderen Dank geht an:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/quassel-eye.png&quot;&gt;&amp;nbsp;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für großartige künstlerische Leistung und das Quassel Icon&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Dem Oxygen- Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für die meisten anderen Icons die in Quassel zu sehen sind&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/qt-logo-32.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software (früher: Trolltech)&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für Qt und Qtopia, und für die Unterstützung der Entwicklung von QuasselTopia auf Greenphones und mehr&lt;/dd&gt;&lt;dt&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;&lt;img src=&quot;:/pics/nokia.png&quot;&gt;&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;für die Aufnahme von Qt und für die Unterstützung der Entwicklung von Quassel Mobile für das N810&lt;/dd&gt;</translation>
     </message>
 </context>
 <context>
     <name>AbstractSqlStorage</name>
     <message>
-        <location filename="../src/core/abstractsqlstorage.cpp" line="103"/>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="104"/>
         <source>Installed Schema (version %1) is not up to date. Upgrading to version %2...</source>
         <translation>Installiertes Datenbankschema (version %1) is nicht aktuell. Aktualisiere auf version %2...</translation>
     </message>
+    <message>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="106"/>
+        <source>Upgrade failed...</source>
+        <translation>Upgrade fehlgeschlagen...</translation>
+    </message>
 </context>
 <context>
     <name>AliasesModel</name>
@@ -120,7 +135,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
         <source>Behaviour</source>
-        <translation>Verhalten</translation>
+        <translation type="obsolete">Verhalten</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
@@ -142,63 +157,176 @@ p, li { white-space: pre-wrap; }
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
+        <source>Misc</source>
+        <translation>Verschiedenes</translation>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="33"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="36"/>
         <source>Appearance</source>
         <translation>Erscheinungsbild</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="33"/>
         <source>General</source>
-        <translation>Allgemein</translation>
+        <translation type="obsolete">Allgemein</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="13"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="14"/>
         <source>Form</source>
         <translation>Formular</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
         <source>Client style:</source>
-        <translation>Client-Stil:</translation>
+        <translation type="obsolete">Client-Stil:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="31"/>
         <source>Language:</source>
-        <translation>Sprache:</translation>
+        <translation type="obsolete">Sprache:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="43"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
         <source>&lt;Original&gt;</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
         <source>Note: needs client restart for full effect!</source>
-        <translation>Hinweis: Erfordert Client-Neustart, damit sich alle Änderungen auswirken!</translation>
+        <translation type="obsolete">Hinweis: Erfordert Client-Neustart, damit sich alle Änderungen auswirken!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="38"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="46"/>
         <source>&lt;System Default&gt;</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="61"/>
         <source>Misc:</source>
-        <translation>Verschiedenes:</translation>
+        <translation type="obsolete">Verschiedenes:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="67"/>
         <source>Show Web Previews</source>
-        <translation>Vorschau von Weblinks aktivieren</translation>
+        <translation type="obsolete">Vorschau von Weblinks aktivieren</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="77"/>
         <source>Use Icons to represent away state of Users</source>
-        <translation>Zeige Abwesenheitsstatus von Benutzern mit Hilfe von Icons an</translation>
+        <translation type="obsolete">Zeige Abwesenheitsstatus von Benutzern mit Hilfe von Icons an</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="20"/>
+        <source>Client Style</source>
+        <translation>Client-Stil</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="26"/>
+        <source>Set application style</source>
+        <translation>Anwendungsstil ändern</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="36"/>
+        <source>Language</source>
+        <translation>Sprache</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="42"/>
+        <source>Set the application language. Requires restart!</source>
+        <translation>Sprache für die Anwendung ändern. Erfordert Neustart!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="62"/>
+        <source>Fonts</source>
+        <translation>Schriftarten</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="84"/>
+        <source>Set font for the main chat window and the chat monitor</source>
+        <translation>Schrift für das Chatfenster und den Chatmonitor auswählen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="71"/>
+        <source>Chat window:</source>
+        <translation>Chatfenster:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="189"/>
+        <source>Font</source>
+        <translation>Schrift</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="205"/>
+        <source>Choose...</source>
+        <translation>Wähle...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="132"/>
+        <source>Set font for channel and nick lists</source>
+        <translation>Schrift für Kanal- und Nickliste auswählen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="119"/>
+        <source>Channel list:</source>
+        <translation>Kanalliste::</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="180"/>
+        <source>Set font for the input line</source>
+        <translation>Schrift für die Eingabezeile auswählen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="167"/>
+        <source>Input line:</source>
+        <translation>Eingabezeile:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="215"/>
+        <source>Misc</source>
+        <translation>Verschiedenes</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="221"/>
+        <source>Show a website preview window when hovering the mouse over a web address</source>
+        <translation>Zeige eine Webseitenvorschau beim Hovern mit der Maus über eine Webadresse</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="224"/>
+        <source>Show previews of webpages on URL hover</source>
+        <translation>Zeige Vorschauen von Webseiten beim Hovern über URLs</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="234"/>
+        <source>Show status icons in channel and nick lists</source>
+        <translation>Zeige Statusicons in der Kanal- und Nickliste</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="237"/>
+        <source>Use icons in channel and nick lists</source>
+        <translation>Benutze Icons in der Kanal- und Nickliste</translation>
+    </message>
+</context>
+<context>
+    <name>AwayLogView</name>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="33"/>
+        <source>Away Log</source>
+        <translation>Abwesenheitslog</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="44"/>
+        <source>Show Network Name</source>
+        <translation>Zeige Netzwerkname</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="49"/>
+        <source>Show Buffer Name</source>
+        <translation>Zeige Fenstername</translation>
     </message>
 </context>
 <context>
@@ -206,7 +334,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
         <source>Behaviour</source>
-        <translation>Verhalten</translation>
+        <translation type="obsolete">Verhalten</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
@@ -219,37 +347,37 @@ p, li { white-space: pre-wrap; }
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="74"/>
         <source>Backlog Request Method:</source>
         <translation>Methode für Verlaufanforderung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="29"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="82"/>
         <source>Fixed Amount per Buffer</source>
         <translation>Fester Verlaufsspeicher pro Fenster</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="34"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="87"/>
         <source>Unread Messages per Buffer</source>
         <translation>Ungelesene Nachrichten pro Fenster</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="39"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="92"/>
         <source>Global Unread Messages</source>
         <translation>Globale ungelesene Nachrichten</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="77"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="122"/>
         <source>The simplest Requester. It fetches a fixed amount of lines for each buffer from the Backlog.</source>
         <translation>Die einfachste Methode: Einen feste Anzahl Zeilen werden für jedes Fenster angefordert.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="92"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="137"/>
         <source>amount of messages per buffer that are requested after the core connection has been established.</source>
         <translation>Anzahl der Nachrichten pro Fenster, die nach dem Core-Verbindungsaufbau angefordert werden.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="95"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="140"/>
         <source>Initial backlog amount:</source>
         <translation>Anfängliche Verlaufsgröße:</translation>
     </message>
@@ -258,27 +386,27 @@ p, li { white-space: pre-wrap; }
         <source>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
 
 You can also chose to fetch additional older chatlines to provide a better context.</source>
-        <translation>Diese Methode fordert ungelesene Nachrichten für jedes Fenster individuell an. Die Anzahl Zeilen kann für jedes Fenster einzeln begrenzt werden.
+        <translation type="obsolete">Diese Methode fordert ungelesene Nachrichten für jedes Fenster individuell an. Die Anzahl Zeilen kann für jedes Fenster einzeln begrenzt werden.
 
 Sie können außerdem weitere ältere Chatzeilen anfordern.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="294"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="341"/>
         <source>Maximum amount of messages to be fetched per buffer.</source>
         <translation>Maximale Anzahl Nachrichten, die pro Fenster angefordert werden.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="287"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="334"/>
         <source>Limit:</source>
         <translation>Begrenzung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="320"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="373"/>
         <source>Amount of messages to be fetched in addition to the unread messages. The Limit does not apply here.</source>
         <translation>Anzahl Nachrichten die zusätzlich zu den ungelesenen angefordert werden. Das Begrenzung wird hier nicht angewandt.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="313"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="366"/>
         <source>Additional Messages:</source>
         <translation>Zusätzliche Nachrichten:</translation>
     </message>
@@ -294,22 +422,22 @@ You can also chose to fetch additional older chatlines to provide a better conte
         <translation type="obsolete">Diese Methode fordert alle Nachrichten, die neuer als die älteste ungelesene Nachricht sind, an.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="284"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="331"/>
         <source>Maximum amount of messages to be fetched over all buffers.</source>
         <translation>Maximale Anzahl Nachrichten die für alle Fenster angefordert werden.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="370"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
         <source>Number of messages to be requested from the core when using scrolling up in the buffer view.</source>
         <translation>Anzahl der Nachrichten, die beim Zurückscrollen angefordert werden.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="373"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="24"/>
         <source>Dynamic backlog amount:</source>
         <translation>Dynamische Verlaufsgröße:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="264"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="311"/>
         <source>This requester fetches all messages newer than the oldest unread message for all buffers.
 
 Note: this requester is not recommended if you use hidden buffer or have inactive buffers (i.e.: no stale queries or channels).
@@ -323,6 +451,50 @@ Nützlich um den Verlauf zu limitieren und um schnellstmöglich Nachrichten anzu
 
 Sie können außerdem weitere (ältere) Verlaufszeilen anfordern um den Kontext zu wahren.</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
+        <source>Misc</source>
+        <translation>Verschiedenes</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="40"/>
+        <source>DynamicBacklogAmount</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="156"/>
+        <source>FixedBacklogAmount</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="198"/>
+        <source>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
+
+You can also choose to fetch additional older chatlines to provide a better context.</source>
+        <translation>Diese Methode fordert ungelesene Nachrichten für jedes Fenster individuell an. Die Anzahl Zeilen kann für jedes Fenster einzeln begrenzt werden.
+
+Sie können außerdem weitere ältere Chatzeilen anfordern.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="237"/>
+        <source>PerBufferUnreadBacklogLimit</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="269"/>
+        <source>PerBufferUnreadBacklogAdditional</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="353"/>
+        <source>GlobalUnreadBacklogLimit</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="385"/>
+        <source>GlobalUnreadBacklogAdditional</source>
+        <translation></translation>
+    </message>
 </context>
 <context>
     <name>BufferItem</name>
@@ -372,7 +544,7 @@ Sie können außerdem weitere (ältere) Verlaufszeilen anfordern um den Kontext
         <translation type="obsolete">Abwesenheitsmeldung: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="276"/>
+        <location filename="../src/client/networkmodel.cpp" line="297"/>
         <source>&lt;p&gt; %1 - %2 &lt;/p&gt;</source>
         <translation></translation>
     </message>
@@ -485,12 +657,12 @@ Sie können außerdem weitere (ältere) Verlaufszeilen anfordern um den Kontext
         <translation type="obsolete">Tageswechsel</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="222"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="256"/>
         <source>Merge buffers permanently?</source>
         <translation>Verbinde Fenster permanent?</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="223"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="257"/>
         <source>Do you want to merge the buffer &quot;%1&quot; permanently into buffer &quot;%2&quot;?
  This cannot be reversed!</source>
         <translation>Wollen Sie das Fenster &quot;%1&quot; permanent mit dem Fenster &quot;%2&quot; verbinden?
@@ -502,7 +674,7 @@ Diese Aktion kann nicht rückgängig gemacht werden!</translation>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="433"/>
         <source>All Buffers</source>
-        <translation>Alle Räume</translation>
+        <translation type="obsolete">Alle Räume</translation>
     </message>
 </context>
 <context>
@@ -518,30 +690,38 @@ Diese Aktion kann nicht rückgängig gemacht werden!</translation>
         <translation>Bitte geben Sie einen Namen für diese Ansicht ein:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="491"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="520"/>
         <source>Add Buffer View</source>
         <translation>Ansicht hinzufügen</translation>
     </message>
 </context>
+<context>
+    <name>BufferViewFilter</name>
+    <message>
+        <location filename="../src/uisupport/bufferviewfilter.cpp" line="54"/>
+        <source>Show / Hide buffers</source>
+        <translation>Zeige/Verstecke Fenster</translation>
+    </message>
+</context>
 <context>
     <name>BufferViewSettingsPage</name>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="35"/>
         <source>General</source>
-        <translation>Allgemein</translation>
+        <translation type="obsolete">Allgemein</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="35"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="36"/>
         <source>Buffer Views</source>
         <translation>Ansichten</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="326"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="342"/>
         <source>Delete Buffer View?</source>
         <translation>Ansicht löschen?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="327"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="343"/>
         <source>Do you really want to delete the buffer view &quot;%1&quot;?</source>
         <translation>Wollen Sie dieses Fenster &quot;%1&quot; wirklich löschen?</translation>
     </message>
@@ -586,65 +766,77 @@ Diese Aktion kann nicht rückgängig gemacht werden!</translation>
         <translation>Puffer begrenzen auf:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="115"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="119"/>
         <source>Status Buffers</source>
         <translation>Statusfenster</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="122"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="126"/>
         <source>Channel Buffers</source>
         <translation>Kanalpuffer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="129"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="133"/>
         <source>Query Buffers</source>
         <translation>Dialogpuffer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="139"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="143"/>
         <source>Hide inactive Buffers</source>
         <translation>Inaktive Puffer verstecken</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="146"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="150"/>
         <source>Add new Buffers automatically</source>
         <translation>Neue Puffer automatisch hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="153"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="157"/>
         <source>Sort alphabetically</source>
         <translation>Alphabetisch sortieren</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="160"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="164"/>
         <source>Minimum Activity:</source>
         <translation>Aktivitätsminimum:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="168"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="172"/>
         <source>No Activity</source>
         <translation>Keine Aktivität</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="173"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="177"/>
         <source>Other Activity</source>
         <translation>Andere Aktivitität</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="178"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="182"/>
         <source>New Message</source>
         <translation>Neue Meldung</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="183"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="187"/>
         <source>Highlight</source>
         <translation>Hervorhebung</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="209"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="213"/>
         <source>Preview:</source>
         <translation>Vorschau:</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="36"/>
+        <source>Appearance</source>
+        <translation>Erscheinungsbild</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="115"/>
+        <source>This option is not available when all Networks are visible.
+In this mode no separate status buffer is displayed.</source>
+        <translation>Diese Option ist nicht verfügbar wenn alle Netzwerke sichtbar sind.
+Keine separaten Statusfenster werden in diesem Modus angezeigt.</translation>
+    </message>
 </context>
 <context>
     <name>BufferViewWidget</name>
@@ -681,16 +873,6 @@ Diese Aktion kann nicht rückgängig gemacht werden!</translation>
 </context>
 <context>
     <name>BufferWidget</name>
-    <message>
-        <location filename="../src/qtui/ui/bufferwidget.ui" line="64"/>
-        <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;:/pics/quassel-large.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></translation>
-    </message>
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="72"/>
         <source>Enlarge Chat View</source>
@@ -719,7 +901,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="85"/>
         <source>Ctrl+0</source>
-        <translation>Strg+0</translation>
+        <translation type="obsolete">Strg+0</translation>
     </message>
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="73"/>
@@ -734,38 +916,43 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="84"/>
         <source>Zoom Original</source>
-        <translation>Zoom zurücksetzen</translation>
+        <translation type="obsolete">Zoom zurücksetzen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/bufferwidget.cpp" line="84"/>
+        <source>Actual Size</source>
+        <translation>Derzeitige Größe</translation>
     </message>
 </context>
 <context>
     <name>ChannelBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="425"/>
+        <location filename="../src/client/networkmodel.cpp" line="461"/>
         <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="428"/>
+        <location filename="../src/client/networkmodel.cpp" line="464"/>
         <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Benutzer:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="432"/>
+        <location filename="../src/client/networkmodel.cpp" line="468"/>
         <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Modus:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="444"/>
+        <location filename="../src/client/networkmodel.cpp" line="480"/>
         <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Thema:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="448"/>
+        <location filename="../src/client/networkmodel.cpp" line="484"/>
         <source>Not active &lt;br /&gt; Double-click to join</source>
         <translation>Nicht aktiv &lt;br /&gt; Doppelklick zum Beitreten</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="451"/>
+        <location filename="../src/client/networkmodel.cpp" line="487"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
         <translation>&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
@@ -825,7 +1012,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
         <source>General</source>
-        <translation>Allgemein</translation>
+        <translation type="obsolete">Allgemein</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
@@ -871,7 +1058,7 @@ p, li { white-space: pre-wrap; }
 &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;Operation modes:&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-weight:600;&quot;&gt;&lt;span style=&quot; font-weight:400; text-decoration: underline;&quot;&gt;Opt-In:&lt;/span&gt; &lt;span style=&quot; font-weight:400;&quot;&gt;Only buffers on the right side are shown in chatmonitor&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; text-decoration: underline;&quot;&gt;Opt-Out:&lt;/span&gt; Buffers on the right side will be ignored in chatmonitor&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:9pt; 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;Operation modes:&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-weight:600;&quot;&gt;&lt;span style=&quot; font-weight:400; text-decoration: underline;&quot;&gt;Opt-In:&lt;/span&gt; &lt;span style=&quot; font-weight:400;&quot;&gt;Lediglich Fenster auf der rechten Seite werden im Chatmonitor angezeigt&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; text-decoration: underline;&quot;&gt;Opt-Out:&lt;/span&gt; Fenster auf der rechten Seite werden im Chatmonitor ignoriert&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="60"/>
@@ -903,6 +1090,11 @@ p, li { white-space: pre-wrap; }
         <source>Show own messages</source>
         <translation>Zeige eigene Nachrichten</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
+        <source>Appearance</source>
+        <translation>Erscheinungsbild</translation>
+    </message>
 </context>
 <context>
     <name>ChatMonitorView</name>
@@ -945,7 +1137,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChatScene</name>
     <message>
-        <location filename="../src/qtui/chatscene.cpp" line="582"/>
+        <location filename="../src/qtui/chatscene.cpp" line="580"/>
         <source>Copy Selection</source>
         <translation>Auswahl kopieren</translation>
     </message>
@@ -986,15 +1178,20 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Client</name>
     <message>
-        <location filename="../src/client/client.cpp" line="252"/>
+        <location filename="../src/client/client.cpp" line="254"/>
         <source>Identity already exists in client!</source>
         <translation>Identität im Client schon vorhanden!</translation>
     </message>
+    <message>
+        <location filename="../src/client/client.cpp" line="317"/>
+        <source>All Buffers</source>
+        <translation>Alle Räume</translation>
+    </message>
 </context>
 <context>
     <name>ClientBacklogManager</name>
     <message>
-        <location filename="../src/client/clientbacklogmanager.cpp" line="116"/>
+        <location filename="../src/client/clientbacklogmanager.cpp" line="123"/>
         <source>Processed %1 messages in %2 seconds.</source>
         <translation>%1 Nachrichten in %2 Sekunden verarbeitet.</translation>
     </message>
@@ -1002,50 +1199,60 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ClientSyncer</name>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="53"/>
+        <location filename="../src/client/clientsyncer.cpp" line="52"/>
         <source>The Quassel Core you try to connect to is too old! Please consider upgrading.</source>
         <translation>Der Quassel-Core, 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="78"/>
+        <location filename="../src/client/clientsyncer.cpp" line="77"/>
         <source>&lt;b&gt;Invalid data received from core!&lt;/b&gt;&lt;br&gt;Disconnecting.</source>
         <translation>&lt;b&gt;Ungültige Daten vom Core erhalten!&lt;/b&gt;&lt;br&gt;Verbindungsabbruch.</translation>
     </message>
     <message>
         <location filename="../src/client/clientsyncer.cpp" line="110"/>
         <source>Internal connections not yet supported.</source>
-        <translation>Interne Verbindungen noch nicht unterstützt.</translation>
+        <translation type="obsolete">Interne Verbindungen noch nicht unterstützt.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="128"/>
+        <location filename="../src/client/clientsyncer.cpp" line="111"/>
         <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;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="193"/>
+        <location filename="../src/client/clientsyncer.cpp" line="196"/>
         <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;Der Quassel-Core, zu dem Sie eine Verbindung herzustellen versuchen, ist veraltet!&lt;/b&gt;&lt;br&gt;Benötige mindestens Core/Client-Protokoll v%1 zum Verbinden.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="209"/>
+        <location filename="../src/client/clientsyncer.cpp" line="219"/>
         <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;Der Quassel-Core, 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="239"/>
+        <location filename="../src/client/clientsyncer.cpp" line="248"/>
         <source>Logging in...</source>
         <translation>Anmelden...</translation>
     </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="102"/>
+        <source>No Host to connect to specified.</source>
+        <translation>Kein Host zum Verbinden festgelegt.</translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="407"/>
+        <source>Cert Digest changed! was: %1</source>
+        <translation>Zertifikat geändert! Vorher: %1</translation>
+    </message>
 </context>
 <context>
     <name>ColorSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="34"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="32"/>
         <source>Appearance</source>
         <translation>Erscheinungsbild</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="34"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="32"/>
         <source>Color settings</source>
         <translation>Farben</translation>
     </message>
@@ -1067,438 +1274,666 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1503"/>
         <source>FG</source>
-        <translation>VG</translation>
+        <translation type="obsolete">VG</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1734"/>
         <source>BG</source>
         <translation>HG</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1523"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1747"/>
         <source>Use BG</source>
         <translation>Benutze HG</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="71"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="77"/>
         <source>Default:</source>
         <translation>Standard:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="120"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="126"/>
         <source>Inactive:</source>
         <translation>Inaktiv:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="160"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="172"/>
         <source>Highlight:</source>
         <translation>Hervorhebung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="197"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="215"/>
         <source>New Message:</source>
         <translation>Neue Meldung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="234"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="258"/>
         <source>Other Activity:</source>
         <translation>Andere Aktivität:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1626"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="317"/>
         <source>Preview:</source>
         <translation>Vorschau:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1633"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="324"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="319"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="349"/>
         <source>Chatview</source>
         <translation>Chatansicht</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="335"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="365"/>
         <source>Server Activity</source>
         <translation>Serveraktivität</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="885"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1724"/>
         <source>Foreground</source>
         <translation>Vordergrund</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="895"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1013"/>
         <source>Background</source>
         <translation>Hintergrund</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="371"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="417"/>
         <source>Error Message:</source>
         <translation>Fehlermeldung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="411"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="463"/>
         <source>Notice Message:</source>
         <translation>Notizmeldung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="451"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="509"/>
         <source>Plain Message:</source>
         <translation>Einfache Meldung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="491"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="555"/>
         <source>Server Message:</source>
         <translation>Servermeldung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="531"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="601"/>
         <source>Highlight Message:</source>
         <translation>Highlight-Meldung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="562"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="619"/>
         <source>User Activity</source>
         <translation>Benutzeraktivität</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="598"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="661"/>
         <source>Action Message:</source>
         <translation>Aktionsmeldung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="638"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="707"/>
         <source>Join Message:</source>
         <translation>Beitrittsmeldung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="678"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="753"/>
         <source>Kick Message:</source>
         <translation>Rauswurfsmeldung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="718"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="799"/>
         <source>Mode Message:</source>
         <translation>Modusmeldung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="758"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="845"/>
         <source>Part Message:</source>
         <translation>Verlassensmeldung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="798"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="891"/>
         <source>Quit Message:</source>
         <translation>Beendigungsmeldung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="838"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="937"/>
         <source>Rename Message:</source>
         <translation>Umbenennungsmeldung:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="879"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="997"/>
         <source>Message</source>
         <translation>Meldung</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="915"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1039"/>
         <source>Timestamp:</source>
         <translation>Zeitstempel:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="955"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1085"/>
         <source>Sender:</source>
         <translation>Absender:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="995"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1092"/>
         <source>Nick:</source>
         <translation>Spitzname:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1035"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1144"/>
         <source>Hostmask:</source>
         <translation>Rechnermaske:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1075"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1196"/>
         <source>Channelname:</source>
         <translation>Kanalname:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1115"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1248"/>
         <source>Mode flags:</source>
         <translation>Modusschalter:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1155"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1300"/>
         <source>Url:</source>
         <translation>Url:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1232"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
         <source>Mirc Color Codes</source>
         <translation>Mirc-Farbkodierungen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1244"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1465"/>
         <source>Color Codes</source>
         <translation>Farbkodierungen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1250"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1471"/>
         <source>Color 0:</source>
         <translation>Farbe 0:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1271"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1492"/>
         <source>Color 1:</source>
         <translation>Farbe 1:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1292"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
         <source>Color 2:</source>
         <translation>Farbe 2:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1313"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1534"/>
         <source>Color 3:</source>
         <translation>Farbe 3:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1334"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1555"/>
         <source>Color 4:</source>
         <translation>Farbe 4:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1355"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1576"/>
         <source>Color 5:</source>
         <translation>Farbe 5:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1376"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1597"/>
         <source>Color 6:</source>
         <translation>Farbe 6:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1397"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1618"/>
         <source>Color 7:</source>
         <translation>Farbe 7:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1418"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1639"/>
         <source>Color 8:</source>
         <translation>Farbe 8:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1425"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1646"/>
         <source>Color 14:</source>
         <translation>Farbe 14:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1432"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1653"/>
         <source>Color 15:</source>
         <translation>Farbe 15:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1439"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1660"/>
         <source>Color 13:</source>
         <translation>Farbe 13:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1446"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1667"/>
         <source>Color 12:</source>
         <translation>Farbe 12:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1674"/>
         <source>Color 11:</source>
         <translation>Farbe 11:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1460"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1681"/>
         <source>Color 10:</source>
         <translation>Farbe 10:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1467"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1688"/>
         <source>Color 9:</source>
         <translation>Farbe 9:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1491"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1712"/>
         <source>Nickview</source>
         <translation>Spitznamenansicht</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1497"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1718"/>
         <source>Nick status:</source>
         <translation>Spitznamensstatus:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1533"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1760"/>
         <source>Online:</source>
         <translation>Angemeldet:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1573"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1806"/>
         <source>Away:</source>
         <translation>Abwesend:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1195"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1352"/>
         <source>New Message Marker:</source>
         <translation>Markierung für neue Nachrichten:</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1366"/>
+        <source>Enable</source>
+        <translation>Einschalten</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1373"/>
+        <source>Sender auto coloring:</source>
+        <translation>Färbung der Absender:</translation>
+    </message>
 </context>
 <context>
     <name>ContentsChatItem</name>
     <message>
-        <location filename="../src/qtui/chatitem.cpp" line="599"/>
+        <location filename="../src/qtui/chatitem.cpp" line="611"/>
         <source>Copy Link Address</source>
         <translation>Linkadresse kopieren</translation>
     </message>
 </context>
 <context>
-    <name>Core</name>
+    <name>ContextMenuActionProvider</name>
     <message>
-        <location filename="../src/core/core.cpp" line="59"/>
-        <source>Could not initialize any storage backend! Exiting...</source>
-        <translation>Konnte keinen Speichermechanismus initialisieren! Beende...</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="35"/>
+        <source>Connect</source>
+        <translation>Verbinden</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="62"/>
-        <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 unterstützt momentan ausschließlich SQLite3.
-Die Qt-Bibliothek mit eingeschaltetem SQLite-Plugin
-wird benötigt, damit der Quassel-Core funktioniert.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="36"/>
+        <source>Disconnect</source>
+        <translation>Trenne Verbindung</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="120"/>
-        <source>Calling restoreState() even though active sessions exist!</source>
-        <translation>restoreState() aufgerufen, obwohl aktive Sitzungen vorhanden sind!</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="38"/>
+        <source>Join</source>
+        <translation>Beitreten</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="161"/>
-        <source>Admin user or password not set.</source>
-        <translation>Administrativbenutzer oder Passwort nicht gesetzt.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="39"/>
+        <source>Part</source>
+        <translation>Verlassen</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="164"/>
-        <source>Could not setup storage!</source>
-        <translation>Speicher konnte nicht eingerichtet werden!</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="40"/>
+        <source>Delete Buffer(s)...</source>
+        <translation>Verlauf löschen...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="168"/>
-        <source>Creating admin user...</source>
-        <translation>Erstelle Administrativbenutzer...</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="41"/>
+        <source>Show Buffer</source>
+        <translation>Fenster anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="316"/>
-        <source>Antique client trying to connect... refusing.</source>
-        <translation>Antiquierter Client versucht zu verbinden... lehne ab.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="43"/>
+        <source>Joins</source>
+        <translation>Joins</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="330"/>
-        <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;Ihr Quassel-Client ist zu alt!&lt;/b&gt;&lt;br&gt;Dieser Core benötigt mindestens Client-/Core-Protokollversion %1.&lt;br&gt;Bitte ziehen Sie in Erwägung, Ihren Client zu aktualisieren.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="44"/>
+        <source>Parts</source>
+        <translation>Parts</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="406"/>
-        <source>Client %1 too old, rejecting.</source>
-        <translation type="obsolete">Client %1 zu alt, lehne ab.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="45"/>
+        <source>Quits</source>
+        <translation>Quits</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="346"/>
-        <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-Core Version %1&lt;/b&gt;&lt;br&gt;Erstellungsdatum: %2&lt;br&gt;Betriebsdauer: %3T%4S%5M (seit %6)</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="46"/>
+        <source>Nick Changes</source>
+        <translation>Spitznamenänderungen</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="410"/>
-        <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;Client nicht initialisiert!&lt;/b&gt;&lt;br&gt;Sie müssen vor dem Anmeldungsversuch eine init-Meldung senden.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="47"/>
+        <source>Mode Changes</source>
+        <translation>Modiänderungen</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 type="obsolete">Client %1 hat vor dem Anmeldungsversuch keine init-Meldung gesendet, lehne ab.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="48"/>
+        <source>Day Changes</source>
+        <translation>Tageswechsel</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="430"/>
-        <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;Ungültiger Benutzername oder Passwort!&lt;/b&gt;&lt;br&gt;Die angegebene Benutzername/Passwort-Kombination konnte in der Datenbank nicht gefunden werden.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="49"/>
+        <source>Set as Default...</source>
+        <translation>Als Standard setzen...</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 type="obsolete">Client %1 erfolgreich als &quot;%2&quot; (BenutzerId: %3) initialisiert und authentifiziert.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="50"/>
+        <source>Use Defaults...</source>
+        <translation>Standardwerte benutzen...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="447"/>
-        <source>Non-authed client disconnected.</source>
-        <translation>Nicht-authentifizierter Client getrennt.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="52"/>
+        <source>Join Channel...</source>
+        <translation>Kanal beitreteten...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="568"/>
-        <source>Could not initialize session for client %1!</source>
-        <translation type="obsolete">Konnte Sitzung für Client %1 nicht initialisieren!</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="54"/>
+        <source>Start Query</source>
+        <translation>Dialog starten</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="294"/>
-        <source>Client connected from</source>
-        <translation>Client verbunden von</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="55"/>
+        <source>Show Query</source>
+        <translation>Dialog anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="436"/>
-        <source>Client</source>
-        <translation>Client</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="56"/>
+        <source>Whois</source>
+        <translation>Whois</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="332"/>
-        <source>too old, rejecting.</source>
-        <translation>zu alt, lehne ab.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="58"/>
+        <source>Version</source>
+        <translation>Version</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="392"/>
-        <source>Starting TLS for Client:</source>
-        <translation>Starte TLS für Client:</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="59"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="412"/>
-        <source>did not send an init message before trying to login, rejecting.</source>
-        <translation>hat vor dem Anmeldungsversuch keine init-Meldung gesendet, lehne ab.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="60"/>
+        <source>Ping</source>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="436"/>
-        <source>initialized and authenticated successfully as &quot;%1&quot; (UserId: %2).</source>
-        <translation>initialisiert und erfolgreich als &quot;%1&quot; (BenutzerId: %2) authentifziert.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="61"/>
+        <source>Finger</source>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="495"/>
-        <source>Could not initialize session for client:</source>
-        <translation>Konnte Sitzung für Client nicht erfolgreich initialisieren:</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="63"/>
+        <source>Give Operator Status</source>
+        <translation>Operator-Status geben</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="453"/>
-        <source>Non-authed client disconnected. (socket allready destroyed)</source>
-        <translation>Unauthentifizierter Client getrennt. (Socket bereits zerstört)</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="64"/>
+        <source>Take Operator Status</source>
+        <translation>Operator-Status nehmen</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="297"/>
-        <source>Closing server for basic setup.</source>
-        <translation>Beende Server für Setup.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="65"/>
+        <source>Give Voice</source>
+        <translation>Voice geben</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="66"/>
+        <source>Take Voice</source>
+        <translation>Voice nehmen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="67"/>
+        <source>Kick From Channel</source>
+        <translation>Aus Kanal werfen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="68"/>
+        <source>Ban From Channel</source>
+        <translation>Vom Kanal bannen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="69"/>
+        <source>Kick &amp;&amp; Ban</source>
+        <translation>Rauswerfen und bannen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="71"/>
+        <source>Hide Buffer(s) Temporarily</source>
+        <translation>Fenster temporär ausblenden</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="72"/>
+        <source>Hide Buffer(s) Permanently</source>
+        <translation>Fenster permanent ausblenden</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="73"/>
+        <source>Show Channel List</source>
+        <translation>Zeige Kanalliste</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="74"/>
+        <source>Show Ignore List</source>
+        <translation>Zeige Ignorieren-Liste</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="86"/>
+        <source>Hide Events</source>
+        <translation>Meldungen ausblenden</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="94"/>
+        <source>CTCP</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="106"/>
+        <source>Actions</source>
+        <translation>Aktionen</translation>
+    </message>
+</context>
+<context>
+    <name>Core</name>
+    <message>
+        <location filename="../src/core/core.cpp" line="146"/>
+        <source>Could not initialize any storage backend! Exiting...</source>
+        <translation>Konnte keinen Speichermechanismus initialisieren! Beende...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="149"/>
+        <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 unterstützt momentan ausschließlich SQLite3.
+Die Qt-Bibliothek mit eingeschaltetem SQLite-Plugin
+wird benötigt, damit der Quassel-Core funktioniert.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="186"/>
+        <source>Calling restoreState() even though active sessions exist!</source>
+        <translation>restoreState() aufgerufen, obwohl aktive Sitzungen vorhanden sind!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="227"/>
+        <source>Admin user or password not set.</source>
+        <translation>Administrativbenutzer oder Passwort nicht gesetzt.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="231"/>
+        <source>Could not setup storage!</source>
+        <translation>Speicher konnte nicht eingerichtet werden!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="235"/>
+        <source>Creating admin user...</source>
+        <translation>Erstelle Administrativbenutzer...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="442"/>
+        <source>Antique client trying to connect... refusing.</source>
+        <translation>Antiquierter Client versucht zu verbinden... lehne ab.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="456"/>
+        <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;Ihr Quassel-Client ist zu alt!&lt;/b&gt;&lt;br&gt;Dieser Core benötigt mindestens Client-/Core-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="406"/>
+        <source>Client %1 too old, rejecting.</source>
+        <translation type="obsolete">Client %1 zu alt, lehne ab.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="472"/>
+        <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-Core Version %1&lt;/b&gt;&lt;br&gt;Erstellungsdatum: %2&lt;br&gt;Betriebsdauer: %3T%4S%5M (seit %6)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="536"/>
+        <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;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="486"/>
+        <source>Client %1 did not send an init message before trying to login, rejecting.</source>
+        <translation type="obsolete">Client %1 hat vor dem Anmeldungsversuch keine init-Meldung gesendet, lehne ab.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="556"/>
+        <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;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="512"/>
+        <source>Client %1 initialized and authenticated successfully as &quot;%2&quot; (UserId: %3).</source>
+        <translation type="obsolete">Client %1 erfolgreich als &quot;%2&quot; (BenutzerId: %3) initialisiert und authentifiziert.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="573"/>
+        <source>Non-authed client disconnected.</source>
+        <translation>Nicht-authentifizierter Client getrennt.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="568"/>
+        <source>Could not initialize session for client %1!</source>
+        <translation type="obsolete">Konnte Sitzung für Client %1 nicht initialisieren!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="420"/>
+        <source>Client connected from</source>
+        <translation>Client verbunden von</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="562"/>
+        <source>Client</source>
+        <translation>Client</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="458"/>
+        <source>too old, rejecting.</source>
+        <translation>zu alt, lehne ab.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="518"/>
+        <source>Starting TLS for Client:</source>
+        <translation>Starte TLS für Client:</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="538"/>
+        <source>did not send an init message before trying to login, rejecting.</source>
+        <translation>hat vor dem Anmeldungsversuch keine init-Meldung gesendet, lehne ab.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="562"/>
+        <source>initialized and authenticated successfully as &quot;%1&quot; (UserId: %2).</source>
+        <translation>initialisiert und erfolgreich als &quot;%1&quot; (BenutzerId: %2) authentifziert.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="623"/>
+        <source>Could not initialize session for client:</source>
+        <translation>Konnte Sitzung für Client nicht erfolgreich initialisieren:</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="579"/>
+        <source>Non-authed client disconnected. (socket allready destroyed)</source>
+        <translation>Unauthentifizierter Client getrennt. (Socket bereits zerstört)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="423"/>
+        <source>Closing server for basic setup.</source>
+        <translation>Beende Server für Setup.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="335"/>
+        <source>Invalid listen address %1</source>
+        <translation>Ungültige Adresse %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="343"/>
+        <source>Listening for GUI clients on IPv4 %1 port %2 using protocol version %3</source>
+        <translation>Warte auf GUI Clients auf IPv4 %1 (port %2) mit Protollversion %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="351"/>
+        <source>Could not open IPv4 interface %1:%2: %3</source>
+        <translation>Konnte IPv4-Interface nicht öffnen %1:%2:%3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="359"/>
+        <source>Listening for GUI clients on IPv6 %1 port %2 using protocol version %3</source>
+        <translation>Warte auf GUI Clients auf IPv4 %1 (port %2) mit Protollversion %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="370"/>
+        <source>Could not open IPv6 interface %1:%2: %3</source>
+        <translation>Konnte IPv4-Interface nicht öffnen %1:%2:%3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="378"/>
+        <source>Invalid listen address %1, unknown network protocol</source>
+        <translation>Ungültige Adresse %1, unbekanntes Netzwerkprotokoll</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="386"/>
+        <source>Could not open any network interfaces to listen on!</source>
+        <translation>Konnte keine Netzwerk-Interfaces öffnen</translation>
     </message>
 </context>
 <context>
     <name>CoreAccountEditDlg</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="497"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="522"/>
         <source>Add Core Account</source>
         <translation>Remote-Konto hinzufügen</translation>
     </message>
@@ -1846,27 +2281,27 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>CoreConnectDlg</name>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="42"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="53"/>
         <source>Connect to Quassel Core</source>
         <translation>Mit Quassel-Core verbinden</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="286"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="294"/>
         <source>User:</source>
         <translation>Benutzer:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="300"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="308"/>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="314"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="322"/>
         <source>Remember</source>
         <translation>Merken</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="117"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="128"/>
         <source>Always use this account</source>
         <translation>Diesen Account immer benutzen</translation>
     </message>
@@ -1876,7 +2311,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="79"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="90"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
@@ -1901,117 +2336,117 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Verbinden</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="183"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="190"/>
         <source>Remove Account Settings</source>
         <translation>Kontoeinstellungen entfernen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="185"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="192"/>
         <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>Möchten Sie wirklich Ihre lokalen Einstellungen für dieses Konto löschen?&lt;br&gt;Anmerkung: Dies wird die Daten im Core selbst &lt;em&gt;nicht&lt;/em&gt; entfernen oder ändern!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="243"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="242"/>
         <source>Connect to %1</source>
         <translation>Mit %1 verbinden</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="260"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="259"/>
         <source>&lt;div style=color:red;&gt;Connection to %1 failed!&lt;/div&gt;</source>
         <translation>&lt;div style=color:red;&gt;Verbindung zu %1 fehlgeschlagen!&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="284"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="309"/>
         <source>Not connected to %1.</source>
         <translation>Nicht mit %1 verbunden.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="285"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="310"/>
         <source>Looking up %1...</source>
         <translation>Schlage %1 nach...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="286"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="311"/>
         <source>Connecting to %1...</source>
         <translation>Verbinde mit %1...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="287"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="312"/>
         <source>Connected to %1</source>
         <translation>Verbunden mit %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="288"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="313"/>
         <source>Unknown connection state to %1</source>
         <translation>Unbekannter Verbindungsstatus zu %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="340"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="365"/>
         <source>Logging in...</source>
         <translation>Anmelden...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="275"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="286"/>
         <source>Login</source>
         <translation>Anmeldung</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="57"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="68"/>
         <source>Edit...</source>
         <translation>Ändern...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="68"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="79"/>
         <source>Add...</source>
         <translation>Hinzufügen...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="146"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="165"/>
         <source>Initializing your connection</source>
         <translation>Initialisiere Ihre Verbindung</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="170"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="183"/>
         <source>Connected to apollo.mindpool.net.</source>
         <translation>Verbunden zu apollo.mindpool.net.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="336"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="456"/>
         <source>Configure your Quassel Core</source>
         <translation>Ihren Quassel-Core konfigurieren</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="342"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="462"/>
         <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>Der Quassel-Core, mit dem Sie eine Verbindung herstellen möchten, ist noch unkonfiguriert. Sie können jetzt den Konfigurationshelfer starten, der Ihnen bei der Konfiguration Ihres Cores behilflich ist.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="370"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="490"/>
         <source>Launch Wizard</source>
         <translation>Helfer starten</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="427"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="553"/>
         <source>Initializing your session...</source>
         <translation>Initialisiere Ihre Sitzung...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="435"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="561"/>
         <source>&lt;b&gt;Please be patient while your client synchronizes with the Quassel Core!&lt;/b&gt;</source>
         <translation>&lt;b&gt;Bitte haben Sie etwas Geduld, während sich Ihr Client mit dem Quassel-Core synchronisiert!&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="450"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="576"/>
         <source>Session state:</source>
         <translation>Sitzungsstatus:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="467"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="593"/>
         <source>Network states:</source>
         <translation>Netzwerkstatus:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="480"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="606"/>
         <source>0/0</source>
         <translation>0/0</translation>
     </message>
@@ -2031,18 +2466,38 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Internen Core benutzen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="103"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="114"/>
         <source>Use internal core</source>
         <translation>Internen Core benutzen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="202"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="215"/>
         <source>THIS IS A PLACEHOLDER
 TO
 RESERVE
 SOME SPACE</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="272"/>
+        <source>&lt;div&gt;Errors occurred while connecting to &quot;%1&quot;:&lt;/div&gt;</source>
+        <translation>&lt;div&gt;Fehler beim Verbinden zu &quot;%1&quot;:&lt;/div&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="356"/>
+        <source>view SSL Certificate</source>
+        <translation>SSL-Zertifikat anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="393"/>
+        <source>add to known hosts</source>
+        <translation>zu den bekannten Hosts hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="413"/>
+        <source>Continue connection</source>
+        <translation>Verbinden fortsetzen</translation>
+    </message>
 </context>
 <context>
     <name>CoreConnectProgressDlg</name>
@@ -2146,37 +2601,47 @@ SOME SPACE</source>
 <context>
     <name>CoreNetwork</name>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="146"/>
+        <location filename="../src/core/corenetwork.cpp" line="151"/>
         <source>Connection failed. Cycling to next Server</source>
         <translation>Verbindung fehlgeschlagen. Wechsle zum nächsten Server</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="155"/>
+        <location filename="../src/core/corenetwork.cpp" line="160"/>
         <source>Connecting to %1:%2...</source>
         <translation>Verbinde mit %1:%2...</translation>
     </message>
     <message>
         <location filename="../src/core/corenetwork.cpp" line="185"/>
         <source>Disconnecting.</source>
-        <translation>Trenne Verbindung.</translation>
+        <translation type="obsolete">Trenne Verbindung.</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="278"/>
+        <location filename="../src/core/corenetwork.cpp" line="304"/>
         <source>Could not connect to %1 (%2)</source>
         <translation>Konnte nicht mit %1 (%2) verbinden</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="280"/>
+        <location filename="../src/core/corenetwork.cpp" line="306"/>
         <source>Connection failure: %1</source>
         <translation>Verbindungsfehler: %1</translation>
     </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="208"/>
+        <source>Disconnecting. (%1)</source>
+        <translation>Trenne Verbindung. (%1)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="208"/>
+        <source>Core Shutdown</source>
+        <translation>Core-Shutdown</translation>
+    </message>
 </context>
 <context>
     <name>CoreSession</name>
     <message>
         <location filename="../src/core/coresession.cpp" line="151"/>
         <source>Default Identity</source>
-        <translation>Standardidentität</translation>
+        <translation type="obsolete">Standardidentität</translation>
     </message>
     <message>
         <location filename="../src/core/coresession.cpp" line="241"/>
@@ -2184,22 +2649,22 @@ SOME SPACE</source>
         <translation type="obsolete">Client %1 hat Verbindung getrennt (BenutzerId: %2).</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="335"/>
+        <location filename="../src/core/coresession.cpp" line="317"/>
         <source>CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!</source>
         <translation>CoreSession::createNetwork(): Ungültige networkId vom Core erhalten beim Versuch Netzwerk %1 anzulegen!</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="352"/>
+        <location filename="../src/core/coresession.cpp" line="339"/>
         <source>CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!</source>
         <translation>CoreSession::createNetwork(): Versuche ein Netzwerk anzulegen, das bereits existiert, aktualisiere stattdessen!</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="197"/>
+        <location filename="../src/core/coresession.cpp" line="180"/>
         <source>Client</source>
         <translation>Client</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="197"/>
+        <location filename="../src/core/coresession.cpp" line="180"/>
         <source>disconnected (UserId: %1).</source>
         <translation>getrennt (UserId: %1).</translation>
     </message>
@@ -2455,12 +2920,12 @@ SOME SPACE</source>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Verhalten</translation>
+        <translation type="obsolete">Verhalten</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>General</source>
-        <translation>Allgemein</translation>
+        <translation type="obsolete">Allgemein</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="13"/>
@@ -2647,13 +3112,18 @@ SOME SPACE</source>
         <source>Errors:</source>
         <translation>Fehler:</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
+        <source>Misc</source>
+        <translation>Verschiedenes</translation>
+    </message>
 </context>
 <context>
     <name>HighlightSettingsPage</name>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
         <source>Behaviour</source>
-        <translation>Verhalten</translation>
+        <translation type="obsolete">Verhalten</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="32"/>
@@ -2740,6 +3210,11 @@ SOME SPACE</source>
         <source>Case sensitive</source>
         <translation>Groß-/Kleinschreibung beachten</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
+        <source>Appearance</source>
+        <translation>Erscheinungsbild</translation>
+    </message>
 </context>
 <context>
     <name>IdentitiesSettingsPage</name>
@@ -2749,49 +3224,49 @@ SOME SPACE</source>
         <translation>Hinzufügen...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="260"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="77"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="108"/>
         <source>General</source>
-        <translation>Allgemein</translation>
+        <translation type="obsolete">Allgemein</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="116"/>
         <source>Real Name:</source>
-        <translation>Realname:</translation>
+        <translation type="obsolete">Realname:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="132"/>
         <source>Nicknames</source>
-        <translation>Spitznamen</translation>
+        <translation type="obsolete">Spitznamen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="171"/>
         <source>&amp;Add...</source>
-        <translation>&amp;Hinzufügen...</translation>
+        <translation type="obsolete">&amp;Hinzufügen...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="217"/>
         <source>Re&amp;name...</source>
-        <translation>Umbe&amp;nennen...</translation>
+        <translation type="obsolete">Umbe&amp;nennen...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="243"/>
         <source>Move upwards in list</source>
-        <translation>In Liste nach oben verschieben</translation>
+        <translation type="obsolete">In Liste nach oben verschieben</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="257"/>
         <source>Move downwards in list</source>
-        <translation>In Liste nach unten verschieben</translation>
+        <translation type="obsolete">In Liste nach unten verschieben</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="313"/>
         <source>A&amp;way</source>
-        <translation>Ab&amp;wesend</translation>
+        <translation type="obsolete">Ab&amp;wesend</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="473"/>
@@ -2826,90 +3301,90 @@ SOME SPACE</source>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="512"/>
         <source>Advanced</source>
-        <translation>Erweitert</translation>
+        <translation type="obsolete">Erweitert</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="520"/>
         <source>Ident:</source>
-        <translation>Ident:</translation>
+        <translation type="obsolete">Ident:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="536"/>
         <source>Messages</source>
-        <translation>Meldungen</translation>
+        <translation type="obsolete">Meldungen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="544"/>
         <source>Part Reason:</source>
-        <translation>Part-Grund:</translation>
+        <translation type="obsolete">Part-Grund:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="557"/>
         <source>Quit Reason:</source>
-        <translation>Beendigungsgrund:</translation>
+        <translation type="obsolete">Beendigungsgrund:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="567"/>
         <source>Kick Reason:</source>
-        <translation>Rauswurfsgrund:</translation>
+        <translation type="obsolete">Rauswurfsgrund:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="35"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
         <source>Identities</source>
         <translation>Identitäten</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="206"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="170"/>
         <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;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="207"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="171"/>
         <source>&lt;li&gt;All identities need an identity name set&lt;/li&gt;</source>
         <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="208"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="172"/>
         <source>&lt;li&gt;Every identity needs at least one nickname defined&lt;/li&gt;</source>
         <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="209"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="173"/>
         <source>&lt;li&gt;You need to specify a real name for every identity&lt;/li&gt;</source>
         <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="210"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="174"/>
         <source>&lt;li&gt;You need to specify an ident for every identity&lt;/li&gt;</source>
         <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="211"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="175"/>
         <source>&lt;/ul&gt;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="212"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="176"/>
         <source>One or more identities are invalid</source>
         <translation>Eine oder mehrere Identitäten sind ungültig</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="397"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="306"/>
         <source>Delete Identity?</source>
         <translation>Identität löschen?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="398"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="307"/>
         <source>Do you really want to delete identity &quot;%1&quot;?</source>
         <translation>Wollen Sie wirklich Identität &quot;%1&quot; löschen?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="214"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="31"/>
         <source>Rename Identity</source>
         <translation>Identität umbenennen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="410"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="319"/>
         <source>Please enter a new name for the identity &quot;%1&quot;!</source>
         <translation>Bitte geben Sie einen neuen Namen für die Identität &quot;%1&quot; an!</translation>
     </message>
@@ -2926,138 +3401,138 @@ SOME SPACE</source>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="123"/>
         <source>The &quot;Real Name&quot; is shown in /whois.</source>
-        <translation>Der &quot;Realname&quot; wird im /whois angezeigt.</translation>
+        <translation type="obsolete">Der &quot;Realname&quot; wird im /whois angezeigt.</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="168"/>
         <source>Add Nickname</source>
-        <translation>Spitznamen hinzufügen</translation>
+        <translation type="obsolete">Spitznamen hinzufügen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="194"/>
         <source>Remove Nickname</source>
-        <translation>Spitznamen entfernen</translation>
+        <translation type="obsolete">Spitznamen entfernen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="197"/>
         <source>Remove</source>
-        <translation>Etnfernen</translation>
+        <translation type="obsolete">Etnfernen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="527"/>
         <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
-        <translation>Der &quot;Ident&quot; bildet zusammen mit Ihrer Rechneradresse die Rechnermaske und identifiziert sie so eindeutig im IRC-Netzwerk.</translation>
+        <translation type="obsolete">Der &quot;Ident&quot; bildet zusammen mit Ihrer Rechneradresse die Rechnermaske und identifiziert sie so eindeutig im IRC-Netzwerk.</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="319"/>
         <source>Default Away Settings</source>
-        <translation>Standard-Abwesenheitseinstellungen</translation>
+        <translation type="obsolete">Standard-Abwesenheitseinstellungen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="360"/>
         <source>Nick to be used when being away</source>
-        <translation>Spitzname wenn abwesend</translation>
+        <translation type="obsolete">Spitzname wenn abwesend</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="350"/>
         <source>Default away reason</source>
-        <translation>Standard-Abwesenheitsgrund</translation>
+        <translation type="obsolete">Standard-Abwesenheitsgrund</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="375"/>
         <source>Set away when all clients have detached from the core</source>
-        <translation>Als abwesend markieren, wenn alle Clients vom Core getrennt wurden</translation>
+        <translation type="obsolete">Als abwesend markieren, wenn alle Clients vom Core getrennt wurden</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="378"/>
         <source>Away On Detach</source>
-        <translation>Als abwesend markieren, wenn vom Core getrennt</translation>
+        <translation type="obsolete">Als abwesend markieren, wenn vom Core getrennt</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="405"/>
         <source>Override default away reason for auto-away on detach</source>
-        <translation>Überschreibe Standard-Abwesenheitsgrund, wenn vom Core getrennt</translation>
+        <translation type="obsolete">Überschreibe Standard-Abwesenheitsgrund, wenn vom Core getrennt</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="420"/>
         <source>Not implemented yet</source>
-        <translation>Noch nicht implementiert</translation>
+        <translation type="obsolete">Noch nicht implementiert</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="423"/>
         <source>Away On Idle</source>
-        <translation>Als abwesend markieren, wenn untätig</translation>
+        <translation type="obsolete">Als abwesend markieren, wenn untätig</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="437"/>
         <source>Set away after</source>
-        <translation>Als abwesend markieren nach</translation>
+        <translation type="obsolete">Als abwesend markieren nach</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="447"/>
         <source>minutes of being idle</source>
-        <translation>Minuten Untätigkeit</translation>
+        <translation type="obsolete">Minuten Untätigkeit</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="471"/>
         <source>Away Reason:</source>
-        <translation>Abwesenheitsgrund:</translation>
+        <translation type="obsolete">Abwesenheitsgrund:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="363"/>
         <source>Away Nick:</source>
-        <translation>Abwesenheitsspitzname:</translation>
+        <translation type="obsolete">Abwesenheitsspitzname:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="534"/>
         <source>Load a Key</source>
-        <translation>Schlüssel laden</translation>
+        <translation type="obsolete">Schlüssel laden</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="726"/>
         <source>No Key loaded</source>
-        <translation>Kein Schlüssel geladen</translation>
+        <translation type="obsolete">Kein Schlüssel geladen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="844"/>
         <source>Load</source>
-        <translation>Laden</translation>
+        <translation type="obsolete">Laden</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="566"/>
         <source>RSA</source>
-        <translation>RSA</translation>
+        <translation type="obsolete">RSA</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="569"/>
         <source>DSA</source>
-        <translation>DSA</translation>
+        <translation type="obsolete">DSA</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="613"/>
         <source>Clear</source>
-        <translation>Aufräumen</translation>
+        <translation type="obsolete">Aufräumen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="584"/>
         <source>Load a Certificate</source>
-        <translation>Ein Zertifikat laden</translation>
+        <translation type="obsolete">Ein Zertifikat laden</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="818"/>
         <source>No Certificate loaded</source>
-        <translation>Kein Zertifikat geladen</translation>
+        <translation type="obsolete">Kein Zertifikat geladen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="601"/>
         <source>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</source>
-        <translation>Sie brauchen einen SSL-fähigen Client um die SSL-Schlüssel und Zertifikate des Cores zu ändern</translation>
+        <translation type="obsolete">Sie brauchen einen SSL-fähigen Client um die SSL-Schlüssel und Zertifikate des Cores zu ändern</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="630"/>
         <source>Warning: you are not connected with a secured connection to the Quassel Core!
 Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!</source>
-        <translation>Warnung: Sie sind nicht mit einer verschlüsselten Verbindung zum Quassel-Core verbunden!
+        <translation type="obsolete">Warnung: Sie sind nicht mit einer verschlüsselten Verbindung zum Quassel-Core verbunden!
 Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und SSL-Zertifikats!</translation>
     </message>
     <message>
@@ -3068,48 +3543,53 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="705"/>
         <source>Use SSL Key</source>
-        <translation>SSL-Schlüssel benutzen</translation>
+        <translation type="obsolete">SSL-Schlüssel benutzen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="719"/>
         <source>Key Type:</source>
-        <translation>Schlüsselformat:</translation>
+        <translation type="obsolete">Schlüsselformat:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="758"/>
         <source>Use SSL Certificate</source>
-        <translation>SSL-Zertifikat benutzen</translation>
+        <translation type="obsolete">SSL-Zertifikat benutzen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="777"/>
         <source>Organisation:</source>
-        <translation>Organisation:</translation>
+        <translation type="obsolete">Organisation:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="811"/>
         <source>CommonName:</source>
-        <translation>Name:</translation>
+        <translation type="obsolete">Name:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="659"/>
         <source>Continue</source>
-        <translation>Fortfahren</translation>
+        <translation type="obsolete">Fortfahren</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
+        <source>Misc</source>
+        <translation>Verschiedenes</translation>
     </message>
 </context>
 <context>
     <name>Identity</name>
     <message>
-        <location filename="../src/common/identity.cpp" line="65"/>
+        <location filename="../src/common/identity.cpp" line="148"/>
         <source>&lt;empty&gt;</source>
         <translation>&lt;leer&gt;</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="66"/>
+        <location filename="../src/common/identity.cpp" line="120"/>
         <source>Quassel IRC User</source>
         <translation>Quassel-IRC-Benutzer</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="72"/>
+        <location filename="../src/common/identity.cpp" line="154"/>
         <source>Gone fishing.</source>
         <translation>Mit&apos;m Fahrrad Sahne holen.</translation>
     </message>
@@ -3119,7 +3599,7 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
         <translation type="obsolete">Sahne geholt.</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="76"/>
+        <location filename="../src/common/identity.cpp" line="158"/>
         <source>Not here. No, really. not here!</source>
         <translation>Nicht da. Nein, ehrlich. Nicht da!</translation>
     </message>
@@ -3129,39 +3609,318 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
         <translation type="obsolete">Wieder im Rennen!</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="82"/>
+        <location filename="../src/common/identity.cpp" line="164"/>
         <source>Kindergarten is elsewhere!</source>
         <translation>Der Kindergarten ist woanders!</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="84"/>
+        <location filename="../src/common/identity.cpp" line="166"/>
         <source>http://quassel-irc.org - Chat comfortably. Anywhere.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="79"/>
+        <location filename="../src/common/identity.cpp" line="161"/>
         <source>All Quassel clients vanished from the face of the earth...</source>
         <translation></translation>
     </message>
 </context>
 <context>
-    <name>InputWidget</name>
+    <name>IdentityEditWidget</name>
     <message>
-        <location filename="../src/qtui/ui/inputwidget.ui" line="19"/>
-        <source>Form</source>
-        <translation>Formular</translation>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="398"/>
+        <source>Advanced</source>
+        <translation>Erweitert</translation>
     </message>
     <message>
-        <location filename="../src/qtui/inputwidget.cpp" line="58"/>
-        <source>Focus Input Line</source>
-        <translation>Eingabezeile fokussieren</translation>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="290"/>
+        <source>Load a Key</source>
+        <translation>Schlüssel laden</translation>
     </message>
     <message>
-        <location filename="../src/qtui/inputwidget.cpp" line="59"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="604"/>
+        <source>No Key loaded</source>
+        <translation>Kein Schlüssel geladen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="722"/>
+        <source>Load</source>
+        <translation>Laden</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="322"/>
+        <source>RSA</source>
+        <translation>RSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="325"/>
+        <source>DSA</source>
+        <translation>DSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="369"/>
+        <source>Clear</source>
+        <translation>Aufräumen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="340"/>
+        <source>Load a Certificate</source>
+        <translation>Ein Zertifikat laden</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="696"/>
+        <source>No Certificate loaded</source>
+        <translation>Kein Zertifikat geladen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="29"/>
+        <source>General</source>
+        <translation>Allgemein</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="37"/>
+        <source>Real Name:</source>
+        <translation>Realname:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="44"/>
+        <source>The &quot;Real Name&quot; is shown in /whois.</source>
+        <translation>Der &quot;Realname&quot; wird im /whois angezeigt.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="53"/>
+        <source>Nicknames</source>
+        <translation>Spitznamen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="89"/>
+        <source>Add Nickname</source>
+        <translation>Spitznamen hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="92"/>
+        <source>&amp;Add...</source>
+        <translation>&amp;Hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="115"/>
+        <source>Remove Nickname</source>
+        <translation>Spitznamen entfernen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="118"/>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="135"/>
+        <source>Rename Identity</source>
+        <translation>Identität umbenennen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="138"/>
+        <source>Re&amp;name...</source>
+        <translation>Umbe&amp;nennen...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="164"/>
+        <source>Move upwards in list</source>
+        <translation>In Liste nach oben verschieben</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="181"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="178"/>
+        <source>Move downwards in list</source>
+        <translation>In Liste nach unten verschieben</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="226"/>
+        <source>A&amp;way</source>
+        <translation>Ab&amp;wesend</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="232"/>
+        <source>Default Away Settings</source>
+        <translation>Standard-Abwesenheitseinstellungen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="243"/>
+        <source>Nick to be used when being away</source>
+        <translation>Spitzname wenn abwesend</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="253"/>
+        <source>Default away reason</source>
+        <translation>Standard-Abwesenheitsgrund</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="260"/>
+        <source>Away Nick:</source>
+        <translation>Abwesenheitsspitzname:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="365"/>
+        <source>Away Reason:</source>
+        <translation>Abwesenheitsgrund:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="279"/>
+        <source>Set away when all clients have detached from the core</source>
+        <translation>Als abwesend markieren, wenn alle Clients vom Core getrennt wurden</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="282"/>
+        <source>Away On Detach</source>
+        <translation>Als abwesend markieren, wenn vom Core getrennt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="314"/>
+        <source>Not implemented yet</source>
+        <translation>Noch nicht implementiert</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="317"/>
+        <source>Away On Idle</source>
+        <translation>Als abwesend markieren, wenn untätig</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="331"/>
+        <source>Set away after</source>
+        <translation>Als abwesend markieren nach</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="341"/>
+        <source>minutes of being idle</source>
+        <translation>Minuten Untätigkeit</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="406"/>
+        <source>Ident:</source>
+        <translation>Ident:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="413"/>
+        <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
+        <translation>Der &quot;Ident&quot; bildet zusammen mit Ihrer Rechneradresse die Rechnermaske und identifiziert sie so eindeutig im IRC-Netzwerk.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="422"/>
+        <source>Messages</source>
+        <translation>Meldungen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="430"/>
+        <source>Part Reason:</source>
+        <translation>Part-Grund:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="443"/>
+        <source>Quit Reason:</source>
+        <translation>Beendigungsgrund:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="453"/>
+        <source>Kick Reason:</source>
+        <translation>Rauswurfsgrund:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="487"/>
+        <source>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</source>
+        <translation>Sie brauchen einen SSL-fähigen Client um die SSL-Schlüssel und Zertifikate des Cores zu ändern</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="516"/>
+        <source>Warning: you are not connected with a secured connection to the Quassel Core!
+Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!</source>
+        <translation>Warnung: Sie sind nicht mit einer verschlüsselten Verbindung zum Quassel-Core verbunden!
+Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und SSL-Zertifikats!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="545"/>
+        <source>Continue</source>
+        <translation>Fortfahren</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="583"/>
+        <source>Use SSL Key</source>
+        <translation>SSL-Schlüssel benutzen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="597"/>
+        <source>Key Type:</source>
+        <translation>Schlüsselformat:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="636"/>
+        <source>Use SSL Certificate</source>
+        <translation>SSL-Zertifikat benutzen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="655"/>
+        <source>Organisation:</source>
+        <translation>Organisation:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="689"/>
+        <source>CommonName:</source>
+        <translation>Name:</translation>
+    </message>
+</context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="107"/>
+        <source>Setup Identity</source>
+        <translation>Identität konfigurieren</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="112"/>
+        <source>Default Identity</source>
+        <translation>Standardidentität</translation>
+    </message>
+</context>
+<context>
+    <name>InputLine</name>
+    <message>
+        <location filename="../src/uisupport/inputline.cpp" line="148"/>
+        <source>Do you really want to paste %1 lines?</source>
+        <translation>Wollen Sie wirklich %1 Zeilen senden?</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/inputline.cpp" line="157"/>
+        <source>Paste Protection</source>
+        <translation>Spamschutz</translation>
+    </message>
+</context>
+<context>
+    <name>InputWidget</name>
+    <message>
+        <location filename="../src/qtui/ui/inputwidget.ui" line="19"/>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/inputwidget.cpp" line="55"/>
+        <source>Focus Input Line</source>
+        <translation>Eingabezeile fokussieren</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/inputwidget.cpp" line="56"/>
         <source>Ctrl+L</source>
         <translation>Strg+L</translation>
     </message>
 </context>
+<context>
+    <name>IrcConnectionWizard</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="51"/>
+        <source>Save &amp;&amp; Connect</source>
+        <translation>Speichern und Verbinden</translation>
+    </message>
+</context>
 <context>
     <name>IrcListModel</name>
     <message>
@@ -3183,152 +3942,152 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
 <context>
     <name>IrcServerHandler</name>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="455"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="464"/>
         <source>%1 has changed topic for %2 to: &quot;%3&quot;</source>
         <translation>%1 hat das Thema für %2 geändert zu: &quot;%3&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="834"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="843"/>
         <source>No topic is set for %1.</source>
         <translation>Für %1 ist kein Thema gesetzt.</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="849"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="858"/>
         <source>Topic for %1 is &quot;%2&quot;</source>
         <translation>Thema für %1 ist &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="860"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="869"/>
         <source>Topic set by %1 on %2</source>
-        <translation>Thema in %2 gesetzt von %1</translation>
+        <translation>Thema gesetzt von %1 am %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="526"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="535"/>
         <source>%1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="561"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="570"/>
         <source>[Whois] %1 is away: &quot;%2&quot;</source>
         <translation>[Whois] %1 ist abwesend: &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="572"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="581"/>
         <source>%1 is away: &quot;%2&quot;</source>
         <translation>%1 ist abwesend: &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="773"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="782"/>
         <source>[Whois] %1</source>
         <translation>[Whois] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="647"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="656"/>
         <source>[Whois] %1 is %2 (%3)</source>
         <translation>[Whois] %1 ist %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="662"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="671"/>
         <source>%1 is online via %2 (%3)</source>
         <translation>%1 ist angemeldet über %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="924"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="933"/>
         <source>[Whowas] %1</source>
         <translation>[Whowas] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="692"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="701"/>
         <source>[Whowas] %1 was %2 (%3)</source>
         <translation>[Whowas] %1 war %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="706"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="715"/>
         <source>[Who] End of /WHO list for %1</source>
         <translation>[Who] Ende der /WHO Liste für %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="726"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="735"/>
         <source>[Whois] %1 is logged in since %2</source>
         <translation>[Whois] %1 ist seit %2 angemeldet</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="728"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="737"/>
         <source>[Whois] %1 is idling for %2 (%3)</source>
         <translation>[Whois] %1 ist seit %2 (%3) inaktiv</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="731"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="740"/>
         <source>[Whois] idle message: %1</source>
         <translation>[Whois] Inaktivmeldung: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="763"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="772"/>
         <source>[Whois] %1 is a user on channels: %2</source>
         <translation>[Whois] %1 ist Benutzer in den Kanälen: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="765"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="774"/>
         <source>[Whois] %1 has voice on channels: %2</source>
         <translation>[Whois] %1 hat Voice in den Kanälen: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="767"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="776"/>
         <source>[Whois] %1 is an operator on channels: %2</source>
         <translation>[Whois] %1 ist Operator in den Kanälen: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="795"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="804"/>
         <source>Channel %1 has %2 users. Topic is: %3</source>
         <translation>Kanal %1 hat %2 Benutzer. Thema ist: %3</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="804"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="813"/>
         <source>End of channel list</source>
         <translation>Ende der Kanalliste</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="883"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="892"/>
         <source>[Who] %1</source>
         <translation>[Who] %1</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="937"/>
         <source>There is a nickname in your identity&apos;s nicklist which contains illegal characters</source>
-        <translation>Ein Spitzname der Spitznamensliste Ihrer Identität enthält ungültige Zeichen</translation>
+        <translation type="obsolete">Ein Spitzname der Spitznamensliste Ihrer Identität enthält ungültige Zeichen</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="938"/>
         <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>Auf Grund eines Fehlers im Unreal IRCs (und evtl. auch anderen IRC-Servern) können wir den fehlerhaften Spitznamen nicht ermitteln</translation>
+        <translation type="obsolete">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="939"/>
         <source>Please use: /nick &lt;othernick&gt; to continue or clean up your nicklist</source>
-        <translation>Bitte benutzen Sie: /nick &lt;andererSpitzname&gt; zum Fortfahren oder säubern Sie Ihre Spitznamensliste</translation>
+        <translation type="obsolete">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="942"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="951"/>
         <source>Nick %1 contains illegal characters</source>
         <translation>Spitzname %1 enthält ungültige Zeichen</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="954"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="962"/>
         <source>Nick already in use: %1</source>
         <translation>Spitzname bereits in Benutzung: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="977"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="987"/>
         <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="480"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="489"/>
         <source>Received RPL_ISUPPORT (005) without parameters!</source>
         <translation>RPL_ISUPPORT (005) ohne Parameter erhalten!</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="488"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="497"/>
         <source>Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!</source>
         <translation>nicht RFC-konformes RPL_ISUPPORT erhalten: Dies kann unerwartete Auswirkungen haben!</translation>
     </message>
@@ -3336,17 +4095,17 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
 <context>
     <name>IrcUserItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="743"/>
+        <location filename="../src/client/networkmodel.cpp" line="780"/>
         <source>idling since %1</source>
         <translation>untätig seit %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="746"/>
+        <location filename="../src/client/networkmodel.cpp" line="783"/>
         <source>login time: %1</source>
         <translation>angemeldet seit: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="749"/>
+        <location filename="../src/client/networkmodel.cpp" line="786"/>
         <source>server: %1</source>
         <translation>Server: %1</translation>
     </message>
@@ -3367,7 +4126,7 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
         <translation type="obsolete">Warte auf Kern...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="594"/>
+        <location filename="../src/qtui/mainwin.cpp" line="665"/>
         <source>Not connected to core.</source>
         <translation>Nicht mit Core verbunden.</translation>
     </message>
@@ -3397,7 +4156,7 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
         <translation type="obsolete">Hilfe</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="280"/>
+        <location filename="../src/qtui/mainwin.cpp" line="316"/>
         <source>Debug</source>
         <translation>Debug</translation>
     </message>
@@ -3452,7 +4211,7 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
         <translation type="obsolete">Quassel konfigurieren...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="227"/>
+        <location filename="../src/qtui/mainwin.cpp" line="249"/>
         <source>F7</source>
         <translation>F7</translation>
     </message>
@@ -3497,32 +4256,32 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
         <translation type="obsolete">Mit Kern verbinden...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="538"/>
+        <location filename="../src/qtui/mainwin.cpp" line="595"/>
         <source>Connected to core.</source>
         <translation>Mit Quassel-Core verbunden.</translation>
     </message>
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="208"/>
         <source>Edit &amp;Networks...</source>
-        <translation>N&amp;etzwerke ändern...</translation>
+        <translation type="obsolete">N&amp;etzwerke ändern...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="372"/>
+        <location filename="../src/qtui/mainwin.cpp" line="410"/>
         <source>Nicks</source>
         <translation>Spitznamen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="392"/>
+        <location filename="../src/qtui/mainwin.cpp" line="430"/>
         <source>Chat Monitor</source>
         <translation>Chatmonitor</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="407"/>
+        <location filename="../src/qtui/mainwin.cpp" line="445"/>
         <source>Inputline</source>
         <translation>Eingabezeile</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="427"/>
+        <location filename="../src/qtui/mainwin.cpp" line="465"/>
         <source>Topic</source>
         <translation>Thema</translation>
     </message>
@@ -3532,17 +4291,17 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
         <translation type="obsolete">Statusleiste</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="245"/>
+        <location filename="../src/qtui/mainwin.cpp" line="267"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="250"/>
+        <location filename="../src/qtui/mainwin.cpp" line="280"/>
         <source>&amp;Networks</source>
         <translation>&amp;Netzwerke</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="265"/>
+        <location filename="../src/qtui/mainwin.cpp" line="301"/>
         <source>&amp;Settings</source>
         <translation>Ein&amp;stellungen</translation>
     </message>
@@ -3552,7 +4311,7 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
         <translation type="obsolete">&amp;Ansichten</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="272"/>
+        <location filename="../src/qtui/mainwin.cpp" line="308"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
@@ -3592,57 +4351,57 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
         <translation type="obsolete">Informationen zum Kern</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="202"/>
+        <location filename="../src/qtui/mainwin.cpp" line="221"/>
         <source>&amp;Connect to Core...</source>
         <translation>Zum Core &amp;verbinden...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="204"/>
+        <location filename="../src/qtui/mainwin.cpp" line="223"/>
         <source>&amp;Disconnect from Core</source>
         <translation>Vom Core &amp;trennen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="206"/>
+        <location filename="../src/qtui/mainwin.cpp" line="225"/>
         <source>Core &amp;Info...</source>
         <translation>Core-&amp;Info...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="210"/>
+        <location filename="../src/qtui/mainwin.cpp" line="229"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="211"/>
+        <location filename="../src/qtui/mainwin.cpp" line="230"/>
         <source>Ctrl+Q</source>
         <translation>Strg+Q</translation>
     </message>
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="214"/>
         <source>&amp;Manage Buffer Views...</source>
-        <translation>&amp;Ansichten verwalten...</translation>
+        <translation type="obsolete">&amp;Ansichten verwalten...</translation>
     </message>
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="216"/>
         <source>&amp;Lock Dock Positions</source>
-        <translation>Fensterleisten &amp;fixieren</translation>
+        <translation type="obsolete">Fensterleisten &amp;fixieren</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="220"/>
+        <location filename="../src/qtui/mainwin.cpp" line="240"/>
         <source>Show &amp;Search Bar</source>
         <translation>&amp;Suchleiste anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="221"/>
+        <location filename="../src/qtui/mainwin.cpp" line="241"/>
         <source>Ctrl+F</source>
         <translation>Strg+F</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="222"/>
+        <location filename="../src/qtui/mainwin.cpp" line="244"/>
         <source>Show Status &amp;Bar</source>
         <translation>St&amp;atusleiste anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="226"/>
+        <location filename="../src/qtui/mainwin.cpp" line="248"/>
         <source>&amp;Configure Quassel...</source>
         <translation>Quassel &amp;konfigurieren...</translation>
     </message>
@@ -3657,65 +4416,95 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
         <translation type="obsolete">Ü&amp;ber Qt...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="234"/>
+        <location filename="../src/qtui/mainwin.cpp" line="256"/>
         <source>Debug &amp;NetworkModel</source>
         <translation>Debug &amp;NetworkModel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="256"/>
+        <location filename="../src/qtui/mainwin.cpp" line="286"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="257"/>
+        <location filename="../src/qtui/mainwin.cpp" line="287"/>
         <source>&amp;Buffer Views</source>
         <translation>&amp;Ansichten</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="381"/>
+        <location filename="../src/qtui/mainwin.cpp" line="419"/>
         <source>Show Nick List</source>
         <translation>Spitznamenliste anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="403"/>
+        <location filename="../src/qtui/mainwin.cpp" line="441"/>
         <source>Show Chat Monitor</source>
         <translation>Chatmonitor anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="416"/>
+        <location filename="../src/qtui/mainwin.cpp" line="454"/>
         <source>Show Input Line</source>
         <translation>Eingabezeile anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="439"/>
+        <location filename="../src/qtui/mainwin.cpp" line="477"/>
         <source>Show Topic Line</source>
         <translation>Thema anzeigen</translation>
     </message>
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="557"/>
         <source>Core Lag: %1 msec</source>
-        <translation>Latenz: %1 msecs</translation>
+        <translation type="obsolete">Latenz: %1 msecs</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="238"/>
+        <location filename="../src/qtui/mainwin.cpp" line="260"/>
         <source>Debug &amp;Log</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="236"/>
+        <location filename="../src/qtui/mainwin.cpp" line="258"/>
         <source>Debug &amp;MessageModel</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="230"/>
+        <location filename="../src/qtui/mainwin.cpp" line="252"/>
         <source>&amp;About Quassel</source>
         <translation>&amp;Über Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="232"/>
+        <location filename="../src/qtui/mainwin.cpp" line="254"/>
         <source>About &amp;Qt</source>
         <translation>Ü&amp;ber Qt</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="227"/>
+        <source>Configure &amp;Networks...</source>
+        <translation>&amp;Netzwerke konfigurieren...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="233"/>
+        <source>&amp;Configure Buffer Views...</source>
+        <translation>&amp;Ansichten konfigurieren...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="236"/>
+        <source>&amp;Lock Layout</source>
+        <translation>Ansicht &amp;fixieren</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="242"/>
+        <source>Show Away Log</source>
+        <translation>Abwesenheitslog anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="289"/>
+        <source>&amp;Toolbars</source>
+        <translation>&amp;Werkzeugleiste</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="629"/>
+        <source>Core Lag: %1</source>
+        <translation>Latenz: %1</translation>
+    </message>
 </context>
 <context>
     <name>Message</name>
@@ -3763,7 +4552,7 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
 <context>
     <name>MessageModel</name>
     <message>
-        <location filename="../src/client/messagemodel.cpp" line="370"/>
+        <location filename="../src/client/messagemodel.cpp" line="362"/>
         <source>Requesting %1 messages from backlog for buffer %2:%3</source>
         <translation>Lade %1 Nachrichten von Verlauf für Fenster %2:%3</translation>
     </message>
@@ -3778,7 +4567,60 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
     <message>
         <location filename="../src/qtui/ui/msgprocessorstatuswidget.ui" line="34"/>
         <source>Processing Messages</source>
-        <translation>Verarbeite Verlauf</translation>
+        <translation type="obsolete">Verarbeite Verlauf</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/msgprocessorstatuswidget.ui" line="34"/>
+        <source>Receiving Backlog</source>
+        <translation>Empfange Rückspeicher</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkAddDlg</name>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="13"/>
+        <source>Add Network</source>
+        <translation>Netzwerk hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="21"/>
+        <source>Use preset:</source>
+        <translation>Voreinstellung benutzen:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="56"/>
+        <source>Manually specify network settings</source>
+        <translation>Netzwerkeinstellungen manuell einstellen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="66"/>
+        <source>Manual Settings</source>
+        <translation>Manuelle Einstellungen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="74"/>
+        <source>Network name:</source>
+        <translation>Netzwerkname:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="84"/>
+        <source>Server address:</source>
+        <translation>Serveradresse:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="94"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="114"/>
+        <source>Server password:</source>
+        <translation>Serverpasswort:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="130"/>
+        <source>Use secure connection</source>
+        <translation>Gesicherte Verbindung benutzen</translation>
     </message>
 </context>
 <context>
@@ -3822,7 +4664,7 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
         <translation>Bitte geben Sie einen Netzwerknamen ein:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="646"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="699"/>
         <source>Add Network</source>
         <translation>Netzwerk hinzufügen</translation>
     </message>
@@ -3830,17 +4672,17 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
 <context>
     <name>NetworkItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="167"/>
+        <location filename="../src/client/networkmodel.cpp" line="178"/>
         <source>Server: %1</source>
         <translation>Server: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="168"/>
+        <location filename="../src/client/networkmodel.cpp" line="179"/>
         <source>Users: %1</source>
         <translation>Benutzer: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="171"/>
+        <location filename="../src/client/networkmodel.cpp" line="182"/>
         <source>Lag: %1 msecs</source>
         <translation>Latenz: %1 msecs</translation>
     </message>
@@ -3848,17 +4690,17 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
 <context>
     <name>NetworkModel</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="768"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Buffer</source>
         <translation>Fenster</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="768"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Topic</source>
         <translation>Thema</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="768"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Nick Count</source>
         <translation>Spitznamenzähler</translation>
     </message>
@@ -3868,112 +4710,102 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="40"/>
         <source>Connect</source>
-        <translation>Verbinden</translation>
+        <translation type="obsolete">Verbinden</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="41"/>
         <source>Disconnect</source>
-        <translation>Trenne Verbindung</translation>
+        <translation type="obsolete">Trenne Verbindung</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="43"/>
         <source>Join</source>
-        <translation>Beitreten</translation>
+        <translation type="obsolete">Beitreten</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="44"/>
         <source>Part</source>
-        <translation>Verlassen</translation>
+        <translation type="obsolete">Verlassen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="45"/>
         <source>Delete Buffer...</source>
-        <translation>Verlauf löschen...</translation>
+        <translation type="obsolete">Verlauf löschen...</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="48"/>
         <source>Joins</source>
-        <translation>Joins</translation>
+        <translation type="obsolete">Joins</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="49"/>
         <source>Parts</source>
-        <translation>Parts</translation>
+        <translation type="obsolete">Parts</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="50"/>
         <source>Quits</source>
-        <translation>Quits</translation>
+        <translation type="obsolete">Quits</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="51"/>
         <source>Nick Changes</source>
-        <translation>Spitznamenänderungen</translation>
+        <translation type="obsolete">Spitznamenänderungen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="52"/>
         <source>Mode Changes</source>
-        <translation>Modiänderungen</translation>
+        <translation type="obsolete">Modiänderungen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="53"/>
         <source>Day Changes</source>
-        <translation>Tageswechsel</translation>
+        <translation type="obsolete">Tageswechsel</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="54"/>
         <source>Apply to All Chat Views...</source>
-        <translation>Auf alle Chatansichten anwenden...</translation>
+        <translation type="obsolete">Auf alle Chatansichten anwenden...</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="56"/>
         <source>Join Channel...</source>
-        <translation>Kanal beitreteten...</translation>
+        <translation type="obsolete">Kanal beitreteten...</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="60"/>
         <source>Whois</source>
-        <translation>Whois</translation>
+        <translation type="obsolete">Whois</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="62"/>
         <source>Version</source>
-        <translation>Version</translation>
+        <translation type="obsolete">Version</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="63"/>
         <source>Time</source>
-        <translation>Zeit</translation>
-    </message>
-    <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="64"/>
-        <source>Ping</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="65"/>
-        <source>Finger</source>
-        <translation></translation>
+        <translation type="obsolete">Zeit</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="67"/>
         <source>Give Operator Status</source>
-        <translation>Operator-Status geben</translation>
+        <translation type="obsolete">Operator-Status geben</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="68"/>
         <source>Take Operator Status</source>
-        <translation>Operator-Status nehmen</translation>
+        <translation type="obsolete">Operator-Status nehmen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="69"/>
         <source>Give Voice</source>
-        <translation>Voice geben</translation>
+        <translation type="obsolete">Voice geben</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="70"/>
         <source>Take Voice</source>
-        <translation>Voice nehmen</translation>
+        <translation type="obsolete">Voice nehmen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="65"/>
@@ -3998,87 +4830,134 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="75"/>
         <source>Hide Buffer(s) Temporarily</source>
-        <translation>Fenster temporär ausblenden</translation>
+        <translation type="obsolete">Fenster temporär ausblenden</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="76"/>
         <source>Hide Buffer(s) Permanently</source>
-        <translation>Fenster permanent ausblenden</translation>
+        <translation type="obsolete">Fenster permanent ausblenden</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="77"/>
         <source>Show Channel List</source>
-        <translation>Zeige Kanalliste</translation>
+        <translation type="obsolete">Zeige Kanalliste</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="78"/>
         <source>Show Ignore List</source>
-        <translation>Zeige Ignorieren-Liste</translation>
+        <translation type="obsolete">Zeige Ignorieren-Liste</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="93"/>
         <source>Hide Events</source>
-        <translation>Meldungen ausblenden</translation>
+        <translation type="obsolete">Meldungen ausblenden</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="482"/>
         <source>Remove buffer permanently?</source>
-        <translation>Verlauf permanent löschen?</translation>
+        <translation type="obsolete">Verlauf permanent löschen?</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="484"/>
         <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>Möchten Sie den Verlauf &quot;%1&quot; permanent löschen? Hierdurch werden alle in Verbindung stehenden Daten - inklusive des gesamten Rückspeichers - aus der Core-Datenbank gelöscht!</translation>
+        <translation type="obsolete">Möchten Sie den Verlauf &quot;%1&quot; permanent löschen? Hierdurch werden alle in Verbindung stehenden Daten - inklusive des gesamten Rückspeichers - aus der Core-Datenbank gelöscht!</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="546"/>
         <source>Join Channel</source>
-        <translation>Kanal beitreten</translation>
+        <translation type="obsolete">Kanal beitreten</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="546"/>
         <source>Input channel name:</source>
-        <translation>Kanalnamen eingeben:</translation>
+        <translation type="obsolete">Kanalnamen eingeben:</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="46"/>
         <source>Show Buffer</source>
-        <translation>Fenster anzeigen</translation>
+        <translation type="obsolete">Fenster anzeigen</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="58"/>
         <source>Start Query</source>
-        <translation>Dialog starten</translation>
+        <translation type="obsolete">Dialog starten</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="59"/>
+        <source>Show Query</source>
+        <translation type="obsolete">Dialog anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="71"/>
+        <source>Kick From Channel</source>
+        <translation type="obsolete">Aus Kanal werfen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="72"/>
+        <source>Ban From Channel</source>
+        <translation type="obsolete">Vom Kanal bannen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="73"/>
+        <source>Kick &amp;&amp; Ban</source>
+        <translation type="obsolete">Rauswerfen und bannen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="113"/>
+        <source>Actions</source>
+        <translation type="obsolete">Aktionen</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkModelController</name>
+    <message numerus="yes">
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="152"/>
+        <source>Do you want to delete the following buffer(s) permanently?</source>
+        <translation>
+            <numerusform>Wollen Sie dieses Fenster wirklich permanent löschen?</numerusform>
+            <numerusform>Wollen Sie diese Fenster wirklich permanent löschen?</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="157"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; This will delete all related data, including all backlog data, from the core&apos;s database and cannot be undone.</source>
+        <translation>&lt;b&gt;Achtung:&lt;/b&gt; Diese Aktion wird alle betroffenen Daten, einschließlich dem Rückspeicher, vom Core entfernen. Kann nich rückgängig gemacht werden.</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="59"/>
-        <source>Show Query</source>
-        <translation>Dialog anzeigen</translation>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="159"/>
+        <source>&lt;br&gt;Active channel buffers cannot be deleted, please part the channel first.</source>
+        <translation>&lt;br&gt;Aktive Channelfenster können nicht gelöscht werden. Bitte den Kanal erst verlassen.</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="71"/>
-        <source>Kick From Channel</source>
-        <translation>Aus Kanal werfen</translation>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="161"/>
+        <source>Remove buffers permanently?</source>
+        <translation>Verläufe permanent löschen?</translation>
     </message>
+</context>
+<context>
+    <name>NetworkModelController::JoinDlg</name>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="72"/>
-        <source>Ban From Channel</source>
-        <translation>Vom Kanal bannen</translation>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="417"/>
+        <source>Join Channel</source>
+        <translation>Kanal beitreten</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="73"/>
-        <source>Kick &amp;&amp; Ban</source>
-        <translation>Rauswerfen und bannen</translation>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="420"/>
+        <source>Network:</source>
+        <translation>Netzwerk:</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="101"/>
-        <source>CTCP</source>
-        <translation></translation>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="422"/>
+        <source>Channel:</source>
+        <translation>Kanal:</translation>
     </message>
+</context>
+<context>
+    <name>NetworkPage</name>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="113"/>
-        <source>Actions</source>
-        <translation>Aktionen</translation>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="148"/>
+        <source>Setup Network Connection</source>
+        <translation>Netzwerkverbindung konfigurieren</translation>
     </message>
 </context>
 <context>
@@ -4086,55 +4965,55 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="33"/>
         <source>General</source>
-        <translation>Allgemein</translation>
+        <translation type="obsolete">Allgemein</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="33"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
         <source>Networks</source>
         <translation>Netzwerke</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="155"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="160"/>
         <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;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="156"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="161"/>
         <source>&lt;li&gt;All networks need at least one server defined&lt;/li&gt;</source>
         <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="157"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="162"/>
         <source>&lt;/ul&gt;</source>
         <translation>&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="158"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="163"/>
         <source>Invalid Network Settings</source>
         <translation>Ungültige Netzwerkeinstellungen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="195"/>
         <source>Connect</source>
-        <translation>Verbinde</translation>
+        <translation type="obsolete">Verbinde</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="198"/>
         <source>Disconnect</source>
-        <translation>Trenne Verbindung</translation>
+        <translation type="obsolete">Trenne Verbindung</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="202"/>
         <source>Apply first!</source>
-        <translation>Zuerst anwenden!</translation>
+        <translation type="obsolete">Zuerst anwenden!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="544"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="546"/>
         <source>Delete Network?</source>
         <translation>Netzwerk löschen?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="545"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="547"/>
         <source>Do you really want to delete the network &quot;%1&quot; and all related settings, including the backlog?</source>
         <translation>Wollen Sie das Netzwerk &quot;%1&quot; und alle damit verbundenen Einstellungen inklusive des Rückspeichers wirklich löschen?</translation>
     </message>
@@ -4144,205 +5023,205 @@ Fortfahren bedeutet die unverschlüsselte Übertragung Ihres SSL-Schlüssels und
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="37"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="47"/>
         <source>Re&amp;name...</source>
         <translation>Umbe&amp;nennen...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="217"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="234"/>
         <source>&amp;Add...</source>
         <translation>&amp;Hinzufügen...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="234"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="251"/>
         <source>De&amp;lete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="110"/>
         <source>Connect now</source>
-        <translation>Jetzt verbinden</translation>
+        <translation type="obsolete">Jetzt verbinden</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="130"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="123"/>
         <source>Network Details</source>
         <translation>Netzwerkdetails</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="138"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="131"/>
         <source>Identity:</source>
         <translation>Identität:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="170"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="189"/>
         <source>Servers</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="173"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="192"/>
         <source>Manage servers for this network</source>
         <translation>Server für dieses Netzwerk verwalten</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="199"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="216"/>
         <source>&amp;Edit...</source>
         <translation>Änd&amp;ern...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="260"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="277"/>
         <source>Move upwards in list</source>
         <translation>In Liste nach oben verschieben</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="277"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="294"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="274"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="291"/>
         <source>Move downwards in list</source>
         <translation>In Liste nach unten verschieben</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="323"/>
         <source>Choose random server for connecting</source>
-        <translation>Beim Verbinden zufälligen Server wählen</translation>
+        <translation type="obsolete">Beim Verbinden zufälligen Server wählen</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="331"/>
         <source>Perform</source>
-        <translation>Ausführen</translation>
+        <translation type="obsolete">Ausführen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="334"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="339"/>
         <source>Configure automatic identification or misc. commands to be executed after connecting to a server</source>
         <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="340"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="345"/>
         <source>Commands to execute on connect:</source>
         <translation>Beim Verbinden auszuführende Befehle:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="350"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="361"/>
         <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>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="364"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="500"/>
         <source>Auto Identify</source>
         <translation>Auto-Identifizieren</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="379"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="515"/>
         <source>NickServ</source>
         <translation>NickServ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="396"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="532"/>
         <source>Service:</source>
         <translation>Service:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="406"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="542"/>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="417"/>
         <source>Advanced</source>
-        <translation>Erweitert</translation>
+        <translation type="obsolete">Erweitert</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="420"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="569"/>
         <source>Configure advanced settings such as message encodings and automatic reconnect</source>
         <translation>Erweiterte Einstellungen wie Meldungskodierung und automatisches Wiederverbinden konfigurieren</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="429"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="578"/>
         <source>Control encodings for in- and outgoing messages</source>
         <translation>Kodierung für ein- und abgehende Meldungen kontrollieren</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="432"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="566"/>
         <source>Encodings</source>
         <translation>Kodierungen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="460"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="612"/>
         <source>Specify which encoding your messages will be sent in.
 UTF-8 should be a sane choice for most networks.</source>
         <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="444"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="596"/>
         <source>Send messages in:</source>
         <translation>Meldungen senden in:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="491"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="643"/>
         <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>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="475"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="627"/>
         <source>Receive fallback:</source>
         <translation>Fallback für Empfang:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="516"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="668"/>
         <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>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="506"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="658"/>
         <source>Server encoding:</source>
         <translation>Serverkodierung:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="529"/>
         <source>Use default settings for encodings (recommended)</source>
-        <translation>Standardeinstellungen für Kodierungen verwenden (empfohlen)</translation>
+        <translation type="obsolete">Standardeinstellungen für Kodierungen verwenden (empfohlen)</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="532"/>
         <source>Use defaults</source>
-        <translation>Standardwerte benutzen</translation>
+        <translation type="obsolete">Standardwerte benutzen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="548"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="382"/>
         <source>Control automatic reconnect to the network</source>
         <translation>Automatisches Wiederverbinden zum Netzwerk kontrollieren</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="551"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="385"/>
         <source>Automatic Reconnect</source>
         <translation>Automatisches Wiederverbinden</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="562"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="396"/>
         <source>Interval:</source>
         <translation>Intervall:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="585"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="419"/>
         <source>Retries:</source>
         <translation>Wiederversuche:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="605"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="439"/>
         <source>Unlimited</source>
         <translation>Unbegrenzt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="617"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="464"/>
         <source>Rejoin all channels on reconnect</source>
         <translation>Allen Kanälen beim Wiederverbinden erneut beitreten</translation>
     </message>
@@ -4352,15 +5231,35 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
         <translation type="obsolete">s</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="569"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="403"/>
         <source> s</source>
         <translation> s</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
+        <source>Misc</source>
+        <translation>Verschiedenes</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="336"/>
+        <source>Commands</source>
+        <translation>Befehle</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="373"/>
+        <source>Connection</source>
+        <translation>Verbindung</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="581"/>
+        <source>Use Custom Encodings</source>
+        <translation>Spezifische Kodierung verwenden</translation>
+    </message>
 </context>
 <context>
     <name>NickEditDlg</name>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="708"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="416"/>
         <source>Add Nickname</source>
         <translation>Spitznamen hinzufügen</translation>
     </message>
@@ -4476,7 +5375,7 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
     <message>
         <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Verhalten</translation>
+        <translation type="obsolete">Verhalten</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
@@ -4518,6 +5417,11 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
         <source>Timeout</source>
         <translation type="obsolete">Zeitüberschreitung</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
+        <source>Appearance</source>
+        <translation>Erscheinungsbild</translation>
+    </message>
 </context>
 <context>
     <name>PhononNotificationBackend::ConfigWidget</name>
@@ -4548,7 +5452,7 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="54"/>
+        <location filename="../src/client/backlogrequester.cpp" line="65"/>
         <source>Requesting a total of up to %1 backlog messages for %2 buffers</source>
         <translation>Lade insgesamt %1 Nachrichten vom Verlauf von %2 Fenstern</translation>
     </message>
@@ -4558,15 +5462,25 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
         <translation type="obsolete">Zur Zwischenablage kopieren</translation>
     </message>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="78"/>
+        <location filename="../src/client/backlogrequester.cpp" line="89"/>
         <source>Requesting up to %1 of all unread backlog messages (plus additional %2)</source>
         <translation>Lade insgesamt %1 ungelesene Nachrichten (und weitere %2)</translation>
     </message>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="96"/>
+        <location filename="../src/client/backlogrequester.cpp" line="107"/>
         <source>Requesting a total of up to %1 unread backlog messages for %2 buffers</source>
         <translation>Lade insgesamt %1 ungelese Nachrichten in %2 Fenster</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="56"/>
+        <source>Welcome to Quassel IRC</source>
+        <translation>Willkommen zu Quassel IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="59"/>
+        <source>This wizard will help you to set up your default identity and your IRC network connection.&lt;br&gt;This only covers basic settings. You can cancel this wizard any time and use the settings dialog for more detailed changes.</source>
+        <translation>Dieser Dialog wird Ihnen helfen, Ihre Identität und ihre IRC-Verbindungen auszuwählen.&lt;br&gt;Dies schließt nur die wichtigsten Einstellungen mit ein. Sie können diesen Dialog jederzeit schließen und in den Einstellungen weitere Modifikationen vornehmen.</translation>
+    </message>
 </context>
 <context>
     <name>QShortcut</name>
@@ -4633,27 +5547,27 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
 <context>
     <name>Quassel::secondsToString()</name>
     <message>
-        <location filename="../src/common/util.cpp" line="211"/>
+        <location filename="../src/common/util.cpp" line="129"/>
         <source>year</source>
         <translation>Jahr</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="212"/>
+        <location filename="../src/common/util.cpp" line="130"/>
         <source>day</source>
         <translation>Tag</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="213"/>
+        <location filename="../src/common/util.cpp" line="131"/>
         <source>h</source>
         <translation>Std.</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="214"/>
+        <location filename="../src/common/util.cpp" line="132"/>
         <source>min</source>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="215"/>
+        <location filename="../src/common/util.cpp" line="133"/>
         <source>sec</source>
         <translation>Sek.</translation>
     </message>
@@ -4661,7 +5575,7 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
 <context>
     <name>QueryBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="354"/>
+        <location filename="../src/client/networkmodel.cpp" line="380"/>
         <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
         <translation>&lt;b&gt;Dialog mit %1&lt;/b&gt;</translation>
     </message>
@@ -4671,17 +5585,17 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
         <translation type="obsolete">Abwesenheitsmeldung: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="372"/>
+        <location filename="../src/client/networkmodel.cpp" line="398"/>
         <source>idling since %1</source>
         <translation>nichtstuend seit %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="375"/>
+        <location filename="../src/client/networkmodel.cpp" line="401"/>
         <source>login time: %1</source>
         <translation>Anmeldezeitpunkt: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="378"/>
+        <location filename="../src/client/networkmodel.cpp" line="404"/>
         <source>server: %1</source>
         <translation>Server: %1</translation>
     </message>
@@ -4823,32 +5737,32 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="75"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="87"/>
         <source>Save changes</source>
         <translation>Einstellungen speichern</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="76"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="88"/>
         <source>There are unsaved changes on the current configuration page. Would you like to apply your changes now?</source>
         <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="151"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="164"/>
         <source>Reload Settings</source>
         <translation>Einstellungen neu laden</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="151"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="164"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <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="160"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="173"/>
         <source>Restore Defaults</source>
         <translation>Standards wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="160"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="173"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation>Möchten Sie die Standardwerte für diese Seite wiederherstellen?</translation>
     </message>
@@ -4857,26 +5771,31 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
         <source>Configure Quassel</source>
         <translation>Quassel konfigurieren</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingsdlg.cpp" line="99"/>
+        <source>Configure %1</source>
+        <translation>Konfiguriere %1</translation>
+    </message>
 </context>
 <context>
     <name>SettingsPageDlg</name>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="104"/>
         <source>Reload Settings</source>
         <translation>Einstellungen neu laden</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="104"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <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"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="113"/>
         <source>Restore Defaults</source>
         <translation>Standards wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="113"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation>Möchten Sie die Standardwerte für diese Seite wiederherstellen?</translation>
     </message>
@@ -4890,16 +5809,21 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="36"/>
+        <source>Configure %1</source>
+        <translation>Konfiguriere %1</translation>
+    </message>
 </context>
 <context>
     <name>SignalProxy</name>
     <message>
         <location filename="../src/common/signalproxy.cpp" line="1094"/>
         <source>Client tried to send package larger than max package size!</source>
-        <translation>Client versuchte Paket größer als max. Paketgröße zu senden!</translation>
+        <translation type="obsolete">Client versuchte Paket größer als max. Paketgröße zu senden!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1273"/>
+        <location filename="../src/common/signalproxy.cpp" line="1088"/>
         <source>Disconnecting</source>
         <translation>Trenne</translation>
     </message>
@@ -4911,41 +5835,212 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
     <message>
         <location filename="../src/common/signalproxy.cpp" line="1099"/>
         <source>Client tried to send 0 byte package!</source>
-        <translation>Client versuchte 0-byte-package zu senden!</translation>
+        <translation type="obsolete">Client versuchte 0-byte-package zu senden!</translation>
     </message>
     <message>
         <location filename="../src/common/signalproxy.cpp" line="1116"/>
         <source>Client sent corrupted compressed data!</source>
-        <translation>Client hat falsch komprimierte Daten gesendet!</translation>
+        <translation type="obsolete">Client hat falsch komprimierte Daten gesendet!</translation>
     </message>
     <message>
         <location filename="../src/common/signalproxy.cpp" line="1131"/>
         <source>Client sent corrupt data: unable to load QVariant!</source>
+        <translation type="obsolete">Client hat beschädigte Daten gesendet. QVariant kann nicht geladen werden!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="951"/>
+        <source>Peer tried to send package larger than max package size!</source>
+        <translation>Client versuchte Paket größer als max. Paketgröße zu senden!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="956"/>
+        <source>Peer tried to send 0 byte package!</source>
+        <translation>Client versuchte 0-byte-package zu senden!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="973"/>
+        <source>Peer sent corrupted compressed data!</source>
+        <translation>Client hat falsch komprimierte Daten gesendet!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="988"/>
+        <source>Peer sent corrupt data: unable to load QVariant!</source>
         <translation>Client hat beschädigte Daten gesendet. QVariant kann nicht geladen werden!</translation>
     </message>
 </context>
+<context>
+    <name>SimpleNetworkEditor</name>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="28"/>
+        <source>Network name:</source>
+        <translation>Netzwerkname:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="35"/>
+        <source>The name of the IRC network you are configuring</source>
+        <translation>Der Name des IRC-Netzwerks, dass Sie gerade bearbeiten</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="63"/>
+        <source>Servers</source>
+        <translation>Server</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="81"/>
+        <source>A list of IRC servers belonging to this network</source>
+        <translation>Eine Liste von IRC-Servern die zu diesem Netzwerk gehören</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="96"/>
+        <source>Edit this server entry</source>
+        <translation>Diesen Servereintrag editieren</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="99"/>
+        <source>&amp;Edit...</source>
+        <translation>Änd&amp;ern...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="116"/>
+        <source>Add another IRC server</source>
+        <translation>IRC-Server hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="119"/>
+        <source>&amp;Add...</source>
+        <translation>&amp;Hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="136"/>
+        <source>Remove this server entry from the list</source>
+        <translation>Diesen Server von der Liste entfernen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="139"/>
+        <source>De&amp;lete</source>
+        <translation>&amp;Löschen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="165"/>
+        <source>Move upwards in list</source>
+        <translation>In Liste nach oben verschieben</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="182"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="179"/>
+        <source>Move downwards in list</source>
+        <translation>In Liste nach unten verschieben</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="226"/>
+        <source>Join Channels Automatically</source>
+        <translation>Kanäle automatisch joinen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="250"/>
+        <source>A list of IRC channels you will join automatically after connecting to the network</source>
+        <translation>Eine Liste von IRC-Kanälen, die Sie automatischen nach dem Verbinden joinen</translation>
+    </message>
+</context>
 <context>
     <name>SqliteStorage</name>
     <message>
-        <location filename="../src/core/sqlitestorage.cpp" line="52"/>
+        <location filename="../src/core/sqlitestorage.cpp" line="51"/>
         <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 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-Core seine Daten auf dem selben Rechner, auf dem er auch läuft, speichern soll und Sie nur mit ein paar Benutzern auf Ihrem Core rechnen.</translation>
     </message>
 </context>
+<context>
+    <name>SslCertDisplayDialog</name>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="568"/>
+        <source>SSL Certificate used by %1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="572"/>
+        <source>Issuer Info</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="583"/>
+        <source>Organization:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="584"/>
+        <source>Locality Name:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="585"/>
+        <source>Organizational Unit Name:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="586"/>
+        <source>Country Name:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="587"/>
+        <source>State or Province Name:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="581"/>
+        <source>Subject Info</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="590"/>
+        <source>Additional Info</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="592"/>
+        <source>Valid From:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="593"/>
+        <source>Valid To:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="596"/>
+        <source>Hostname %1:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="600"/>
+        <source>E-Mail Address %1:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="602"/>
+        <source>Digest:</source>
+        <translation></translation>
+    </message>
+</context>
 <context>
     <name>StatusBufferItem</name>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="294"/>
         <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Statusfenster von %1&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Statusfenster von %1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="296"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
-        <translation>&lt;p&gt; %1 &lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.h" line="130"/>
+        <location filename="../src/client/networkmodel.h" line="139"/>
         <source>Status Buffer</source>
         <translation>Statusfenster</translation>
     </message>
@@ -4953,17 +6048,17 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
 <context>
     <name>SystrayNotificationBackend::ConfigWidget</name>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="123"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="106"/>
         <source>System Tray Icon</source>
         <translation>Systemleistensymbol</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="124"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="107"/>
         <source>Animate</source>
         <translation>Animieren</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="126"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="109"/>
         <source>Show bubble</source>
         <translation>Sprechblasen anzeigen</translation>
     </message>
@@ -4991,6 +6086,149 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
         <translation> s</translation>
     </message>
 </context>
+<context>
+    <name>ToolBarActionProvider</name>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect</source>
+        <translation>Verbinden</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect to IRC</source>
+        <translation>Zum IRC verbinden</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect</source>
+        <translation>Trennen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect from IRC</source>
+        <translation>Vom IRC trennen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Part</source>
+        <translation>Verlassen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Leave currently selected channel</source>
+        <translation>Markierten Kanal verlassen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join</source>
+        <translation>Beitreten</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join a channel</source>
+        <translation>Kanal beitreten</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Query</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Start a private conversation</source>
+        <translation>Privates Gespräch (Query) starten</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Whois</source>
+        <translation>Whois</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Request user information</source>
+        <translation>Benutzerinfo anfordern</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Op</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Give operator privileges to user</source>
+        <translation>Operator-Status geben</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Deop</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Take operator privileges from user</source>
+        <translation>Operator-Status nehmen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Voice</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Give voice to user</source>
+        <translation>Voice geben</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Devoice</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Take voice from user</source>
+        <translation>Voice nehmen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Kick</source>
+        <translation>Kicken</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Remove user from channel</source>
+        <translation>Nick vom Kanal kicken</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban</source>
+        <translation>Bannen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban user from channel</source>
+        <translation>Nick vom Kanal verbannen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Kick/Ban</source>
+        <translation>Rauswerfen/Verbannen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Remove and ban user from channel</source>
+        <translation>Nick vom Kanal kicken und verbannen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="54"/>
+        <source>Connect to all</source>
+        <translation>Zu allen verbinden</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="61"/>
+        <source>Disconnect from all</source>
+        <translation>Von allen trennen</translation>
+    </message>
+</context>
 <context>
     <name>TopicLabel</name>
     <message>
@@ -5053,122 +6291,122 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
 <context>
     <name>UiStyle::StyledMessage</name>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="328"/>
         <source>%D0%1</source>
         <translation>%D0%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="339"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="330"/>
         <source>%Dn%1</source>
         <translation>%Dn%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="341"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="332"/>
         <source>%Ds%1</source>
         <translation>%Ds%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="343"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="334"/>
         <source>%De%1</source>
         <translation>%De%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="345"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
         <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
         <translation>%Dj%DN%1%DN %DH(%2@%3)%DH hat %DC%4%DC betreten</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="347"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="338"/>
         <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
         <translation>%Dp%DN%1%DN %DH(%2@%3)%DH hat %DC%4%DC verlassen</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="351"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="342"/>
         <source>%Dq%DN%1%DN %DH(%2@%3)%DH has quit</source>
         <translation>%Dq%DN%1%DN %DH(%2@%3)%DH hat den Chat verlassen</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="358"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="348"/>
         <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
         <translation>%Dk%DN%1%DN hat %DN%2%DN aus %DC%3%DC geworfen</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="363"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="353"/>
         <source>%DrYou are now known as %DN%1%DN</source>
         <translation>%DrSie sind jetzt als %DN%1%DN bekannt</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="364"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="354"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
         <translation>%Dr%DN%1%DN ist jetzt als %DN%2%DN bekannt</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="367"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="357"/>
         <source>%DmUser mode: %DM%1%DM</source>
         <translation>%DmBenutzermodus: %DM%1%DM</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="368"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="358"/>
         <source>%DmMode %DM%1%DM by %DN%2%DN</source>
         <translation>%DmModus %DM%1%DM by %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="371"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="361"/>
         <source>%Da%DN%1%DN %2</source>
         <translation>%Da%DN%1%DN %2</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="375"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="364"/>
         <source>%De[%1]</source>
         <translation>%De[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="401"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="386"/>
         <source>&lt;%1&gt;</source>
         <translation>&lt;%1&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="403"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="388"/>
         <source>[%1]</source>
         <translation>[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="407"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="392"/>
         <source>*</source>
         <translation>*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="409"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="394"/>
         <source>--&gt;</source>
         <translation>--&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="413"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="398"/>
         <source>&lt;--</source>
         <translation>&lt;--</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="415"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="400"/>
         <source>&lt;-*</source>
         <translation>&lt;-*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="417"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="402"/>
         <source>&lt;-&gt;</source>
         <translation>&lt;-&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="419"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="404"/>
         <source>***</source>
         <translation>***</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="421"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="406"/>
         <source>-*-</source>
         <translation>-*-</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="423"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="408"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
@@ -5176,7 +6414,7 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
 <context>
     <name>UserCategoryItem</name>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="619"/>
+        <location filename="../src/client/networkmodel.cpp" line="656"/>
         <source>%n Owner(s)</source>
         <translation>
             <numerusform>%n Besitzer</numerusform>
@@ -5184,7 +6422,7 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="620"/>
+        <location filename="../src/client/networkmodel.cpp" line="657"/>
         <source>%n Admin(s)</source>
         <translation>
             <numerusform>%n Admin(s)</numerusform>
@@ -5192,7 +6430,7 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="621"/>
+        <location filename="../src/client/networkmodel.cpp" line="658"/>
         <source>%n Operator(s)</source>
         <translation>
             <numerusform>%n Operator</numerusform>
@@ -5200,7 +6438,7 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="622"/>
+        <location filename="../src/client/networkmodel.cpp" line="659"/>
         <source>%n Half-Op(s)</source>
         <translation>
             <numerusform>%n Half-Op(s)</numerusform>
@@ -5208,7 +6446,7 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="623"/>
+        <location filename="../src/client/networkmodel.cpp" line="660"/>
         <source>%n Voiced</source>
         <translation>
             <numerusform>%n Voiced</numerusform>
@@ -5216,7 +6454,7 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="624"/>
+        <location filename="../src/client/networkmodel.cpp" line="661"/>
         <source>%n User(s)</source>
         <translation>
             <numerusform>%n Benutzer</numerusform>
@@ -5227,9 +6465,14 @@ Lassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was S
 <context>
     <name>UserInputHandler</name>
     <message>
-        <location filename="../src/core/userinputhandler.cpp" line="130"/>
+        <location filename="../src/core/userinputhandler.cpp" line="138"/>
         <source>sending CTCP-%1 request</source>
         <translation>sende CTCP-%1-Anfrage</translation>
     </message>
+    <message>
+        <location filename="../src/core/userinputhandler.cpp" line="69"/>
+        <source>away</source>
+        <translation></translation>
+    </message>
 </context>
 </TS>
index b15a96f..fbb914a 100644 (file)
@@ -78,12 +78,12 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">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.ui" line="17"/>
         <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.ui" line="59"/>
         <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;
@@ -91,7 +91,7 @@ p, li { white-space: pre-wrap; }
         <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.ui" line="75"/>
         <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;
@@ -99,22 +99,22 @@ p, li { white-space: pre-wrap; }
         <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="114"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="115"/>
         <source>&amp;About</source>
         <translation>&amp;À Propos</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="134"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="135"/>
         <source>A&amp;uthors</source>
         <translation>A&amp;uteurs</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="154"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="155"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Contributeurs</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="174"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="175"/>
         <source>&amp;Thanks To</source>
         <translation>&amp;Remerciements</translation>
     </message>
@@ -131,21 +131,31 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="118"/>
         <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&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;Qt Software formerly known as 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;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s&lt;/dd&gt;</source>
-        <translation>Remerciements particuliers à:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;pour son grand travail artistique et pour le logo Quassel&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;pour la création del a majorité des autres belles icones que vous pouvez voir dans Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software précédemment nommée Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;pour la création de Qt et Qtopia, et comme sponsor du developpement de QuasselTopia avec Greenphones et d&apos;autres&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;pour garder en vie Qt, et pour sponsoriser le developpement de Quassel Mobile avec N810s&lt;/dd&gt;</translation>
+        <translation type="obsolete">Remerciements particuliers à:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;pour son grand travail artistique et pour le logo Quassel&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;pour la création del a majorité des autres belles icones que vous pouvez voir dans Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software précédemment nommée Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;pour la création de Qt et Qtopia, et comme sponsor du developpement de QuasselTopia avec Greenphones et d&apos;autres&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;pour garder en vie Qt, et pour sponsoriser le developpement de Quassel Mobile avec N810s&lt;/dd&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
         <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 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;Un Client IRC distribué et moderne&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 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="125"/>
+        <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/quassel-eye.png&quot;&gt;&amp;nbsp;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for the original Quassel icon - The All-Seeing Eye&lt;/dt&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/oxygen.png&quot;&gt;&amp;nbsp;&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 all the artwork you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/qt-logo-32.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software formerly known as 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;&lt;dt&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;&lt;img src=&quot;:/pics/nokia.png&quot;&gt;&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s&lt;/dd&gt;</source>
+        <translation>Remerciements particuliers à:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/quassel-eye.png&quot;&gt;&amp;nbsp;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;pour son grand travail artistique et pour le logo Quassel&lt;/dt&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/oxygen.png&quot;&gt;&amp;nbsp;&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;pour la création de la majorité des autres belles icones que vous pouvez voir dans Quassel&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/qt-logo-32.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software précédemment nommée Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;pour la création de Qt et Qtopia, et comme sponsor du developpement de QuasselTopia avec Greenphones et d&apos;autres&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;&lt;img src=&quot;:/pics/nokia.png&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;pour garder en vie Qt, et pour sponsoriser le developpement de Quassel Mobile avec N810s&lt;/dd&gt;</translation>
+    </message>
 </context>
 <context>
     <name>AbstractSqlStorage</name>
     <message>
-        <location filename="../src/core/abstractsqlstorage.cpp" line="103"/>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="110"/>
         <source>Installed Schema (version %1) is not up to date. Upgrading to version %2...</source>
         <translation>Le schéma installé (version %1) n&apos;est pas à jour. Mise à jour à la version %2...</translation>
     </message>
+    <message>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="112"/>
+        <source>Upgrade failed...</source>
+        <translation>Echec de la mise à jour...</translation>
+    </message>
 </context>
 <context>
     <name>AccountManagementSettingsPage</name>
@@ -224,12 +234,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>AliasesModel</name>
     <message>
-        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="160"/>
+        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="171"/>
         <source>Alias</source>
         <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="160"/>
+        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="171"/>
         <source>Expansion</source>
         <translation>Expansion</translation>
     </message>
@@ -239,7 +249,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
         <source>Behaviour</source>
-        <translation>Comportement</translation>
+        <translation type="obsolete">Comportement</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
@@ -261,33 +271,38 @@ p, li { white-space: pre-wrap; }
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
+        <source>Misc</source>
+        <translation>Divers</translation>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="33"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="36"/>
         <source>Appearance</source>
         <translation>Apparence</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="33"/>
         <source>General</source>
-        <translation>Général</translation>
+        <translation type="obsolete">Général</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="13"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="14"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
         <source>Client style:</source>
-        <translation>Style du Client:</translation>
+        <translation type="obsolete">Style du Client:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="31"/>
         <source>Language:</source>
-        <translation>Langage:</translation>
+        <translation type="obsolete">Langage:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="38"/>
@@ -295,34 +310,142 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&lt;Système&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="43"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
         <source>&lt;Original&gt;</source>
         <translation>&lt;Original&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
         <source>Note: needs client restart for full effect!</source>
-        <translation>N.B.: il est nécessaire de relancer le client!</translation>
+        <translation type="obsolete">N.B.: il est nécessaire de relancer le client!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="38"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="46"/>
         <source>&lt;System Default&gt;</source>
-        <translation>&lt;Défaut Système&gt;</translation>
+        <translation>&lt;Système par défaut&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="61"/>
         <source>Misc:</source>
-        <translation>Divers:</translation>
+        <translation type="obsolete">Divers:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="67"/>
         <source>Show Web Previews</source>
-        <translation>Afficher les aperçus Web</translation>
+        <translation type="obsolete">Afficher les aperçus Web</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="77"/>
         <source>Use Icons to represent away state of Users</source>
-        <translation>Utiliser des Icônes pour représenter les états d&apos;absence des Utilisateurs</translation>
+        <translation type="obsolete">Utiliser des Icônes pour représenter les états d&apos;absence des Utilisateurs</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="20"/>
+        <source>Client Style</source>
+        <translation>Style du client</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="26"/>
+        <source>Set application style</source>
+        <translation>Définir le style</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="36"/>
+        <source>Language</source>
+        <translation>Langage</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="42"/>
+        <source>Set the application language. Requires restart!</source>
+        <translation>Definir la langue de l&apos;application. Nécessite un redemarrage!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="62"/>
+        <source>Fonts</source>
+        <translation>Polices</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="84"/>
+        <source>Set font for the main chat window and the chat monitor</source>
+        <translation>Définir la police pour la fenêtre principale de discussion et le moniteur de discussion</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="71"/>
+        <source>Chat window:</source>
+        <translation>Fenêtre de discussion:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="189"/>
+        <source>Font</source>
+        <translation>Police</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="205"/>
+        <source>Choose...</source>
+        <translation>Choisir...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="132"/>
+        <source>Set font for channel and nick lists</source>
+        <translation>Définir la police pour les listes de canaux et de pseudos</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="119"/>
+        <source>Channel list:</source>
+        <translation>Liste des canaux:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="180"/>
+        <source>Set font for the input line</source>
+        <translation>Définir le police pour la ligne de saisie</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="167"/>
+        <source>Input line:</source>
+        <translation>Ligne de saisie:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="215"/>
+        <source>Misc</source>
+        <translation>Divers</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="221"/>
+        <source>Show a website preview window when hovering the mouse over a web address</source>
+        <translation>Affiche une fenêtre d&apos;aperçu du site web quand la souris passe sur une adresse web</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="224"/>
+        <source>Show previews of webpages on URL hover</source>
+        <translation>Afficher les aperçus de pages web au passage sur une URL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="234"/>
+        <source>Show status icons in channel and nick lists</source>
+        <translation>Affiche des icones dans les listes de canaux et de pseudos</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="237"/>
+        <source>Use icons in channel and nick lists</source>
+        <translation>Utiliser les icons dans les listes de canaux et de pseudos</translation>
+    </message>
+</context>
+<context>
+    <name>AwayLogView</name>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="33"/>
+        <source>Away Log</source>
+        <translation>Historique d&apos;absence</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="44"/>
+        <source>Show Network Name</source>
+        <translation>Afficher le Nom du Réseau</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="49"/>
+        <source>Show Buffer Name</source>
+        <translation>Afficher le Nom du Tampon</translation>
     </message>
 </context>
 <context>
@@ -330,7 +453,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
         <source>Behaviour</source>
-        <translation>Comportement</translation>
+        <translation type="obsolete">Comportement</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
@@ -343,37 +466,37 @@ p, li { white-space: pre-wrap; }
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="74"/>
         <source>Backlog Request Method:</source>
         <translation>Méthode de demande de l&apos;historique:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="29"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="82"/>
         <source>Fixed Amount per Buffer</source>
         <translation>Montant fixe par tampon</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="34"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="87"/>
         <source>Unread Messages per Buffer</source>
         <translation>Messages non lus par tampon</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="39"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="92"/>
         <source>Global Unread Messages</source>
         <translation>Messages non lus globalement</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="69"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="122"/>
         <source>The simplest Requester. It fetches a fixed amount of lines for each buffer from the Backlog.</source>
         <translation>C&apos;est la demande la plus simple. Elle récupère un montant fixe de lignes de chaque tampon à partir de l&apos;historique.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="84"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="137"/>
         <source>amount of messages per buffer that are requested after the core connection has been established.</source>
         <translation>nombre de messages par tampon demandés après que la connection avec le noyau ait été établie.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="87"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="140"/>
         <source>Initial backlog amount:</source>
         <translation>Montant initial de l&apos;historique:</translation>
     </message>
@@ -382,27 +505,27 @@ p, li { white-space: pre-wrap; }
         <source>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
 
 You can also chose to fetch additional older chatlines to provide a better context.</source>
-        <translation>Cette demande récupère les messages non lus de chaque tampon individuellement. Le montant des lignes par tampon peut être limité.
+        <translation type="obsolete">Cette demande récupère les messages non lus de chaque tampon individuellement. Le montant des lignes par tampon peut être limité.
 
 Vous pouvez aussi demander des lignes complémentaires afin d&apos;obtenir un meilleur contexte.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="288"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="341"/>
         <source>Maximum amount of messages to be fetched per buffer.</source>
         <translation>Montant maximim des messages devant être récupéré par tampon.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="281"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="334"/>
         <source>Limit:</source>
         <translation>Limite:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="320"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="373"/>
         <source>Amount of messages to be fetched in addition to the unread messages. The Limit does not apply here.</source>
         <translation>Montant des messages devant être récupéré en complément des messages non lus. La limite ne s&apos;applique pas ici.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="313"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="366"/>
         <source>Additional Messages:</source>
         <translation>Messages complémentaires:</translation>
     </message>
@@ -424,37 +547,37 @@ Il est plus pratique de limiter le montant total de l&apos;historique et c&apos;
 Vous pouvez également choisir de récupérer des lignes complémentaires plus anciennes de discussion pour obtenir un meilleur contexte.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="278"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="331"/>
         <source>Maximum amount of messages to be fetched over all buffers.</source>
         <translation>Montant maximum de messages à récupérer pour tous les tampons.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="376"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
         <source>Number of messages to be requested from the core when using scrolling up in the buffer view.</source>
         <translation>Nombre de messages à demander au noyau quand on défile dans un tampon.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="379"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="24"/>
         <source>Dynamic backlog amount:</source>
         <translation>Taille dynamique de l&apos;historique :</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="103"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="156"/>
         <source>FixedBacklogAmount</source>
         <translation>FixedBacklogAmount</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="184"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="237"/>
         <source>PerBufferUnreadBacklogLimit</source>
         <translation>PerBufferUnreadBacklogLimit</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="216"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="269"/>
         <source>PerBufferUnreadBacklogAdditional</source>
         <translation>PerBufferUnreadBacklogAdditional</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="258"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="311"/>
         <source>This requester fetches all messages newer than the oldest unread message for all buffers.
 
 Note: this requester is not recommended if you use hidden buffer or have inactive buffers (i.e.: no stale queries or channels).
@@ -469,20 +592,34 @@ Il est plus pratique de limiter le montant total de l&apos;historique et c&apos;
 Vous pouvez également choisir de récupérer des lignes complémentaires plus anciennes de discussion pour obtenir un meilleur contexte.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="300"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="353"/>
         <source>GlobalUnreadBacklogLimit</source>
         <translation>GlobalUnreadBacklogLimit</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="332"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="385"/>
         <source>GlobalUnreadBacklogAdditional</source>
         <translation>GlobalUnreadBacklogAdditional</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="395"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="40"/>
         <source>DynamicBacklogAmount</source>
         <translation>DynamicBacklogAmount</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
+        <source>Misc</source>
+        <translation>Divers</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="198"/>
+        <source>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
+
+You can also choose to fetch additional older chatlines to provide a better context.</source>
+        <translation>Cette demande récupère les messages non lus de chaque tampon individuellement. Le montant des lignes par tampon peut être limité.
+
+Vous pouvez aussi demander des lignes complémentaires afin d&apos;obtenir un meilleur contexte.</translation>
+    </message>
 </context>
 <context>
     <name>BufferItem</name>
@@ -542,7 +679,7 @@ Vous pouvez également choisir de récupérer des lignes complémentaires plus a
         <translation type="obsolete">&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="284"/>
+        <location filename="../src/client/networkmodel.cpp" line="297"/>
         <source>&lt;p&gt; %1 - %2 &lt;/p&gt;</source>
         <translation>&lt;p&gt; %1 - %2 &lt;/p&gt;</translation>
     </message>
@@ -738,12 +875,12 @@ Lines:     1234
         <translation type="obsolete">Voulez vous supprimer le tampon &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>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="275"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="256"/>
         <source>Merge buffers permanently?</source>
         <translation>Fusionner définitivement les tampons ?</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="276"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="257"/>
         <source>Do you want to merge the buffer &quot;%1&quot; permanently into buffer &quot;%2&quot;?
  This cannot be reversed!</source>
         <translation>Voulez-vous fusionner définitivement le tampon &quot;%1&quot; dans le tampon &quot;%2&quot; ?
@@ -771,7 +908,7 @@ Lines:     1234
         <translation>Merci de saisir un nom pour la vue:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="519"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="520"/>
         <source>Add Buffer View</source>
         <translation>Ajouter une Vue</translation>
     </message>
@@ -781,7 +918,12 @@ Lines:     1234
     <message>
         <location filename="../src/uisupport/bufferviewfilter.cpp" line="53"/>
         <source>Edit Mode</source>
-        <translation>Mode édition</translation>
+        <translation type="obsolete">Mode édition</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferviewfilter.cpp" line="54"/>
+        <source>Show / Hide buffers</source>
+        <translation>Afficher / Cacher les tampons</translation>
     </message>
 </context>
 <context>
@@ -789,20 +931,20 @@ Lines:     1234
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="35"/>
         <source>General</source>
-        <translation>Général</translation>
+        <translation type="obsolete">Général</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="35"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="36"/>
         <source>Buffer Views</source>
         <translation>Vues</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="338"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="342"/>
         <source>Delete Buffer View?</source>
         <translation>Supprimer la vue ?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="339"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="343"/>
         <source>Do you really want to delete the buffer view &quot;%1&quot;?</source>
         <translation>Voulez vous réellement supprimer la vue &quot;%1&quot; ?</translation>
     </message>
@@ -913,6 +1055,11 @@ In this mode no separate status buffer is displayed.</source>
         <translation>Cette option n&apos;est pas disponible quand tout les Réseaux sont visibles.
 Dans ce mode, aucun tampon d&apos;état séparé n&apos;est affiché.</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="36"/>
+        <source>Appearance</source>
+        <translation>Apparence</translation>
+    </message>
 </context>
 <context>
     <name>BufferViewWidget</name>
@@ -1006,7 +1153,7 @@ 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;:/pics/quassel-large.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;
+        <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;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
@@ -1022,32 +1169,32 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="448"/>
+        <location filename="../src/client/networkmodel.cpp" line="461"/>
         <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
         <translation>&lt;b&gt;Canal %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="451"/>
+        <location filename="../src/client/networkmodel.cpp" line="464"/>
         <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Utilisateurs:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="455"/>
+        <location filename="../src/client/networkmodel.cpp" line="468"/>
         <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Mode:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="467"/>
+        <location filename="../src/client/networkmodel.cpp" line="480"/>
         <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Sujet:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="471"/>
+        <location filename="../src/client/networkmodel.cpp" line="484"/>
         <source>Not active &lt;br /&gt; Double-click to join</source>
         <translation>Inactif &lt;br /&gt; Double-cliquez pour rejoindre</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="474"/>
+        <location filename="../src/client/networkmodel.cpp" line="487"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
         <translation>&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
@@ -1168,7 +1315,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
         <source>General</source>
-        <translation>Général</translation>
+        <translation type="obsolete">Général</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
@@ -1188,7 +1335,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="132"/>
         <source>Show:</source>
-        <translation>Montrer:</translation>
+        <translation>Afficher:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="239"/>
@@ -1250,7 +1397,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="156"/>
         <source>Show own messages</source>
-        <translation>Montrer mes messages</translation>
+        <translation>Afficher mes messages</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
+        <source>Appearance</source>
+        <translation>Apparence</translation>
     </message>
 </context>
 <context>
@@ -1294,7 +1446,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChatScene</name>
     <message>
-        <location filename="../src/qtui/chatscene.cpp" line="582"/>
+        <location filename="../src/qtui/chatscene.cpp" line="583"/>
         <source>Copy Selection</source>
         <translation>Copier la Sélection</translation>
     </message>
@@ -1380,25 +1532,25 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Récupération des informations sur les canaux...</translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="254"/>
+        <location filename="../src/client/client.cpp" line="264"/>
         <source>Identity already exists in client!</source>
         <translation>L&apos;Identité existe déjà dans le client!</translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="320"/>
+        <location filename="../src/client/client.cpp" line="345"/>
         <source>All Buffers</source>
         <translation>Tous tampons</translation>
     </message>
     <message>
         <location filename="../src/client/client.cpp" line="330"/>
         <source>Default Identity</source>
-        <translation>Identité par défaut</translation>
+        <translation type="obsolete">Identité par défaut</translation>
     </message>
 </context>
 <context>
     <name>ClientBacklogManager</name>
     <message>
-        <location filename="../src/client/clientbacklogmanager.cpp" line="119"/>
+        <location filename="../src/client/clientbacklogmanager.cpp" line="123"/>
         <source>Processed %1 messages in %2 seconds.</source>
         <translation>%1 messages traités en %2 secondes.</translation>
     </message>
@@ -1406,50 +1558,60 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ClientSyncer</name>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="53"/>
+        <location filename="../src/client/clientsyncer.cpp" line="52"/>
         <source>The Quassel Core you try to connect to is too old! Please consider upgrading.</source>
         <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="78"/>
+        <location filename="../src/client/clientsyncer.cpp" line="77"/>
         <source>&lt;b&gt;Invalid data received from core!&lt;/b&gt;&lt;br&gt;Disconnecting.</source>
         <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="110"/>
         <source>Internal connections not yet supported.</source>
-        <translation>Les connexions internes ne sont pas encore supportées.</translation>
+        <translation type="obsolete">Les connexions internes ne sont pas encore supportées.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="129"/>
+        <location filename="../src/client/clientsyncer.cpp" line="111"/>
         <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;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="219"/>
+        <location filename="../src/client/clientsyncer.cpp" line="196"/>
         <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;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="233"/>
+        <location filename="../src/client/clientsyncer.cpp" line="219"/>
         <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;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="262"/>
+        <location filename="../src/client/clientsyncer.cpp" line="248"/>
         <source>Logging in...</source>
         <translation>Authentification...</translation>
     </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="102"/>
+        <source>No Host to connect to specified.</source>
+        <translation>L&apos;hôte n&apos;a pas été spécifié.</translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="407"/>
+        <source>Cert Digest changed! was: %1</source>
+        <translation>Le certificat a changé! C&apos;était: %1</translation>
+    </message>
 </context>
 <context>
     <name>ColorSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="34"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="32"/>
         <source>Appearance</source>
         <translation>Apparence</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="34"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="32"/>
         <source>Color settings</source>
         <translation>Options de Couleur</translation>
     </message>
@@ -1471,293 +1633,303 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1503"/>
         <source>FG</source>
-        <translation>Avant</translation>
+        <translation type="obsolete">Avant</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1734"/>
         <source>BG</source>
         <translation>Fd</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1523"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1747"/>
         <source>Use BG</source>
         <translation>Utiliser le Fond</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="71"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="77"/>
         <source>Default:</source>
         <translation>Défaut:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="120"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="126"/>
         <source>Inactive:</source>
         <translation>Inactif:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="160"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="172"/>
         <source>Highlight:</source>
         <translation>Surlignage:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="197"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="215"/>
         <source>New Message:</source>
         <translation>Nouveau message:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="234"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="258"/>
         <source>Other Activity:</source>
         <translation>Autre activité:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1626"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="317"/>
         <source>Preview:</source>
         <translation>Aperçu:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1633"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="324"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="319"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="349"/>
         <source>Chatview</source>
         <translation>Moniteur de discussion</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="335"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="365"/>
         <source>Server Activity</source>
         <translation>Activité du serveur</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="885"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1724"/>
         <source>Foreground</source>
         <translation>Devant</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="895"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1013"/>
         <source>Background</source>
         <translation>Fond</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="371"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="417"/>
         <source>Error Message:</source>
         <translation>Message d&apos;erreur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="411"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="463"/>
         <source>Notice Message:</source>
         <translation>Message d&apos;information:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="451"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="509"/>
         <source>Plain Message:</source>
         <translation>Message normal:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="491"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="555"/>
         <source>Server Message:</source>
         <translation>Message du serveur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="531"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="601"/>
         <source>Highlight Message:</source>
         <translation>Message surligné:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="562"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="619"/>
         <source>User Activity</source>
         <translation>Activité utilisateur</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="598"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="661"/>
         <source>Action Message:</source>
         <translation>Message d&apos;action:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="638"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="707"/>
         <source>Join Message:</source>
         <translation>Message d&apos;entrée:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="678"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="753"/>
         <source>Kick Message:</source>
         <translation>Message de kick:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="718"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="799"/>
         <source>Mode Message:</source>
         <translation>Message de mode:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="758"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="845"/>
         <source>Part Message:</source>
         <translation>Message de sortie:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="798"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="891"/>
         <source>Quit Message:</source>
         <translation>Message de départ:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="838"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="937"/>
         <source>Rename Message:</source>
         <translation>Message de changement de pseudo:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="879"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="997"/>
         <source>Message</source>
         <translation>Message</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="915"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1039"/>
         <source>Timestamp:</source>
         <translation>Format d&apos;heure:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="955"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1085"/>
         <source>Sender:</source>
         <translation>Emetteur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="995"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1092"/>
         <source>Nick:</source>
         <translation>Pseudo:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1035"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1144"/>
         <source>Hostmask:</source>
         <translation>Masque de l&apos;hôte:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1075"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1196"/>
         <source>Channelname:</source>
         <translation>Nom du Canal:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1115"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1248"/>
         <source>Mode flags:</source>
         <translation>Drapeaux de Mode:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1155"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1300"/>
         <source>Url:</source>
         <translation>Url:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1232"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
         <source>Mirc Color Codes</source>
         <translation>Codes Couleur Mirc</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1244"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1465"/>
         <source>Color Codes</source>
         <translation>Codes de Couleur</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1250"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1471"/>
         <source>Color 0:</source>
         <translation>Couleur 0:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1271"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1492"/>
         <source>Color 1:</source>
         <translation>Couleur 1:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1292"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
         <source>Color 2:</source>
         <translation>Couleur 2:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1313"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1534"/>
         <source>Color 3:</source>
         <translation>Couleur 3:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1334"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1555"/>
         <source>Color 4:</source>
         <translation>Couleur 4:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1355"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1576"/>
         <source>Color 5:</source>
         <translation>Couleur 5:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1376"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1597"/>
         <source>Color 6:</source>
         <translation>Couleur 6:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1397"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1618"/>
         <source>Color 7:</source>
         <translation>Couleur 7:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1418"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1639"/>
         <source>Color 8:</source>
         <translation>Couleur 8:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1425"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1646"/>
         <source>Color 14:</source>
         <translation>Couleur 14:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1432"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1653"/>
         <source>Color 15:</source>
         <translation>Couleur 15:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1439"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1660"/>
         <source>Color 13:</source>
         <translation>Couleur 13:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1446"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1667"/>
         <source>Color 12:</source>
         <translation>Couleur 12:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1674"/>
         <source>Color 11:</source>
         <translation>Couleur 11:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1460"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1681"/>
         <source>Color 10:</source>
         <translation>Couleur 10:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1467"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1688"/>
         <source>Color 9:</source>
         <translation>Couleur 9:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1491"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1712"/>
         <source>Nickview</source>
         <translation>Vue des pseudos</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1497"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1718"/>
         <source>Nick status:</source>
         <translation>Etat des pseudos:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1533"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1760"/>
         <source>Online:</source>
         <translation>En ligne:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1573"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1806"/>
         <source>Away:</source>
         <translation>Absent:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1195"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1352"/>
         <source>New Message Marker:</source>
         <translation>Marque d&apos;un nouveau message:</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1366"/>
+        <source>Enable</source>
+        <translation>Activé</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1373"/>
+        <source>Sender auto coloring:</source>
+        <translation>Couleur automatique de l&apos;emetteur:</translation>
+    </message>
 </context>
 <context>
     <name>ConclusionPage</name>
@@ -1801,184 +1973,376 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ContentsChatItem</name>
     <message>
-        <location filename="../src/qtui/chatitem.cpp" line="610"/>
+        <location filename="../src/qtui/chatitem.cpp" line="611"/>
         <source>Copy Link Address</source>
         <translation>Copier l&apos;Adresse du Lien</translation>
     </message>
 </context>
 <context>
-    <name>Core</name>
+    <name>ContextMenuActionProvider</name>
     <message>
-        <location filename="../src/core/core.cpp" line="137"/>
-        <source>Could not initialize any storage backend! Exiting...</source>
-        <translation>Impossible de créer une base de donnée ! Fin de l&apos;opération...</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="35"/>
+        <source>Connect</source>
+        <translation>Connecter</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="188"/>
-        <source>Calling restoreState() even though active sessions exist!</source>
-        <translation>Appel de restoreState() alors que des sessions actives existent !</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="36"/>
+        <source>Disconnect</source>
+        <translation>Déconnecter</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="229"/>
-        <source>Admin user or password not set.</source>
-        <translation>L&apos;idnetifiant et le mot de passe administrateur ne sont pas saisis.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="38"/>
+        <source>Join</source>
+        <translation>Rejoindre</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="232"/>
-        <source>Could not setup storage!</source>
-        <translation>Impossible de paramétrer la base de données !</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="39"/>
+        <source>Part</source>
+        <translation>Partir</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="236"/>
-        <source>Creating admin user...</source>
-        <translation>Création de l&apos;utilisateur administrateur...</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="40"/>
+        <source>Delete Buffer(s)...</source>
+        <translation>Supprimer le(s) tampon(s)...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="430"/>
-        <source>Antique client trying to connect... refusing.</source>
-        <translation>Un antique client essaye de se connecter... refusé.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="41"/>
+        <source>Show Buffer</source>
+        <translation>Afficher le tampon</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="444"/>
-        <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;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>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="43"/>
+        <source>Joins</source>
+        <translation>Arrivées</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="417"/>
-        <source>Client %1 too old, rejecting.</source>
-        <translation type="obsolete">Client %1 trop vieux, rejeté.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="44"/>
+        <source>Parts</source>
+        <translation>Sorties</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="460"/>
-        <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 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>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="45"/>
+        <source>Quits</source>
+        <translation>Départs</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="524"/>
-        <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;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>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="46"/>
+        <source>Nick Changes</source>
+        <translation>Changements de Pseudo</translation>
     </message>
     <message>
-        <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="obsolete">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>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="47"/>
+        <source>Mode Changes</source>
+        <translation>Changement de Mode</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="544"/>
-        <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;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>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="48"/>
+        <source>Day Changes</source>
+        <translation>Changement de Jour</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="523"/>
-        <source>Client %1 initialized and authenticated successfully as &quot;%2&quot; (UserId: %3).</source>
-        <translation type="obsolete">Client %1 crée et identifié avec succès comme &quot;%2&quot; (IdUtilisateur: %3).</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="49"/>
+        <source>Set as Default...</source>
+        <translation>Définir par défaut...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="561"/>
-        <source>Non-authed client disconnected.</source>
-        <translation>Client non-identifié déconnecté.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="50"/>
+        <source>Use Defaults...</source>
+        <translation>Utiliser les paramètres par défauts...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="579"/>
-        <source>Could not initialize session for client %1!</source>
-        <translation type="obsolete">Impossible de lancer la session pour le client %1 !</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="52"/>
+        <source>Join Channel...</source>
+        <translation>Rejoindre le Canal...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="140"/>
-        <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>Actuellement, Quassel supporte uniquement SQLite3. Vous devez
-construire votre librairie Qt avec le plugin sqlite activé pour que le 
-noyau quassel fonctionne.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="54"/>
+        <source>Start Query</source>
+        <translation>Lancer la requête</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="408"/>
-        <source>Client connected from</source>
-        <translation>Client connecté par</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="55"/>
+        <source>Show Query</source>
+        <translation>Afficher la requête</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="550"/>
-        <source>Client</source>
-        <translation>Client</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="56"/>
+        <source>Whois</source>
+        <translation>Whois</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="446"/>
-        <source>too old, rejecting.</source>
-        <translation>trop vieux, rejeté.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="58"/>
+        <source>Version</source>
+        <translation>Version</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="506"/>
-        <source>Starting TLS for Client:</source>
-        <translation>Début du TLS pour le Client:</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="59"/>
+        <source>Time</source>
+        <translation>Heure</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="526"/>
-        <source>did not send an init message before trying to login, rejecting.</source>
-        <translation>n&apos;a pas envoyé de message de création avant d&apos;essayer de se connecter, rejet.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="60"/>
+        <source>Ping</source>
+        <translation>Ping</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="550"/>
-        <source>initialized and authenticated successfully as &quot;%1&quot; (UserId: %2).</source>
-        <translation>créé et identifié avec succès comme &quot;%1&quot; (IdUtilisateur: %2).</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="61"/>
+        <source>Finger</source>
+        <translation>Finger</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="611"/>
-        <source>Could not initialize session for client:</source>
-        <translation>Impossible de lancer la session pour le client:</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="63"/>
+        <source>Give Operator Status</source>
+        <translation>Donner le statut d&apos;opérateur</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="567"/>
-        <source>Non-authed client disconnected. (socket allready destroyed)</source>
-        <translation>Client non-identifié déconnecté. (socket déjà supprimée)</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="64"/>
+        <source>Take Operator Status</source>
+        <translation>Enlever le statut d&apos;opérateur</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="411"/>
-        <source>Closing server for basic setup.</source>
-        <translation>Arrêt du serveur pour un paramétrage simple.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="65"/>
+        <source>Give Voice</source>
+        <translation>Donner Voix</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="323"/>
-        <source>Invalid listen address %1</source>
-        <translation>Adresse d&apos;écoute invalide %1</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="66"/>
+        <source>Take Voice</source>
+        <translation>Enlever Voix</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="331"/>
-        <source>Listening for GUI clients on IPv4 %1 port %2 using protocol version %3</source>
-        <translation>A l&apos;écoute des clients sur l&apos;IPv4 %1 port %2 avec la version %3 du protocole</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="67"/>
+        <source>Kick From Channel</source>
+        <translation>Kicker du Canal</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="339"/>
-        <source>Could not open IPv4 interface %1:%2: %3</source>
-        <translation>Impossible d&apos;ouvrir l&apos;interface IPv4 %1:%2: %3</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="68"/>
+        <source>Ban From Channel</source>
+        <translation>Bannir du Canal</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="347"/>
-        <source>Listening for GUI clients on IPv6 %1 port %2 using protocol version %3</source>
-        <translation>A l&apos;écoute des clients sur l&apos;IPv6 %1 port %2 avec la version %3 du protocole</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="69"/>
+        <source>Kick &amp;&amp; Ban</source>
+        <translation>Kicker &amp;&amp; Bannir</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="358"/>
-        <source>Could not open IPv6 interface %1:%2: %3</source>
-        <translation>Impossible d&apos;ouvrir l&apos;interface IPv6 %1:%2: %3</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="71"/>
+        <source>Hide Buffer(s) Temporarily</source>
+        <translation>Cacher le(s) tampon(s) temporairement</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="366"/>
-        <source>Invalid listen address %1, unknown network protocol</source>
-        <translation>Adresse d&apos;écoute invalide %1, version du protocole inconnue</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="72"/>
+        <source>Hide Buffer(s) Permanently</source>
+        <translation>Cacher le(s) tampon(s) définitivement</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="374"/>
-        <source>Could not open any network interfaces to listen on!</source>
-        <translation>Impossible d&apos;ouvrir une interface réseau pour écouter !</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="73"/>
+        <source>Show Channel List</source>
+        <translation>Voir la liste des canaux</translation>
     </message>
-</context>
-<context>
-    <name>CoreAccountEditDlg</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="483"/>
-        <source>Add Core Account</source>
-        <translation>Ajouter un compte noyau</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="74"/>
+        <source>Show Ignore List</source>
+        <translation>Voi la liste des ignorés</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="86"/>
+        <source>Hide Events</source>
+        <translation>Cacher les Avis</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="94"/>
+        <source>CTCP</source>
+        <translation>CTCP</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="106"/>
+        <source>Actions</source>
+        <translation>Actions</translation>
+    </message>
+</context>
+<context>
+    <name>Core</name>
+    <message>
+        <location filename="../src/core/core.cpp" line="156"/>
+        <source>Could not initialize any storage backend! Exiting...</source>
+        <translation>Impossible de créer une base de donnée ! Fin de l&apos;opération...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="206"/>
+        <source>Calling restoreState() even though active sessions exist!</source>
+        <translation>Appel de restoreState() alors que des sessions actives existent !</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="247"/>
+        <source>Admin user or password not set.</source>
+        <translation>L&apos;idnetifiant et le mot de passe administrateur ne sont pas saisis.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="251"/>
+        <source>Could not setup storage!</source>
+        <translation>Impossible de paramétrer la base de données !</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="255"/>
+        <source>Creating admin user...</source>
+        <translation>Création de l&apos;utilisateur administrateur...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="476"/>
+        <source>Antique client trying to connect... refusing.</source>
+        <translation>Un antique client essaye de se connecter... refusé.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="490"/>
+        <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;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="417"/>
+        <source>Client %1 too old, rejecting.</source>
+        <translation type="obsolete">Client %1 trop vieux, rejeté.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="506"/>
+        <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 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="572"/>
+        <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;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="497"/>
+        <source>Client %1 did not send an init message before trying to login, rejecting.</source>
+        <translation type="obsolete">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="592"/>
+        <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;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="523"/>
+        <source>Client %1 initialized and authenticated successfully as &quot;%2&quot; (UserId: %3).</source>
+        <translation type="obsolete">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="609"/>
+        <source>Non-authed client disconnected.</source>
+        <translation>Client non-identifié déconnecté.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="579"/>
+        <source>Could not initialize session for client %1!</source>
+        <translation type="obsolete">Impossible de lancer la session pour le client %1 !</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="140"/>
+        <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="obsolete">Actuellement, Quassel supporte uniquement SQLite3. Vous devez
+construire votre librairie Qt avec le plugin sqlite activé pour que le 
+noyau quassel fonctionne.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="454"/>
+        <source>Client connected from</source>
+        <translation>Client connecté par</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="598"/>
+        <source>Client</source>
+        <translation>Client</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="492"/>
+        <source>too old, rejecting.</source>
+        <translation>trop vieux, rejeté.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="554"/>
+        <source>Starting TLS for Client:</source>
+        <translation>Début du TLS pour le Client:</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="574"/>
+        <source>did not send an init message before trying to login, rejecting.</source>
+        <translation>n&apos;a pas envoyé de message de création avant d&apos;essayer de se connecter, rejet.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="598"/>
+        <source>initialized and authenticated successfully as &quot;%1&quot; (UserId: %2).</source>
+        <translation>créé et identifié avec succès comme &quot;%1&quot; (IdUtilisateur: %2).</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="659"/>
+        <source>Could not initialize session for client:</source>
+        <translation>Impossible de lancer la session pour le client:</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="615"/>
+        <source>Non-authed client disconnected. (socket allready destroyed)</source>
+        <translation>Client non-identifié déconnecté. (socket déjà supprimée)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="457"/>
+        <source>Closing server for basic setup.</source>
+        <translation>Arrêt du serveur pour un paramétrage simple.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="369"/>
+        <source>Invalid listen address %1</source>
+        <translation>Adresse d&apos;écoute invalide %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="377"/>
+        <source>Listening for GUI clients on IPv4 %1 port %2 using protocol version %3</source>
+        <translation>A l&apos;écoute des clients sur l&apos;IPv4 %1 port %2 avec la version %3 du protocole</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="385"/>
+        <source>Could not open IPv4 interface %1:%2: %3</source>
+        <translation>Impossible d&apos;ouvrir l&apos;interface IPv4 %1:%2: %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="393"/>
+        <source>Listening for GUI clients on IPv6 %1 port %2 using protocol version %3</source>
+        <translation>A l&apos;écoute des clients sur l&apos;IPv6 %1 port %2 avec la version %3 du protocole</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="404"/>
+        <source>Could not open IPv6 interface %1:%2: %3</source>
+        <translation>Impossible d&apos;ouvrir l&apos;interface IPv6 %1:%2: %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="412"/>
+        <source>Invalid listen address %1, unknown network protocol</source>
+        <translation>Adresse d&apos;écoute invalide %1, version du protocole inconnue</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="420"/>
+        <source>Could not open any network interfaces to listen on!</source>
+        <translation>Impossible d&apos;ouvrir une interface réseau pour écouter !</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="159"/>
+        <source>Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your
+Qt library with the sqlite or postgres plugin enabled in order for quasselcore
+to work.</source>
+        <translation>Actuellement, Quassel supporte uniquement SQLite3 et PostgreSQL. Vous devez
+construire votre librairie Qt avec le plugin sqlite ou postgres activé pour que le 
+noyau quassel fonctionne.</translation>
+    </message>
+</context>
+<context>
+    <name>CoreAccountEditDlg</name>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="522"/>
+        <source>Add Core Account</source>
+        <translation>Ajouter un compte noyau</translation>
     </message>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="289"/>
@@ -2142,22 +2506,22 @@ noyau quassel fonctionne.</translation>
 <context>
     <name>CoreConfigWizard</name>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="58"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="60"/>
         <source>Core Configuration Wizard</source>
         <translation>Assistant de configuration du noyau</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="77"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="82"/>
         <source>Your core has been successfully configured. Logging you in...</source>
         <translation>Votre noyau a été configuré avec succès. Nous vous connectons...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="88"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="93"/>
         <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>Echec de la configuration du noyau :&lt;br&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;Pressez &lt;em&gt;suivant&lt;/em&gt; pour recommencer.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="105"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="109"/>
         <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>Vous êtes maintenant connecté dans votre Noyau Quassel tout juste configuré !&lt;br&gt;N&apos;oubliez pas de configurer vos identités et réseaux maintenant.</translation>
     </message>
@@ -2226,12 +2590,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>CoreConfigWizardPages::AdminUserPage</name>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="136"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="140"/>
         <source>Create Admin User</source>
         <translation>Créer l&apos;Utilisateur Administrateur</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="137"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="141"/>
         <source>First, we will create a user on the core. This first user will have administrator privileges.</source>
         <translation>D&apos;abord, nous allons créer un utilisateur dans pour le noyau. Le premier utilisateur aura les paramètres d&apos;administration.</translation>
     </message>
@@ -2239,7 +2603,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>CoreConfigWizardPages::IntroPage</name>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="121"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="125"/>
         <source>Introduction</source>
         <translation>Introduction</translation>
     </message>
@@ -2247,25 +2611,30 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>CoreConfigWizardPages::StorageSelectionPage</name>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="165"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="172"/>
         <source>Select Storage Backend</source>
         <translation>Selectionnez le type de base de données</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="166"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="173"/>
         <source>Please select a database backend for the Quassel Core storage to store the backlog and other data in.</source>
         <translation>Merci de selectionner une base de données pour le stockage de l&apos;historique est des autres données pour Quassel Core.</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="267"/>
+        <source>Connection Properties</source>
+        <translation>Paramètres de connexion</translation>
+    </message>
 </context>
 <context>
     <name>CoreConfigWizardPages::SyncPage</name>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="195"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="307"/>
         <source>Storing Your Settings</source>
         <translation>Sauver vos paramètres</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="196"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="308"/>
         <source>Your settings are now stored in the core, and you will be logged in automatically.</source>
         <translation>Vos paramètres sont maintenant sauvés dans le coeur, et vous serez connecté automatiquement.</translation>
     </message>
@@ -2415,7 +2784,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="42"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="53"/>
         <source>Connect to Quassel Core</source>
         <translation>Connexion au noyau Quassel</translation>
     </message>
@@ -2450,22 +2819,22 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Port:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="286"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="294"/>
         <source>User:</source>
         <translation>Utilisateur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="300"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="308"/>
         <source>Password:</source>
         <translation>Mot de Passe:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="314"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="322"/>
         <source>Remember</source>
         <translation>Mémoriser</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="117"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="128"/>
         <source>Always use this account</source>
         <translation>Toujours utiliser ce compte</translation>
     </message>
@@ -2500,7 +2869,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Nouveau</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="79"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="90"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
@@ -2525,77 +2894,77 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Connecter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="184"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="190"/>
         <source>Remove Account Settings</source>
         <translation>Supprimer les paramètres du compte</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="186"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="192"/>
         <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>Voulez-vous réellement supprimer les informations locales pour ce compte noyau de Quassel ?&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="236"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="242"/>
         <source>Connect to %1</source>
         <translation>Connexion à %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="253"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="259"/>
         <source>&lt;div style=color:red;&gt;Connection to %1 failed!&lt;/div&gt;</source>
         <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="270"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="309"/>
         <source>Not connected to %1.</source>
         <translation>Non connecté à %1.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="271"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="310"/>
         <source>Looking up %1...</source>
         <translation>Recherche de %1...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="272"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="311"/>
         <source>Connecting to %1...</source>
         <translation>Connexion à %1...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="273"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="312"/>
         <source>Connected to %1</source>
         <translation>Connecté à %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="274"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="313"/>
         <source>Unknown connection state to %1</source>
         <translation>Etat de la connexion à %1 inconnu </translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="326"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="365"/>
         <source>Logging in...</source>
         <translation>Authentification...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="275"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="286"/>
         <source>Login</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="57"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="68"/>
         <source>Edit...</source>
         <translation>Modifier...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="68"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="79"/>
         <source>Add...</source>
         <translation>Ajouter...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="146"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="165"/>
         <source>Initializing your connection</source>
         <translation>Création de votre connexion</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="170"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="183"/>
         <source>Connected to apollo.mindpool.net.</source>
         <translation>Connecté à apollo.mindpool.net.</translation>
     </message>
@@ -2611,42 +2980,42 @@ un peu
 d&apos;espace</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="336"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="456"/>
         <source>Configure your Quassel Core</source>
         <translation>Configurer votre noyau Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="342"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="462"/>
         <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>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="370"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="490"/>
         <source>Launch Wizard</source>
         <translation>Lancer l&apos;Assistant</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="427"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="553"/>
         <source>Initializing your session...</source>
         <translation>Lancement de votre session...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="435"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="561"/>
         <source>&lt;b&gt;Please be patient while your client synchronizes with the Quassel Core!&lt;/b&gt;</source>
         <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="450"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="576"/>
         <source>Session state:</source>
         <translation>Etat de la Session:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="467"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="593"/>
         <source>Network states:</source>
         <translation>Etat du réseau:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="480"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="606"/>
         <source>0/0</source>
         <translation></translation>
     </message>
@@ -2661,12 +3030,12 @@ d&apos;espace</translation>
         <translation type="obsolete">Etats de l&apos;utilisateur:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="103"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="114"/>
         <source>Use internal core</source>
         <translation>Utiliser le noyau interne</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="202"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="215"/>
         <source>THIS IS A PLACEHOLDER
 TO
 RESERVE
@@ -2676,6 +3045,26 @@ TO
 RESERVE
 SOME SPACE</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="272"/>
+        <source>&lt;div&gt;Errors occurred while connecting to &quot;%1&quot;:&lt;/div&gt;</source>
+        <translation>&lt;div&gt;Erreurs lors de la connexion à &quot;%1&quot;:&lt;/div&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="356"/>
+        <source>view SSL Certificate</source>
+        <translation>voir le certificat SSL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="393"/>
+        <source>add to known hosts</source>
+        <translation>ajouter aux hôtes connus</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="413"/>
+        <source>Continue connection</source>
+        <translation>Continuer la connexion</translation>
+    </message>
 </context>
 <context>
     <name>CoreConnectProgressDlg</name>
@@ -2810,30 +3199,40 @@ SOME SPACE</translation>
 <context>
     <name>CoreNetwork</name>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="145"/>
+        <location filename="../src/core/corenetwork.cpp" line="153"/>
         <source>Connection failed. Cycling to next Server</source>
         <translation>Echec de connexion. Passage sur le serveur suivant</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="154"/>
+        <location filename="../src/core/corenetwork.cpp" line="162"/>
         <source>Connecting to %1:%2...</source>
         <translation>Connexion à %1:%2...</translation>
     </message>
     <message>
         <location filename="../src/core/corenetwork.cpp" line="184"/>
         <source>Disconnecting.</source>
-        <translation>Déconnecte.</translation>
+        <translation type="obsolete">Déconnecte.</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="280"/>
+        <location filename="../src/core/corenetwork.cpp" line="306"/>
         <source>Could not connect to %1 (%2)</source>
         <translation>Impossible de se connecter à %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="282"/>
+        <location filename="../src/core/corenetwork.cpp" line="308"/>
         <source>Connection failure: %1</source>
         <translation>Erreur de connexion: %1</translation>
     </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="210"/>
+        <source>Disconnecting. (%1)</source>
+        <translation>Déconnecte. (%1)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="210"/>
+        <source>Core Shutdown</source>
+        <translation>Arrêt du Noyau</translation>
+    </message>
 </context>
 <context>
     <name>CoreSession</name>
@@ -2848,22 +3247,22 @@ SOME SPACE</translation>
         <translation type="obsolete">Client %1 déconnecté (IdUtilisateur: %2).</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="317"/>
+        <location filename="../src/core/coresession.cpp" line="359"/>
         <source>CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!</source>
         <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="339"/>
+        <location filename="../src/core/coresession.cpp" line="381"/>
         <source>CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!</source>
         <translation>CoreSession::createNetwork(): Essai de création d&apos;un réseau dejà existant, mise à jour réalisée !</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="180"/>
+        <location filename="../src/core/coresession.cpp" line="186"/>
         <source>Client</source>
         <translation>Client</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="180"/>
+        <location filename="../src/core/coresession.cpp" line="186"/>
         <source>disconnected (UserId: %1).</source>
         <translation>déconnecté (IdUtilisateur: %1).</translation>
     </message>
@@ -3064,6 +3463,44 @@ SOME SPACE</translation>
         <translation type="obsolete">Utilisateur:</translation>
     </message>
 </context>
+<context>
+    <name>ExecWrapper</name>
+    <message>
+        <location filename="../src/client/execwrapper.cpp" line="45"/>
+        <source>Invalid command string for /exec: %1</source>
+        <translation>Commande invalide pour /exec: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/execwrapper.cpp" line="53"/>
+        <source>Name &quot;%1&quot; is invalid: / or ../ are not allowed!</source>
+        <translation type="obsolete">Le nom &quot;%1&quot; est invalide: les / ou les ../ ne sont pas autorisés!</translation>
+    </message>
+    <message>
+        <location filename="../src/client/execwrapper.cpp" line="64"/>
+        <source>Could not find script &quot;%1&quot;</source>
+        <translation>Impossible de trouver le script &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/client/execwrapper.cpp" line="82"/>
+        <source>Script &quot;%1&quot; crashed with exit code %2.</source>
+        <translation>Le script &quot;%1&quot; a crashé avec le code d&apos;erreur %2.</translation>
+    </message>
+    <message>
+        <location filename="../src/client/execwrapper.cpp" line="98"/>
+        <source>Script &quot;%1&quot; could not start.</source>
+        <translation>Le Script &quot;%1&quot; ne peut pas être lancé.</translation>
+    </message>
+    <message>
+        <location filename="../src/client/execwrapper.cpp" line="100"/>
+        <source>Script &quot;%1&quot; caused error %2.</source>
+        <translation>Le Script &quot;%1&quot; a causé l&apos;erreur %2.</translation>
+    </message>
+    <message>
+        <location filename="../src/client/execwrapper.cpp" line="53"/>
+        <source>Name &quot;%1&quot; is invalid: ../ or ..\ are not allowed!</source>
+        <translation>Le nom &quot;%1&quot; est invalide: les / ou les ../ ne sont pas autorisés !</translation>
+    </message>
+</context>
 <context>
     <name>FontsSettingsPage</name>
     <message>
@@ -3265,12 +3702,12 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Comportement</translation>
+        <translation type="obsolete">Comportement</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>General</source>
-        <translation>Général</translation>
+        <translation type="obsolete">Général</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="13"/>
@@ -3432,13 +3869,18 @@ SOME SPACE</translation>
         <source>Errors:</source>
         <translation>Erreurs:</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
+        <source>Misc</source>
+        <translation>Divers</translation>
+    </message>
 </context>
 <context>
     <name>HighlightSettingsPage</name>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
         <source>Behaviour</source>
-        <translation>Comportement</translation>
+        <translation type="obsolete">Comportement</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="32"/>
@@ -3525,6 +3967,11 @@ SOME SPACE</translation>
         <source>Case sensitive</source>
         <translation>Sensible à la casse</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
+        <source>Appearance</source>
+        <translation>Apparence</translation>
+    </message>
 </context>
 <context>
     <name>IdentitiesDlg</name>
@@ -3712,34 +4159,34 @@ SOME SPACE</translation>
         <translation>Ajouter...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="260"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="77"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="108"/>
         <source>General</source>
-        <translation>Général</translation>
+        <translation type="obsolete">Général</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="116"/>
         <source>Real Name:</source>
-        <translation>Nom Réel:</translation>
+        <translation type="obsolete">Nom Réel:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="132"/>
         <source>Nicknames</source>
-        <translation>Pseudos</translation>
+        <translation type="obsolete">Pseudos</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="171"/>
         <source>&amp;Add...</source>
-        <translation>&amp;Ajouter...</translation>
+        <translation type="obsolete">&amp;Ajouter...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="217"/>
         <source>Re&amp;name...</source>
-        <translation>&amp;Renommer...</translation>
+        <translation type="obsolete">&amp;Renommer...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="180"/>
@@ -3749,17 +4196,17 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="243"/>
         <source>Move upwards in list</source>
-        <translation>Monter dans la liste</translation>
+        <translation type="obsolete">Monter dans la liste</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="257"/>
         <source>Move downwards in list</source>
-        <translation>Descendre dans la liste</translation>
+        <translation type="obsolete">Descendre dans la liste</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="313"/>
         <source>A&amp;way</source>
-        <translation>A&amp;bsence</translation>
+        <translation type="obsolete">A&amp;bsence</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="471"/>
@@ -3794,90 +4241,90 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="512"/>
         <source>Advanced</source>
-        <translation>Avancé</translation>
+        <translation type="obsolete">Avancé</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="520"/>
         <source>Ident:</source>
-        <translation>Ident:</translation>
+        <translation type="obsolete">Ident:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="536"/>
         <source>Messages</source>
-        <translation>Messages</translation>
+        <translation type="obsolete">Messages</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="544"/>
         <source>Part Reason:</source>
-        <translation>Motif de Départ:</translation>
+        <translation type="obsolete">Motif de Départ:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="557"/>
         <source>Quit Reason:</source>
-        <translation>Motif de Sortie:</translation>
+        <translation type="obsolete">Motif de Sortie:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="567"/>
         <source>Kick Reason:</source>
-        <translation>Motif de Kick:</translation>
+        <translation type="obsolete">Motif de Kick:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="35"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
         <source>Identities</source>
         <translation>Identités</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="206"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="178"/>
         <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;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="207"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="179"/>
         <source>&lt;li&gt;All identities need an identity name set&lt;/li&gt;</source>
         <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="208"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="180"/>
         <source>&lt;li&gt;Every identity needs at least one nickname defined&lt;/li&gt;</source>
         <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="209"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="181"/>
         <source>&lt;li&gt;You need to specify a real name for every identity&lt;/li&gt;</source>
         <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="210"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="182"/>
         <source>&lt;li&gt;You need to specify an ident for every identity&lt;/li&gt;</source>
         <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="211"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="183"/>
         <source>&lt;/ul&gt;</source>
         <translation>&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="212"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="184"/>
         <source>One or more identities are invalid</source>
         <translation>Une ou plusieurs identités sont invalides</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="397"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="310"/>
         <source>Delete Identity?</source>
         <translation>Supprimer l&apos;Identité ?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="398"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="311"/>
         <source>Do you really want to delete identity &quot;%1&quot;?</source>
         <translation>Voulez vous vraiment supprimer l&apos;identité &quot;%1&quot;?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="214"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="31"/>
         <source>Rename Identity</source>
         <translation>Renommer l&apos;identité</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="410"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="323"/>
         <source>Please enter a new name for the identity &quot;%1&quot;!</source>
         <translation>Merci de saisir un nom pour l&apos;identité &quot;%1&quot;!</translation>
     </message>
@@ -3894,27 +4341,27 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="123"/>
         <source>The &quot;Real Name&quot; is shown in /whois.</source>
-        <translation>Le &quot;Nom Réel&quot; est montré dans le /whois.</translation>
+        <translation type="obsolete">Le &quot;Nom Réel&quot; est montré dans le /whois.</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="168"/>
         <source>Add Nickname</source>
-        <translation>Ajouter un pseudo</translation>
+        <translation type="obsolete">Ajouter un pseudo</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="194"/>
         <source>Remove Nickname</source>
-        <translation>Supprimer le pseudo</translation>
+        <translation type="obsolete">Supprimer le pseudo</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="197"/>
         <source>Remove</source>
-        <translation>Supprimer</translation>
+        <translation type="obsolete">Supprimer</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="527"/>
         <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>
+        <translation type="obsolete">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>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="216"/>
@@ -3924,77 +4371,77 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="319"/>
         <source>Default Away Settings</source>
-        <translation>Paramètres d&apos;absence par défaut</translation>
+        <translation type="obsolete">Paramètres d&apos;absence par défaut</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="360"/>
         <source>Nick to be used when being away</source>
-        <translation>Pseudo utilisé en cas d&apos;absence</translation>
+        <translation type="obsolete">Pseudo utilisé en cas d&apos;absence</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="350"/>
         <source>Default away reason</source>
-        <translation>Motif d&apos;absence par défaut</translation>
+        <translation type="obsolete">Motif d&apos;absence par défaut</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="375"/>
         <source>Set away when all clients have detached from the core</source>
-        <translation>Mettre absent lorsque tout les clients sont détachés du noyau</translation>
+        <translation type="obsolete">Mettre absent lorsque tout les clients sont détachés du noyau</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="378"/>
         <source>Away On Detach</source>
-        <translation>Absent sur détachement</translation>
+        <translation type="obsolete">Absent sur détachement</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="405"/>
         <source>Override default away reason for auto-away on detach</source>
-        <translation>Forcer le motif d&apos;absence par défaut pour l&apos;absence automatique sur détachement</translation>
+        <translation type="obsolete">Forcer le motif d&apos;absence par défaut pour l&apos;absence automatique sur détachement</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="420"/>
         <source>Not implemented yet</source>
-        <translation>Non fonctionnel pour le moment</translation>
+        <translation type="obsolete">Non fonctionnel pour le moment</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="423"/>
         <source>Away On Idle</source>
-        <translation>Absence sur inactivité</translation>
+        <translation type="obsolete">Absence sur inactivité</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="437"/>
         <source>Set away after</source>
-        <translation>Mettre absent après</translation>
+        <translation type="obsolete">Mettre absent après</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="447"/>
         <source>minutes of being idle</source>
-        <translation>minutes d&apos;inactivité</translation>
+        <translation type="obsolete">minutes d&apos;inactivité</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="534"/>
         <source>Load a Key</source>
-        <translation>Charger une Clé</translation>
+        <translation type="obsolete">Charger une Clé</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="726"/>
         <source>No Key loaded</source>
-        <translation>Clé non chargée</translation>
+        <translation type="obsolete">Clé non chargée</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="844"/>
         <source>Load</source>
-        <translation>Chargement</translation>
+        <translation type="obsolete">Chargement</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="566"/>
         <source>RSA</source>
-        <translation>RSA</translation>
+        <translation type="obsolete">RSA</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="569"/>
         <source>DSA</source>
-        <translation>DSA</translation>
+        <translation type="obsolete">DSA</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="572"/>
@@ -4004,28 +4451,28 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="613"/>
         <source>Clear</source>
-        <translation>Effacer</translation>
+        <translation type="obsolete">Effacer</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="584"/>
         <source>Load a Certificate</source>
-        <translation>Charger un Certificat</translation>
+        <translation type="obsolete">Charger un Certificat</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="818"/>
         <source>No Certificate loaded</source>
-        <translation>Pas de Certificat chargé</translation>
+        <translation type="obsolete">Pas de Certificat chargé</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="601"/>
         <source>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</source>
-        <translation>Vous avez besoin d&apos;un client supportant le SSL pour éditer vos clés et certificats SSL du noyau</translation>
+        <translation type="obsolete">Vous avez besoin d&apos;un client supportant le SSL pour éditer vos clés et certificats SSL du noyau</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="630"/>
         <source>Warning: you are not connected with a secured connection to the Quassel Core!
 Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!</source>
-        <translation>Attention: vous n&apos;êtes pas connecté avec une connection sécure au noyau Quassel
+        <translation type="obsolete">Attention: vous n&apos;êtes pas connecté avec une connection sécure au noyau Quassel
 Continuer provoquera le transfert non crypté de votre clé SSL et de votre certificat SSL !</translation>
     </message>
     <message>
@@ -4036,58 +4483,63 @@ Continuer provoquera le transfert non crypté de votre clé SSL et de votre cert
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="705"/>
         <source>Use SSL Key</source>
-        <translation>Utiliser une clé SSL</translation>
+        <translation type="obsolete">Utiliser une clé SSL</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="719"/>
         <source>Key Type:</source>
-        <translation>Type de clé:</translation>
+        <translation type="obsolete">Type de clé:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="758"/>
         <source>Use SSL Certificate</source>
-        <translation>Utiliser un certificat SSL</translation>
+        <translation type="obsolete">Utiliser un certificat SSL</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="777"/>
         <source>Organisation:</source>
-        <translation>Organisation:</translation>
+        <translation type="obsolete">Organisation:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="811"/>
         <source>CommonName:</source>
-        <translation>Nom:</translation>
+        <translation type="obsolete">Nom:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="471"/>
         <source>Away Reason:</source>
-        <translation>Motif d&apos;absence:</translation>
+        <translation type="obsolete">Motif d&apos;absence:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="363"/>
         <source>Away Nick:</source>
-        <translation>Pseudo d&apos;absence:</translation>
+        <translation type="obsolete">Pseudo d&apos;absence:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="659"/>
         <source>Continue</source>
-        <translation>Continuer</translation>
+        <translation type="obsolete">Continuer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
+        <source>Misc</source>
+        <translation>Divers</translation>
     </message>
 </context>
 <context>
     <name>Identity</name>
     <message>
-        <location filename="../src/common/identity.cpp" line="65"/>
+        <location filename="../src/common/identity.cpp" line="148"/>
         <source>&lt;empty&gt;</source>
         <translation>&lt;vide&gt;</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="66"/>
+        <location filename="../src/common/identity.cpp" line="120"/>
         <source>Quassel IRC User</source>
         <translation>Utilisateur Quassel IRC</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="72"/>
+        <location filename="../src/common/identity.cpp" line="154"/>
         <source>Gone fishing.</source>
         <translation>Parti pêcher.</translation>
     </message>
@@ -4097,7 +4549,7 @@ Continuer provoquera le transfert non crypté de votre clé SSL et de votre cert
         <translation type="obsolete">Ramène du poisson.</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="76"/>
+        <location filename="../src/common/identity.cpp" line="158"/>
         <source>Not here. No, really. not here!</source>
         <translation>Pas ici. Non, vraiment. pas ici !</translation>
     </message>
@@ -4107,21 +4559,300 @@ Continuer provoquera le transfert non crypté de votre clé SSL et de votre cert
         <translation type="obsolete">A nouveau en action !</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="82"/>
+        <location filename="../src/common/identity.cpp" line="164"/>
         <source>Kindergarten is elsewhere!</source>
         <translation>Le jardin d&apos;enfants est ailleurs !</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="84"/>
+        <location filename="../src/common/identity.cpp" line="166"/>
         <source>http://quassel-irc.org - Chat comfortably. Anywhere.</source>
         <translation>http://quassel-irc.org - Discuter simplement. Partout.</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="79"/>
+        <location filename="../src/common/identity.cpp" line="161"/>
         <source>All Quassel clients vanished from the face of the earth...</source>
         <translation>Tous les clients Quassel ont disparu de la face de la terre ...</translation>
     </message>
 </context>
+<context>
+    <name>IdentityEditWidget</name>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="398"/>
+        <source>Advanced</source>
+        <translation>Avancé</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="290"/>
+        <source>Load a Key</source>
+        <translation>Charger une Clé</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="604"/>
+        <source>No Key loaded</source>
+        <translation>Clé non chargée</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="722"/>
+        <source>Load</source>
+        <translation>Chargement</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="322"/>
+        <source>RSA</source>
+        <translation>RSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="325"/>
+        <source>DSA</source>
+        <translation>DSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="369"/>
+        <source>Clear</source>
+        <translation>Effacer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="340"/>
+        <source>Load a Certificate</source>
+        <translation>Charger un Certificat</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="696"/>
+        <source>No Certificate loaded</source>
+        <translation>Pas de Certificat chargé</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="29"/>
+        <source>General</source>
+        <translation>Général</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="37"/>
+        <source>Real Name:</source>
+        <translation>Nom Réel:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="44"/>
+        <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/identityeditwidget.ui" line="53"/>
+        <source>Nicknames</source>
+        <translation>Pseudos</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="89"/>
+        <source>Add Nickname</source>
+        <translation>Ajouter un pseudo</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="92"/>
+        <source>&amp;Add...</source>
+        <translation>&amp;Ajouter...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="115"/>
+        <source>Remove Nickname</source>
+        <translation>Supprimer le pseudo</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="118"/>
+        <source>Remove</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="135"/>
+        <source>Rename Identity</source>
+        <translation>Renommer l&apos;identité</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="138"/>
+        <source>Re&amp;name...</source>
+        <translation>Re&amp;nommer...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="164"/>
+        <source>Move upwards in list</source>
+        <translation>Monter dans la liste</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="181"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="178"/>
+        <source>Move downwards in list</source>
+        <translation>Descendre dans la liste</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="226"/>
+        <source>A&amp;way</source>
+        <translation>A&amp;bsence</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="232"/>
+        <source>Default Away Settings</source>
+        <translation>Paramètres d&apos;absence par défaut</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="243"/>
+        <source>Nick to be used when being away</source>
+        <translation>Pseudo utilisé en cas d&apos;absence</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="253"/>
+        <source>Default away reason</source>
+        <translation>Motif d&apos;absence par défaut</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="260"/>
+        <source>Away Nick:</source>
+        <translation>Pseudo d&apos;absence:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="365"/>
+        <source>Away Reason:</source>
+        <translation>Motif d&apos;absence:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="279"/>
+        <source>Set away when all clients have detached from the core</source>
+        <translation>Mettre absent lorsque tout les clients sont détachés du noyau</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="282"/>
+        <source>Away On Detach</source>
+        <translation>Absent sur détachement</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="314"/>
+        <source>Not implemented yet</source>
+        <translation>Non fonctionnel pour le moment</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="317"/>
+        <source>Away On Idle</source>
+        <translation>Absence sur inactivité</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="331"/>
+        <source>Set away after</source>
+        <translation>Mettre absent après</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="341"/>
+        <source>minutes of being idle</source>
+        <translation>minutes d&apos;inactivité</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="406"/>
+        <source>Ident:</source>
+        <translation>Ident:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="413"/>
+        <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>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="422"/>
+        <source>Messages</source>
+        <translation>Messages</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="430"/>
+        <source>Part Reason:</source>
+        <translation>Motif de Départ:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="443"/>
+        <source>Quit Reason:</source>
+        <translation>Motif de Sortie:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="453"/>
+        <source>Kick Reason:</source>
+        <translation>Motif de Kick:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="487"/>
+        <source>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</source>
+        <translation>Vous avez besoin d&apos;un client supportant le SSL pour éditer vos clés et certificats SSL du noyau</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="516"/>
+        <source>Warning: you are not connected with a secured connection to the Quassel Core!
+Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!</source>
+        <translation>Attention: vous n&apos;êtes pas connecté avec une connection sécure au noyau Quassel
+Continuer provoquera le transfert non crypté de votre clé SSL et de votre certificat SSL !</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="545"/>
+        <source>Continue</source>
+        <translation>Continuer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="583"/>
+        <source>Use SSL Key</source>
+        <translation>Utiliser une clé SSL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="597"/>
+        <source>Key Type:</source>
+        <translation>Type de clé:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="636"/>
+        <source>Use SSL Certificate</source>
+        <translation>Utiliser un certificat SSL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="655"/>
+        <source>Organisation:</source>
+        <translation>Organisation:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="689"/>
+        <source>CommonName:</source>
+        <translation>Nom:</translation>
+    </message>
+</context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="107"/>
+        <source>Setup Identity</source>
+        <translation>Paramétrage d&apos;Identité</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="112"/>
+        <source>Default Identity</source>
+        <translation>Identité par défaut</translation>
+    </message>
+</context>
+<context>
+    <name>InputLine</name>
+    <message>
+        <location filename="../src/uisupport/inputline.cpp" line="178"/>
+        <source>Do you really want to paste %1 lines?</source>
+        <translation type="obsolete">Voulez vous vraiment coller %1 lignes ?</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/inputline.cpp" line="213"/>
+        <source>Paste Protection</source>
+        <translation>Protection Collage</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/uisupport/inputline.cpp" line="204"/>
+        <source>Do you really want to paste %n lines?</source>
+        <translation>
+            <numerusform>Voulez vous vraiment coller une ligne ?</numerusform>
+            <numerusform>Voulez vous vraiment coller %n lignes ?</numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>InputWidget</name>
     <message>
@@ -4130,12 +4861,12 @@ Continuer provoquera le transfert non crypté de votre clé SSL et de votre cert
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/qtui/inputwidget.cpp" line="57"/>
+        <location filename="../src/qtui/inputwidget.cpp" line="54"/>
         <source>Focus Input Line</source>
         <translation>Focus sur la ligne de commande</translation>
     </message>
     <message>
-        <location filename="../src/qtui/inputwidget.cpp" line="58"/>
+        <location filename="../src/qtui/inputwidget.cpp" line="55"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
@@ -4153,6 +4884,14 @@ Continuer provoquera le transfert non crypté de votre clé SSL et de votre cert
         <translation type="obsolete">Cet assistant va vous guider dans le processus de paramétrage de votre tout nouveau client IRC Quassel.</translation>
     </message>
 </context>
+<context>
+    <name>IrcConnectionWizard</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="51"/>
+        <source>Save &amp;&amp; Connect</source>
+        <translation>Sauve &amp;&amp; Connecte</translation>
+    </message>
+</context>
 <context>
     <name>IrcListModel</name>
     <message>
@@ -4174,22 +4913,22 @@ Continuer provoquera le transfert non crypté de votre clé SSL et de votre cert
 <context>
     <name>IrcServerHandler</name>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="459"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="464"/>
         <source>%1 has changed topic for %2 to: &quot;%3&quot;</source>
         <translation>%1 à changé le sujet de  %2 en :&quot;%3&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="838"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="843"/>
         <source>No topic is set for %1.</source>
         <translation>Pas de sujet pour %1.</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="853"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="858"/>
         <source>Topic for %1 is &quot;%2&quot;</source>
         <translation>Le sujet pour %1 est &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="864"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="869"/>
         <source>Topic set by %1 on %2</source>
         <translation>Sujet mis par %1 le %2</translation>
     </message>
@@ -4209,132 +4948,132 @@ Continuer provoquera le transfert non crypté de votre clé SSL et de votre cert
         <translation type="obsolete">Le pseudo %1 est déjà utilisé</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="530"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="535"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="565"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="570"/>
         <source>[Whois] %1 is away: &quot;%2&quot;</source>
         <translation>[Whois] %1 est absent: &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="576"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="581"/>
         <source>%1 is away: &quot;%2&quot;</source>
         <translation>%1 est absent: &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="777"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="782"/>
         <source>[Whois] %1</source>
         <translation>[Whois] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="651"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="656"/>
         <source>[Whois] %1 is %2 (%3)</source>
         <translation>[Whois] %1 est %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="666"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="671"/>
         <source>%1 is online via %2 (%3)</source>
         <translation>%1 est connecté par %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="928"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="933"/>
         <source>[Whowas] %1</source>
         <translation>[Whowas] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="696"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="701"/>
         <source>[Whowas] %1 was %2 (%3)</source>
         <translation>[Whowas] %1 était %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="710"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="715"/>
         <source>[Who] End of /WHO list for %1</source>
         <translation>[Who] Fin de la liste  /WHO pour %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="730"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="735"/>
         <source>[Whois] %1 is logged in since %2</source>
         <translation>[Whois] %1 est connecté depuis %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="732"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="737"/>
         <source>[Whois] %1 is idling for %2 (%3)</source>
         <translation>[Whois] %1est en attente depuis %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="735"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="740"/>
         <source>[Whois] idle message: %1</source>
         <translation>[Whois] message d&apos;attente: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="767"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="772"/>
         <source>[Whois] %1 is a user on channels: %2</source>
         <translation>[Whois] %1 est présent sur les canaux: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="769"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="774"/>
         <source>[Whois] %1 has voice on channels: %2</source>
         <translation>[Whois] %1 a voix sur les canaux: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="771"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="776"/>
         <source>[Whois] %1 is an operator on channels: %2</source>
         <translation>[Whois] %1 est opérateur sur les canaux: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="799"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="804"/>
         <source>Channel %1 has %2 users. Topic is: %3</source>
         <translation>Le canal %1 a %2 utilisateurs. Son sujet est: %3</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="808"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="813"/>
         <source>End of channel list</source>
         <translation>Fin de la liste des canaux</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="887"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="892"/>
         <source>[Who] %1</source>
         <translation>[Who] %1</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="941"/>
         <source>There is a nickname in your identity&apos;s nicklist which contains illegal characters</source>
-        <translation>Il y a un pseudo dans votre liste d&apos;identié qui contient des caractères illégaux</translation>
+        <translation type="obsolete">Il y a un pseudo dans votre liste d&apos;identié qui contient des caractères illégaux</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="942"/>
         <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>En raison d&apos;une bogue dans Unreal IRCd ( et peut être dans d&apos;autres serveurs IRC) nous ne pouvons déterminer le pseudo erroné</translation>
+        <translation type="obsolete">En raison d&apos;une bogue dans Unreal IRCd ( et peut être dans d&apos;autres serveurs IRC) nous ne pouvons déterminer le pseudo erroné</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="943"/>
         <source>Please use: /nick &lt;othernick&gt; to continue or clean up your nicklist</source>
-        <translation>Merci d&apos;utiliser: /nick &lt;autrepseudo&gt; pour continuer ou de nettoyer votre liste de pseudos</translation>
+        <translation type="obsolete">Merci d&apos;utiliser: /nick &lt;autrepseudo&gt; pour continuer ou de nettoyer votre liste de pseudos</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="946"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="951"/>
         <source>Nick %1 contains illegal characters</source>
         <translation>Le pseudo %1 contient des caractères illégaux</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="958"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="962"/>
         <source>Nick already in use: %1</source>
         <translation>Le pseudo suivant est déjà utilisé: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="981"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="987"/>
         <source>No free and valid nicks in nicklist found. use: /nick &lt;othernick&gt; to continue</source>
         <translation>Aucun pseudo libre et valide n&apos;a été trouvé dans la liste. Utiliser: /nick &lt;autrepseudo&gt; pour continuer</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="484"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="489"/>
         <source>Received RPL_ISUPPORT (005) without parameters!</source>
         <translation>Réception de RPL_ISUPPORT (005) sans paramètres !</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="492"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="497"/>
         <source>Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!</source>
         <translation>Récetion d&apos;un  RPL_ISUPPORT hors RFC: cela peut avoir des conséquences inattendues !</translation>
     </message>
@@ -4342,17 +5081,17 @@ Continuer provoquera le transfert non crypté de votre clé SSL et de votre cert
 <context>
     <name>IrcUserItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="767"/>
+        <location filename="../src/client/networkmodel.cpp" line="780"/>
         <source>idling since %1</source>
         <translation>inactif depuis %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="770"/>
+        <location filename="../src/client/networkmodel.cpp" line="783"/>
         <source>login time: %1</source>
         <translation>durée de connexion: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="773"/>
+        <location filename="../src/client/networkmodel.cpp" line="786"/>
         <source>server: %1</source>
         <translation>serveur: %1</translation>
     </message>
@@ -4388,7 +5127,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Attente du noyau...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="613"/>
+        <location filename="../src/qtui/mainwin.cpp" line="665"/>
         <source>Not connected to core.</source>
         <translation>Déconnecté au noyau.</translation>
     </message>
@@ -4433,7 +5172,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Aide</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="292"/>
+        <location filename="../src/qtui/mainwin.cpp" line="316"/>
         <source>Debug</source>
         <translation>Déboguage</translation>
     </message>
@@ -4493,7 +5232,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Configurer Quassel...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="231"/>
+        <location filename="../src/qtui/mainwin.cpp" line="249"/>
         <source>F7</source>
         <translation>F7</translation>
     </message>
@@ -4538,7 +5277,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Connecter au Noyau...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="551"/>
+        <location filename="../src/qtui/mainwin.cpp" line="595"/>
         <source>Connected to core.</source>
         <translation>Connecté au noyau.</translation>
     </message>
@@ -4548,22 +5287,22 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&amp;Modifier les réseaux...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="380"/>
+        <location filename="../src/qtui/mainwin.cpp" line="410"/>
         <source>Nicks</source>
         <translation>Pseudos</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="400"/>
+        <location filename="../src/qtui/mainwin.cpp" line="430"/>
         <source>Chat Monitor</source>
         <translation>Moniteur de discussion</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="415"/>
+        <location filename="../src/qtui/mainwin.cpp" line="445"/>
         <source>Inputline</source>
         <translation>Ligne de Saisie</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="435"/>
+        <location filename="../src/qtui/mainwin.cpp" line="465"/>
         <source>Topic</source>
         <translation>Sujet</translation>
     </message>
@@ -4573,17 +5312,17 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Barre d&apos;état</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="249"/>
+        <location filename="../src/qtui/mainwin.cpp" line="267"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="262"/>
+        <location filename="../src/qtui/mainwin.cpp" line="280"/>
         <source>&amp;Networks</source>
         <translation>&amp;Réseaux</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="277"/>
+        <location filename="../src/qtui/mainwin.cpp" line="301"/>
         <source>&amp;Settings</source>
         <translation>&amp;Paramètres</translation>
     </message>
@@ -4593,7 +5332,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&amp;Vues</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="284"/>
+        <location filename="../src/qtui/mainwin.cpp" line="308"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
@@ -4648,27 +5387,27 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Lag noyau:  %1 ms</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="206"/>
+        <location filename="../src/qtui/mainwin.cpp" line="221"/>
         <source>&amp;Connect to Core...</source>
         <translation>&amp;Connecter au Noyau...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="208"/>
+        <location filename="../src/qtui/mainwin.cpp" line="223"/>
         <source>&amp;Disconnect from Core</source>
         <translation>&amp;Déconnecter du Noyau</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="210"/>
+        <location filename="../src/qtui/mainwin.cpp" line="225"/>
         <source>Core &amp;Info...</source>
-        <translation>&amp;Info Noyau</translation>
+        <translation>&amp;Info Noyau...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="214"/>
+        <location filename="../src/qtui/mainwin.cpp" line="229"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="215"/>
+        <location filename="../src/qtui/mainwin.cpp" line="230"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
@@ -4680,25 +5419,25 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="220"/>
         <source>&amp;Lock Dock Positions</source>
-        <translation>&amp;Bloquer les positions des fenêtres</translation>
+        <translation type="obsolete">&amp;Bloquer les positions des fenêtres</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="224"/>
+        <location filename="../src/qtui/mainwin.cpp" line="240"/>
         <source>Show &amp;Search Bar</source>
-        <translation>Montrer la Barre de &amp;Recherche</translation>
+        <translation>Afficher la Barre de &amp;Recherche</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="225"/>
+        <location filename="../src/qtui/mainwin.cpp" line="241"/>
         <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <translation type="obsolete">Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="226"/>
+        <location filename="../src/qtui/mainwin.cpp" line="244"/>
         <source>Show Status &amp;Bar</source>
-        <translation>Monter la Barre d&apos;&amp;Etat</translation>
+        <translation>Montrer la Barre d&apos;&amp;Etat</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="230"/>
+        <location filename="../src/qtui/mainwin.cpp" line="248"/>
         <source>&amp;Configure Quassel...</source>
         <translation>&amp;Configurer Quassel...</translation>
     </message>
@@ -4713,75 +5452,90 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">À propos de &amp;Qt...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="238"/>
+        <location filename="../src/qtui/mainwin.cpp" line="256"/>
         <source>Debug &amp;NetworkModel</source>
         <translation>Déboguage et Modèle &amp;Réseau</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="240"/>
+        <location filename="../src/qtui/mainwin.cpp" line="258"/>
         <source>Debug &amp;MessageModel</source>
         <translation>Déboguage et Modèle &amp;Message</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="242"/>
+        <location filename="../src/qtui/mainwin.cpp" line="260"/>
         <source>Debug &amp;Log</source>
         <translation>Déboguage &amp;Historique</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="268"/>
+        <location filename="../src/qtui/mainwin.cpp" line="286"/>
         <source>&amp;View</source>
         <translation>&amp;Vue</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="269"/>
+        <location filename="../src/qtui/mainwin.cpp" line="287"/>
         <source>&amp;Buffer Views</source>
         <translation>&amp;Vues</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="389"/>
+        <location filename="../src/qtui/mainwin.cpp" line="419"/>
         <source>Show Nick List</source>
         <translation>Afficher la liste des pseudos</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="411"/>
+        <location filename="../src/qtui/mainwin.cpp" line="441"/>
         <source>Show Chat Monitor</source>
         <translation>Afficher le moniteur de discussion</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="424"/>
+        <location filename="../src/qtui/mainwin.cpp" line="454"/>
         <source>Show Input Line</source>
         <translation>Afficher la ligne de commande</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="447"/>
+        <location filename="../src/qtui/mainwin.cpp" line="477"/>
         <source>Show Topic Line</source>
         <translation>Afficher la ligne de Sujet</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="234"/>
+        <location filename="../src/qtui/mainwin.cpp" line="252"/>
         <source>&amp;About Quassel</source>
         <translation>&amp;À propos de Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="236"/>
+        <location filename="../src/qtui/mainwin.cpp" line="254"/>
         <source>About &amp;Qt</source>
         <translation>À propos de &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="212"/>
+        <location filename="../src/qtui/mainwin.cpp" line="227"/>
         <source>Configure &amp;Networks...</source>
         <translation>Configurer les &amp;Réseaux...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="218"/>
+        <location filename="../src/qtui/mainwin.cpp" line="233"/>
         <source>&amp;Configure Buffer Views...</source>
         <translation>&amp;Configurer les Vues...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="577"/>
+        <location filename="../src/qtui/mainwin.cpp" line="629"/>
         <source>Core Lag: %1</source>
         <translation>Lag noyau:  %1</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="236"/>
+        <source>&amp;Lock Layout</source>
+        <translation>B&amp;loquer le Fond</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="242"/>
+        <source>Show Away Log</source>
+        <translation>Afficher l&apos;historique d&apos;absence</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="289"/>
+        <source>&amp;Toolbars</source>
+        <translation>&amp;Barre d&apos;outils</translation>
+    </message>
 </context>
 <context>
     <name>Message</name>
@@ -4949,7 +5703,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MessageModel</name>
     <message>
-        <location filename="../src/client/messagemodel.cpp" line="362"/>
+        <location filename="../src/client/messagemodel.cpp" line="374"/>
         <source>Requesting %1 messages from backlog for buffer %2:%3</source>
         <translation>Demande de %1 messages dans l&apos;historique pour le tampon %2:%3</translation>
     </message>
@@ -4964,7 +5718,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/ui/msgprocessorstatuswidget.ui" line="34"/>
         <source>Processing Messages</source>
-        <translation>Traitement des Messages</translation>
+        <translation type="obsolete">Traitement des Messages</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/msgprocessorstatuswidget.ui" line="34"/>
+        <source>Receiving Backlog</source>
+        <translation>Réception de l&apos;historique</translation>
     </message>
 </context>
 <context>
@@ -5156,7 +5915,7 @@ p, li { white-space: pre-wrap; }
         <translation>Merci de saisir un nom de réseau:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="698"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="705"/>
         <source>Add Network</source>
         <translation>Ajouter un réseau</translation>
     </message>
@@ -5164,17 +5923,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>NetworkItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="175"/>
+        <location filename="../src/client/networkmodel.cpp" line="178"/>
         <source>Server: %1</source>
         <translation>Serveur: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="176"/>
+        <location filename="../src/client/networkmodel.cpp" line="179"/>
         <source>Users: %1</source>
         <translation>Utilisateurs: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="179"/>
+        <location filename="../src/client/networkmodel.cpp" line="182"/>
         <source>Lag: %1 msecs</source>
         <translation>Lag: %1 ms</translation>
     </message>
@@ -5182,17 +5941,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>NetworkModel</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="792"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Buffer</source>
         <translation>Tampon</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="792"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Topic</source>
         <translation>Sujet</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="792"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Nick Count</source>
         <translation>Nombre de Pseudos</translation>
     </message>
@@ -5202,22 +5961,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="40"/>
         <source>Connect</source>
-        <translation>Connecter</translation>
+        <translation type="obsolete">Connecter</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="41"/>
         <source>Disconnect</source>
-        <translation>Déconnecter</translation>
+        <translation type="obsolete">Déconnecter</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="43"/>
         <source>Join</source>
-        <translation>Rejoindre</translation>
+        <translation type="obsolete">Rejoindre</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="44"/>
         <source>Part</source>
-        <translation>Partir</translation>
+        <translation type="obsolete">Partir</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="45"/>
@@ -5227,37 +5986,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="46"/>
         <source>Show Buffer</source>
-        <translation>Afficher le tampon</translation>
+        <translation type="obsolete">Afficher le tampon</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="48"/>
         <source>Joins</source>
-        <translation>Arrivées</translation>
+        <translation type="obsolete">Arrivées</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="49"/>
         <source>Parts</source>
-        <translation>Sorties</translation>
+        <translation type="obsolete">Sorties</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="50"/>
         <source>Quits</source>
-        <translation>Départs</translation>
+        <translation type="obsolete">Départs</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="51"/>
         <source>Nick Changes</source>
-        <translation>Changements de Pseudo</translation>
+        <translation type="obsolete">Changements de Pseudo</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="52"/>
         <source>Mode Changes</source>
-        <translation>Changement de Mode</translation>
+        <translation type="obsolete">Changement de Mode</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="53"/>
         <source>Day Changes</source>
-        <translation>Changement de Jour</translation>
+        <translation type="obsolete">Changement de Jour</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="54"/>
@@ -5267,112 +6026,112 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="57"/>
         <source>Join Channel...</source>
-        <translation>Rejoindre le Canal...</translation>
+        <translation type="obsolete">Rejoindre le Canal...</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="59"/>
         <source>Start Query</source>
-        <translation>Lancer la requête</translation>
+        <translation type="obsolete">Lancer la requête</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="60"/>
         <source>Show Query</source>
-        <translation>Afficher la requête</translation>
+        <translation type="obsolete">Afficher la requête</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="61"/>
         <source>Whois</source>
-        <translation>Whois</translation>
+        <translation type="obsolete">Whois</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="63"/>
         <source>Version</source>
-        <translation>Version</translation>
+        <translation type="obsolete">Version</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="64"/>
         <source>Time</source>
-        <translation>Heure</translation>
+        <translation type="obsolete">Heure</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="65"/>
         <source>Ping</source>
-        <translation>Ping</translation>
+        <translation type="obsolete">Ping</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="66"/>
         <source>Finger</source>
-        <translation>Finger</translation>
+        <translation type="obsolete">Finger</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="68"/>
         <source>Give Operator Status</source>
-        <translation>Donner le statut d&apos;opérateur</translation>
+        <translation type="obsolete">Donner le statut d&apos;opérateur</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="69"/>
         <source>Take Operator Status</source>
-        <translation>Enlever le statut d&apos;opérateur</translation>
+        <translation type="obsolete">Enlever le statut d&apos;opérateur</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="70"/>
         <source>Give Voice</source>
-        <translation>Donner Voix</translation>
+        <translation type="obsolete">Donner Voix</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="71"/>
         <source>Take Voice</source>
-        <translation>Enlever Voix</translation>
+        <translation type="obsolete">Enlever Voix</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="72"/>
         <source>Kick From Channel</source>
-        <translation>Kicker du Canal</translation>
+        <translation type="obsolete">Kicker du Canal</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="73"/>
         <source>Ban From Channel</source>
-        <translation>Banir du Canal</translation>
+        <translation type="obsolete">Banir du Canal</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="74"/>
         <source>Kick &amp;&amp; Ban</source>
-        <translation>Kicker &amp;&amp; Banir</translation>
+        <translation type="obsolete">Kicker &amp;&amp; Banir</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="76"/>
         <source>Hide Buffer(s) Temporarily</source>
-        <translation>Cacher le(s) tampon(s) temporairement</translation>
+        <translation type="obsolete">Cacher le(s) tampon(s) temporairement</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="77"/>
         <source>Hide Buffer(s) Permanently</source>
-        <translation>Cacher le(s) tampon(s) définitivement</translation>
+        <translation type="obsolete">Cacher le(s) tampon(s) définitivement</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="78"/>
         <source>Show Channel List</source>
-        <translation>Voir la liste des canaux</translation>
+        <translation type="obsolete">Voir la liste des canaux</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="79"/>
         <source>Show Ignore List</source>
-        <translation>Voi la liste des ignorés</translation>
+        <translation type="obsolete">Voi la liste des ignorés</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="93"/>
         <source>Hide Events</source>
-        <translation>Cacher les Avis</translation>
+        <translation type="obsolete">Cacher les Avis</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="101"/>
         <source>CTCP</source>
-        <translation>CTCP</translation>
+        <translation type="obsolete">CTCP</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="113"/>
         <source>Actions</source>
-        <translation>Actions</translation>
+        <translation type="obsolete">Actions</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="482"/>
@@ -5387,22 +6146,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="603"/>
         <source>Join Channel</source>
-        <translation>Rejoindre le canal</translation>
+        <translation type="obsolete">Rejoindre le canal</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="603"/>
         <source>Input channel name:</source>
-        <translation>Entrez le nom du canal:</translation>
+        <translation type="obsolete">Entrez le nom du canal:</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="45"/>
         <source>Delete Buffer(s)...</source>
-        <translation>Supprimer le(s) tampon(s)...</translation>
+        <translation type="obsolete">Supprimer le(s) tampon(s)...</translation>
     </message>
     <message numerus="yes">
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="519"/>
         <source>Do you want to delete the following buffer(s) permanently?</source>
-        <translation>
+        <translation type="obsolete">
             <numerusform>Voulez vous supprimer définitivement la vue suivante ?</numerusform>
             <numerusform>Voulez vous supprimer définitivement les vues suivantes ?</numerusform>
         </translation>
@@ -5410,27 +6169,79 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="524"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; This will delete all related data, including all backlog data, from the core&apos;s database and cannot be undone.</source>
-        <translation>&lt;b&gt;Note:&lt;/b&gt; Cela détruira toutes les données rattachées, y compris l&apos;historique, de la base de donnée du noyau et cela ne peut être annullé.</translation>
+        <translation type="obsolete">&lt;b&gt;Note:&lt;/b&gt; Cela détruira toutes les données rattachées, y compris l&apos;historique, de la base de donnée du noyau et cela ne peut être annullé.</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="526"/>
         <source>&lt;br&gt;Active channel buffers cannot be deleted, please part the channel first.</source>
-        <translation>&lt;br&gt;Les canaux actifs ne peuvent être supprimés, merci de quitter le canal auparavant.</translation>
+        <translation type="obsolete">&lt;br&gt;Les canaux actifs ne peuvent être supprimés, merci de quitter le canal auparavant.</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="528"/>
         <source>Remove buffers permanently?</source>
-        <translation>Supprimer les tampons définitivement ?</translation>
+        <translation type="obsolete">Supprimer les tampons définitivement ?</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="54"/>
         <source>Set as Default...</source>
-        <translation>Définir par défaut...</translation>
+        <translation type="obsolete">Définir par défaut...</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="55"/>
         <source>Use Defaults...</source>
-        <translation>Utiliser les paramètres par défauts...</translation>
+        <translation type="obsolete">Utiliser les paramètres par défauts...</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkModelController</name>
+    <message numerus="yes">
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="152"/>
+        <source>Do you want to delete the following buffer(s) permanently?</source>
+        <translation>
+            <numerusform>Voulez vous supprimer définitivement le tampon suivant ?</numerusform>
+            <numerusform>Voulez vous supprimer définitivement les tampons suivants ?</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="157"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; This will delete all related data, including all backlog data, from the core&apos;s database and cannot be undone.</source>
+        <translation>&lt;b&gt;Note:&lt;/b&gt; Cela suppirmera toutes les données rattachées, y compris l&apos;historique, de la base de donnée du noyau et cela ne peut être annulé.</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="159"/>
+        <source>&lt;br&gt;Active channel buffers cannot be deleted, please part the channel first.</source>
+        <translation>&lt;br&gt;Les canaux actifs ne peuvent être supprimés, merci de quitter le canal auparavant.</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="161"/>
+        <source>Remove buffers permanently?</source>
+        <translation>Supprimer les tampons définitivement ?</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkModelController::JoinDlg</name>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="417"/>
+        <source>Join Channel</source>
+        <translation>Rejoindre le Canal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="420"/>
+        <source>Network:</source>
+        <translation>Réseau:</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="422"/>
+        <source>Channel:</source>
+        <translation>Canal:</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="148"/>
+        <source>Setup Network Connection</source>
+        <translation>Paramétrer la connection réseau</translation>
     </message>
 </context>
 <context>
@@ -5438,30 +6249,30 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="36"/>
         <source>General</source>
-        <translation>Général</translation>
+        <translation type="obsolete">Général</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="36"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
         <source>Networks</source>
         <translation>Réseaux</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="159"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="160"/>
         <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;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="160"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="161"/>
         <source>&lt;li&gt;All networks need at least one server defined&lt;/li&gt;</source>
         <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="161"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="162"/>
         <source>&lt;/ul&gt;</source>
         <translation>&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="162"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="163"/>
         <source>Invalid Network Settings</source>
         <translation>Paramètres réseau invalides</translation>
     </message>
@@ -5481,12 +6292,12 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Appliquer d&apos;abord !</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="545"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="542"/>
         <source>Delete Network?</source>
         <translation>Supprimer le Réseau ?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="546"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="543"/>
         <source>Do you really want to delete the network &quot;%1&quot; and all related settings, including the backlog?</source>
         <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>
@@ -5716,6 +6527,11 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <source>Use Custom Encodings</source>
         <translation>Utiliser des encodages personnalisés</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
+        <source>Misc</source>
+        <translation>Divers</translation>
+    </message>
 </context>
 <context>
     <name>NickEditDlg</name>
@@ -5730,7 +6546,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation type="obsolete">Pseudo:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="708"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="420"/>
         <source>Add Nickname</source>
         <translation>Ajouter un pseudo</translation>
     </message>
@@ -5877,7 +6693,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Comportement</translation>
+        <translation type="obsolete">Comportement</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
@@ -5929,6 +6745,11 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <source>Y</source>
         <translation type="obsolete">Y</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
+        <source>Appearance</source>
+        <translation>Apparence</translation>
+    </message>
 </context>
 <context>
     <name>PhononNotificationBackend::ConfigWidget</name>
@@ -5956,23 +6777,41 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>Fichier joué:</translation>
     </message>
 </context>
+<context>
+    <name>PostgreSqlStorage</name>
+    <message>
+        <location filename="../src/core/postgresqlstorage.cpp" line="61"/>
+        <source>PostgreSQL Turbo Bomber HD!</source>
+        <translation>PostgreSQL Turbo Bomber HD!</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="54"/>
+        <location filename="../src/client/backlogrequester.cpp" line="65"/>
         <source>Requesting a total of up to %1 backlog messages for %2 buffers</source>
         <translation>Demande d&apos;un maximum de %1 messages d&apos;historique pour %2 tampons</translation>
     </message>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="78"/>
+        <location filename="../src/client/backlogrequester.cpp" line="89"/>
         <source>Requesting up to %1 of all unread backlog messages (plus additional %2)</source>
         <translation>Demande d&apos;un maximum de %1 de tous les messages non lus (plus %2 complémentaires)</translation>
     </message>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="96"/>
+        <location filename="../src/client/backlogrequester.cpp" line="107"/>
         <source>Requesting a total of up to %1 unread backlog messages for %2 buffers</source>
         <translation>Demande d&apos;un maximum de %1 messages non lus d&apos;historique pour %2 tampons</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="56"/>
+        <source>Welcome to Quassel IRC</source>
+        <translation>Bienvenue sur Quassel IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="59"/>
+        <source>This wizard will help you to set up your default identity and your IRC network connection.&lt;br&gt;This only covers basic settings. You can cancel this wizard any time and use the settings dialog for more detailed changes.</source>
+        <translation>Cet assistant vous aide à paraméter votre identité par défaut et votre connection au réseau IRC.&lt;br&gt;Uniquement pour les paramètres de base. Vous pouvez annuller l&apos;assistant à tout moment et utiliser la fenêtre de paramètres pour des modifications plus détaillées.</translation>
+    </message>
 </context>
 <context>
     <name>QtopiaMainWin</name>
@@ -6028,27 +6867,27 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>Quassel::secondsToString()</name>
     <message>
-        <location filename="../src/common/util.cpp" line="157"/>
+        <location filename="../src/common/util.cpp" line="129"/>
         <source>year</source>
         <translation>année</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="158"/>
+        <location filename="../src/common/util.cpp" line="130"/>
         <source>day</source>
         <translation>jour</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="159"/>
+        <location filename="../src/common/util.cpp" line="131"/>
         <source>h</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="160"/>
+        <location filename="../src/common/util.cpp" line="132"/>
         <source>min</source>
         <translation>mn</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="161"/>
+        <location filename="../src/common/util.cpp" line="133"/>
         <source>sec</source>
         <translation>s</translation>
     </message>
@@ -6056,7 +6895,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>QueryBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="367"/>
+        <location filename="../src/client/networkmodel.cpp" line="380"/>
         <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
         <translation>&lt;b&gt;Dialogue avec %1&lt;/b&gt;</translation>
     </message>
@@ -6071,17 +6910,17 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation type="obsolete">&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="385"/>
+        <location filename="../src/client/networkmodel.cpp" line="398"/>
         <source>idling since %1</source>
         <translation>inactif depuis %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="388"/>
+        <location filename="../src/client/networkmodel.cpp" line="401"/>
         <source>login time: %1</source>
         <translation>durée de connexion: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="391"/>
+        <location filename="../src/client/networkmodel.cpp" line="404"/>
         <source>server: %1</source>
         <translation>serveur: %1</translation>
     </message>
@@ -6294,32 +7133,32 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="79"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="87"/>
         <source>Save changes</source>
         <translation>Sauver les changements</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="80"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="88"/>
         <source>There are unsaved changes on the current configuration page. Would you like to apply your changes now?</source>
         <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="156"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="171"/>
         <source>Reload Settings</source>
         <translation>Recharger les paramètres</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="171"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <translation>Voulez vous recharger les paramètres, et annuler vos changements sur cette page ?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="165"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="180"/>
         <source>Restore Defaults</source>
         <translation>Restaurer les valeurs par défaut</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="165"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="180"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation>Voulez-vous restaurer les paramètres par défaut de cette page?</translation>
     </message>
@@ -6329,7 +7168,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>Configurer Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="91"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="104"/>
         <source>Configure %1</source>
         <translation>Configurer %1</translation>
     </message>
@@ -6382,10 +7221,10 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/common/signalproxy.cpp" line="937"/>
         <source>Client tried to send package larger than max package size!</source>
-        <translation>Le client a essayé d&apos;envoyer un paquet supérieur à la taille maximum d&apos;un paquet!</translation>
+        <translation type="obsolete">Le client a essayé d&apos;envoyer un paquet supérieur à la taille maximum d&apos;un paquet!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1074"/>
+        <location filename="../src/common/signalproxy.cpp" line="1088"/>
         <source>Disconnecting</source>
         <translation>Déconnecte</translation>
     </message>
@@ -6397,17 +7236,115 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/common/signalproxy.cpp" line="942"/>
         <source>Client tried to send 0 byte package!</source>
-        <translation>Le client a essayé d&apos;envoyer un paquet de 0 octet!</translation>
+        <translation type="obsolete">Le client a essayé d&apos;envoyer un paquet de 0 octet!</translation>
     </message>
     <message>
         <location filename="../src/common/signalproxy.cpp" line="959"/>
         <source>Client sent corrupted compressed data!</source>
-        <translation>Le client a envoyé des données compressées corrompues!</translation>
+        <translation type="obsolete">Le client a envoyé des données compressées corrompues!</translation>
     </message>
     <message>
         <location filename="../src/common/signalproxy.cpp" line="974"/>
         <source>Client sent corrupt data: unable to load QVariant!</source>
-        <translation>Le client a envoyé des données corrompues: impossible de charger QVariant!</translation>
+        <translation type="obsolete">Le client a envoyé des données corrompues: impossible de charger QVariant!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="951"/>
+        <source>Peer tried to send package larger than max package size!</source>
+        <translation>Le partenaire a essayé d&apos;envoyer un paquet supérieur à la taille maximum d&apos;un paquet!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="956"/>
+        <source>Peer tried to send 0 byte package!</source>
+        <translation>Le partenaire a essayé d&apos;envoyer un paquet de 0 octet!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="973"/>
+        <source>Peer sent corrupted compressed data!</source>
+        <translation>Le partenaire a envoyé des données compressées corrompues!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="988"/>
+        <source>Peer sent corrupt data: unable to load QVariant!</source>
+        <translation>Le partenaire a envoyé des données corrompues: impossible de charger QVariant!</translation>
+    </message>
+</context>
+<context>
+    <name>SimpleNetworkEditor</name>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="28"/>
+        <source>Network name:</source>
+        <translation>Nom du Réseau:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="35"/>
+        <source>The name of the IRC network you are configuring</source>
+        <translation>Nom du réseau IRC que vous configurez</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="63"/>
+        <source>Servers</source>
+        <translation>Serveurs</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="81"/>
+        <source>A list of IRC servers belonging to this network</source>
+        <translation>Liste des serveurs IRC appartenant à ce réseau</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="96"/>
+        <source>Edit this server entry</source>
+        <translation>Modifier cette entrée de serveur</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="99"/>
+        <source>&amp;Edit...</source>
+        <translation>&amp;Modifier...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="116"/>
+        <source>Add another IRC server</source>
+        <translation>Ajouter un autre serveur IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="119"/>
+        <source>&amp;Add...</source>
+        <translation>&amp;Ajouter...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="136"/>
+        <source>Remove this server entry from the list</source>
+        <translation>Supprimer cette entrée serveur de la liste</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="139"/>
+        <source>De&amp;lete</source>
+        <translation>&amp;Supprimer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="165"/>
+        <source>Move upwards in list</source>
+        <translation>Monter dans la liste</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="182"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="179"/>
+        <source>Move downwards in list</source>
+        <translation>Descendre dans la liste</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="226"/>
+        <source>Join Channels Automatically</source>
+        <translation>Rejoindre les canaux automatiquement</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="250"/>
+        <source>A list of IRC channels you will join automatically after connecting to the network</source>
+        <translation>Liste des canaux IRC que vous voulez rejoindre automatiquement après connection au réseau</translation>
     </message>
 </context>
 <context>
@@ -6433,20 +7370,93 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>SQLite est un moteur de base de données par fichiers qui ne nécessite aucun paramétrage. Cela 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. Utilisez SQLite si votre Noyau Quassel doit sauver ses données sur la machine même qu&apos;il utilise, et si vous pensez être peu à utiliser votre noyau.</translation>
     </message>
 </context>
+<context>
+    <name>SslCertDisplayDialog</name>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="568"/>
+        <source>SSL Certificate used by %1</source>
+        <translation>SSL Certificat émis par %1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="572"/>
+        <source>Issuer Info</source>
+        <translation>Informations Emetteur</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="583"/>
+        <source>Organization:</source>
+        <translation>Organisation:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="584"/>
+        <source>Locality Name:</source>
+        <translation>Nom de la Localité:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="585"/>
+        <source>Organizational Unit Name:</source>
+        <translation>Unité d&apos;Organisation:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="586"/>
+        <source>Country Name:</source>
+        <translation>Nom du Pays:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="587"/>
+        <source>State or Province Name:</source>
+        <translation>Nom de l&apos;Etat ou de la Province:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="581"/>
+        <source>Subject Info</source>
+        <translation>Sujet Info </translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="590"/>
+        <source>Additional Info</source>
+        <translation>Info additionelle</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="592"/>
+        <source>Valid From:</source>
+        <translation>Valable à partir de:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="593"/>
+        <source>Valid To:</source>
+        <translation>Valable jusqu&apos;au:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="596"/>
+        <source>Hostname %1:</source>
+        <translation>Nom de l&apos;hôte %1:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="600"/>
+        <source>E-Mail Address %1:</source>
+        <translation>Adresse Email %1:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="602"/>
+        <source>Digest:</source>
+        <translation>Résumé:</translation>
+    </message>
+</context>
 <context>
     <name>StatusBufferItem</name>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="300"/>
         <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Tampon d&apos;état de %1&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Tampon d&apos;état de %1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="302"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
-        <translation>&lt;p&gt; %1 &lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.h" line="133"/>
+        <location filename="../src/client/networkmodel.h" line="139"/>
         <source>Status Buffer</source>
         <translation>Tampon d&apos;état</translation>
     </message>
@@ -6505,17 +7515,17 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>SystrayNotificationBackend::ConfigWidget</name>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="124"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="106"/>
         <source>System Tray Icon</source>
         <translation>Icône système</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="125"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="107"/>
         <source>Animate</source>
         <translation>Animer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="127"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="109"/>
         <source>Show bubble</source>
         <translation>Afficher une bulle</translation>
     </message>
@@ -6543,6 +7553,149 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>s</translation>
     </message>
 </context>
+<context>
+    <name>ToolBarActionProvider</name>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect</source>
+        <translation>Connecter</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect to IRC</source>
+        <translation>Connecter à l&apos;IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect</source>
+        <translation>Déconnecter</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect from IRC</source>
+        <translation>Déconnecter de l&apos;IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Part</source>
+        <translation>Partir</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Leave currently selected channel</source>
+        <translation>Partir du canal sélectionné</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join</source>
+        <translation>Rejoindre</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join a channel</source>
+        <translation>Rejoindre le Canal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Query</source>
+        <translation>Requête</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Start a private conversation</source>
+        <translation>Commencer une conversation privée</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Whois</source>
+        <translation>Whois</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Request user information</source>
+        <translation>Demander les informations de l&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Op</source>
+        <translation>Op</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Give operator privileges to user</source>
+        <translation>Donner le statut d&apos;opérateur à l&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Deop</source>
+        <translation>Deop</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Take operator privileges from user</source>
+        <translation>Enlever le statut d&apos;opérateur à l&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Voice</source>
+        <translation>Voice</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Give voice to user</source>
+        <translation>Donner Voix à l&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Devoice</source>
+        <translation>Dévoice</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Take voice from user</source>
+        <translation>Enlever Voix à l&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Kick</source>
+        <translation>Kicker</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Remove user from channel</source>
+        <translation>Enlever l&apos;utilisateur du Canal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban</source>
+        <translation>Bannir</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban user from channel</source>
+        <translation>Bannir l&apos;utilisateur du Canal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Kick/Ban</source>
+        <translation>Kicker/Bannir</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Remove and ban user from channel</source>
+        <translation>Enlever et bannir l&apos;utilisateur du Canal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="54"/>
+        <source>Connect to all</source>
+        <translation>Connecter à tous</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="61"/>
+        <source>Disconnect from all</source>
+        <translation>Déconnecter de tous</translation>
+    </message>
+</context>
 <context>
     <name>TopicButton</name>
     <message>
@@ -6720,122 +7873,122 @@ Click to edit!</source>
 <context>
     <name>UiStyle::StyledMessage</name>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="311"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="328"/>
         <source>%D0%1</source>
         <translation>%D0%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="313"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="330"/>
         <source>%Dn%1</source>
         <translation>%Dn%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="315"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="332"/>
         <source>%Ds%1</source>
         <translation>%Ds%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="317"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="334"/>
         <source>%De%1</source>
         <translation>%De%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="319"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
         <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
         <translation>%Dj%DN%1%DN %DH(%2@%3)%DH a rejoint %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="321"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="338"/>
         <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
         <translation>%Dp%DN%1%DN %DH(%2@%3)%DH a quitté %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="325"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="342"/>
         <source>%Dq%DN%1%DN %DH(%2@%3)%DH has quit</source>
         <translation>%Dq%DN%1%DN %DH(%2@%3)%DH est parti</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="331"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="348"/>
         <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
         <translation>%Dk%DN%1%DN a kické %DN%2%DN de %DC%3%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="353"/>
         <source>%DrYou are now known as %DN%1%DN</source>
         <translation>%DrVous vous appellez maintenant %DN%1%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="337"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="354"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
         <translation>%Dr%DN%1%DN s&apos;appelle maintenant %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="340"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="357"/>
         <source>%DmUser mode: %DM%1%DM</source>
         <translation>%DmMode utilisateur: %DM%1%DM</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="341"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="358"/>
         <source>%DmMode %DM%1%DM by %DN%2%DN</source>
         <translation>%DmMode %DM%1%DM par %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="344"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="361"/>
         <source>%Da%DN%1%DN %2</source>
         <translation>%Da%DN%1%DN %2</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="347"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="364"/>
         <source>%De[%1]</source>
         <translation>%De[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="369"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="386"/>
         <source>&lt;%1&gt;</source>
         <translation>&lt;%1&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="371"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="388"/>
         <source>[%1]</source>
         <translation>[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="375"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="392"/>
         <source>*</source>
         <translation>*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="377"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="394"/>
         <source>--&gt;</source>
         <translation>--&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="381"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="398"/>
         <source>&lt;--</source>
         <translation>&lt;--</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="383"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="400"/>
         <source>&lt;-*</source>
         <translation>&lt;-*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="385"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="402"/>
         <source>&lt;-&gt;</source>
         <translation>&lt;-&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="387"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="404"/>
         <source>***</source>
         <translation>***</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="389"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="406"/>
         <source>-*-</source>
         <translation>-*-</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="391"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="408"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
@@ -6843,7 +7996,7 @@ Click to edit!</source>
 <context>
     <name>UserCategoryItem</name>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="643"/>
+        <location filename="../src/client/networkmodel.cpp" line="656"/>
         <source>%n Owner(s)</source>
         <translation>
             <numerusform>%n Fondateur</numerusform>
@@ -6851,7 +8004,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="644"/>
+        <location filename="../src/client/networkmodel.cpp" line="657"/>
         <source>%n Admin(s)</source>
         <translation>
             <numerusform>%n Admin</numerusform>
@@ -6859,7 +8012,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="645"/>
+        <location filename="../src/client/networkmodel.cpp" line="658"/>
         <source>%n Operator(s)</source>
         <translation>
             <numerusform>%n Operateur</numerusform>
@@ -6867,7 +8020,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="646"/>
+        <location filename="../src/client/networkmodel.cpp" line="659"/>
         <source>%n Half-Op(s)</source>
         <translation>
             <numerusform>%n Half-Op</numerusform>
@@ -6875,7 +8028,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="647"/>
+        <location filename="../src/client/networkmodel.cpp" line="660"/>
         <source>%n Voiced</source>
         <translation>
             <numerusform>%n Voicé</numerusform>
@@ -6883,7 +8036,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="648"/>
+        <location filename="../src/client/networkmodel.cpp" line="661"/>
         <source>%n User(s)</source>
         <translation>
             <numerusform>%n Utilisateur</numerusform>
@@ -6894,9 +8047,14 @@ Click to edit!</source>
 <context>
     <name>UserInputHandler</name>
     <message>
-        <location filename="../src/core/userinputhandler.cpp" line="134"/>
+        <location filename="../src/core/userinputhandler.cpp" line="132"/>
         <source>sending CTCP-%1 request</source>
         <translation>envoi d&apos;une requête CTCP-%1</translation>
     </message>
+    <message>
+        <location filename="../src/core/userinputhandler.cpp" line="63"/>
+        <source>away</source>
+        <translation>absent</translation>
+    </message>
 </context>
 </TS>
index a01bc9e..c19b6ec 100644 (file)
@@ -19,7 +19,7 @@
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
         <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;Современный, распределённый клиент IRC&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 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; в сети &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC распространяется по двойной лицензии &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; и &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Большинство значков &amp;copy;  &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Команда Oxygen&lt;/a&gt; и используются по лицензии &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Об ошибках пожалуйста сообщайте на  &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt;.</translation>
+        <translation type="obsolete">&lt;b&gt;Современный, распределённый клиент IRC&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 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; в сети &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC распространяется по двойной лицензии &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; и &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Большинство значков &amp;copy;  &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Команда Oxygen&lt;/a&gt; и используются по лицензии &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Об ошибках пожалуйста сообщайте на  &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt;.</translation>
     </message>
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="63"/>
         <translation type="obsolete">Особая благодарность:&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;за прекрасную графическую работу и логотип/значок Quassel&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Команде Oxygen&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за создания большинства шикарных значков, которые вы видите в 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;за создание Qt и Qtopia, и за поддержку развития Quasseltopia с помощью Greenphones и прочего&lt;/dd&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="16"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="17"/>
         <source>About Quassel</source>
         <translation>О Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="61"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="59"/>
         <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;
@@ -50,7 +50,7 @@ p, li { white-space: pre-wrap; }
         <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.ui" line="75"/>
         <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;
@@ -58,38 +58,53 @@ p, li { white-space: pre-wrap; }
         <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="114"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="115"/>
         <source>&amp;About</source>
         <translation>&amp;О программе</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="134"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="135"/>
         <source>A&amp;uthors</source>
         <translation>&amp;Авторы</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="154"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="155"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Помощники</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="174"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="175"/>
         <source>&amp;Thanks To</source>
         <translation>&amp;Благодарности</translation>
     </message>
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="118"/>
         <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&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;Qt Software formerly known as 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;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s&lt;/dd&gt;</source>
-        <translation>Особая благодарность:&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;за прекрасную графическую работу и логотип/значок Quassel&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Команде Oxygen&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за создания большинства шикарных значков, которые вы видите в Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software, ранее известная как Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за создание Qt и Qtopia, и за поддержку развития QuasselTopia с помощью Greenphones и прочего&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за поддержку жизни Qt, и за спонсорство разработки Quassel Mobile с помощью N810&lt;/dd&gt;</translation>
+        <translation type="obsolete">Особая благодарность:&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;за прекрасную графическую работу и логотип/значок Quassel&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Команде Oxygen&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за создания большинства шикарных значков, которые вы видите в Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software, ранее известная как Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за создание Qt и Qtopia, и за поддержку развития QuasselTopia с помощью Greenphones и прочего&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за поддержку жизни Qt, и за спонсорство разработки Quassel Mobile с помощью N810&lt;/dd&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
+        <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 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;Современный, распределённый клиент IRC&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 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; в сети &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC распространяется по двойной лицензии &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; и &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Большинство значков &amp;copy;  &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Команда Oxygen&lt;/a&gt; и используются по лицензии &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Об ошибках пожалуйста сообщайте на  &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="125"/>
+        <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/quassel-eye.png&quot;&gt;&amp;nbsp;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for the original Quassel icon - The All-Seeing Eye&lt;/dt&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/oxygen.png&quot;&gt;&amp;nbsp;&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 all the artwork you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/qt-logo-32.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software formerly known as 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;&lt;dt&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;&lt;img src=&quot;:/pics/nokia.png&quot;&gt;&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s&lt;/dd&gt;</source>
+        <translation>Особая благодарность:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/quassel-eye.png&quot;&gt;&amp;nbsp;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за оригинальный значок Quassel - Всевидящее Око&lt;/dt&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/oxygen.png&quot;&gt;&amp;nbsp;&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;за всю графическую работу для Quassel&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/qt-logo-32.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software, ранее известная как Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за создание Qt и Qtopia, и за поддержку развития QuasselTopia с помощью Greenphones и прочего&lt;/dd&gt;&lt;dt&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;&lt;img src=&quot;:/pics/nokia.png&quot;&gt;&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за поддержку жизни Qt, и за спонсорство разработки Quassel Mobile с помощью N810&lt;/dd&gt;</translation>
     </message>
 </context>
 <context>
     <name>AbstractSqlStorage</name>
     <message>
-        <location filename="../src/core/abstractsqlstorage.cpp" line="103"/>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="104"/>
         <source>Installed Schema (version %1) is not up to date. Upgrading to version %2...</source>
         <translation>Используемая Схема (версии %1) устарела. Обновляю до версии %2...</translation>
     </message>
+    <message>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="106"/>
+        <source>Upgrade failed...</source>
+        <translation>Обновление не удалось...</translation>
+    </message>
 </context>
 <context>
     <name>AliasesModel</name>
@@ -109,7 +124,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
         <source>Behaviour</source>
-        <translation>Поведение</translation>
+        <translation type="obsolete">Поведение</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
@@ -131,63 +146,176 @@ p, li { white-space: pre-wrap; }
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
+        <source>Misc</source>
+        <translation>Прочее</translation>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="33"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="36"/>
         <source>Appearance</source>
         <translation>Вид</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="33"/>
         <source>General</source>
-        <translation>Общие</translation>
+        <translation type="obsolete">Общие</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="38"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="46"/>
         <source>&lt;System Default&gt;</source>
         <translation>&lt;По умолчанию&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="13"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="14"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
         <source>Client style:</source>
-        <translation>Стиль клиента:</translation>
+        <translation type="obsolete">Стиль клиента:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="31"/>
         <source>Language:</source>
-        <translation>Язык:</translation>
+        <translation type="obsolete">Язык:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="43"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
         <source>&lt;Original&gt;</source>
         <translation>&lt;Без изменений&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
         <source>Note: needs client restart for full effect!</source>
-        <translation>Замечание: для полного эффекта нужно перезапустить клиент!</translation>
+        <translation type="obsolete">Замечание: для полного эффекта нужно перезапустить клиент!</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="61"/>
         <source>Misc:</source>
-        <translation>Прочее:</translation>
+        <translation type="obsolete">Прочее:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="67"/>
         <source>Show Web Previews</source>
-        <translation>Показывать предварительный просмотр веб-ссылок</translation>
+        <translation type="obsolete">Показывать предварительный просмотр веб-ссылок</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="77"/>
         <source>Use Icons to represent away state of Users</source>
-        <translation>Отображать состояние пользователей значками</translation>
+        <translation type="obsolete">Отображать состояние пользователей значками</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="20"/>
+        <source>Client Style</source>
+        <translation>Стиль клиента</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="26"/>
+        <source>Set application style</source>
+        <translation>Задаёт стиль приложения</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="36"/>
+        <source>Language</source>
+        <translation>Язык</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="42"/>
+        <source>Set the application language. Requires restart!</source>
+        <translation>Задаёт язык приложения. Требует перезапуска!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="62"/>
+        <source>Fonts</source>
+        <translation>Шрифты</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="84"/>
+        <source>Set font for the main chat window and the chat monitor</source>
+        <translation>Задаёт шрифт главного окна чата и монитора чата</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="71"/>
+        <source>Chat window:</source>
+        <translation>Окно чата:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="189"/>
+        <source>Font</source>
+        <translation>Шрифт</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="205"/>
+        <source>Choose...</source>
+        <translation>Выбрать...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="132"/>
+        <source>Set font for channel and nick lists</source>
+        <translation>Задаёт шрифт списков каналов и ников</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="119"/>
+        <source>Channel list:</source>
+        <translation>Список каналов:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="180"/>
+        <source>Set font for the input line</source>
+        <translation>Задаёт шрифт для строки ввода</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="167"/>
+        <source>Input line:</source>
+        <translation>Строка ввода:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="215"/>
+        <source>Misc</source>
+        <translation>Прочее</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="221"/>
+        <source>Show a website preview window when hovering the mouse over a web address</source>
+        <translation>Показывать предварительный просмотр вебсайта при наведении мышью на адрес</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="224"/>
+        <source>Show previews of webpages on URL hover</source>
+        <translation>Показывать эскиз вебсайта при наведении на URL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="234"/>
+        <source>Show status icons in channel and nick lists</source>
+        <translation>Показывать значки статус в списках каналов и ников</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="237"/>
+        <source>Use icons in channel and nick lists</source>
+        <translation>Использовать значки в списках</translation>
+    </message>
+</context>
+<context>
+    <name>AwayLogView</name>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="33"/>
+        <source>Away Log</source>
+        <translation>Журнал отсутствия</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="44"/>
+        <source>Show Network Name</source>
+        <translation>Показывать название сети</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="49"/>
+        <source>Show Buffer Name</source>
+        <translation>Показывать название буфера</translation>
     </message>
 </context>
 <context>
@@ -195,7 +323,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
         <source>Behaviour</source>
-        <translation>Поведение</translation>
+        <translation type="obsolete">Поведение</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
@@ -208,37 +336,37 @@ p, li { white-space: pre-wrap; }
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="74"/>
         <source>Backlog Request Method:</source>
         <translation>Метод запроса журнала:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="29"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="82"/>
         <source>Fixed Amount per Buffer</source>
         <translation>Фиксированная длина для каждого буфера</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="34"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="87"/>
         <source>Unread Messages per Buffer</source>
         <translation>Непрочитанные сообщения для каждого буфера</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="39"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="92"/>
         <source>Global Unread Messages</source>
         <translation>Глобальное количество непрочитанных сообщений</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="69"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="122"/>
         <source>The simplest Requester. It fetches a fixed amount of lines for each buffer from the Backlog.</source>
         <translation>Простейший вариант. Запрашивает фиксированное количество строк для каждого буфера из журнала.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="84"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="137"/>
         <source>amount of messages per buffer that are requested after the core connection has been established.</source>
         <translation>количество сообщений из каждого буфера, которые запрашиваются у ядра после установления соединения.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="87"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="140"/>
         <source>Initial backlog amount:</source>
         <translation>Начальный размер журнала:</translation>
     </message>
@@ -247,27 +375,27 @@ p, li { white-space: pre-wrap; }
         <source>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
 
 You can also chose to fetch additional older chatlines to provide a better context.</source>
-        <translation>Этот метод запрашивает непрочитанные сообщения для каждого буфера индивидуально. Количество строк может быть ограничено для каждого буфера.
+        <translation type="obsolete">Этот метод запрашивает непрочитанные сообщения для каждого буфера индивидуально. Количество строк может быть ограничено для каждого буфера.
 
 Также можно запрашивать дополнительное количество старых строк для лучшего контекста.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="288"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="341"/>
         <source>Maximum amount of messages to be fetched per buffer.</source>
         <translation>Максимальное количество запрашиваемых сообщений для буфера.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="281"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="334"/>
         <source>Limit:</source>
         <translation>Предел:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="320"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="373"/>
         <source>Amount of messages to be fetched in addition to the unread messages. The Limit does not apply here.</source>
         <translation>Количество сообщений, запрашиваемых в дополнение к непрочитанным. Предел здесь не применяется.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="313"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="366"/>
         <source>Additional Messages:</source>
         <translation>Дополнительных сообщений:</translation>
     </message>
@@ -283,22 +411,22 @@ You can also chose to fetch additional older chatlines to provide a better conte
         <translation type="obsolete">Этот метод запрашивает все сообщения новее чем самое старое сообщение из каждого буфера.Этот метод определяет самое старое прочитанное сообщение из всех буферов и затем запрашивает один большой кусок сообщений со всех буферовПримечание: не рекомендуется использовать этот метод, если используются скрытые буфера или есть неактивные буфера (например оконченные диалоги или каналы).Полезно его использовать для ограничения общего объёма журнала и достижение максимальной скорости.Также можно запросить дополнительно старые строки для лучшего контекста.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="278"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="331"/>
         <source>Maximum amount of messages to be fetched over all buffers.</source>
         <translation>Максимальное количество сообщений, запрашиваемых из всех буферов.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="376"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
         <source>Number of messages to be requested from the core when using scrolling up in the buffer view.</source>
         <translation>Количество запрашиваемых у ядра сообщений при прокрутке журнала вверх.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="379"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="24"/>
         <source>Dynamic backlog amount:</source>
         <translation>Динамический размер журнала:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="258"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="311"/>
         <source>This requester fetches all messages newer than the oldest unread message for all buffers.
 
 Note: this requester is not recommended if you use hidden buffer or have inactive buffers (i.e.: no stale queries or channels).
@@ -313,40 +441,54 @@ You can also chose to fetch additional older chatlines to provide a better conte
 Также можно запрашивать дополнительные старые строки для лучшего контекста.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="103"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="156"/>
         <source>FixedBacklogAmount</source>
         <translation>FixedBacklogAmount</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="184"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="237"/>
         <source>PerBufferUnreadBacklogLimit</source>
         <translation>PerBufferUnreadBacklogLimit</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="216"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="269"/>
         <source>PerBufferUnreadBacklogAdditional</source>
         <translation>PerBufferUnreadBacklogAdditional</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="300"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="353"/>
         <source>GlobalUnreadBacklogLimit</source>
         <translation>GlobalUnreadBacklogLimit</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="332"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="385"/>
         <source>GlobalUnreadBacklogAdditional</source>
         <translation>GlobalUnreadBacklogAdditional</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="395"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="40"/>
         <source>DynamicBacklogAmount</source>
         <translation>DynamicBacklogAmount</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
+        <source>Misc</source>
+        <translation>Прочее</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="198"/>
+        <source>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
+
+You can also choose to fetch additional older chatlines to provide a better context.</source>
+        <translation>Этот метод запрашивает непрочитанные сообщения для каждого буфера индивидуально. Количество строк может быть ограничено для каждого буфера.
+
+Также можно запрашивать дополнительное количество старых строк для лучшего контекста.</translation>
+    </message>
 </context>
 <context>
     <name>BufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="276"/>
+        <location filename="../src/client/networkmodel.cpp" line="297"/>
         <source>&lt;p&gt; %1 - %2 &lt;/p&gt;</source>
         <translation>&lt;p&gt; %1 - %2 &lt;/p&gt;</translation>
     </message>
@@ -474,12 +616,12 @@ You can also chose to fetch additional older chatlines to provide a better conte
         <translation type="obsolete">Смены дня</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="276"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="256"/>
         <source>Merge buffers permanently?</source>
         <translation>Произвести необратимое слияние буферов?</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="277"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="257"/>
         <source>Do you want to merge the buffer &quot;%1&quot; permanently into buffer &quot;%2&quot;?
  This cannot be reversed!</source>
         <translation>Хотите ли вы слить буфер &quot;%1&quot; с буфером &quot;%2&quot;?
@@ -507,7 +649,7 @@ You can also chose to fetch additional older chatlines to provide a better conte
         <translation>Пожалуйста введите названия нового списка буферов:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="518"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="520"/>
         <source>Add Buffer View</source>
         <translation>Добавить список буферов</translation>
     </message>
@@ -517,7 +659,12 @@ You can also chose to fetch additional older chatlines to provide a better conte
     <message>
         <location filename="../src/uisupport/bufferviewfilter.cpp" line="53"/>
         <source>Edit Mode</source>
-        <translation>Режим правки</translation>
+        <translation type="obsolete">Режим правки</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferviewfilter.cpp" line="54"/>
+        <source>Show / Hide buffers</source>
+        <translation>Показать / спрятать буферы</translation>
     </message>
 </context>
 <context>
@@ -525,10 +672,10 @@ You can also chose to fetch additional older chatlines to provide a better conte
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="35"/>
         <source>General</source>
-        <translation>Общие</translation>
+        <translation type="obsolete">Общие</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="35"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="36"/>
         <source>Buffer Views</source>
         <translation>Списки буферов</translation>
     </message>
@@ -538,12 +685,12 @@ You can also chose to fetch additional older chatlines to provide a better conte
         <translation>Все</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="338"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="342"/>
         <source>Delete Buffer View?</source>
         <translation>Удалить список буферов?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="339"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="343"/>
         <source>Do you really want to delete the buffer view &quot;%1&quot;?</source>
         <translation>Вы действительно хотите удалить список буферов &quot;%1&quot;?</translation>
     </message>
@@ -649,6 +796,11 @@ In this mode no separate status buffer is displayed.</source>
         <translation>Эта опция недоступна когда видны все сети.
 В этом режиме отдельные буфера состояния не отображаются.</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="36"/>
+        <source>Appearance</source>
+        <translation>Вид</translation>
+    </message>
 </context>
 <context>
     <name>BufferViewWidget</name>
@@ -688,7 +840,7 @@ In this mode no separate status buffer is displayed.</source>
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="85"/>
         <source>Ctrl+0</source>
-        <translation>Ctrl+0</translation>
+        <translation type="obsolete">Ctrl+0</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/bufferwidget.ui" line="64"/>
@@ -698,7 +850,7 @@ 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;:/pics/quassel-large.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;:/pics/quassel-large.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;Разговаривать удобно. Везде.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <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;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;:/pics/quassel-large.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;Разговаривать удобно. Везде.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="73"/>
@@ -713,38 +865,43 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="84"/>
         <source>Zoom Original</source>
-        <translation>Восстановить размер</translation>
+        <translation type="obsolete">Восстановить размер</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/bufferwidget.cpp" line="84"/>
+        <source>Actual Size</source>
+        <translation>Исходный размер</translation>
     </message>
 </context>
 <context>
     <name>ChannelBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="425"/>
+        <location filename="../src/client/networkmodel.cpp" line="461"/>
         <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
         <translation>&lt;b&gt;Канал %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="428"/>
+        <location filename="../src/client/networkmodel.cpp" line="464"/>
         <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Пользователи:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="432"/>
+        <location filename="../src/client/networkmodel.cpp" line="468"/>
         <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Режим:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="444"/>
+        <location filename="../src/client/networkmodel.cpp" line="480"/>
         <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Тема:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="448"/>
+        <location filename="../src/client/networkmodel.cpp" line="484"/>
         <source>Not active &lt;br /&gt; Double-click to join</source>
         <translation>Неактивно &lt;br /&gt; Дважды щёлкните чтобы войти</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="451"/>
+        <location filename="../src/client/networkmodel.cpp" line="487"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
         <translation>&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
@@ -809,7 +966,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
         <source>General</source>
-        <translation>Общие</translation>
+        <translation type="obsolete">Общие</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
@@ -887,6 +1044,11 @@ p, li { white-space: pre-wrap; }
         <source>Show own messages</source>
         <translation>Показывать свои сообщения</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
+        <source>Appearance</source>
+        <translation>Вид</translation>
+    </message>
 </context>
 <context>
     <name>ChatMonitorView</name>
@@ -929,7 +1091,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChatScene</name>
     <message>
-        <location filename="../src/qtui/chatscene.cpp" line="582"/>
+        <location filename="../src/qtui/chatscene.cpp" line="580"/>
         <source>Copy Selection</source>
         <translation>Скопировать выделение</translation>
     </message>
@@ -975,15 +1137,20 @@ p, li { white-space: pre-wrap; }
         <translation>Личность уже есть в клиенте!</translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="316"/>
+        <location filename="../src/client/client.cpp" line="317"/>
         <source>All Buffers</source>
         <translation>Все буфера</translation>
     </message>
+    <message>
+        <location filename="../src/client/client.cpp" line="330"/>
+        <source>Default Identity</source>
+        <translation type="obsolete">Личность по умолчанию</translation>
+    </message>
 </context>
 <context>
     <name>ClientBacklogManager</name>
     <message>
-        <location filename="../src/client/clientbacklogmanager.cpp" line="119"/>
+        <location filename="../src/client/clientbacklogmanager.cpp" line="123"/>
         <source>Processed %1 messages in %2 seconds.</source>
         <translation>Обработано сообщений: %1. Затрачено секунд: %2.</translation>
     </message>
@@ -991,50 +1158,60 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ClientSyncer</name>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="53"/>
+        <location filename="../src/client/clientsyncer.cpp" line="52"/>
         <source>The Quassel Core you try to connect to is too old! Please consider upgrading.</source>
         <translation>Вы пытаетесь подключиться к слишком старому ядру Quassel! Пожалуйста обновите.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="78"/>
+        <location filename="../src/client/clientsyncer.cpp" line="77"/>
         <source>&lt;b&gt;Invalid data received from core!&lt;/b&gt;&lt;br&gt;Disconnecting.</source>
         <translation>&lt;b&gt;От ядра получены некорректные данные!&lt;/b&gt;&lt;br&gt;Отсоединяюсь.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="110"/>
+        <location filename="../src/client/clientsyncer.cpp" line="111"/>
         <source>Internal connections not yet supported.</source>
-        <translation>Внутренние соединения пока не поддерживаются.</translation>
+        <translation type="obsolete">Внутренние соединения пока не поддерживаются.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="128"/>
+        <location filename="../src/client/clientsyncer.cpp" line="111"/>
         <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;Этот клиент был собран без поддержки SSL!&lt;/b&gt;&lt;br /&gt;Отключите использование SSL в настройках аккаунта.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="219"/>
+        <location filename="../src/client/clientsyncer.cpp" line="196"/>
         <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!&lt;/b&gt;&lt;br&gt;Для соединения необходима поддержка клиент-серверного протокола по крайней мере версии %1.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="235"/>
+        <location filename="../src/client/clientsyncer.cpp" line="219"/>
         <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, к которому вы пытаетесь подключиться не поддерживает SSL!&lt;/b&gt;&lt;br /&gt;Если вы всё равно хотите подключиться, отключите использование SSL в настройках аккаунта.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="265"/>
+        <location filename="../src/client/clientsyncer.cpp" line="248"/>
         <source>Logging in...</source>
         <translation>Авторизуюсь...</translation>
     </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="407"/>
+        <source>Cert Digest changed! was: %1</source>
+        <translation>Хеш сертификата изменился! старый был: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="102"/>
+        <source>No Host to connect to specified.</source>
+        <translation>Не указан хост для соединения.</translation>
+    </message>
 </context>
 <context>
     <name>ColorSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="34"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="32"/>
         <source>Appearance</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="34"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="32"/>
         <source>Color settings</source>
         <translation>Настройки цвета</translation>
     </message>
@@ -1056,468 +1233,696 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1503"/>
         <source>FG</source>
-        <translation>Текст</translation>
+        <translation type="obsolete">Текст</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1734"/>
         <source>BG</source>
         <translation>Фон</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1523"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1747"/>
         <source>Use BG</source>
         <translation>Использовать фон</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="71"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="77"/>
         <source>Default:</source>
         <translation>По умолчанию:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="120"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="126"/>
         <source>Inactive:</source>
         <translation>Неактивно:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="160"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="172"/>
         <source>Highlight:</source>
         <translation>Подсветка:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="197"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="215"/>
         <source>New Message:</source>
         <translation>Новое сообщение:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="234"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="258"/>
         <source>Other Activity:</source>
         <translation>Другая активность:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1626"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="317"/>
         <source>Preview:</source>
         <translation>Предварительный просмотр:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1633"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="324"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="319"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="349"/>
         <source>Chatview</source>
         <translation>Окно чата</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="335"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="365"/>
         <source>Server Activity</source>
         <translation>Активность сервера</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="885"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1724"/>
         <source>Foreground</source>
         <translation>Текст</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="895"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1013"/>
         <source>Background</source>
         <translation>Фон</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="371"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="417"/>
         <source>Error Message:</source>
         <translation>Сообщение об ошибке:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="411"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="463"/>
         <source>Notice Message:</source>
         <translation>Уведомление:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="451"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="509"/>
         <source>Plain Message:</source>
         <translation>Простое сообщение:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="491"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="555"/>
         <source>Server Message:</source>
         <translation>Сообщение сервера:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="531"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="601"/>
         <source>Highlight Message:</source>
         <translation>Подсвеченное сообщение:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="562"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="619"/>
         <source>User Activity</source>
         <translation>Пользовательская активность</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="598"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="661"/>
         <source>Action Message:</source>
         <translation>Сообщение о действии:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="638"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="707"/>
         <source>Join Message:</source>
         <translation>Сообщение о входе:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="678"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="753"/>
         <source>Kick Message:</source>
         <translation>Сообщение об изгнании:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="718"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="799"/>
         <source>Mode Message:</source>
         <translation>Сообщение о смене режима:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="758"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="845"/>
         <source>Part Message:</source>
         <translation>Сообщение об уходе:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="798"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="891"/>
         <source>Quit Message:</source>
         <translation>Сообщение о выходе:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="838"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="937"/>
         <source>Rename Message:</source>
         <translation>Сообщение о переименовании:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="879"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="997"/>
         <source>Message</source>
         <translation>Сообщение</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="915"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1039"/>
         <source>Timestamp:</source>
         <translation>Время:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="955"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1085"/>
         <source>Sender:</source>
         <translation>Отправитель:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="995"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1092"/>
         <source>Nick:</source>
         <translation>Ник:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1035"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1144"/>
         <source>Hostmask:</source>
         <translation>Маска:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1075"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1196"/>
         <source>Channelname:</source>
         <translation>Канал:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1115"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1248"/>
         <source>Mode flags:</source>
         <translation>Режимы:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1155"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1300"/>
         <source>Url:</source>
         <translation>Адрес:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1195"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1352"/>
         <source>New Message Marker:</source>
         <translation>Маркер новых сообщений:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1232"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
         <source>Mirc Color Codes</source>
         <translation>Цвета mIRC</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1244"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1465"/>
         <source>Color Codes</source>
         <translation>Цвета</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1250"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1471"/>
         <source>Color 0:</source>
         <translation>Цвет 0:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1271"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1492"/>
         <source>Color 1:</source>
         <translation>Цвет 1:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1292"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
         <source>Color 2:</source>
         <translation>Цвет 2:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1313"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1534"/>
         <source>Color 3:</source>
         <translation>Цвет 3:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1334"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1555"/>
         <source>Color 4:</source>
         <translation>Цвет 4:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1355"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1576"/>
         <source>Color 5:</source>
         <translation>Цвет 5:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1376"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1597"/>
         <source>Color 6:</source>
         <translation>Цвет 6:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1397"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1618"/>
         <source>Color 7:</source>
         <translation>Цвет 7:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1418"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1639"/>
         <source>Color 8:</source>
         <translation>Цвет 8:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1425"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1646"/>
         <source>Color 14:</source>
         <translation>Цвет 14:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1432"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1653"/>
         <source>Color 15:</source>
         <translation>Цвет 15:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1439"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1660"/>
         <source>Color 13:</source>
         <translation>Цвет 13:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1446"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1667"/>
         <source>Color 12:</source>
         <translation>Цвет 12:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1674"/>
         <source>Color 11:</source>
         <translation>Цвет 11:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1460"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1681"/>
         <source>Color 10:</source>
         <translation>Цвет 10:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1467"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1688"/>
         <source>Color 9:</source>
         <translation>Цвет 9:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1491"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1712"/>
         <source>Nickview</source>
         <translation>Список  ников</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1497"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1718"/>
         <source>Nick status:</source>
         <translation>Состояние ника:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1533"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1760"/>
         <source>Online:</source>
         <translation>Онлайн:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1573"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1806"/>
         <source>Away:</source>
         <translation>Отошёл:</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1366"/>
+        <source>Enable</source>
+        <translation>Включено</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1373"/>
+        <source>Sender auto coloring:</source>
+        <translation>Автоматическая раскраска отправителя:</translation>
+    </message>
 </context>
 <context>
     <name>ContentsChatItem</name>
     <message>
-        <location filename="../src/qtui/chatitem.cpp" line="608"/>
+        <location filename="../src/qtui/chatitem.cpp" line="611"/>
         <source>Copy Link Address</source>
         <translation>Скопировать адрес ссылки</translation>
     </message>
 </context>
 <context>
-    <name>Core</name>
+    <name>ContextMenuActionProvider</name>
     <message>
-        <location filename="../src/core/core.cpp" line="59"/>
-        <source>Could not initialize any storage backend! Exiting...</source>
-        <translation>Ð\9dе Ð¼Ð¾Ð³Ñ\83 Ð¸Ð½Ð¸Ñ\86иализиÑ\80оваÑ\82Ñ\8c Ð½Ð¸ Ð¾Ð´Ð½Ð¾ Ñ\85Ñ\80анилиÑ\89е! Ð\92Ñ\8bÑ\85ожÑ\83...</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="35"/>
+        <source>Connect</source>
+        <translation>СоединиÑ\82Ñ\8cÑ\81Ñ\8f</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="62"/>
-        <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 поддерживает только SQLite3. Вам нужно
-собрать собственную библиотеку Qt с включенным плагином sqlite
-чтобы quasselcore заработал.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="36"/>
+        <source>Disconnect</source>
+        <translation>Отсоединиться</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="120"/>
-        <source>Calling restoreState() even though active sessions exist!</source>
-        <translation>Ð\92Ñ\8bзÑ\8bваÑ\8e restoreState() Ð½ÐµÑ\81моÑ\82Ñ\80Ñ\8f Ð½Ð° Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83Ñ\8eÑ\89ие Ð°ÐºÑ\82ивнÑ\8bе Ñ\81еÑ\81Ñ\81ии!</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="38"/>
+        <source>Join</source>
+        <translation>Ð\97айÑ\82и</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="161"/>
-        <source>Admin user or password not set.</source>
-        <translation>Ð\9dеÑ\82 Ð¿Ð¾Ð»Ñ\8cзоваÑ\82елÑ\8f-админиÑ\81Ñ\82Ñ\80аÑ\82оÑ\80а Ð¸Ð»Ð¸ Ð¿Ð°Ñ\80олÑ\8f.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="39"/>
+        <source>Part</source>
+        <translation>Ð\92Ñ\8bйÑ\82и</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="164"/>
-        <source>Could not setup storage!</source>
-        <translation>Ð\9dе Ð¼Ð¾Ð³Ñ\83 Ð½Ð°Ñ\81Ñ\82Ñ\80оиÑ\82Ñ\8c Ñ\85Ñ\80анилиÑ\89е!</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="40"/>
+        <source>Delete Buffer(s)...</source>
+        <translation>УдалиÑ\82Ñ\8c Ð±Ñ\83Ñ\84еÑ\80(а)...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="168"/>
-        <source>Creating admin user...</source>
-        <translation>СоздаÑ\8e Ð¿Ð¾Ð»Ñ\8cзоваÑ\82елÑ\8f-админиÑ\81Ñ\82Ñ\80аÑ\82оÑ\80а...</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="41"/>
+        <source>Show Buffer</source>
+        <translation>Ð\9fоказаÑ\82Ñ\8c Ð±Ñ\83Ñ\84еÑ\80</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="294"/>
-        <source>Client connected from</source>
-        <translation>Ð\9aлиенÑ\82 Ñ\81оединилÑ\81Ñ\8f Ñ\81</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="43"/>
+        <source>Joins</source>
+        <translation>Ð\92Ñ\85одÑ\8b</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="297"/>
-        <source>Closing server for basic setup.</source>
-        <translation>Ð\97акÑ\80Ñ\8bваÑ\8e Ñ\81еÑ\80веÑ\80 Ð´Ð»Ñ\8f Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¹ Ð½Ð°Ñ\81Ñ\82Ñ\80ойки.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="44"/>
+        <source>Parts</source>
+        <translation>Ð\92Ñ\8bÑ\85одÑ\8b Ð¸Ð· ÐºÐ°Ð½Ð°Ð»Ð°</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="316"/>
-        <source>Antique client trying to connect... refusing.</source>
-        <translation>Ð\94Ñ\80евний ÐºÐ»Ð¸ÐµÐ½Ñ\82 Ð¿Ð¾Ð¿Ñ\8bÑ\82алÑ\81Ñ\8f Ð¿Ð¾Ð´ÐºÐ»Ñ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f... Ð¾Ñ\82казÑ\8bваÑ\8e.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="45"/>
+        <source>Quits</source>
+        <translation>Ð\92Ñ\8bÑ\85одÑ\8b Ð¸Ð· Ñ\81еÑ\82и</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="330"/>
-        <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;Ваш клиент Quassel слишком старый!&lt;/b&gt;&lt;br&gt;Этому ядру нужна версия клиент-серверного протокола по крайней мере %1.&lt;br&gt;Пожалуйста обновите клиент.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="46"/>
+        <source>Nick Changes</source>
+        <translation>Смены ника</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="436"/>
-        <source>Client</source>
-        <translation>Ð\9aлиенÑ\82</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="47"/>
+        <source>Mode Changes</source>
+        <translation>СменÑ\8b Ñ\80ежимов</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="332"/>
-        <source>too old, rejecting.</source>
-        <translation>слишком старый, отказываю.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="48"/>
+        <source>Day Changes</source>
+        <translation>Смены дня</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="346"/>
-        <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 версии %1&lt;/b&gt;&lt;br&gt;Собрано: %2&lt;br&gt;Аптайм %3д%4ч%5м (с %6)</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="49"/>
+        <source>Set as Default...</source>
+        <translation>Задать буфер по умолчанию...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="392"/>
-        <source>Starting TLS for Client:</source>
-        <translation>Ð\97апÑ\83Ñ\81каÑ\8e TLS Ð´Ð»Ñ\8f ÐºÐ»Ð¸ÐµÐ½Ñ\82а:</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="50"/>
+        <source>Use Defaults...</source>
+        <translation>Ð\98Ñ\81полÑ\8cзоваÑ\82Ñ\8c Ð¿Ð¾ Ñ\83молÑ\87аниÑ\8e...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="410"/>
-        <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;Клиент не инициализирован!&lt;/b&gt;&lt;br&gt;Вам нужно отправить инициализационное сообщение перед попыткой входа.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="52"/>
+        <source>Join Channel...</source>
+        <translation>Зайти на канал...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="412"/>
-        <source>did not send an init message before trying to login, rejecting.</source>
-        <translation>не Ð¾Ñ\82пÑ\80авил Ð¸Ð½Ð¸Ñ\86иализаÑ\86ионное Ñ\81ообÑ\89ение Ð¿ÐµÑ\80ед Ð¿Ð¾Ð¿Ñ\8bÑ\82кой Ð²Ñ\85ода, Ð¾Ñ\82казÑ\8bваÑ\8e.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="54"/>
+        <source>Start Query</source>
+        <translation>Ð\9dаÑ\87аÑ\82Ñ\8c Ð´Ð¸Ð°Ð»Ð¾Ð³</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="430"/>
-        <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;Неверное имя пользователя или пароль!&lt;/b&gt;&lt;br&gt;Предоставленные вами имя пользователя и пароль не найдены в базе.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="55"/>
+        <source>Show Query</source>
+        <translation>Показать диалог</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="436"/>
-        <source>initialized and authenticated successfully as &quot;%1&quot; (UserId: %2).</source>
-        <translation>инициализирован и аутентифицирован успешно как &quot;%1&quot; (UserId: %2).</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="56"/>
+        <source>Whois</source>
+        <translation>Whois</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="447"/>
-        <source>Non-authed client disconnected.</source>
-        <translation>Ð\9dеавÑ\82оÑ\80изованнÑ\8bй ÐºÐ»Ð¸ÐµÐ½Ñ\82 Ð¾Ñ\82Ñ\81оединÑ\91н.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="58"/>
+        <source>Version</source>
+        <translation>Ð\92еÑ\80Ñ\81иÑ\8f</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="453"/>
-        <source>Non-authed client disconnected. (socket allready destroyed)</source>
-        <translation>Ð\9dеавÑ\82оÑ\80изованнÑ\8bй ÐºÐ»Ð¸ÐµÐ½Ñ\82 Ð¾Ñ\82Ñ\81оединÑ\91н. (Ñ\81океÑ\82 Ñ\83же Ñ\83ниÑ\87Ñ\82ожен)</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="59"/>
+        <source>Time</source>
+        <translation>Ð\92Ñ\80емÑ\8f</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="495"/>
-        <source>Could not initialize session for client:</source>
-        <translation>Не могу инициализировать сессию для клиента:</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="60"/>
+        <source>Ping</source>
+        <translation>Ping</translation>
     </message>
-</context>
-<context>
-    <name>CoreAccountEditDlg</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="490"/>
-        <source>Add Core Account</source>
-        <translation>Добавить аккаунт в ядре</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="61"/>
+        <source>Finger</source>
+        <translation>Finger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="13"/>
-        <source>Edit Core Account</source>
-        <translation>РедакÑ\82иÑ\80оваÑ\82Ñ\8c Ð°ÐºÐºÐ°Ñ\83нÑ\82 Ð² Ñ\8fдÑ\80е</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="63"/>
+        <source>Give Operator Status</source>
+        <translation>Ð\94аÑ\82Ñ\8c Ð¾Ð¿ÐµÑ\80аÑ\82оÑ\80а</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="21"/>
-        <source>Account Details</source>
-        <translation>Ð\9fодÑ\80обноÑ\81Ñ\82и Ð°ÐºÐºÐ°Ñ\83нÑ\82а</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="64"/>
+        <source>Take Operator Status</source>
+        <translation>СнÑ\8fÑ\82Ñ\8c Ð¾Ð¿ÐµÑ\80аÑ\82оÑ\80а</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="29"/>
-        <source>Account Name:</source>
-        <translation>Ð\9dазвание Ð°ÐºÐºÐ°Ñ\83нÑ\82а:</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="65"/>
+        <source>Give Voice</source>
+        <translation>Ð\94аÑ\82Ñ\8c Ð³Ð¾Ð»Ð¾Ñ\81</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="36"/>
-        <source>Local Core</source>
-        <translation>Ð\9bокалÑ\8cное Ñ\8fдÑ\80о</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="66"/>
+        <source>Take Voice</source>
+        <translation>СнÑ\8fÑ\82Ñ\8c Ð³Ð¾Ð»Ð¾Ñ\81</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="47"/>
-        <source>Hostname:</source>
-        <translation>ХоÑ\81Ñ\82:</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="67"/>
+        <source>Kick From Channel</source>
+        <translation>Ð\92Ñ\8bгнаÑ\82Ñ\8c Ñ\81 ÐºÐ°Ð½Ð°Ð»Ð°</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="54"/>
-        <source>Port:</source>
-        <translation>Ð\9fоÑ\80Ñ\82:</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="68"/>
+        <source>Ban From Channel</source>
+        <translation>Ð\97абаниÑ\82Ñ\8c Ð½Ð° ÐºÐ°Ð½Ð°Ð»Ðµ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="144"/>
-        <source>localhost</source>
-        <translation>localhost</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="69"/>
+        <source>Kick &amp;&amp; Ban</source>
+        <translation>Выгнать и забанить</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="81"/>
-        <source>Use secure connection (SSL)</source>
-        <translation>Ð\98Ñ\81полÑ\8cзоваÑ\82Ñ\8c Ð·Ð°Ñ\89иÑ\89Ñ\91нное Ñ\81оединение (SSL)</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="71"/>
+        <source>Hide Buffer(s) Temporarily</source>
+        <translation>Ð\92Ñ\80еменно Ñ\81пÑ\80Ñ\8fÑ\82аÑ\82Ñ\8c Ð±Ñ\83Ñ\84еÑ\80(а)</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="97"/>
-        <source>Use a proxy:</source>
-        <translation>Ð\98Ñ\81полÑ\8cзоваÑ\82Ñ\8c Ð¿Ñ\80окÑ\81и:</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="72"/>
+        <source>Hide Buffer(s) Permanently</source>
+        <translation>Ð\9dавÑ\81егда Ñ\81пÑ\80Ñ\8fÑ\82аÑ\82Ñ\8c Ð±Ñ\83Ñ\84еÑ\80(а)</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="109"/>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="73"/>
+        <source>Show Channel List</source>
+        <translation>Показать список каналов</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="74"/>
+        <source>Show Ignore List</source>
+        <translation>Показать список игнорируемых</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="86"/>
+        <source>Hide Events</source>
+        <translation>Спрятать события</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="94"/>
+        <source>CTCP</source>
+        <translation>CTCP</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="106"/>
+        <source>Actions</source>
+        <translation>Действия</translation>
+    </message>
+</context>
+<context>
+    <name>Core</name>
+    <message>
+        <location filename="../src/core/core.cpp" line="146"/>
+        <source>Could not initialize any storage backend! Exiting...</source>
+        <translation>Не могу инициализировать ни одно хранилище! Выхожу...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="149"/>
+        <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 поддерживает только SQLite3. Вам нужно
+собрать собственную библиотеку Qt с включенным плагином sqlite
+чтобы quasselcore заработал.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="186"/>
+        <source>Calling restoreState() even though active sessions exist!</source>
+        <translation>Вызываю restoreState() несмотря на существующие активные сессии!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="227"/>
+        <source>Admin user or password not set.</source>
+        <translation>Нет пользователя-администратора или пароля.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="231"/>
+        <source>Could not setup storage!</source>
+        <translation>Не могу настроить хранилище!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="235"/>
+        <source>Creating admin user...</source>
+        <translation>Создаю пользователя-администратора...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="420"/>
+        <source>Client connected from</source>
+        <translation>Клиент соединился с</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="423"/>
+        <source>Closing server for basic setup.</source>
+        <translation>Закрываю сервер для базовой настройки.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="442"/>
+        <source>Antique client trying to connect... refusing.</source>
+        <translation>Древний клиент попытался подключиться... отказываю.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="456"/>
+        <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;Ваш клиент Quassel слишком старый!&lt;/b&gt;&lt;br&gt;Этому ядру нужна версия клиент-серверного протокола по крайней мере %1.&lt;br&gt;Пожалуйста обновите клиент.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="562"/>
+        <source>Client</source>
+        <translation>Клиент</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="458"/>
+        <source>too old, rejecting.</source>
+        <translation>слишком старый, отказываю.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="472"/>
+        <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 версии %1&lt;/b&gt;&lt;br&gt;Собрано: %2&lt;br&gt;Аптайм %3д%4ч%5м (с %6)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="518"/>
+        <source>Starting TLS for Client:</source>
+        <translation>Запускаю TLS для клиента:</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="536"/>
+        <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;Клиент не инициализирован!&lt;/b&gt;&lt;br&gt;Вам нужно отправить инициализационное сообщение перед попыткой входа.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="538"/>
+        <source>did not send an init message before trying to login, rejecting.</source>
+        <translation>не отправил инициализационное сообщение перед попыткой входа, отказываю.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="556"/>
+        <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;Неверное имя пользователя или пароль!&lt;/b&gt;&lt;br&gt;Предоставленные вами имя пользователя и пароль не найдены в базе.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="562"/>
+        <source>initialized and authenticated successfully as &quot;%1&quot; (UserId: %2).</source>
+        <translation>инициализирован и аутентифицирован успешно как &quot;%1&quot; (UserId: %2).</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="573"/>
+        <source>Non-authed client disconnected.</source>
+        <translation>Неавторизованный клиент отсоединён.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="579"/>
+        <source>Non-authed client disconnected. (socket allready destroyed)</source>
+        <translation>Неавторизованный клиент отсоединён. (сокет уже уничтожен)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="623"/>
+        <source>Could not initialize session for client:</source>
+        <translation>Не могу инициализировать сессию для клиента:</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="335"/>
+        <source>Invalid listen address %1</source>
+        <translation>Некорректный адрес для прослушивания %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="343"/>
+        <source>Listening for GUI clients on IPv4 %1 port %2 using protocol version %3</source>
+        <translation>Ожидаю графических клиентов по адресу IPv4 %1 порт %2, использую протокол версии %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="351"/>
+        <source>Could not open IPv4 interface %1:%2: %3</source>
+        <translation>Не могу открыть интерфейс IPv4 %1:%2: %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="359"/>
+        <source>Listening for GUI clients on IPv6 %1 port %2 using protocol version %3</source>
+        <translation>Ожидаю графических клиентов по адресу IPv6 %1 порт %2, использую протокол версии %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="370"/>
+        <source>Could not open IPv6 interface %1:%2: %3</source>
+        <translation>Не могу открыть интерфейс IPv6 %1:%2: %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="378"/>
+        <source>Invalid listen address %1, unknown network protocol</source>
+        <translation>Некорректный адрес для прослушивания %1, неизвестный сетевой протокол</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="386"/>
+        <source>Could not open any network interfaces to listen on!</source>
+        <translation>Не могу открыть ни один сетевой интерфейс для прослушивания!</translation>
+    </message>
+</context>
+<context>
+    <name>CoreAccountEditDlg</name>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="522"/>
+        <source>Add Core Account</source>
+        <translation>Добавить аккаунт в ядре</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="13"/>
+        <source>Edit Core Account</source>
+        <translation>Редактировать аккаунт в ядре</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="21"/>
+        <source>Account Details</source>
+        <translation>Подробности аккаунта</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="29"/>
+        <source>Account Name:</source>
+        <translation>Название аккаунта:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="36"/>
+        <source>Local Core</source>
+        <translation>Локальное ядро</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="47"/>
+        <source>Hostname:</source>
+        <translation>Хост:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="54"/>
+        <source>Port:</source>
+        <translation>Порт:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="144"/>
+        <source>localhost</source>
+        <translation>localhost</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="81"/>
+        <source>Use secure connection (SSL)</source>
+        <translation>Использовать защищённое соединение (SSL)</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="97"/>
+        <source>Use a proxy:</source>
+        <translation>Использовать прокси:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="109"/>
         <source>Proxy Type:</source>
         <translation>Тип прокси:</translation>
     </message>
@@ -1770,77 +2175,77 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>CoreConnectDlg</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="184"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="190"/>
         <source>Remove Account Settings</source>
         <translation>Удаление настроек аккаунта</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="186"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="192"/>
         <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>Вы действительно хотите удалить ваши локальные настройки для этого аккаунта ядра Quassel?&lt;br&gt;Замечание: это &lt;em&gt;не&lt;/em&gt; удалит и никак не изменит данные в самом ядре!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="236"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="242"/>
         <source>Connect to %1</source>
         <translation>Соединиться с %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="253"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="259"/>
         <source>&lt;div style=color:red;&gt;Connection to %1 failed!&lt;/div&gt;</source>
         <translation>&lt;div style=&quot;color:red;&quot;&gt;Сбой соединения с %1!&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="277"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="309"/>
         <source>Not connected to %1.</source>
         <translation>Нет соединения с %1.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="278"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="310"/>
         <source>Looking up %1...</source>
         <translation>Ищу хост %1...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="279"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="311"/>
         <source>Connecting to %1...</source>
         <translation>Соединяюсь с %1...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="280"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="312"/>
         <source>Connected to %1</source>
         <translation>Соединение с %1 установлено</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="281"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="313"/>
         <source>Unknown connection state to %1</source>
         <translation>Неизвестно состояние соединения с %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="333"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="365"/>
         <source>Logging in...</source>
         <translation>Выполняю вход...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="275"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="286"/>
         <source>Login</source>
         <translation>Вход</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="42"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="53"/>
         <source>Connect to Quassel Core</source>
         <translation>Соединение с ядром Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="57"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="68"/>
         <source>Edit...</source>
         <translation>Правка...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="68"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="79"/>
         <source>Add...</source>
         <translation>Добавить...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="79"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="90"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
@@ -1850,17 +2255,17 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">использовать встроенное ядро</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="117"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="128"/>
         <source>Always use this account</source>
         <translation>Всегда использовать этот аккаунт</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="146"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="165"/>
         <source>Initializing your connection</source>
         <translation>Инициализирую ваше соединение</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="170"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="183"/>
         <source>Connected to apollo.mindpool.net.</source>
         <translation>Соединён с apollo.mindpool.net.</translation>
     </message>
@@ -1876,67 +2281,67 @@ some
 space</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="286"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="294"/>
         <source>User:</source>
         <translation>Пользователь:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="300"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="308"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="314"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="322"/>
         <source>Remember</source>
         <translation>Запомнить</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="336"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="456"/>
         <source>Configure your Quassel Core</source>
         <translation>Настройте ваше ядро Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="342"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="462"/>
         <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, к которому вы подключились, ещё не настроено. Сейчас вы можете запустить мастер настройки, который поможет сконфигурировать ваше ядро.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="370"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="490"/>
         <source>Launch Wizard</source>
         <translation>Запустить мастер</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="427"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="553"/>
         <source>Initializing your session...</source>
         <translation>Инициализирую ваш сеанс...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="435"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="561"/>
         <source>&lt;b&gt;Please be patient while your client synchronizes with the Quassel Core!&lt;/b&gt;</source>
         <translation>&lt;b&gt;Пожалуйста, наберитесь терпения, пока ваш клиент синхронизируется с ядром Quassel!&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="450"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="576"/>
         <source>Session state:</source>
         <translation>Состояние сессии:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="467"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="593"/>
         <source>Network states:</source>
         <translation>Состояния сетей:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="480"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="606"/>
         <source>0/0</source>
         <translation>0/0</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="103"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="114"/>
         <source>Use internal core</source>
         <translation>Использовать встроенное ядро</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="202"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="215"/>
         <source>THIS IS A PLACEHOLDER
 TO
 RESERVE
@@ -1946,6 +2351,26 @@ TO
 RESERVE
 SOME SPACE</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="272"/>
+        <source>&lt;div&gt;Errors occurred while connecting to &quot;%1&quot;:&lt;/div&gt;</source>
+        <translation>&lt;div&gt;При соединении с &quot;%1&quot; возникли ошибки:&lt;/div&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="356"/>
+        <source>view SSL Certificate</source>
+        <translation>просмотреть сертификат SSL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="393"/>
+        <source>add to known hosts</source>
+        <translation>добавить в известные адреса</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="413"/>
+        <source>Continue connection</source>
+        <translation>Продолжить соединение</translation>
+    </message>
 </context>
 <context>
     <name>CoreInfoDlg</name>
@@ -2017,55 +2442,65 @@ SOME SPACE</translation>
 <context>
     <name>CoreNetwork</name>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="145"/>
+        <location filename="../src/core/corenetwork.cpp" line="151"/>
         <source>Connection failed. Cycling to next Server</source>
         <translation>Сбой соединения. Пробую следующий сервер</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="154"/>
+        <location filename="../src/core/corenetwork.cpp" line="160"/>
         <source>Connecting to %1:%2...</source>
         <translation>Соединяюсь с %1:%2...</translation>
     </message>
     <message>
         <location filename="../src/core/corenetwork.cpp" line="184"/>
         <source>Disconnecting.</source>
-        <translation>Отсоединяюсь.</translation>
+        <translation type="obsolete">Отсоединяюсь.</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="280"/>
+        <location filename="../src/core/corenetwork.cpp" line="304"/>
         <source>Could not connect to %1 (%2)</source>
         <translation>Не могу подсоединиться к %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="282"/>
+        <location filename="../src/core/corenetwork.cpp" line="306"/>
         <source>Connection failure: %1</source>
         <translation>Сбой соединения: %1</translation>
     </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="208"/>
+        <source>Disconnecting. (%1)</source>
+        <translation>Отсоединяюсь. (%1)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="208"/>
+        <source>Core Shutdown</source>
+        <translation>Ядро завершает работу</translation>
+    </message>
 </context>
 <context>
     <name>CoreSession</name>
     <message>
         <location filename="../src/core/coresession.cpp" line="139"/>
         <source>Default Identity</source>
-        <translation>Личность по умолчанию</translation>
+        <translation type="obsolete">Личность по умолчанию</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="186"/>
+        <location filename="../src/core/coresession.cpp" line="180"/>
         <source>Client</source>
         <translation>Клиент</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="186"/>
+        <location filename="../src/core/coresession.cpp" line="180"/>
         <source>disconnected (UserId: %1).</source>
         <translation>отсоединён (UserId: %1).</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="324"/>
+        <location filename="../src/core/coresession.cpp" line="317"/>
         <source>CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!</source>
         <translation>CoreSession::createNetwork(): Получен неверный networkId от ядра, пытаясь создать сеть %1!</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="341"/>
+        <location filename="../src/core/coresession.cpp" line="339"/>
         <source>CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!</source>
         <translation>CoreSession::createNetwork(): Попытался создать уже существующую сеть, вместо этого обновляю!</translation>
     </message>
@@ -2288,12 +2723,12 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Поведение</translation>
+        <translation type="obsolete">Поведение</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>General</source>
-        <translation>Общие</translation>
+        <translation type="obsolete">Общие</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="13"/>
@@ -2440,13 +2875,18 @@ SOME SPACE</translation>
         <source>Errors:</source>
         <translation>Ошибки:</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
+        <source>Misc</source>
+        <translation>Прочее</translation>
+    </message>
 </context>
 <context>
     <name>HighlightSettingsPage</name>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
         <source>Behaviour</source>
-        <translation>Поведение</translation>
+        <translation type="obsolete">Поведение</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="32"/>
@@ -2523,76 +2963,81 @@ SOME SPACE</translation>
         <source>Case sensitive</source>
         <translation>Учитывать регистр</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
+        <source>Appearance</source>
+        <translation>Вид</translation>
+    </message>
 </context>
 <context>
     <name>IdentitiesSettingsPage</name>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="108"/>
         <source>General</source>
-        <translation>Общие</translation>
+        <translation type="obsolete">Общие</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="35"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
         <source>Identities</source>
         <translation>Личности</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="206"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="170"/>
         <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;Прежде чем сохранить настройки, необходимо устранить следующие проблемы:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="207"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="171"/>
         <source>&lt;li&gt;All identities need an identity name set&lt;/li&gt;</source>
         <translation>&lt;li&gt;У всех личностей должно быть название&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="208"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="172"/>
         <source>&lt;li&gt;Every identity needs at least one nickname defined&lt;/li&gt;</source>
         <translation>&lt;li&gt;В каждой личности должен быть хотя бы один ник&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="209"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="173"/>
         <source>&lt;li&gt;You need to specify a real name for every identity&lt;/li&gt;</source>
         <translation>&lt;li&gt;Вам нужно указать настоящее имя для каждой личности&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="210"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="174"/>
         <source>&lt;li&gt;You need to specify an ident for every identity&lt;/li&gt;</source>
         <translation>&lt;li&gt;Вам нужно указать идент для каждой личности&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="211"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="175"/>
         <source>&lt;/ul&gt;</source>
         <translation>&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="212"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="176"/>
         <source>One or more identities are invalid</source>
         <translation>Одна или несколько личностей некорректны</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="397"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="306"/>
         <source>Delete Identity?</source>
         <translation>Удалить личность?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="398"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="307"/>
         <source>Do you really want to delete identity &quot;%1&quot;?</source>
         <translation>Вы действительно хотите удалить личность &quot;%1&quot;?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="214"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="31"/>
         <source>Rename Identity</source>
         <translation>Переименовать личность</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="410"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="319"/>
         <source>Please enter a new name for the identity &quot;%1&quot;!</source>
         <translation>Пожалуйста введите новое название личности &quot;%1&quot;!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="260"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="77"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -2614,72 +3059,72 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="116"/>
         <source>Real Name:</source>
-        <translation>Настоящее имя:</translation>
+        <translation type="obsolete">Настоящее имя:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="123"/>
         <source>The &quot;Real Name&quot; is shown in /whois.</source>
-        <translation>&quot;Настоящее имя&quot; отображается в /whois.</translation>
+        <translation type="obsolete">&quot;Настоящее имя&quot; отображается в /whois.</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="132"/>
         <source>Nicknames</source>
-        <translation>Ники</translation>
+        <translation type="obsolete">Ники</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="168"/>
         <source>Add Nickname</source>
-        <translation>Добавить ник</translation>
+        <translation type="obsolete">Добавить ник</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="171"/>
         <source>&amp;Add...</source>
-        <translation>Доб&amp;авить...</translation>
+        <translation type="obsolete">Доб&amp;авить...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="194"/>
         <source>Remove Nickname</source>
-        <translation>Удалить ник</translation>
+        <translation type="obsolete">Удалить ник</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="197"/>
         <source>Remove</source>
-        <translation>Удалить</translation>
+        <translation type="obsolete">Удалить</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="217"/>
         <source>Re&amp;name...</source>
-        <translation>Пере&amp;именовать...</translation>
+        <translation type="obsolete">Пере&amp;именовать...</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="243"/>
         <source>Move upwards in list</source>
-        <translation>Передвинуть вверх в списке</translation>
+        <translation type="obsolete">Передвинуть вверх в списке</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="257"/>
         <source>Move downwards in list</source>
-        <translation>Передвинуть вниз в списке</translation>
+        <translation type="obsolete">Передвинуть вниз в списке</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="313"/>
         <source>A&amp;way</source>
-        <translation>&amp;Отошёл</translation>
+        <translation type="obsolete">&amp;Отошёл</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="319"/>
         <source>Default Away Settings</source>
-        <translation>Настройки состояния &quot;Отошёл&quot; по-умолчанию</translation>
+        <translation type="obsolete">Настройки состояния &quot;Отошёл&quot; по-умолчанию</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="360"/>
         <source>Nick to be used when being away</source>
-        <translation>Ник для состояния &quot;Отошёл&quot;</translation>
+        <translation type="obsolete">Ник для состояния &quot;Отошёл&quot;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="350"/>
         <source>Default away reason</source>
-        <translation>Причина по-умолчанию</translation>
+        <translation type="obsolete">Причина по-умолчанию</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="471"/>
@@ -2694,97 +3139,97 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="375"/>
         <source>Set away when all clients have detached from the core</source>
-        <translation>Устанавливать состояние &quot;отошёл&quot; когда все клиенты отсоединены от ядра</translation>
+        <translation type="obsolete">Устанавливать состояние &quot;отошёл&quot; когда все клиенты отсоединены от ядра</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="378"/>
         <source>Away On Detach</source>
-        <translation>&quot;Отошёл&quot; при отсоединении</translation>
+        <translation type="obsolete">&quot;Отошёл&quot; при отсоединении</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="405"/>
         <source>Override default away reason for auto-away on detach</source>
-        <translation>Игнорировать причину по-умолчанию при автоматическом состоянии &quot;отошёл&quot; при отсоединении</translation>
+        <translation type="obsolete">Игнорировать причину по-умолчанию при автоматическом состоянии &quot;отошёл&quot; при отсоединении</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="420"/>
         <source>Not implemented yet</source>
-        <translation>Ещё не реализовано</translation>
+        <translation type="obsolete">Ещё не реализовано</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="423"/>
         <source>Away On Idle</source>
-        <translation>&quot;Отошёл&quot; при неактивности</translation>
+        <translation type="obsolete">&quot;Отошёл&quot; при неактивности</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="437"/>
         <source>Set away after</source>
-        <translation>Устанавливать &quot;отошёл&quot; после</translation>
+        <translation type="obsolete">Устанавливать &quot;отошёл&quot; после</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="447"/>
         <source>minutes of being idle</source>
-        <translation>минут неактивности</translation>
+        <translation type="obsolete">минут неактивности</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="512"/>
         <source>Advanced</source>
-        <translation>Дополнительно</translation>
+        <translation type="obsolete">Дополнительно</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="520"/>
         <source>Ident:</source>
-        <translation>Идент:</translation>
+        <translation type="obsolete">Идент:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="527"/>
         <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;Идент&quot; является частью хостмаски и вместе с хостом является однозначным идентификатором пользователя сети IRC.</translation>
+        <translation type="obsolete">&quot;Идент&quot; является частью хостмаски и вместе с хостом является однозначным идентификатором пользователя сети IRC.</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="536"/>
         <source>Messages</source>
-        <translation>Сообщения</translation>
+        <translation type="obsolete">Сообщения</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="544"/>
         <source>Part Reason:</source>
-        <translation>Причина выхода с канала:</translation>
+        <translation type="obsolete">Причина выхода с канала:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="557"/>
         <source>Quit Reason:</source>
-        <translation>Причина выхода:</translation>
+        <translation type="obsolete">Причина выхода:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="567"/>
         <source>Kick Reason:</source>
-        <translation>Причина изгнания:</translation>
+        <translation type="obsolete">Причина изгнания:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="534"/>
         <source>Load a Key</source>
-        <translation>Загрузить ключ</translation>
+        <translation type="obsolete">Загрузить ключ</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="726"/>
         <source>No Key loaded</source>
-        <translation>Ключ не загружен</translation>
+        <translation type="obsolete">Ключ не загружен</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="844"/>
         <source>Load</source>
-        <translation>Загрузить</translation>
+        <translation type="obsolete">Загрузить</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="566"/>
         <source>RSA</source>
-        <translation>RSA</translation>
+        <translation type="obsolete">RSA</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="569"/>
         <source>DSA</source>
-        <translation>DSA</translation>
+        <translation type="obsolete">DSA</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="572"/>
@@ -2794,28 +3239,28 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="613"/>
         <source>Clear</source>
-        <translation>Очистить</translation>
+        <translation type="obsolete">Очистить</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="584"/>
         <source>Load a Certificate</source>
-        <translation>Загрузить сертификат</translation>
+        <translation type="obsolete">Загрузить сертификат</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="818"/>
         <source>No Certificate loaded</source>
-        <translation>Сертификат не загружен</translation>
+        <translation type="obsolete">Сертификат не загружен</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="601"/>
         <source>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</source>
-        <translation>Вам нужен клиент, умеющий работать с SSL, для редактирования ключа и сертификата SSL</translation>
+        <translation type="obsolete">Вам нужен клиент, умеющий работать с SSL, для редактирования ключа и сертификата SSL</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="630"/>
         <source>Warning: you are not connected with a secured connection to the Quassel Core!
 Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!</source>
-        <translation>Предупреждение: вы не используете безопасное соединение с ядром Quassel!
+        <translation type="obsolete">Предупреждение: вы не используете безопасное соединение с ядром Quassel!
 В случае продолжения передача вашего ключа и сертификата будет небезопасной!</translation>
     </message>
     <message>
@@ -2826,91 +3271,371 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="705"/>
         <source>Use SSL Key</source>
-        <translation>Использовать ключ SSL</translation>
+        <translation type="obsolete">Использовать ключ SSL</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="719"/>
         <source>Key Type:</source>
-        <translation>Тип ключа:</translation>
+        <translation type="obsolete">Тип ключа:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="758"/>
         <source>Use SSL Certificate</source>
-        <translation>Использовать сертификат SSL</translation>
+        <translation type="obsolete">Использовать сертификат SSL</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="777"/>
         <source>Organisation:</source>
-        <translation>Организация:</translation>
+        <translation type="obsolete">Организация:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="811"/>
         <source>CommonName:</source>
-        <translation>ОбщееИмя:</translation>
+        <translation type="obsolete">ОбщееИмя:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="471"/>
         <source>Away Reason:</source>
-        <translation>Причина отсутствия:</translation>
+        <translation type="obsolete">Причина отсутствия:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="363"/>
         <source>Away Nick:</source>
-        <translation>Ник при отсутствии:</translation>
+        <translation type="obsolete">Ник при отсутствии:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="659"/>
         <source>Continue</source>
-        <translation>Продолжить</translation>
+        <translation type="obsolete">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
+        <source>Misc</source>
+        <translation>Прочее</translation>
     </message>
 </context>
 <context>
     <name>Identity</name>
     <message>
-        <location filename="../src/common/identity.cpp" line="65"/>
+        <location filename="../src/common/identity.cpp" line="148"/>
         <source>&lt;empty&gt;</source>
         <translation>&lt;пусто&gt;</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="66"/>
+        <location filename="../src/common/identity.cpp" line="120"/>
         <source>Quassel IRC User</source>
         <translation>Пользователь Quassel IRC</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="72"/>
+        <location filename="../src/common/identity.cpp" line="154"/>
         <source>Gone fishing.</source>
         <translation>Ловлю рыбу.</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="76"/>
+        <location filename="../src/common/identity.cpp" line="158"/>
         <source>Not here. No, really. not here!</source>
         <translation>Нет меня. Не, честно, нет меня!</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="79"/>
+        <location filename="../src/common/identity.cpp" line="161"/>
         <source>All Quassel clients vanished from the face of the earth...</source>
         <translation>Все клиенты Quassel стёрты с лица земли...</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="82"/>
+        <location filename="../src/common/identity.cpp" line="164"/>
         <source>Kindergarten is elsewhere!</source>
         <translation>Детский сад в другом месте!</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="84"/>
+        <location filename="../src/common/identity.cpp" line="166"/>
         <source>http://quassel-irc.org - Chat comfortably. Anywhere.</source>
         <translation>http://quassel-irc.org - Разговаривать удобно. Везде.</translation>
     </message>
 </context>
+<context>
+    <name>IdentityEditWidget</name>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="398"/>
+        <source>Advanced</source>
+        <translation>Дополнительно</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="290"/>
+        <source>Load a Key</source>
+        <translation>Загрузить ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="604"/>
+        <source>No Key loaded</source>
+        <translation>Ключ не загружен</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="722"/>
+        <source>Load</source>
+        <translation>Загрузить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="322"/>
+        <source>RSA</source>
+        <translation>RSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="325"/>
+        <source>DSA</source>
+        <translation>DSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="369"/>
+        <source>Clear</source>
+        <translation>Очистить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="340"/>
+        <source>Load a Certificate</source>
+        <translation>Загрузить сертификат</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="696"/>
+        <source>No Certificate loaded</source>
+        <translation>Сертификат не загружен</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="29"/>
+        <source>General</source>
+        <translation>Общие</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="37"/>
+        <source>Real Name:</source>
+        <translation>Настоящее имя:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="44"/>
+        <source>The &quot;Real Name&quot; is shown in /whois.</source>
+        <translation>&quot;Настоящее имя&quot; отображается в /whois.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="53"/>
+        <source>Nicknames</source>
+        <translation>Ники</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="89"/>
+        <source>Add Nickname</source>
+        <translation>Добавить ник</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="92"/>
+        <source>&amp;Add...</source>
+        <translation>Доб&amp;авить...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="115"/>
+        <source>Remove Nickname</source>
+        <translation>Удалить ник</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="118"/>
+        <source>Remove</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="135"/>
+        <source>Rename Identity</source>
+        <translation>Переименовать личность</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="138"/>
+        <source>Re&amp;name...</source>
+        <translation>Пере&amp;именовать...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="164"/>
+        <source>Move upwards in list</source>
+        <translation>Передвинуть вверх в списке</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="181"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="178"/>
+        <source>Move downwards in list</source>
+        <translation>Передвинуть вниз в списке</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="226"/>
+        <source>A&amp;way</source>
+        <translation>&amp;Отошёл</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="232"/>
+        <source>Default Away Settings</source>
+        <translation>Настройки состояния &quot;Отошёл&quot; по-умолчанию</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="243"/>
+        <source>Nick to be used when being away</source>
+        <translation>Ник для состояния &quot;Отошёл&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="253"/>
+        <source>Default away reason</source>
+        <translation>Причина по-умолчанию</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="260"/>
+        <source>Away Nick:</source>
+        <translation>Ник при отсутствии:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="365"/>
+        <source>Away Reason:</source>
+        <translation>Причина отсутствия:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="279"/>
+        <source>Set away when all clients have detached from the core</source>
+        <translation>Устанавливать состояние &quot;отошёл&quot; когда все клиенты отсоединены от ядра</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="282"/>
+        <source>Away On Detach</source>
+        <translation>&quot;Отошёл&quot; при отсоединении</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="314"/>
+        <source>Not implemented yet</source>
+        <translation>Ещё не реализовано</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="317"/>
+        <source>Away On Idle</source>
+        <translation>&quot;Отошёл&quot; при неактивности</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="331"/>
+        <source>Set away after</source>
+        <translation>Устанавливать &quot;отошёл&quot; после</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="341"/>
+        <source>minutes of being idle</source>
+        <translation>минут неактивности</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="406"/>
+        <source>Ident:</source>
+        <translation>Идент:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="413"/>
+        <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;Идент&quot; является частью хостмаски и вместе с хостом является однозначным идентификатором пользователя сети IRC.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="422"/>
+        <source>Messages</source>
+        <translation>Сообщения</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="430"/>
+        <source>Part Reason:</source>
+        <translation>Причина выхода с канала:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="443"/>
+        <source>Quit Reason:</source>
+        <translation>Причина выхода:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="453"/>
+        <source>Kick Reason:</source>
+        <translation>Причина изгнания:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="487"/>
+        <source>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</source>
+        <translation>Вам нужен клиент, умеющий работать с SSL, для редактирования ключа и сертификата SSL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="516"/>
+        <source>Warning: you are not connected with a secured connection to the Quassel Core!
+Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!</source>
+        <translation>Предупреждение: вы не используете безопасное соединение с ядром Quassel!
+В случае продолжения передача вашего ключа и сертификата будет небезопасной!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="545"/>
+        <source>Continue</source>
+        <translation>Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="583"/>
+        <source>Use SSL Key</source>
+        <translation>Использовать ключ SSL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="597"/>
+        <source>Key Type:</source>
+        <translation>Тип ключа:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="636"/>
+        <source>Use SSL Certificate</source>
+        <translation>Использовать сертификат SSL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="655"/>
+        <source>Organisation:</source>
+        <translation>Организация:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="689"/>
+        <source>CommonName:</source>
+        <translation>ОбщееИмя:</translation>
+    </message>
+</context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="107"/>
+        <source>Setup Identity</source>
+        <translation>Настроить личность</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="112"/>
+        <source>Default Identity</source>
+        <translation>Личность по умолчанию</translation>
+    </message>
+</context>
+<context>
+    <name>InputLine</name>
+    <message numerus="yes">
+        <location filename="../src/uisupport/inputline.cpp" line="148"/>
+        <source>Do you really want to paste %1 lines?</source>
+        <translation>
+            <numerusform>Действительно вставить %1 строку?</numerusform>
+            <numerusform>Действительно вставить %1 строки?</numerusform>
+            <numerusform>Действительно вставить %1 строк?</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/inputline.cpp" line="157"/>
+        <source>Paste Protection</source>
+        <translation>Защита при вставке</translation>
+    </message>
+</context>
 <context>
     <name>InputWidget</name>
     <message>
-        <location filename="../src/qtui/inputwidget.cpp" line="57"/>
+        <location filename="../src/qtui/inputwidget.cpp" line="55"/>
         <source>Focus Input Line</source>
         <translation>Активировать строку ввода</translation>
     </message>
     <message>
-        <location filename="../src/qtui/inputwidget.cpp" line="58"/>
+        <location filename="../src/qtui/inputwidget.cpp" line="56"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
@@ -2920,6 +3645,14 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
         <translation>Форма</translation>
     </message>
 </context>
+<context>
+    <name>IrcConnectionWizard</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="51"/>
+        <source>Save &amp;&amp; Connect</source>
+        <translation>Сохранить и соединиться</translation>
+    </message>
+</context>
 <context>
     <name>IrcListModel</name>
     <message>
@@ -2941,152 +3674,152 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
 <context>
     <name>IrcServerHandler</name>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="455"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="464"/>
         <source>%1 has changed topic for %2 to: &quot;%3&quot;</source>
         <translation>%1 сменил тему канала %2 на &quot;%3&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="480"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="489"/>
         <source>Received RPL_ISUPPORT (005) without parameters!</source>
         <translation>Получено RPL_ISUPPORT (005) без параметров!</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="488"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="497"/>
         <source>Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!</source>
         <translation>Получен нестандартный RPL_ISUPPORT: может случиться всё что угодно!</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="526"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="535"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="561"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="570"/>
         <source>[Whois] %1 is away: &quot;%2&quot;</source>
         <translation>[Whois] %1 отошёл: &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="572"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="581"/>
         <source>%1 is away: &quot;%2&quot;</source>
         <translation>%1 отошёл: &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="773"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="782"/>
         <source>[Whois] %1</source>
         <translation>[Whois] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="647"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="656"/>
         <source>[Whois] %1 is %2 (%3)</source>
         <translation>[Whois] %1 это %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="662"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="671"/>
         <source>%1 is online via %2 (%3)</source>
         <translation>%1 подключен через %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="924"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="933"/>
         <source>[Whowas] %1</source>
         <translation>[Whowas] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="692"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="701"/>
         <source>[Whowas] %1 was %2 (%3)</source>
         <translation>[Whowas] %1 был %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="706"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="715"/>
         <source>[Who] End of /WHO list for %1</source>
         <translation>[Who] Конец списка /WHO для %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="726"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="735"/>
         <source>[Whois] %1 is logged in since %2</source>
         <translation>[Whois] %1 в онлайне с %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="728"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="737"/>
         <source>[Whois] %1 is idling for %2 (%3)</source>
         <translation>[Whois] %1 неактивен %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="731"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="740"/>
         <source>[Whois] idle message: %1</source>
         <translation>[Whois] сообщение неактивности: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="763"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="772"/>
         <source>[Whois] %1 is a user on channels: %2</source>
         <translation>[Whois] %1 является участником каналов: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="765"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="774"/>
         <source>[Whois] %1 has voice on channels: %2</source>
         <translation>[Whois] %1 является участником с голосом на каналах: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="767"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="776"/>
         <source>[Whois] %1 is an operator on channels: %2</source>
         <translation>[Whois] %1 является оператором каналов: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="795"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="804"/>
         <source>Channel %1 has %2 users. Topic is: %3</source>
         <translation>На канале %1 %2 пользователей. Тема: %3</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="804"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="813"/>
         <source>End of channel list</source>
         <translation>Конец списка каналов</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="834"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="843"/>
         <source>No topic is set for %1.</source>
         <translation>Тема для канала %1 не установлена.</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="849"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="858"/>
         <source>Topic for %1 is &quot;%2&quot;</source>
         <translation>Тема канала %1 &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="860"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="869"/>
         <source>Topic set by %1 on %2</source>
         <translation>Тема установлена %1 %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="883"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="892"/>
         <source>[Who] %1</source>
         <translation>[Who] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="937"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="941"/>
         <source>There is a nickname in your identity&apos;s nicklist which contains illegal characters</source>
-        <translation>В списке ников вашей личности есть ник с недопустимыми символами</translation>
+        <translation type="obsolete">В списке ников вашей личности есть ник с недопустимыми символами</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="938"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="942"/>
         <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>Из-за бага в сервере Unreal IRCd (и, возможно, в других) мы не можем определить ошибочный ник</translation>
+        <translation type="obsolete">Из-за бага в сервере Unreal IRCd (и, возможно, в других) мы не можем определить ошибочный ник</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="939"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="943"/>
         <source>Please use: /nick &lt;othernick&gt; to continue or clean up your nicklist</source>
-        <translation>Для продолжения используйте: /nick &lt;другой ник&gt; или почистите ваш список ников</translation>
+        <translation type="obsolete">Для продолжения используйте: /nick &lt;другой ник&gt; или почистите ваш список ников</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="942"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="951"/>
         <source>Nick %1 contains illegal characters</source>
         <translation>Ник %1 содержит недопустимые символы</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="954"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="962"/>
         <source>Nick already in use: %1</source>
         <translation>Ник уже используется: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="977"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="987"/>
         <source>No free and valid nicks in nicklist found. use: /nick &lt;othernick&gt; to continue</source>
         <translation>Среди ников в списке не найдено свободного и корректного. Используйте /nick &lt;другой ник&gt; для продолжения</translation>
     </message>
@@ -3094,17 +3827,17 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
 <context>
     <name>IrcUserItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="743"/>
+        <location filename="../src/client/networkmodel.cpp" line="780"/>
         <source>idling since %1</source>
         <translation>неактивен с %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="746"/>
+        <location filename="../src/client/networkmodel.cpp" line="783"/>
         <source>login time: %1</source>
         <translation>время входа: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="749"/>
+        <location filename="../src/client/networkmodel.cpp" line="786"/>
         <source>server: %1</source>
         <translation>сервер: %1</translation>
     </message>
@@ -3112,17 +3845,17 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
 <context>
     <name>MainWin</name>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="206"/>
+        <location filename="../src/qtui/mainwin.cpp" line="221"/>
         <source>&amp;Connect to Core...</source>
         <translation>&amp;Подключиться к ядру...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="208"/>
+        <location filename="../src/qtui/mainwin.cpp" line="223"/>
         <source>&amp;Disconnect from Core</source>
         <translation>&amp;Отключиться от ядра</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="210"/>
+        <location filename="../src/qtui/mainwin.cpp" line="225"/>
         <source>Core &amp;Info...</source>
         <translation>&amp;Инфромация ядра...</translation>
     </message>
@@ -3132,12 +3865,12 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
         <translation type="obsolete">&amp;Редактировать сети...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="214"/>
+        <location filename="../src/qtui/mainwin.cpp" line="229"/>
         <source>&amp;Quit</source>
         <translation>В&amp;ыход</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="215"/>
+        <location filename="../src/qtui/mainwin.cpp" line="230"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
@@ -3149,30 +3882,30 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="220"/>
         <source>&amp;Lock Dock Positions</source>
-        <translation>За&amp;фиксировать позиции</translation>
+        <translation type="obsolete">За&amp;фиксировать позиции</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="224"/>
+        <location filename="../src/qtui/mainwin.cpp" line="240"/>
         <source>Show &amp;Search Bar</source>
         <translation>Показать строку &amp;поиска</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="225"/>
+        <location filename="../src/qtui/mainwin.cpp" line="241"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="226"/>
+        <location filename="../src/qtui/mainwin.cpp" line="244"/>
         <source>Show Status &amp;Bar</source>
         <translation>Показать строку &amp;статуса</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="230"/>
+        <location filename="../src/qtui/mainwin.cpp" line="248"/>
         <source>&amp;Configure Quassel...</source>
         <translation>&amp;Настройки Quassel...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="231"/>
+        <location filename="../src/qtui/mainwin.cpp" line="249"/>
         <source>F7</source>
         <translation>F7</translation>
     </message>
@@ -3187,135 +3920,155 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
         <translation type="obsolete">О &amp;Qt...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="238"/>
+        <location filename="../src/qtui/mainwin.cpp" line="256"/>
         <source>Debug &amp;NetworkModel</source>
         <translation>Отладить &amp;NetworkModel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="249"/>
+        <location filename="../src/qtui/mainwin.cpp" line="267"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="262"/>
+        <location filename="../src/qtui/mainwin.cpp" line="280"/>
         <source>&amp;Networks</source>
         <translation>&amp;Сети</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="268"/>
+        <location filename="../src/qtui/mainwin.cpp" line="286"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="269"/>
+        <location filename="../src/qtui/mainwin.cpp" line="287"/>
         <source>&amp;Buffer Views</source>
         <translation>&amp;Буфера</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="277"/>
+        <location filename="../src/qtui/mainwin.cpp" line="301"/>
         <source>&amp;Settings</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="284"/>
+        <location filename="../src/qtui/mainwin.cpp" line="308"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощь</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="292"/>
+        <location filename="../src/qtui/mainwin.cpp" line="316"/>
         <source>Debug</source>
         <translation>Отладка</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="379"/>
+        <location filename="../src/qtui/mainwin.cpp" line="410"/>
         <source>Nicks</source>
         <translation>Ники</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="388"/>
+        <location filename="../src/qtui/mainwin.cpp" line="419"/>
         <source>Show Nick List</source>
         <translation>Показать список ников</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="399"/>
+        <location filename="../src/qtui/mainwin.cpp" line="430"/>
         <source>Chat Monitor</source>
         <translation>Монитор чата</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="410"/>
+        <location filename="../src/qtui/mainwin.cpp" line="441"/>
         <source>Show Chat Monitor</source>
         <translation>Показать монитор чата</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="414"/>
+        <location filename="../src/qtui/mainwin.cpp" line="445"/>
         <source>Inputline</source>
         <translation>Строкаввода</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="423"/>
+        <location filename="../src/qtui/mainwin.cpp" line="454"/>
         <source>Show Input Line</source>
         <translation>Показать строку ввода</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="434"/>
+        <location filename="../src/qtui/mainwin.cpp" line="465"/>
         <source>Topic</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="446"/>
+        <location filename="../src/qtui/mainwin.cpp" line="477"/>
         <source>Show Topic Line</source>
         <translation>Показать строку темы</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="553"/>
+        <location filename="../src/qtui/mainwin.cpp" line="595"/>
         <source>Connected to core.</source>
         <translation>Соединение с ядром установлено.</translation>
     </message>
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="576"/>
         <source>Core Lag: %1 msec</source>
-        <translation>Лаг ядра: %1 мс</translation>
+        <translation type="obsolete">Лаг ядра: %1 мс</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="613"/>
+        <location filename="../src/qtui/mainwin.cpp" line="665"/>
         <source>Not connected to core.</source>
         <translation>Нет соединения с ядром.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="240"/>
+        <location filename="../src/qtui/mainwin.cpp" line="258"/>
         <source>Debug &amp;MessageModel</source>
         <translation>Отладить &amp;MessageModel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="242"/>
+        <location filename="../src/qtui/mainwin.cpp" line="260"/>
         <source>Debug &amp;Log</source>
         <translation>&amp;Журнал отладки</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="234"/>
+        <location filename="../src/qtui/mainwin.cpp" line="252"/>
         <source>&amp;About Quassel</source>
         <translation>&amp;О Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="236"/>
+        <location filename="../src/qtui/mainwin.cpp" line="254"/>
         <source>About &amp;Qt</source>
         <translation>О &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="212"/>
+        <location filename="../src/qtui/mainwin.cpp" line="227"/>
         <source>Configure &amp;Networks...</source>
         <translation>Настроить &amp;Сети...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="218"/>
+        <location filename="../src/qtui/mainwin.cpp" line="233"/>
         <source>&amp;Configure Buffer Views...</source>
         <translation>Настроить списки &amp;буферов...</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="629"/>
+        <source>Core Lag: %1</source>
+        <translation>Лаг ядра: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="236"/>
+        <source>&amp;Lock Layout</source>
+        <translation>&amp;Блокировать расположение</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="242"/>
+        <source>Show Away Log</source>
+        <translation>Показать журнал отсутствия</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="289"/>
+        <source>&amp;Toolbars</source>
+        <translation>Па&amp;нели</translation>
+    </message>
 </context>
 <context>
     <name>MessageModel</name>
     <message>
-        <location filename="../src/client/messagemodel.cpp" line="370"/>
+        <location filename="../src/client/messagemodel.cpp" line="362"/>
         <source>Requesting %1 messages from backlog for buffer %2:%3</source>
         <translation>Запрашиваю %1 сообщений из журнала для буфера %2:%3</translation>
     </message>
@@ -3330,7 +4083,60 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/qtui/ui/msgprocessorstatuswidget.ui" line="34"/>
         <source>Processing Messages</source>
-        <translation>Обработка сообщений</translation>
+        <translation type="obsolete">Обработка сообщений</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/msgprocessorstatuswidget.ui" line="34"/>
+        <source>Receiving Backlog</source>
+        <translation>Получаю журнал</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkAddDlg</name>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="13"/>
+        <source>Add Network</source>
+        <translation>Добавить сеть</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="21"/>
+        <source>Use preset:</source>
+        <translation>Выбрать известную сеть:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="56"/>
+        <source>Manually specify network settings</source>
+        <translation>Вручную указать параметры сети</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="66"/>
+        <source>Manual Settings</source>
+        <translation>Ручные настройки</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="74"/>
+        <source>Network name:</source>
+        <translation>Название сети:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="84"/>
+        <source>Server address:</source>
+        <translation>Адрес сервера:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="94"/>
+        <source>Port:</source>
+        <translation>Порт:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="114"/>
+        <source>Server password:</source>
+        <translation>Пароль сервера:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="130"/>
+        <source>Use secure connection</source>
+        <translation>Использовать безопасное соединение</translation>
     </message>
 </context>
 <context>
@@ -3374,7 +4180,7 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
         <translation>Пожалуйста введите название сети:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="646"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="699"/>
         <source>Add Network</source>
         <translation>Добавить сеть</translation>
     </message>
@@ -3382,17 +4188,17 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
 <context>
     <name>NetworkItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="167"/>
+        <location filename="../src/client/networkmodel.cpp" line="178"/>
         <source>Server: %1</source>
         <translation>Сервер: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="168"/>
+        <location filename="../src/client/networkmodel.cpp" line="179"/>
         <source>Users: %1</source>
         <translation>Пользователи: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="171"/>
+        <location filename="../src/client/networkmodel.cpp" line="182"/>
         <source>Lag: %1 msecs</source>
         <translation>Лаг: %1 мс</translation>
     </message>
@@ -3400,17 +4206,17 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
 <context>
     <name>NetworkModel</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="768"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Buffer</source>
         <translation>Буфер</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="768"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Topic</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="768"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Nick Count</source>
         <translation>Ников</translation>
     </message>
@@ -3420,253 +4226,345 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="40"/>
         <source>Connect</source>
-        <translation>Соединиться</translation>
+        <translation type="obsolete">Соединиться</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="41"/>
         <source>Disconnect</source>
-        <translation>Отсоединиться</translation>
+        <translation type="obsolete">Отсоединиться</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="43"/>
         <source>Join</source>
-        <translation>Зайти</translation>
+        <translation type="obsolete">Зайти</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="44"/>
         <source>Part</source>
-        <translation>Выйти</translation>
+        <translation type="obsolete">Выйти</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="45"/>
         <source>Delete Buffer...</source>
-        <translation>Удалить буфер...</translation>
+        <translation type="obsolete">Удалить буфер...</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="46"/>
         <source>Show Buffer</source>
-        <translation>Показать буфер</translation>
+        <translation type="obsolete">Показать буфер</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="48"/>
         <source>Joins</source>
-        <translation>Входы</translation>
+        <translation type="obsolete">Входы</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="49"/>
         <source>Parts</source>
-        <translation>Выходы из канала</translation>
+        <translation type="obsolete">Выходы из канала</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="50"/>
         <source>Quits</source>
-        <translation>Выходы из сети</translation>
+        <translation type="obsolete">Выходы из сети</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="51"/>
         <source>Nick Changes</source>
-        <translation>Смены ника</translation>
+        <translation type="obsolete">Смены ника</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="52"/>
         <source>Mode Changes</source>
-        <translation>Смены режимов</translation>
+        <translation type="obsolete">Смены режимов</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="53"/>
         <source>Day Changes</source>
-        <translation>Смены дня</translation>
+        <translation type="obsolete">Смены дня</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="54"/>
         <source>Apply to All Chat Views...</source>
-        <translation>Применить ко всем окнам чата...</translation>
+        <translation type="obsolete">Применить ко всем окнам чата...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="56"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="57"/>
         <source>Join Channel...</source>
-        <translation>Зайти на канал...</translation>
+        <translation type="obsolete">Зайти на канал...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="58"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="59"/>
         <source>Start Query</source>
-        <translation>Начать диалог</translation>
+        <translation type="obsolete">Начать диалог</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="59"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="60"/>
         <source>Show Query</source>
-        <translation>Показать диалог</translation>
+        <translation type="obsolete">Показать диалог</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="60"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="61"/>
         <source>Whois</source>
-        <translation>Whois</translation>
+        <translation type="obsolete">Whois</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="62"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="63"/>
         <source>Version</source>
-        <translation>Версия</translation>
+        <translation type="obsolete">Версия</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="63"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="64"/>
         <source>Time</source>
-        <translation>Время</translation>
+        <translation type="obsolete">Время</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="64"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="65"/>
         <source>Ping</source>
-        <translation>Ping</translation>
+        <translation type="obsolete">Ping</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="65"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="66"/>
         <source>Finger</source>
-        <translation>Finger</translation>
+        <translation type="obsolete">Finger</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="67"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="68"/>
         <source>Give Operator Status</source>
-        <translation>Дать оператора</translation>
+        <translation type="obsolete">Дать оператора</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="68"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="69"/>
         <source>Take Operator Status</source>
-        <translation>Снять оператора</translation>
+        <translation type="obsolete">Снять оператора</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="69"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="70"/>
         <source>Give Voice</source>
-        <translation>Дать голос</translation>
+        <translation type="obsolete">Дать голос</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="70"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="71"/>
         <source>Take Voice</source>
-        <translation>Снять голос</translation>
+        <translation type="obsolete">Снять голос</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="71"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="72"/>
         <source>Kick From Channel</source>
-        <translation>Выгнать с канала</translation>
+        <translation type="obsolete">Выгнать с канала</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="72"/>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="73"/>
         <source>Ban From Channel</source>
-        <translation>Забанить на канале</translation>
+        <translation type="obsolete">Забанить на канале</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="74"/>
+        <source>Kick &amp;&amp; Ban</source>
+        <translation type="obsolete">Выгнать и забанить</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="76"/>
+        <source>Hide Buffer(s) Temporarily</source>
+        <translation type="obsolete">Временно спрятать буфер(а)</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="77"/>
+        <source>Hide Buffer(s) Permanently</source>
+        <translation type="obsolete">Навсегда спрятать буфер(а)</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="78"/>
+        <source>Show Channel List</source>
+        <translation type="obsolete">Показать список каналов</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="79"/>
+        <source>Show Ignore List</source>
+        <translation type="obsolete">Показать список игнорируемых</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="93"/>
+        <source>Hide Events</source>
+        <translation type="obsolete">Спрятать события</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="101"/>
+        <source>CTCP</source>
+        <translation type="obsolete">CTCP</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="113"/>
+        <source>Actions</source>
+        <translation type="obsolete">Действия</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="482"/>
+        <source>Remove buffer permanently?</source>
+        <translation type="obsolete">Удалить буфер навсегда?</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="484"/>
+        <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="obsolete">Удалить буфер &quot;%1&quot; навсегда? Это удалить все относящиеся к нему данные, включая историю, из базы данных ядра!</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="603"/>
+        <source>Join Channel</source>
+        <translation type="obsolete">Зайти на канал</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="73"/>
-        <source>Kick &amp;&amp; Ban</source>
-        <translation>Выгнать и забанить</translation>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="603"/>
+        <source>Input channel name:</source>
+        <translation type="obsolete">Введите название канала:</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="75"/>
-        <source>Hide Buffer(s) Temporarily</source>
-        <translation>Временно спрятать буфер(а)</translation>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="45"/>
+        <source>Delete Buffer(s)...</source>
+        <translation type="obsolete">Удалить буфер(а)...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="76"/>
-        <source>Hide Buffer(s) Permanently</source>
-        <translation>Навсегда спрятать буфер(а)</translation>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="54"/>
+        <source>Set as Default...</source>
+        <translation type="obsolete">Задать буфер по умолчанию...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="77"/>
-        <source>Show Channel List</source>
-        <translation>Показать список каналов</translation>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="55"/>
+        <source>Use Defaults...</source>
+        <translation type="obsolete">Использовать по умолчанию...</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="519"/>
+        <source>Do you want to delete the following buffer(s) permanently?</source>
+        <translation type="obsolete">
+            <numerusform>Удалить следующий буфер навсегда?</numerusform>
+            <numerusform>Удалить следующие буфера навсегда?</numerusform>
+            <numerusform>Удалить следующие буфера навсегда?</numerusform>
+        </translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="78"/>
-        <source>Show Ignore List</source>
-        <translation>Показать список игнорируемых</translation>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="524"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; This will delete all related data, including all backlog data, from the core&apos;s database and cannot be undone.</source>
+        <translation type="obsolete">&lt;b&gt;Замечание:&lt;/b&gt; Это удалит все соответствующие данные, включае весь журнал, из базы данных ядра без возможности отмены.</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="93"/>
-        <source>Hide Events</source>
-        <translation>Спрятать события</translation>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="526"/>
+        <source>&lt;br&gt;Active channel buffers cannot be deleted, please part the channel first.</source>
+        <translation type="obsolete">&lt;br&gt;Нельзя удалить буфера активных каналов, сначала, пожалуйста, покиньте канал.</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="101"/>
-        <source>CTCP</source>
-        <translation>CTCP</translation>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="528"/>
+        <source>Remove buffers permanently?</source>
+        <translation type="obsolete">Удалить буфера навсегда?</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkModelController</name>
+    <message numerus="yes">
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="152"/>
+        <source>Do you want to delete the following buffer(s) permanently?</source>
+        <translation>
+            <numerusform>Удалить следующий буфер навсегда?</numerusform>
+            <numerusform>Удалить следующие буфера навсегда?</numerusform>
+            <numerusform>Удалить следующие буфера навсегда?</numerusform>
+        </translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="113"/>
-        <source>Actions</source>
-        <translation>Действия</translation>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="157"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; This will delete all related data, including all backlog data, from the core&apos;s database and cannot be undone.</source>
+        <translation>&lt;b&gt;Замечание:&lt;/b&gt; Это удалит все соответствующие данные, включая весь журнал, из базы данных ядра без возможности отмены.</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="482"/>
-        <source>Remove buffer permanently?</source>
-        <translation>Удалить буфер навсегда?</translation>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="159"/>
+        <source>&lt;br&gt;Active channel buffers cannot be deleted, please part the channel first.</source>
+        <translation>&lt;br&gt;Нельзя удалить буфера активных каналов, сначала, пожалуйста, покиньте канал.</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="484"/>
-        <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>Удалить буфер &quot;%1&quot; навсегда? Это удалить все относящиеся к нему данные, включая историю, из базы данных ядра!</translation>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="161"/>
+        <source>Remove buffers permanently?</source>
+        <translation>Удалить буфера навсегда?</translation>
     </message>
+</context>
+<context>
+    <name>NetworkModelController::JoinDlg</name>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="546"/>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="417"/>
         <source>Join Channel</source>
         <translation>Зайти на канал</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="546"/>
-        <source>Input channel name:</source>
-        <translation>Введите название канала:</translation>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="420"/>
+        <source>Network:</source>
+        <translation>Сеть:</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="422"/>
+        <source>Channel:</source>
+        <translation>Канал:</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="148"/>
+        <source>Setup Network Connection</source>
+        <translation>Настройка сетевого соединения</translation>
     </message>
 </context>
 <context>
     <name>NetworksSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="33"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="36"/>
         <source>General</source>
-        <translation>Общие</translation>
+        <translation type="obsolete">Общие</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="33"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
         <source>Networks</source>
         <translation>Сети</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="155"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="160"/>
         <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;Прежде чем сохранить настройки, необходимо устранить следующие проблемы:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="156"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="161"/>
         <source>&lt;li&gt;All networks need at least one server defined&lt;/li&gt;</source>
         <translation>&lt;li&gt;У каждой сети должен быть хотя бы один сервер&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="157"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="162"/>
         <source>&lt;/ul&gt;</source>
         <translation>&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="158"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="163"/>
         <source>Invalid Network Settings</source>
         <translation>Некорректные настройки сети</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="195"/>
         <source>Connect</source>
-        <translation>Соединиться</translation>
+        <translation type="obsolete">Соединиться</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="198"/>
         <source>Disconnect</source>
-        <translation>Отсоединиться</translation>
+        <translation type="obsolete">Отсоединиться</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="202"/>
         <source>Apply first!</source>
-        <translation>Сначала примени!</translation>
+        <translation type="obsolete">Сначала примени!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="544"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="546"/>
         <source>Delete Network?</source>
         <translation>Удалить сеть?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="545"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="547"/>
         <source>Do you really want to delete the network &quot;%1&quot; and all related settings, including the backlog?</source>
         <translation>Действительно удалить сеть &quot;%1&quot; и все сопутствующие данные, включая журнал?</translation>
     </message>
@@ -3676,218 +4574,238 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="37"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="47"/>
         <source>Re&amp;name...</source>
         <translation>Пере&amp;именовать...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="217"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="234"/>
         <source>&amp;Add...</source>
         <translation>Доб&amp;авить...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="234"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="251"/>
         <source>De&amp;lete</source>
         <translation>У&amp;далить</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="110"/>
         <source>Connect now</source>
-        <translation>Соединиться сейчас</translation>
+        <translation type="obsolete">Соединиться сейчас</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="130"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="123"/>
         <source>Network Details</source>
         <translation>Подробности сети</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="138"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="131"/>
         <source>Identity:</source>
         <translation>Личность:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="170"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="189"/>
         <source>Servers</source>
         <translation>Серверы</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="173"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="192"/>
         <source>Manage servers for this network</source>
         <translation>Управление серверами данной сети</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="199"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="216"/>
         <source>&amp;Edit...</source>
         <translation>&amp;Править...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="260"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="277"/>
         <source>Move upwards in list</source>
         <translation>Передвинуть вверх в списке</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="277"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="294"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="274"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="291"/>
         <source>Move downwards in list</source>
         <translation>Передвинуть вниз в списке</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="323"/>
         <source>Choose random server for connecting</source>
-        <translation>Выбирать случайный сервер для соединения</translation>
+        <translation type="obsolete">Выбирать случайный сервер для соединения</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="331"/>
         <source>Perform</source>
-        <translation>Автовыполнение</translation>
+        <translation type="obsolete">Автовыполнение</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="334"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="339"/>
         <source>Configure automatic identification or misc. commands to be executed after connecting to a server</source>
         <translation>Настройка автоматического выполнения идентификационных или любых других команд при подключении к серверу</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="340"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="345"/>
         <source>Commands to execute on connect:</source>
         <translation>При подключении выполнить команды:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="350"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="361"/>
         <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>Укажите список команд IRC, которые будут выполнены при подключении.
 Учтите, что Quassel автоматически входит на каналы, так что /join здесь нужен редко!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="364"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="500"/>
         <source>Auto Identify</source>
         <translation>Автоматическая идентификация</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="379"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="515"/>
         <source>NickServ</source>
         <translation>NickServ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="396"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="532"/>
         <source>Service:</source>
         <translation>Служба:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="406"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="542"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="417"/>
         <source>Advanced</source>
-        <translation>Дополнительно</translation>
+        <translation type="obsolete">Дополнительно</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="420"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="569"/>
         <source>Configure advanced settings such as message encodings and automatic reconnect</source>
         <translation>Настроить дополнительные параметры, такие как кодировки сообщений и автоматическое соединение</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="429"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="578"/>
         <source>Control encodings for in- and outgoing messages</source>
         <translation>Управление кодировками для входящих и исходящих сообщений</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="432"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="566"/>
         <source>Encodings</source>
         <translation>Кодировки</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="460"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="612"/>
         <source>Specify which encoding your messages will be sent in.
 UTF-8 should be a sane choice for most networks.</source>
         <translation>Укажите кодировки, в которых будут отправляться ваши сообщения.
 UTF-8 должен быть разумным выбором для большинства сетей.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="444"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="596"/>
         <source>Send messages in:</source>
         <translation>Отправлять сообщения в:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="491"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="643"/>
         <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>Входящие сообщения, закодированные в Utf8, всегда будут обработаны как надо.
 Эти настройки затрагивают только сообщения не в кодировке Utf8.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="475"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="627"/>
         <source>Receive fallback:</source>
         <translation>Альтернативная входящая кодировка:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="516"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="668"/>
         <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>Это определяет кодировку контрольных сообщений, ников и названий серверов.
 Если только вы *действительно* не знаете что делаете, оставьте тут ISO-8859-1!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="506"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="658"/>
         <source>Server encoding:</source>
         <translation>Кодировка сервера:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="529"/>
         <source>Use default settings for encodings (recommended)</source>
-        <translation>Использовать настройки кодировок по-умолчанию (рекомендуется)</translation>
+        <translation type="obsolete">Использовать настройки кодировок по-умолчанию (рекомендуется)</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="532"/>
         <source>Use defaults</source>
-        <translation>По-умолчанию</translation>
+        <translation type="obsolete">По-умолчанию</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="548"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="382"/>
         <source>Control automatic reconnect to the network</source>
         <translation>Настройки автоматического соединения с сетью</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="551"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="385"/>
         <source>Automatic Reconnect</source>
         <translation>Автоматическое соединение</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="562"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="396"/>
         <source>Interval:</source>
         <translation>Интервал:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="569"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="403"/>
         <source> s</source>
         <translation>с</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="585"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="419"/>
         <source>Retries:</source>
         <translation>Попыток:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="605"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="439"/>
         <source>Unlimited</source>
         <translation>Неограничено</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="617"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="464"/>
         <source>Rejoin all channels on reconnect</source>
         <translation>Вернуться на все каналы при повторном соединении</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="336"/>
+        <source>Commands</source>
+        <translation>Команды</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="373"/>
+        <source>Connection</source>
+        <translation>Соединения</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="581"/>
+        <source>Use Custom Encodings</source>
+        <translation>Использовать свои кодировки</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
+        <source>Misc</source>
+        <translation>Прочее</translation>
+    </message>
 </context>
 <context>
     <name>NickEditDlg</name>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="708"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="416"/>
         <source>Add Nickname</source>
         <translation>Добавить ник</translation>
     </message>
@@ -3995,13 +4913,18 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Поведение</translation>
+        <translation type="obsolete">Поведение</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
         <source>Notifications</source>
         <translation>Уведомления</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
+        <source>Appearance</source>
+        <translation>Вид</translation>
+    </message>
 </context>
 <context>
     <name>PhononNotificationBackend::ConfigWidget</name>
@@ -4032,7 +4955,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="54"/>
+        <location filename="../src/client/backlogrequester.cpp" line="65"/>
         <source>Requesting a total of up to %1 backlog messages for %2 buffers</source>
         <translation>Всего запрашиваю сообщений: %1 для буферов: %2</translation>
     </message>
@@ -4042,15 +4965,25 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation type="obsolete">Скопировать в буфер обмена</translation>
     </message>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="78"/>
+        <location filename="../src/client/backlogrequester.cpp" line="89"/>
         <source>Requesting up to %1 of all unread backlog messages (plus additional %2)</source>
         <translation>Запрашиваю до %1 всех непрочитанных сообщений из журнала (и дополнительные %2)</translation>
     </message>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="96"/>
+        <location filename="../src/client/backlogrequester.cpp" line="107"/>
         <source>Requesting a total of up to %1 unread backlog messages for %2 buffers</source>
         <translation>Запрашиваю суммарно до %1 непрочитанных сообщений из журнала для %2 буферов</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="56"/>
+        <source>Welcome to Quassel IRC</source>
+        <translation>Добро пожаловать в Quassel IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="59"/>
+        <source>This wizard will help you to set up your default identity and your IRC network connection.&lt;br&gt;This only covers basic settings. You can cancel this wizard any time and use the settings dialog for more detailed changes.</source>
+        <translation>Этот мастер поможет настроить личность по умолчанию и сетевое соединение с IRC.&lt;br&gt;Он устанавливает только базовые настройки. В любой момент можно отказаться от мастера и использовать окно настройки для более подробной конфигурации.</translation>
+    </message>
 </context>
 <context>
     <name>Quassel</name>
@@ -4068,27 +5001,27 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>Quassel::secondsToString()</name>
     <message>
-        <location filename="../src/common/util.cpp" line="206"/>
+        <location filename="../src/common/util.cpp" line="129"/>
         <source>year</source>
         <translation>год</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="207"/>
+        <location filename="../src/common/util.cpp" line="130"/>
         <source>day</source>
         <translation>день</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="208"/>
+        <location filename="../src/common/util.cpp" line="131"/>
         <source>h</source>
         <translation>ч</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="209"/>
+        <location filename="../src/common/util.cpp" line="132"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="210"/>
+        <location filename="../src/common/util.cpp" line="133"/>
         <source>sec</source>
         <translation>сек</translation>
     </message>
@@ -4096,22 +5029,22 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>QueryBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="354"/>
+        <location filename="../src/client/networkmodel.cpp" line="380"/>
         <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
         <translation>&lt;b&gt;Приват с %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="372"/>
+        <location filename="../src/client/networkmodel.cpp" line="398"/>
         <source>idling since %1</source>
         <translation>неактивен с %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="375"/>
+        <location filename="../src/client/networkmodel.cpp" line="401"/>
         <source>login time: %1</source>
         <translation>время входа: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="378"/>
+        <location filename="../src/client/networkmodel.cpp" line="404"/>
         <source>server: %1</source>
         <translation>сервер: %1</translation>
     </message>
@@ -4245,32 +5178,32 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="78"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="87"/>
         <source>Save changes</source>
         <translation>Сохранить изменения</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="79"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="88"/>
         <source>There are unsaved changes on the current configuration page. Would you like to apply your changes now?</source>
         <translation>В текущей вкладке есть несохранённые изменения. Применить их сейчас?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="155"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="164"/>
         <source>Reload Settings</source>
         <translation>Вернуть настройки</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="155"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="164"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <translation>Вернуть старый настройки, отменив все изменения на этой вкладке?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="164"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="173"/>
         <source>Restore Defaults</source>
         <translation>Вернуть умолчания</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="164"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="173"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation>Вернуть параметры по-умолчанию для этой вкладки?</translation>
     </message>
@@ -4280,7 +5213,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>Настроить Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="90"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="99"/>
         <source>Configure %1</source>
         <translation>Настроить %1</translation>
     </message>
@@ -4326,12 +5259,12 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>SignalProxy</name>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="898"/>
+        <location filename="../src/common/signalproxy.cpp" line="937"/>
         <source>Client tried to send package larger than max package size!</source>
-        <translation>Клиент пытался отправить пакет больше максимального размера!</translation>
+        <translation type="obsolete">Клиент пытался отправить пакет больше максимального размера!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1035"/>
+        <location filename="../src/common/signalproxy.cpp" line="1088"/>
         <source>Disconnecting</source>
         <translation>Отсоединяюсь</translation>
     </message>
@@ -4341,43 +5274,214 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation type="obsolete">локальный клиент</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="903"/>
+        <location filename="../src/common/signalproxy.cpp" line="942"/>
         <source>Client tried to send 0 byte package!</source>
-        <translation>Клиент пытался отправить пакет из 0 байт!</translation>
+        <translation type="obsolete">Клиент пытался отправить пакет из 0 байт!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="920"/>
+        <location filename="../src/common/signalproxy.cpp" line="959"/>
         <source>Client sent corrupted compressed data!</source>
-        <translation>Клиент отправил повреждённые сжатые данные!</translation>
+        <translation type="obsolete">Клиент отправил повреждённые сжатые данные!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="935"/>
+        <location filename="../src/common/signalproxy.cpp" line="974"/>
         <source>Client sent corrupt data: unable to load QVariant!</source>
-        <translation>Клиент отправил повреждённые данные: не могу загрузить QVariant!</translation>
+        <translation type="obsolete">Клиент отправил повреждённые данные: не могу загрузить QVariant!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="951"/>
+        <source>Peer tried to send package larger than max package size!</source>
+        <translation>Пир попытался отправить пакет больше максимального размера!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="956"/>
+        <source>Peer tried to send 0 byte package!</source>
+        <translation>Пир попытался отправить пакет из 0 байт!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="973"/>
+        <source>Peer sent corrupted compressed data!</source>
+        <translation>Пир отправил испорченные сжатые данные!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="988"/>
+        <source>Peer sent corrupt data: unable to load QVariant!</source>
+        <translation>Пир отправил испорченные данные: не могу загрузить QVariant!</translation>
+    </message>
+</context>
+<context>
+    <name>SimpleNetworkEditor</name>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="28"/>
+        <source>Network name:</source>
+        <translation>Название сети:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="35"/>
+        <source>The name of the IRC network you are configuring</source>
+        <translation>Название настраиваемой IRC-сети</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="63"/>
+        <source>Servers</source>
+        <translation>Серверы</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="81"/>
+        <source>A list of IRC servers belonging to this network</source>
+        <translation>Список IRC-серверов в этой сети</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="96"/>
+        <source>Edit this server entry</source>
+        <translation>Редактировать этот сервер</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="99"/>
+        <source>&amp;Edit...</source>
+        <translation>&amp;Править...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="116"/>
+        <source>Add another IRC server</source>
+        <translation>Добавить другой IRC-сервер</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="119"/>
+        <source>&amp;Add...</source>
+        <translation>Доб&amp;авить...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="136"/>
+        <source>Remove this server entry from the list</source>
+        <translation>Удалить этот сервер из списка</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="139"/>
+        <source>De&amp;lete</source>
+        <translation>У&amp;далить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="165"/>
+        <source>Move upwards in list</source>
+        <translation>Передвинуть вверх в списке</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="182"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="179"/>
+        <source>Move downwards in list</source>
+        <translation>Передвинуть вниз в списке</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="226"/>
+        <source>Join Channels Automatically</source>
+        <translation>Автоматически входить на каналы</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="250"/>
+        <source>A list of IRC channels you will join automatically after connecting to the network</source>
+        <translation>Список каналов IRC, на которые клиент будет автоматически заходить при подключении к сети</translation>
     </message>
 </context>
 <context>
     <name>SqliteStorage</name>
     <message>
-        <location filename="../src/core/sqlitestorage.cpp" line="52"/>
+        <location filename="../src/core/sqlitestorage.cpp" line="51"/>
         <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 -- это основанная на файлах система управления базами данных, которая не требует никаких настроек. Она подходит для маленьких и средних баз данных, для которых не нужен доступ через сеть. Используйте SQLite, если ваше ядро Quassel должно хранить данные на той же машине, на которой запущено, и если вашим ядром не будет пользоваться много народу.</translation>
     </message>
 </context>
+<context>
+    <name>SslCertDisplayDialog</name>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="568"/>
+        <source>SSL Certificate used by %1</source>
+        <translation>Сертификат SSL используется %1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="572"/>
+        <source>Issuer Info</source>
+        <translation>Сертификат выдан</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="583"/>
+        <source>Organization:</source>
+        <translation>Организация:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="584"/>
+        <source>Locality Name:</source>
+        <translation>Название местности:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="585"/>
+        <source>Organizational Unit Name:</source>
+        <translation>Название отделения:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="586"/>
+        <source>Country Name:</source>
+        <translation>Страна:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="587"/>
+        <source>State or Province Name:</source>
+        <translation>Название штата или области:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="581"/>
+        <source>Subject Info</source>
+        <translation>Информация о субъекте</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="590"/>
+        <source>Additional Info</source>
+        <translation>Дополнительная информация</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="592"/>
+        <source>Valid From:</source>
+        <translation>Годен с:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="593"/>
+        <source>Valid To:</source>
+        <translation>Годен по:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="596"/>
+        <source>Hostname %1:</source>
+        <translation>Хост %1:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="600"/>
+        <source>E-Mail Address %1:</source>
+        <translation>E-Mail %1:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="602"/>
+        <source>Digest:</source>
+        <translation>Хеш:</translation>
+    </message>
+</context>
 <context>
     <name>StatusBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="294"/>
+        <location filename="../src/client/networkmodel.cpp" line="300"/>
         <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Буфер состояния %1&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Буфер состояния %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="296"/>
+        <location filename="../src/client/networkmodel.cpp" line="302"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
-        <translation>&lt;p&gt; %1 &lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.h" line="130"/>
+        <location filename="../src/client/networkmodel.h" line="139"/>
         <source>Status Buffer</source>
         <translation>Буфер состояния</translation>
     </message>
@@ -4385,17 +5489,17 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>SystrayNotificationBackend::ConfigWidget</name>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="124"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="106"/>
         <source>System Tray Icon</source>
         <translation>Значок в трее</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="125"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="107"/>
         <source>Animate</source>
         <translation>Анимировать</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="127"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="109"/>
         <source>Show bubble</source>
         <translation>Показывать всплывающее уведомление</translation>
     </message>
@@ -4423,6 +5527,149 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>с</translation>
     </message>
 </context>
+<context>
+    <name>ToolBarActionProvider</name>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect</source>
+        <translation>Соединиться</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect to IRC</source>
+        <translation>Соединиться с IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect</source>
+        <translation>Отсоединиться</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect from IRC</source>
+        <translation>Отсоединиться от IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Part</source>
+        <translation>Выйти</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Leave currently selected channel</source>
+        <translation>Покинуть выделенный канал</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join</source>
+        <translation>Зайти</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join a channel</source>
+        <translation>Зайти на канал</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Query</source>
+        <translation>Приват</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Start a private conversation</source>
+        <translation>Начать личную беседу</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Whois</source>
+        <translation>Whois</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Request user information</source>
+        <translation>Запросить информацию о пользователе</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Op</source>
+        <translation>Оп</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Give operator privileges to user</source>
+        <translation>Дать пользователю статус оператора</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Deop</source>
+        <translation>Снять оп</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Take operator privileges from user</source>
+        <translation>Снять статус оператора с пользователя</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Voice</source>
+        <translation>Голос</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Give voice to user</source>
+        <translation>Дать пользователю статус &quot;с голосом&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Devoice</source>
+        <translation>Снять голос</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Take voice from user</source>
+        <translation>Снять статус &quot;с голосом&quot; с пользователя</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Kick</source>
+        <translation>Выгнать</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Remove user from channel</source>
+        <translation>Удалить пользователя с канала</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban</source>
+        <translation>Забанить</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban user from channel</source>
+        <translation>Запретить пользователю вход на канал</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Kick/Ban</source>
+        <translation>Выгнать и забанить</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Remove and ban user from channel</source>
+        <translation>Удалить пользователя с канала и запретить ему вход</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="54"/>
+        <source>Connect to all</source>
+        <translation>Подключиться ко всем</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="61"/>
+        <source>Disconnect from all</source>
+        <translation>Отключиться от всех</translation>
+    </message>
+</context>
 <context>
     <name>TopicLabel</name>
     <message>
@@ -4442,122 +5689,122 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>UiStyle::StyledMessage</name>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="328"/>
         <source>%D0%1</source>
         <translation>%D0%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="339"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="330"/>
         <source>%Dn%1</source>
         <translation>%Dn%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="341"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="332"/>
         <source>%Ds%1</source>
         <translation>%Ds%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="343"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="334"/>
         <source>%De%1</source>
         <translation>%De%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="345"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
         <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
         <translation>%Dj%DN%1%DN %DH(%2@%3)%DH вошёл на канал %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="347"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="338"/>
         <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
         <translation>%Dp%DN%1%DN %DH(%2@%3)%DH покинул %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="351"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="342"/>
         <source>%Dq%DN%1%DN %DH(%2@%3)%DH has quit</source>
         <translation>%Dq%DN%1%DN %DH(%2@%3)%DH вышел из сети</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="358"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="348"/>
         <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
         <translation>%Dk%DN%1%DN выгнал %DN%2%DN с %DC%3%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="363"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="353"/>
         <source>%DrYou are now known as %DN%1%DN</source>
         <translation>%DrВы теперь известны как %DN%1%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="364"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="354"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
         <translation>%Dr%DN%1%DN теперь известен как %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="367"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="357"/>
         <source>%DmUser mode: %DM%1%DM</source>
         <translation>%DmПользовательский режим: %DM%1%DM</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="368"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="358"/>
         <source>%DmMode %DM%1%DM by %DN%2%DN</source>
         <translation>%DmРежим %DM%1%DM установлен %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="371"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="361"/>
         <source>%Da%DN%1%DN %2</source>
         <translation>%Da%DN%1%DN %2</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="375"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="364"/>
         <source>%De[%1]</source>
         <translation>%De[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="401"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="386"/>
         <source>&lt;%1&gt;</source>
         <translation>&lt;%1&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="403"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="388"/>
         <source>[%1]</source>
         <translation>[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="407"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="392"/>
         <source>*</source>
         <translation>*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="409"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="394"/>
         <source>--&gt;</source>
         <translation>--&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="413"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="398"/>
         <source>&lt;--</source>
         <translation>&lt;--</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="415"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="400"/>
         <source>&lt;-*</source>
         <translation>&lt;-*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="417"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="402"/>
         <source>&lt;-&gt;</source>
         <translation>&lt;-&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="419"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="404"/>
         <source>***</source>
         <translation>***</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="421"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="406"/>
         <source>-*-</source>
         <translation>-*-</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="423"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="408"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
@@ -4565,7 +5812,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>UserCategoryItem</name>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="619"/>
+        <location filename="../src/client/networkmodel.cpp" line="656"/>
         <source>%n Owner(s)</source>
         <translation>
             <numerusform>%n владелец</numerusform>
@@ -4574,7 +5821,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="620"/>
+        <location filename="../src/client/networkmodel.cpp" line="657"/>
         <source>%n Admin(s)</source>
         <translation>
             <numerusform>%n администратор</numerusform>
@@ -4583,7 +5830,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="621"/>
+        <location filename="../src/client/networkmodel.cpp" line="658"/>
         <source>%n Operator(s)</source>
         <translation>
             <numerusform>%n оператор</numerusform>
@@ -4592,7 +5839,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="622"/>
+        <location filename="../src/client/networkmodel.cpp" line="659"/>
         <source>%n Half-Op(s)</source>
         <translation>
             <numerusform>%n полуоператор</numerusform>
@@ -4601,7 +5848,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="623"/>
+        <location filename="../src/client/networkmodel.cpp" line="660"/>
         <source>%n Voiced</source>
         <translation>
             <numerusform>%n с голосом</numerusform>
@@ -4610,7 +5857,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="624"/>
+        <location filename="../src/client/networkmodel.cpp" line="661"/>
         <source>%n User(s)</source>
         <translation>
             <numerusform>%n пользователь</numerusform>
@@ -4622,9 +5869,14 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>UserInputHandler</name>
     <message>
-        <location filename="../src/core/userinputhandler.cpp" line="130"/>
+        <location filename="../src/core/userinputhandler.cpp" line="138"/>
         <source>sending CTCP-%1 request</source>
         <translation>отправляю запрос CTCP-%1</translation>
     </message>
+    <message>
+        <location filename="../src/core/userinputhandler.cpp" line="69"/>
+        <source>away</source>
+        <translation>отошёл</translation>
+    </message>
 </context>
 </TS>
index a37add9..5f6c088 100644 (file)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="sl">
+<!DOCTYPE TS>
+<TS version="2.0" language="sl">
 <context>
     <name></name>
     <message>
-        <location filename="../src/common/message.h" line="68"/>
         <source>Day changed to %1</source>
-        <translation>Dan se je spremenil v %1</translation>
+        <translation type="obsolete">Dan se je spremenil v %1</translation>
     </message>
 </context>
 <context>
         <translation>&lt;b&gt;Različica:&lt;/b&gt; %1&lt;br&gt;&lt;b&gt;Različica protokola:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;Zgrajeno:&lt;/b&gt; %3</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="46"/>
         <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 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;Moderen, porazdeljen odjemalec za IRC&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 projekt Quassel&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; na &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC je izdan pod pogoji licenc &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; in &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Večina ikon je &amp;copy; s strani &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;ekipe Oxygen&lt;/a&gt; in uporabljenih pod pogoji &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Za poročanje o napakah obiščite stran &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;bugs.quassel-irc.org&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="63"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="62"/>
         <source>Quassel IRC is mainly developed by:</source>
         <translation>Quassel IRC v glavnem razvijajo:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="78"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="77"/>
         <source>We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:</source>
         <translation>Radi bi se zahvalili sledečim sodelavcem (v abecednem vrstnem redu) in vsem, ki smo jih pozabili omeniti tu:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="118"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="115"/>
+        <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/quassel-eye.png&quot;&gt;&amp;nbsp;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for the original Quassel icon - The All-Seeing Eye&lt;/dt&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/oxygen.png&quot;&gt;&amp;nbsp;&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 all the artwork you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/qt-logo-32.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software formerly known as 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;&lt;dt&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;&lt;img src=&quot;:/pics/nokia.png&quot;&gt;&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s&lt;/dd&gt;</source>
+        <translation>Posebno zahvalo si zaslužijo:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/quassel-eye.png&quot;&gt;&amp;nbsp;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za originalno ikono za Quassel - Vse-vidno oko&lt;/dt&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/oxygen.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Ekipa Oxygen&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za izdelavo vse grafike, ki jo vidite v Quassel&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/qt-logo-32.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software, nekdaj znani kot Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za izdelavo Qt in Qtopia ter sponzoriranje razvoja QuasselTopia z Greenphone in ostalim&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/nokia.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za nadaljnji razvoj Qt in za sponzoriranje razvoja Quassel Mobile z večimi N810&lt;/dd&gt;</translation>
+    </message>
+    <message>
         <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&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;Qt Software formerly known as 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;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s&lt;/dd&gt;</source>
-        <translation>Posebno zahvalo si zaslužijo:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za odlično grafiko in logo/ikono za Quassel&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;ekipa Oxygen&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za izdelavo večine ostalih čudovitih ikon, ki jih vidite v Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software, nekdaj znani kot Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za izdelavo Qt in Qtopia ter sponzoriranje razvoja QuasselTopia z Greenphone in ostalim&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za nadaljnji razvoj Qt in za sponzoriranje razvoja Quassel Mobile z večimi N810&lt;/dd&gt;</translation>
+        <translation type="obsolete">Posebno zahvalo si zaslužijo:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za odlično grafiko in logo/ikono za Quassel&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;ekipa Oxygen&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za izdelavo večine ostalih čudovitih ikon, ki jih vidite v Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software, nekdaj znani kot Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za izdelavo Qt in Qtopia ter sponzoriranje razvoja QuasselTopia z Greenphone in ostalim&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za nadaljnji razvoj Qt in za sponzoriranje razvoja Quassel Mobile z večimi N810&lt;/dd&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="16"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="17"/>
         <source>About Quassel</source>
         <translation>O Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="61"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="59"/>
         <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;
@@ -52,7 +56,7 @@ p, li { white-space: pre-wrap; }
 &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.ui" line="75"/>
         <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;
@@ -63,22 +67,22 @@ p, li { white-space: pre-wrap; }
 &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;Različica 0.2.0-pre, gradnja &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="114"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="115"/>
         <source>&amp;About</source>
         <translation>&amp;O</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="134"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="135"/>
         <source>A&amp;uthors</source>
         <translation>A&amp;vtorji</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="154"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="155"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Sodelavci</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="174"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="175"/>
         <source>&amp;Thanks To</source>
         <translation>&amp;Zahvale</translation>
     </message>
@@ -86,15 +90,20 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>AbstractSqlStorage</name>
     <message>
-        <location filename="../src/core/abstractsqlstorage.cpp" line="103"/>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="104"/>
         <source>Installed Schema (version %1) is not up to date. Upgrading to version %2...</source>
         <translation>Nameščena shema (različica %1) ni ažurna. Nadgradnja na različico %2 ...</translation>
     </message>
+    <message>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="106"/>
+        <source>Upgrade failed...</source>
+        <translation>Nadgradnja ni uspela.</translation>
+    </message>
 </context>
 <context>
     <name>AliasesModel</name>
     <message>
-        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="160"/>
+        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="159"/>
         <source>Alias</source>
         <translation>Vzdevek</translation>
     </message>
@@ -107,15 +116,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>AliasesSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
         <source>Behaviour</source>
-        <translation>Obnašanje</translation>
+        <translation type="obsolete">Obnašanje</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
         <source>Aliases</source>
         <translation>Vzdevki</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
+        <source>Misc</source>
+        <translation>Razno</translation>
+    </message>
     <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.ui" line="13"/>
         <source>Form</source>
@@ -135,159 +148,287 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="33"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="36"/>
         <source>Appearance</source>
         <translation>Videz</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="33"/>
         <source>General</source>
-        <translation>Splošno</translation>
+        <translation type="obsolete">Splošno</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="38"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="68"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="46"/>
         <source>&lt;System Default&gt;</source>
         <translation>&lt;sistemsko privzeto&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="13"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="14"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="20"/>
+        <source>Client Style</source>
+        <translation>Slog odjemalca</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="26"/>
+        <source>Set application style</source>
+        <translation>Nastavite slog programa</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="36"/>
+        <source>Language</source>
+        <translation>Jezik</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="42"/>
+        <source>Set the application language. Requires restart!</source>
+        <translation>Nastavite jezik programa. Potreben je ponovni zagon programa.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="62"/>
+        <source>Fonts</source>
+        <translation>Pisave</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="68"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="84"/>
+        <source>Set font for the main chat window and the chat monitor</source>
+        <translation>Nastavite pisavo za glavno okno klepeta in nadzorovalnik klepeta</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="71"/>
+        <source>Chat window:</source>
+        <translation>Okno klepeta:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="93"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="141"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="189"/>
+        <source>Font</source>
+        <translation>Pisava</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="109"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="157"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="205"/>
+        <source>Choose...</source>
+        <translation>Izbor ...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="116"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="132"/>
+        <source>Set font for channel and nick lists</source>
+        <translation>Nastavite pisavo za seznama kanalov in vzdevkov</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="119"/>
+        <source>Channel list:</source>
+        <translation>Seznam kanalov:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="164"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="180"/>
+        <source>Set font for the input line</source>
+        <translation>Nastavite pisavo za vnosno vrstico</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="167"/>
+        <source>Input line:</source>
+        <translation>Vnosna vrstica:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="215"/>
+        <source>Misc</source>
+        <translation>Razno</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="221"/>
+        <source>Show a website preview window when hovering the mouse over a web address</source>
+        <translation>Prikaži namig z ogledom spletne strani, ko miška lebdi nad spletno povezavo</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="224"/>
+        <source>Show previews of webpages on URL hover</source>
+        <translation>Ob lebdenju nad povezavo prikaži ogled strani</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="234"/>
+        <source>Show status icons in channel and nick lists</source>
+        <translation>V seznamih kanalov in vzdevkov prikaži ikone stanj</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="237"/>
+        <source>Use icons in channel and nick lists</source>
+        <translation>V seznamih kanalov in vzdevkov prikaži ikone</translation>
+    </message>
+    <message>
         <source>Client style:</source>
-        <translation>Slog odjemalca:</translation>
+        <translation type="obsolete">Slog odjemalca:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="31"/>
         <source>Language:</source>
-        <translation>Jezik:</translation>
+        <translation type="obsolete">Jezik:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="43"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
         <source>&lt;Original&gt;</source>
         <translation>&lt;prvotni&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
         <source>Note: needs client restart for full effect!</source>
-        <translation>Pomnite: za uveljavitev je potrebno znova zagnati program!</translation>
+        <translation type="obsolete">Pomnite: za uveljavitev je potrebno znova zagnati program!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="61"/>
         <source>Misc:</source>
-        <translation>Razno:</translation>
+        <translation type="obsolete">Razno:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="67"/>
         <source>Show Web Previews</source>
-        <translation>Prikaži oglede spletnih strani</translation>
+        <translation type="obsolete">Prikaži oglede spletnih strani</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="77"/>
         <source>Use Icons to represent away state of Users</source>
-        <translation>Za prikaz stanja uporabnikov uporabi ikone</translation>
+        <translation type="obsolete">Za prikaz stanja uporabnikov uporabi ikone</translation>
+    </message>
+</context>
+<context>
+    <name>AwayLogView</name>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="33"/>
+        <source>Away Log</source>
+        <translation>Dnevnik ob odsotnosti</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="44"/>
+        <source>Show Network Name</source>
+        <translation>Prikaži ime omrežja</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="49"/>
+        <source>Show Buffer Name</source>
+        <translation>Prikaži ime prikaza</translation>
     </message>
 </context>
 <context>
     <name>BacklogSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
         <source>Behaviour</source>
-        <translation>Obnašanje</translation>
+        <translation type="obsolete">Obnašanje</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
         <source>Backlog</source>
         <translation>Stara sporočila</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
+        <source>Misc</source>
+        <translation>Razno</translation>
+    </message>
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="13"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="74"/>
         <source>Backlog Request Method:</source>
         <translation>Način zahtevanja starih sporočil:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="29"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="82"/>
         <source>Fixed Amount per Buffer</source>
         <translation>Fiksno število na prikaz</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="34"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="87"/>
         <source>Unread Messages per Buffer</source>
         <translation>Neprebranih sporočil na prikaz</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="39"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="92"/>
         <source>Global Unread Messages</source>
         <translation>Globalno neprebranih sporočil</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="69"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="122"/>
         <source>The simplest Requester. It fetches a fixed amount of lines for each buffer from the Backlog.</source>
         <translation>Najbolj preprost način. Iz zgodovine sporočil pridobi fiksno število vrstic za vsak prikaz.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="84"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="137"/>
         <source>amount of messages per buffer that are requested after the core connection has been established.</source>
         <translation>Število sporočil na prikaz, ki so zahtevana po vzpostavljeni povezavi z jedrom.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="87"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="140"/>
         <source>Initial backlog amount:</source>
         <translation>Začetno število starih sporočil:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="103"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="156"/>
         <source>FixedBacklogAmount</source>
         <translation>FixedBacklogAmount</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="145"/>
         <source>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
 
 You can also chose to fetch additional older chatlines to provide a better context.</source>
+        <translation type="obsolete">Pridobi neprebrana sporočila za vsak prikaz posebaj. Število vrstic lahko omejite za vsak prikaz.
+
+Za boljši kontekst lahko izberete tudi pridobivanje dodatnih starih sporočil.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="198"/>
+        <source>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
+
+You can also choose to fetch additional older chatlines to provide a better context.</source>
         <translation>Pridobi neprebrana sporočila za vsak prikaz posebaj. Število vrstic lahko omejite za vsak prikaz.
 
 Za boljši kontekst lahko izberete tudi pridobivanje dodatnih starih sporočil.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="288"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="215"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="225"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="341"/>
         <source>Maximum amount of messages to be fetched per buffer.</source>
         <translation>Največje število pridobljenih sporočil na prikaz.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="281"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="218"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="334"/>
         <source>Limit:</source>
         <translation>Omejitev:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="184"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="237"/>
         <source>PerBufferUnreadBacklogLimit</source>
         <translation>PerBufferUnreadBacklogLimit</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="320"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="247"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="257"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="363"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="373"/>
         <source>Amount of messages to be fetched in addition to the unread messages. The Limit does not apply here.</source>
         <translation>Število sporočil, ki naj se pridobijo poleg neprebranih sporočil. Omejitev tu nima veljave.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="313"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="250"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="366"/>
         <source>Additional Messages:</source>
         <translation>Dodatna sporočila:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="216"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="269"/>
         <source>PerBufferUnreadBacklogAdditional</source>
         <translation>PerBufferUnreadBacklogAdditional</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="258"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="311"/>
         <source>This requester fetches all messages newer than the oldest unread message for all buffers.
 
 Note: this requester is not recommended if you use hidden buffer or have inactive buffers (i.e.: no stale queries or channels).
@@ -302,32 +443,32 @@ Uporaben je za omejitev skupnega števila starih sporočil in je verjetno najhit
 Za boljši kontekst lahko izberete tudi pridobivanje dodatnih starih sporočil.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="278"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="331"/>
         <source>Maximum amount of messages to be fetched over all buffers.</source>
         <translation>Največje število sporočil, pridobljenih za vse prikaze.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="300"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="353"/>
         <source>GlobalUnreadBacklogLimit</source>
         <translation>GlobalUnreadBacklogLimit</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="332"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="385"/>
         <source>GlobalUnreadBacklogAdditional</source>
         <translation>GlobalUnreadBacklogAdditional</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="376"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
         <source>Number of messages to be requested from the core when using scrolling up in the buffer view.</source>
         <translation>Število sporočil, ki se jih zahteva od jedra ob pomiku proti vrhu prikazu prikaza.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="379"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="24"/>
         <source>Dynamic backlog amount:</source>
         <translation>Dinamično število starih sporočil:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="395"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="40"/>
         <source>DynamicBacklogAmount</source>
         <translation>DynamicBacklogAmount</translation>
     </message>
@@ -335,7 +476,7 @@ Za boljši kontekst lahko izberete tudi pridobivanje dodatnih starih sporočil.<
 <context>
     <name>BufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="296"/>
+        <location filename="../src/client/networkmodel.cpp" line="297"/>
         <source>&lt;p&gt; %1 - %2 &lt;/p&gt;</source>
         <translation>&lt;p&gt; %1 - %2 &lt;/p&gt;</translation>
     </message>
@@ -343,12 +484,12 @@ Za boljši kontekst lahko izberete tudi pridobivanje dodatnih starih sporočil.<
 <context>
     <name>BufferView</name>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="241"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="256"/>
         <source>Merge buffers permanently?</source>
         <translation>Trajno združim prikaza?</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="242"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="257"/>
         <source>Do you want to merge the buffer &quot;%1&quot; permanently into buffer &quot;%2&quot;?
  This cannot be reversed!</source>
         <translation>Ali želite trajno združiti prikaz »%1« v prikaz »%2«?
@@ -368,7 +509,7 @@ Tega kasneje ni moč razveljaviti!</translation>
         <translation>Vnesite ime za prikaz:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="519"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="520"/>
         <source>Add Buffer View</source>
         <translation>Dodaj prikaz</translation>
     </message>
@@ -376,35 +517,44 @@ Tega kasneje ni moč razveljaviti!</translation>
 <context>
     <name>BufferViewFilter</name>
     <message>
-        <location filename="../src/uisupport/bufferviewfilter.cpp" line="51"/>
         <source>Edit Mode</source>
-        <translation>Način za urejanje</translation>
+        <translation type="obsolete">Način za urejanje</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferviewfilter.cpp" line="54"/>
+        <source>Show / Hide buffers</source>
+        <translation>Prikaži/skrij prikaze</translation>
     </message>
 </context>
 <context>
     <name>BufferViewSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="35"/>
         <source>General</source>
-        <translation>Splošno</translation>
+        <translation type="obsolete">Splošno</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="35"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="36"/>
         <source>Buffer Views</source>
         <translation>Prikazi</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="36"/>
+        <source>Appearance</source>
+        <translation>Videz</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="117"/>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="99"/>
         <source>All</source>
         <translation>Vsa</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="338"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="342"/>
         <source>Delete Buffer View?</source>
         <translation>Zbrišem prikaz?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="339"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="343"/>
         <source>Do you really want to delete the buffer view &quot;%1&quot;?</source>
         <translation>Ali res želite zbrisati prikaz »%1«?</translation>
     </message>
@@ -537,14 +687,13 @@ V tem načinu ni ločenega prikaza stanja.</translation>
         <translation>Dejanska velikost</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/bufferwidget.ui" line="64"/>
         <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;:/pics/quassel-large.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;
+        <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;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
@@ -555,32 +704,32 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="458"/>
+        <location filename="../src/client/networkmodel.cpp" line="461"/>
         <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="461"/>
+        <location filename="../src/client/networkmodel.cpp" line="464"/>
         <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Uporabniki:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="465"/>
+        <location filename="../src/client/networkmodel.cpp" line="468"/>
         <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Način:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="477"/>
+        <location filename="../src/client/networkmodel.cpp" line="480"/>
         <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Tema:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="481"/>
+        <location filename="../src/client/networkmodel.cpp" line="484"/>
         <source>Not active &lt;br /&gt; Double-click to join</source>
         <translation>Ni aktiven &lt;br /&gt; Za pridružitev dvo-kliknite</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="484"/>
+        <location filename="../src/client/networkmodel.cpp" line="487"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
         <translation>&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
@@ -638,15 +787,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChatMonitorSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
         <source>General</source>
-        <translation>Splošno</translation>
+        <translation type="obsolete">Splošno</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
         <source>Chat Monitor</source>
         <translation>Nadzorovalnik klepeta</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
+        <source>Appearance</source>
+        <translation>Videz</translation>
+    </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="58"/>
         <source>Opt In</source>
@@ -658,6 +811,7 @@ p, li { white-space: pre-wrap; }
         <translation>Izvzemi</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="236"/>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="132"/>
         <source>Show:</source>
         <translation>Prikaži:</translation>
@@ -751,7 +905,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChatScene</name>
     <message>
-        <location filename="../src/qtui/chatscene.cpp" line="582"/>
+        <location filename="../src/qtui/chatscene.cpp" line="580"/>
         <source>Copy Selection</source>
         <translation>Skopiraj izbor</translation>
     </message>
@@ -764,6 +918,8 @@ p, li { white-space: pre-wrap; }
         <translation>Obrazec</translation>
     </message>
     <message>
+        <location filename="../src/qtui/ui/chatviewsearchbar.ui" line="19"/>
+        <location filename="../src/qtui/ui/chatviewsearchbar.ui" line="33"/>
         <location filename="../src/qtui/ui/chatviewsearchbar.ui" line="44"/>
         <source>...</source>
         <translation>...</translation>
@@ -797,20 +953,19 @@ p, li { white-space: pre-wrap; }
         <translation>Identiteta v odjemalcu že obstaja!</translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="320"/>
+        <location filename="../src/client/client.cpp" line="317"/>
         <source>All Buffers</source>
         <translation>Vsi prikazi</translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="330"/>
         <source>Default Identity</source>
-        <translation>Privzeta identiteta</translation>
+        <translation type="obsolete">Privzeta identiteta</translation>
     </message>
 </context>
 <context>
     <name>ClientBacklogManager</name>
     <message>
-        <location filename="../src/client/clientbacklogmanager.cpp" line="119"/>
+        <location filename="../src/client/clientbacklogmanager.cpp" line="123"/>
         <source>Processed %1 messages in %2 seconds.</source>
         <translation>Obdelanih %1 sporočil v %2 sekundah.</translation>
     </message>
@@ -828,32 +983,33 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;b&gt;Od jedra je bil prejet neveljaven podatek.&lt;/b&gt;&lt;br&gt;Prekinjam povezavo.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="104"/>
+        <location filename="../src/client/clientsyncer.cpp" line="102"/>
         <source>No Host to connect to specified.</source>
         <translation>Podanega ni nobenega gostitelja za povezavo.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="113"/>
+        <location filename="../src/client/clientsyncer.cpp" line="111"/>
         <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;Odjemalec je bil zgrajen brez podpore za SSL.&lt;/b&gt;&lt;br /&gt;V nastavitvah računa onemogočite uporabo SSL.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="198"/>
+        <location filename="../src/client/clientsyncer.cpp" line="195"/>
         <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;Jedro Quassel, s katerim se želite povezati, je prestaro.&lt;/b&gt;&lt;br&gt;Za povezavo je potreben vsaj protokol različice %1.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="221"/>
+        <location filename="../src/client/clientsyncer.cpp" line="219"/>
         <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;Jedro Quassel, s katerim se želite povezati, ne podpira SSL.&lt;/b&gt;&lt;br /&gt;Če se vseeno želite povezati, v nastavitvah računa onemogočite uporabo SSL.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="250"/>
+        <location filename="../src/client/clientsyncer.cpp" line="248"/>
         <source>Logging in...</source>
         <translation>Prijavljanje ...</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="409"/>
+        <location filename="../src/client/clientsyncer.cpp" line="382"/>
+        <location filename="../src/client/clientsyncer.cpp" line="407"/>
         <source>Cert Digest changed! was: %1</source>
         <translation>Povzetek potrdila se je spremenil. Bil je: %1</translation>
     </message>
@@ -871,39 +1027,32 @@ p, li { white-space: pre-wrap; }
         <translation>Nastavitve barv</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="565"/>
         <source>Buffers</source>
-        <translation>Prikazi</translation>
+        <translation type="obsolete">Prikazi</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="567"/>
         <source>Network</source>
-        <translation>Omrežje</translation>
+        <translation type="obsolete">Omrežje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="571"/>
         <source>#incative</source>
-        <translation>#neaktiven</translation>
+        <translation type="obsolete">#neaktiven</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="575"/>
         <source>#regular</source>
-        <translation>#običajen</translation>
+        <translation type="obsolete">#običajen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="578"/>
         <source>#highlight</source>
-        <translation>#poudarek</translation>
+        <translation type="obsolete">#poudarek</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="584"/>
         <source>#new message</source>
-        <translation>#novo sporočilo</translation>
+        <translation type="obsolete">#novo sporočilo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="590"/>
         <source>#other activity</source>
-        <translation>#druga aktivnost</translation>
+        <translation type="obsolete">#druga aktivnost</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="19"/>
@@ -911,442 +1060,677 @@ p, li { white-space: pre-wrap; }
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="37"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="29"/>
         <source>Bufferview</source>
         <translation>Prikaz</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="43"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="35"/>
         <source>Activities:</source>
         <translation>Aktivnosti:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="49"/>
         <source>FG</source>
-        <translation>OS</translation>
+        <translation type="obsolete">OS</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="59"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="51"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1734"/>
         <source>BG</source>
         <translation>OZ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="958"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="64"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="404"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="648"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1026"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1747"/>
         <source>Use BG</source>
         <translation>Uporabi OZ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="85"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="172"/>
         <source>Highlight:</source>
         <translation>Poudarek:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="128"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="215"/>
         <source>New Message:</source>
         <translation>Novo sporočilo:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="171"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="258"/>
         <source>Other Activity:</source>
         <translation>Druga aktivnost:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="230"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="317"/>
         <source>Preview:</source>
         <translation>Ogled:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="237"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="324"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="270"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="349"/>
         <source>Chatview</source>
         <translation>Prikaz klepeta</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="294"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="365"/>
         <source>Server Activity</source>
         <translation>Aktivnost strežnika</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="935"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="41"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="384"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="625"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1003"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1724"/>
         <source>Foreground</source>
         <translation>Ospredje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="945"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="77"/>
+        <source>Default:</source>
+        <translation>Privzeto:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="126"/>
+        <source>Inactive:</source>
+        <translation>Neaktivno:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="394"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="635"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1013"/>
         <source>Background</source>
         <translation>Ozadje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="333"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="417"/>
         <source>Error Message:</source>
         <translation>Sporočilo napake:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="379"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="463"/>
         <source>Notice Message:</source>
         <translation>Sporočilo opombe:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="425"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="509"/>
         <source>Plain Message:</source>
         <translation>Navadno sporočilo:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="471"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="555"/>
         <source>Server Message:</source>
         <translation>Sporočilo strežnika:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="517"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="601"/>
         <source>Highlight Message:</source>
         <translation>Poudarjeno sporočilo:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="556"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="619"/>
         <source>User Activity</source>
         <translation>Uporabniška aktivnost</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="598"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="661"/>
         <source>Action Message:</source>
         <translation>Sporočilo aktivnosti:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="644"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="707"/>
         <source>Join Message:</source>
         <translation>Sporočilo pridružitve:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="690"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="753"/>
         <source>Kick Message:</source>
         <translation>Sporočilo brce:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="736"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="799"/>
         <source>Mode Message:</source>
         <translation>Sporočilo načina:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="782"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="845"/>
         <source>Part Message:</source>
         <translation>Sporočilo zapustitve:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="828"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="891"/>
         <source>Quit Message:</source>
         <translation>Sporočilo končanja:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="874"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="937"/>
         <source>Rename Message:</source>
         <translation>Sporočilo preimenovanja:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="929"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="997"/>
         <source>Message</source>
         <translation>Sporočilo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="971"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1039"/>
         <source>Timestamp:</source>
         <translation>Časovna oznaka:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1017"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1085"/>
         <source>Sender:</source>
         <translation>Pošiljatelj:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1063"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1092"/>
         <source>Nick:</source>
         <translation>Vzdevek:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1109"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1144"/>
         <source>Hostmask:</source>
         <translation>Maska gostitelja:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1155"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1196"/>
         <source>Channelname:</source>
         <translation>Ime kanala:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1201"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1248"/>
         <source>Mode flags:</source>
         <translation>Zastavice načina:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1247"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1300"/>
         <source>Url:</source>
         <translation>Lokacija:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1293"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1352"/>
         <source>New Message Marker:</source>
         <translation>Označevalnik novih sporočil:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1320"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1366"/>
+        <source>Enable</source>
+        <translation>Omogoči</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1373"/>
+        <source>Sender auto coloring:</source>
+        <translation>Samodejno barvanje pošiljateljev:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
         <source>Mirc Color Codes</source>
         <translation>Barvne kode mIRCa</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1332"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1465"/>
         <source>Color Codes</source>
         <translation>Barvne kode</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1338"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1471"/>
         <source>Color 0:</source>
         <translation>Barva 0:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1359"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1492"/>
         <source>Color 1:</source>
         <translation>Barva 1:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1380"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
         <source>Color 2:</source>
         <translation>Barva 2:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1401"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1534"/>
         <source>Color 3:</source>
         <translation>Barva 3:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1422"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1555"/>
         <source>Color 4:</source>
         <translation>Barva 4:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1443"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1576"/>
         <source>Color 5:</source>
         <translation>Barva 5:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1464"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1597"/>
         <source>Color 6:</source>
         <translation>Barva 6:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1485"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1618"/>
         <source>Color 7:</source>
         <translation>Barva 7:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1506"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1639"/>
         <source>Color 8:</source>
         <translation>Barva 8:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1646"/>
         <source>Color 14:</source>
         <translation>Barva 14:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1520"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1653"/>
         <source>Color 15:</source>
         <translation>Barva 15:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1527"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1660"/>
         <source>Color 13:</source>
         <translation>Barva 13:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1534"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1667"/>
         <source>Color 12:</source>
         <translation>Barva 12:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1541"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1674"/>
         <source>Color 11:</source>
         <translation>Barva 11:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1548"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1681"/>
         <source>Color 10:</source>
         <translation>Barva 10:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1555"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1688"/>
         <source>Color 9:</source>
         <translation>Barva 9:</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1712"/>
+        <source>Nickview</source>
+        <translation>Prikaz vzdevkov</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1718"/>
+        <source>Nick status:</source>
+        <translation>Stanje vzdevka:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1760"/>
+        <source>Online:</source>
+        <translation>Na zvazi:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1806"/>
+        <source>Away:</source>
+        <translation>Odsoten:</translation>
+    </message>
 </context>
 <context>
     <name>ContentsChatItem</name>
     <message>
-        <location filename="../src/qtui/chatitem.cpp" line="610"/>
+        <location filename="../src/qtui/chatitem.cpp" line="611"/>
         <source>Copy Link Address</source>
         <translation>Skopiraj naslov povezave</translation>
     </message>
 </context>
 <context>
-    <name>Core</name>
+    <name>ContextMenuActionProvider</name>
     <message>
-        <location filename="../src/core/core.cpp" line="135"/>
-        <source>Could not initialize any storage backend! Exiting...</source>
-        <translation>Ni bilo moč inicializirati nobene hrbtenice za shranjevanje. Končujem ...</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="35"/>
+        <source>Connect</source>
+        <translation>Poveži se</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="138"/>
-        <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>Trenutno Quassel podpira le SQLite3. Da bo quasselcore deloval,
-morate knjižnico Qt zgraditi z omogočenim vstavkom sqlite.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="36"/>
+        <source>Disconnect</source>
+        <translation>Prekini povezavo</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="186"/>
-        <source>Calling restoreState() even though active sessions exist!</source>
-        <translation>Kličem restoreState(), čeprav obstajajo aktivne seje!</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="38"/>
+        <source>Join</source>
+        <translation>Pridruži se</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="227"/>
-        <source>Admin user or password not set.</source>
-        <translation>Skrbniški uporabnik, ali geslo zanj, ni nastavljen.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="39"/>
+        <source>Part</source>
+        <translation>Zapusti</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="230"/>
-        <source>Could not setup storage!</source>
-        <translation>Ni moč nastaviti shranjevanja!</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="40"/>
+        <source>Delete Buffer(s)...</source>
+        <translation>Zbriši prikaz(e) ...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="234"/>
-        <source>Creating admin user...</source>
-        <translation>Ustvarjanje skrbniškega uporabnika ...</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="41"/>
+        <source>Show Buffer</source>
+        <translation>Prikaži prikaz</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="321"/>
-        <source>Invalid listen address %1</source>
-        <translation>Neveljaven naslov za poslušanje (%1)</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="43"/>
+        <source>Joins</source>
+        <translation>Pridružitve</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="329"/>
-        <source>Listening for GUI clients on IPv4 %1 port %2 using protocol version %3</source>
-        <translation>Odjemalce poslušam na IPv4 %1, vratih %2, z uporabo protokola različice %3</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="44"/>
+        <source>Parts</source>
+        <translation>Zapustitve</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="337"/>
-        <source>Could not open IPv4 interface %1:%2: %3</source>
-        <translation>Ni moč odpreti vmesnika IPv4 %1:%2: %3</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="45"/>
+        <source>Quits</source>
+        <translation>Končanja</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="345"/>
-        <source>Listening for GUI clients on IPv6 %1 port %2 using protocol version %3</source>
-        <translation>Odjemalce poslušam na IPv6 %1, vratih %2, z uporabo protokola različice %3</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="46"/>
+        <source>Nick Changes</source>
+        <translation>Spremembe vzdevkov</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="356"/>
-        <source>Could not open IPv6 interface %1:%2: %3</source>
-        <translation>Ni moč odpreti vmesnika IPv6 %1:%2: %3</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="47"/>
+        <source>Mode Changes</source>
+        <translation>Spremembe načina</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="364"/>
-        <source>Invalid listen address %1, unknown network protocol</source>
-        <translation>Neveljaven naslov za poslušanje (%1), neznan omrežni protokol</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="48"/>
+        <source>Day Changes</source>
+        <translation>Spremembe dneva</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="372"/>
-        <source>Could not open any network interfaces to listen on!</source>
-        <translation>Ni moč odpreti nobenega omrežnega vmesnika za poslušanje!</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="49"/>
+        <source>Set as Default...</source>
+        <translation>Nastavi kot privzeto ...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="406"/>
-        <source>Client connected from</source>
-        <translation>Odjemalec se je povezal z</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="50"/>
+        <source>Use Defaults...</source>
+        <translation>Uporabi privzeto ...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="409"/>
-        <source>Closing server for basic setup.</source>
-        <translation>Zapiram strežnik za osnovno nastavitev.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="52"/>
+        <source>Join Channel...</source>
+        <translation>Pridruži se kanalu ...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="428"/>
-        <source>Antique client trying to connect... refusing.</source>
-        <translation>Zastarel odjemalec se poskupa povezati... Zavračam ga.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="54"/>
+        <source>Start Query</source>
+        <translation>Zaženi poizvedbo</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="442"/>
-        <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;Vaš odjemalec Quassel je prestar.&lt;/b&gt;&lt;br&gt;To jedro potrebuje vsaj protokol različice %1.&lt;br&gt;Razmislite o nadgradnji odjemalca.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="55"/>
+        <source>Show Query</source>
+        <translation>Prikaži poizvedbo</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="548"/>
-        <source>Client</source>
-        <translation>Odjemalec</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="56"/>
+        <source>Whois</source>
+        <translation>Kdoje</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="444"/>
-        <source>too old, rejecting.</source>
-        <translation>je prestar, zavračam ga.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="58"/>
+        <source>Version</source>
+        <translation>Različica</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="458"/>
-        <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;Jedro Quassel različice %1&lt;/b&gt;&lt;br&gt;Zgrajeno: %2&lt;br&gt;Teče %3d %4u %5m (od %6)</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="59"/>
+        <source>Time</source>
+        <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="504"/>
-        <source>Starting TLS for Client:</source>
-        <translation>Zaganjanje TLS za odjemalca:</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="60"/>
+        <source>Ping</source>
+        <translation>Ping</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="522"/>
-        <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;Odjemalec ni inicializiran.&lt;/b&gt;&lt;br&gt;Preden se poskusi prijaviti mora poslati inicializacijsko sporočilo.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="61"/>
+        <source>Finger</source>
+        <translation>Podrobnosti</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="524"/>
-        <source>did not send an init message before trying to login, rejecting.</source>
-        <translation>pred prijavo ni poslal inicializacijskega sporočila, zavračam ga.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="63"/>
+        <source>Give Operator Status</source>
+        <translation>Podeli status operaterja</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="542"/>
-        <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;Neveljavno uporabniško ime ali geslo.&lt;/b&gt;&lt;br&gt;Podane kombinacije uporabniškega imena in gesla ni moč najti v podatkovni zbirki.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="64"/>
+        <source>Take Operator Status</source>
+        <translation>Odvzemi status operaterja</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="548"/>
-        <source>initialized and authenticated successfully as &quot;%1&quot; (UserId: %2).</source>
-        <translation>je uspešno inicializiran in overjen kot »%1« (uporabniški ID: %2).</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="65"/>
+        <source>Give Voice</source>
+        <translation>Daj besedo</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="559"/>
-        <source>Non-authed client disconnected.</source>
-        <translation>Prekinjena povezava z neoverjenim odjemalcem.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="66"/>
+        <source>Take Voice</source>
+        <translation>Odvzemi besedo</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="565"/>
-        <source>Non-authed client disconnected. (socket allready destroyed)</source>
-        <translation>Prekinjena povezava z neoverjenim odjemalcem. (vtičnica je že bila uničena)</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="67"/>
+        <source>Kick From Channel</source>
+        <translation>Brcni s kanala</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="609"/>
-        <source>Could not initialize session for client:</source>
-        <translation>Ni moč inicializirati seje za odjemalca:</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="68"/>
+        <source>Ban From Channel</source>
+        <translation>Izloči s kanala</translation>
     </message>
-</context>
-<context>
-    <name>CoreAccountEditDlg</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="522"/>
-        <source>Add Core Account</source>
-        <translation>Dodaj račun pri jedru</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="69"/>
+        <source>Kick &amp;&amp; Ban</source>
+        <translation>Brcni in izloči</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="13"/>
-        <source>Edit Core Account</source>
-        <translation>Urejanje računa pri jedru</translation>
-    </message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="71"/>
+        <source>Hide Buffer(s) Temporarily</source>
+        <translation>Začasno skrij prikaz(e)</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="72"/>
+        <source>Hide Buffer(s) Permanently</source>
+        <translation>Trajno skrij prikaz(e)</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="73"/>
+        <source>Show Channel List</source>
+        <translation>Prikaži seznam kanalov</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="74"/>
+        <source>Show Ignore List</source>
+        <translation>Prikaži seznam spregledanih</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="86"/>
+        <source>Hide Events</source>
+        <translation>Skrij dogodke</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="94"/>
+        <source>CTCP</source>
+        <translation>CTCP</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="106"/>
+        <source>Actions</source>
+        <translation>Dejanja</translation>
+    </message>
+</context>
+<context>
+    <name>Core</name>
+    <message>
+        <location filename="../src/core/core.cpp" line="146"/>
+        <source>Could not initialize any storage backend! Exiting...</source>
+        <translation>Ni bilo moč inicializirati nobene hrbtenice za shranjevanje. Končujem ...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="147"/>
+        <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>Trenutno Quassel podpira le SQLite3. Da bo quasselcore deloval,
+morate knjižnico Qt zgraditi z omogočenim vstavkom sqlite.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="186"/>
+        <source>Calling restoreState() even though active sessions exist!</source>
+        <translation>Kličem restoreState(), čeprav obstajajo aktivne seje!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="227"/>
+        <source>Admin user or password not set.</source>
+        <translation>Skrbniški uporabnik, ali geslo zanj, ni nastavljen.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="231"/>
+        <source>Could not setup storage!</source>
+        <translation>Ni moč nastaviti shranjevanja!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="235"/>
+        <source>Creating admin user...</source>
+        <translation>Ustvarjanje skrbniškega uporabnika ...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="334"/>
+        <source>Invalid listen address %1</source>
+        <translation>Neveljaven naslov za poslušanje (%1)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="342"/>
+        <source>Listening for GUI clients on IPv4 %1 port %2 using protocol version %3</source>
+        <translation>Odjemalce poslušam na IPv4 %1, vratih %2, z uporabo protokola različice %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="350"/>
+        <source>Could not open IPv4 interface %1:%2: %3</source>
+        <translation>Ni moč odpreti vmesnika IPv4 %1:%2: %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="358"/>
+        <source>Listening for GUI clients on IPv6 %1 port %2 using protocol version %3</source>
+        <translation>Odjemalce poslušam na IPv6 %1, vratih %2, z uporabo protokola različice %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="369"/>
+        <source>Could not open IPv6 interface %1:%2: %3</source>
+        <translation>Ni moč odpreti vmesnika IPv6 %1:%2: %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="377"/>
+        <source>Invalid listen address %1, unknown network protocol</source>
+        <translation>Neveljaven naslov za poslušanje (%1), neznan omrežni protokol</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="386"/>
+        <source>Could not open any network interfaces to listen on!</source>
+        <translation>Ni moč odpreti nobenega omrežnega vmesnika za poslušanje!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="420"/>
+        <source>Client connected from</source>
+        <translation>Odjemalec se je povezal z</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="423"/>
+        <source>Closing server for basic setup.</source>
+        <translation>Zapiram strežnik za osnovno nastavitev.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="442"/>
+        <source>Antique client trying to connect... refusing.</source>
+        <translation>Zastarel odjemalec se poskupa povezati... Zavračam ga.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="454"/>
+        <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;Vaš odjemalec Quassel je prestar.&lt;/b&gt;&lt;br&gt;To jedro potrebuje vsaj protokol različice %1.&lt;br&gt;Razmislite o nadgradnji odjemalca.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="458"/>
+        <location filename="../src/core/core.cpp" line="538"/>
+        <location filename="../src/core/core.cpp" line="562"/>
+        <source>Client</source>
+        <translation>Odjemalec</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="458"/>
+        <source>too old, rejecting.</source>
+        <translation>je prestar, zavračam ga.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="470"/>
+        <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;Jedro Quassel različice %1&lt;/b&gt;&lt;br&gt;Zgrajeno: %2&lt;br&gt;Teče %3d %4u %5m (od %6)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="518"/>
+        <source>Starting TLS for Client:</source>
+        <translation>Zaganjanje TLS za odjemalca:</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="536"/>
+        <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;Odjemalec ni inicializiran.&lt;/b&gt;&lt;br&gt;Preden se poskusi prijaviti mora poslati inicializacijsko sporočilo.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="538"/>
+        <source>did not send an init message before trying to login, rejecting.</source>
+        <translation>pred prijavo ni poslal inicializacijskega sporočila, zavračam ga.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="556"/>
+        <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;Neveljavno uporabniško ime ali geslo.&lt;/b&gt;&lt;br&gt;Podane kombinacije uporabniškega imena in gesla ni moč najti v podatkovni zbirki.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="562"/>
+        <source>initialized and authenticated successfully as &quot;%1&quot; (UserId: %2).</source>
+        <translation>je uspešno inicializiran in overjen kot »%1« (uporabniški ID: %2).</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="573"/>
+        <source>Non-authed client disconnected.</source>
+        <translation>Prekinjena povezava z neoverjenim odjemalcem.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="579"/>
+        <source>Non-authed client disconnected. (socket allready destroyed)</source>
+        <translation>Prekinjena povezava z neoverjenim odjemalcem. (vtičnica je že bila uničena)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="623"/>
+        <source>Could not initialize session for client:</source>
+        <translation>Ni moč inicializirati seje za odjemalca:</translation>
+    </message>
+</context>
+<context>
+    <name>CoreAccountEditDlg</name>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="522"/>
+        <source>Add Core Account</source>
+        <translation>Dodaj račun pri jedru</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="13"/>
+        <source>Edit Core Account</source>
+        <translation>Urejanje računa pri jedru</translation>
+    </message>
     <message>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="21"/>
         <source>Account Details</source>
@@ -1373,6 +1757,7 @@ morate knjižnico Qt zgraditi z omogočenim vstavkom sqlite.</translation>
         <translation>Vrata:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="61"/>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="144"/>
         <source>localhost</source>
         <translation>localhost</translation>
@@ -1441,7 +1826,7 @@ morate knjižnico Qt zgraditi z omogočenim vstavkom sqlite.</translation>
         <translation>Nastavitev jedra ni uspela.&lt;br&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;Kliknite &lt;em&gt;Naprej&lt;/em&gt;, da začnete znova.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="105"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="104"/>
         <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>Prijavljeni ste v sveže nastavljeno jedro Quassel.&lt;br&gt;Ne pozabite sedaj nastaviti svojih identitet in omrežij.</translation>
     </message>
@@ -1618,7 +2003,7 @@ p, li { white-space: pre-wrap; }
         <translation>Odstrani nastavitve računa</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="192"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="191"/>
         <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>Ali res želite odstraniti svoje krajevne nastavitve za ta račun pri jedru Quassel.&lt;br&gt;Pomnite: s tem &lt;em&gt;ne&lt;/em&gt; odstranite ali spremenite nobenih podatkov pri jedru samem!</translation>
     </message>
@@ -1655,7 +2040,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="312"/>
         <source>Connected to %1</source>
-        <translation>Povezan s %1</translation>
+        <translation type="unfinished">Povezan na %1</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="313"/>
@@ -1668,11 +2053,14 @@ p, li { white-space: pre-wrap; }
         <translation>Prijavljanje ...</translation>
     </message>
     <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="392"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="450"/>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="286"/>
         <source>Login</source>
         <translation>Prijava</translation>
     </message>
     <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="19"/>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="53"/>
         <source>Connect to Quassel Core</source>
         <translation>Poveži se z jedrom Quassel</translation>
@@ -1865,27 +2253,37 @@ SOME SPACE</translation>
 <context>
     <name>CoreNetwork</name>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="145"/>
+        <location filename="../src/core/corenetwork.cpp" line="151"/>
         <source>Connection failed. Cycling to next Server</source>
         <translation>Povezovanje ni uspelo. Prehajam na naslednji strežnik</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="154"/>
+        <location filename="../src/core/corenetwork.cpp" line="159"/>
+        <location filename="../src/core/corenetwork.cpp" line="160"/>
         <source>Connecting to %1:%2...</source>
         <translation>Povezujem se z %1:%2 ...</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="184"/>
+        <location filename="../src/core/corenetwork.cpp" line="208"/>
+        <source>Disconnecting. (%1)</source>
+        <translation>Prekinjanje povezave ... (%1)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="208"/>
+        <source>Core Shutdown</source>
+        <translation>Zaustavitev jedra</translation>
+    </message>
+    <message>
         <source>Disconnecting.</source>
-        <translation>Prekinjam povezavo.</translation>
+        <translation type="obsolete">Prekinjam povezavo.</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="280"/>
+        <location filename="../src/core/corenetwork.cpp" line="304"/>
         <source>Could not connect to %1 (%2)</source>
         <translation>Ni se moč povezati z %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="282"/>
+        <location filename="../src/core/corenetwork.cpp" line="306"/>
         <source>Connection failure: %1</source>
         <translation>Neuspeh pri povezovanju: %1</translation>
     </message>
@@ -2028,6 +2426,7 @@ SOME SPACE</translation>
         <translation>Položaj:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="86"/>
         <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="102"/>
         <source> px</source>
         <translation> pik</translation>
@@ -2071,11 +2470,25 @@ SOME SPACE</translation>
         <translation>Pisave po meri</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="53"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="104"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="158"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="212"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="254"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="322"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="357"/>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="392"/>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="72"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="123"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="177"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="231"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="273"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="338"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="373"/>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="408"/>
         <source>Choose...</source>
         <translation>Izbor ...</translation>
@@ -2101,6 +2514,7 @@ SOME SPACE</translation>
         <translation>Vnosna vrstica:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="283"/>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="303"/>
         <source>General:</source>
         <translation>Splošno:</translation>
@@ -2129,14 +2543,12 @@ SOME SPACE</translation>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Obnašanje</translation>
+        <translation type="obsolete">Obnašanje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>General</source>
-        <translation>Splošno</translation>
+        <translation type="obsolete">Splošno</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="13"/>
@@ -2233,19 +2645,29 @@ SOME SPACE</translation>
         <source>Completion suffix:</source>
         <translation>Pripona dokončevanja:</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
+        <source>Misc</source>
+        <translation>Razno</translation>
+    </message>
 </context>
 <context>
     <name>HighlightSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
         <source>Behaviour</source>
-        <translation>Obnašanje</translation>
+        <translation type="obsolete">Obnašanje</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="32"/>
         <source>Highlight</source>
         <translation>Poudarek</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
+        <source>Appearance</source>
+        <translation>Videz</translation>
+    </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="159"/>
         <source>this shouldn&apos;t be empty</source>
@@ -2320,112 +2742,110 @@ SOME SPACE</translation>
 <context>
     <name>IdentitiesSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="108"/>
         <source>General</source>
-        <translation>Splošno</translation>
+        <translation type="obsolete">Splošno</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="35"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
         <source>Identities</source>
         <translation>Identitete</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="206"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
+        <source>Misc</source>
+        <translation>Razno</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="170"/>
         <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;Preden se uveljavijo spremembe, je potrebno odpraviti sledeče težave:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="207"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="171"/>
         <source>&lt;li&gt;All identities need an identity name set&lt;/li&gt;</source>
         <translation>&lt;li&gt;Vse identitete morajo imeti nastavljeno ime&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="208"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="172"/>
         <source>&lt;li&gt;Every identity needs at least one nickname defined&lt;/li&gt;</source>
         <translation>&lt;li&gt;Vsaka identiteta mora imeti določen vsaj en vzdevek&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="209"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="173"/>
         <source>&lt;li&gt;You need to specify a real name for every identity&lt;/li&gt;</source>
         <translation>&lt;li&gt;Za vsako identiteto morate nastaviti pravo ime&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="210"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="174"/>
         <source>&lt;li&gt;You need to specify an ident for every identity&lt;/li&gt;</source>
         <translation>&lt;li&gt;Za vsako identiteto morate nastaviti ident&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="211"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="175"/>
         <source>&lt;/ul&gt;</source>
         <translation>&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="212"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="176"/>
         <source>One or more identities are invalid</source>
         <translation>Vsaj ena identiteta ni veljavna</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="397"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="306"/>
         <source>Delete Identity?</source>
         <translation>Zbrišem identiteto?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="398"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="307"/>
         <source>Do you really want to delete identity &quot;%1&quot;?</source>
         <translation>Ali res želite zbrisati identiteto »%1«?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="214"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="318"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="31"/>
         <source>Rename Identity</source>
         <translation>Preimenuj identiteto</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="410"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="319"/>
         <source>Please enter a new name for the identity &quot;%1&quot;!</source>
         <translation>Vnesite novo ime identitete »%1«!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="534"/>
         <source>Load a Key</source>
-        <translation>Naloži ključ</translation>
+        <translation type="obsolete">Naloži ključ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="726"/>
         <source>No Key loaded</source>
-        <translation>Naložen ni noben ključ</translation>
+        <translation type="obsolete">Naložen ni noben ključ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="844"/>
         <source>Load</source>
-        <translation>Naloži</translation>
+        <translation type="obsolete">Naloži</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="566"/>
         <source>RSA</source>
-        <translation>RSA</translation>
+        <translation type="obsolete">RSA</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="569"/>
         <source>DSA</source>
-        <translation>DSA</translation>
+        <translation type="obsolete">DSA</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="613"/>
         <source>Clear</source>
-        <translation>Počisti</translation>
+        <translation type="obsolete">Počisti</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="584"/>
         <source>Load a Certificate</source>
-        <translation>Naloži potrdilo</translation>
+        <translation type="obsolete">Naloži potrdilo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="818"/>
         <source>No Certificate loaded</source>
-        <translation>Naloženo ni nobeno potrdilo</translation>
+        <translation type="obsolete">Naloženo ni nobeno potrdilo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="260"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="34"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="77"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -2445,245 +2865,492 @@ SOME SPACE</translation>
         <translation>Odstrani identiteto</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="116"/>
+        <source>Real Name:</source>
+        <translation type="obsolete">Pravo ime:</translation>
+    </message>
+    <message>
+        <source>The &quot;Real Name&quot; is shown in /whois.</source>
+        <translation type="obsolete">Pravo ime je prikazano v izpisu /whois.</translation>
+    </message>
+    <message>
+        <source>Nicknames</source>
+        <translation type="obsolete">Vzdevki</translation>
+    </message>
+    <message>
+        <source>Add Nickname</source>
+        <translation type="obsolete">Dodaj vzdevek</translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation type="obsolete">&amp;Dodaj ...</translation>
+    </message>
+    <message>
+        <source>Remove Nickname</source>
+        <translation type="obsolete">Odstrani vzdevek</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Odstrani</translation>
+    </message>
+    <message>
+        <source>Re&amp;name...</source>
+        <translation type="obsolete">Pre&amp;imenuj ...</translation>
+    </message>
+    <message>
+        <source>Move upwards in list</source>
+        <translation type="obsolete">Premakni gor v seznamu</translation>
+    </message>
+    <message>
+        <source>Move downwards in list</source>
+        <translation type="obsolete">Premakni dol v seznamu</translation>
+    </message>
+    <message>
+        <source>A&amp;way</source>
+        <translation type="obsolete">&amp;Odsoten</translation>
+    </message>
+    <message>
+        <source>Default Away Settings</source>
+        <translation type="obsolete">Privzete nastavitve za odsotnost</translation>
+    </message>
+    <message>
+        <source>Nick to be used when being away</source>
+        <translation type="obsolete">Vzdevek, ki bo prikazan, ko ste odsotni</translation>
+    </message>
+    <message>
+        <source>Default away reason</source>
+        <translation type="obsolete">Privzeti razlog za odsotnost</translation>
+    </message>
+    <message>
+        <source>Away Reason:</source>
+        <translation type="obsolete">Razlog odsotnosti:</translation>
+    </message>
+    <message>
+        <source>Away Nick:</source>
+        <translation type="obsolete">Vzdevek odsotnosti:</translation>
+    </message>
+    <message>
+        <source>Set away when all clients have detached from the core</source>
+        <translation type="obsolete">Nastavi odsotnost, ko vsi odjemalci prekinejo povezavo z jedrom</translation>
+    </message>
+    <message>
+        <source>Away On Detach</source>
+        <translation type="obsolete">Odsotnost ob prekinitvi</translation>
+    </message>
+    <message>
+        <source>Override default away reason for auto-away on detach</source>
+        <translation type="obsolete">Za samo-odsotnost ob prekinitvi povozi privzeti razlog odsotnosti</translation>
+    </message>
+    <message>
+        <source>Not implemented yet</source>
+        <translation type="obsolete">Še ni izvedeno</translation>
+    </message>
+    <message>
+        <source>Away On Idle</source>
+        <translation type="obsolete">Odsotnost ob neaktivnosti</translation>
+    </message>
+    <message>
+        <source>Set away after</source>
+        <translation type="obsolete">Odsoten po</translation>
+    </message>
+    <message>
+        <source>minutes of being idle</source>
+        <translation type="obsolete">minutah neaktivnosti</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="obsolete">Napredno</translation>
+    </message>
+    <message>
+        <source>Ident:</source>
+        <translation type="obsolete">Ident:</translation>
+    </message>
+    <message>
+        <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="obsolete">»ident« je del maske gostitelja in vas, skupaj z gostiteljem, edinstveno identificira na omrežju IRC.</translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="obsolete">Sporočila</translation>
+    </message>
+    <message>
+        <source>Part Reason:</source>
+        <translation type="obsolete">Razlog zapustitve:</translation>
+    </message>
+    <message>
+        <source>Quit Reason:</source>
+        <translation type="obsolete">Razlog končanja:</translation>
+    </message>
+    <message>
+        <source>Kick Reason:</source>
+        <translation type="obsolete">Razlog za brco:</translation>
+    </message>
+    <message>
+        <source>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</source>
+        <translation type="obsolete">Za urejanje ključa in potrdila SSL za jedro potrebujete odjemalca s podporo za SSL</translation>
+    </message>
+    <message>
+        <source>Warning: you are not connected with a secured connection to the Quassel Core!
+Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!</source>
+        <translation type="obsolete">Opozorilo: Povezava z jedrom Quassel ni varna. Če nadaljujete, se bosta
+ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="obsolete">Nadaljuj</translation>
+    </message>
+    <message>
+        <source>Use SSL Key</source>
+        <translation type="obsolete">Uporabi ključ SSL</translation>
+    </message>
+    <message>
+        <source>Key Type:</source>
+        <translation type="obsolete">Vrsta ključa:</translation>
+    </message>
+    <message>
+        <source>Use SSL Certificate</source>
+        <translation type="obsolete">Uporabi potrdilo SSL</translation>
+    </message>
+    <message>
+        <source>Organisation:</source>
+        <translation type="obsolete">Organizacija:</translation>
+    </message>
+    <message>
+        <source>CommonName:</source>
+        <translation type="obsolete">Skupno ime:</translation>
+    </message>
+</context>
+<context>
+    <name>Identity</name>
+    <message>
+        <location filename="../src/common/identity.cpp" line="148"/>
+        <source>&lt;empty&gt;</source>
+        <translation>&lt;prazno&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="120"/>
+        <source>Quassel IRC User</source>
+        <translation>Uporabnik Quassel IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="154"/>
+        <source>Gone fishing.</source>
+        <translation>Odšel sem ribarit.</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="158"/>
+        <source>Not here. No, really. not here!</source>
+        <translation>Ni me tu. Ne, res, ni me tu!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="161"/>
+        <source>All Quassel clients vanished from the face of the earth...</source>
+        <translation>Vsi odjemalci Quassel so izginili z obličja Zemlje ...</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="164"/>
+        <source>Kindergarten is elsewhere!</source>
+        <translation>Otroški vrtec je drugje!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="165"/>
+        <location filename="../src/common/identity.cpp" line="166"/>
+        <source>http://quassel-irc.org - Chat comfortably. Anywhere.</source>
+        <translation>http://quassel-irc.org - Klepetajte udobno. Kjerkoli.</translation>
+    </message>
+</context>
+<context>
+    <name>IdentityEditWidget</name>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="219"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="398"/>
+        <source>Advanced</source>
+        <translation>Napredno</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="290"/>
+        <source>Load a Key</source>
+        <translation>Naloži ključ</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="317"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="328"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="604"/>
+        <source>No Key loaded</source>
+        <translation>Naložen ni noben ključ</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="318"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="365"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="624"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="722"/>
+        <source>Load</source>
+        <translation>Naloži</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="322"/>
+        <source>RSA</source>
+        <translation>RSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="325"/>
+        <source>DSA</source>
+        <translation>DSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="330"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="369"/>
+        <source>Clear</source>
+        <translation>Počisti</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="340"/>
+        <source>Load a Certificate</source>
+        <translation>Naloži potrdilo</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="363"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="364"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="662"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="696"/>
+        <source>No Certificate loaded</source>
+        <translation>Naloženo ni nobeno potrdilo</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="29"/>
+        <source>General</source>
+        <translation>Splošno</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="37"/>
         <source>Real Name:</source>
         <translation>Pravo ime:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="123"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="44"/>
         <source>The &quot;Real Name&quot; is shown in /whois.</source>
-        <translation>Pravo ime je prikazano v izpisu /whois.</translation>
+        <translation>Pravo ime je prikazano v izpisu /whois (kdoje).</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="132"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="53"/>
         <source>Nicknames</source>
         <translation>Vzdevki</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="168"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="89"/>
         <source>Add Nickname</source>
         <translation>Dodaj vzdevek</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="171"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="92"/>
         <source>&amp;Add...</source>
         <translation>&amp;Dodaj ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="194"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="115"/>
         <source>Remove Nickname</source>
         <translation>Odstrani vzdevek</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="197"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="118"/>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="217"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="135"/>
+        <source>Rename Identity</source>
+        <translation>Preimenuj identiteto</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="138"/>
         <source>Re&amp;name...</source>
         <translation>Pre&amp;imenuj ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="243"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="164"/>
         <source>Move upwards in list</source>
         <translation>Premakni gor v seznamu</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="257"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="167"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="181"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="178"/>
         <source>Move downwards in list</source>
         <translation>Premakni dol v seznamu</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="313"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="226"/>
         <source>A&amp;way</source>
-        <translation>&amp;Odsoten</translation>
+        <translation>&amp;Odsotnost</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="319"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="232"/>
         <source>Default Away Settings</source>
         <translation>Privzete nastavitve za odsotnost</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="360"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="243"/>
         <source>Nick to be used when being away</source>
         <translation>Vzdevek, ki bo prikazan, ko ste odsotni</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="350"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="253"/>
         <source>Default away reason</source>
-        <translation>Privzeti razlog za odsotnost</translation>
+        <translation>Privzet razlog za odsotnost</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="471"/>
-        <source>Away Reason:</source>
-        <translation>Razlog odsotnosti:</translation>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="260"/>
+        <source>Away Nick:</source>
+        <translation>Vzdevek ob odsotnosti:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="363"/>
-        <source>Away Nick:</source>
-        <translation>Vzdevek odsotnosti:</translation>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="267"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="296"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="365"/>
+        <source>Away Reason:</source>
+        <translation>Razlog za odsotnost:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="375"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="279"/>
         <source>Set away when all clients have detached from the core</source>
         <translation>Nastavi odsotnost, ko vsi odjemalci prekinejo povezavo z jedrom</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="378"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="282"/>
         <source>Away On Detach</source>
         <translation>Odsotnost ob prekinitvi</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="405"/>
-        <source>Override default away reason for auto-away on detach</source>
-        <translation>Za samo-odsotnost ob prekinitvi povozi privzeti razlog odsotnosti</translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="420"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="314"/>
         <source>Not implemented yet</source>
-        <translation>Še ni izvedeno</translation>
+        <translation>Še ni izdelano</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="423"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="317"/>
         <source>Away On Idle</source>
         <translation>Odsotnost ob neaktivnosti</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="437"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="331"/>
         <source>Set away after</source>
         <translation>Odsoten po</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="447"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="341"/>
         <source>minutes of being idle</source>
         <translation>minutah neaktivnosti</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="512"/>
-        <source>Advanced</source>
-        <translation>Napredno</translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="520"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="406"/>
         <source>Ident:</source>
         <translation>Ident:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="527"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="413"/>
         <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
         <translation>»ident« je del maske gostitelja in vas, skupaj z gostiteljem, edinstveno identificira na omrežju IRC.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="536"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="422"/>
         <source>Messages</source>
         <translation>Sporočila</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="544"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="430"/>
         <source>Part Reason:</source>
         <translation>Razlog zapustitve:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="557"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="443"/>
         <source>Quit Reason:</source>
         <translation>Razlog končanja:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="567"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="453"/>
         <source>Kick Reason:</source>
         <translation>Razlog za brco:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="601"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="487"/>
         <source>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</source>
         <translation>Za urejanje ključa in potrdila SSL za jedro potrebujete odjemalca s podporo za SSL</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="630"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="516"/>
         <source>Warning: you are not connected with a secured connection to the Quassel Core!
 Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!</source>
         <translation>Opozorilo: Povezava z jedrom Quassel ni varna. Če nadaljujete, se bosta
 ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="659"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="545"/>
         <source>Continue</source>
         <translation>Nadaljuj</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="705"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="583"/>
         <source>Use SSL Key</source>
         <translation>Uporabi ključ SSL</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="719"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="597"/>
         <source>Key Type:</source>
         <translation>Vrsta ključa:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="758"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="636"/>
         <source>Use SSL Certificate</source>
         <translation>Uporabi potrdilo SSL</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="777"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="655"/>
         <source>Organisation:</source>
         <translation>Organizacija:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="811"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="689"/>
         <source>CommonName:</source>
         <translation>Skupno ime:</translation>
     </message>
 </context>
 <context>
-    <name>Identity</name>
+    <name>IdentityPage</name>
     <message>
-        <location filename="../src/common/identity.cpp" line="65"/>
-        <source>&lt;empty&gt;</source>
-        <translation>&lt;prazno&gt;</translation>
-    </message>
-    <message>
-        <location filename="../src/common/identity.cpp" line="66"/>
-        <source>Quassel IRC User</source>
-        <translation>Uporabnik Quassel IRC</translation>
-    </message>
-    <message>
-        <location filename="../src/common/identity.cpp" line="72"/>
-        <source>Gone fishing.</source>
-        <translation>Odšel sem ribarit.</translation>
-    </message>
-    <message>
-        <location filename="../src/common/identity.cpp" line="76"/>
-        <source>Not here. No, really. not here!</source>
-        <translation>Ni me tu. Ne, res, ni me tu!</translation>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="107"/>
+        <source>Setup Identity</source>
+        <translation>Nastavitev identitete</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="79"/>
-        <source>All Quassel clients vanished from the face of the earth...</source>
-        <translation>Vsi odjemalci Quassel so izginili z obličja Zemlje ...</translation>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="112"/>
+        <source>Default Identity</source>
+        <translation>Privzeta identiteta</translation>
     </message>
+</context>
+<context>
+    <name>InputLine</name>
     <message>
-        <location filename="../src/common/identity.cpp" line="82"/>
-        <source>Kindergarten is elsewhere!</source>
-        <translation>Otroški vrtec je drugje!</translation>
+        <location filename="../src/uisupport/inputline.cpp" line="148"/>
+        <source>Do you really want to paste %1 lines?</source>
+        <translation>Ali res želite prilepiti %1 vrstic?</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="84"/>
-        <source>http://quassel-irc.org - Chat comfortably. Anywhere.</source>
-        <translation>http://quassel-irc.org - Klepetajte udobno. Kjerkoli.</translation>
+        <location filename="../src/uisupport/inputline.cpp" line="157"/>
+        <source>Paste Protection</source>
+        <translation>Varovanje pri lepljenju</translation>
     </message>
 </context>
 <context>
     <name>InputWidget</name>
     <message>
-        <location filename="../src/qtui/inputwidget.cpp" line="57"/>
+        <location filename="../src/qtui/inputwidget.cpp" line="55"/>
         <source>Focus Input Line</source>
         <translation>Fokusiraj vnosno vrstico</translation>
     </message>
     <message>
-        <location filename="../src/qtui/inputwidget.cpp" line="58"/>
+        <location filename="../src/qtui/inputwidget.cpp" line="56"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
@@ -2693,15 +3360,23 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
         <translation>Obrazec</translation>
     </message>
 </context>
+<context>
+    <name>IrcConnectionWizard</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="51"/>
+        <source>Save &amp;&amp; Connect</source>
+        <translation>Shrani in se poveži</translation>
+    </message>
+</context>
 <context>
     <name>IrcListModel</name>
     <message>
-        <location filename="../src/client/irclistmodel.cpp" line="60"/>
+        <location filename="../src/client/irclistmodel.cpp" line="59"/>
         <source>Channel</source>
         <translation>Kanal</translation>
     </message>
     <message>
-        <location filename="../src/client/irclistmodel.cpp" line="61"/>
+        <location filename="../src/client/irclistmodel.cpp" line="60"/>
         <source>Users</source>
         <translation>Uporabniki</translation>
     </message>
@@ -2714,152 +3389,160 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
 <context>
     <name>IrcServerHandler</name>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="459"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="464"/>
         <source>%1 has changed topic for %2 to: &quot;%3&quot;</source>
         <translation>%1 je spremenil temo za %2 na: »%3«</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="484"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="489"/>
         <source>Received RPL_ISUPPORT (005) without parameters!</source>
         <translation>Prejet je bil RPL_ISUPPORT (005) brez parametrov!</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="492"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="497"/>
         <source>Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!</source>
         <translation>Prejet je bil RPL_ISUPPORT, ki ni skladen z RFC: to lahko vodi do nepredvidenega obnašanja!</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="530"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="514"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="521"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="528"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="535"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="565"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="570"/>
         <source>[Whois] %1 is away: &quot;%2&quot;</source>
-        <translation>[Whois] %1 je odsoten: »%2«</translation>
+        <translation>[Kdoje] %1 je odsoten: »%2«</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="576"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="581"/>
         <source>%1 is away: &quot;%2&quot;</source>
         <translation>%1 je odsoten: »%2«</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="777"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="625"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="639"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="673"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="689"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="750"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="782"/>
         <source>[Whois] %1</source>
-        <translation>[Whois] %1</translation>
+        <translation>[Kdoje] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="651"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="654"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="656"/>
         <source>[Whois] %1 is %2 (%3)</source>
-        <translation>[Whois] %1 je %2 (%3)</translation>
+        <translation>[Kdoje] %1 je %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="666"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="671"/>
         <source>%1 is online via %2 (%3)</source>
         <translation>%1 je povezan prek %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="928"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="675"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="933"/>
         <source>[Whowas] %1</source>
-        <translation>[Whowas] %1</translation>
+        <translation>[Kdojebil] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="696"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="701"/>
         <source>[Whowas] %1 was %2 (%3)</source>
-        <translation>[Whowas] %1 je bil %2 (%3)</translation>
+        <translation>[Kdojebil] %1 je bil %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="710"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="715"/>
         <source>[Who] End of /WHO list for %1</source>
         <translation>[Who] Konec seznama /WHO za %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="730"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="735"/>
         <source>[Whois] %1 is logged in since %2</source>
-        <translation>[Whois] %1 je prijavljen od %2</translation>
+        <translation>[Kdoje] %1 je prijavljen od %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="732"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="737"/>
         <source>[Whois] %1 is idling for %2 (%3)</source>
-        <translation>[Whois] %1 je nedejaven %2 (%3)</translation>
+        <translation>[Kdoje] %1 je nedejaven %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="735"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="740"/>
         <source>[Whois] idle message: %1</source>
-        <translation>[Whois] sporočilo nedejavnosti: %1</translation>
+        <translation>[Kdoje] sporočilo nedejavnosti: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="767"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="772"/>
         <source>[Whois] %1 is a user on channels: %2</source>
-        <translation>[Whois] %1 je uporabnik na kanalih: %2</translation>
+        <translation>[Kdoje] %1 je uporabnik na kanalih: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="769"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="774"/>
         <source>[Whois] %1 has voice on channels: %2</source>
-        <translation>[Whois] %1 ima glas na kanalih: %2</translation>
+        <translation>[Kdoje] %1 ima glas na kanalih: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="771"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="776"/>
         <source>[Whois] %1 is an operator on channels: %2</source>
-        <translation>[Whois] %1 je operater na kanalih: %2</translation>
+        <translation>[Kdoje] %1 je operater na kanalih: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="799"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="804"/>
         <source>Channel %1 has %2 users. Topic is: %3</source>
         <translation>Kanal %1 ima %2 uporabnikov. Tema je: %3</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="808"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="813"/>
         <source>End of channel list</source>
         <translation>Konec seznama kanalov</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="838"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="843"/>
         <source>No topic is set for %1.</source>
         <translation>Za %1 ni nastavljene nobene teme.</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="853"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="858"/>
         <source>Topic for %1 is &quot;%2&quot;</source>
         <translation>Tema za %1 je »%2«</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="864"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="869"/>
         <source>Topic set by %1 on %2</source>
         <translation>Temo je %2 nastavil %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="887"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="892"/>
         <source>[Who] %1</source>
         <translation>[Who] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="941"/>
         <source>There is a nickname in your identity&apos;s nicklist which contains illegal characters</source>
-        <translation>Na seznamu vzdevkov za vašo identiteto je vzdevek, ki vsebuje neveljavne znake</translation>
+        <translation type="obsolete">Na seznamu vzdevkov za vašo identiteto je vzdevek, ki vsebuje neveljavne znake</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="942"/>
         <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>Zaradi napake v Unreal IRCd (in mogoče drugih strežnikih za IRC) ne moremo določiti nepravilnega vzdevka</translation>
+        <translation type="obsolete">Zaradi napake v Unreal IRCd (in mogoče drugih strežnikih za IRC) ne moremo določiti nepravilnega vzdevka</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="943"/>
         <source>Please use: /nick &lt;othernick&gt; to continue or clean up your nicklist</source>
-        <translation>Za nadaljevanje uporabite »/nick &lt;drug_vzdevek&gt;«, ali pa počistite seznam vzdevkov</translation>
+        <translation type="obsolete">Za nadaljevanje uporabite »/nick &lt;drug_vzdevek&gt;«, ali pa počistite seznam vzdevkov</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="946"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="951"/>
         <source>Nick %1 contains illegal characters</source>
         <translation>Vzdevek %1 vsebuje neveljavne znake</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="958"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="962"/>
         <source>Nick already in use: %1</source>
         <translation>Vzdevek je že v uporabi: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="981"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="987"/>
         <source>No free and valid nicks in nicklist found. use: /nick &lt;othernick&gt; to continue</source>
         <translation>Na seznamu vzdevkov ni moč najti nobenega prostega ali veljavnega vzdevka. Za nadaljevanje uporabite »/nick &lt;drug_vzdevek&gt;«</translation>
     </message>
@@ -2867,17 +3550,17 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
 <context>
     <name>IrcUserItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="777"/>
+        <location filename="../src/client/networkmodel.cpp" line="780"/>
         <source>idling since %1</source>
         <translation>nedejaven od %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="780"/>
+        <location filename="../src/client/networkmodel.cpp" line="783"/>
         <source>login time: %1</source>
         <translation>čas prijave: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="783"/>
+        <location filename="../src/client/networkmodel.cpp" line="786"/>
         <source>server: %1</source>
         <translation>strežnik: %1</translation>
     </message>
@@ -2885,190 +3568,212 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
 <context>
     <name>MainWin</name>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="206"/>
+        <location filename="../src/qtui/mainwin.cpp" line="221"/>
         <source>&amp;Connect to Core...</source>
         <translation>&amp;Poveži se z jedrom ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="208"/>
+        <location filename="../src/qtui/mainwin.cpp" line="223"/>
         <source>&amp;Disconnect from Core</source>
         <translation>P&amp;rekini povezavo z jedrom</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="210"/>
+        <location filename="../src/qtui/mainwin.cpp" line="225"/>
         <source>Core &amp;Info...</source>
         <translation>P&amp;odatki o jedru ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="212"/>
+        <location filename="../src/qtui/mainwin.cpp" line="227"/>
         <source>Configure &amp;Networks...</source>
         <translation>&amp;Nastavi omrežja ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="214"/>
+        <location filename="../src/qtui/mainwin.cpp" line="229"/>
         <source>&amp;Quit</source>
         <translation>Konča&amp;j</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="215"/>
+        <location filename="../src/qtui/mainwin.cpp" line="230"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="218"/>
+        <location filename="../src/qtui/mainwin.cpp" line="233"/>
         <source>&amp;Configure Buffer Views...</source>
         <translation>N&amp;astavi prikaze ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="220"/>
         <source>&amp;Lock Dock Positions</source>
-        <translation>&amp;Zakleni položaj podoken</translation>
+        <translation type="obsolete">&amp;Zakleni položaj podoken</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="236"/>
+        <source>&amp;Lock Layout</source>
+        <translation>&amp;Zakleni razpored</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="224"/>
+        <location filename="../src/qtui/mainwin.cpp" line="240"/>
         <source>Show &amp;Search Bar</source>
         <translation>Pr&amp;ikaži iskalno vrstico</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="225"/>
+        <location filename="../src/qtui/mainwin.cpp" line="241"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="226"/>
+        <location filename="../src/qtui/mainwin.cpp" line="242"/>
+        <source>Show Away Log</source>
+        <translation>Prkaži dnevnik ob odsotnosti</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="244"/>
         <source>Show Status &amp;Bar</source>
         <translation>Pri&amp;kaži vrstico stanja</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="230"/>
+        <location filename="../src/qtui/mainwin.cpp" line="248"/>
         <source>&amp;Configure Quassel...</source>
         <translation>&amp;Nastavi Quassel ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="231"/>
+        <location filename="../src/qtui/mainwin.cpp" line="249"/>
         <source>F7</source>
         <translation>F7</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="234"/>
+        <location filename="../src/qtui/mainwin.cpp" line="252"/>
         <source>&amp;About Quassel</source>
         <translation>&amp;O Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="236"/>
+        <location filename="../src/qtui/mainwin.cpp" line="254"/>
         <source>About &amp;Qt</source>
         <translation>O &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="238"/>
+        <location filename="../src/qtui/mainwin.cpp" line="256"/>
         <source>Debug &amp;NetworkModel</source>
         <translation>Raz&amp;hroščevanje modela omrežja</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="240"/>
+        <location filename="../src/qtui/mainwin.cpp" line="258"/>
         <source>Debug &amp;MessageModel</source>
         <translation>Ra&amp;zhroščevanje modela sporočil</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="242"/>
+        <location filename="../src/qtui/mainwin.cpp" line="260"/>
         <source>Debug &amp;Log</source>
         <translation>Razhroščevalni &amp;dnevnik</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="249"/>
+        <location filename="../src/qtui/mainwin.cpp" line="267"/>
         <source>&amp;File</source>
         <translation>&amp;Datoteka</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="262"/>
+        <location filename="../src/qtui/mainwin.cpp" line="280"/>
         <source>&amp;Networks</source>
         <translation>&amp;Omrežja</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="268"/>
+        <location filename="../src/qtui/mainwin.cpp" line="286"/>
         <source>&amp;View</source>
         <translation>&amp;Videz</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="269"/>
+        <location filename="../src/qtui/mainwin.cpp" line="287"/>
         <source>&amp;Buffer Views</source>
         <translation>P&amp;rikazi</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="277"/>
+        <location filename="../src/qtui/mainwin.cpp" line="289"/>
+        <source>&amp;Toolbars</source>
+        <translation>&amp;Orodjarne</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="301"/>
         <source>&amp;Settings</source>
         <translation>&amp;Nastavitve</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="284"/>
+        <location filename="../src/qtui/mainwin.cpp" line="308"/>
         <source>&amp;Help</source>
         <translation>&amp;Pomoč</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="292"/>
+        <location filename="../src/qtui/mainwin.cpp" line="316"/>
         <source>Debug</source>
         <translation>Razhroščevanje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="380"/>
+        <location filename="../src/qtui/mainwin.cpp" line="410"/>
         <source>Nicks</source>
         <translation>Vzdevki</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="389"/>
+        <location filename="../src/qtui/mainwin.cpp" line="419"/>
         <source>Show Nick List</source>
         <translation>Prikaži seznam vzdevkov</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="400"/>
+        <location filename="../src/qtui/mainwin.cpp" line="430"/>
         <source>Chat Monitor</source>
         <translation>Nadzorovalnik klepeta</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="411"/>
+        <location filename="../src/qtui/mainwin.cpp" line="441"/>
         <source>Show Chat Monitor</source>
         <translation>Prikaži nadzorovalnik klepeta</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="415"/>
+        <location filename="../src/qtui/mainwin.cpp" line="445"/>
         <source>Inputline</source>
         <translation>Vnosna vrstica</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="424"/>
+        <location filename="../src/qtui/mainwin.cpp" line="454"/>
         <source>Show Input Line</source>
         <translation>Prikaži vnosno vrstico</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="435"/>
+        <location filename="../src/qtui/mainwin.cpp" line="465"/>
         <source>Topic</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="447"/>
+        <location filename="../src/qtui/mainwin.cpp" line="477"/>
         <source>Show Topic Line</source>
         <translation>Prikaži vrstico s temo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="551"/>
+        <location filename="../src/qtui/mainwin.cpp" line="595"/>
         <source>Connected to core.</source>
         <translation>Povezan z jedrom.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="577"/>
+        <location filename="../src/qtui/mainwin.cpp" line="629"/>
         <source>Core Lag: %1</source>
         <translation>Zakasnitev jedra: %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="613"/>
+        <location filename="../src/qtui/mainwin.cpp" line="665"/>
         <source>Not connected to core.</source>
         <translation>Brez povezave z jedrom.</translation>
     </message>
 </context>
+<context>
+    <name>Message</name>
+    <message>
+        <location filename="../src/common/message.h" line="68"/>
+        <source>Day changed to %1</source>
+        <translation>Dan se je spremenil na %1</translation>
+    </message>
+</context>
 <context>
     <name>MessageModel</name>
     <message>
-        <location filename="../src/client/messagemodel.cpp" line="362"/>
+        <location filename="../src/client/messagemodel.cpp" line="361"/>
         <source>Requesting %1 messages from backlog for buffer %2:%3</source>
         <translation>Zahtevam %1 starih sporočil za prikaz %2:%3</translation>
     </message>
@@ -3082,8 +3787,12 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/msgprocessorstatuswidget.ui" line="34"/>
+        <source>Receiving Backlog</source>
+        <translation>Sprejemanje starih sporočil</translation>
+    </message>
+    <message>
         <source>Processing Messages</source>
-        <translation>Obdelovanje sporočil</translation>
+        <translation type="obsolete">Obdelovanje sporočil</translation>
     </message>
 </context>
 <context>
@@ -3147,7 +3856,7 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
         <translation>Vnesite ime omrežja:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="698"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="699"/>
         <source>Add Network</source>
         <translation>Dodaj omrežje</translation>
     </message>
@@ -3155,17 +3864,17 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
 <context>
     <name>NetworkItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="177"/>
+        <location filename="../src/client/networkmodel.cpp" line="178"/>
         <source>Server: %1</source>
         <translation>Strežnik: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="178"/>
+        <location filename="../src/client/networkmodel.cpp" line="179"/>
         <source>Users: %1</source>
         <translation>Uporabniki: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="181"/>
+        <location filename="../src/client/networkmodel.cpp" line="182"/>
         <source>Lag: %1 msecs</source>
         <translation>Zakasnitev: %1 ms</translation>
     </message>
@@ -3173,17 +3882,17 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
 <context>
     <name>NetworkModel</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="802"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Buffer</source>
         <translation>Prikaz</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="802"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Topic</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="802"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Nick Count</source>
         <translation>Št. vzdevkov</translation>
     </message>
@@ -3191,189 +3900,152 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
 <context>
     <name>NetworkModelActionProvider</name>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="40"/>
         <source>Connect</source>
-        <translation>Poveži se</translation>
+        <translation type="obsolete">Poveži se</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="41"/>
         <source>Disconnect</source>
-        <translation>Prekini povezavo</translation>
+        <translation type="obsolete">Prekini povezavo</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="43"/>
         <source>Join</source>
-        <translation>Pridruži se</translation>
+        <translation type="obsolete">Pridruži se</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="44"/>
         <source>Part</source>
-        <translation>Zapusti</translation>
+        <translation type="obsolete">Zapusti</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="45"/>
         <source>Delete Buffer(s)...</source>
-        <translation>Zbriši prikaz(e) ...</translation>
+        <translation type="obsolete">Zbriši prikaz(e) ...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="46"/>
         <source>Show Buffer</source>
-        <translation>Prikaži prikaz</translation>
+        <translation type="obsolete">Prikaži prikaz</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="48"/>
         <source>Joins</source>
-        <translation>Pridružitve</translation>
+        <translation type="obsolete">Pridružitve</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="49"/>
         <source>Parts</source>
-        <translation>Zapustitve</translation>
+        <translation type="obsolete">Zapustitve</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="50"/>
         <source>Quits</source>
-        <translation>Končanja</translation>
+        <translation type="obsolete">Končanja</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="51"/>
         <source>Nick Changes</source>
-        <translation>Spremembe vzdevkov</translation>
+        <translation type="obsolete">Spremembe vzdevkov</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="52"/>
         <source>Mode Changes</source>
-        <translation>Spremembe načina</translation>
+        <translation type="obsolete">Spremembe načina</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="53"/>
         <source>Day Changes</source>
-        <translation>Spremembe dneva</translation>
+        <translation type="obsolete">Spremembe dneva</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="54"/>
         <source>Set as Default...</source>
-        <translation>Nastavi kot privzeto ...</translation>
+        <translation type="obsolete">Nastavi kot privzeto ...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="55"/>
         <source>Use Defaults...</source>
-        <translation>Uporabi privzeto ...</translation>
+        <translation type="obsolete">Uporabi privzeto ...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="57"/>
         <source>Join Channel...</source>
-        <translation>Pridruži se kanalu ...</translation>
+        <translation type="obsolete">Pridruži se kanalu ...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="59"/>
         <source>Start Query</source>
-        <translation>Zaženi poizvedbo</translation>
+        <translation type="obsolete">Zaženi poizvedbo</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="60"/>
         <source>Show Query</source>
-        <translation>Prikaži poizvedbo</translation>
+        <translation type="obsolete">Prikaži poizvedbo</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="61"/>
         <source>Whois</source>
-        <translation>Whois</translation>
+        <translation type="obsolete">Whois</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="63"/>
         <source>Version</source>
-        <translation>Različica</translation>
+        <translation type="obsolete">Različica</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="64"/>
         <source>Time</source>
-        <translation>Čas</translation>
+        <translation type="obsolete">Čas</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="65"/>
         <source>Ping</source>
-        <translation>Ping</translation>
+        <translation type="obsolete">Ping</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="66"/>
         <source>Finger</source>
-        <translation>Finger</translation>
+        <translation type="obsolete">Finger</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="68"/>
         <source>Give Operator Status</source>
-        <translation>Daj status operaterja</translation>
+        <translation type="obsolete">Daj status operaterja</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="69"/>
         <source>Take Operator Status</source>
-        <translation>Odvzemi status operaterja</translation>
+        <translation type="obsolete">Odvzemi status operaterja</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="70"/>
         <source>Give Voice</source>
-        <translation>Daj besedo</translation>
+        <translation type="obsolete">Daj besedo</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="71"/>
         <source>Take Voice</source>
-        <translation>Odvzemi besedo</translation>
+        <translation type="obsolete">Odvzemi besedo</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="72"/>
         <source>Kick From Channel</source>
-        <translation>Brcni s kanala</translation>
+        <translation type="obsolete">Brcni s kanala</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="73"/>
         <source>Ban From Channel</source>
-        <translation>Izloči s kanala</translation>
+        <translation type="obsolete">Izloči s kanala</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="74"/>
         <source>Kick &amp;&amp; Ban</source>
-        <translation>Brcni in izloči</translation>
+        <translation type="obsolete">Brcni in izloči</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="76"/>
         <source>Hide Buffer(s) Temporarily</source>
-        <translation>Začasno skrij prikaz(e)</translation>
+        <translation type="obsolete">Začasno skrij prikaz(e)</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="77"/>
         <source>Hide Buffer(s) Permanently</source>
-        <translation>Trajno skrij prikaz(e)</translation>
+        <translation type="obsolete">Trajno skrij prikaz(e)</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="78"/>
         <source>Show Channel List</source>
-        <translation>Prikaži seznam kanalov</translation>
+        <translation type="obsolete">Prikaži seznam kanalov</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="79"/>
         <source>Show Ignore List</source>
-        <translation>Prikaži seznam spregledanih</translation>
+        <translation type="obsolete">Prikaži seznam spregledanih</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="93"/>
         <source>Hide Events</source>
-        <translation>Skrij dogodke</translation>
+        <translation type="obsolete">Skrij dogodke</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="101"/>
         <source>CTCP</source>
-        <translation>CTCP</translation>
+        <translation type="obsolete">CTCP</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="113"/>
         <source>Actions</source>
-        <translation>Dejanja</translation>
+        <translation type="obsolete">Dejanja</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="519"/>
         <source>Do you want to delete the following buffer(s) permanently?</source>
-        <translation>
+        <translation type="obsolete">
             <numerusform>Ali želite trajno zbrisati sledeči prikaz?</numerusform>
             <numerusform>Ali želite trajno zbrisati sledeča prikaza?</numerusform>
             <numerusform>Ali želite trajno zbrisati sledeče prikaze?</numerusform>
@@ -3381,70 +4053,123 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
         </translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="524"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; This will delete all related data, including all backlog data, from the core&apos;s database and cannot be undone.</source>
+        <translation type="obsolete">&lt;b&gt;Pomnite:&lt;/b&gt; S tem iz podatkovne zbirke jedra zbrišete vse povezane podatke, vključno z zgodovino sporočil. Tega kasneje ni moč razveljaviti.</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Active channel buffers cannot be deleted, please part the channel first.</source>
+        <translation type="obsolete">&lt;br&gt;Aktivnih prikazov kanalov ni moč zbrisati. Najprej zapustite kanale.</translation>
+    </message>
+    <message>
+        <source>Remove buffers permanently?</source>
+        <translation type="obsolete">Ali trajno zbrišem prikaze?</translation>
+    </message>
+    <message>
+        <source>Join Channel</source>
+        <translation type="obsolete">Pridruži se kanalu</translation>
+    </message>
+    <message>
+        <source>Input channel name:</source>
+        <translation type="obsolete">Vnesite ime kanala:</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkModelController</name>
+    <message numerus="yes">
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="152"/>
+        <source>Do you want to delete the following buffer(s) permanently?</source>
+        <translation>
+            <numerusform>Ali želite trajno zbrisati sledeči %n prikaz?</numerusform>
+            <numerusform>Ali želite trajno zbrisati sledeča %n prikaza?</numerusform>
+            <numerusform>Ali želite trajno zbrisati sledeče %n prikaze?</numerusform>
+            <numerusform>Ali želite trajno zbrisati sledečih %n prikaze?</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="157"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; This will delete all related data, including all backlog data, from the core&apos;s database and cannot be undone.</source>
         <translation>&lt;b&gt;Pomnite:&lt;/b&gt; S tem iz podatkovne zbirke jedra zbrišete vse povezane podatke, vključno z zgodovino sporočil. Tega kasneje ni moč razveljaviti.</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="526"/>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="159"/>
         <source>&lt;br&gt;Active channel buffers cannot be deleted, please part the channel first.</source>
         <translation>&lt;br&gt;Aktivnih prikazov kanalov ni moč zbrisati. Najprej zapustite kanale.</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="528"/>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="161"/>
         <source>Remove buffers permanently?</source>
         <translation>Ali trajno zbrišem prikaze?</translation>
     </message>
+</context>
+<context>
+    <name>NetworkModelController::JoinDlg</name>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="603"/>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="417"/>
         <source>Join Channel</source>
         <translation>Pridruži se kanalu</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="603"/>
-        <source>Input channel name:</source>
-        <translation>Vnesite ime kanala:</translation>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="420"/>
+        <source>Network:</source>
+        <translation>Omrežje:</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="422"/>
+        <source>Channel:</source>
+        <translation>Kanal:</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="148"/>
+        <source>Setup Network Connection</source>
+        <translation>Nastavitev omrežne povezave</translation>
     </message>
 </context>
 <context>
     <name>NetworksSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="36"/>
         <source>General</source>
-        <translation>Splošno</translation>
+        <translation type="obsolete">Splošno</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="36"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
         <source>Networks</source>
         <translation>Omrežja</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="159"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
+        <source>Misc</source>
+        <translation>Razno</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="160"/>
         <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;Preden se uveljavijo spremembe, je potrebno odpraviti sledeče težave:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="160"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="161"/>
         <source>&lt;li&gt;All networks need at least one server defined&lt;/li&gt;</source>
         <translation>&lt;li&gt;Vsako omrežje mora imeti določen vsaj en strežnik&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="161"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="162"/>
         <source>&lt;/ul&gt;</source>
         <translation>&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="162"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="163"/>
         <source>Invalid Network Settings</source>
         <translation>Neveljavne nastavitve omrežja</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="545"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="546"/>
         <source>Delete Network?</source>
         <translation>Zbrišem omrežje?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="546"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="547"/>
         <source>Do you really want to delete the network &quot;%1&quot; and all related settings, including the backlog?</source>
         <translation>Ali res želite zbrisati omrežje »%1« in vse z njim povezane nastavitve, vključno z zgodovino sporočil?</translation>
     </message>
@@ -3459,11 +4184,13 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
         <translation>Pre&amp;imenuj ...</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="64"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="234"/>
         <source>&amp;Add...</source>
         <translation>&amp;Dodaj ...</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="87"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="251"/>
         <source>De&amp;lete</source>
         <translation>&amp;Zbriši</translation>
@@ -3479,6 +4206,8 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
         <translation>Identiteta:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="148"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="280"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="294"/>
         <source>...</source>
         <translation>...</translation>
@@ -3571,6 +4300,7 @@ Pomnite, da se Quassel samodejno znova pridruži kanalom, zato /join tu verjetno
         <translation>Po vnovični povezavi se pridruži vsem kanalom</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="491"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="500"/>
         <source>Auto Identify</source>
         <translation>Samodejno se identificiraj</translation>
@@ -3611,6 +4341,7 @@ Pomnite, da se Quassel samodejno znova pridruži kanalom, zato /join tu verjetno
         <translation>Uporabi nabor znakov po meri</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="592"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="612"/>
         <source>Specify which encoding your messages will be sent in.
 UTF-8 should be a sane choice for most networks.</source>
@@ -3623,6 +4354,7 @@ Za večino omrežij bi morala biti UTF-8 razumna izbira.</translation>
         <translation>Pošlji sporočila z:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="623"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="643"/>
         <source>Incoming messages encoded in Utf8 will always be treated as such.
 This setting defines the encoding for messages that are not Utf8.</source>
@@ -3635,6 +4367,7 @@ Ta nastavitev določa nabor znakov za sporočila, ki niso UTF-8.</translation>
         <translation>Zasilen za prejeta:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="654"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="668"/>
         <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>
@@ -3650,7 +4383,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>NickEditDlg</name>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="708"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="416"/>
         <source>Add Nickname</source>
         <translation>Dodaj vzdevek</translation>
     </message>
@@ -3673,15 +4406,19 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>NotificationsSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Obnašanje</translation>
+        <translation type="obsolete">Obnašanje</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
         <source>Notifications</source>
         <translation>Obvestila</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
+        <source>Appearance</source>
+        <translation>Videz</translation>
+    </message>
 </context>
 <context>
     <name>PhononNotificationBackend::ConfigWidget</name>
@@ -3712,20 +4449,30 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="54"/>
+        <location filename="../src/client/backlogrequester.cpp" line="65"/>
         <source>Requesting a total of up to %1 backlog messages for %2 buffers</source>
         <translation>Zahtevam največ %1 starih sporočil za %2 prikazov</translation>
     </message>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="78"/>
+        <location filename="../src/client/backlogrequester.cpp" line="89"/>
         <source>Requesting up to %1 of all unread backlog messages (plus additional %2)</source>
         <translation>Zahtevam največ %1 neprebranih starih sporočil (in dodatnih %2)</translation>
     </message>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="96"/>
+        <location filename="../src/client/backlogrequester.cpp" line="107"/>
         <source>Requesting a total of up to %1 unread backlog messages for %2 buffers</source>
         <translation>Zahtevam največ %1 neprebranih starih sporočil za %2 prikazov</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="56"/>
+        <source>Welcome to Quassel IRC</source>
+        <translation>Dobrodošli v Quassel IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="58"/>
+        <source>This wizard will help you to set up your default identity and your IRC network connection.&lt;br&gt;This only covers basic settings. You can cancel this wizard any time and use the settings dialog for more detailed changes.</source>
+        <translation>Ta čarovnik vam bo pomagal pri nastavitvi privzete identitete in povezave v omrežje IRC.&lt;br&gt;Zaobjete so le osnovne nastavitve. Tega čarovnika lahko prekličete kadarkoli in za podrobnejše spremembe uporabite nastavitveno okno.</translation>
+    </message>
 </context>
 <context>
     <name>Quassel::secondsToString()</name>
@@ -3758,22 +4505,22 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>QueryBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="377"/>
+        <location filename="../src/client/networkmodel.cpp" line="380"/>
         <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
         <translation>&lt;b&gt;Poizvedba z %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="395"/>
+        <location filename="../src/client/networkmodel.cpp" line="398"/>
         <source>idling since %1</source>
         <translation>nedejaven od %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="398"/>
+        <location filename="../src/client/networkmodel.cpp" line="401"/>
         <source>login time: %1</source>
         <translation>čas prijave: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="401"/>
+        <location filename="../src/client/networkmodel.cpp" line="404"/>
         <source>server: %1</source>
         <translation>strežnik: %1</translation>
     </message>
@@ -3814,6 +4561,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
         <translation>Naslov strežnika:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="52"/>
         <location filename="../src/qtui/settingspages/servereditdlg.ui" line="242"/>
         <source>Port:</source>
         <translation>Vrata:</translation>
@@ -3902,42 +4650,44 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>SettingsDlg</name>
     <message>
+        <location filename="../src/qtui/settingsdlg.cpp" line="77"/>
+        <location filename="../src/qtui/ui/settingsdlg.ui" line="34"/>
         <location filename="../src/qtui/ui/settingsdlg.ui" line="49"/>
         <source>Settings</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="79"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="87"/>
         <source>Save changes</source>
         <translation>Shrani spremembe</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="80"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="88"/>
         <source>There are unsaved changes on the current configuration page. Would you like to apply your changes now?</source>
         <translation>Na trenutni strani z nastavitvami so neshranjene spremembe. Ali želite sedaj uveljaviti spremembe?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="91"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="99"/>
         <source>Configure %1</source>
         <translation>Nastavi %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="164"/>
         <source>Reload Settings</source>
         <translation>Znova naloži nastavitve</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="164"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <translation>Ali želite znova naložiti nastavitve, pri čemer se spremembe izgubijo?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="165"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="173"/>
         <source>Restore Defaults</source>
         <translation>Obnovi privzete vrednosti</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="165"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="173"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation>Ali želite obnoviti privzete vrednosti za to stran?</translation>
     </message>
@@ -3988,35 +4738,114 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>SignalProxy</name>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="948"/>
+        <location filename="../src/common/signalproxy.cpp" line="951"/>
         <source>Peer tried to send package larger than max package size!</source>
         <translation>Vrstnik je poskusil poslati paket, ki je večji kot je dovoljeno!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="953"/>
+        <location filename="../src/common/signalproxy.cpp" line="956"/>
         <source>Peer tried to send 0 byte package!</source>
         <translation>Vrstnik je poskusil poslati paket velik 0 bajtov!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="970"/>
+        <location filename="../src/common/signalproxy.cpp" line="973"/>
         <source>Peer sent corrupted compressed data!</source>
         <translation>Vrstnik je poslal poškodovane stisnjene podatke!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="985"/>
+        <location filename="../src/common/signalproxy.cpp" line="988"/>
         <source>Peer sent corrupt data: unable to load QVariant!</source>
         <translation>Vrstnik je poslal poškodovane podatke: ni moč naložiti QVariant!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1085"/>
+        <location filename="../src/common/signalproxy.cpp" line="1088"/>
         <source>Disconnecting</source>
         <translation>Prekinjam povezavo</translation>
     </message>
 </context>
+<context>
+    <name>SimpleNetworkEditor</name>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="28"/>
+        <source>Network name:</source>
+        <translation>Ime omrežja:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="35"/>
+        <source>The name of the IRC network you are configuring</source>
+        <translation>Ime omrežja IRC, ki ga nastavljate</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="63"/>
+        <source>Servers</source>
+        <translation>Strežniki</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="81"/>
+        <source>A list of IRC servers belonging to this network</source>
+        <translation>Seznam strežnikov, ki spadajo v to omrežje</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="96"/>
+        <source>Edit this server entry</source>
+        <translation>Urejanje izbranega strežnika</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="99"/>
+        <source>&amp;Edit...</source>
+        <translation>&amp;Urejanje ...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="116"/>
+        <source>Add another IRC server</source>
+        <translation>Doda nov strežnik za IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="119"/>
+        <source>&amp;Add...</source>
+        <translation>&amp;Dodaj ...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="136"/>
+        <source>Remove this server entry from the list</source>
+        <translation>Odstrani izbrani strežnik s seznama</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="139"/>
+        <source>De&amp;lete</source>
+        <translation>&amp;Zbriši</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="165"/>
+        <source>Move upwards in list</source>
+        <translation>Premakni gor v seznamu</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="168"/>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="182"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="179"/>
+        <source>Move downwards in list</source>
+        <translation>Premakni dol v seznamu</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="226"/>
+        <source>Join Channels Automatically</source>
+        <translation>Samodejno se pridruži kanalom</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="250"/>
+        <source>A list of IRC channels you will join automatically after connecting to the network</source>
+        <translation>Seznam kanalov IRC, katerim se boste po vzpostavljeni povezavi v omrežje pridružili samodejno</translation>
+    </message>
+</context>
 <context>
     <name>SqliteStorage</name>
     <message>
-        <location filename="../src/core/sqlitestorage.cpp" line="51"/>
+        <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 je pogon za zbirko podatkov, ki temelji na datotekah in ne potrebuje nobenega nastavljanja. Primeren je za male in srednje-velike podatkovne zbirke, ki ne potrebujejo dostopa prek omrežja. Uporabite SQLite, če naj jedro Quassel shranjuje svoje podatke na računalniku, kjer teče, in če bo jedro uporabljalo malo uporabnikov.</translation>
     </message>
@@ -4024,72 +4853,77 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>SslCertDisplayDialog</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="570"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="568"/>
         <source>SSL Certificate used by %1</source>
         <translation>Potrdilo SSL, ki ga uporablja %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="574"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="572"/>
         <source>Issuer Info</source>
         <translation>Podatki o izdajatelju</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="585"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="574"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="583"/>
         <source>Organization:</source>
         <translation>Organizacija:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="586"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="575"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="584"/>
         <source>Locality Name:</source>
         <translation>Ime krajevnosti:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="587"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="576"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="585"/>
         <source>Organizational Unit Name:</source>
         <translation>Ime organizacijske enote:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="588"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="577"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="586"/>
         <source>Country Name:</source>
         <translation>Ime države:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="589"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="578"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="587"/>
         <source>State or Province Name:</source>
         <translation>Ime zv. države ali province:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="583"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="581"/>
         <source>Subject Info</source>
         <translation>Podatki o subjektu</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="592"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="590"/>
         <source>Additional Info</source>
         <translation>Dodatni podatki</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="594"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="592"/>
         <source>Valid From:</source>
         <translation>Veljavno od:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="595"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="593"/>
         <source>Valid To:</source>
         <translation>Veljavno do:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="598"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="596"/>
         <source>Hostname %1:</source>
         <translation>Ime gostitelja %1:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="602"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="600"/>
         <source>E-Mail Address %1:</source>
         <translation>E-poštni naslov %1:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="604"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="602"/>
         <source>Digest:</source>
         <translation>Povzetek:</translation>
     </message>
@@ -4097,7 +4931,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>StatusBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.h" line="138"/>
+        <location filename="../src/client/networkmodel.h" line="139"/>
         <source>Status Buffer</source>
         <translation>Prikaz stanja</translation>
     </message>
@@ -4105,17 +4939,17 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>SystrayNotificationBackend::ConfigWidget</name>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="124"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="106"/>
         <source>System Tray Icon</source>
         <translation>Ikona v sistemski vrstici</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="125"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="107"/>
         <source>Animate</source>
         <translation>Animiraj</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="127"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="109"/>
         <source>Show bubble</source>
         <translation>Prikaži oblaček</translation>
     </message>
@@ -4143,6 +4977,149 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
         <translation> s</translation>
     </message>
 </context>
+<context>
+    <name>ToolBarActionProvider</name>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect</source>
+        <translation>Poveži se</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect to IRC</source>
+        <translation>Poveži se na IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect</source>
+        <translation>Prekini povezavo</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect from IRC</source>
+        <translation>Prekini povezavo z IRC-em</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Part</source>
+        <translation>Zapusti</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Leave currently selected channel</source>
+        <translation>Zapusti trnutno izbrani kanal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join</source>
+        <translation>Pridruži se</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join a channel</source>
+        <translation>Pridruži se kanalu</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Query</source>
+        <translation>Poizvedba</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Start a private conversation</source>
+        <translation>Zaćni zaseben pogovor</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Whois</source>
+        <translation>Kdoje</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Request user information</source>
+        <translation>Zahtevaj podatke o uporabniku</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Op</source>
+        <translation>Op</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Give operator privileges to user</source>
+        <translation>Uporabniku podeli pravice operaterja</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Deop</source>
+        <translation>Razop</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Take operator privileges from user</source>
+        <translation>Uporabniku odvzemi pravice operaterja</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Voice</source>
+        <translation>Glas</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Give voice to user</source>
+        <translation>Uporabniku daj glas</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Devoice</source>
+        <translation>Razglas</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Take voice from user</source>
+        <translation>Uporabniku odvzemi glas</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Kick</source>
+        <translation>Brcni</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Remove user from channel</source>
+        <translation>Uporabnika odstrani iz kanala</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban</source>
+        <translation>Izloči</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban user from channel</source>
+        <translation>Uporabnika izloči iz kanala</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Kick/Ban</source>
+        <translation>Brcni/izloči</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Remove and ban user from channel</source>
+        <translation>Uporabnika odstrani in izloči iz kanala</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="54"/>
+        <source>Connect to all</source>
+        <translation>Poveži se na vse</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="61"/>
+        <source>Disconnect from all</source>
+        <translation>Prekini povezavo z vsemi</translation>
+    </message>
+</context>
 <context>
     <name>TopicLabel</name>
     <message>
@@ -4162,122 +5139,124 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>UiStyle::StyledMessage</name>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="311"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="328"/>
         <source>%D0%1</source>
         <translation>%D0%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="313"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="330"/>
         <source>%Dn%1</source>
         <translation>%Dn%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="315"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="332"/>
         <source>%Ds%1</source>
         <translation>%Ds%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="317"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="334"/>
         <source>%De%1</source>
         <translation>%De%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="319"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
         <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
         <translation>%Dj%DN%1%DN %DH(%2@%3)%DH se je pridružil %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="321"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="338"/>
         <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
         <translation>%Dp%DN%1%DN %DH(%2@%3)%DH je zapustil %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="325"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="342"/>
         <source>%Dq%DN%1%DN %DH(%2@%3)%DH has quit</source>
         <translation>%Dq%DN%1%DN %DH(%2@%3)%DH je končal</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="331"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="348"/>
         <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
         <translation>%Dk%DN%1%DN je brcnil %DN%2%DN iz %DC%3%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="353"/>
         <source>%DrYou are now known as %DN%1%DN</source>
         <translation>%DrSedaj ste znani kot %DN%1%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="337"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="354"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
         <translation>%Dr%DN%1%DN je sedaj znan kot %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="340"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="357"/>
         <source>%DmUser mode: %DM%1%DM</source>
         <translation>%DmUporabniški način: %DM%1%DM</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="341"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="358"/>
         <source>%DmMode %DM%1%DM by %DN%2%DN</source>
         <translation>%DmNačin %DM%1%DM od %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="344"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="361"/>
         <source>%Da%DN%1%DN %2</source>
         <translation>%Da%DN%1%DN %2</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="347"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="364"/>
         <source>%De[%1]</source>
         <translation>%De[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="369"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="386"/>
         <source>&lt;%1&gt;</source>
         <translation>&lt;%1&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="371"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="388"/>
         <source>[%1]</source>
         <translation>[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="375"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="390"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="392"/>
         <source>*</source>
         <translation>*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="377"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="394"/>
         <source>--&gt;</source>
         <translation>--&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="381"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="396"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="398"/>
         <source>&lt;--</source>
         <translation>&lt;--</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="383"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="400"/>
         <source>&lt;-*</source>
         <translation>&lt;-*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="385"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="402"/>
         <source>&lt;-&gt;</source>
         <translation>&lt;-&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="387"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="404"/>
         <source>***</source>
         <translation>***</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="389"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="406"/>
         <source>-*-</source>
         <translation>-*-</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="391"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="408"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
@@ -4285,7 +5264,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>UserCategoryItem</name>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="653"/>
+        <location filename="../src/client/networkmodel.cpp" line="656"/>
         <source>%n Owner(s)</source>
         <translation>
             <numerusform>%n lastnik</numerusform>
@@ -4295,7 +5274,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="654"/>
+        <location filename="../src/client/networkmodel.cpp" line="657"/>
         <source>%n Admin(s)</source>
         <translation>
             <numerusform>%n skrbnik</numerusform>
@@ -4305,7 +5284,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="655"/>
+        <location filename="../src/client/networkmodel.cpp" line="658"/>
         <source>%n Operator(s)</source>
         <translation>
             <numerusform>%n operater</numerusform>
@@ -4315,7 +5294,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="656"/>
+        <location filename="../src/client/networkmodel.cpp" line="659"/>
         <source>%n Half-Op(s)</source>
         <translation>
             <numerusform>%n pol-operater</numerusform>
@@ -4325,7 +5304,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="657"/>
+        <location filename="../src/client/networkmodel.cpp" line="660"/>
         <source>%n Voiced</source>
         <translation>
             <numerusform>%n z besedo</numerusform>
@@ -4335,7 +5314,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="658"/>
+        <location filename="../src/client/networkmodel.cpp" line="661"/>
         <source>%n User(s)</source>
         <translation>
             <numerusform>%n uporabnik</numerusform>
@@ -4348,7 +5327,12 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>UserInputHandler</name>
     <message>
-        <location filename="../src/core/userinputhandler.cpp" line="134"/>
+        <location filename="../src/core/userinputhandler.cpp" line="69"/>
+        <source>away</source>
+        <translation>odsoten</translation>
+    </message>
+    <message>
+        <location filename="../src/core/userinputhandler.cpp" line="138"/>
         <source>sending CTCP-%1 request</source>
         <translation>pošiljanje zahtevka CTCP-%1</translation>
     </message>
index 0018f50..02c084a 100644 (file)
@@ -86,7 +86,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
         <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 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;Modern, dağıtımlı bir  IRC İstemcisi&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 Quassel Projesi&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 &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; ve &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt; ile çifte lisanslanmıştır..&lt;br&gt;Çoğu simge &amp;copy; &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Takımı&lt;/a&gt; tarafından yapılmış ve &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt; ile lisanslamıştır..&lt;br&gt;&lt;br&gt;Hataları lütfen &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; adresine bildiriniz.</translation>
     </message>
 </context>
 <context>
@@ -206,7 +206,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
         <source>Backlog</source>
-        <translation type="unfinished">Birikim</translation>
+        <translation>Backlog</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="13"/>
@@ -216,7 +216,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
         <source>Backlog Request Method:</source>
-        <translation type="unfinished"></translation>
+        <translation>Backlog Talep Metodu:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="29"/>
@@ -226,7 +226,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="34"/>
         <source>Unread Messages per Buffer</source>
-        <translation type="unfinished"></translation>
+        <translation>Arabellek Başına Düşen Okunmamış Mesajlar</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="39"/>
@@ -323,7 +323,7 @@ You can also chose to fetch additional older chatlines to provide a better conte
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="379"/>
         <source>Dynamic backlog amount:</source>
-        <translation type="unfinished">Dinamik birikim miktarı:</translation>
+        <translation>Dinamik backlog miktarı:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="395"/>
@@ -439,13 +439,14 @@ You can also chose to fetch additional older chatlines to provide a better conte
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="275"/>
         <source>Merge buffers permanently?</source>
-        <translation type="unfinished"></translation>
+        <translation>Arabellekleri kalıcı olarak birleştireyim mi?</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="276"/>
         <source>Do you want to merge the buffer &quot;%1&quot; permanently into buffer &quot;%2&quot;?
  This cannot be reversed!</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; arabelleğini kalıcı olarak &quot;%2&quot; arabelleğiyle birleştireyim mi?
+Bu işlem geri alınamaz!</translation>
     </message>
 </context>
 <context>
@@ -597,7 +598,7 @@ You can also chose to fetch additional older chatlines to provide a better conte
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="187"/>
         <source>Highlight</source>
-        <translation type="unfinished">Vurgula</translation>
+        <translation>Vurgula</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="213"/>
@@ -795,7 +796,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="239"/>
         <source>Ignore:</source>
-        <translation type="unfinished"></translation>
+        <translation>Görmezden Gel:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="13"/>
@@ -805,7 +806,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="21"/>
         <source>Operation Mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>İşlem Kipi:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="28"/>
@@ -821,22 +822,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="60"/>
         <source>Available Buffers:</source>
-        <translation type="unfinished"></translation>
+        <translation>Mevcut Arabellekler:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="87"/>
         <source>Move selected buffers to the left</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçili arabellekleri sola taşı</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="101"/>
         <source>Move selected buffers to the right</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçili arabellekleri sağa taşı</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="146"/>
         <source>Show highlights in chatmonitor even if the originating buffer is ignored</source>
-        <translation type="unfinished"></translation>
+        <translation>Mesajın geldiği arabellek görmezden geliniyor olsa bile, vurgulamaları sohbet ekranında göster</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="149"/>
@@ -1432,37 +1433,37 @@ derlemeniz gerekmektedir.</translation>
     <message>
         <location filename="../src/core/core.cpp" line="255"/>
         <source>Invalid listen address %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Geçersiz dinleme adresi %1</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="263"/>
         <source>Listening for GUI clients on IPv4 %1 port %2 using protocol version %3</source>
-        <translation type="unfinished"></translation>
+        <translation>GUI istemcileri IPv4 %1 port %2 ve %3 protokol sürümü üzerinden dinleniyor</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="271"/>
         <source>Could not open IPv4 interface %1:%2: %3</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv4 arayüzü açılamadı %1:%2: %3</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="279"/>
         <source>Listening for GUI clients on IPv6 %1 port %2 using protocol version %3</source>
-        <translation type="unfinished"></translation>
+        <translation>GUI istemcileri IPv6 %1 port %2 ve %3 protokol sürümü üzerinden dinleniyor</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="290"/>
         <source>Could not open IPv6 interface %1:%2: %3</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6 arayüzü açılamadı %1:%2: %3</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="298"/>
         <source>Invalid listen address %1, unknown network protocol</source>
-        <translation type="unfinished"></translation>
+        <translation>Geçersiz dinleme adresi %1, bilinmeyen ağ protokolü</translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="306"/>
         <source>Could not open any network interfaces to listen on!</source>
-        <translation type="unfinished"></translation>
+        <translation>Hiçbir dinlenecek ağ arayüzü açılamadı!</translation>
     </message>
 </context>
 <context>
@@ -2051,7 +2052,7 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/core/coresession.cpp" line="339"/>
         <source>CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!</source>
-        <translation type="unfinished"></translation>
+        <translation>CoreSession::createNetwork(): Zaten varolan bir ağı oluşturmaya çalışıyor, güncelliyorum!</translation>
     </message>
 </context>
 <context>
@@ -2087,7 +2088,7 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/core/ctcphandler.cpp" line="195"/>
         <source>Received CTCP PING answer from %1 with %2 seconds round trip time</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 kişisinden %2 saniye geri dönüş süresiyle CTCP PING cevabı alındı</translation>
     </message>
     <message>
         <location filename="../src/core/ctcphandler.cpp" line="205"/>
@@ -2097,7 +2098,7 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/core/ctcphandler.cpp" line="208"/>
         <source>Received CTCP VERSION answer from %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP VERSION cevabı alındı %1: %2</translation>
     </message>
     <message>
         <location filename="../src/core/ctcphandler.cpp" line="216"/>
@@ -2513,7 +2514,7 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="210"/>
         <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;Her kimlik için bir ident belirtmeniz gerekiyor&lt;/li&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="211"/>
@@ -2658,7 +2659,7 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="405"/>
         <source>Override default away reason for auto-away on detach</source>
-        <translation type="unfinished"></translation>
+        <translation>Ayrılırken otomatik dışarıda olma durumunda, öntanımlı dışarıda sebebini geçersiz kıl</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="420"/>
@@ -2768,7 +2769,7 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="601"/>
         <source>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</source>
-        <translation type="unfinished"></translation>
+        <translation>Çekirdeğinizin SSL Anahtar ve Sertifikasını düzenlemeniz için SSL Destekli bir İstemcinizin olması gerekiyor</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="630"/>
@@ -2804,7 +2805,7 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="811"/>
         <source>CommonName:</source>
-        <translation type="unfinished"></translation>
+        <translation>OrtakAd:</translation>
     </message>
 </context>
 <context>
@@ -3257,7 +3258,7 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="579"/>
         <source>Core Lag: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Çekirdek Gecikmesi: %1</translation>
     </message>
 </context>
 <context>
@@ -3301,7 +3302,7 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/qtui/settingspages/networkadddlg.ui" line="66"/>
         <source>Manual Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Manuel Ayarlar</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkadddlg.ui" line="74"/>
@@ -3466,7 +3467,7 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="52"/>
         <source>Mode Changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Kip Değişimi</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="53"/>
@@ -3521,27 +3522,27 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="66"/>
         <source>Finger</source>
-        <translation type="unfinished"></translation>
+        <translation>Finger</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="68"/>
         <source>Give Operator Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Operatör Yetkisi Ver</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="69"/>
         <source>Take Operator Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Operatör Yetkisini Al</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="70"/>
         <source>Give Voice</source>
-        <translation type="unfinished"></translation>
+        <translation>Voice Ver</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="71"/>
         <source>Take Voice</source>
-        <translation type="unfinished"></translation>
+        <translation>Voice Al</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="72"/>
@@ -3556,17 +3557,17 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="74"/>
         <source>Kick &amp;&amp; Ban</source>
-        <translation type="unfinished"></translation>
+        <translation>Kick &amp;&amp; Ban</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="76"/>
         <source>Hide Buffer(s) Temporarily</source>
-        <translation type="unfinished"></translation>
+        <translation>Arabellek(leri) Geçici Olarak Gizle</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="77"/>
         <source>Hide Buffer(s) Permanently</source>
-        <translation type="unfinished"></translation>
+        <translation>Arabellek(leri) Kalıcı Olarak Gizle</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="78"/>
@@ -3576,7 +3577,7 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="79"/>
         <source>Show Ignore List</source>
-        <translation type="unfinished"></translation>
+        <translation>Görmezden Gelinenlerin Listesini Göster</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="93"/>
@@ -3591,25 +3592,25 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="113"/>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Eylemler</translation>
     </message>
     <message numerus="yes">
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="519"/>
         <source>Do you want to delete the following buffer(s) permanently?</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>Aşağıdaki arabelleği kalıcı olarak silmek istiyor musunuz?</numerusform>
+            <numerusform>Aşağıdaki arabellekleri kalıcı olarak silmek istiyor musunuz?</numerusform>
         </translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="524"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; This will delete all related data, including all backlog data, from the core&apos;s database and cannot be undone.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Not:&lt;/b&gt; Bu işlem tüm backlog verileri de dahil olmak üzere tüm ilgili verileri çekirdeğinizin veritabanından silecek ve geri dönüşü yok.</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="526"/>
         <source>&lt;br&gt;Active channel buffers cannot be deleted, please part the channel first.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;Etkin kanal arabellekleri silinemez, lütfen önce kanaldan ayrılın.</translation>
     </message>
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="528"/>
@@ -3624,7 +3625,7 @@ Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificat
     <message>
         <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="603"/>
         <source>Input channel name:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -4310,7 +4311,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingsdlg.cpp" line="91"/>
         <source>Configure %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Yapılandır %1</translation>
     </message>
 </context>
 <context>
@@ -4348,7 +4349,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingspagedlg.cpp" line="36"/>
         <source>Configure %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Yapılandır %1</translation>
     </message>
 </context>
 <context>
@@ -4433,7 +4434,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/taskbarnotificationbackend.cpp" line="70"/>
         <source>Mark taskbar entry, timeout:</source>
-        <translation type="unfinished"></translation>
+        <translation>Görev çubuğu girdisini işaretle, zaman aşımı:</translation>
     </message>
     <message>
         <location filename="../src/qtui/taskbarnotificationbackend.cpp" line="75"/>
@@ -4487,17 +4488,17 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="340"/>
         <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 katıldı %DC%4%DC</translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="342"/>
         <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 ayrıldı %DC%4%DC</translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="346"/>
         <source>%Dq%DN%1%DN %DH(%2@%3)%DH has quit</source>
-        <translation type="unfinished"></translation>
+        <translation>%Dq%DN%1%DN %DH(%2@%3)%DH çıktı</translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="352"/>
@@ -4507,12 +4508,12 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="357"/>
         <source>%DrYou are now known as %DN%1%DN</source>
-        <translation type="unfinished"></translation>
+        <translation>%DrOlarak biliniyorsunuz %DN%1%DN</translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="358"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
-        <translation type="unfinished"></translation>
+        <translation>%Dr%DN%1%DN olarak biliniyor %DN%2%DN</translation>
     </message>
     <message>
         <location filename="../src/uisupport/uistyle.cpp" line="361"/>
@@ -4606,9 +4607,9 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message numerus="yes">
         <location filename="../src/client/networkmodel.cpp" line="645"/>
         <source>%n Operator(s)</source>
-        <translation>
+        <translation type="unfinished">
+            <numerusform>%n Operatör</numerusform>
             <numerusform>%n Operatör</numerusform>
-            <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
index e7e9e4d..f60f66c 100644 (file)
@@ -14,6 +14,7 @@ set(SOURCES
     buffersettings.cpp
     bufferviewoverlay.cpp
     client.cpp
+    clientaliasmanager.cpp
     clientbacklogmanager.cpp
     clientbufferviewconfig.cpp
     clientbufferviewmanager.cpp
@@ -22,6 +23,7 @@ set(SOURCES
     clientsettings.cpp
     clientsyncer.cpp
     clientuserinputhandler.cpp
+    execwrapper.cpp
     irclistmodel.cpp
     messagefilter.cpp
     messagemodel.cpp
@@ -35,6 +37,7 @@ set(MOC_HDRS
     buffermodel.h
     bufferviewoverlay.h
     client.h
+    clientaliasmanager.h
     clientbacklogmanager.h
     clientbufferviewconfig.h
     clientbufferviewmanager.h
@@ -43,6 +46,7 @@ set(MOC_HDRS
     clientirclisthelper.h
     clientuserinputhandler.h
     clientsyncer.h
+    execwrapper.h
     irclistmodel.h
     messagefilter.h
     messagemodel.h
index 3d43037..d04e258 100644 (file)
@@ -28,6 +28,7 @@
 #include "buffersyncer.h"
 #include "bufferviewconfig.h"
 #include "bufferviewoverlay.h"
+#include "clientaliasmanager.h"
 #include "clientbacklogmanager.h"
 #include "clientbufferviewmanager.h"
 #include "clientirclisthelper.h"
@@ -51,6 +52,11 @@ AccountId Client::_currentCoreAccount = 0;
 
 /*** Initialization/destruction ***/
 
+bool Client::instanceExists()
+{
+  return instanceptr;
+}
+
 Client *Client::instance() {
   if(!instanceptr)
     instanceptr = new Client();
@@ -77,11 +83,12 @@ Client::Client(QObject *parent)
     _networkModel(0),
     _bufferModel(0),
     _bufferSyncer(0),
+    _aliasManager(0),
     _backlogManager(new ClientBacklogManager(this)),
     _bufferViewManager(0),
     _bufferViewOverlay(new BufferViewOverlay(this)),
     _ircListHelper(new ClientIrcListHelper(this)),
-    _inputHandler(new ClientUserInputHandler(this)),
+    _inputHandler(0),
     _messageModel(0),
     _messageProcessor(0),
     _connectedToCore(false),
@@ -107,6 +114,7 @@ void Client::init() {
   _bufferModel = new BufferModel(_networkModel);
   _messageModel = mainUi()->createMessageModel(this);
   _messageProcessor = mainUi()->createMessageProcessor(this);
+  _inputHandler = new ClientUserInputHandler(this);
 
   SignalProxy *p = signalProxy();
 
@@ -268,9 +276,21 @@ void Client::coreIdentityRemoved(IdentityId id) {
   }
 }
 
-/***  ***/
+/*** User input handling ***/
+
 void Client::userInput(const BufferInfo &bufferInfo, const QString &message) {
-  inputHandler()->handleUserInput(bufferInfo, message);
+  // we need to make sure that AliasManager is ready before processing input
+  if(aliasManager() && aliasManager()->isInitialized())
+    inputHandler()->handleUserInput(bufferInfo, message);
+  else
+   instance()-> _userInputBuffer.append(qMakePair(bufferInfo, message));
+}
+
+void Client::sendBufferedUserInput() {
+  for(int i = 0; i < _userInputBuffer.count(); i++)
+    userInput(_userInputBuffer.at(i).first, _userInputBuffer.at(i).second);
+
+  _userInputBuffer.clear();
 }
 
 /*** core connection stuff ***/
@@ -305,6 +325,12 @@ void Client::setSyncedToCore() {
   connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(createDefaultBufferView()));
   connect(bufferViewManager(), SIGNAL(viewsInitialized()), this, SLOT(requestInitialBacklogBarrier()));
 
+  // create AliasManager
+  Q_ASSERT(!_aliasManager);
+  _aliasManager = new ClientAliasManager(this);
+  connect(aliasManager(), SIGNAL(initDone()), SLOT(sendBufferedUserInput()));
+  signalProxy()->synchronize(aliasManager());
+
   _syncedToCore = true;
   emit connected();
   emit coreConnectionStateChanged(true);
@@ -360,6 +386,14 @@ void Client::disconnectedFromCore() {
     _bufferViewManager = 0;
   }
 
+  if(_aliasManager) {
+    _aliasManager->deleteLater();
+    _aliasManager = 0;
+  }
+
+  // we probably don't want to save pending input for reconnect
+  _userInputBuffer.clear();
+
   _messageModel->clear();
   _networkModel->clear();
 
@@ -476,6 +510,12 @@ void Client::logMessage(QtMsgType type, const char *msg) {
     Quassel::logFatalMessage(msg);
   } else {
     QString msgString = QString("%1\n").arg(msg);
+
+    //Check to see if there is an instance around, else we risk recursions
+    //when calling instance() and creating new ones.
+    if (!instanceExists())
+      return;
+
     instance()->_debugLog << msgString;
     emit instance()->logUpdated(msgString);
   }
index ec4ab3a..0c9922a 100644 (file)
@@ -43,6 +43,7 @@ class NetworkModel;
 class BufferModel;
 class BufferSyncer;
 class BufferViewOverlay;
+class ClientAliasManager;
 class ClientBacklogManager;
 class ClientBufferViewManager;
 class ClientIrcListHelper;
@@ -62,6 +63,7 @@ public:
     RemoteCore
   };
 
+  static bool instanceExists();
   static Client *instance();
   static void destroy();
   static void init(AbstractUi *);
@@ -102,6 +104,7 @@ public:
   static inline AbstractMessageProcessor *messageProcessor() { return instance()->_messageProcessor; }
   static inline SignalProxy *signalProxy() { return instance()->_signalProxy; }
 
+  static inline ClientAliasManager *aliasManager() { return instance()->_aliasManager; }
   static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
   static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
   static inline ClientBufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
@@ -189,6 +192,8 @@ private slots:
   void requestInitialBacklogBarrier();
   void createDefaultBufferView();
 
+  void sendBufferedUserInput();
+
 private:
   Client(QObject *parent = 0);
   virtual ~Client();
@@ -205,6 +210,7 @@ private:
   NetworkModel * _networkModel;
   BufferModel * _bufferModel;
   BufferSyncer * _bufferSyncer;
+  ClientAliasManager *_aliasManager;
   ClientBacklogManager *_backlogManager;
   ClientBufferViewManager *_bufferViewManager;
   BufferViewOverlay *_bufferViewOverlay;
@@ -227,6 +233,8 @@ private:
   QString _debugLogBuffer;
   QTextStream _debugLog;
 
+  QList<QPair<BufferInfo, QString> > _userInputBuffer;
+
   friend class ClientSyncer;
 };
 
similarity index 82%
rename from dev-notes/obsolete/qtopia/qtopiauistyle.h
rename to src/client/clientaliasmanager.cpp
index 238937f..e8fc361 100644 (file)
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _QTOPIASTYLE_H_
-#define _QTOPIASTYLE_H_
+#include "clientaliasmanager.h"
 
-#include "uistyle.h"
+#include "client.h"
 
-class QtopiaUiStyle : public UiStyle {
+ClientAliasManager::ClientAliasManager(QObject *parent)
+  : AliasManager(parent)
+{
 
-  public:
-    QtopiaUiStyle();
-    virtual ~QtopiaUiStyle();
+}
 
-};
-
-#endif
+const Network *ClientAliasManager::network(NetworkId id) const {
+  return Client::network(id);
+}
similarity index 75%
rename from dev-notes/obsolete/qtopia/main.cpp
rename to src/client/clientaliasmanager.h
index 03c33c2..47ffe07 100644 (file)
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "qtopiamainwin.h"
-#include <qtopia/qtopiaapplication.h>
+#ifndef CLIENTALIASMANAGER_H
+#define CLIENTALIASMANAGER_H
 
-QTOPIA_ADD_APPLICATION("Quassel IRC", QtopiaMainWin)
-QTOPIA_MAIN
+#include "aliasmanager.h"
 
+class ClientAliasManager : public AliasManager {
+  Q_OBJECT
+
+public:
+  explicit ClientAliasManager(QObject *parent = 0);
+
+  inline virtual const QMetaObject *syncMetaObject() const { return &AliasManager::staticMetaObject; }
+
+protected:
+  const Network *network(NetworkId) const;
+
+};
+
+#endif //CLIENTALIASMANAGER_H
index 296fc1c..610a702 100644 (file)
 #include <QDateTime>
 
 #include "client.h"
+#include "clientaliasmanager.h"
 #include "clientuserinputhandler.h"
 #include "clientsettings.h"
+#include "execwrapper.h"
 #include "ircuser.h"
 #include "network.h"
 
-ClientUserInputHandler::ClientUserInputHandler(QObject *parent) : QObject(parent) {
+ClientUserInputHandler::ClientUserInputHandler(QObject *parent)
+: QObject(parent)
+{
   TabCompletionSettings s;
   s.notify("CompletionSuffix", this, SLOT(completionSuffixChanged(QVariant)));
   completionSuffixChanged(s.completionSuffix());
@@ -41,16 +45,28 @@ void ClientUserInputHandler::completionSuffixChanged(const QVariant &v) {
 
 // this would be the place for a client-side hook
 void ClientUserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QString &msg) {
-  // check if we addressed a user and update its timestamp in that case
-  if(bufferInfo.type() == BufferInfo::ChannelBuffer) {
-    if(!msg.startsWith('/')) {
-      if(_nickRx.indexIn(msg) == 0) {
-        const Network *net = Client::network(bufferInfo.networkId());
-        IrcUser *user = net ? net->ircUser(_nickRx.cap(1)) : 0;
-        if(user)
-          user->setLastSpokenTo(bufferInfo.bufferId(), QDateTime::currentDateTime().toUTC());
-      }
+
+  if(!msg.startsWith('/')) {
+    if(_nickRx.indexIn(msg) == 0) {
+      const Network *net = Client::network(bufferInfo.networkId());
+      IrcUser *user = net ? net->ircUser(_nickRx.cap(1)) : 0;
+      if(user)
+        user->setLastSpokenTo(bufferInfo.bufferId(), QDateTime::currentDateTime().toUTC());
     }
   }
-  emit sendInput(bufferInfo, msg);
+
+  AliasManager::CommandList clist = Client::aliasManager()->processInput(bufferInfo, msg);
+
+  for(int i = 0; i < clist.count(); i++) {
+    QString cmd = clist.at(i).second.section(' ', 0, 0).remove(0, 1).toUpper();
+    if(cmd == "EXEC")
+      handleExec(clist.at(i).first, clist.at(i).second.section(' ', 1));
+    else
+      emit sendInput(clist.at(i).first, clist.at(i).second);
+  }
+}
+
+void ClientUserInputHandler::handleExec(const BufferInfo &bufferInfo, const QString &execString) {
+  ExecWrapper *exec = new ExecWrapper(this); // gets suicidal when it's done
+  exec->start(bufferInfo, execString);
 }
index bc1b46c..21d2757 100644 (file)
@@ -38,6 +38,8 @@ signals:
 private slots:
   void completionSuffixChanged(const QVariant &);
 
+  void handleExec(const BufferInfo &bufferInfo, const QString &execStr);
+
 private:
   QRegExp _nickRx;
 };
diff --git a/src/client/execwrapper.cpp b/src/client/execwrapper.cpp
new file mode 100644 (file)
index 0000000..510a444
--- /dev/null
@@ -0,0 +1,126 @@
+/***************************************************************************
+*   Copyright (C) 2005-09 by the Quassel Project                          *
+*   devel@quassel-irc.org                                                 *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) version 3.                                           *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU General Public License     *
+*   along with this program; if not, write to the                         *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
+
+#include <QFile>
+
+#include "execwrapper.h"
+
+#include "client.h"
+#include "messagemodel.h"
+#include "quassel.h"
+
+ExecWrapper::ExecWrapper(QObject* parent) : QObject(parent) {
+  connect(&_process, SIGNAL(readyReadStandardOutput()), SLOT(processReadStdout()));
+  connect(&_process, SIGNAL(readyReadStandardError()), SLOT(processReadStderr()));
+  connect(&_process, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus)));
+  connect(&_process, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
+
+  connect(this, SIGNAL(output(QString)), SLOT(postStdout(QString)));
+  connect(this, SIGNAL(error(QString)), SLOT(postStderr(QString)));
+}
+
+void ExecWrapper::start(const BufferInfo &info, const QString &command) {
+  _bufferInfo = info;
+  QString params;
+
+  QRegExp rx("^\\s*(\\S+)(\\s+(.*))?$");
+  if(!rx.exactMatch(command)) {
+    emit error(tr("Invalid command string for /exec: %1").arg(command));
+  } else {
+    _scriptName = rx.cap(1);
+    params = rx.cap(3);
+  }
+
+  // Make sure we don't execute something outside a script dir
+  if(_scriptName.contains("../") || _scriptName.contains("..\\"))
+    emit error(tr("Name \"%1\" is invalid: ../ or ..\\ are not allowed!").arg(_scriptName));
+
+  else {
+    foreach(QString scriptDir, Quassel::scriptDirPaths()) {
+      QString fileName = scriptDir + _scriptName;
+      if(!QFile::exists(fileName))
+        continue;
+      _process.setWorkingDirectory(scriptDir);
+      _process.start('"' + fileName + "\" " + params);
+      return;
+    }
+    emit error(tr("Could not find script \"%1\"").arg(_scriptName));
+  }
+
+  deleteLater(); // self-destruct
+}
+
+void ExecWrapper::postStdout(const QString &msg) {
+  if(_bufferInfo.isValid())
+    Client::userInput(_bufferInfo, msg);
+}
+
+void ExecWrapper::postStderr(const QString &msg) {
+  if(_bufferInfo.isValid())
+    Client::messageModel()->insertErrorMessage(_bufferInfo, msg);
+}
+
+void ExecWrapper::processFinished(int exitCode, QProcess::ExitStatus status) {
+  if(status == QProcess::CrashExit) {
+    emit error(tr("Script \"%1\" crashed with exit code %2.").arg(_scriptName).arg(exitCode));
+  }
+
+  // empty buffers
+  if(!_stdoutBuffer.isEmpty())
+    foreach(QString msg, _stdoutBuffer.split('\n'))
+      emit output(msg);
+  if(!_stderrBuffer.isEmpty())
+    foreach(QString msg, _stderrBuffer.split('\n'))
+    emit error(msg);
+
+  deleteLater();
+}
+
+void ExecWrapper::processError(QProcess::ProcessError err) {
+  if(err == QProcess::FailedToStart)
+    emit error(tr("Script \"%1\" could not start.").arg(_scriptName));
+  else
+    emit error(tr("Script \"%1\" caused error %2.").arg(_scriptName).arg(err));
+
+  if(_process.state() != QProcess::Running)
+    deleteLater();
+}
+
+void ExecWrapper::processReadStdout() {
+  QString str = QTextCodec::codecForLocale()->toUnicode(_process.readAllStandardOutput());
+  str.replace(QRegExp("\r\n?"), "\n");
+  _stdoutBuffer.append(str);
+  int idx;
+  while((idx = _stdoutBuffer.indexOf('\n')) >= 0) {
+    emit output(_stdoutBuffer.left(idx));
+    _stdoutBuffer = _stdoutBuffer.mid(idx + 1);
+  }
+}
+
+void ExecWrapper::processReadStderr() {
+  QString str = QTextCodec::codecForLocale()->toUnicode(_process.readAllStandardError());
+  str.replace(QRegExp("\r\n?"), "\n");
+  _stderrBuffer.append(str);
+  int idx;
+  while((idx = _stderrBuffer.indexOf('\n')) >= 0) {
+    emit error(_stderrBuffer.left(idx));
+    _stderrBuffer = _stderrBuffer.mid(idx + 1);
+  }
+}
diff --git a/src/client/execwrapper.h b/src/client/execwrapper.h
new file mode 100644 (file)
index 0000000..e6d6dce
--- /dev/null
@@ -0,0 +1,58 @@
+/***************************************************************************
+*   Copyright (C) 2005-09 by the Quassel Project                          *
+*   devel@quassel-irc.org                                                 *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) version 3.                                           *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU General Public License     *
+*   along with this program; if not, write to the                         *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
+
+#ifndef EXECWRAPPER_H_
+#define EXECWRAPPER_H_
+
+#include <QProcess>
+
+#include "bufferinfo.h"
+
+class ExecWrapper : public QObject {
+  Q_OBJECT
+
+public:
+  ExecWrapper(QObject *parent = 0);
+
+public slots:
+  void start(const BufferInfo &info, const QString &command);
+
+signals:
+  void error(const QString &errorMsg);
+  void output(const QString &out);
+
+private slots:
+  void processReadStdout();
+  void processReadStderr();
+  void processFinished(int exitCode, QProcess::ExitStatus exitStatus);
+  void processError(QProcess::ProcessError);
+
+  void postStdout(const QString &);
+  void postStderr(const QString &);
+
+private:
+  QProcess _process;
+  BufferInfo _bufferInfo;
+  QString _scriptName;
+  QString _stdoutBuffer;
+  QString _stderrBuffer;
+};
+
+#endif
index 91eb769..58e3108 100644 (file)
@@ -348,6 +348,18 @@ void MessageModel::changeOfDay() {
   _nextDayChange = _nextDayChange.addSecs(86400);
 }
 
+void MessageModel::insertErrorMessage(BufferInfo bufferInfo, const QString &errorString) {
+  int idx = messageCount();
+  beginInsertRows(QModelIndex(), idx, idx);
+  Message msg(bufferInfo, Message::Error, errorString);
+  if(!messagesIsEmpty())
+    msg.setMsgId(messageItemAt(idx-1)->msgId());
+  else
+    msg.setMsgId(0);
+  insertMessage__(idx, msg);
+  endInsertRows();
+}
+
 void MessageModel::requestBacklog(BufferId bufferId) {
   if(_messagesWaiting.contains(bufferId))
     return;
index 0d540cd..b6b783f 100644 (file)
@@ -73,6 +73,7 @@ public slots:
   void requestBacklog(BufferId bufferId);
   void messagesReceived(BufferId bufferId, int count);
   void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
+  void insertErrorMessage(BufferInfo bufferInfo, const QString &errorString);
 
 protected:
 //   virtual MessageModelItem *createMessageModelItem(const Message &) = 0;
index c627e70..b398b8b 100644 (file)
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "aliasmanager.h"
 
 #include <QDebug>
 #include <QStringList>
 
+#include "aliasmanager.h"
+#include "network.h"
+
 AliasManager &AliasManager::operator=(const AliasManager &other) {
   if(this == &other)
     return *this;
-  
+
   SyncableObject::operator=(other);
   _aliases = other._aliases;
   return *this;
@@ -84,12 +86,106 @@ void AliasManager::addAlias(const QString &name, const QString &expansion) {
 AliasManager::AliasList AliasManager::defaults() {
   AliasList aliases;
   aliases << Alias("j", "/join $0")
-         << Alias("ns", "/msg nickserv $0")
-         << Alias("nickserv", "/msg nickserv $0")
-         << Alias("cs", "/msg chanserv $0")
-         << Alias("chanserv",  "/msg chanserv $0")
-         << Alias("hs", "/msg hostserv $0")
-         << Alias("hostserv", "/msg hostserv $0")
-         << Alias("back", "/quote away");
+          << Alias("ns", "/msg nickserv $0")
+          << Alias("nickserv", "/msg nickserv $0")
+          << Alias("cs", "/msg chanserv $0")
+          << Alias("chanserv",  "/msg chanserv $0")
+          << Alias("hs", "/msg hostserv $0")
+          << Alias("hostserv", "/msg hostserv $0")
+          << Alias("back", "/quote away");
+
+#ifdef Q_OS_LINUX
+  // let's add aliases for scripts that only run on linux
+  aliases << Alias("inxi", "/exec inxi $0")
+          << Alias("sysinfo", "/exec inxi -d");
+#endif
+
   return aliases;
 }
+
+AliasManager::CommandList AliasManager::processInput(const BufferInfo &info, const QString &msg) {
+  CommandList result;
+  processInput(info, msg, result);
+  return result;
+}
+
+void AliasManager::processInput(const BufferInfo &info, const QString &msg_, CommandList &list) {
+  QString msg = msg_;
+
+  // leading slashes indicate there's a command to call unless there is another one in the first section (like a path /proc/cpuinfo)
+  int secondSlashPos = msg.indexOf('/', 1);
+  int firstSpacePos = msg.indexOf(' ');
+  if(!msg.startsWith('/') || (secondSlashPos != -1 && (secondSlashPos < firstSpacePos || firstSpacePos == -1))) {
+    if(msg.startsWith("//"))
+      msg.remove(0, 1); // //asdf is transformed to /asdf
+    msg.prepend("/SAY ");  // make sure we only send proper commands to the core
+  } else {
+    // check for aliases
+    QString cmd = msg.section(' ', 0, 0).remove(0, 1).toUpper();
+    for(int i = 0; i < count(); i++) {
+      if((*this)[i].name.toUpper() == cmd) {
+        expand((*this)[i].expansion, info, msg.section(' ', 1), list);
+        return;
+      }
+    }
+  }
+
+  list.append(qMakePair(info, msg));
+}
+
+void AliasManager::expand(const QString &alias, const BufferInfo &bufferInfo, const QString &msg, CommandList &list) {
+  const Network *net = network(bufferInfo.networkId());
+  if(!net) {
+    // FIXME send error as soon as we have a method for that!
+    return;
+  }
+
+  QRegExp paramRangeR("\\$(\\d+)\\.\\.(\\d*)");
+  QStringList commands = alias.split(QRegExp("; ?"));
+  QStringList params = msg.split(' ');
+  QStringList expandedCommands;
+  for(int i = 0; i < commands.count(); i++) {
+    QString command = commands[i];
+
+    // replace ranges like $1..3
+    if(!params.isEmpty()) {
+      int pos;
+      while((pos = paramRangeR.indexIn(command)) != -1) {
+        int start = paramRangeR.cap(1).toInt();
+        bool ok;
+        int end = paramRangeR.cap(2).toInt(&ok);
+        if(!ok) {
+          end = params.count();
+        }
+        if(end < start)
+          command = command.replace(pos, paramRangeR.matchedLength(), QString());
+        else {
+          command = command.replace(pos, paramRangeR.matchedLength(), QStringList(params.mid(start - 1, end - start + 1)).join(" "));
+        }
+      }
+    }
+
+    for(int j = params.count(); j > 0; j--) {
+      IrcUser *ircUser = net->ircUser(params[j - 1]);
+      command = command.replace(QString("$%1:hostname").arg(j), ircUser ? ircUser->host() : QString("*"));
+      command = command.replace(QString("$%1").arg(j), params[j - 1]);
+    }
+    command = command.replace("$0", msg);
+    command = command.replace("$channelname", bufferInfo.bufferName()); // legacy
+    command = command.replace("$channel", bufferInfo.bufferName());
+    command = command.replace("$currentnick", net->myNick()); // legacy
+    command = command.replace("$nick", net->myNick());
+    expandedCommands << command;
+  }
+
+  while(!expandedCommands.isEmpty()) {
+    QString command;
+    if(expandedCommands[0].trimmed().toLower().startsWith("/wait")) {
+      command = expandedCommands.join("; ");
+      expandedCommands.clear();
+    } else {
+      command = expandedCommands.takeFirst();
+    }
+    list.append(qMakePair(bufferInfo, command));
+  }
+}
index cc936cd..c72f57d 100644 (file)
 #ifndef ALIASMANAGER_H
 #define ALIASMANAGER_H
 
+#include <QVariantMap>
+
+#include "bufferinfo.h"
 #include "syncableobject.h"
 
-#include <QVariantMap>
+class Network;
 
 class AliasManager : public SyncableObject {
   Q_OBJECT
@@ -31,7 +34,7 @@ class AliasManager : public SyncableObject {
 public:
   inline AliasManager(QObject *parent = 0) : SyncableObject(parent) { setAllowClientUpdates(true); }
   AliasManager &operator=(const AliasManager &other);
-  
+
   struct Alias {
     QString name;
     QString expansion;
@@ -45,24 +48,32 @@ public:
   inline int count() const { return _aliases.count(); }
   inline void removeAt(int index) { _aliases.removeAt(index); }
   inline Alias &operator[](int i) { return _aliases[i]; }
-  inline const Alias &operator[](int i) const { return _aliases[i]; }
+  inline const Alias &operator[](int i) const { return _aliases.at(i); }
   inline const AliasList &aliases() const { return _aliases; }
 
   static AliasList defaults();
 
+  typedef QList<QPair<BufferInfo, QString> > CommandList;
+
+  CommandList processInput(const BufferInfo &info, const QString &message);
+
 public slots:
   virtual QVariantMap initAliases() const;
   virtual void initSetAliases(const QVariantMap &aliases);
 
   virtual void addAlias(const QString &name, const QString &expansion);
-  
+
 protected:
   void setAliases(const QList<Alias> &aliases) { _aliases = aliases; }
+  virtual const Network *network(NetworkId) const = 0; // core and client require different access
 
 signals:
   void aliasAdded(const QString &name, const QString &expansion);
-  
+
 private:
+  void processInput(const BufferInfo &info, const QString &message, CommandList &previousCommands);
+  void expand(const QString &alias, const BufferInfo &bufferInfo, const QString &msg, CommandList &previousCommands);
+
   AliasList _aliases;
 
 };
index 39be78b..059ef35 100644 (file)
@@ -24,6 +24,8 @@
 #include <QString>
 #include <QFileInfo>
 
+#include <iostream>
+
 CliParser::CliParser() : AbstractCliParser() {
 
 }
@@ -148,7 +150,7 @@ bool CliParser::init(const QStringList &args) {
 }
 
 void CliParser::usage() {
-  qWarning() << "Usage:" << QFileInfo(argsRaw.at(0)).completeBaseName() << "[arguments]";
+  std::cout << "Usage: " << qPrintable(QFileInfo(argsRaw.at(0)).completeBaseName()) << " [arguments]" << std::endl;
 
   // get size of longName field
   QStringList keys = argsHash.keys();
@@ -184,7 +186,7 @@ void CliParser::usage() {
     if(arg.value().type == CliParserArg::CliArgOption && !arg.value().def.isNull()) {
       output.append(". Default is: ").append(arg.value().def);
     }
-    qWarning() << qPrintable(output);
+    std::cout << qPrintable(output) << std::endl;
   }
 }
 
index 97e7100..6aff6db 100644 (file)
@@ -84,7 +84,12 @@ int main(int argc, char **argv) {
   // put shared client&core arguments here
   cliParser->addSwitch("debug",'d', "Enable debug output");
   cliParser->addSwitch("help",'h', "Display this help and exit");
-  cliParser->addOption("configdir <path>", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL Cert");
+  cliParser->addSwitch("version", 'v', "Display version information");
+#ifdef BUILD_QTUI
+  cliParser->addOption("configdir <path>", 'c', "Specify the directory holding the client configuration");
+#else
+  cliParser->addOption("configdir <path>", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL certificate");
+#endif
   cliParser->addOption("datadir <path>", 0, "DEPRECATED - Use --configdir instead");
 
 #ifndef BUILD_CORE
index 50651bd..4be4db1 100644 (file)
@@ -20,6 +20,7 @@
 
 #include "quassel.h"
 
+#include <iostream>
 #include <signal.h>
 
 #include <QCoreApplication>
@@ -84,6 +85,11 @@ bool Quassel::init() {
     return false;
   }
 
+  if(isOptionSet("version")) {
+    std::cout << qPrintable("Quassel IRC: " + Quassel::buildInfo().plainVersionString) << std::endl;
+    return false;
+  }
+
   DEBUG = isOptionSet("debug");
   return true;
 }
@@ -336,6 +342,13 @@ QString Quassel::findDataFilePath(const QString &fileName) {
   return QString();
 }
 
+QStringList Quassel::scriptDirPaths() {
+  QStringList res(configDirPath() + "scripts/");
+  foreach(QString path, dataDirPaths())
+    res << path + "scripts/";
+  return res;
+}
+
 QString Quassel::translationDirPath() {
   if(_translationDirPath.isEmpty()) {
     // We support only one translation dir; fallback mechanisms wouldn't work else.
index 7e78f73..53d9e0b 100644 (file)
@@ -84,6 +84,12 @@ public:
 
   static QString translationDirPath();
 
+  //! Returns a list of directories we look for scripts in
+  /** We look for a subdirectory named "scripts" in the configdir and in all datadir paths.
+  *   \return A list of directory paths containing executable scripts for /exec
+  */
+  static QStringList scriptDirPaths();
+
   static void loadTranslation(const QLocale &locale);
 
   static inline void setCliParser(AbstractCliParser *cliParser);
index 003f6da..5678429 100644 (file)
@@ -668,7 +668,13 @@ void Core::setupInternalClientSession(SignalProxy *proxy) {
     setupCoreForInternalUsage();
   }
 
-  UserId uid = _storage->internalUser();
+  UserId uid;
+  if(_storage) {
+    uid = _storage->internalUser();
+  } else {
+    qWarning() << "Core::setupInternalClientSession(): You're trying to run monolithic Quassel with an unusable Backend! Go fix it!";
+    return;
+  }
 
   // Find or create session for validated user
   SessionThread *sess;
index 78044db..b1e7f2f 100644 (file)
@@ -21,6 +21,7 @@
 #include "corealiasmanager.h"
 
 #include "core.h"
+#include "corenetwork.h"
 #include "coresession.h"
 
 CoreAliasManager::CoreAliasManager(CoreSession *parent)
@@ -33,13 +34,11 @@ CoreAliasManager::CoreAliasManager(CoreSession *parent)
     return;
   }
 
-  QVariantMap aliases = Core::getUserSetting(session->user(), "Aliases").toMap();
   initSetAliases(Core::getUserSetting(session->user(), "Aliases").toMap());
   if(isEmpty())
     loadDefaults();
 }
 
-
 CoreAliasManager::~CoreAliasManager() {
   CoreSession *session = qobject_cast<CoreSession *>(parent());
   if(!session) {
@@ -50,6 +49,9 @@ CoreAliasManager::~CoreAliasManager() {
   Core::setUserSetting(session->user(), "Aliases", initAliases());
 }
 
+const Network *CoreAliasManager::network(NetworkId id) const {
+  return qobject_cast<CoreSession *>(parent())->network(id);
+}
 
 void CoreAliasManager::loadDefaults() {
   foreach(Alias alias, AliasManager::defaults()) {
index ab2c1e5..d5739c6 100644 (file)
@@ -29,14 +29,17 @@ class CoreAliasManager : public AliasManager {
   Q_OBJECT
 
 public:
-  CoreAliasManager(CoreSession *parent = 0);
+  explicit CoreAliasManager(CoreSession *parent);
   ~CoreAliasManager();
 
   inline virtual const QMetaObject *syncMetaObject() const { return &AliasManager::staticMetaObject; }
 
+protected:
+  const Network *network(NetworkId) const;
+
 private:
   void loadDefaults();
-  
+
 };
 
 #endif //COREALIASMANAGER_H
index 5fd5ed9..b1278ca 100644 (file)
@@ -192,6 +192,7 @@ void CoreNetwork::disconnectFromIrc(bool requested, const QString &reason, bool
     _autoReconnectCount = 0; // prohibiting auto reconnect
   }
   disablePingTimeout();
+  _msgQueue.clear();
 
   IrcUser *me_ = me();
   if(me_) {
@@ -327,10 +328,10 @@ void CoreNetwork::socketInitialized() {
   }
 
   // TokenBucket to avoid sending too much at once
-  _messagesPerSecond = 1;
+  _messageDelay = 2200;    // this seems to be a safe value (2.2 seconds delay)
   _burstSize = 5;
-  _tokenBucket = 5; // init with a full bucket
-  _tokenBucketTimer.start(_messagesPerSecond * 1000);
+  _tokenBucket = _burstSize; // init with a full bucket
+  _tokenBucketTimer.start(_messageDelay);
 
   if(!server.password.isEmpty()) {
     putRawLine(serverEncode(QString("PASS %1").arg(server.password)));
@@ -348,6 +349,7 @@ void CoreNetwork::socketInitialized() {
 
 void CoreNetwork::socketDisconnected() {
   disablePingTimeout();
+  _msgQueue.clear();
 
   _autoWhoCycleTimer.stop();
   _autoWhoTimer.stop();
@@ -525,6 +527,10 @@ void CoreNetwork::doAutoReconnect() {
 
 void CoreNetwork::sendPing() {
   uint now = QDateTime::currentDateTime().toTime_t();
+  if(_pingCount != 0) {
+    qDebug() << "UserId:" << userId() << "Network:" << networkName() << "missed" << _pingCount << "pings."
+            << "BA:" << socket.bytesAvailable() << "BTW:" << socket.bytesToWrite();
+  }
   if(_pingCount >= _maxPingCount && now - _lastPingTime <= (uint)(_pingTimer.interval() / 1000) + 1) {
     // the second check compares the actual elapsed time since the last ping and the pingTimer interval
     // if the interval is shorter then the actual elapsed time it means that this thread was somehow blocked
index dbb8a5e..d7ebd44 100644 (file)
@@ -194,7 +194,7 @@ private:
   QTimer _autoWhoTimer, _autoWhoCycleTimer;
 
   QTimer _tokenBucketTimer;
-  int _messagesPerSecond;   // token refill speed
+  int _messageDelay;        // token refill speed in ms
   int _burstSize;           // size of the token bucket
   int _tokenBucket;         // the virtual bucket that holds the tokens
   QList<QByteArray> _msgQueue;
index bd1e089..13aa8c9 100644 (file)
@@ -1067,7 +1067,7 @@ bool PostgreSqlStorage::mergeBuffersPermanently(const UserId &user, const Buffer
   }
 
   QSqlQuery checkQuery(db);
-  checkQuery.prepare("SELECT count(*) FROM buffer"
+  checkQuery.prepare("SELECT count(*) FROM buffer "
                     "WHERE userid = :userid AND bufferid IN (:buffer1, :buffer2)");
   checkQuery.bindValue(":userid", user.toInt());
   checkQuery.bindValue(":buffer1", bufferId1.toInt());
index fcc52ad..6b795f2 100644 (file)
@@ -152,53 +152,71 @@ void SqliteStorage::renameUser(UserId user, const QString &newName) {
 }
 
 UserId SqliteStorage::validateUser(const QString &user, const QString &password) {
-  QSqlQuery query(logDb());
-  query.prepare(queryString("select_authuser"));
-  query.bindValue(":username", user);
-  query.bindValue(":password", cryptedPassword(password));
-
-  lockForRead();
-  safeExec(query);
-
-  if(query.first()) {
-    unlock();
-    return query.value(0).toInt();
-  } else {
-    unlock();
-    return 0;
+  UserId userId;
+
+  // this scope ensures that the query is freed in sqlite before we call unlock()
+  // this ensures that our thread doesn't hold a internal after unlock is called
+  // (see sqlites doc on implicit locking for details)
+  {
+    QSqlQuery query(logDb());
+    query.prepare(queryString("select_authuser"));
+    query.bindValue(":username", user);
+    query.bindValue(":password", cryptedPassword(password));
+
+    lockForRead();
+    safeExec(query);
+
+    if(query.first()) {
+      userId = query.value(0).toInt();
+    }
   }
+  unlock();
+
+  return userId;
 }
 
 UserId SqliteStorage::getUserId(const QString &username) {
-  QSqlQuery query(logDb());
-  query.prepare(queryString("select_userid"));
-  query.bindValue(":username", username);
+  UserId userId;
 
-  lockForRead();
-  safeExec(query);
+  // this scope ensures that the query is freed in sqlite before we call unlock()
+  // this ensures that our thread doesn't hold a internal after unlock is called
+  // (see sqlites doc on implicit locking for details)
+  {
+    QSqlQuery query(logDb());
+    query.prepare(queryString("select_userid"));
+    query.bindValue(":username", username);
 
-  if(query.first()) {
-    unlock();
-    return query.value(0).toInt();
-  } else {
-    unlock();
-    return 0;
+    lockForRead();
+    safeExec(query);
+
+    if(query.first()) {
+      userId = query.value(0).toInt();
+    }
   }
+  unlock();
+
+  return userId;
 }
 
 UserId SqliteStorage::internalUser() {
-  QSqlQuery query(logDb());
-  query.prepare(queryString("select_internaluser"));
-  lockForRead();
-  safeExec(query);
-
-  if(query.first()) {
-    unlock();
-    return query.value(0).toInt();
-  } else {
-    unlock();
-    return 0;
+  UserId userId;
+
+  // this scope ensures that the query is freed in sqlite before we call unlock()
+  // this ensures that our thread doesn't hold a internal after unlock is called
+  // (see sqlites doc on implicit locking for details)
+  {
+    QSqlQuery query(logDb());
+    query.prepare(queryString("select_internaluser"));
+    lockForRead();
+    safeExec(query);
+
+    if(query.first()) {
+      userId = query.value(0).toInt();
+    }
   }
+  unlock();
+
+  return userId;
 }
 
 void SqliteStorage::delUser(UserId user) {
@@ -442,7 +460,7 @@ QList<CoreIdentity> SqliteStorage::identities(UserId user) {
   QList<CoreIdentity> identities;
   QSqlDatabase db = logDb();
   db.transaction();
-  
+
   QSqlQuery query(db);
   query.prepare(queryString("select_identities"));
   query.bindValue(":userid", user.toInt());
@@ -498,7 +516,7 @@ NetworkId SqliteStorage::createNetwork(UserId user, const NetworkInfo &info) {
 
   QSqlDatabase db = logDb();
   db.transaction();
-  
+
   QSqlQuery query(db);
   query.prepare(queryString("insert_network"));
   query.bindValue(":userid", user.toInt());
@@ -526,7 +544,7 @@ NetworkId SqliteStorage::createNetwork(UserId user, const NetworkInfo &info) {
       return NetworkId();
     }
   }
-  
+
   db.commit();
   unlock();
   return networkId;
@@ -741,7 +759,7 @@ QList<NetworkId> SqliteStorage::connectedNetworks(UserId user) {
 
   QSqlDatabase db = logDb();
   db.transaction();
-  
+
   QSqlQuery query(db);
   query.prepare(queryString("select_connected_networks"));
   query.bindValue(":userid", user.toInt());
@@ -1236,7 +1254,7 @@ bool SqliteStorage::logMessages(MessageList &msgs) {
   QSqlDatabase db = logDb();
   db.transaction();
 
-  QSet<QString> senders;  
+  QSet<QString> senders;
 
   QSqlQuery addSenderQuery(db);
   addSenderQuery.prepare(queryString("insert_sender"));
index 8fe87b0..1cac5aa 100644 (file)
@@ -33,23 +33,17 @@ UserInputHandler::UserInputHandler(CoreNetwork *parent)
 {
 }
 
-void UserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QString &msg_) {
-  if(msg_.isEmpty())
+void UserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QString &msg) {
+  if(msg.isEmpty())
     return;
-  QString cmd;
-  QString msg = msg_;
-  // leading slashes indicate there's a command to call unless there is another one in the first section (like a path /proc/cpuinfo)
-  int secondSlashPos = msg.indexOf('/', 1);
-  int firstSpacePos = msg.indexOf(' ');
-  if(!msg.startsWith('/') || (secondSlashPos != -1 && (secondSlashPos < firstSpacePos || firstSpacePos == -1))) {
-    if(msg.startsWith("//"))
-      msg.remove(0, 1); // //asdf is transformed to /asdf
-    cmd = QString("SAY");
-  } else {
-    cmd = msg.section(' ', 0, 0).remove(0, 1).toUpper();
-    msg = msg.section(' ', 1);
+
+  AliasManager::CommandList list = coreSession()->aliasManager().processInput(bufferInfo, msg);
+
+  for(int i = 0; i < list.count(); i++) {
+    QString cmd = list.at(i).second.section(' ', 0, 0).remove(0, 1).toUpper();
+    QString payload = list.at(i).second.section(' ', 1);
+    handle(cmd, Q_ARG(BufferInfo, list.at(i).first), Q_ARG(QString, payload));
   }
-  handle(cmd, Q_ARG(BufferInfo, bufferInfo), Q_ARG(QString, msg));
 }
 
 // ====================
@@ -392,65 +386,10 @@ void UserInputHandler::handleWhowas(const BufferInfo &bufferInfo, const QString
 }
 
 void UserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo, const QString &msg) {
-  for(int i = 0; i < coreSession()->aliasManager().count(); i++) {
-    if(coreSession()->aliasManager()[i].name.toLower() == cmd.toLower()) {
-      expand(coreSession()->aliasManager()[i].expansion, bufferInfo, msg);
-      return;
-    }
-  }
+  Q_UNUSED(bufferInfo);
   emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", QString("Error: %1 %2").arg(cmd, msg));
 }
 
-void UserInputHandler::expand(const QString &alias, const BufferInfo &bufferInfo, const QString &msg) {
-  QRegExp paramRangeR("\\$(\\d+)\\.\\.(\\d*)");
-  QStringList commands = alias.split(QRegExp("; ?"));
-  QStringList params = msg.split(' ');
-  QStringList expandedCommands;
-  for(int i = 0; i < commands.count(); i++) {
-    QString command = commands[i];
-
-    // replace ranges like $1..3
-    if(!params.isEmpty()) {
-      int pos;
-      while((pos = paramRangeR.indexIn(command)) != -1) {
-       int start = paramRangeR.cap(1).toInt();
-       bool ok;
-       int end = paramRangeR.cap(2).toInt(&ok);
-       if(!ok) {
-         end = params.count();
-       }
-       if(end < start)
-         command = command.replace(pos, paramRangeR.matchedLength(), QString());
-       else {
-         command = command.replace(pos, paramRangeR.matchedLength(), QStringList(params.mid(start - 1, end - start + 1)).join(" "));
-       }
-      }
-    }
-
-    for(int j = params.count(); j > 0; j--) {
-      IrcUser *ircUser = network()->ircUser(params[j - 1]);
-      command = command.replace(QString("$%1:hostname").arg(j), ircUser ? ircUser->host() : QString("*"));
-      command = command.replace(QString("$%1").arg(j), params[j - 1]);
-    }
-    command = command.replace("$0", msg);
-    command = command.replace("$channelname", bufferInfo.bufferName());
-    command = command.replace("$currentnick", network()->myNick());
-    expandedCommands << command;
-  }
-
-  while(!expandedCommands.isEmpty()) {
-    QString command;
-    if(expandedCommands[0].trimmed().toLower().startsWith("/wait")) {
-      command = expandedCommands.join("; ");
-      expandedCommands.clear();
-    } else {
-      command = expandedCommands.takeFirst();
-    }
-    handleUserInput(bufferInfo, command);
-  }
-}
-
-
 void UserInputHandler::putPrivmsg(const QByteArray &target, const QByteArray &message) {
   static const char *cmd = "PRIVMSG";
   int overrun = lastParamOverrun(cmd, QList<QByteArray>() << message);
index 5df2686..2d20725 100644 (file)
@@ -73,7 +73,6 @@ protected:
   void timerEvent(QTimerEvent *event);
 
 private:
-  void expand(const QString &alias, const BufferInfo &bufferInfo, const QString &msg);
   void banOrUnban(const BufferInfo &bufferInfo, const QString &text, bool ban);
   void putPrivmsg(const QByteArray &target, const QByteArray &message);
   int lastParamOverrun(const QString &cmd, const QList<QByteArray> &params);
index 934fadf..dd23c5c 100644 (file)
@@ -413,7 +413,7 @@ void ContentsChatItem::doLayout(QTextLayout *layout) const {
 QList<ContentsChatItem::Clickable> ContentsChatItem::findClickables() const {
   // For matching URLs
   static QString urlEnd("(?:>|[,.;:\"]*\\s|\\b|$)");
-  static QString urlChars("(?:[,.;:]*[\\w\\-~@/?&=+$()!%#*|{}\\[\\]])");
+  static QString urlChars("(?:[,.;:]*[\\w\\-~@/?&=+$()!%#*|{}\\[\\]'])");
 
   static QRegExp regExp[] = {
     // URL
index 71f124c..737387f 100644 (file)
@@ -62,7 +62,7 @@ void InputWidget::setCustomFont(const QVariant &v) {
   QFont font = v.value<QFont>();
   if(font.family().isEmpty())
     font = QApplication::font();
-  ui.inputEdit->setFont(font);
+  ui.inputEdit->setCustomFont(font);
 }
 
 void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
index 99fe6d5..5a484fe 100644 (file)
@@ -240,7 +240,7 @@ void MainWin::setupActions() {
   connect(lockAct, SIGNAL(toggled(bool)), SLOT(on_actionLockLayout_toggled(bool)));
 
   coll->addAction("ToggleSearchBar", new Action(SmallIcon("edit-find"), tr("Show &Search Bar"), coll,
-                                               0, 0, tr("Ctrl+F")))->setCheckable(true);
+                                               0, 0, QKeySequence::Find))->setCheckable(true);
   coll->addAction("ShowAwayLog", new Action(tr("Show Away Log"), coll,
                                            this, SLOT(showAwayLog())));
   coll->addAction("ToggleStatusBar", new Action(tr("Show Status &Bar"), coll,
index c1ed4aa..2efdf72 100644 (file)
@@ -21,7 +21,6 @@
 #include "qtui.h"
 
 #include "abstractnotificationbackend.h"
-#include "actioncollection.h"
 #include "chatlinemodel.h"
 #include "contextmenuactionprovider.h"
 #include "mainwin.h"
@@ -32,7 +31,6 @@
 #include "types.h"
 #include "util.h"
 
-QHash<QString, ActionCollection *> QtUi::_actionCollections;
 QPointer<QtUi> QtUi::_instance = 0;
 QPointer<MainWin> QtUi::_mainWin = 0;
 QList<AbstractNotificationBackend *> QtUi::_notificationBackends;
@@ -55,6 +53,8 @@ QtUi::QtUi() : GraphicalUi() {
   _mainWin = new MainWin();
   _style = new QtUiStyle;
 
+  setMainWidget(_mainWin);
+
   connect(_mainWin, SIGNAL(connectToCore(const QVariantMap &)), this, SIGNAL(connectToCore(const QVariantMap &)));
   connect(_mainWin, SIGNAL(disconnectFromCore()), this, SIGNAL(disconnectFromCore()));
 }
@@ -69,15 +69,6 @@ void QtUi::init() {
   _mainWin->init();
 }
 
-ActionCollection *QtUi::actionCollection(const QString &category) {
-  if(_actionCollections.contains(category))
-    return _actionCollections.value(category);
-  ActionCollection *coll = new ActionCollection(mainWindow());
-  coll->addAssociatedWidget(mainWindow());
-  _actionCollections.insert(category, coll);
-  return coll;
-}
-
 MessageModel *QtUi::createMessageModel(QObject *parent) {
   return new ChatLineModel(parent);
 }
index 77916ce..1e2144c 100644 (file)
@@ -26,7 +26,6 @@
 #include "abstractnotificationbackend.h"
 #include "mainwin.h"
 
-class ActionCollection;
 class MainWin;
 class MessageModel;
 class QtUiMessageProcessor;
@@ -50,13 +49,6 @@ public:
   inline static QtUiStyle *style();
   inline static MainWin *mainWindow();
 
-  //! Access global ActionCollections.
-  /** These ActionCollections are associated with the main window, i.e. they contain global
-   *  actions (and thus, shortcuts). Widgets providing application-wide shortcuts should
-   *  create appropriate Action objects using QtUi::actionCollection(cat)->add\<Action\>().
-   *  @param category The category (default: "General")
-   */
-  static ActionCollection *actionCollection(const QString &category = "General");
 
   /* Notifications */
 
@@ -80,7 +72,6 @@ protected slots:
 private:
   static QPointer<QtUi> _instance;
   static QPointer<MainWin> _mainWin;
-  static QHash<QString, ActionCollection *> _actionCollections;
   static QtUiStyle *_style;
   static QList<AbstractNotificationBackend *> _notificationBackends;
   static QList<AbstractNotificationBackend::Notification> _notifications;
index f260fb0..d1db2ce 100644 (file)
@@ -95,8 +95,15 @@ void SettingsDlg::selectPage(SettingsPage *sp) {
   }
 
   if(sp != currentPage()) {
-    ui.pageTitle->setText(sp->title());
-    setWindowTitle(tr("Configure %1").arg(sp->title()));
+    if(sp->title().isEmpty()) {
+      ui.pageTitle->setText(sp->category());
+      setWindowTitle(tr("Configure %1").arg(sp->category()));
+    }
+    else {
+      ui.pageTitle->setText(sp->title());
+      setWindowTitle(tr("Configure %1").arg(sp->title()));
+    }
+
     ui.settingsStack->setCurrentWidget(sp);
     _currentPage = sp;
   }
index 251e9e2..416414d 100644 (file)
 
 AliasesModel::AliasesModel(QObject *parent)
   : QAbstractItemModel(parent),
-    _configChanged(false)
+    _configChanged(false),
+    _modelReady(false)
 {
   // we need this signal for future connects to reset the data;
   connect(Client::instance(), SIGNAL(connected()), this, SLOT(clientConnected()));
   connect(Client::instance(), SIGNAL(disconnected()), this, SLOT(clientDisconnected()));
+
   if(Client::isConnected())
     clientConnected();
   else
@@ -40,6 +42,9 @@ AliasesModel::AliasesModel(QObject *parent)
 }
 
 QVariant AliasesModel::data(const QModelIndex &index, int role) const {
+  if(!_modelReady)
+    return QVariant();
+
   if(!index.isValid() || index.row() >= rowCount() || index.column() >= columnCount())
     return QVariant();
 
@@ -58,8 +63,8 @@ QVariant AliasesModel::data(const QModelIndex &index, int role) const {
        " - <b>$i..</b> represents all parameters from i on separated by spaces.<br />"
        " - <b>$i:hostname</b> represents the hostname of the user identified by the i'th parameter or a * if unknown.<br />"
        " - <b>$0</b> the whole string.<br />"
-       " - <b>$currentnick</b> your current nickname<br />"
-       " - <b>$channelname</b> the name of the selected channel<br /><br />"
+       " - <b>$nick</b> your current nickname<br />"
+       " - <b>$channel</b> the name of the selected channel<br /><br />"
        "Multiple commands can be separated with semicolons<br /><br />"
        "<b>Example:</b> \"Test $1; Test $2; Test All $0\" will be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test All 1 2 3\" when called like /test 1 2 3";
     default:
@@ -81,13 +86,16 @@ QVariant AliasesModel::data(const QModelIndex &index, int role) const {
 }
 
 bool AliasesModel::setData(const QModelIndex &index, const QVariant &value, int role) {
+  if(!_modelReady)
+    return false;
+
   if(!index.isValid() || index.row() >= rowCount() || index.column() >= columnCount() || role != Qt::EditRole)
     return false;
 
   QString newValue = value.toString();
   if(newValue.isEmpty())
     return false;
-  
+
   switch(index.column()) {
   case 0:
     if(aliasManager().contains(newValue)) {
@@ -118,6 +126,9 @@ void AliasesModel::newAlias() {
 }
 
 void AliasesModel::loadDefaults() {
+  if(!_modelReady)
+    return;
+
   AliasManager &manager = cloneAliasManager();
 
   if(!manager.isEmpty()) {
@@ -157,8 +168,8 @@ Qt::ItemFlags AliasesModel::flags(const QModelIndex &index) const {
 QVariant AliasesModel::headerData(int section, Qt::Orientation orientation, int role) const {
   QStringList header;
   header << tr("Alias")
-        << tr("Expansion");
-  
+         << tr("Expansion");
+
   if(orientation == Qt::Horizontal && role == Qt::DisplayRole)
     return header[section];
 
@@ -178,19 +189,19 @@ const AliasManager &AliasesModel::aliasManager() const {
   if(_configChanged)
     return _clonedAliasManager;
   else
-    return _aliasManager;
+    return *Client::aliasManager();
 }
 
 AliasManager &AliasesModel::aliasManager() {
   if(_configChanged)
     return _clonedAliasManager;
   else
-    return _aliasManager;
+    return *Client::aliasManager();
 }
 
 AliasManager &AliasesModel::cloneAliasManager() {
   if(!_configChanged) {
-    _clonedAliasManager = _aliasManager;
+    _clonedAliasManager = *Client::aliasManager();
     _configChanged = true;
     emit configChanged(true);
   }
@@ -200,7 +211,7 @@ AliasManager &AliasesModel::cloneAliasManager() {
 void AliasesModel::revert() {
   if(!_configChanged)
     return;
-  
+
   _configChanged = false;
   emit configChanged(false);
   reset();
@@ -210,26 +221,28 @@ void AliasesModel::commit() {
   if(!_configChanged)
     return;
 
-  _aliasManager.requestUpdate(_clonedAliasManager.toVariantMap());
+  Client::aliasManager()->requestUpdate(_clonedAliasManager.toVariantMap());
   revert();
-}  
+}
 
 void AliasesModel::initDone() {
+  _modelReady = true;
   reset();
   emit modelReady(true);
 }
 
 void AliasesModel::clientConnected() {
-  _aliasManager = AliasManager();
-  Client::signalProxy()->synchronize(&_aliasManager);
-  connect(&_aliasManager, SIGNAL(initDone()), this, SLOT(initDone()));
-  connect(&_aliasManager, SIGNAL(updated(const QVariantMap &)), this, SLOT(revert()));
+  connect(Client::aliasManager(), SIGNAL(updated(QVariantMap)), SLOT(revert()));
+  if(Client::aliasManager()->isInitialized())
+    initDone();
+  else
+    connect(Client::aliasManager(), SIGNAL(initDone()), SLOT(initDone()));
 }
 
 void AliasesModel::clientDisconnected() {
-  // clear alias managers
-  _aliasManager = AliasManager();
-  _clonedAliasManager = AliasManager();
+  // clear
+  _clonedAliasManager = ClientAliasManager();
+  _modelReady = false;
   reset();
   emit modelReady(false);
 }
index c2b8b2e..74a0cfd 100644 (file)
@@ -24,7 +24,7 @@
 #include <QAbstractItemModel>
 #include <QPointer>
 
-#include "aliasmanager.h"
+#include "clientaliasmanager.h"
 
 class AliasesModel : public QAbstractItemModel {
   Q_OBJECT
@@ -43,10 +43,11 @@ public:
 
   inline QModelIndex parent(const QModelIndex &) const { return QModelIndex(); }
 
-  inline int rowCount(const QModelIndex &parent = QModelIndex()) const { Q_UNUSED(parent) return aliasManager().count(); }
-  inline int columnCount(const QModelIndex &parent = QModelIndex()) const { Q_UNUSED(parent) return 2; }
+  inline int rowCount(const QModelIndex &parent = QModelIndex()) const;
+  inline int columnCount(const QModelIndex &parent = QModelIndex()) const;
 
   inline bool configChanged() const { return _configChanged; }
+  inline bool isReady() const { return _modelReady; }
 
 public slots:
   void newAlias();
@@ -58,11 +59,11 @@ public slots:
 signals:
   void configChanged(bool);
   void modelReady(bool);
-  
+
 private:
-  AliasManager _aliasManager;
-  AliasManager _clonedAliasManager;
+  ClientAliasManager _clonedAliasManager;
   bool _configChanged;
+  bool _modelReady;
 
   const AliasManager &aliasManager() const;
   AliasManager &aliasManager();
@@ -74,4 +75,16 @@ private slots:
   void initDone();
 };
 
+// Inlines
+int AliasesModel::rowCount(const QModelIndex &parent) const {
+  Q_UNUSED(parent);
+  return isReady() ? aliasManager().count() : 0;
+}
+
+int AliasesModel::columnCount(const QModelIndex &parent) const {
+  Q_UNUSED(parent);
+  return isReady() ? 2 : 0;
+}
+    
+
 #endif //ALIASESMODEL_H
index 1b35fb0..8ffd30a 100644 (file)
@@ -45,6 +45,8 @@ AliasesSettingsPage::AliasesSettingsPage(QWidget *parent)
   connect(ui.deleteAliasButton, SIGNAL(clicked()), this, SLOT(deleteSelectedAlias()));
   connect(&_aliasesModel, SIGNAL(configChanged(bool)), this, SLOT(setChangedState(bool)));
   connect(&_aliasesModel, SIGNAL(modelReady(bool)), this, SLOT(enableDialog(bool)));
+
+  enableDialog(_aliasesModel.isReady());
 }
 
 void AliasesSettingsPage::load() {
@@ -64,6 +66,7 @@ void AliasesSettingsPage::save() {
 void AliasesSettingsPage::enableDialog(bool enabled) {
   ui.newAliasButton->setEnabled(enabled);
   ui.deleteAliasButton->setEnabled(enabled);
+  setEnabled(enabled);
 }
 
 void AliasesSettingsPage::deleteSelectedAlias() {
index c6a8b45..9a69912 100644 (file)
@@ -33,7 +33,8 @@
 #include <QStyleFactory>
 
 AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Appearance"), QString(), parent)
+  : SettingsPage(tr("Appearance"), QString(), parent),
+  _fontsChanged(false)
 {
   ui.setupUi(this);
   initStyleComboBox();
@@ -88,6 +89,10 @@ void AppearanceSettingsPage::defaults() {
 
   loadFonts(Settings::Default);
   _fontsChanged = true;
+
+  ui.showWebPreview->setChecked(true);
+  ui.showUserStateIcons->setChecked(true);
+
   widgetHasChanged();
 }
 
@@ -95,13 +100,14 @@ void AppearanceSettingsPage::load() {
   QtUiSettings uiSettings;
 
   // Gui Style
-  settings["Style"] = uiSettings.value("Style", QString(""));
-  if(settings["Style"].toString() == "") {
+  QString style = uiSettings.value("Style", QString("")).toString();
+  if(style.isEmpty()) {
     ui.styleComboBox->setCurrentIndex(0);
   } else {
-    ui.styleComboBox->setCurrentIndex(ui.styleComboBox->findText(settings["Style"].toString(), Qt::MatchExactly));
-    QApplication::setStyle(settings["Style"].toString());
+    ui.styleComboBox->setCurrentIndex(ui.styleComboBox->findText(style, Qt::MatchExactly));
+    QApplication::setStyle(style);
   }
+  ui.styleComboBox->setProperty("storedValue", ui.styleComboBox->currentIndex());
 
   // Language
   QLocale locale = uiSettings.value("Locale", QLocale::system()).value<QLocale>();
@@ -111,6 +117,7 @@ void AppearanceSettingsPage::load() {
     ui.languageComboBox->setCurrentIndex(1);
   else
     ui.languageComboBox->setCurrentIndex(ui.languageComboBox->findText(QLocale::languageToString(locale.language()), Qt::MatchExactly));
+  ui.languageComboBox->setProperty("storedValue", ui.languageComboBox->currentIndex());
   Quassel::loadTranslation(selectedLocale());
 
   ChatViewSettings chatViewSettings;
@@ -226,7 +233,8 @@ void AppearanceSettingsPage::widgetHasChanged() {
 bool AppearanceSettingsPage::testHasChanged() {
   if(_fontsChanged) return true; // comparisons are nasty for now
 
-  if(settings["Style"].toString() != ui.styleComboBox->currentText()) return true;
+  if(ui.styleComboBox->currentIndex() != ui.styleComboBox->property("storedValue").toInt()) return true;
+
   if(selectedLocale() != QLocale()) return true; // QLocale() returns the default locale (manipulated via loadTranslation())
 
   if(SettingsPage::hasChanged(ui.showWebPreview)) return true;
index 796eb21..abd8cd1 100644 (file)
 
 #include "graphicalui.h"
 
+#include "actioncollection.h"
 #include "contextmenuactionprovider.h"
 
+QWidget *GraphicalUi::_mainWidget = 0;
+QHash<QString, ActionCollection *> GraphicalUi::_actionCollections;
 ContextMenuActionProvider *GraphicalUi::_contextMenuActionProvider = 0;
 ToolBarActionProvider *GraphicalUi::_toolBarActionProvider = 0;
 
-GraphicalUi::GraphicalUi(QObject *parent) : AbstractUi(parent) {
+GraphicalUi::GraphicalUi(QObject *parent) : AbstractUi(parent)
+{
 
 }
 
+ActionCollection *GraphicalUi::actionCollection(const QString &category) {
+  if(_actionCollections.contains(category))
+    return _actionCollections.value(category);
+  ActionCollection *coll = new ActionCollection(_mainWidget);
+  if(_mainWidget)
+    coll->addAssociatedWidget(_mainWidget);
+  _actionCollections.insert(category, coll);
+  return coll;
+}
+
+void GraphicalUi::setMainWidget(QWidget *widget) {
+  _mainWidget = widget;
+}
+
 void GraphicalUi::setContextMenuActionProvider(ContextMenuActionProvider *provider) {
   _contextMenuActionProvider = provider;
 }
index b4f8669..392075e 100644 (file)
@@ -23,6 +23,7 @@
 
 #include "abstractui.h"
 
+class ActionCollection;
 class ContextMenuActionProvider;
 class ToolBarActionProvider;
 
@@ -32,14 +33,27 @@ class GraphicalUi : public AbstractUi {
 public:
   GraphicalUi(QObject *parent = 0);
 
+  //! Access global ActionCollections.
+  /** These ActionCollections are associated with the main window, i.e. they contain global
+  *  actions (and thus, shortcuts). Widgets providing application-wide shortcuts should
+  *  create appropriate Action objects using GraphicalUi::actionCollection(cat)->add\<Action\>().
+  *  @param category The category (default: "General")
+  */
+  static ActionCollection *actionCollection(const QString &category = "General");
+
   inline static ContextMenuActionProvider *contextMenuActionProvider();
   inline static ToolBarActionProvider *toolBarActionProvider();
 
 protected:
+  //! This is the widget we associate global actions with, typically the main window
+  void setMainWidget(QWidget *);
+
   void setContextMenuActionProvider(ContextMenuActionProvider *);
   void setToolBarActionProvider(ToolBarActionProvider *);
 
 private:
+  static QWidget *_mainWidget;
+  static QHash<QString, ActionCollection *> _actionCollections;
   static ContextMenuActionProvider *_contextMenuActionProvider;
   static ToolBarActionProvider *_toolBarActionProvider;
 
index 76796dd..593af03 100644 (file)
  ***************************************************************************/
 
 #include "bufferview.h"
-
+#include "graphicalui.h"
 #include "inputline.h"
 #include "tabcompleter.h"
 
 InputLine::InputLine(QWidget *parent)
-  : QLineEdit(parent),
+  :
+#ifdef HAVE_KDE
+    KTextEdit(parent),
+#else
+    QLineEdit(parent),
+#endif
     idx(0),
     tabCompleter(new TabCompleter(this))
 {
+#ifdef HAVE_KDE
+//This is done to make the KTextEdit look like a lineedit
+  setMaximumHeight(document()->size().toSize().height());
+  setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+  setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+  setAcceptRichText(false);
+  setLineWrapMode(NoWrap);
+  enableFindReplace(false);
+  connect(this, SIGNAL(textChanged()), this, SLOT(on_textChanged()));
+#endif
+
   connect(this, SIGNAL(returnPressed()), this, SLOT(on_returnPressed()));
   connect(this, SIGNAL(textChanged(QString)), this, SLOT(on_textChanged(QString)));
 }
@@ -35,6 +51,13 @@ InputLine::InputLine(QWidget *parent)
 InputLine::~InputLine() {
 }
 
+void InputLine::setCustomFont(const QFont &font) {
+  setFont(font);
+#ifdef HAVE_KDE
+  setMaximumHeight(document()->size().toSize().height());
+#endif
+}
+
 bool InputLine::eventFilter(QObject *watched, QEvent *event) {
   if(event->type() != QEvent::KeyPress)
     return false;
@@ -57,6 +80,18 @@ bool InputLine::eventFilter(QObject *watched, QEvent *event) {
 }
 
 void InputLine::keyPressEvent(QKeyEvent * event) {
+
+#ifdef HAVE_KDE
+  if(event->matches(QKeySequence::Find)) {
+    QAction *act = GraphicalUi::actionCollection()->action("ToggleSearchBar");
+    if(act) {
+      act->toggle();
+      event->accept();
+      return;
+    }
+  }
+#endif
+
   switch(event->key()) {
   case Qt::Key_Up:
     event->accept();
@@ -90,9 +125,30 @@ void InputLine::keyPressEvent(QKeyEvent * event) {
 
   case Qt::Key_Select:         // for Qtopia
     emit returnPressed();
+    break;
+
+#ifdef HAVE_KDE
+//Since this is a ktextedit, we don't have this signal "natively"
+  case Qt::Key_Return:
+    event->accept();
+    if(!text().isEmpty())
+      emit returnPressed();
+    break;
+
+  case Qt::Key_Enter:
+    event->accept();
+    if(!text().isEmpty())
+      emit returnPressed();
+    break;
+
+#endif
 
   default:
+#ifdef HAVE_KDE
+    KTextEdit::keyPressEvent(event);
+#else
     QLineEdit::keyPressEvent(event);
+#endif
   }
 }
 
@@ -145,7 +201,7 @@ void InputLine::on_textChanged(QString newText) {
   clear();
 
   if(lines.count() >= 4) {
-    QString msg = tr("Do you really want to paste %1 lines?").arg(lines.count());
+    QString msg = tr("Do you really want to paste %n lines?", "", lines.count());
     msg += "<p>";
     for(int i = 0; i < 3; i++) {
       msg += lines[i].left(40);
@@ -164,9 +220,11 @@ void InputLine::on_textChanged(QString newText) {
   }
 
   foreach(QString line, lines) {
-    clear();
-    insert(line);
-    emit returnPressed();
+    if(!line.isEmpty()) {
+      clear();
+      insert(line);
+      emit returnPressed();
+    }
   }
 //   if(newText.contains(lineSep)) {
 //     clear();
index dc6d691..66742b6 100644 (file)
 
 #include <QtGui>
 
+#ifdef HAVE_KDE
+#include <KDE/KTextEdit>
+#endif
+
 class TabCompleter;
 
-class InputLine : public QLineEdit {
+class InputLine : public
+#ifdef HAVE_KDE
+                  KTextEdit
+#else
+                  QLineEdit
+#endif
+{
   Q_OBJECT
 
 public:
   InputLine(QWidget *parent = 0);
   ~InputLine();
 
+  void setCustomFont(const QFont &); // should be used instead setFont(), so we can set our size correctly
+
+#ifdef HAVE_KDE
+//Compatibility methods with the rest of the classes which expects this to be a QLineEdit
+  QString text() { return toPlainText(); };
+  int cursorPosition() { return textCursor().position(); };
+  void insert(const QString &newText) { insertPlainText(newText); };
+  void backspace() { keyPressEvent(new QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier));  };
+  bool hasSelectedText() { return textCursor().hasSelection(); };
+#endif
+
 protected:
   //    virtual bool event(QEvent *);
   virtual void keyPressEvent(QKeyEvent * event);
@@ -40,11 +61,20 @@ protected:
 private slots:
   void on_returnPressed();
   void on_textChanged(QString newText);
+#ifdef HAVE_KDE
+//Needed to emulate the signal that QLineEdit has
+  void on_textChanged() { emit textChanged(toPlainText()); };
+#endif
 
   bool addToHistory(const QString &text, bool temporary = false);
 
 signals:
   void sendText(QString text);
+#ifdef HAVE_KDE
+//KTextEdit does not provide this signal, so we manually emit it in keyPressEvent()
+  void returnPressed();
+  void textChanged(QString newText);
+#endif
 
 private:
   QStringList history;
index 577f168..a1b6f8d 100644 (file)
@@ -53,7 +53,7 @@ void SettingsPage::load(QCheckBox *box, bool checked) {
 }
 
 bool SettingsPage::hasChanged(QCheckBox *box) {
-  return box->property("StoredValue").toBool() == box->isChecked();
+  return box->property("StoredValue").toBool() != box->isChecked();
 }
 
 
@@ -63,7 +63,7 @@ void SettingsPage::load(QComboBox *box, int index) {
 }
 
 bool SettingsPage::hasChanged(QComboBox *box) {
-  return box->property("StoredValue").toInt() == box->currentIndex();
+  return box->property("StoredValue").toInt() != box->currentIndex();
 }
 
 void SettingsPage::load(QSpinBox *box, int value) {
@@ -72,7 +72,7 @@ void SettingsPage::load(QSpinBox *box, int value) {
 }
 
 bool SettingsPage::hasChanged(QSpinBox *box) {
-  return box->property("StoredValue").toInt() == box->value();
+  return box->property("StoredValue").toInt() != box->value();
 }
 
 /*** Auto child widget handling ***/