Philipp Hörist pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes:

  • gajim/command_system/implementation/standard.py
    ... ... @@ -330,7 +330,7 @@ class StandardGroupChatCommands(CommandContainer):
    330 330
                        'reason': reason}})
    
    331 331
     
    
    332 332
         @command(raw=True, empty=True)
    
    333
    -    @doc(_("Kick user by a nick from a group chat"))
    
    333
    +    @doc(_("Kick user from group chat by nickname"))
    
    334 334
         def kick(self, who, reason):
    
    335 335
             if not who in app.contacts.get_nick_list(self.account, self.room_jid):
    
    336 336
                 raise CommandError(_("Nickname not found"))
    

  • gajim/common/config.py
    ... ... @@ -171,7 +171,6 @@ class Config:
    171 171
             'restore_lines': [opt_int, 10, _('Number of messages from chat history to be restored when a chat tab/window is reopened.')],
    
    172 172
             'restore_timeout': [opt_int, -1, _('How far back in time (minutes) chat history is restored. -1 means no limit.')],
    
    173 173
             'muc_autorejoin_timeout': [opt_int, 1, _('How many seconds to wait before trying to automatically rejoin a group chat you were disconnected from. Set to 0 to disable automatic rejoining.')],
    
    174
    -        'muc_autorejoin_on_kick': [opt_bool, False, _('Should automatic rejoin be activated when you were kicked from a group chat?')],
    
    175 174
             'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and make a new line with Enter.')],
    
    176 175
             'last_roster_visible': [opt_bool, True],
    
    177 176
             'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP (previously sent messages).')],
    
    ... ... @@ -194,10 +193,8 @@ class Config:
    194 193
             'use_kib_mib': [opt_bool, False, _('IEC standard says KiB = 1024 bytes, KB = 1000 bytes.')],
    
    195 194
             'notify_on_all_muc_messages': [opt_bool, False],
    
    196 195
             'trayicon_notification_on_events': [opt_bool, True, _('Notify of events in the notification area.')],
    
    197
    -        'trayicon_blink': [opt_bool, True, _('If disabled, Gajim will display a static event icon instead of the blinking status icon in the notification area when notifying about an event.')],
    
    198 196
             'last_save_dir': [opt_str, ''],
    
    199 197
             'last_send_dir': [opt_str, ''],
    
    200
    -        'last_emoticons_dir': [opt_str, ''],
    
    201 198
             'last_sounds_dir': [opt_str, ''],
    
    202 199
             'tabs_position': [opt_str, 'top'],
    
    203 200
             'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')],
    
    ... ... @@ -234,7 +231,6 @@ class Config:
    234 231
             'print_status_muc_default': [opt_bool, False, _('Default Setting: Show a status message for all status changes (away, dnd, etc.) of users in a group chat.')],
    
    235 232
             'log_contact_status_changes': [opt_bool, False],
    
    236 233
             'log_xhtml_messages': [opt_bool, False, _('Store XHTML messages in chat history instead of plain text messages.')],
    
    237
    -        'hide_avatar_of_transport': [opt_bool, False, _('Don\'t show avatar for the transport itself.')],
    
    238 234
             'roster_window_skip_taskbar': [opt_bool, False, _('Don\'t show contact list window in the system taskbar.')],
    
    239 235
             'use_urgency_hint': [opt_bool, True, _('If enabled, Gajim makes the window flash (the default behaviour in most Window Managers) when holding pending events.')],
    
    240 236
             'notification_timeout': [opt_int, 5],
    
    ... ... @@ -252,14 +248,12 @@ class Config:
    252 248
             'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl+Tab switches to the next composing tab when there are no tabs with messages pending.')],
    
    253 249
             'confirm_metacontacts': [opt_str, '', _('Show a confirmation dialog to create metacontacts? Empty string means never show the dialog.')],
    
    254 250
             'confirm_block': [opt_str, '', _('Show a confirmation dialog to block a contact? Empty string means never show the dialog.')],
    
    255
    -        'confirm_custom_status': [opt_str, '', _('Show a confirmation dialog for a custom status? Empty string means never show the dialog.')],
    
    256 251
             'enable_negative_priority': [opt_bool, False, _('If enabled, you will be able to set a negative priority to your account in the Accounts window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.')],
    
    257 252
             'show_contacts_number': [opt_bool, True, _('If enabled, Gajim will show both the number of online and total contacts in account rows as well as in group rows.')],
    
    258 253
             'treat_incoming_messages': [opt_str, 'chat', _('Can be empty, \'chat\' or \'normal\'. If not empty, all incoming messages are treated as if they were of this type.')],
    
    259 254
             'scroll_roster_to_last_message': [opt_bool, True, _('If enabled, Gajim will scroll and select the contact who sent you the last message, if the chat window is not already opened.')],
    
    260 255
             'change_status_window_timeout': [opt_int, 15, _('Time of inactivity needed before the change status window closes down.')],
    
    261 256
             'max_conversation_lines': [opt_int, 500, _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.')],
    
    262
    -        'attach_notifications_to_systray': [opt_bool, False, _('If enabled, notification windows from notification-daemon will be attached to the notification area icon.')],
    
    263 257
             'check_idle_every_foo_seconds': [opt_int, 2, _('Choose interval between 2 checks of idleness.')],
    
    264 258
             'uri_schemes': [opt_str, 'aaa:// aaas:// acap:// cap:// cid: crid:// data: dav: dict:// dns: fax: file:/ ftp:// geo: go: gopher:// h323: http:// https:// iax: icap:// im: imap:// info: ipp:// iris: iris.beep: iris.xpc: iris.xpcs: iris.lwz: ldap:// mid: modem: msrp:// msrps:// mtqp:// mupdate:// news: nfs:// nntp:// opaquelocktoken: pop:// pres: prospero:// rtsp:// service: shttp:// sip: sips: sms: snmp:// soap.beep:// soap.beeps:// tag: tel: telnet:// tftp:// thismessage:/ tip:// tv: urn:// vemmi:// xmlrpc.beep:// xmlrpc.beeps:// z39.50r:// z39.50s:// about: apt: cvs:// daap:// ed2k:// feed: fish:// git:// iax2: irc:// ircs:// ldaps:// magnet: mms:// rsync:// ssh:// svn:// sftp:// smb:// webcal:// aesgcm://', _('Valid URI schemes. Only schemes in this list will be accepted as \'real\' URI (mailto and xmpp are handled separately).'), True],
    
    265 259
             'shell_like_completion': [opt_bool, False, _('If enabled, completion in group chats will be like a shell auto-completion.')],
    
    ... ... @@ -321,7 +315,7 @@ class Config:
    321 315
                 'autoconnect': [opt_bool, False, '', True],
    
    322 316
                 'autoconnect_as': [opt_str, 'online', _('Status to be used automatically when connecting. Can be \'online\', \'chat\', \'away\', \'xa\', \'dnd\' or \'invisible\'. NOTE: This option is used only if \'restore_last_status\' is disabled.'), True],
    
    323 317
                 'restore_last_status': [opt_bool, False, _('If enabled, the last status will be restored.')],
    
    324
    -            'autoauth': [opt_bool, False, _('If enabled, Contacts requesting authorization will be accepted automatically.')],
    
    318
    +            'autoauth': [opt_bool, False, _('If enabled, contacts requesting authorization will be accepted automatically.')],
    
    325 319
                 'active': [opt_bool, True, _('If disabled, this account will be disabled and will not appear in the contact list window.'), True],
    
    326 320
                 'proxy': [opt_str, '', '', True],
    
    327 321
                 'keyid': [opt_str, '', '', True],
    
    ... ... @@ -332,7 +326,6 @@ class Config:
    332 326
                 'authentication_mechanisms': [opt_str, '', _('List of authentication mechanisms to try (space separated). Can contain \'ANONYMOUS\', \'EXTERNAL\', \'GSSAPI\', \'SCRAM-SHA-1-PLUS\', \'SCRAM-SHA-1\', \'DIGEST-MD5\', \'PLAIN\', \'X-MESSENGER-OAUTH2\' or \'XEP-0078\'.')],
    
    333 327
                 'action_when_plaintext_connection': [opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\' or \'disconnect\'.')],
    
    334 328
                 'warn_when_insecure_ssl_connection': [opt_bool, True, _('Show a warning dialog before using standard SSL library.')],
    
    335
    -            'warn_when_insecure_password': [opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain connection.')],
    
    336 329
                 'ignore_ssl_errors': [opt_str, '', _('List of SSL errors to ignore (space separated).')],
    
    337 330
                 'use_srv': [opt_bool, True, '', True],
    
    338 331
                 'use_custom_host': [opt_bool, False, '', True],
    
    ... ... @@ -340,7 +333,6 @@ class Config:
    340 333
                 'custom_host': [opt_str, '', '', True],
    
    341 334
                 'sync_with_global_status': [opt_bool, False, ],
    
    342 335
                 'no_log_for': [opt_str, '', _('List of XMPP Addresses (space separated) for which you do not want to store chat history. You can also add the name of an account to disable storing chat history for this account.')],
    
    343
    -            'allow_no_log_for': [opt_str, '', _('List of XMPP Addresses (space separated) for which you accept to not store chat history if your contact does not want to.')],
    
    344 336
                 'attached_gpg_keys': [opt_str, ''],
    
    345 337
                 'keep_alives_enabled': [opt_bool, True, _('If enabled, a whitespace is sent after inactivity (keep alive).')],
    
    346 338
                 'ping_alives_enabled': [opt_bool, True, _('If enabled, an XMPP ping is sent after inactivity (ping alive).')],
    
    ... ... @@ -351,7 +343,6 @@ class Config:
    351 343
                 # try for 1 minutes before giving up (aka. timeout after those seconds)
    
    352 344
                 'try_connecting_for_foo_secs': [opt_int, 60],
    
    353 345
                 'http_auth': [opt_str, 'ask'], # yes, no, ask
    
    354
    -            'dont_ack_subscription': [opt_bool, False, _('Jabberd2 workaround.')],
    
    355 346
                 # proxy65 for FT
    
    356 347
                 'file_transfer_proxies': [opt_str, ''],
    
    357 348
                 'use_ft_proxies': [opt_bool, False, _('If enabled, Gajim will use your IP and proxies defined in \'file_transfer_proxies\' option for file transfers.'), True],
    
    ... ... @@ -477,7 +468,7 @@ class Config:
    477 468
             'contact_connected': [False, 'connected.wav'],
    
    478 469
             'contact_disconnected': [False, 'disconnected.wav'],
    
    479 470
             'message_sent': [False, 'sent.wav'],
    
    480
    -        'muc_message_highlight': [True, 'gc_message1.wav', _('Sound to play when a group chat message contains one of the words in \'muc_highlight_words\' your nickname is mentioned.')],
    
    471
    +        'muc_message_highlight': [True, 'gc_message1.wav', _('Sound to play when a group chat message contains one of the words in \'muc_highlight_words\' or your nickname is mentioned.')],
    
    481 472
             'muc_message_received': [True, 'gc_message2.wav', _('Sound to play when any group chat message arrives.')],
    
    482 473
         }
    
    483 474