Merge branch 'master' into qt-client

lang/zh_HK/zh_HK.po

lang/zh_TW/zh_TW.po

sflphone-client-gnome/VERSION

sflphone-client-gnome/configure.ac

sflphone-client-gnome/doc/C/sflphone.xml

sflphone-client-gnome/src/actions.c

sflphone-client-gnome/src/actions.h

sflphone-client-gnome/src/callable_obj.c

sflphone-client-gnome/src/codeclist.c

sflphone-client-gnome/src/conference_obj.c

sflphone-client-gnome/src/config/accountconfigdialog.c

sflphone-client-gnome/src/contacts/addressbook.c

sflphone-client-gnome/src/contacts/calltree.c

sflphone-client-gnome/src/dbus/callmanager-introspec.xml

...-client-gnome/src/dbus/configurationmanager-introspec.xml

sflphone-client-gnome/src/dbus/dbus.c

sflphone-client-gnome/src/dbus/instance-introspec.xml

sflphone-client-gnome/src/mainwindow.c

sflphone-client-gnome/src/sflphone_const.h

sflphone-client-gnome/src/statusicon.c