diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 3de514982..b769287e4 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -174,6 +174,7 @@ service.gui.CREATE_FIRST_GROUP_WIZARD=Your contact list doesn't contain any grou
 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.CREATE_VIDEO_CONFERENCE=Create a new video conference for this chat room
 service.gui.CONTACT_INFO_NOT_SUPPORTED=This contact doesn't support web contact info
 service.gui.CUT=C&ut
 service.gui.DATE=Date
@@ -196,7 +197,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.END_CONFERENCE=End conference
 service.gui.ENTER_PHONE_NUMBER=Enter phone number
 service.gui.ENTER_NAME_OR_NUMBER=Enter name or number
 service.gui.ERROR=Error
@@ -302,6 +303,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_EXISTING_VIDEO_CONFERENCE=Join an existing video conference
 service.gui.JOIN_VIDEO=Join video
 service.gui.CLOSE_CHAT_ROOM_DIALOG=C&lose
 service.gui.JOB_TITLE=Job title
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatConferenceCallDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatConferenceCallDialog.java
index a9b73bd05..145d46ff3 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatConferenceCallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatConferenceCallDialog.java
@@ -34,13 +34,17 @@ public class ChatConferenceCallDialog
      * Create conference radio button.
      */
     private final JRadioButton createConferenceButton
-        = new JRadioButton("Create new video conference for this chat room");
+        = new JRadioButton(
+            GuiActivator.getResources()
+                    .getI18NString("service.gui.CREATE_VIDEO_CONFERENCE"));
 
     /**
      * Join conference radio button.
      */
     private final JRadioButton joinConferenceButton
-        = new JRadioButton("Join existing video conference for this chat room");
+        = new JRadioButton(
+            GuiActivator.getResources()
+                .getI18NString("service.gui.JOIN_EXISTING_VIDEO_CONFERENCE"));
     
     /**
      * Main panel that holds all elements in the dialog.
@@ -87,7 +91,7 @@ public class ChatConferenceCallDialog
      */
     private JButton endConference = new JButton(
         GuiActivator.getResources().getI18NString(
-            "service.gui.END_CONFEREMCE"));
+            "service.gui.END_CONFERENCE"));
     
     /**
      * The chat panel that created the dialog.
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
index 4766c924e..80c97b4ef 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
@@ -25,7 +25,7 @@
 import net.java.sip.communicator.service.contactsource.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.event.*;
-import net.java.sip.communicator.service.muc.ChatRoomWrapper;
+import net.java.sip.communicator.service.muc.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.Logger;
diff --git a/src/net/java/sip/communicator/plugin/desktoputil/chat/ChatOperationReasonDialog.java b/src/net/java/sip/communicator/plugin/desktoputil/chat/ChatOperationReasonDialog.java
index ae59707b6..5ce3e76b4 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/chat/ChatOperationReasonDialog.java
+++ b/src/net/java/sip/communicator/plugin/desktoputil/chat/ChatOperationReasonDialog.java
@@ -11,8 +11,7 @@
 import javax.swing.*;
 import javax.swing.event.*;
 
-import net.java.sip.communicator.plugin.desktoputil.DesktopUtilActivator;
-import net.java.sip.communicator.plugin.desktoputil.MessageDialog;
+import net.java.sip.communicator.plugin.desktoputil.*;
 
 /**
  *
diff --git a/src/net/java/sip/communicator/plugin/desktoputil/chat/ChatRoomJoinOptionsDialog.java b/src/net/java/sip/communicator/plugin/desktoputil/chat/ChatRoomJoinOptionsDialog.java
index 51d62cb86..f98bfd455 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/chat/ChatRoomJoinOptionsDialog.java
+++ b/src/net/java/sip/communicator/plugin/desktoputil/chat/ChatRoomJoinOptionsDialog.java
@@ -13,12 +13,10 @@
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
-/**
- * @author Ico
- *
- */
 /**
  * Dialog with fields for nickname and subject.
+ *
+ * @author Hristo Terezov
  */
 public class ChatRoomJoinOptionsDialog extends ChatOperationReasonDialog
 {
diff --git a/src/net/java/sip/communicator/service/gui/UIService.java b/src/net/java/sip/communicator/service/gui/UIService.java
index 79e763ac3..f60554203 100644
--- a/src/net/java/sip/communicator/service/gui/UIService.java
+++ b/src/net/java/sip/communicator/service/gui/UIService.java
@@ -23,7 +23,7 @@
  * <p>
  * Through the <tt>UIService</tt> all modules can add their own components in
  * different menus, toolbars, etc. within the ui. Each <tt>UIService</tt>
- * implementation should export its supported "plugable" containers - a set of
+ * implementation should export its supported "pluggable" containers - a set of
  * <tt>Container</tt>s corresponding to different "places" in the application,
  * where a module can add a component.
  * <p>