Author: jim++ Date: 2006-10-12 04:12:10 +0200 (Thu, 12 Oct 2006) New Revision: 7220

Modified: trunk/src/chat_control.py trunk/src/common/config.py trunk/src/dialogs.py trunk/src/groupchat_control.py trunk/src/roster_window.py trunk/src/tooltips.py Log: Use "group chat" instead of "room" in all strings. Fixes #2523.

Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2006-10-12 01:43:31 UTC (rev 7219) +++ trunk/src/chat_control.py 2006-10-12 02:12:10 UTC (rev 7220) @@ -1019,7 +1019,7 @@ if self.resource: name += '/' + self.resource if self.TYPE_ID == message_control.TYPE_PM: - name = _('%(nickname)s from room %(room_name)s') %\ + name = _('%(nickname)s from group chat %(room_name)s') %\ {'nickname': name, 'room_name': self.room_name} name = gtkgui_helpers.escape_for_pango_markup(name)

Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2006-10-12 01:43:31 UTC (rev 7219) +++ trunk/src/common/config.py 2006-10-12 02:12:10 UTC (rev 7220) @@ -153,8 +153,8 @@ 'autodetect_browser_mailer': [opt_bool, False, '', True], 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (print_time==sometimes), print it every x minutes.')], 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], - 'confirm_close_muc_rooms': [opt_str, '', _('Always ask before closing group chat tab/window in this space separated list of room jids.')], - 'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask before closing group chat tab/window in this space separated list of room jids.')], + 'confirm_close_muc_rooms': [opt_str, '', _('Always ask before closing group chat tab/window in this space separated list of group chats jids.')], + 'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask before closing group chat tab/window in this space separated list of group chats jids.')], 'notify_on_file_complete': [opt_bool, True], 'file_transfers_port': [opt_int, 28011], 'ft_override_host_to_send': [opt_str, '', _('Overrides the host we send for File Transfer in case of address translation/port forwarding.')], @@ -182,7 +182,7 @@ 'notification_position_y': [opt_int, -1], 'notification_avatar_width': [opt_int, 48], 'notification_avatar_height': [opt_int, 48], - 'muc_highlight_words': [opt_str, '', _('A semicolon-separated list of words that will be highlighted in multi-user chat.')], + 'muc_highlight_words': [opt_str, '', _('A semicolon-separated list of words that will be highlighted in group chats.')], 'quit_on_roster_x_button': [opt_bool, False, _('If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used.')], 'set_xmpp://_handler_everytime': [opt_bool, False, _('If True, Gajim registers for xmpp:// on each startup.')], 'show_unread_tab_icon': [opt_bool, False, _('If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated.')], @@ -190,7 +190,7 @@ 'show_avatars_in_roster': [opt_bool, True, '', True], 'ask_avatars_on_startup': [opt_bool, True, _('If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old.')], 'print_status_in_chats': [opt_bool, True, _('If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message.')], - 'print_status_in_muc': [opt_str, 'in_and_out', _('can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", gajim will only print FOO enters/leaves room.')], + 'print_status_in_muc': [opt_str, 'in_and_out', _('can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", gajim will only print FOO enters/leaves group chat.')], 'log_contact_status_changes': [opt_bool, False], 'restored_messages_color': [opt_str, 'grey'], 'restored_messages_small': [opt_bool, True, _('If True, restored messages will use a smaller font than the default one.')], @@ -198,7 +198,7 @@ 'roster_window_skip_taskbar': [opt_bool, False, _('Don't show roster in the system taskbar.')], 'use_urgency_hint': [opt_bool, True, _('If True and installed GTK+ and PyGTK versions are at least 2.8, make the window flash (the default behaviour in most Window Managers) when holding pending events.')], 'notification_timeout': [opt_int, 5], - 'send_sha_in_gc_presence': [opt_bool, True, _('Jabberd1.4 does not like sha info when one join a password protected room. Turn this option to False to stop sending sha info in group chat presences.')], + 'send_sha_in_gc_presence': [opt_bool, True, _('Jabberd1.4 does not like sha info when one join a password protected group chat. Turn this option to False to stop sending sha info in group chat presences.')], 'one_message_window': [opt_str, 'always', #always, never, peracct, pertype should not be translated _('Controls the window where new messages are placed.\n'always' - All messages are sent to a single window.\n'never' - All messages get their own window.\n'peracct' - Messages for each account are sent to a specific window.\n'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window. Note, changing this option requires restarting Gajim before the changes will take effect.')], @@ -208,7 +208,7 @@ 'always_hide_chat_buttons': [opt_bool, False, _('Hides the buttons in two persons chat window.')], 'hide_groupchat_banner': [opt_bool, False, _('Hides the banner in a group chat window')], 'hide_chat_banner': [opt_bool, False, _('Hides the banner in two persons chat window')], - 'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the room occupants list in group chat window.')], + 'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the group chat occupants list in group chat window.')], 'chat_merge_consecutive_nickname': [opt_bool, False, _('Merge consecutive nickname in chat window.')], 'chat_merge_consecutive_nickname_indent': [opt_str, ' ', _('Indentation when using merge consecutive nickame.')], 'gc_nicknames_colors': [ opt_str, '#a34526:#c000ff:#0012ff:#388a99:#38995d:#519938:#ff8a00:#94452d:#244b5a:#32645a', _('List of colors that will be used to color nicknames in group chats.'), True ], @@ -364,7 +364,7 @@ 'contact_connected': [ True, '../data/sounds/connected.wav' ], 'contact_disconnected': [ True, '../data/sounds/disconnected.wav' ], 'message_sent': [ True, '../data/sounds/sent.wav' ], - 'muc_message_highlight': [ True, '../data/sounds/gc_message1.wav', _('Sound to play when a MUC message contains one of the words in muc_highlight_words, or when a MUC message contains your nickname.')], + 'muc_message_highlight': [ True, '../data/sounds/gc_message1.wav', _('Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname.')], 'muc_message_received': [ False, '../data/sounds/gc_message2.wav', _('Sound to play when any MUC message arrives.') ], }

Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-10-12 01:43:31 UTC (rev 7219) +++ trunk/src/dialogs.py 2006-10-12 02:12:10 UTC (rev 7220) @@ -1107,8 +1107,8 @@ if room_jid != '': if room_jid in gajim.gc_connected[account] and\ gajim.gc_connected[account][room_jid]: - ErrorDialog(_('You are already in room %s') % room_jid) - raise GajimGeneralException, 'You are already in this room' + ErrorDialog(_('You are already in group chat %s') % room_jid) + raise GajimGeneralException, 'You are already in this group chat' self.account = account self.automatic = automatic if nick == '': @@ -1199,8 +1199,8 @@ try: room_jid = helpers.parse_jid(room_jid) except: - ErrorDialog(_('Invalid room Jabber ID'), - _('The room Jabber ID has not allowed characters.')) + ErrorDialog(_('Invalid group chat Jabber ID'), + _('The group chat Jabber ID has not allowed characters.')) return

if room_jid in self.recently_groupchat: @@ -2170,8 +2170,8 @@ self.dialog = xml.get_widget('invitation_received_dialog')

#FIXME: use nickname instead of contact_jid - pritext = _('%(contact_jid)s has invited you to %(room_jid)s room') % { - 'room_jid': room_jid, 'contact_jid': contact_jid } + pritext = _('%(contact_jid)s has invited you to group chat %(room_jid)s')\ + % {'room_jid': room_jid, 'contact_jid': contact_jid } label_text = '<big><b>%s</b></big>' % pritext

Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-10-12 01:43:31 UTC (rev 7219) +++ trunk/src/groupchat_control.py 2006-10-12 02:12:10 UTC (rev 7220) @@ -119,7 +119,7 @@ dialogs.ErrorDialog( _('Sending private message failed'), #in second %s code replaces with nickname - _('You are no longer in room "%s" or "%s" has left.') % \ + _('You are no longer in group chat "%s" or "%s" has left.') % \ (room, nick)) return

@@ -891,7 +891,7 @@ st += ' [%s]' % reason else: if newly_created and print_status in ('all', 'in_and_out'): - st = _('%s has joined the room') % nick_jid + st = _('%s has joined the group chat') % nick_jid elif print_status == 'all': st = _('%s is now %s') % (nick_jid, helpers.get_uf_show(show)) if st: @@ -1046,7 +1046,7 @@ elif self.subject is not '': self.print_conversation(self.subject, 'info') else: - self.print_conversation(_('This room has no subject'), 'info') + self.print_conversation(_('This group chat has no subject'), 'info') self.clear(self.msg_textview) return True elif command == 'invite': @@ -1202,10 +1202,11 @@ if command == 'help': self.print_conversation(_('Commands: %s') % self.muc_cmds, 'info') elif command == 'ban': - s = _('Usage: /%s <nickname|JID> [reason], bans the JID from the room.' + s = _('Usage: /%s <nickname|JID> [reason], bans the JID from the group chat.' ' The nickname of an occupant may be substituted, but not if it ' - 'contains "@". If the JID is currently in the room, he/she/it will ' - 'also be kicked. Does NOT support spaces in nickname.') % command + 'contains "@". If the JID is currently in the group chat, ' + 'he/she/it will also be kicked. Does NOT support spaces in ' + 'nickname.') % command self.print_conversation(s, 'info') elif command == 'chat' or command == 'query': self.print_conversation(_('Usage: /%s <nickname>, opens a private chat' @@ -1221,7 +1222,7 @@ command, 'info') elif command == 'invite': self.print_conversation(_('Usage: /%s <JID> [reason], invites JID to ' - 'the current room, optionally providing a reason.') % command, + 'the current group chat, optionally providing a reason.') % command, 'info') elif command == 'join': self.print_conversation(_('Usage: /%s <room>@<server>[/nickname], ' @@ -1229,12 +1230,12 @@ % command, 'info') elif command == 'kick': self.print_conversation(_('Usage: /%s <nickname> [reason], removes ' - 'the occupant specified by nickname from the room and optionally ' - 'displays a reason. Does NOT support spaces in nickname.') % \ - command, 'info') + 'the occupant specified by nickname from the group chat and ' + 'optionally displays a reason. Does NOT support spaces in ' + 'nickname.') % command, 'info') elif command == 'me': self.print_conversation(_('Usage: /%s <action>, sends action to the ' - 'current room. Use third person. (e.g. /%s explodes.)') % \ + 'current group chat. Use third person. (e.g. /%s explodes.)') % \ (command, command), 'info') elif command == 'msg': s = _('Usage: /%s <nickname> [message], opens a private message window' @@ -1242,16 +1243,16 @@ command self.print_conversation(s, 'info') elif command == 'nick': - s = _('Usage: /%s <nickname>, changes your nickname in current room.')\ - % command + s = _('Usage: /%s <nickname>, changes your nickname in current group ' + 'chat.') % command self.print_conversation(s, 'info') elif command == 'names': - s = _('Usage: /%s , display the names of room occupants.')\ + s = _('Usage: /%s , display the names of group chat occupants.')\ % command self.print_conversation(s, 'info') elif command == 'topic': self.print_conversation(_('Usage: /%s [topic], displays or updates the' - ' current room topic.') % command, 'info') + ' current group chat topic.') % command, 'info') elif command == 'say': self.print_conversation(_('Usage: /%s <message>, sends a message ' 'without looking for other commands.') % command, 'info') @@ -1305,9 +1306,10 @@ if (gajim.config.get('confirm_close_muc') or self.room_jid in includes) \ and gajim.gc_connected[self.account][self.room_jid] and self.room_jid not\ in excludes: - pritext = _('Are you sure you want to leave room "%s"?') % self.name + pritext = _('Are you sure you want to leave group chat "%s"?')\ + % self.name sectext = _('If you close this window, you will be disconnected ' - 'from this room.') + 'from this group chat.')

dialog = dialogs.ConfirmationDialogCheck(pritext, sectext, _('Do _not ask me again'))

Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-10-12 01:43:31 UTC (rev 7219) +++ trunk/src/roster_window.py 2006-10-12 02:12:10 UTC (rev 7220) @@ -596,11 +596,11 @@ win = gajim.interface.msg_win_mgr.get_window(room_jid, account) win.window.present() win.set_active_tab(room_jid, account) - dialogs.ErrorDialog(_('You are already in room %s') % room_jid) + dialogs.ErrorDialog(_('You are already in group chat %s') % room_jid) return invisible_show = gajim.SHOW_LIST.index('invisible') if gajim.connections[account].connected == invisible_show: - dialogs.ErrorDialog(_('You cannot join a room while you are invisible') + dialogs.ErrorDialog(_('You cannot join a group chat while you are invisible') ) return if not gajim.interface.msg_win_mgr.has_window(room_jid, account): @@ -1563,7 +1563,7 @@

submenu = gtk.Menu() invite_menuitem.set_submenu(submenu) - menuitem = gtk.ImageMenuItem(_('_New room')) + menuitem = gtk.ImageMenuItem(_('_New group chat')) icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU) menuitem.set_image(icon) menuitem.connect('activate', self.on_invite_to_new_room, [(contact, @@ -1738,7 +1738,7 @@ else:

sub_menu = gtk.Menu() - menuitem = gtk.ImageMenuItem(_('_New room')) + menuitem = gtk.ImageMenuItem(_('_New group chat')) icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU) menuitem.set_image(icon) menuitem.connect('activate', self.on_invite_to_new_room, list_) @@ -2834,7 +2834,7 @@ '''when the join gc menuitem is clicked, show the join gc window''' invisible_show = gajim.SHOW_LIST.index('invisible') if gajim.connections[account].connected == invisible_show: - dialogs.ErrorDialog(_('You cannot join a room while you are invisible') + dialogs.ErrorDialog(_('You cannot join a group chat while you are invisible') ) return if gajim.interface.instances[account].has_key('join_gc'):

Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2006-10-12 01:43:31 UTC (rev 7219) +++ trunk/src/tooltips.py 2006-10-12 02:12:10 UTC (rev 7220) @@ -320,7 +320,8 @@ gtkgui_helpers.escape_for_pango_markup(contact.resource) )) if contact.affiliation != 'none': uf_affiliation = helpers.get_uf_affiliation(contact.affiliation) - affiliation_str = _('%(owner_or_admin_or_member)s of this room') %\ + affiliation_str = \ + _('%(owner_or_admin_or_member)s of this group chat') %\ {'owner_or_admin_or_member': uf_affiliation} properties.append((affiliation_str, None))