We now use one term "group chat" in the place of sometimes used room
This commit is contained in:
		
							parent
							
								
									b0d7c4ff81
								
							
						
					
					
						commit
						10ae874cb6
					
				
					 4 changed files with 7 additions and 7 deletions
				
			
		| 
						 | 
					@ -2510,7 +2510,7 @@ class ManageBookmarksWindow:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		account = model[add_to][1].decode('utf-8')
 | 
							account = model[add_to][1].decode('utf-8')
 | 
				
			||||||
		nick = gajim.nicks[account]
 | 
							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'])
 | 
								nick, 'in_and_out'])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		self.view.expand_row(model.get_path(add_to), True)
 | 
							self.view.expand_row(model.get_path(add_to), True)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1378,7 +1378,7 @@ class GroupchatControl(ChatControlBase):
 | 
				
			||||||
			if bookmark['jid'] == bm['jid']:
 | 
								if bookmark['jid'] == bm['jid']:
 | 
				
			||||||
				dialogs.ErrorDialog(
 | 
									dialogs.ErrorDialog(
 | 
				
			||||||
					_('Bookmark already set'),
 | 
										_('Bookmark already set'),
 | 
				
			||||||
					_('Room "%s" is already in your bookmarks.') % bm['jid'])
 | 
										_('Group Chat "%s" is already in your bookmarks.') % bm['jid'])
 | 
				
			||||||
				return
 | 
									return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		gajim.connections[self.account].bookmarks.append(bm)
 | 
							gajim.connections[self.account].bookmarks.append(bm)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -231,7 +231,7 @@ def notify(event, jid, account, parameters, advanced_notif_num = None):
 | 
				
			||||||
				room_name = gajim.get_nick_from_jid(jid)
 | 
									room_name = gajim.get_nick_from_jid(jid)
 | 
				
			||||||
				img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
 | 
									img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
 | 
				
			||||||
					'priv_msg_recv.png')
 | 
										'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,
 | 
									text = _('%(nickname)s: %(message)s') % {'nickname': nickname,
 | 
				
			||||||
					'message': message}
 | 
										'message': message}
 | 
				
			||||||
			else: # chat message
 | 
								else: # chat message
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -963,8 +963,8 @@ class RosterWindow:
 | 
				
			||||||
		item.connect('activate', self.on_history_manager_menuitem_activate)
 | 
							item.connect('activate', self.on_history_manager_menuitem_activate)
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
	def add_bookmarks_list(self, gc_sub_menu, account):
 | 
						def add_bookmarks_list(self, gc_sub_menu, account):
 | 
				
			||||||
		'''Print join new room item and bookmarks list for an account'''
 | 
							'''Show join new group chat item and bookmarks list for an account'''
 | 
				
			||||||
		item = gtk.MenuItem(_('_Join New Room'))
 | 
							item = gtk.MenuItem(_('_Join New Group Chat'))
 | 
				
			||||||
		item.connect('activate', self.on_join_gc_activate, account)
 | 
							item.connect('activate', self.on_join_gc_activate, account)
 | 
				
			||||||
		gc_sub_menu.append(item)
 | 
							gc_sub_menu.append(item)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue