Changeset 7841 for branches/gajim_0.11/src/common/config.py

Timestamp:

01/15/07 19:51:27 (23 months ago)

Author:

asterix

Message:

merge usefull diff from trunk

Files:

• branches/gajim_0.11/src/common/config.py (modified) (1 diff)

branches/gajim_0.11/src/common/config.py

@@ -131 +131 @@
                 'latest_disco_addresses': [ opt_str, '' ],
                 'recently_groupchat': [ opt_str, '' ],
-                'before_nickname': [ opt_str, '' ],
-                'time_stamp': [ opt_str, '[%H:%M] ' ],
-                'after_nickname': [ opt_str, ':' ],
+                'time_stamp': [ opt_str, '[%X] ', _('This option let you customize timestamp that is printed in conversation. For exemple "[%H:%M] " will show "[hour:minute] ". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html') ],
+                'before_nickname': [ opt_str, '', _('Characters that are printed before the nickname in conversations') ],
+                'after_nickname': [ opt_str, ':', _('Characters that are printed after the nickname in conversations') ],
                 'send_os_info': [ opt_bool, True ],
                 'set_status_msg_from_current_music_track': [ opt_bool, False ],