Yann Leboulanger pushed to branch master at gajim / gajim
Commits: 792be245 by Daniel at 2018-01-15T10:51:04+01:00 Make more strings translatable
- - - - - b3a805c5 by Yann Leboulanger at 2018-01-15T11:16:26+01:00 Merge branch 'more-translations' into 'master'
Make more strings translatable
See merge request gajim/gajim!186 - - - - -
15 changed files:
- gajim/accounts_window.py - gajim/data/gui/accounts_window.ui - gajim/data/gui/add_new_contact_window.ui - gajim/data/gui/esession_info_window.ui - gajim/data/gui/filetransfers.ui - gajim/data/gui/join_groupchat_window.ui - gajim/data/gui/roster_item_exchange_window.ui - gajim/data/gui/systray_context_menu.ui - gajim/data/gui/voip_call_received_dialog.ui - gajim/data/gui/xml_console_window.ui - gajim/dialogs.py - gajim/gtkgui_helpers.py - gajim/gui_menu_builder.py - gajim/notify.py - gajim/options_dialog.py
Changes:
===================================== gajim/accounts_window.py ===================================== --- 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)
===================================== gajim/data/gui/accounts_window.ui ===================================== --- a/gajim/data/gui/accounts_window.ui +++ b/gajim/data/gui/accounts_window.ui @@ -75,7 +75,7 @@ <object class="GtkHeaderBar" id="headerbar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="title">Accounts</property> + <property name="title" translatable="yes">Accounts</property> <property name="show_close_button">True</property> <property name="decoration_layout">:close</property> <child>
===================================== gajim/data/gui/add_new_contact_window.ui ===================================== --- a/gajim/data/gui/add_new_contact_window.ui +++ b/gajim/data/gui/add_new_contact_window.ui @@ -207,7 +207,7 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="activates_default">True</property> - <property name="placeholder_text">Type User ID</property> + <property name="placeholder_text" translatable="yes">Type User ID</property> </object> <packing> <property name="left_attach">1</property> @@ -220,7 +220,7 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="activates_default">True</property> - <property name="placeholder_text">Type Nickname</property> + <property name="placeholder_text" translatable="yes">Type Nickname</property> </object> <packing> <property name="left_attach">1</property>
===================================== gajim/data/gui/esession_info_window.ui ===================================== --- a/gajim/data/gui/esession_info_window.ui +++ b/gajim/data/gui/esession_info_window.ui @@ -134,7 +134,7 @@ <object class="GtkLabel" id="info_display"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">(<b>ESession</b> info)</property> + <property name="label" translatable="yes">(<b>ESession</b> info)</property> <property name="use_markup">True</property> <property name="wrap">True</property> </object>
===================================== gajim/data/gui/filetransfers.ui ===================================== --- a/gajim/data/gui/filetransfers.ui +++ b/gajim/data/gui/filetransfers.ui @@ -8,7 +8,7 @@ <child> <object class="GtkMenuItem" id="remove_menuitem"> <property name="can_focus">False</property> - <property name="label">_Remove</property> + <property name="label" translatable="yes">_Remove</property> <property name="use_underline">True</property> <signal name="activate" handler="on_remove_menuitem_activate" swapped="no"/> </object> @@ -171,7 +171,7 @@ </child> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">_Cancel</property> + <property name="label" translatable="yes">_Cancel</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> @@ -196,7 +196,7 @@ </child> <child> <object class="GtkButton" id="close_button"> - <property name="label">_Close</property> + <property name="label" translatable="yes">_Close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property>
===================================== gajim/data/gui/join_groupchat_window.ui ===================================== --- a/gajim/data/gui/join_groupchat_window.ui +++ b/gajim/data/gui/join_groupchat_window.ui @@ -309,7 +309,7 @@ <object class="GtkHeaderBar" id="headerbar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="title">Join Groupchat</property> + <property name="title" translatable="yes">Join Groupchat</property> <child> <object class="GtkButton"> <property name="label">gtk-cancel</property>
===================================== gajim/data/gui/roster_item_exchange_window.ui ===================================== --- a/gajim/data/gui/roster_item_exchange_window.ui +++ b/gajim/data/gui/roster_item_exchange_window.ui @@ -18,7 +18,7 @@ <object class="GtkLabel" id="type_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label"><b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster.</property> + <property name="label" translatable="yes"><b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster.</property> <property name="use_markup">True</property> <property name="justify">center</property> <property name="selectable">True</property>
===================================== gajim/data/gui/systray_context_menu.ui ===================================== --- a/gajim/data/gui/systray_context_menu.ui +++ b/gajim/data/gui/systray_context_menu.ui @@ -72,7 +72,7 @@ <object class="GtkMenuItem" id="preferences_menuitem"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">_Preferences</property> + <property name="label" translatable="yes">_Preferences</property> <property name="use_underline">True</property> <signal name="activate" handler="on_preferences_menuitem_activate" swapped="no"/> </object> @@ -87,7 +87,7 @@ <object class="GtkMenuItem" id="quit_menuitem"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">_Quit</property> + <property name="label" translatable="yes">_Quit</property> <property name="use_underline">True</property> <signal name="activate" handler="on_quit_menuitem_activate" swapped="no"/> </object>
===================================== gajim/data/gui/voip_call_received_dialog.ui ===================================== --- a/gajim/data/gui/voip_call_received_dialog.ui +++ b/gajim/data/gui/voip_call_received_dialog.ui @@ -12,7 +12,7 @@ <property name="skip_taskbar_hint">True</property> <property name="message_type">question</property> <property name="buttons">yes-no</property> - <property name="text"><b><big>Incoming call</big></b></property> + <property name="text" translatable="yes"><b><big>Incoming call</big></b></property> <property name="use_markup">True</property> <signal name="close" handler="on_voip_call_received_messagedialog_close" swapped="no"/> <signal name="destroy" handler="on_voip_call_received_messagedialog_destroy" swapped="no"/>
===================================== gajim/data/gui/xml_console_window.ui ===================================== --- a/gajim/data/gui/xml_console_window.ui +++ b/gajim/data/gui/xml_console_window.ui @@ -74,7 +74,7 @@ <object class="GtkHeaderBar" id="headerbar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="title">XML Console</property> + <property name="title" translatable="yes">XML Console</property> <property name="has_subtitle">False</property> <property name="show_close_button">True</property> <child>
===================================== gajim/dialogs.py ===================================== --- 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)
===================================== gajim/gtkgui_helpers.py ===================================== --- 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):
===================================== gajim/gui_menu_builder.py ===================================== --- 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):
===================================== gajim/notify.py ===================================== --- 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')):
===================================== gajim/options_dialog.py ===================================== --- 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)
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a01bbb51110a4a904c5ae01ee4796e4d9e...
--- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a01bbb51110a4a904c5ae01ee4796e4d9e... You're receiving this email because of your account on dev.gajim.org.
-
Yann Leboulanger