Show
Ignore:
Timestamp:
02/06/07 20:54:30 (22 months ago)
Author:
asterix
Message:

merge diff from trunk

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/gajim_0.11/src/config.py

    r7888 r7940  
    23832383                prompt += _('Can be one of the following:\n' 
    23842384                                '1. user@domain/resource (only that resource matches).\n' 
    2385                                 '2. user@domain (any resource matches).\n' 
     2385                                '2. user@domain (any resource matches).\n' 
    23862386                                '3. domain/resource (only that resource matches).\n' 
    23872387                                '4. domain (the domain itself matches, as does any user@domain,\n'