Implements publishing a conference in chat room (Merged from publish-conference branch).

4 files changed, 8 insertions, 0 deletions

diff --git a/resources/images/images.properties b/resources/images/images.properties
index 63dbfbb..b313f79 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -234,6 +234,8 @@ service.gui.buttons.CALL_PEER_TOOLS=resources/images/impl/gui/buttons/tools.png
 service.gui.buttons.CHAT_ROOM_CONFIG=resources/images/impl/gui/buttons/chatRoomConfig.png
 service.gui.buttons.CHAT_CALL=resources/images/impl/gui/buttons/chatCall.png
 service.gui.buttons.CHAT_VIDEO_CALL=resources/images/impl/gui/buttons/chatVideoCall.png
+service.gui.buttons.CHAT_ROOM_CALL=resources/images/impl/gui/buttons/chatRoomCall.png
+service.gui.buttons.CHAT_ROOM_VIDEO_CALL=resources/images/impl/gui/buttons/chatRoomVideoCall.png
 service.gui.buttons.CHAT_DESKTOP_SHARING=resources/images/impl/gui/buttons/chatDesktopSharing.png
 service.gui.buttons.CALL_HISTORY_BUTTON=resources/images/impl/gui/buttons/callHistoryButton.png
 service.gui.buttons.CALL_HISTORY_BUTTON_PRESSED=resources/images/impl/gui/buttons/callHistoryButtonPressed.png
diff --git a/resources/images/impl/gui/buttons/chatRoomCall.png b/resources/images/impl/gui/buttons/chatRoomCall.png
new file mode 100644
index 0000000..0d51a84
--- /dev/null
+++ b/resources/images/impl/gui/buttons/chatRoomCall.png
diff --git a/resources/images/impl/gui/buttons/chatRoomVideoCall.png b/resources/images/impl/gui/buttons/chatRoomVideoCall.png
new file mode 100644
index 0000000..58aca05
--- /dev/null
+++ b/resources/images/impl/gui/buttons/chatRoomVideoCall.png
diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 09da79b..4db6e0e 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -102,6 +102,8 @@ service.gui.CHANGE_NICKNAME_LABEL=In the field below, you can enter your new nic
 service.gui.CHANGE_NICKNAME_ERROR=Error Changing nickname
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Nickname already exist
 service.gui.CHANGE_VIDEO_QUALITY=Change remote video quality
+service.gui.CHAT_CONFERENCE_LABEL=Conferences
+service.gui.CHAT_CONFERENCE_ITEM_LABEL='s conference
 service.gui.CHAT_ROOM_ALREADY_JOINED=The {0} chat room is already joined.
 service.gui.CHAT_ROOM_CONFIGURATION={0} chat room configuration
 service.gui.CHAT_ROOM_CONFIGURATION_FAILED=Failed to obtain the {0} chat room configuration form.
@@ -169,6 +171,7 @@ service.gui.CREATE_GROUP_NAME=In the field below enter the name of the group you
 service.gui.CREATE_FIRST_GROUP_WIZARD=Your contact list doesn't contain any groups. Please create a group first (File/Create group).
 service.gui.CREATE_VIDEO_BRIDGE=Create a &video bridge...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Create a &video bridge
+service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Create / Join video conference
 service.gui.CONTACT_INFO_NOT_SUPPORTED=This contact doesn't support web contact info
 service.gui.CUT=C&ut
 service.gui.DATE=Date
@@ -191,6 +194,7 @@ service.gui.EMAILS=Emails
 service.gui.EMPTY_HISTORY=&Empty history
 service.gui.ENABLE_DESKTOP_REMOTE_CONTROL=Enable desktop remote control
 service.gui.ENABLE_TYPING_NOTIFICATIONS=Tell others when we are writing to them (send chat activity)
+service.gui.END_CONFEREMCE=End conference
 service.gui.ENTER_PHONE_NUMBER=Enter phone number
 service.gui.ENTER_NAME_OR_NUMBER=Enter name or number
 service.gui.ERROR=Error
@@ -296,6 +300,7 @@ service.gui.JITSI_WARNING=SIP Communicator has recently been renamed to Jitsi.<b
 service.gui.JITSI_WARNING_TITLE=SIP Communicator becomes Jitsi
 service.gui.JOIN=&Join
 service.gui.JOIN_AS=J&oin as
+service.gui.JOIN_VIDEO=Join video
 service.gui.CLOSE_CHAT_ROOM_DIALOG=C&lose
 service.gui.JOB_TITLE=Job title
 service.gui.JOIN_CHAT_ROOM=&Join chat room...
@@ -464,6 +469,7 @@ service.gui.SELECT_GROUP_WIZARD=Specify group
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=The list below contains all accounts that support the multi user chat feature. Select the one you would like to use to create your chat room.
 service.gui.SELECT_PROVIDERS_WIZARD_MSG=The list below contains all registered accounts. Select the one you would like to use to communicate with the new contact.
 service.gui.SELECT_PROVIDERS_WIZARD=Select account
+service.gui.SELECT_VIDEO_CONFERENCE=Select video conference
 service.gui.SEND=&Send
 service.gui.SEND_FILE=Send &file
 service.gui.SELECT_CONTACT_SUPPORTING_INFO=There is no info for this contact.