From 792be24540c89b5ff0a652805a8bf355dc9da2c8 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 11 Jan 2018 15:12:07 +0100 Subject: [PATCH] Make more strings translatable --- gajim/accounts_window.py | 8 ++++---- gajim/data/gui/accounts_window.ui | 2 +- gajim/data/gui/add_new_contact_window.ui | 4 ++-- gajim/data/gui/esession_info_window.ui | 2 +- gajim/data/gui/filetransfers.ui | 6 +++--- gajim/data/gui/join_groupchat_window.ui | 2 +- gajim/data/gui/roster_item_exchange_window.ui | 2 +- gajim/data/gui/systray_context_menu.ui | 4 ++-- gajim/data/gui/voip_call_received_dialog.ui | 2 +- gajim/data/gui/xml_console_window.ui | 2 +- gajim/dialogs.py | 8 ++++---- gajim/gtkgui_helpers.py | 2 +- gajim/gui_menu_builder.py | 6 +++--- gajim/notify.py | 2 +- gajim/options_dialog.py | 4 ++-- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gajim/accounts_window.py b/gajim/accounts_window.py index 836ce800a..ee812fcf7 100644 --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -37,11 +37,11 @@ class AccountsWindow(Gtk.ApplicationWindow): self.set_titlebar(self.headerbar) menu = Gio.Menu() - menu.append('Merge Accounts', 'app.merge') - menu.append('Use PGP Agent', 'app.agent') + menu.append(_('Merge Accounts'), 'app.merge') + menu.append(_('Use PGP Agent'), 'app.agent') self.menu_button.set_menu_model(menu) - button = get_image_button('list-add-symbolic', 'Add') + button = get_image_button('list-add-symbolic', _('Add')) button.set_action_name('app.add-account') self.actionbar.pack_start(button) @@ -341,7 +341,7 @@ class Account(Gtk.Box): self.add(self.label) if account != app.ZEROCONF_ACC_NAME: - button = get_image_button('list-remove-symbolic', 'Remove') + button = get_image_button('list-remove-symbolic', _('Remove')) button.connect('clicked', parent.on_remove_account, account) self.add(button) diff --git a/gajim/data/gui/accounts_window.ui b/gajim/data/gui/accounts_window.ui index 290f96458..cfa146805 100644 --- a/gajim/data/gui/accounts_window.ui +++ b/gajim/data/gui/accounts_window.ui @@ -75,7 +75,7 @@ True False - Accounts + Accounts True :close diff --git a/gajim/data/gui/add_new_contact_window.ui b/gajim/data/gui/add_new_contact_window.ui index 377dc70f4..413eecd6d 100644 --- a/gajim/data/gui/add_new_contact_window.ui +++ b/gajim/data/gui/add_new_contact_window.ui @@ -207,7 +207,7 @@ True True True - Type User ID + Type User ID 1 @@ -220,7 +220,7 @@ True True True - Type Nickname + Type Nickname 1 diff --git a/gajim/data/gui/esession_info_window.ui b/gajim/data/gui/esession_info_window.ui index a82a0e2e9..627f224a7 100644 --- a/gajim/data/gui/esession_info_window.ui +++ b/gajim/data/gui/esession_info_window.ui @@ -134,7 +134,7 @@ True False - (<b>ESession</b> info) + (<b>ESession</b> info) True True diff --git a/gajim/data/gui/filetransfers.ui b/gajim/data/gui/filetransfers.ui index 2fe11bf4d..b410170db 100644 --- a/gajim/data/gui/filetransfers.ui +++ b/gajim/data/gui/filetransfers.ui @@ -8,7 +8,7 @@ False - _Remove + _Remove True @@ -171,7 +171,7 @@ - _Cancel + _Cancel True False True @@ -196,7 +196,7 @@ - _Close + _Close True True True diff --git a/gajim/data/gui/join_groupchat_window.ui b/gajim/data/gui/join_groupchat_window.ui index 9aff6a87b..fc3d85851 100644 --- a/gajim/data/gui/join_groupchat_window.ui +++ b/gajim/data/gui/join_groupchat_window.ui @@ -309,7 +309,7 @@ True False - Join Groupchat + Join Groupchat gtk-cancel diff --git a/gajim/data/gui/roster_item_exchange_window.ui b/gajim/data/gui/roster_item_exchange_window.ui index 930764d49..d6a56d6b8 100644 --- a/gajim/data/gui/roster_item_exchange_window.ui +++ b/gajim/data/gui/roster_item_exchange_window.ui @@ -18,7 +18,7 @@ True False - <b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster. + <b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster. True center True diff --git a/gajim/data/gui/systray_context_menu.ui b/gajim/data/gui/systray_context_menu.ui index 9d83b13b8..26a8bb34e 100644 --- a/gajim/data/gui/systray_context_menu.ui +++ b/gajim/data/gui/systray_context_menu.ui @@ -72,7 +72,7 @@ True False - _Preferences + _Preferences True @@ -87,7 +87,7 @@ True False - _Quit + _Quit True diff --git a/gajim/data/gui/voip_call_received_dialog.ui b/gajim/data/gui/voip_call_received_dialog.ui index 02fb10f02..9650446fd 100644 --- a/gajim/data/gui/voip_call_received_dialog.ui +++ b/gajim/data/gui/voip_call_received_dialog.ui @@ -12,7 +12,7 @@ True question yes-no - <b><big>Incoming call</big></b> + <b><big>Incoming call</big></b> True diff --git a/gajim/data/gui/xml_console_window.ui b/gajim/data/gui/xml_console_window.ui index dd9d697ea..f80a42e38 100644 --- a/gajim/data/gui/xml_console_window.ui +++ b/gajim/data/gui/xml_console_window.ui @@ -74,7 +74,7 @@ True False - XML Console + XML Console False True diff --git a/gajim/dialogs.py b/gajim/dialogs.py index c6b09265d..f3cccfd5e 100644 --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3560,21 +3560,21 @@ class XMLConsoleWindow(Gtk.Window): self.paned.set_position(self.paned.get_property('max-position')) button = gtkgui_helpers.get_image_button( - 'edit-clear-all-symbolic', 'Clear') + 'edit-clear-all-symbolic', _('Clear')) button.connect('clicked', self.on_clear) self.actionbar.pack_start(button) button = gtkgui_helpers.get_image_button( - 'applications-system-symbolic', 'Filter') + 'applications-system-symbolic', _('Filter')) button.connect('clicked', self.on_filter_options) self.actionbar.pack_start(button) button = gtkgui_helpers.get_image_button( - 'document-edit-symbolic', 'XML Input', toggle=True) + 'document-edit-symbolic', _('XML Input'), toggle=True) button.connect('toggled', self.on_input) self.actionbar.pack_start(button) - button = gtkgui_helpers.get_image_button('emblem-ok-symbolic', 'Send') + button = gtkgui_helpers.get_image_button('emblem-ok-symbolic', _('Send')) button.connect('clicked', self.on_send) self.actionbar.pack_end(button) diff --git a/gajim/gtkgui_helpers.py b/gajim/gtkgui_helpers.py index 5318b23bf..8773ffe5c 100644 --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -121,7 +121,7 @@ def get_image_button(icon_name, tooltip, toggle=False): else: button = Gtk.Button.new_from_icon_name( icon_name, Gtk.IconSize.MENU) - button.set_tooltip_text(_(tooltip)) + button.set_tooltip_text(tooltip) return button def get_gtk_builder(file_name, widget=None): diff --git a/gajim/gui_menu_builder.py b/gajim/gui_menu_builder.py index 2477ddc1a..011da1ec3 100644 --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -724,14 +724,14 @@ def get_account_menu(account): ('-profile', _('Profile')), ('-services', _('Discover Services')), ('-start-single-chat', _('Send Single Message...')), - ('Advanced', [ + (_('Advanced'), [ ('-archive', _('Archiving Preferences')), ('-sync-history', _('Synchronise History')), ('-privacylists', _('Privacy Lists')), ('-server-info', _('Server Info')), ('-xml-console', _('XML Console')) ]), - ('Admin', [ + (_('Admin'), [ ('-send-server-message', _('Send Server Message...')), ('-set-motd', _('Set MOTD...')), ('-update-motd', _('Update MOTD...')), @@ -787,7 +787,7 @@ def build_accounts_menu(): else: acc_menu = get_account_menu(accounts_list[0]) menubar.remove(menu_position) - menubar.insert_submenu(menu_position, 'Accounts', acc_menu) + menubar.insert_submenu(menu_position, _('Accounts'), acc_menu) def build_bookmark_menu(account): diff --git a/gajim/notify.py b/gajim/notify.py index 8be89082f..e3b643f01 100644 --- a/gajim/notify.py +++ b/gajim/notify.py @@ -100,7 +100,7 @@ text=None, timeout=-1): 'type_': GLib.Variant('s', type_)} variant_dict = GLib.Variant('a{sv}', dict_) action = 'app.{}-open-event'.format(account) - notification.add_button_with_target('Open', action, variant_dict) + notification.add_button_with_target(_('Open'), action, variant_dict) notification.set_default_action_and_target(action, variant_dict) if event_type in (_('New Message'), _('New Single Message'), _('New Private Message')): diff --git a/gajim/options_dialog.py b/gajim/options_dialog.py index e6ac5bf80..b9aa47ece 100644 --- a/gajim/options_dialog.py +++ b/gajim/options_dialog.py @@ -389,7 +389,7 @@ class FileChooserOption(GenericOption): button.connect('selection-changed', self.on_select) clear_button = gtkgui_helpers.get_image_button( - 'edit-clear-all-symbolic', 'Clear File') + 'edit-clear-all-symbolic', _('Clear File')) clear_button.connect('clicked', lambda *args: button.unselect_all()) self.option_box.pack_start(button, True, True, 0) self.option_box.pack_start(clear_button, False, False, 0) @@ -471,7 +471,7 @@ class ProxyComboOption(GenericOption): self.combo.set_valign(Gtk.Align.CENTER) button = gtkgui_helpers.get_image_button( - 'preferences-system-symbolic', 'Manage Proxies') + 'preferences-system-symbolic', _('Manage Proxies')) button.set_action_name('app.manage-proxies') button.set_valign(Gtk.Align.CENTER)