[vacuum-im] r2514 committed - Синхронизация с trunk.

[vacu...@googlecode.com]

Revision: 2514
Author: potapov.s.a
Date: Sun Apr 5 20:40:50 2015 UTC
Log: Синхронизация с trunk.
https://code.google.com/p/vacuum-im/source/detail?r=2514

Modified:
/branches/dev_options2
/branches/dev_options2/src/interfaces/ivcard.h
/branches/dev_options2/src/loader/loader.pro
/branches/dev_options2/src/make/config.cmake
/branches/dev_options2/src/make/config.inc
/branches/dev_options2/src/plugins/avatars/avatars.cpp
/branches/dev_options2/src/plugins/captchaforms/captchaforms.cpp
/branches/dev_options2/src/plugins/captchaforms/captchaforms.h

/branches/dev_options2/src/plugins/filemessagearchive/databasesynchronizer.cpp
/branches/dev_options2/src/plugins/filemessagearchive/databaseworker.cpp

/branches/dev_options2/src/plugins/filemessagearchive/filemessagearchive.cpp
/branches/dev_options2/src/plugins/filemessagearchive/filewriter.cpp
/branches/dev_options2/src/plugins/messagearchiver/archiveviewwindow.cpp
/branches/dev_options2/src/plugins/messagearchiver/archiveviewwindow.h
/branches/dev_options2/src/plugins/messagearchiver/archiveviewwindow.ui
/branches/dev_options2/src/plugins/messagecarbons/messagecarbons.cpp
/branches/dev_options2/src/plugins/messagewidgets/editwidget.cpp
/branches/dev_options2/src/plugins/messagewidgets/editwidget.h
/branches/dev_options2/src/plugins/messagewidgets/infowidget.cpp
/branches/dev_options2/src/plugins/messagewidgets/infowidget.h
/branches/dev_options2/src/plugins/multiuserchat/multiuserchatwindow.cpp
/branches/dev_options2/src/plugins/notifications/notifications.cpp
/branches/dev_options2/src/plugins/recentcontacts/recentcontacts.cpp
/branches/dev_options2/src/plugins/recentcontacts/recentcontacts.h
/branches/dev_options2/src/plugins/rostersearch/rostersearch.cpp
/branches/dev_options2/src/plugins/rostersmodel/rootindex.cpp
/branches/dev_options2/src/plugins/rostersmodel/rosterindex.cpp
/branches/dev_options2/src/plugins/rostersmodel/rosterindex.h
/branches/dev_options2/src/plugins/rostersmodel/rostersmodel.cpp
/branches/dev_options2/src/plugins/servicediscovery/servicediscovery.cpp
/branches/dev_options2/src/plugins/vcard/vcard.cpp
/branches/dev_options2/src/plugins/vcard/vcarddialog.cpp
/branches/dev_options2/src/plugins/vcard/vcarddialog.h
/branches/dev_options2/src/plugins/vcard/vcardplugin.cpp
/branches/dev_options2/src/plugins/vcard/vcardplugin.h
/branches/dev_options2/src/translations/.tx/config
/branches/dev_options2/src/translations/de/messagearchiver.ts
/branches/dev_options2/src/translations/de/multiuserchat.ts
/branches/dev_options2/src/translations/en/messagearchiver.ts
/branches/dev_options2/src/translations/es/birthdayreminder.ts
/branches/dev_options2/src/translations/es/bitsofbinary.ts
/branches/dev_options2/src/translations/es/chatmessagehandler.ts
/branches/dev_options2/src/translations/es/chatstates.ts
/branches/dev_options2/src/translations/es/clientinfo.ts
/branches/dev_options2/src/translations/es/commands.ts
/branches/dev_options2/src/translations/es/dataforms.ts
/branches/dev_options2/src/translations/es/datastreamsmanager.ts
/branches/dev_options2/src/translations/es/defaultconnection.ts
/branches/dev_options2/src/translations/es/filetransfer.ts
/branches/dev_options2/src/translations/es/gateways.ts
/branches/dev_options2/src/translations/es/inbandstreams.ts
/branches/dev_options2/src/translations/es/jabbersearch.ts
/branches/dev_options2/src/translations/es/messagearchiver.ts
/branches/dev_options2/src/translations/es/messagewidgets.ts
/branches/dev_options2/src/translations/es/metacontacts.ts
/branches/dev_options2/src/translations/es/multiuserchat.ts
/branches/dev_options2/src/translations/es/notifications.ts
/branches/dev_options2/src/translations/es/optionsmanager.ts
/branches/dev_options2/src/translations/es/recentcontacts.ts
/branches/dev_options2/src/translations/es/roster.ts
/branches/dev_options2/src/translations/es/rosteritemexchange.ts
/branches/dev_options2/src/translations/es/socksstreams.ts
/branches/dev_options2/src/translations/es/starttls.ts
/branches/dev_options2/src/translations/es/statuschanger.ts
/branches/dev_options2/src/translations/es/vacuumutils.ts
/branches/dev_options2/src/translations/es/vcard.ts
/branches/dev_options2/src/translations/es/xmppstreams.ts
/branches/dev_options2/src/translations/pl/messagearchiver.ts
/branches/dev_options2/src/translations/ru/messagearchiver.ts
/branches/dev_options2/src/translations/uk/autostatus.ts
/branches/dev_options2/src/translations/uk/birthdayreminder.ts
/branches/dev_options2/src/translations/uk/bitsofbinary.ts
/branches/dev_options2/src/translations/uk/connectionmanager.ts
/branches/dev_options2/src/translations/uk/defaultconnection.ts
/branches/dev_options2/src/translations/uk/messagearchiver.ts
/branches/dev_options2/src/translations/uk/metacontacts.ts
/branches/dev_options2/src/translations/uk/multiuserchat.ts
/branches/dev_options2/src/translations/uk/notifications.ts
/branches/dev_options2/src/translations/uk/recentcontacts.ts
/branches/dev_options2/src/translations/uk/starttls.ts
/branches/dev_options2/src/translations/uk/statuschanger.ts
/branches/dev_options2/src/translations/uk/vacuumutils.ts
/branches/dev_options2/src/translations/uk/vcard.ts
/branches/dev_options2/src/utils/menu.cpp
/branches/dev_options2/src/utils/toolbarchanger.cpp
/branches/dev_options2/src/utils/toolbarchanger.h