Commits

commits@gajim.org

17632 discussions

gajim: Avoid him/her in strings. Fixes #7390
by Yann Leboulanger 15 Aug '13

15 Aug '13

changeset 978f7e8cd23b in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=978f7e8cd23b description: Avoid him/her in strings. Fixes #7390 diffstat: data/gui/contact_context_menu.ui | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (32 lines): diff -r b7a264841b7a -r 978f7e8cd23b data/gui/contact_context_menu.ui --- a/data/gui/contact_context_menu.ui Thu Aug 15 10:33:27 2013 +0200 +++ b/data/gui/contact_context_menu.ui Thu Aug 15 10:36:25 2013 +0200 @@ -168,7 +168,7 @@ <object class="GtkMenu" id="subscription_menuitem_menu"> <child> <object class="GtkImageMenuItem" id="resend_authorization_to_menuitem"> - <property name="label" translatable="yes">_Allow him/her to see my status</property> + <property name="label" translatable="yes">_Allow contact to see my status</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image15</property> @@ -177,7 +177,7 @@ </child> <child> <object class="GtkImageMenuItem" id="rerequest_authorization_from_menuitem"> - <property name="label" translatable="yes">A_sk to see his/her status</property> + <property name="label" translatable="yes">A_sk to see contact status</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image16</property> @@ -185,8 +185,8 @@ </object> </child> <child> - <object class="GtkImageMenuItem" id="forbid_him/her_to_see_my_status1"> - <property name="label" translatable="yes">_Forbid him/her to see my status</property> + <object class="GtkImageMenuItem" id="forbid_contact_to_see_my_status1"> + <property name="label" translatable="yes">_Forbid contact to see my status</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image17</property>

1 0

gajim: [Darlan] improve some strings. Fixes #7239
by Yann Leboulanger 15 Aug '13

15 Aug '13

changeset b7a264841b7a in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b7a264841b7a description: [Darlan] improve some strings. Fixes #7239 diffstat: data/gui/adhoc_commands_window.ui | 2 +- data/gui/filetransfers.ui | 2 +- data/gui/history_window.ui | 2 +- data/gui/preferences_window.ui | 4 ++-- src/common/config.py | 28 ++++++++++++++-------------- src/common/connection.py | 2 +- src/config.py | 2 +- src/dialogs.py | 6 +++--- src/groupchat_control.py | 4 ++-- src/profile_window.py | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diffs (243 lines): diff -r 38e6b33bd44c -r b7a264841b7a data/gui/adhoc_commands_window.ui --- a/data/gui/adhoc_commands_window.ui Thu Aug 15 10:00:42 2013 +0200 +++ b/data/gui/adhoc_commands_window.ui Thu Aug 15 10:33:27 2013 +0200 @@ -171,7 +171,7 @@ <child> <object class="GtkLabel" id="notes_label"> <property name="visible">True</property> - <property name="label" translatable="yes">Please wait while the command is sending...</property> + <property name="label" translatable="yes">Please wait while the command is being sent...</property> <property name="selectable">True</property> </object> <packing> diff -r 38e6b33bd44c -r b7a264841b7a data/gui/filetransfers.ui --- a/data/gui/filetransfers.ui Thu Aug 15 10:00:42 2013 +0200 +++ b/data/gui/filetransfers.ui Thu Aug 15 10:33:27 2013 +0200 @@ -196,7 +196,7 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Cancels the selected file transfer and removes incomplete file</property> + <property name="tooltip_text" translatable="yes">Cancels the selected file transfer and removes incomplete files</property> <property name="use_stock">True</property> <child internal-child="accessible"> <object class="AtkObject" id="cancel_button-atkobject"> diff -r 38e6b33bd44c -r b7a264841b7a data/gui/history_window.ui --- a/data/gui/history_window.ui Thu Aug 15 10:00:42 2013 +0200 +++ b/data/gui/history_window.ui Thu Aug 15 10:33:27 2013 +0200 @@ -86,7 +86,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">searching only in the selected day </property> + <property name="tooltip_text" translatable="yes">Searching only in the selected day </property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> </object> diff -r 38e6b33bd44c -r b7a264841b7a data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Thu Aug 15 10:00:42 2013 +0200 +++ b/data/gui/preferences_window.ui Thu Aug 15 10:33:27 2013 +0200 @@ -669,7 +669,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will also include information about the sender of the new emails</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will also include information about the sender of new emails</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_notify_gmail_extra_checkbutton_toggled"/> @@ -1530,7 +1530,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (e.g. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/> diff -r 38e6b33bd44c -r b7a264841b7a src/common/config.py --- a/src/common/config.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/common/config.py Thu Aug 15 10:33:27 2013 +0200 @@ -80,10 +80,10 @@ '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 as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoaway time.') ], + 'autoaway_message': [ opt_str, _('$S (Away as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoawaytime.') ], '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 as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoxa time.') ], + 'autoxa_message': [ opt_str, _('$S (Not available as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoxatime.') ], 'ask_online_status': [ opt_bool, False ], 'ask_offline_status': [ opt_bool, False ], 'trayicon': [opt_str, 'always', _("When to show notification area icon. Can be 'never', 'on_event', 'always'."), False], @@ -157,7 +157,7 @@ 'single-msg-y-position': [opt_int, 0], 'single-msg-width': [opt_int, 400], 'single-msg-height': [opt_int, 280], - 'save-roster-position': [opt_bool, True, _('If true, Gajim will save roster position when hiding roster, and restore it when showing roster.')], + 'save-roster-position': [opt_bool, True, _('If True, Gajim will save roster position when hiding roster, and restore it when showing roster.')], 'roster_x-position': [ opt_int, 0 ], 'roster_y-position': [ opt_int, 0 ], 'roster_width': [ opt_int, 200 ], @@ -177,10 +177,10 @@ 'notify_on_new_gmail_email_command': [ opt_str, '', _('Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q') ], 'use_gpg_agent': [ opt_bool, False ], 'change_roster_title': [ opt_bool, True, _('Add * and [n] in roster title?')], - 'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened.')], + 'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened?')], 'restore_timeout': [opt_int, 60, _('How many minutes should last lines from previous conversation last.')], 'muc_restore_lines': [opt_int, 20, _('How many lines to request from server when entering a groupchat. -1 means no limit')], - 'muc_restore_timeout': [opt_int, 60, _('How many minutes back to request logs when a entering a groupchat. -1 means no limit')], + 'muc_restore_timeout': [opt_int, 60, _('How many minutes back to request logs when entering a groupchat. -1 means no limit')], 'muc_autorejoin_timeout': [opt_int, 1, _('How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining.')], 'muc_autorejoin_on_kick': [opt_bool, False, _('Should autorejoin be activated when we are being kicked from a conference?')], 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour).')], @@ -198,9 +198,9 @@ 'autodetect_browser_mailer': [opt_bool, True, '', True], 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (print_time==sometimes), print it every x minutes.')], 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], - 'confirm_close_muc_rooms': [opt_str, '', _('Always ask before closing group chat tab/window in this space separated list of group chat jids.')], - 'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask before closing group chat tab/window in this space separated list of group chat jids.')], - 'confirm_close_multiple_tabs': [opt_bool, True, _('Ask before closing tabbed chat window if there are control that can loose data (chat, private chat, groupchat that will not be minimized)')], + 'confirm_close_muc_rooms': [opt_str, '', _('Always ask before closing group chat tab/window in this space separated list of group chat JIDs.')], + 'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask before closing group chat tab/window in this space separated list of group chat JIDs.')], + 'confirm_close_multiple_tabs': [opt_bool, True, _('Ask before closing tabbed chat window if there are controls that can lose data (chat, private chat, groupchat that will not be minimized)')], 'notify_on_file_complete': [opt_bool, True], 'file_transfers_port': [opt_int, 28011], 'ft_add_hosts_to_send': [opt_str, '', _('Comma separated list of hosts that we send, in addition of local interfaces, for File Transfer in case of address translation/port forwarding.')], @@ -256,7 +256,7 @@ 'avatar_position_in_roster': [opt_str, 'right', _('Define the position of the avatar in roster. Can be left or right'), True], 'ask_avatars_on_startup': [opt_bool, True, _('If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old.')], 'print_status_in_chats': [opt_bool, True, _('If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message.')], - 'print_status_in_muc': [opt_str, 'in_and_out', _('can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')], + 'print_status_in_muc': [opt_str, 'in_and_out', _('Can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')], 'log_contact_status_changes': [opt_bool, False], 'log_xhtml_messages': [opt_bool, False, _('Log XHTML messages instead of plain text messages.')], 'just_connected_bg_color': [opt_str, '#adc3c6', _('Background color of contacts when they just signed in.')], @@ -270,7 +270,7 @@ 'send_sha_in_gc_presence': [opt_bool, True, _('Jabberd1.4 does not like sha info when one join a password protected group chat. Turn this option to False to stop sending sha info in group chat presences.')], '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 roster.\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. groupchats) are sent to a specific window.')], + _('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 roster.\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. groupchats) is sent to a specific window.')], 'show_roster_on_startup':[opt_str, 'always', _('Show roster on startup.\n\'always\' - Always show roster.\n\'never\' - Never show roster.\n\'last_state\' - Restore the last state roster.')], 'show_avatar_in_chat': [opt_bool, True, _('If False, you will no longer see the avatar in the chat window.')], 'escape_key_closes': [opt_bool, True, _('If True, pressing the escape key closes a tab/window.')], @@ -297,7 +297,7 @@ 'attach_notifications_to_systray': [opt_bool, False, _('If True, notification windows from notification-daemon will be attached to notification 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://', _('Valid uri schemes. Only schemes in this list will be accepted as "real" uri. (mailto and xmpp are handled separately)'), True], - 'ask_offline_status_on_connection': [ opt_bool, False, _('Ask offline status message to all offline contacts when connection to an accoutn is established. WARNING: This causes a lot of requests to be sent!') ], + 'ask_offline_status_on_connection': [ opt_bool, False, _('Ask offline status message to all offline contacts when connection to an account is established. WARNING: This causes a lot of requests to be sent!') ], 'shell_like_completion': [ opt_bool, False, _('If True, completion in groupchats will be like a shell auto-completion')], 'show_self_contact': [opt_str, 'when_other_resource', _('When is self contact row displayed. Can be "always", "when_other_resource" or "never"'), True], 'audio_input_device': [opt_str, 'autoaudiosrc ! volume name=gajim_vol'], @@ -368,7 +368,7 @@ # send keepalive every N seconds of inactivity 'keep_alive_every_foo_secs': [ opt_int, 55 ], 'ping_alive_every_foo_secs': [ opt_int, 120 ], - 'time_for_ping_alive_answer': [ opt_int, 60, _('How many seconds to wait for the answer of ping alive packet before we try to reconnect.') ], + 'time_for_ping_alive_answer': [ opt_int, 60, _('How many seconds to wait for the answer of ping alive packet before we try to reconnect?') ], # 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 @@ -412,7 +412,7 @@ 'oauth2_refresh_token': [ opt_str, '', _('Latest token for Oauth2 authentication.')], 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for Oauth2 authentication.')], 'oauth2_redirect_url': [ opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for Oauth2 authentication.')], - 'opened_chat_controls': [opt_str, '', _('Space separated list of jid for which we want to re-open a chat window on next startup.')], + 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDsfor which we want to re-open a chat window on next startup.')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ], @@ -481,7 +481,7 @@ 'rooms': ({ 'speller_language': [ opt_str, '', _('Language for which we want to check misspelled words')], 'muc_restore_lines': [opt_int, -2, _('How many lines to request from server when entering a groupchat. -1 means no limit, -2 means global value')], - 'muc_restore_timeout': [opt_int, -2, _('How many minutes back to request logs when a entering a groupchat. -1 means no limit, -2 means global value')], + 'muc_restore_timeout': [opt_int, -2, _('How many minutes back to request logs when entering a groupchat. -1 means no limit, -2 means global value')], }, {}), 'plugins': ({ 'active': [opt_bool, False, _('State whether plugins should be activated on startup (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], diff -r 38e6b33bd44c -r b7a264841b7a src/common/connection.py --- a/src/common/connection.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/common/connection.py Thu Aug 15 10:33:27 2013 +0200 @@ -1460,7 +1460,7 @@ self.disconnect(on_purpose=True) gajim.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, title=_('Could not connect to "%s"') % self._hostname, - msg=_('Check your connection or try again later'))) + msg=_('Check your connection or try again later.'))) if self.on_connect_auth: self.on_connect_auth(None) self.on_connect_auth = None diff -r 38e6b33bd44c -r b7a264841b7a src/config.py --- a/src/config.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/config.py Thu Aug 15 10:33:27 2013 +0200 @@ -2445,7 +2445,7 @@ return if not gajim.connections[self.current_account].vcard_supported: - dialogs.ErrorDialog(_("Your server doesn't support Vcard"), + dialogs.ErrorDialog(_("Your server doesn't support vCard"), _("Your server can't save your personal information.")) return diff -r 38e6b33bd44c -r b7a264841b7a src/dialogs.py --- a/src/dialogs.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/dialogs.py Thu Aug 15 10:33:27 2013 +0200 @@ -2140,7 +2140,7 @@ except Exception: # invalid char ErrorDialog(_('Invalid nickname'), - _('The nickname has not allowed characters.')) + _('The nickname contains invalid characters.')) return self.on_ok(nick, self.is_checked()) @@ -2594,7 +2594,7 @@ nickname = helpers.parse_resource(nickname) except Exception: ErrorDialog(_('Invalid Nickname'), - _('The nickname has not allowed characters.')) + _('The nickname contains invalid characters.')) return user, server, resource = helpers.decompose_jid(room_jid) if not user or not server or resource: @@ -2605,7 +2605,7 @@ room_jid = helpers.parse_jid(room_jid) except Exception: ErrorDialog(_('Invalid group chat Jabber ID'), - _('The group chat Jabber ID has not allowed characters.')) + _('The group chat Jabber ID contains invalid characters.')) return if gajim.contacts.get_contact(self.account, room_jid) and \ diff -r 38e6b33bd44c -r b7a264841b7a src/groupchat_control.py --- a/src/groupchat_control.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/groupchat_control.py Thu Aug 15 10:33:27 2013 +0200 @@ -1288,9 +1288,9 @@ changes.append(_('Any occupant is allowed to see your full JID')) self.is_anonymous = False if '102' in obj.status_code: - changes.append(_('Room now shows unavailable member')) + changes.append(_('Room now shows unavailable members')) if '103' in obj.status_code: - changes.append(_('room now does not show unavailable members')) + changes.append(_('Room now does not show unavailable members')) if '104' in obj.status_code: changes.append(_('A non-privacy-related room configuration change ' 'has occurred')) diff -r 38e6b33bd44c -r b7a264841b7a src/profile_window.py --- a/src/profile_window.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/profile_window.py Thu Aug 15 10:33:27 2013 +0200 @@ -367,7 +367,7 @@ return if gajim.connections[self.account].connected < 2: dialogs.ErrorDialog(_('You are not connected to the server'), - _('Without a connection you can not publish your contact ' + _('Without a connection, you can not publish your contact ' 'information.')) return vcard_ = self.make_vcard()

1 0

gajim: prevent bug when forming a jid. Fixes #7428
by Yann Leboulanger 15 Aug '13

15 Aug '13

changeset 38e6b33bd44c in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=38e6b33bd44c description: prevent bug when forming a jid. Fixes #7428 diffstat: src/common/stanza_session.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diffs (14 lines): diff -r b5a02571bc6c -r 38e6b33bd44c src/common/stanza_session.py --- a/src/common/stanza_session.py Wed Aug 14 23:52:24 2013 +0400 +++ b/src/common/stanza_session.py Thu Aug 15 10:00:42 2013 +0200 @@ -83,9 +83,7 @@ def get_to(self): to = str(self.jid) - if self.resource and not to.endswith(self.resource): - to += '/' + self.resource - return to + return gajim.get_jid_without_resource(to) + self.resource def remove_events(self, types): """

1 0

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 14 Aug '13

14 Aug '13

changeset b5a02571bc6c in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b5a02571bc6c description: [Darlan] Update Hebrew translation diffstat: po/he.po | 1135 ++++++++++++++++++++----------------------------------------- 1 файлов изменено, 368 вставок(+), 767 удалений(-) различия (урезанные с 3707 до 300 строк): diff -r 9b807ddc8d99 -r b5a02571bc6c po/he.po --- a/po/he.po Wed Aug 14 18:58:48 2013 +0200 +++ b/po/he.po Wed Aug 14 23:52:24 2013 +0400 @@ -65,7 +65,6 @@ msgid "Gajim: Account Creation Wizard" msgstr "‫Gajim: אשף יצירת חשבון" -# עליך להחזיק #: ../data/gui/account_creation_wizard_window.ui.h:2 msgid "" "You need to have an account in order to connect\n" @@ -74,15 +73,10 @@ "יש צורך בחשבון בכדי להתחבר\n" "אל רשת התקשורת Jabber." -# בו אני רוצה לעשות #: ../data/gui/account_creation_wizard_window.ui.h:4 msgid "I already have an account I want to _use" msgstr "כבר קיים ברשותי _חשבון אשר ברצוני לעשות בו שימוש" -# I want to _register a new account -# אני רוצה _לרשום חשבון חדש -# I want to _register for a new account -# אני רוצה _להירשם לחשבון חדש #: ../data/gui/account_creation_wizard_window.ui.h:5 msgid "I want to _register for a new account" msgstr "ברצוני ל_רשום חשבון חדש" @@ -108,11 +102,6 @@ msgstr "שמו_ר סיסמה" # BUG: a dot at the end -# From: Clipman -# If checked, this option allows to store one image inside the history -# במידה והמשבצת/והאפשרות מסומנת -# במידה ומשבצת/ואפשרות זו מסומנת -# בבוחרך באפשרות זו, Wicd #: ../data/gui/account_creation_wizard_window.ui.h:10 #: ../data/gui/accounts_window.ui.h:21 msgid "If checked, Gajim will remember the password for this account" @@ -163,8 +152,6 @@ msgid "_Advanced" msgstr "_מתקדם" -# הוספת אישור זה לרשימת האישורים המהימנים.\n -# טביעת אצבע (מסוג) SHA1 של האישור:\n #: ../data/gui/account_creation_wizard_window.ui.h:21 msgid "" "Add this certificate to the list of trusted certificates.\n" @@ -183,10 +170,9 @@ "\n" "אנא המתן..." -# מיידית לאחר ש #: ../data/gui/account_creation_wizard_window.ui.h:27 msgid "Connect when I press Finish" -msgstr "התחבר מידית כאשר אני אלחץ על סיים" +msgstr "התחבר כאשר אני אלחץ על סיים" #: ../data/gui/account_creation_wizard_window.ui.h:28 msgid "Set my profile when I connect" @@ -203,8 +189,8 @@ #: ../src/config.py:1738 ../src/config.py:2314 ../src/config.py:2393 #: ../src/config.py:2406 ../src/config.py:3682 ../src/config.py:3757 #: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 -#: ../src/dialogs.py:536 ../src/roster_window.py:3148 -#: ../src/roster_window.py:3154 ../src/roster_window.py:3159 +#: ../src/dialogs.py:536 ../src/roster_window.py:3149 +#: ../src/roster_window.py:3155 ../src/roster_window.py:3160 msgid "None" msgstr "ללא" @@ -225,7 +211,7 @@ msgstr "מחק" #. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5793 +#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5790 msgid "Re_name" msgstr "_שנה שם" @@ -234,10 +220,9 @@ msgid "_Enable" msgstr "א_פשר" -# אימות אלמוני #: ../data/gui/accounts_window.ui.h:7 msgid "Anonymous authentication" -msgstr "התאמתות אלמונית" +msgstr "אימות אלמוני" #: ../data/gui/accounts_window.ui.h:8 msgid "" @@ -275,7 +260,6 @@ msgid "Chan_ge Password" msgstr "ש_נה סיסמה" -# Omitted: Click to #: ../data/gui/accounts_window.ui.h:13 msgid "Click to change account's password" msgstr "שנה סיסמת חשבון" @@ -301,7 +285,6 @@ msgid "A_djust to status" msgstr "_התאם אל מצב חיבור" -# תשונה #: ../data/gui/accounts_window.ui.h:17 msgid "Priority will change automatically according to your status." msgstr "העדיפות תשתנה אוטומטית בהתאם אל מצב החיבור שלך." @@ -335,7 +318,6 @@ msgid "Account" msgstr "חשבון" -# אתחול #: ../data/gui/accounts_window.ui.h:29 msgid "C_onnect on Gajim startup" msgstr "התחבר בעת ה_פעלת Gajim" @@ -351,17 +333,14 @@ "חשבון זה" # BUG: _underline -# במידה והחיבור #: ../data/gui/accounts_window.ui.h:31 msgid "Auto-reconnect when connection is lost" msgstr "התחבר אוטומטית כאשר החיבור אובד" -# יו_מני שיחות #: ../data/gui/accounts_window.ui.h:32 msgid "Save conversation _logs for all contacts" msgstr "שמור רשו_מות שיחה עבור כל אנשי קשר" -# כוללני #: ../data/gui/accounts_window.ui.h:33 msgid "Synch_ronize account status with global status" msgstr "סנכרן מצב חשבון עם מצב חיבור _גלובלי" @@ -386,25 +365,24 @@ msgid "Use file transfer proxies" msgstr "השתמש במתווכי העברת קובץ" -# שיהיו סיכויים גדולים יותר להעברת קובץ לעבוד #: ../data/gui/accounts_window.ui.h:36 msgid "" "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." msgstr "" "במידה ואפשרות זו מסומנת, Gajim ישדר, בנוסף לכתובת פרוטוקול המרשתת (IP; ‏" -"Internet Protocol) שלך, מספר כתובות IP נוספות, כך שלהעברת קובץ יהיו סיכויים " -"גדולים יותר לעבוד." - -# אכן, זוהי קבוצה כללית. אנא לא להפוך זאת באופן שרירותי ל"רישום" כללי או לכל מילה אחר אשר לא קשורה אל התוכנית +"Internet Protocol) שלך, מספר כתובות IP נוספות, כך שלפעולת העברת קובץ יהיו " +"סיכויים גדולים יותר לעבוד." + +# (קבוצה כללית) #. FIXME: Ugly workaround. #. FIXME: Ugly workaround. #. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 #: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127 -#: ../src/roster_window.py:3090 ../src/roster_window.py:4220 -#: ../src/roster_window.py:5843 +#: ../src/roster_window.py:3091 ../src/roster_window.py:4217 +#: ../src/roster_window.py:5840 msgid "General" msgstr "כללית" @@ -432,7 +410,6 @@ "סמן את אפשרות זו כדי ש־Gajim ישאל אותך טרם שליחת סיסמתך על פני חיבור לא " "מאובטח." -# חבילות נתונים מסוג #: ../data/gui/accounts_window.ui.h:43 msgid "Send _keep-alive packets" msgstr "ש_לח חבילות keep-alive" @@ -446,7 +423,6 @@ "במידה ואפשרות זו מסומנת, Gajim ישלח חבילות keep-alive כדי למנוע פקיעת זמן של " "חיבור (connection timeout) המביאה לידי ניתוק" -# ה_תאם #: ../data/gui/accounts_window.ui.h:45 msgid "Use cust_om hostname/port" msgstr "השתמש בשם מארח\\פורט מו_תאמים" @@ -540,10 +516,6 @@ msgid "Last Name:" msgstr "שם משפחה:" -# ״ -# " -# דוא\"ל: -# דוא״ל: #: ../data/gui/accounts_window.ui.h:66 #: ../data/gui/zeroconf_information_window.ui.h:8 msgid "E-Mail:" @@ -641,7 +613,6 @@ msgid "Check once more" msgstr "בדוק פעם נוספת" -# "Please wait while the command is sending..." has been turned to "Please wait while the command is being sent..." #: ../data/gui/adhoc_commands_window.ui.h:5 msgid "Please wait while the command is sending..." msgstr "אנא המתן בזמן שהפקודה נשלחת..." @@ -680,7 +651,6 @@ msgid "Description" msgstr "תיאור" -# יש צורך לאתחל #: ../data/gui/advanced_configuration_window.ui.h:4 msgid "NOTE: You should restart Gajim for some settings to take effect" msgstr "הערה: עליך לאתחל את Gajim כדי שהגדרות מסוימות ייכנסו לתוקף" @@ -734,7 +704,6 @@ msgid "Delete MOTD" msgstr "מחק MOTD" -# הודעה יומית #: ../data/gui/advanced_menuitem_menu.ui.h:12 msgid "Deletes Message of the Day" msgstr "מחיקת הודעת היום (Message of the Day)" @@ -757,7 +726,6 @@ msgid "Concede" msgstr "וותר" -# אסירה #: ../data/gui/archiving_preferences_window.ui.h:5 msgid "Forbid" msgstr "אסור" @@ -809,8 +777,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 -#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5812 -#: ../src/roster_window.py:5939 ../src/roster_window.py:6072 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5809 +#: ../src/roster_window.py:5936 ../src/roster_window.py:6069 msgid "_Unblock" msgstr "_בטל חסימה" @@ -842,10 +810,9 @@ msgid "Enter new password:" msgstr "הזן סיסמה חדשה:" -# לשם #: ../data/gui/change_password_dialog.ui.h:3 msgid "Enter it again for confirmation:" -msgstr "הזן את הסיסמה, פעם נוספת, לאימות:" +msgstr "הזן את הסיסמה, פעם נוספת, לשם אימות:" # ערוך מראש #: ../data/gui/change_status_message_dialog.ui.h:1 @@ -868,7 +835,6 @@ msgid "Type your new status message" msgstr "הקלד הודעת מצב חדשה" -# אתר #: ../data/gui/chat_context_menu.ui.h:1 msgid "_Copy Link Location" msgstr "ה_עתק כתובת מיקום" @@ -920,7 +886,6 @@ msgid "Browse the chat history (Ctrl+H)" msgstr "עיון בהיסטוריית השיחה (Ctrl+H)" -# תפקודיות #: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7 msgid "Show advanced functions (Alt+D)" msgstr "הצגת פקדים מתקדמים (Alt+D)" @@ -945,44 +910,36 @@ msgstr "" #: ../data/gui/chat_control.ui.h:12 -#, fuzzy msgid "2" -msgstr "2 (דהו)" +msgstr "" #: ../data/gui/chat_control.ui.h:13 -#, fuzzy msgid "3" -msgstr "3 (אבג)" +msgstr "" #: ../data/gui/chat_control.ui.h:14 -#, fuzzy msgid "4" -msgstr "4 (מנ)" +msgstr "" #: ../data/gui/chat_control.ui.h:15 -#, fuzzy msgid "5" -msgstr "5 (יכל)" +msgstr "" #: ../data/gui/chat_control.ui.h:16 -#, fuzzy msgid "6" -msgstr "6 (זחט)" +msgstr "" #: ../data/gui/chat_control.ui.h:17 -#, fuzzy msgid "7"

1 0

gajim: fix error when there is a ' char in the config path. Fixe...
by Yann Leboulanger 14 Aug '13

14 Aug '13

changeset 9b807ddc8d99 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9b807ddc8d99 description: fix error when there is a ' char in the config path. Fixes #7344 diffstat: src/common/logger.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 8c1fbf9421ab -r 9b807ddc8d99 src/common/logger.py --- a/src/common/logger.py Wed Aug 14 14:56:15 2013 +0200 +++ b/src/common/logger.py Wed Aug 14 18:58:48 2013 +0200 @@ -149,7 +149,8 @@ def attach_cache_database(self): try: - self.cur.execute("ATTACH DATABASE '%s' AS cache" % CACHE_DB_PATH) + self.cur.execute("ATTACH DATABASE '%s' AS cache" % \ + CACHE_DB_PATH.replace("'", "''")) except sqlite.Error, e: log.debug("Failed to attach cache database: %s" % str(e))

1 0

gajim: add translator notes. Fixes #7427
by Yann Leboulanger 14 Aug '13

14 Aug '13

changeset 8c1fbf9421ab in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8c1fbf9421ab description: add translator notes. Fixes #7427 diffstat: src/command_system/implementation/standard.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (27 lines): diff -r c947292ba8a8 -r 8c1fbf9421ab src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Wed Aug 14 14:32:58 2013 +0200 +++ b/src/command_system/implementation/standard.py Wed Aug 14 14:56:15 2013 +0200 @@ -126,6 +126,7 @@ self.echo(formatted) @command(raw=True, empty=True) + #Do not translate online, away, chat, xa, dnd @doc(_(""" Set the current status @@ -353,6 +354,7 @@ self.connection.gc_set_role(self.room_jid, who, 'none', reason or str()) @command(raw=True) + #Do not translate moderator, participant, visitor, none @doc(_("""Set occupant role in group chat. Role can be given as one of the following values: moderator, participant, visitor, none""")) @@ -364,6 +366,7 @@ self.connection.gc_set_role(self.room_jid, who, role) @command(raw=True) + #Do not translate owner, admin, member, outcast, none @doc(_("""Set occupant affiliation in group chat. Affiliation can be given as one of the following values: owner, admin, member, outcast, none"""))

1 0

gajim: correctly detect that farstream is not available. Fixes #...
by Yann Leboulanger 14 Aug '13

14 Aug '13

changeset 3a5cb0ed4861 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=3a5cb0ed4861 description: correctly detect that farstream is not available. Fixes #7420 diffstat: src/common/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b53a121defda -r 3a5cb0ed4861 src/common/gajim.py --- a/src/common/gajim.py Tue Aug 13 13:42:20 2013 +0200 +++ b/src/common/gajim.py Tue Aug 13 13:54:16 2013 +0200 @@ -182,7 +182,7 @@ session = conference.new_session(farstream.MEDIA_TYPE_AUDIO) del session del conference - except glib.GError: + except: HAVE_FARSTREAM = False except ImportError:

1 0

gajim: ignore wrong incoming stanza. Fixes #7416
by Yann Leboulanger 14 Aug '13

14 Aug '13

changeset 8212069223e3 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=8212069223e3 description: ignore wrong incoming stanza. Fixes #7416 diffstat: src/common/jingle.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 3a5cb0ed4861 -r 8212069223e3 src/common/jingle.py --- a/src/common/jingle.py Tue Aug 13 13:54:16 2013 +0200 +++ b/src/common/jingle.py Tue Aug 13 14:37:56 2013 +0200 @@ -75,7 +75,11 @@ adequatelly. """ # get data - jid = helpers.get_full_jid_from_iq(stanza) + try: + jid = helpers.get_full_jid_from_iq(stanza) + except helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % stanza.getFrom()) + return id_ = stanza.getID() if (jid, id_) in self.__iq_responses.keys(): self.__iq_responses[(jid, id_)].on_stanza(stanza)

1 0

gajim: remove our own list of available spelling language. gtksp...
by Yann Leboulanger 14 Aug '13

14 Aug '13

changeset cd2203a09023 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=cd2203a09023 description: remove our own list of available spelling language. gtkspell already adds one. Fixes #7408 diffstat: src/chat_control.py | 43 ------------------------------------------- 1 files changed, 0 insertions(+), 43 deletions(-) diffs (60 lines): diff -r 8212069223e3 -r cd2203a09023 src/chat_control.py --- a/src/chat_control.py Tue Aug 13 14:37:56 2013 +0200 +++ b/src/chat_control.py Tue Aug 13 18:27:17 2013 +0200 @@ -83,36 +83,6 @@ import dbus import remote_control -# the next script, executed in the "po" directory, -# generates the following list. -##!/bin/sh -#LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done) -#echo "{_('en'):'en'",$LANG"}" -langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg', - _('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de', - _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo', - _('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr', - _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb', - _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', - _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', - _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk', - _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN', _('Hebrew'): 'he'} - -if gajim.config.get('use_speller') and HAS_GTK_SPELL: - # loop removing non-existent dictionaries - # iterating on a copy - tv = Gtk.TextView() - spell = gtkspell.Spell(tv) - for lang in dict(langs): - try: - spell.set_language(langs[lang]) - except OSError: - del langs[lang] - if spell: - spell.detach() - del tv - - ################################################################################ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): """ @@ -593,19 +563,6 @@ id_ = item.connect('activate', self.msg_textview.clear) self.handlers[id_] = item - if gajim.config.get('use_speller') and HAS_GTK_SPELL: - item = Gtk.MenuItem(_('Spelling language')) - menu.prepend(item) - submenu = Gtk.Menu() - item.set_submenu(submenu) - for lang in sorted(langs): - item = Gtk.CheckMenuItem(lang) - if langs[lang] == self.msg_textview.lang: - item.set_active(True) - submenu.append(item) - id_ = item.connect('activate', _on_select_dictionary, langs[lang]) - self.handlers[id_] = item - menu.show_all() def on_quote(self, widget, text):

1 0

gajim: print correctly when we correct a /me message. Fixes #7400
by Yann Leboulanger 14 Aug '13

14 Aug '13

changeset 96d11fb9663e in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=96d11fb9663e description: print correctly when we correct a /me message. Fixes #7400 diffstat: src/chat_control.py | 12 ++++++------ src/conversation_textview.py | 8 +++++++- 2 files changed, 13 insertions(+), 7 deletions(-) diffs (58 lines): diff -r cd2203a09023 -r 96d11fb9663e src/chat_control.py --- a/src/chat_control.py Tue Aug 13 18:27:17 2013 +0200 +++ b/src/chat_control.py Tue Aug 13 21:18:44 2013 +0200 @@ -1394,8 +1394,8 @@ end_iter = msg_buf.get_end_iter() self.orig_msg = msg_buf.get_text(start_iter, end_iter, False) if pos == size and size > 0 and direction == 'up' and \ - msg_type == 'sent' and not self.correcting and not \ - history[pos - 1].startswith('/'): + msg_type == 'sent' and not self.correcting and (not \ + history[pos - 1].startswith('/') or history[pos - 1].startswith('/me')): self.correcting = True context = self.msg_textview.get_style_context() state = Gtk.StateFlags.NORMAL @@ -3032,14 +3032,14 @@ xhtml = None if row[2].startswith('<body '): xhtml = row[2] + if row[2].startswith('/me ') or row[2].startswith('/me\n'): + local_old_kind = None + else: + local_old_kind = kind ChatControlBase.print_conversation_line(self, row[2], kind, name, tim, small_attr, small_attr + ['restored_message'], small_attr + ['restored_message'], False, old_kind=local_old_kind, xhtml=xhtml) - if row[2].startswith('/me ') or row[2].startswith('/me\n'): - local_old_kind = None - else: - local_old_kind = kind if len(rows): self.conv_textview.print_empty_line() diff -r cd2203a09023 -r 96d11fb9663e src/conversation_textview.py --- a/src/conversation_textview.py Tue Aug 13 18:27:17 2013 +0200 +++ b/src/conversation_textview.py Tue Aug 13 21:18:44 2013 +0200 @@ -491,7 +491,10 @@ i2 = buffer_.get_iter_at_mark(m2) txt = buffer_.get_text(i1, i2, True) buffer_.delete(i1, i2) - i2 = self.print_real_text(message, text_tags=['outgoingtxt'], name=name, + tag = 'outgoingtxt' + if message.startswith('/me'): + tag = 'outgoing' + i2 = self.print_real_text(message, text_tags=[tag], name=name, xhtml=xhtml, iter_=i1) tt_txt = _('Message was corrected. Last message was:\n %s') % \ old_txt @@ -1353,6 +1356,9 @@ if other_text_tag: # note that color of /me may be overwritten in gc_control text_tags.append(other_text_tag) + if text.startswith('/me'): + mark1 = buffer_.create_mark(None, buffer_.get_end_iter(), + left_gravity=True) else: # not status nor /me if gajim.config.get('chat_merge_consecutive_nickname'): if kind != old_kind or self.just_cleared:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits