Changeset 7787 for branches/gajim_0.11/src/groupchat_control.py

Timestamp:

01/06/07 12:00:50 (23 months ago)

Author:

asterix

Message:

merge changeset from trunk except pyopenssl stuff

Files:

• branches/gajim_0.11/src/groupchat_control.py (modified) (3 diffs)

branches/gajim_0.11/src/groupchat_control.py

@@ -879 +879 @@
                                 for old_file in files:
                                         if os.path.exists(old_file):
+                                                if os.path.exists(files[old_file]):
+                                                        # Windows require this
+                                                        os.remove(files[old_file])
                                                 os.rename(old_file, files[old_file])
                                 self.print_conversation(s, 'info')
@@ -1258 +1261 @@
                 elif command == 'chat' or command == 'query':
                         self.print_conversation(_('Usage: /%s <nickname>, opens a private chat'
-                                ' window to the specified occupant.') % command, 'info')
+                                ' window with the specified occupant.') % command, 'info')
                 elif command == 'clear':
                         self.print_conversation(
@@ -1287 +1290 @@
                 elif command == 'msg':
                         s = _('Usage: /%s <nickname> [message], opens a private message window'
-                                'and sends message to the occupant specified by nickname.') % \
+                                ' and sends message to the occupant specified by nickname.') % \
                                 command
                         self.print_conversation(s, 'info')