Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 1 insertions, 48 deletions

diff --git a/resources/images/images.properties b/resources/images/images.properties
index d0ff14c..e9ac9ea 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -408,20 +408,9 @@ service.systray.DOCK_ICON_EXTENDED_AWAY=resources/images/impl/systray/dock-exten
 service.systray.DOCK_ICON_FFC=resources/images/impl/systray/dock-chatty.png
 service.systray.DOCK_ICON_DND=resources/images/impl/systray/dock-dnd.png
 service.systray.STATUS_MENU_ICON=resources/images/impl/systray/statusIcon.png
-service.systray.MESSAGE_ICON=resources/images/impl/systray/envelope.png
-service.systray.MESSAGE_ICON_WINDOWS=resources/images/impl/systray/envelopeWindows.png
-service.systray.MESSAGE_ICON_MACOSX=resources/images/impl/systray/envelopeMacOSX.png
-service.systray.MESSAGE_ICON_MACOSX_WHITE=resources/images/impl/systray/envelopeMacOSXWhite.png
 service.systray.QUIT_MENU_ICON=resources/images/impl/gui/common/quit16x16.png
 service.systray.CONFIGURE_ICON=resources/images/impl/gui/common/configureIcon.png
 
-# dict protocol icons
-service.protocol.dict.DICT_16x16=resources/images/protocol/dict/dict-16x16.png
-service.protocol.dict.DICT_32x32=resources/images/protocol/dict/dict-32x32.png
-service.protocol.dict.DICT_48x48=resources/images/protocol/dict/dict-48x48.png
-service.protocol.dict.DICT_64x64=resources/images/protocol/dict/dict-64x64.png
-service.protocol.dict.OFFLINE_STATUS_ICON=resources/images/protocol/dict/dict-16x16-offline.png
-
 # icq protocol icons
 service.protocol.icq.ICQ_16x16=resources/images/protocol/icq/icq16x16-online.png
 service.protocol.icq.ICQ_32x32=resources/images/protocol/icq/icq32x32.png
@@ -429,33 +418,6 @@ service.protocol.icq.ICQ_48x48=resources/images/protocol/icq/icq48x48.png
 service.protocol.icq.ICQ_64x64=resources/images/protocol/icq/icq64x64.png
 service.protocol.icq.CONNECTING=resources/images/protocol/icq/cr16-action-icq_connecting-1.gif
 
-# yahoo protocol icons
-service.protocol.yahoo.YAHOO_16x16=resources/images/protocol/yahoo/yahoo16x16.png
-service.protocol.yahoo.YAHOO_32x32=resources/images/protocol/yahoo/yahoo32x32.png
-service.protocol.yahoo.YAHOO_48x48=resources/images/protocol/yahoo/yahoo48x48.png
-service.protocol.yahoo.YAHOO_64x64=resources/images/protocol/yahoo/yahoo64x64.png
-
-# zeroconf protocol icons
-service.protocol.zeroconf.ZEROCONF_16x16=resources/images/protocol/zeroconf/zeroconf16x16.png
-service.protocol.zeroconf.ZEROCONF_32x32=resources/images/protocol/zeroconf/zeroconf32x32.png
-service.protocol.zeroconf.ZEROCONF_48x48=resources/images/protocol/zeroconf/zeroconf48x48.png
-service.protocol.zeroconf.ZEROCONF_64x64=resources/images/protocol/zeroconf/zeroconf64x64.png
-service.protocol.zeroconf.ONLINE_STATUS_ICON=resources/images/protocol/zeroconf/zeroconf-online.png
-service.protocol.zeroconf.OFFLINE_STATUS_ICON=resources/images/protocol/zeroconf/zeroconf-offline.png
-service.protocol.zeroconf.DND_STATUS_ICON=resources/images/protocol/zeroconf/zeroconf-dnd.png
-service.protocol.zeroconf.INVISIBLE_STATUS_ICON=resources/images/protocol/zeroconf/zeroconf-invisible.png
-
-# ssh protocol icons
-service.protocol.ssh.SSH_16x16=resources/images/protocol/ssh/ssh-online.png
-service.protocol.ssh.SSH_32x32=resources/images/protocol/ssh/ssh32x32.png
-service.protocol.ssh.SSH_48x48=resources/images/protocol/ssh/ssh48x48.png
-service.protocol.ssh.SSH_64x64=resources/images/protocol/ssh/ssh64x64.png
-service.protocol.ssh.OFFLINE_STATUS_ICON=resources/images/protocol/ssh/ssh-offline.png
-service.protocol.ssh.NA_STATUS_ICON=resources/images/protocol/ssh/ssh-na.png
-service.protocol.ssh.CONNECTING_ICON=resources/images/protocol/ssh/ssh-connecting.png
-service.protocol.ssh.CONNECTED_ICON=resources/images/protocol/ssh/ssh-connected.png
-service.protocol.ssh.FILE_TRANSFER_ICON=resources/images/protocol/ssh/ssh-filetransfer.png
-
 # sip protocol icons
 service.protocol.sip.SIP_16x16=resources/images/protocol/sip/sip16x16.png
 service.protocol.sip.SIP_64x64=resources/images/protocol/sip/sip64x64.png
@@ -503,21 +465,12 @@ service.protocol.googletalk.GTALK_64x64=resources/images/protocol/googletalk/log
 service.protocol.iptel.IPTEL_16x16=resources/images/protocol/iptel/sip16x16.png
 service.protocol.iptel.IPTEL_64x64=resources/images/protocol/iptel/sip64x64.png
 
-# sip2sip accregwizz
-service.protocol.sip2sip.SIP2SIP_16x16=resources/images/protocol/sip2sip/sip16x16.png
-service.protocol.sip2sip.SIP2SIP_64x64=resources/images/protocol/sip2sip/sip64x64.png
-
 # ippi accregwizz
 service.protocol.ippi.IPPI_16x16=resources/images/protocol/ippi/sip16x16.png
 service.protocol.ippi.IPPI_64x64=resources/images/protocol/ippi/sip64x64.png
 
-# facebook accregwizz
-service.protocol.facebook.FACEBOOK_16x16=resources/images/protocol/facebook/facebook-online.png
-service.protocol.facebook.FACEBOOK_48x48=resources/images/protocol/facebook/facebook48.png
-
 # branding plugin images
 plugin.branding.ABOUT_WINDOW_BACKGROUND=resources/images/plugin/branding/aboutWindowBackground.png
-plugin.branding.SPLASH_SCREEN_BACKGROUND=resources/images/plugin/branding/splashScreenBackground.png
 
 #plugin busylampfield
 plugin.busylampfield.PICKUP_CALL=resources/images/impl/gui/buttons/pickupCall.png
@@ -625,4 +578,4 @@ plugin.spellcheck.PERSONAL_DIR=resources/images/plugin/spellcheck/personalDictio
 plugin.spellcheck.WORD_INCLUDE=resources/images/plugin/spellcheck/wordInclude.png
 plugin.spellcheck.WORD_EXCLUDE=resources/images/plugin/spellcheck/wordExclude.png
 plugin.spellcheck.ENABLE=resources/images/plugin/spellcheck/enableSpellchecker.png
-plugin.spellcheck.DISABLE=resources/images/plugin/spellcheck/disableSpellchecker.png
\ No newline at end of file
+plugin.spellcheck.DISABLE=resources/images/plugin/spellcheck/disableSpellchecker.png