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

Commits: 77c1f4d6 by lovetox at 2022-05-29T18:51:17+02:00 refactor: Don’t translate unused strings

Strings in the old config backend are not displayed anywhere anymore.

- - - - -

1 changed file:

- gajim/common/config.py

Changes:

===================================== gajim/common/config.py ===================================== @@ -39,7 +39,6 @@ from gi.repository import GLib

import gajim -from gajim.common.i18n import _

@unique @@ -51,6 +50,7 @@ class Option(IntEnum): # Option.DESC also should be there RESTART = 3

+ opt_int = ['integer', 0] opt_str = ['string', 0] opt_bool = ['boolean', 0] @@ -67,148 +67,146 @@ class Config: # name: [ type, default_value, help_string, restart ] 'autopopup': [opt_bool, False], 'autopopupaway': [opt_bool, False], - 'sounddnd': [opt_bool, False, _('Play sound even when being busy.')], + 'sounddnd': [opt_bool, False, 'Play sound even when being busy.'], 'showoffline': [opt_bool, True], - 'show_only_chat_and_online': [opt_bool, False, _('Show only online and free for chat contacts in the contact list.')], + 'show_only_chat_and_online': [opt_bool, False, 'Show only online and free for chat contacts in the contact list.'], 'show_transports_group': [opt_bool, True], 'autoaway': [opt_bool, True], - 'autoawaytime': [opt_int, 5, _('Time in minutes, after which your status changes to away.')], - 'autoaway_message': [opt_str, _('$S (Away: Idle more than $T min)'), _('$S will be replaced by current status message, $T by the 'autoawaytime' value.')], + 'autoawaytime': [opt_int, 5, 'Time in minutes, after which your status changes to away.'], + 'autoaway_message': [opt_str, '$S (Away: Idle more than $T min)', '$S will be replaced by current status message, $T by the 'autoawaytime' value.'], 'autoxa': [opt_bool, True], - 'autoxatime': [opt_int, 15, _('Time in minutes, after which your status changes to not available.')], - 'autoxa_message': [opt_str, _('$S (Not available: Idle more than $T min)'), _('$S will be replaced by current status message, $T by the 'autoxatime' value.')], + 'autoxatime': [opt_int, 15, 'Time in minutes, after which your status changes to not available.'], + 'autoxa_message': [opt_str, '$S (Not available: Idle more than $T min)', '$S will be replaced by current status message, $T by the 'autoxatime' value.'], 'ask_online_status': [opt_bool, False], 'ask_offline_status': [opt_bool, False], - 'trayicon': [opt_str, 'always', _('When to show the notification area icon. Can be 'never', 'on_event', and 'always'.'), False], - 'allow_hide_roster': [opt_bool, False, _('Allow to hide the contact list window even if the notification area icon is not shown.'), False], + 'trayicon': [opt_str, 'always', 'When to show the notification area icon. Can be 'never', 'on_event', and 'always'.', False], + 'allow_hide_roster': [opt_bool, False, 'Allow to hide the contact list window even if the notification area icon is not shown.', False], 'iconset': [opt_str, DEFAULT_ICONSET, '', True], 'use_transports_iconsets': [opt_bool, True, '', True], - 'collapsed_rows': [opt_str, '', _('List of rows (accounts and groups) that are collapsed (space separated).'), True], + 'collapsed_rows': [opt_str, '', 'List of rows (accounts and groups) that are collapsed (space separated).', True], 'roster_theme': [opt_str, 'default', '', True], 'mergeaccounts': [opt_bool, False, '', True], 'sort_by_show_in_roster': [opt_bool, True, '', True], 'sort_by_show_in_muc': [opt_bool, False, '', True], 'use_speller': [opt_bool, False, ], 'show_xhtml': [opt_bool, True, ], - 'speller_language': [opt_str, '', _('Language used for spell checking.')], + 'speller_language': [opt_str, '', 'Language used for spell checking.'], 'emoticons_theme': [opt_str, 'noto-emoticons', '', True], 'ascii_formatting': [opt_bool, True, - _('Treat * / _ pairs as possible formatting characters.'), True], - 'show_ascii_formatting_chars': [opt_bool, True, _('If enabled, do not ' - 'remove */_ . So *abc* will be bold but with * * not removed.')], + 'Treat * / _ pairs as possible formatting characters.', True], + 'show_ascii_formatting_chars': [opt_bool, True, 'If enabled, do not ' + 'remove */_ . So *abc* will be bold but with * * not removed.'], 'sounds_on': [opt_bool, True], - 'gc_refer_to_nick_char': [opt_str, ',', _('Character to add after nickname when using nickname completion (tab) in group chat.')], + 'gc_refer_to_nick_char': [opt_str, ',', 'Character to add after nickname when using nickname completion (tab) in group chat.'], 'msgwin-max-state': [opt_bool, False], 'msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide 'msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide 'msgwin-width': [opt_int, 500], 'msgwin-height': [opt_int, 440], - 'save-roster-position': [opt_bool, True, _('If enabled, Gajim will save the contact list window position when hiding it, and restore it when showing the contact list window again.')], + 'save-roster-position': [opt_bool, True, 'If enabled, Gajim will save the contact list window position when hiding it, and restore it when showing the contact list window again.'], 'roster_x-position': [opt_int, 0], 'roster_y-position': [opt_int, 0], 'roster_width': [opt_int, 200], 'roster_height': [opt_int, 400], - 'roster_on_the_right': [opt_bool, False, _('Place the contact list on the right in single window mode'), True], + 'roster_on_the_right': [opt_bool, False, 'Place the contact list on the right in single window mode', True], 'latest_disco_addresses': [opt_str, ''], - 'time_stamp': [opt_str, '%x | %X ', _('This option lets you customize the timestamp that is printed in conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).')], - 'change_roster_title': [opt_bool, True, _('If enabled, Gajim will add * and [n] in contact list window title.')], - 'restore_timeout': [opt_int, -1, _('How far back in time (minutes) chat history is restored. -1 means no limit.')], - 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and make a new line with Enter.')], + 'time_stamp': [opt_str, '%x | %X ', 'This option lets you customize the timestamp that is printed in conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).'], + 'change_roster_title': [opt_bool, True, 'If enabled, Gajim will add * and [n] in contact list window title.'], + 'restore_timeout': [opt_int, -1, 'How far back in time (minutes) chat history is restored. -1 means no limit.'], + '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).')], + 'key_up_lines': [opt_int, 25, 'How many lines to store for Ctrl+KeyUP (previously sent messages).'], 'version': [opt_str, gajim.__version__], # which version created the config 'search_engine': [opt_str, 'https://duckduckgo.com/?q=%s'], - 'dictionary_url': [opt_str, 'WIKTIONARY', _('Either a custom URL with %%s in it (where %%s is the word/phrase) or 'WIKTIONARY' (which means use Wikitionary).')], + 'dictionary_url': [opt_str, 'WIKTIONARY', 'Either a custom URL with %%s in it (where %%s is the word/phrase) or 'WIKTIONARY' (which means use Wikitionary).'], 'always_english_wikipedia': [opt_bool, False], 'always_english_wiktionary': [opt_bool, True], - 'remote_control': [opt_bool, False, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], - 'confirm_paste_image': [opt_bool, True, _('Ask before pasting an image.')], - 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], - 'confirm_close_multiple_tabs': [opt_bool, True, _('Ask before closing tabbed chat window if there are chats that can lose data (chat, private chat).')], + 'remote_control': [opt_bool, False, 'If checked, Gajim can be controlled remotely using gajim-remote.', True], + 'confirm_paste_image': [opt_bool, True, 'Ask before pasting an image.'], + 'confirm_close_muc': [opt_bool, True, 'Ask before closing a group chat tab/window.'], + 'confirm_close_multiple_tabs': [opt_bool, True, 'Ask before closing tabbed chat window if there are chats that can lose data (chat, private chat).'], 'notify_on_file_complete': [opt_bool, True], 'file_transfers_port': [opt_int, 28011], - 'ft_add_hosts_to_send': [opt_str, '', _('List of send hosts (comma separated) in addition to local interfaces for file transfers (in case of address translation/port forwarding).')], - 'use_kib_mib': [opt_bool, False, _('IEC standard says KiB = 1024 bytes, KB = 1000 bytes.')], + 'ft_add_hosts_to_send': [opt_str, '', 'List of send hosts (comma separated) in addition to local interfaces for file transfers (in case of address translation/port forwarding).'], + '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_notification_on_events': [opt_bool, True, 'Notify of events in the notification area.'], 'last_save_dir': [opt_str, ''], 'last_send_dir': [opt_str, ''], 'last_sounds_dir': [opt_str, ''], 'tabs_position': [opt_str, 'left'], - 'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')], - 'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')], - 'tabs_close_button': [opt_bool, True, _('Show close button in tab?')], - 'notification_preview_message': [opt_bool, True, _('Preview new messages in notification popup?')], + 'tabs_always_visible': [opt_bool, False, 'Show tab when only one conversation?'], + 'tabs_border': [opt_bool, False, 'Show tabbed notebook border in chat windows?'], + 'tabs_close_button': [opt_bool, True, 'Show close button in tab?'], + 'notification_preview_message': [opt_bool, True, 'Preview new messages in notification popup?'], 'notification_position_x': [opt_int, -1], 'notification_position_y': [opt_int, -1], - 'muc_highlight_words': [opt_str, '', _('A list of words (semicolon separated) that will be highlighted in group chats.')], - 'quit_on_roster_x_button': [opt_bool, False, _('If enabled, Gajim quits when clicking the X button of your Window Manager. This setting is taken into account only if the notification area icon is used.')], - 'hide_on_roster_x_button': [opt_bool, False, _('If enabled, Gajim hides the contact list window when pressing the X button instead of minimizing into the notification area.')], - 'show_status_msgs_in_roster': [opt_bool, True, _('If enabled, Gajim will display the status message (if not empty) underneath the contact name in the contact list window.'), True], + 'muc_highlight_words': [opt_str, '', 'A list of words (semicolon separated) that will be highlighted in group chats.'], + 'quit_on_roster_x_button': [opt_bool, False, 'If enabled, Gajim quits when clicking the X button of your Window Manager. This setting is taken into account only if the notification area icon is used.'], + 'hide_on_roster_x_button': [opt_bool, False, 'If enabled, Gajim hides the contact list window when pressing the X button instead of minimizing into the notification area.'], + 'show_status_msgs_in_roster': [opt_bool, True, 'If enabled, Gajim will display the status message (if not empty) underneath the contact name in the contact list window.', True], 'show_avatars_in_roster': [opt_bool, True, '', True], 'show_mood_in_roster': [opt_bool, True, '', True], 'show_activity_in_roster': [opt_bool, True, '', True], 'show_tunes_in_roster': [opt_bool, True, '', True], 'show_location_in_roster': [opt_bool, True, '', True], - 'avatar_position_in_roster': [opt_str, 'right', _('Define the position of avatars in the contact list. Can be 'left' or 'right'.'), True], - 'print_status_in_chats': [opt_bool, False, _('If disabled, Gajim will no longer print status messages in chats when a contact changes their status (and/or their status message).')], - 'print_join_left_default': [opt_bool, False, _('Default Setting: Show a status message for every join or leave in a group chat.')], - '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.')], + 'avatar_position_in_roster': [opt_str, 'right', 'Define the position of avatars in the contact list. Can be 'left' or 'right'.', True], + 'print_status_in_chats': [opt_bool, False, 'If disabled, Gajim will no longer print status messages in chats when a contact changes their status (and/or their status message).'], + 'print_join_left_default': [opt_bool, False, 'Default Setting: Show a status message for every join or leave in a group chat.'], + '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], - '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.')], + '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], - 'one_message_window': [opt_str, 'always', - #always, never, peracct, pertype should not be translated - _('Controls the window where new messages are placed.\n'always' - All messages are sent to a single window.\n'always_with_roster' - Like 'always' but the messages are in a single window along with the contact list.\n'never' - All messages get their own window.\n'peracct' - Messages for each account are sent to a specific window.\n'pertype' - Each message type (e.g. chats vs. group chats) is sent to a specific window.')], - 'show_roster_on_startup':[opt_str, 'always', _('Show contact list window on startup.\n'always' - Always show contact list window.\n'never' - Never show contact list window.\n'last_state' - Restore last state of the contact list window.')], - 'escape_key_closes': [opt_bool, False, _('If enabled, pressing Esc closes a tab/window.')], - 'hide_groupchat_banner': [opt_bool, False, _('Hides the banner in a group chat window.')], - 'hide_chat_banner': [opt_bool, False, _('Hides the banner in a 1:1 chat window.')], - 'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the group chat participants list in a group chat window.')], - 'chat_merge_consecutive_nickname': [opt_bool, False, _('In a chat, show the nickname at the beginning of a line only when it's not the same person talking as in the previous message.')], - '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_block': [opt_str, '', _('Show a confirmation dialog to block a contact? 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.')], - '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.')], - '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: 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.')], + 'one_message_window': [opt_str, 'always', 'Controls the window where new messages are placed.\n'always' - All messages are sent to a single window.\n'always_with_roster' - Like 'always' but the messages are in a single window along with the contact list.\n'never' - All messages get their own window.\n'peracct' - Messages for each account are sent to a specific window.\n'pertype' - Each message type (e.g. chats vs. group chats) is sent to a specific window.'], + 'show_roster_on_startup': [opt_str, 'always', 'Show contact list window on startup.\n'always' - Always show contact list window.\n'never' - Never show contact list window.\n'last_state' - Restore last state of the contact list window.'], + 'escape_key_closes': [opt_bool, False, 'If enabled, pressing Esc closes a tab/window.'], + 'hide_groupchat_banner': [opt_bool, False, 'Hides the banner in a group chat window.'], + 'hide_chat_banner': [opt_bool, False, 'Hides the banner in a 1:1 chat window.'], + 'hide_groupchat_occupants_list': [opt_bool, False, 'Hides the group chat participants list in a group chat window.'], + 'chat_merge_consecutive_nickname': [opt_bool, False, 'In a chat, show the nickname at the beginning of a line only when it's not the same person talking as in the previous message.'], + '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_block': [opt_str, '', 'Show a confirmation dialog to block a contact? 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.'], + '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.'], + '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: 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.'], 'audio_input_device': [opt_str, 'autoaudiosrc ! volume name=gajim_vol'], 'audio_output_device': [opt_str, 'autoaudiosink'], 'video_input_device': [opt_str, 'autovideosrc'], - 'video_framerate': [opt_str, '', _('Optionally fix Jingle output video framerate. Example: 10/1 or 25/2.')], - 'video_size': [opt_str, '', _('Optionally resize Jingle output video. Example: 320x240.')], - 'video_see_self': [opt_bool, True, _('If enabled, you will see your webcam's video stream as well.')], + 'video_framerate': [opt_str, '', 'Optionally fix Jingle output video framerate. Example: 10/1 or 25/2.'], + 'video_size': [opt_str, '', 'Optionally resize Jingle output video. Example: 320x240.'], + 'video_see_self': [opt_bool, True, 'If enabled, you will see your webcam's video stream as well.'], 'audio_input_volume': [opt_int, 50], 'audio_output_volume': [opt_int, 50], - 'use_stun_server': [opt_bool, False, _('If enabled, Gajim will try to use a STUN server when using Jingle. The one in 'stun_server' option, or the one given by the XMPP server.')], - 'stun_server': [opt_str, '', _('STUN server to use when using Jingle')], - 'global_proxy': [opt_str, '', _('Proxy used for all outgoing connections if the account does not have a specific proxy configured.')], - 'ignore_incoming_attention': [opt_bool, False, _('If enabled, Gajim will ignore incoming attention requests ('wizz').')], - 'remember_opened_chat_controls': [opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')], - 'positive_184_ack': [opt_bool, False, _('If enabled, Gajim will display an icon to show that sent messages have been received by your contact.')], - 'use_keyring': [opt_bool, True, _('If enabled, Gajim will use the System's Keyring to store account passwords.')], - 'remote_commands': [opt_bool, False, _('If enabled, Gajim will execute XEP-0146 Commands.')], - 'dark_theme': [opt_int, 2, _('2: System, 1: Enabled, 0: Disabled')], - 'public_room_sync_threshold': [opt_int, 1, _('Maximum history in days we request from a public group chat archive. 0: As much as possible.')], - 'private_room_sync_threshold': [opt_int, 0, _('Maximum history in days we request from a private group chat archive. 0: As much as possible.')], - 'show_subject_on_join': [opt_bool, True, _('If enabled, Gajim shows the group chat subject in the chat window when joining.')], - 'show_chatstate_in_roster': [opt_bool, True, _('If enabled, the contact row is colored according to the current chat state of the contact.')], - 'show_chatstate_in_tabs': [opt_bool, True, _('If enabled, the tab is colored according to the current chat state of the contact.')], - 'show_chatstate_in_banner': [opt_bool, True, _('Shows a text in the banner that describes the current chat state of the contact.')], - 'send_chatstate_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to contacts. Possible values: all, composing_only, disabled')], - 'send_chatstate_muc_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: 'all', 'composing_only', 'disabled'')], + 'use_stun_server': [opt_bool, False, 'If enabled, Gajim will try to use a STUN server when using Jingle. The one in 'stun_server' option, or the one given by the XMPP server.'], + 'stun_server': [opt_str, '', 'STUN server to use when using Jingle'], + 'global_proxy': [opt_str, '', 'Proxy used for all outgoing connections if the account does not have a specific proxy configured.'], + 'ignore_incoming_attention': [opt_bool, False, 'If enabled, Gajim will ignore incoming attention requests ('wizz'.'], + 'remember_opened_chat_controls': [opt_bool, True, 'If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.'], + 'positive_184_ack': [opt_bool, False, 'If enabled, Gajim will display an icon to show that sent messages have been received by your contact.'], + 'use_keyring': [opt_bool, True, 'If enabled, Gajim will use the System's Keyring to store account passwords.'], + 'remote_commands': [opt_bool, False, 'If enabled, Gajim will execute XEP-0146 Commands.'], + 'dark_theme': [opt_int, 2, '2: System, 1: Enabled, 0: Disabled'], + 'public_room_sync_threshold': [opt_int, 1, 'Maximum history in days we request from a public group chat archive. 0: As much as possible.'], + 'private_room_sync_threshold': [opt_int, 0, 'Maximum history in days we request from a private group chat archive. 0: As much as possible.'], + 'show_subject_on_join': [opt_bool, True, 'If enabled, Gajim shows the group chat subject in the chat window when joining.'], + 'show_chatstate_in_roster': [opt_bool, True, 'If enabled, the contact row is colored according to the current chat state of the contact.'], + 'show_chatstate_in_tabs': [opt_bool, True, 'If enabled, the tab is colored according to the current chat state of the contact.'], + 'show_chatstate_in_banner': [opt_bool, True, 'Shows a text in the banner that describes the current chat state of the contact.'], + 'send_chatstate_default': [opt_str, 'composing_only', 'Chat state notifications that are sent to contacts. Possible values: all, composing_only, disabled'], + 'send_chatstate_muc_default': [opt_str, 'composing_only', 'Chat state notifications that are sent to the group chat. Possible values: 'all', 'composing_only', 'disabled''], 'muclumbus_api_jid': [opt_str, 'api@search.jabber.network'], 'muclumbus_api_http_uri': [opt_str, 'https://search.jabber.network/api/1.0/search'], - 'muclumbus_api_pref': [opt_str, 'http', _('API Preferences. Possible values: 'http', 'iq'')], - 'command_system_execute': [opt_bool, False, _('If enabled, Gajim will execute commands (/show, /sh, /execute, /exec).')], - 'groupchat_roster_width': [opt_int, 210, _('Width of group chat roster in pixel')], - 'dev_force_bookmark_2': [opt_bool, False, _('Force Bookmark 2 usage')], - 'show_help_start_chat': [opt_bool, True, _('Shows an info bar with helpful hints in the Start / Join Chat dialog')], - 'check_for_update': [opt_bool, True, _('Check for Gajim updates periodically')], - 'last_update_check': [opt_str, '', _('Date of the last update check')], + 'muclumbus_api_pref': [opt_str, 'http', 'API Preferences. Possible values: 'http', 'iq''], + 'command_system_execute': [opt_bool, False, 'If enabled, Gajim will execute commands (/show, /sh, /execute, /exec).'], + 'groupchat_roster_width': [opt_int, 210, 'Width of group chat roster in pixel'], + 'dev_force_bookmark_2': [opt_bool, False, 'Force Bookmark 2 usage'], + 'show_help_start_chat': [opt_bool, True, 'Shows an info bar with helpful hints in the Start / Join Chat dialog'], + 'check_for_update': [opt_bool, True, 'Check for Gajim updates periodically'], + 'last_update_check': [opt_str, '', 'Date of the last update check'], 'always_ask_for_status_message': [opt_bool, False], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]]

@@ -226,35 +224,34 @@ class Config: 'password': [opt_str, ''], 'resource': [opt_str, 'gajim.$rand', '', True], 'priority': [opt_int, 0, '', True], - 'adjust_priority_with_status': [opt_bool, False, _('Priority will change automatically according to your status. Priorities are defined in 'autopriority_*' options.')], + 'adjust_priority_with_status': [opt_bool, False, 'Priority will change automatically according to your status. Priorities are defined in 'autopriority_*' options.'], 'autopriority_online': [opt_int, 50], 'autopriority_chat': [opt_int, 50], 'autopriority_away': [opt_int, 40], 'autopriority_xa': [opt_int, 30], 'autopriority_dnd': [opt_int, 20], 'autoconnect': [opt_bool, False, '', 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.')], - 'active': [opt_bool, True, _('If disabled, this account will be disabled and will not appear in the contact list window.'), 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.'], + '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], 'keyname': [opt_str, '', '', True], - 'use_plain_connection': [opt_bool, False, _('Use an unencrypted connection to the server')], + 'use_plain_connection': [opt_bool, False, 'Use an unencrypted connection to the server'], 'confirm_unencrypted_connection': [opt_bool, True], 'use_custom_host': [opt_bool, False, '', True], 'custom_port': [opt_int, 5222, '', True], 'custom_host': [opt_str, '', '', True], - 'custom_type': [opt_str, 'START TLS', _('ConnectionType: START TLS, DIRECT TLS or PLAIN'), True], + 'custom_type': [opt_str, 'START TLS', 'ConnectionType: START TLS, DIRECT TLS or PLAIN', 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.')], + '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.'], 'attached_gpg_keys': [opt_str, ''], - 'http_auth': [opt_str, 'ask'], # yes, no, ask - # proxy65 for FT + 'http_auth': [opt_str, 'ask'], # yes, no, ask '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], - 'test_ft_proxies_on_startup': [opt_bool, False, _('If enabled, Gajim will test file transfer proxies on startup to be sure they work. Openfire's proxies are known to fail this test even if they work.')], - 'msgwin-x-position': [opt_int, -1], # Default is to let the wm decide - 'msgwin-y-position': [opt_int, -1], # Default is to let the wm decide + '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], + 'test_ft_proxies_on_startup': [opt_bool, False, 'If enabled, Gajim will test file transfer proxies on startup to be sure they work. Openfire's proxies are known to fail this test even if they work.'], + 'msgwin-x-position': [opt_int, -1], # Default is to let the wm decide + 'msgwin-y-position': [opt_int, -1], # Default is to let the wm decide 'msgwin-width': [opt_int, 480], 'msgwin-height': [opt_int, 440], 'is_zeroconf': [opt_bool, False], @@ -264,21 +261,21 @@ class Config: 'zeroconf_last_name': [opt_str, '', '', True], 'zeroconf_jabber_id': [opt_str, '', '', True], 'zeroconf_email': [opt_str, '', '', True], - 'answer_receipts': [opt_bool, True, _('If enabled, Gajim will answer to message receipt requests.')], + 'answer_receipts': [opt_bool, True, 'If enabled, Gajim will answer to message receipt requests.'], 'publish_tune': [opt_bool, False], 'publish_location': [opt_bool, False], 'request_user_data': [opt_bool, True], 'ignore_unknown_contacts': [opt_bool, False], - 'send_os_info': [opt_bool, True, _('Allow Gajim to send information about the operating system you are running.')], - 'send_time_info': [opt_bool, True, _('Allow Gajim to send your local time.')], + 'send_os_info': [opt_bool, True, 'Allow Gajim to send information about the operating system you are running.'], + 'send_time_info': [opt_bool, True, 'Allow Gajim to send your local time.'], 'send_idle_time': [opt_bool, True], 'roster_version': [opt_str, ''], - 'subscription_request_msg': [opt_str, '', _('Message that is sent to contacts you want to add.')], - 'ft_send_local_ips': [opt_bool, True, _('If enabled, Gajim will send your local IP so your contact can connect to your machine for file transfers.')], - 'opened_chat_controls': [opt_str, '', _('List of XMPP Addresses (space separated) for which the chat window will be re-opened on next startup.')], + 'subscription_request_msg': [opt_str, '', 'Message that is sent to contacts you want to add.'], + 'ft_send_local_ips': [opt_bool, True, 'If enabled, Gajim will send your local IP so your contact can connect to your machine for file transfers.'], + 'opened_chat_controls': [opt_str, '', 'List of XMPP Addresses (space separated) for which the chat window will be re-opened on next startup.'], 'recent_groupchats': [opt_str, ''], - 'filetransfer_preference' : [opt_str, 'httpupload', _('Preferred file transfer mechanism for file drag&drop on a chat window. Can be 'httpupload' (default) or 'jingle'.')], - 'allow_posh': [opt_bool, True, _('Allow certificate verification with POSH.')], + 'filetransfer_preference': [opt_str, 'httpupload', 'Preferred file transfer mechanism for file drag&drop on a chat window. Can be 'httpupload' (default) or 'jingle'.'], + 'allow_posh': [opt_bool, True, 'Allow certificate verification with POSH.'], }, {}), 'statusmsg': ({ 'message': [opt_str, ''], @@ -301,32 +298,32 @@ class Config: 'pass': [opt_str, ''], }, {}), 'contacts': ({ - 'speller_language': [opt_str, '', _('Language used for spell checking.')], - 'send_chatstate': [opt_str, 'composing_only', _('Chat state notifications that are sent to contacts. Possible values: 'all', 'composing_only', 'disabled'')], + 'speller_language': [opt_str, '', 'Language used for spell checking.'], + 'send_chatstate': [opt_str, 'composing_only', 'Chat state notifications that are sent to contacts. Possible values: 'all', 'composing_only', 'disabled''], }, {}), 'encryption': ({ - 'encryption': [opt_str, '', _('The currently active encryption for that contact.')], + 'encryption': [opt_str, '', 'The currently active encryption for that contact.'], }, {}), 'rooms': ({ - 'speller_language': [opt_str, '', _('Language used for spell checking.')], - 'notify_on_all_messages': [opt_bool, False, _('If enabled, a notification is created for every message in this group chat.')], - 'print_status': [opt_bool, False, _('Show a status message for all status changes (away, dnd, etc.) of users in a group chat.')], - 'print_join_left': [opt_bool, False, _('Show a status message for every join or leave in a group chat.')], - 'send_chatstate': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: 'all', 'composing_only' or 'disabled'.')], + 'speller_language': [opt_str, '', 'Language used for spell checking.'], + 'notify_on_all_messages': [opt_bool, False, 'If enabled, a notification is created for every message in this group chat.'], + 'print_status': [opt_bool, False, 'Show a status message for all status changes (away, dnd, etc.) of users in a group chat.'], + 'print_join_left': [opt_bool, False, 'Show a status message for every join or leave in a group chat.'], + 'send_chatstate': [opt_str, 'composing_only', 'Chat state notifications that are sent to the group chat. Possible values: 'all', 'composing_only' or 'disabled'.'], }, {}), 'plugins': ({ - 'active': [opt_bool, False, _('If enabled, plugins will be activated on startup (this is saved when exiting Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the plugin window instead.')], + 'active': [opt_bool, False, 'If enabled, plugins will be activated on startup (this is saved when exiting Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the plugin window instead.'], }, {}), } # type: Dict[str, Tuple[Dict[str, List[Any]], Dict[Any, Any]]]

statusmsg_default = { - _('Sleeping'): ['ZZZZzzzzzZZZZZ', 'inactive', 'sleeping', '', 'sleepy', ''], - _('Back soon'): [_('Back in some minutes.'), '', '', '', '', ''], - _('Eating'): [_('I'm eating.'), 'eating', 'other', '', '', ''], - _('Movie'): [_('I'm watching a movie.'), 'relaxing', 'watching_a_movie', '', '', ''], - _('Working'): [_('I'm working.'), 'working', 'other', '', '', ''], - _('Phone'): [_('I'm on the phone.'), 'talking', 'on_the_phone', '', '', ''], - _('Out'): [_('I'm out enjoying life.'), 'relaxing', 'going_out', '', '', ''], + 'Sleeping': ['ZZZZzzzzzZZZZZ', 'inactive', 'sleeping', '', 'sleepy', ''], + 'Back soon': ['Back in some minutes.', '', '', '', '', ''], + 'Eating': ['I'm eating.', 'eating', 'other', '', '', ''], + 'Movie': ['I'm watching a movie.', 'relaxing', 'watching_a_movie', '', '', ''], + 'Working': ['I'm working.', 'working', 'other', '', '', ''], + 'Phone': ['I'm on the phone.', 'talking', 'on_the_phone', '', '', ''], + 'Out': ['I'm out enjoying life.', 'relaxing', 'going_out', '', '', ''], }

soundevents_default = { @@ -337,12 +334,12 @@ 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' or your nickname is mentioned.')], - 'muc_message_received': [True, 'gc_message2.wav', _('Sound to play when any group chat message arrives.')], + '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.'], }

proxies_default = { - _('Tor'): ['socks5', 'localhost', 9050], + 'Tor': ['socks5', 'localhost', 9050], }

def foreach(self, cb, data=None):

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/77c1f4d69ec5142c130d2b2ed366e1119...