We now use one term "group chat" in the place of sometimes used room

src/config.py

@@ -2402,10 +2402,10 @@ class ManageBookmarksWindow:
 		self.window = self.xml.get_widget('manage_bookmarks_window')
 		self.window.set_transient_for(gajim.interface.roster.window)
 
-		#Account-JID, RoomName, Room-JID, Autojoin, Passowrd, Nick, Show_Status
+		# Account-JID, RoomName, Room-JID, Autojoin, Passowrd, Nick, Show_Status
 		self.treestore = gtk.TreeStore(str, str, str, bool, str, str, str)
 
-		#Store bookmarks in treeview.
+		# Store bookmarks in treeview.
 		for account in gajim.connections:
 			if gajim.connections[account].connected <= 1:
 				continue
@@ -2510,7 +2510,7 @@ class ManageBookmarksWindow:
 
 		account = model[add_to][1].decode('utf-8')
 		nick = gajim.nicks[account]
-		self.treestore.append(add_to, [account, _('New Room'), '', False, '',
+		self.treestore.append(add_to, [account, _('New Group Chat'), '', False, '',
 			nick, 'in_and_out'])
 
 		self.view.expand_row(model.get_path(add_to), True)

src/groupchat_control.py

@@ -1378,7 +1378,7 @@ class GroupchatControl(ChatControlBase):
 			if bookmark['jid'] == bm['jid']:
 				dialogs.ErrorDialog(
 					_('Bookmark already set'),
-					_('Room "%s" is already in your bookmarks.') % bm['jid'])
+					_('Group Chat "%s" is already in your bookmarks.') % bm['jid'])
 				return
 
 		gajim.connections[self.account].bookmarks.append(bm)

src/notify.py

@@ -231,7 +231,7 @@ def notify(event, jid, account, parameters, advanced_notif_num = None):
 				room_name = gajim.get_nick_from_jid(jid)
 				img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
 					'priv_msg_recv.png')
-				title = _('New Private Message from room %s') % room_name
+				title = _('New Private Message from group chat %s') % room_name
 				text = _('%(nickname)s: %(message)s') % {'nickname': nickname,
 					'message': message}
 			else: # chat message

src/roster_window.py

@@ -963,8 +963,8 @@ class RosterWindow:
 		item.connect('activate', self.on_history_manager_menuitem_activate)
 		
 	def add_bookmarks_list(self, gc_sub_menu, account):
-		'''Print join new room item and bookmarks list for an account'''
-		item = gtk.MenuItem(_('_Join New Room'))
+		'''Show join new group chat item and bookmarks list for an account'''
+		item = gtk.MenuItem(_('_Join New Group Chat'))
 		item.connect('activate', self.on_join_gc_activate, account)
 		gc_sub_menu.append(item)