[Git][gajim/gajim][master] 10 commits: Fix some typos

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

Commits: cc7fa92b by Daniel Brötzmann at 2019-08-16T16:24:35Z Fix some typos

- - - - - d465073e by Daniel Brötzmann at 2019-08-16T16:43:21Z Remove obsolete confirm_custom_status setting

- - - - - 0ee804f5 by Daniel Brötzmann at 2019-08-16T16:43:32Z Remove obsolete muc_autorejoin_on_kick setting

- - - - - a7abfb2f by Daniel Brötzmann at 2019-08-16T16:43:32Z Remove obsolete trayicon_blink setting

- - - - - bbe6209f by Daniel Brötzmann at 2019-08-16T16:43:32Z Remove obsolete last_emoticons_dir setting

- - - - - ece96c72 by Daniel Brötzmann at 2019-08-16T16:43:33Z Remove obsolete hide_avatar_of_transport setting

- - - - - a7400573 by Daniel Brötzmann at 2019-08-16T16:43:33Z Remove obsolete attach_notifications_to_systray setting

- - - - - 29f638cb by Daniel Brötzmann at 2019-08-16T16:43:33Z Remove obsolete allow_no_log_for setting

- - - - - 35c3fb5c by Daniel Brötzmann at 2019-08-16T16:44:34Z Remove obsolete warn_when_insecure_password setting

- - - - - 3ad1d995 by Daniel Brötzmann at 2019-08-16T16:46:25Z Remove obsolete dont_ack_subscription setting

- - - - -

2 changed files:

- gajim/command_system/implementation/standard.py - gajim/common/config.py

Changes:

===================================== gajim/command_system/implementation/standard.py ===================================== @@ -330,7 +330,7 @@ class StandardGroupChatCommands(CommandContainer): 'reason': reason}})

@command(raw=True, empty=True) - @doc(_("Kick user by a nick from a group chat")) + @doc(_("Kick user from group chat by nickname")) def kick(self, who, reason): if not who in app.contacts.get_nick_list(self.account, self.room_jid): raise CommandError(_("Nickname not found"))

===================================== gajim/common/config.py ===================================== @@ -171,7 +171,6 @@ class Config: 'restore_lines': [opt_int, 10, _('Number of messages from chat history to be restored when a chat tab/window is reopened.')], 'restore_timeout': [opt_int, -1, _('How far back in time (minutes) chat history is restored. -1 means no limit.')], '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.')], - 'muc_autorejoin_on_kick': [opt_bool, False, _('Should automatic rejoin be activated when you were kicked from a group chat?')], 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and make a new line with Enter.')], 'last_roster_visible': [opt_bool, True], 'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP (previously sent messages).')], @@ -194,10 +193,8 @@ class Config: 'use_kib_mib': [opt_bool, False, _('IEC standard says KiB = 1024 bytes, KB = 1000 bytes.')], 'notify_on_all_muc_messages': [opt_bool, False], 'trayicon_notification_on_events': [opt_bool, True, _('Notify of events in the notification area.')], - '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.')], 'last_save_dir': [opt_str, ''], 'last_send_dir': [opt_str, ''], - 'last_emoticons_dir': [opt_str, ''], 'last_sounds_dir': [opt_str, ''], 'tabs_position': [opt_str, 'top'], 'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')], @@ -234,7 +231,6 @@ class Config: '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.')], 'log_contact_status_changes': [opt_bool, False], 'log_xhtml_messages': [opt_bool, False, _('Store XHTML messages in chat history instead of plain text messages.')], - 'hide_avatar_of_transport': [opt_bool, False, _('Don't show avatar for the transport itself.')], 'roster_window_skip_taskbar': [opt_bool, False, _('Don't show contact list window in the system taskbar.')], 'use_urgency_hint': [opt_bool, True, _('If enabled, Gajim makes the window flash (the default behaviour in most Window Managers) when holding pending events.')], 'notification_timeout': [opt_int, 5], @@ -252,14 +248,12 @@ class Config: '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.')], 'confirm_metacontacts': [opt_str, '', _('Show a confirmation dialog to create metacontacts? Empty string means never show the dialog.')], 'confirm_block': [opt_str, '', _('Show a confirmation dialog to block a contact? Empty string means never show the dialog.')], - 'confirm_custom_status': [opt_str, '', _('Show a confirmation dialog for a custom status? Empty string means never show the dialog.')], '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.')], '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.')], '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.')], '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.')], 'change_status_window_timeout': [opt_int, 15, _('Time of inactivity needed before the change status window closes down.')], 'max_conversation_lines': [opt_int, 500, _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.')], - 'attach_notifications_to_systray': [opt_bool, False, _('If enabled, notification windows from notification-daemon will be attached to the notification area icon.')], 'check_idle_every_foo_seconds': [opt_int, 2, _('Choose interval between 2 checks of idleness.')], '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], '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: 'autoconnect': [opt_bool, False, '', True], '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], 'restore_last_status': [opt_bool, False, _('If enabled, the last status will be restored.')], - 'autoauth': [opt_bool, False, _('If enabled, Contacts requesting authorization will be accepted automatically.')], + 'autoauth': [opt_bool, False, _('If enabled, contacts requesting authorization will be accepted automatically.')], 'active': [opt_bool, True, _('If disabled, this account will be disabled and will not appear in the contact list window.'), True], 'proxy': [opt_str, '', '', True], 'keyid': [opt_str, '', '', True], @@ -332,7 +326,6 @@ class Config: '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'.')], 'action_when_plaintext_connection': [opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be 'warn', 'connect' or 'disconnect'.')], 'warn_when_insecure_ssl_connection': [opt_bool, True, _('Show a warning dialog before using standard SSL library.')], - 'warn_when_insecure_password': [opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain connection.')], 'ignore_ssl_errors': [opt_str, '', _('List of SSL errors to ignore (space separated).')], 'use_srv': [opt_bool, True, '', True], 'use_custom_host': [opt_bool, False, '', True], @@ -340,7 +333,6 @@ class Config: 'custom_host': [opt_str, '', '', True], 'sync_with_global_status': [opt_bool, False, ], '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.')], - '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.')], 'attached_gpg_keys': [opt_str, ''], 'keep_alives_enabled': [opt_bool, True, _('If enabled, a whitespace is sent after inactivity (keep alive).')], 'ping_alives_enabled': [opt_bool, True, _('If enabled, an XMPP ping is sent after inactivity (ping alive).')], @@ -351,7 +343,6 @@ class Config: # try for 1 minutes before giving up (aka. timeout after those seconds) 'try_connecting_for_foo_secs': [opt_int, 60], 'http_auth': [opt_str, 'ask'], # yes, no, ask - 'dont_ack_subscription': [opt_bool, False, _('Jabberd2 workaround.')], # proxy65 for FT 'file_transfer_proxies': [opt_str, ''], '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: 'contact_connected': [False, 'connected.wav'], 'contact_disconnected': [False, 'disconnected.wav'], 'message_sent': [False, 'sent.wav'], - '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.')], + '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.')], 'muc_message_received': [True, 'gc_message2.wav', _('Sound to play when any group chat message arrives.')], }

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7207b824927ebf9cbc2a958b4dd0ef174d...