Commits October 2010

commits@gajim.org

2 participants
111 discussions

gajim: don't close all GPG passphrase request dialogs when an ac...
by Yann Leboulanger 04 Oct '10

04 Oct '10

changeset b96d1395001d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b96d1395001d description: don't close all GPG passphrase request dialogs when an account goes offline. Fixes #5938 diffstat: src/gui_interface.py | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diffs (31 lines): diff -r 39b05481dfbb -r b96d1395001d src/gui_interface.py --- a/src/gui_interface.py Mon Oct 04 21:24:34 2010 +0200 +++ b/src/gui_interface.py Mon Oct 04 21:46:39 2010 +0200 @@ -225,7 +225,7 @@ del self.instances[account]['online_dialog'][name] for request in self.gpg_passphrase.values(): if request: - request.interrupt() + request.interrupt(account=account) if account in self.pass_dialog: self.pass_dialog[account].window.destroy() if show == 'offline': @@ -3373,9 +3373,15 @@ self.passphrase = None self.completed = False - def interrupt(self): - self.dialog.window.destroy() - self.callbacks = [] + def interrupt(self, account=None): + if account: + for (acct, cb) in self.callbacks: + if acct == account: + self.callbacks.remove((acct, cb)) + else: + self.callbacks = [] + if not len(self.callbacks): + self.dialog.window.destroy() def run_callback(self, account, callback): gajim.connections[account].gpg_passphrase(self.passphrase)

1 0

gajim: don't ignore presence from other resources of our jid.
by Yann Leboulanger 04 Oct '10

04 Oct '10

changeset 39b05481dfbb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=39b05481dfbb description: don't ignore presence from other resources of our jid. diffstat: src/common/connection_handlers_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 196d15483fbe -r 39b05481dfbb src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Oct 04 15:07:53 2010 +0200 +++ b/src/common/connection_handlers_events.py Mon Oct 04 21:24:34 2010 +0200 @@ -732,7 +732,7 @@ self.conn.server_resource: # We got our own presence self.conn.dispatch('STATUS', self.show) - elif self.jid in jid_list: + elif self.jid in jid_list or self.jid == our_jid: return True class GcPresenceReceivedEvent(nec.NetworkIncomingEvent):

1 0

gajim-website: fix link to README file on website
by Yann Leboulanger 04 Oct '10

04 Oct '10

changeset 335b26ccf8c1 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=335b26ccf8c1 description: fix link to README file on website diffstat: downloads.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 32dfc26d7042 -r 335b26ccf8c1 downloads.php --- a/downloads.php Sun Sep 26 14:16:35 2010 +0200 +++ b/downloads.php Mon Oct 04 20:33:17 2010 +0200 @@ -156,7 +156,7 @@ print _(" Source\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" The tarball version of Gajim is ")."<a href=\"downloads/".$download_folder."/gajim-".$last_version.".tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://hg.gajim.org/gajim/raw-file/1001e93ec906/README.html\">see the <tt>README</tt></a> ("._("in English")."). \n"; +print _(" The tarball version of Gajim is ")."<a href=\"downloads/".$download_folder."/gajim-".$last_version.".tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://hg.gajim.org/gajim/raw-file/tip/README.html\">see the <tt>README</tt></a> ("._("in English")."). \n"; #printf(_(" The tarball version of %s is "), "0.13-rc5"); #print "<a href=\"downloads/0.13/gajim-0.13.tar.gz\">"._("here")."</a>. \n"; print _("If you want to use the last unstable development version, then you should checkout the mercurial repository.\n"); @@ -184,7 +184,7 @@ print (" \n"); print (" \n"); print (" \n"); -print _(" Install dependencies, and build Gajim. Please see the")." <a href=\"http://trac.gajim.org/browser/trunk/README.html?format=raw\"><code>README</code></a> ("._("English").") "._("for details.\n"); +print _(" Install dependencies, and build Gajim. Please see the")." <a href=\"http://http://hg.gajim.org/gajim/raw-file/tip/README.html\"><code>README</code></a> ("._("English").") "._("for details.\n"); print (" \n"); print (" \n"); print _(" You can run Gajim by typing the following:\n");

1 0

gajim: small precision in README.html. fixes #5961
by Yann Leboulanger 04 Oct '10

04 Oct '10

changeset 196d15483fbe in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=196d15483fbe description: small precision in README.html. fixes #5961 diffstat: README.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 60b976248b38 -r 196d15483fbe README.html --- a/README.html Mon Oct 04 13:51:42 2010 +0200 +++ b/README.html Mon Oct 04 15:07:53 2010 +0200 @@ -68,7 +68,7 @@ <h2>Running Gajim</h2> Just do gajim or you can run Gajim from your GNOME/Xfce/KDE/whatever menus. -or if you didn't 'make install' you can also run from gajim folder with./launch.sh +or if you use hg version and you didn't 'make install' you can also run from gajim folder with./launch.sh <hr /> <h3>Note for hg users</h3> You will need GNU autotools in order to install Gajim from svn. This includes:

1 0

gajim: - rename error-received event to iq-error-received
by Yann Leboulanger 04 Oct '10

04 Oct '10

changeset 60b976248b38 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=60b976248b38 description: - rename error-received event to iq-error-received - move some code from generate() function to the correct handler for PresenceEvent diffstat: src/common/connection_handlers.py | 55 ++++++++++++++++++++++--- src/common/connection_handlers_events.py | 68 ++++--------------------------- src/gui_interface.py | 4 +- 3 files changed, 59 insertions(+), 68 deletions(-) diffs (214 lines): diff -r a563523b8aa1 -r 60b976248b38 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Oct 04 10:56:34 2010 +0200 +++ b/src/common/connection_handlers.py Mon Oct 04 13:51:42 2010 +0200 @@ -895,10 +895,10 @@ # keep track of sessions this connection has with other JIDs self.sessions = {} - gajim.ged.register_event_handler('error-received', ged.CORE, - self._nec_error_received) + gajim.ged.register_event_handler('iq-error-received', ged.CORE, + self._nec_iq_error_received) - def _nec_error_received(self, obj): + def _nec_iq_error_received(self, obj): if obj.conn.name != self.name: return if obj.id_ in self.last_ids: @@ -1108,8 +1108,8 @@ ged.CORE, self._nec_private_storate_rosternotes_received) gajim.ged.register_event_handler('roster-received', ged.CORE, self._nec_roster_received) - gajim.ged.register_event_handler('error-received', ged.CORE, - self._nec_error_received) + gajim.ged.register_event_handler('iq-error-received', ged.CORE, + self._nec_iq_error_received) gajim.ged.register_event_handler('gmail-new-mail-received', ged.CORE, self._nec_gmail_new_mail_received) gajim.ged.register_event_handler('ping-received', ged.CORE, @@ -1156,10 +1156,10 @@ def _ErrorCB(self, con, iq_obj): log.debug('ErrorCB') - gajim.nec.push_incoming_event(ErrorReceivedEvent(None, conn=self, + gajim.nec.push_incoming_event(IqErrorReceivedEvent(None, conn=self, iq_obj=iq_obj)) - def _nec_error_received(self, obj): + def _nec_iq_error_received(self, obj): if obj.conn.name != self.name: return if obj.id_ in self.version_ids: @@ -1879,6 +1879,47 @@ sess.terminate_e2e() self.delete_session(jid, sess.thread_id) + if obj.ptype == 'unavailable': + for jid in (obj.jid, obj.fjid): + if jid not in self.sessions: + continue + # automatically terminate sessions that they haven't sent a + # thread ID in, only if other part support thread ID + for sess in self.sessions[jid].values(): + if not sess.received_thread_id: + contact = gajim.contacts.get_contact(self.name, jid) + if contact and (contact.supports(xmpp.NS_SSN) or \ + contact.supports(xmpp.NS_ESESSION)): + sess.terminate() + del self.sessions[jid][sess.thread_id] + + if obj.avatar_sha is not None and obj.ptype != 'error': + if obj.jid not in self.vcard_shas: + cached_vcard = self.get_cached_vcard(obj.jid) + if cached_vcard and 'PHOTO' in cached_vcard and \ + 'SHA' in cached_vcard['PHOTO']: + self.vcard_shas[obj.jid] = cached_vcard['PHOTO']['SHA'] + else: + self.vcard_shas[obj.jid] = '' + if obj.avatar_sha != self.vcard_shas[obj.jid]: + # avatar has been updated + self.request_vcard(obj.jid) + + if gajim.config.get('log_contact_status_changes') and \ + gajim.config.should_log(self.name, obj.jid): + try: + gajim.logger.write('status', obj.jid, obj.status, obj.show) + except exceptions.PysqliteOperationalError, e: + self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) + except exceptions.DatabaseMalformed: + pritext = _('Database Error') + sectext = _('The database file (%s) cannot be read. Try to ' + 'repair it (see ' + 'http://trac.gajim.org/wiki/DatabaseBackup) or remove ' + 'it (all history will be lost).') % LOG_DB_PATH + self.dispatch('DB_ERROR', (pritext, sectext)) + our_jid = gajim.get_jid_from_account(self.name) + def _nec_subscribe_presence_received(self, obj): account = obj.conn.name if account != self.name: diff -r a563523b8aa1 -r 60b976248b38 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Oct 04 10:56:34 2010 +0200 +++ b/src/common/connection_handlers_events.py Mon Oct 04 13:51:42 2010 +0200 @@ -559,8 +559,8 @@ self.data.append(f) return True -class ErrorReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'error-received' +class IqErrorReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): + name = 'iq-error-received' base_network_events = [] def generate(self): @@ -700,6 +700,9 @@ self.keyID = helpers.prepare_and_validate_gpg_keyID(self.conn.name, self.jid, self.keyID) + self.errcode = self.iq_obj.getErrorCode() + self.errmsg = self.iq_obj.getErrorMsg() + if self.is_gc: gajim.nec.push_incoming_event(GcPresenceReceivedEvent(None, conn=self.conn, iq_obj=self.iq_obj, presence_obj=self)) @@ -718,65 +721,12 @@ gajim.nec.push_incoming_event(UnsubscribedPresenceReceivedEvent( None, conn=self.conn, iq_obj=self.iq_obj, presence_obj=self)) elif self.ptype == 'error': - errmsg = self.iq_obj.getError() - errcode = self.iq_obj.getErrorCode() - if errcode != '502': # Internal Timeout: - # print in the window the error - self.conn.dispatch('ERROR_ANSWER', ('', self.jid, errmsg, errcode)) - if errcode != '409': # conflict # See #5120 + if self.errcode != '409': # conflict # See #5120 self.show = 'error' - self.status = errmsg + self.status = self.errmsg return True - elif self.ptype == 'unavailable': - for jid in [self.jid, self.fjid]: - if jid not in self.conn.sessions: - continue - # automatically terminate sessions that they haven't sent a thread - # ID in, only if other part support thread ID - for sess in self.conn.sessions[jid].values(): - if not sess.received_thread_id: - contact = gajim.contacts.get_contact(self.conn.name, - jid) - # FIXME: I don't know if this is the correct behavior here. - # Anyway, it is the old behavior when we assumed that - # not-existing contacts don't support anything - contact_exists = bool(contact) - session_supported = contact_exists and ( - contact.supports(xmpp.NS_SSN) or - contact.supports(xmpp.NS_ESESSION)) - if session_supported: - sess.terminate() - del self.conn.sessions[jid][sess.thread_id] - - if self.avatar_sha is not None and self.ptype != 'error': - if self.jid not in self.conn.vcard_shas: - cached_vcard = self.conn.get_cached_vcard(self.jid) - if cached_vcard and 'PHOTO' in cached_vcard and \ - 'SHA' in cached_vcard['PHOTO']: - self.conn.vcard_shas[self.jid] = \ - cached_vcard['PHOTO']['SHA'] - else: - self.conn.vcard_shas[self.jid] = '' - if self.avatar_sha != self.conn.vcard_shas[self.jid]: - # avatar has been updated - self.conn.request_vcard(self.jid) - if not self.ptype or self.ptype == 'unavailable': - if gajim.config.get('log_contact_status_changes') and \ - gajim.config.should_log(self.conn.name, self.jid): - try: - gajim.logger.write('status', self.jid, self.status, - self.show) - except exceptions.PysqliteOperationalError, e: - self.conn.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) - except exceptions.DatabaseMalformed: - pritext = _('Database Error') - sectext = _('The database file (%s) cannot be read. Try to ' - 'repair it (see ' - 'http://trac.gajim.org/wiki/DatabaseBackup) or remove ' - 'it (all history will be lost).') % LOG_DB_PATH - self.conn.dispatch('DB_ERROR', (pritext, sectext)) our_jid = gajim.get_jid_from_account(self.conn.name) if self.jid == our_jid and self.resource == \ self.conn.server_resource: @@ -808,9 +758,9 @@ self.show = self.presence_obj.show self.status = self.presence_obj.status self.avatar_sha = self.presence_obj.avatar_sha + self.errcode = self.presence_obj.errcode + self.errmsg = self.presence_obj.errmsg self.errcon = self.iq_obj.getError() - self.errmsg = self.iq_obj.getErrorMsg() - self.errcode = self.iq_obj.getErrorCode() self.get_gc_control() self.gc_contact = gajim.contacts.get_gc_contact(self.conn.name, self.room_jid, self.nick) diff -r a563523b8aa1 -r 60b976248b38 src/gui_interface.py --- a/src/gui_interface.py Mon Oct 04 10:56:34 2010 +0200 +++ b/src/gui_interface.py Mon Oct 04 13:51:42 2010 +0200 @@ -165,7 +165,7 @@ 'id': obj.iq_id}, sec_msg, on_response_yes=(on_yes, obj), on_response_no=(response, obj, 'no')) - def handle_event_error_answer(self, obj): + def handle_event_iq_error(self, obj): #('ERROR_ANSWER', account, (id_, fjid, errmsg, errcode)) if unicode(obj.errcode) in ('400', '403', '406') and obj.id_: # show the error dialog @@ -1959,7 +1959,7 @@ 'ARCHIVING_CHANGED': [self.handle_event_archiving_changed], 'ARCHIVING_ERROR': [self.handle_event_archiving_error], 'bookmarks-received': [self.handle_event_bookmarks], - 'error-received': [self.handle_event_error_answer], + 'iq-error-received': [self.handle_event_iq_error], 'gc-presence-received': [self.handle_event_gc_presence], 'gmail-notify': [self.handle_event_gmail_notify], 'http-auth-received': [self.handle_event_http_auth],

1 0

gajim: handle (un)subscription requests with NEC
by Yann Leboulanger 04 Oct '10

04 Oct '10

changeset a563523b8aa1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a563523b8aa1 description: handle (un)subscription requests with NEC diffstat: src/common/connection_handlers.py | 98 +++++++++++++++++++++++++++ src/common/connection_handlers_events.py | 110 +++++++++++------------------- src/gui_interface.py | 76 +++++++++----------- src/remote_control.py | 17 ++++ 4 files changed, 190 insertions(+), 111 deletions(-) diffs (truncated from 441 to 300 lines): diff -r 20bbfe8aa155 -r a563523b8aa1 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Oct 03 19:41:31 2010 +0000 +++ b/src/common/connection_handlers.py Mon Oct 04 10:56:34 2010 +0200 @@ -1116,6 +1116,16 @@ self._nec_ping_received) gajim.ged.register_event_handler('presence-received', ged.CORE, self._nec_presence_received) + gajim.ged.register_event_handler('subscribe-presence-received', + ged.CORE, self._nec_subscribe_presence_received) + gajim.ged.register_event_handler('subscribed-presence-received', + ged.CORE, self._nec_subscribed_presence_received) + gajim.ged.register_event_handler('subscribed-presence-received', + ged.POSTGUI, self._nec_subscribed_presence_received_end) + gajim.ged.register_event_handler('unsubscribed-presence-received', + ged.CORE, self._nec_unsubscribed_presence_received) + gajim.ged.register_event_handler('unsubscribed-presence-received', + ged.POSTGUI, self._nec_unsubscribed_presence_received_end) def build_http_auth_answer(self, iq_obj, answer): if not self.connection or self.connected < 2: @@ -1869,6 +1879,94 @@ sess.terminate_e2e() self.delete_session(jid, sess.thread_id) + def _nec_subscribe_presence_received(self, obj): + account = obj.conn.name + if account != self.name: + return + if gajim.jid_is_transport(obj.fjid) and obj.fjid in \ + self.agent_registrations: + self.agent_registrations[obj.fjid]['sub_received'] = True + if not self.agent_registrations[obj.fjid]['roster_push']: + # We'll reply after roster push result + return True + if gajim.config.get_per('accounts', self.name, 'autoauth') or \ + gajim.jid_is_transport(obj.fjid) or obj.jid in self.jids_for_auto_auth \ + or obj.transport_auto_auth: + if self.connection: + p = xmpp.Presence(obj.fjid, 'subscribed') + p = self.add_sha(p) + self.connection.send(p) + if gajim.jid_is_transport(obj.fjid) or obj.transport_auto_auth: + #TODO!?!? + #self.show = 'offline' + #self.status = 'offline' + #emit NOTIFY + pass + if obj.transport_auto_auth: + self.automatically_added.append(obj.jid) + self.request_subscription(obj.jid, name=obj.user_nick) + return True + if not obj.status: + obj.status = _('I would like to add you to my roster.') + + def _nec_subscribed_presence_received(self, obj): + account = obj.conn.name + if account != self.name: + return + # BE CAREFUL: no con.updateRosterItem() in a callback + if obj.jid in self.automatically_added: + self.automatically_added.remove(obj.jid) + return True + # detect a subscription loop + if obj.jid not in self.subscribed_events: + self.subscribed_events[obj.jid] = [] + self.subscribed_events[obj.jid].append(time_time()) + block = False + if len(self.subscribed_events[obj.jid]) > 5: + if time_time() - self.subscribed_events[obj.jid][0] < 5: + block = True + self.subscribed_events[obj.jid] = \ + self.subscribed_events[obj.jid][1:] + if block: + gajim.config.set_per('account', self.name, 'dont_ack_subscription', + True) + return True + + def _nec_subscribed_presence_received_end(self, obj): + account = obj.conn.name + if account != self.name: + return + if not gajim.config.get_per('accounts', account, + 'dont_ack_subscription'): + self.ack_subscribed(obj.jid) + + def _nec_unsubscribed_presence_received(self, obj): + account = obj.conn.name + if account != self.name: + return + # detect a unsubscription loop + if obj.jid not in self.subscribed_events: + self.subscribed_events[obj.jid] = [] + self.subscribed_events[obj.jid].append(time_time()) + block = False + if len(self.subscribed_events[obj.jid]) > 5: + if time_time() - self.subscribed_events[obj.jid][0] < 5: + block = True + self.subscribed_events[obj.jid] = \ + self.subscribed_events[obj.jid][1:] + if block: + gajim.config.set_per('account', self.name, 'dont_ack_subscription', + True) + return True + + def _nec_unsubscribed_presence_received_end(self, obj): + account = obj.conn.name + if account != self.name: + return + if not gajim.config.get_per('accounts', account, + 'dont_ack_subscription'): + self.ack_unsubscribed(obj.jid) + def _StanzaArrivedCB(self, con, obj): self.last_io = gajim.idlequeue.current_time() diff -r 20bbfe8aa155 -r a563523b8aa1 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Oct 03 19:41:31 2010 +0000 +++ b/src/common/connection_handlers_events.py Mon Oct 04 10:56:34 2010 +0200 @@ -624,8 +624,8 @@ except Exception: if self.iq_obj.getTag('error') and self.iq_obj.getTag('error').\ getTag('jid-malformed'): - # wrong jid, we probably tried to change our nick in a room to a non - # valid one + # wrong jid, we probably tried to change our nick in a room to a + # non valid one who = str(self.iq_obj.getFrom()) jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who) self.conn.dispatch('GC_MSG', (jid_stripped, @@ -641,7 +641,7 @@ # XEP-0172 User Nickname self.user_nick = self.iq_obj.getTagData('nick') or '' self.contact_nickname = None - transport_auto_auth = False + self.transport_auto_auth = False # XEP-0203 delay_tag = self.iq_obj.getTag('delay', namespace=xmpp.NS_DELAY2) if delay_tag: @@ -668,12 +668,12 @@ agent = gajim.get_server_from_jid(self.jid) if self.conn.connection.getRoster().getItem(agent): # to be sure it's a transport contact - transport_auto_auth = True + self.transport_auto_auth = True if not self.is_gc and self.id_ and self.id_.startswith('gajim_muc_') \ and self.ptype == 'error': - # Error presences may not include sent stanza, so we don't detect it's - # a muc preence. So detect it by ID + # Error presences may not include sent stanza, so we don't detect + # it's a muc presence. So detect it by ID h = hmac.new(self.conn.secret_hmac, self.jid).hexdigest()[:6] if self.id_.split('_')[-1] == h: self.is_gc = True @@ -706,74 +706,17 @@ return if self.ptype == 'subscribe': - log.debug('subscribe request from %s' % self.fjid) - if self.fjid.find('@') <= 0 and self.fjid in \ - self.conn.agent_registrations: - self.conn.agent_registrations[self.fjid]['sub_received'] = True - if not self.conn.agent_registrations[self.fjid]['roster_push']: - # We'll reply after roster push result - return - if gajim.config.get_per('accounts', self.conn.name, 'autoauth') or \ - self.fjid.find('@') <= 0 or self.jid in \ - self.conn.jids_for_auto_auth or transport_auto_auth: - if self.conn.connection: - p = xmpp.Presence(self.fjid, 'subscribed') - p = self.conn.add_sha(p) - self.conn.connection.send(p) - if self.fjid.find('@') <= 0 or transport_auto_auth: - self.show = 'offline' - self.status = 'offline' - return True - - if transport_auto_auth: - self.conn.automatically_added.append(self.jid) - self.conn.request_subscription(self.jid, - name=self.user_nick) - else: - if not self.status: - self.status = _('I would like to add you to my roster.') - self.conn.dispatch('SUBSCRIBE', (self.jid, self.status, - self.user_nick)) + gajim.nec.push_incoming_event(SubscribePresenceReceivedEvent(None, + conn=self.conn, iq_obj=self.iq_obj, presence_obj=self)) elif self.ptype == 'subscribed': - if self.jid in self.conn.automatically_added: - self.conn.automatically_added.remove(self.jid) - else: - # detect a subscription loop - if self.jid not in self.conn.subscribed_events: - self.conn.subscribed_events[self.jid] = [] - self.conn.subscribed_events[self.jid].append(time_time()) - block = False - if len(self.conn.subscribed_events[self.jid]) > 5: - if time_time() - self.subscribed_events[self.jid][0] < 5: - block = True - self.conn.subscribed_events[self.jid] = \ - self.conn.subscribed_events[self.jid][1:] - if block: - gajim.config.set_per('account', self.conn.name, - 'dont_ack_subscription', True) - else: - self.conn.dispatch('SUBSCRIBED', (self.jid, self.resource)) # BE CAREFUL: no con.updateRosterItem() in a callback - log.debug(_('we are now subscribed to %s') % self.jid) + gajim.nec.push_incoming_event(SubscribedPresenceReceivedEvent(None, + conn=self.conn, iq_obj=self.iq_obj, presence_obj=self)) elif self.ptype == 'unsubscribe': log.debug(_('unsubscribe request from %s') % self.jid) elif self.ptype == 'unsubscribed': - log.debug(_('we are now unsubscribed from %s') % self.jid) - # detect a unsubscription loop - if self.jid not in self.conn.subscribed_events: - self.conn.subscribed_events[self.jid] = [] - self.conn.subscribed_events[self.jid].append(time_time()) - block = False - if len(self.conn.subscribed_events[self.jid]) > 5: - if time_time() - self.conn.subscribed_events[self.jid][0] < 5: - block = True - self.conn.subscribed_events[self.jid] = \ - self.conn.subscribed_events[self.jid][1:] - if block: - gajim.config.set_per('account', self.conn.name, - 'dont_ack_subscription', True) - else: - self.conn.dispatch('UNSUBSCRIBED', self.jid) + gajim.nec.push_incoming_event(UnsubscribedPresenceReceivedEvent( + None, conn=self.conn, iq_obj=self.iq_obj, presence_obj=self)) elif self.ptype == 'error': errmsg = self.iq_obj.getError() errcode = self.iq_obj.getErrorCode() @@ -934,3 +877,32 @@ self.actor = self.iq_obj.getActor() self.new_nick = self.iq_obj.getNewNick() return True + +class SubscribePresenceReceivedEvent(nec.NetworkIncomingEvent): + name = 'subscribe-presence-received' + base_network_events = [] + + def generate(self): + self.jid = self.presence_obj.jid + self.fjid = self.presence_obj.fjid + self.status = self.presence_obj.status + self.transport_auto_auth = self.presence_obj.transport_auto_auth + self.user_nick = self.presence_obj.user_nick + return True + +class SubscribedPresenceReceivedEvent(nec.NetworkIncomingEvent): + name = 'subscribed-presence-received' + base_network_events = [] + + def generate(self): + self.jid = self.presence_obj.jid + self.resource = self.presence_obj.resource + return True + +class UnsubscribedPresenceReceivedEvent(nec.NetworkIncomingEvent): + name = 'unsubscribed-presence-received' + base_network_events = [] + + def generate(self): + self.jid = self.presence_obj.jid + return True diff -r 20bbfe8aa155 -r a563523b8aa1 src/gui_interface.py --- a/src/gui_interface.py Sun Oct 03 19:41:31 2010 +0000 +++ b/src/gui_interface.py Mon Oct 04 10:56:34 2010 +0200 @@ -520,56 +520,48 @@ array[4].roster_message(array[0], msg, array[3], account, msg_type='error') - def handle_event_subscribe(self, account, array): + def handle_event_subscribe_presence(self, obj): #('SUBSCRIBE', account, (jid, text, user_nick)) user_nick is JEP-0172 - if self.remote_ctrl: - self.remote_ctrl.raise_signal('Subscribe', (account, array)) - - jid = array[0] - text = array[1] - nick = array[2] + account = obj.conn.name if helpers.allow_popup_window(account) or not self.systray_enabled: - dialogs.SubscriptionRequestWindow(jid, text, account, nick) + dialogs.SubscriptionRequestWindow(obj.jid, obj.status, account, + obj.user_nick) return - self.add_event(account, jid, 'subscription_request', (text, nick)) + self.add_event(account, obj.jid, 'subscription_request', (obj.status, + obj.user_nick)) if helpers.allow_showing_notification(account): path = gtkgui_helpers.get_icon_path('gajim-subscription_request', 48) event_type = _('Subscription request') - notify.popup(event_type, jid, account, 'subscription_request', path,

1 0

gajim: l10n: Updated Russian (ru) translation to 98%
by dicson_ 03 Oct '10

03 Oct '10

changeset 20bbfe8aa155 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=20bbfe8aa155 description: l10n: Updated Russian (ru) translation to 98% New status: 2142 messages complete with 10 fuzzies and 21 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/ru.po | 3076 ++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 1710 insertions(+), 1366 deletions(-) diffs (truncated from 6817 to 300 lines): diff -r 5ea59a240481 -r 20bbfe8aa155 po/ru.po --- a/po/ru.po Sun Oct 03 19:27:10 2010 +0000 +++ b/po/ru.po Sun Oct 03 19:41:31 2010 +0000 @@ -12,19 +12,20 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-05 02:23+0400\n" -"PO-Revision-Date: 2010-09-05 02:43+0300\n" +"POT-Creation-Date: 2010-10-03 23:32+0400\n" +"PO-Revision-Date: 2010-10-03 23:39+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Linux Support LLC\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Basepath: /home/test/gajim\n" "X-Generator: Virtaal 0.6.1\n" -#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 +#: ../data/gui/account_context_menu.ui.h:1 +#: ../data/gui/roster_window.ui.h:7 msgid "Join _Group Chat..." msgstr "Войти в _комнату" @@ -32,7 +33,8 @@ msgid "_Add Contact..." msgstr "_Добавить контакт..." -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18 +#: ../data/gui/account_context_menu.ui.h:3 +#: ../data/gui/roster_window.ui.h:18 msgid "_Discover Services" msgstr "_Просмотреть сервисы" @@ -52,7 +54,8 @@ msgid "_Personal Events" msgstr "_Расширенный статус" -#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24 +#: ../data/gui/account_context_menu.ui.h:8 +#: ../data/gui/roster_window.ui.h:24 msgid "_Start Chat..." msgstr "_Начать беседу" @@ -121,13 +124,24 @@ msgstr "Управление..." #: ../data/gui/account_creation_wizard_window.ui.h:17 -#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1295 ../src/config.py:1398 ../src/config.py:1709 -#: ../src/config.py:1714 ../src/config.py:2278 ../src/config.py:2357 -#: ../src/config.py:2370 ../src/config.py:3614 ../src/config.py:3689 -#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513 -#: ../src/dialogs.py:526 ../src/roster_window.py:2918 -#: ../src/roster_window.py:2924 ../src/roster_window.py:2929 +#: ../data/gui/accounts_window.ui.h:39 +#: ../data/gui/change_mood_dialog.ui.h:3 +#: ../src/config.py:1280 +#: ../src/config.py:1383 +#: ../src/config.py:1694 +#: ../src/config.py:1699 +#: ../src/config.py:2265 +#: ../src/config.py:2344 +#: ../src/config.py:2357 +#: ../src/config.py:3613 +#: ../src/config.py:3688 +#: ../src/dialogs.py:309 +#: ../src/dialogs.py:311 +#: ../src/dialogs.py:517 +#: ../src/dialogs.py:530 +#: ../src/roster_window.py:2956 +#: ../src/roster_window.py:2962 +#: ../src/roster_window.py:2967 msgid "None" msgstr "Нет" @@ -187,7 +201,8 @@ msgid "_Server:" msgstr "_Сервер:" -#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13 +#: ../data/gui/accounts_window.ui.h:1 +#: ../data/gui/preferences_window.ui.h:13 msgid "Miscellaneous" msgstr "Прочее" @@ -207,7 +222,8 @@ msgid "A_djust to status" msgstr "В _зависимости от статуса" -#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1 +#: ../data/gui/accounts_window.ui.h:6 +#: ../data/gui/join_groupchat_window.ui.h:1 msgid "Account" msgstr "Учетные записи" @@ -282,20 +298,27 @@ msgstr "Имя:" #. No configured account -#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1165 ../src/common/helpers.py:1177 -#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592 -#: ../src/notify.py:608 +#: ../data/gui/accounts_window.ui.h:24 +#: ../data/gui/roster_window.ui.h:5 +#: ../src/common/helpers.py:1159 +#: ../src/common/helpers.py:1171 +#: ../src/notify.py:528 +#: ../src/notify.py:551 +#: ../src/notify.py:600 +#: ../src/notify.py:616 msgid "Gajim" msgstr "Gajim" #. FIXME: Ugly workaround. -#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to -#. General) +#. 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:25 ../data/gui/preferences_window.ui.h:61 -#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121 -#: ../src/roster_window.py:2860 ../src/roster_window.py:5413 +#: ../data/gui/accounts_window.ui.h:25 +#: ../data/gui/preferences_window.ui.h:57 +#: ../src/common/contacts.py:141 +#: ../src/dialogs.py:112 +#: ../src/dialogs.py:122 +#: ../src/roster_window.py:2898 +#: ../src/roster_window.py:5451 msgid "General" msgstr "Общие" @@ -332,8 +355,9 @@ msgstr "Информация о вас, сохраненная на сервере" #: ../data/gui/accounts_window.ui.h:35 -#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1832 -#: ../src/dialogs.py:830 +#: ../data/gui/zeroconf_information_window.ui.h:4 +#: ../src/config.py:1817 +#: ../src/dialogs.py:834 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -346,12 +370,14 @@ msgid "Mer_ge accounts" msgstr "_Объединить учетные записи" -#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1805 -#: ../src/config.py:2371 +#: ../data/gui/accounts_window.ui.h:38 +#: ../src/config.py:1790 +#: ../src/config.py:2358 msgid "No key selected" msgstr "Не выбран ключ" -#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35 +#: ../data/gui/accounts_window.ui.h:40 +#: ../data/gui/profile_window.ui.h:35 msgid "Personal Information" msgstr "Личная информация" @@ -368,7 +394,8 @@ msgstr "Изменять приоритет автоматически в соответствии со статусом." #. Rename -#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5363 +#: ../data/gui/accounts_window.ui.h:44 +#: ../src/roster_window.py:5401 msgid "Re_name" msgstr "П_ереименовать" @@ -430,7 +457,8 @@ msgstr "Редактировать личную информацию..." #. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:60 +#: ../data/gui/xml_console_window.ui.h:11 msgid "_Enable" msgstr "_Включить" @@ -467,7 +495,8 @@ msgid "Add New Contact" msgstr "Добавить новый контакт" -#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1345 +#: ../data/gui/add_new_contact_window.ui.h:4 +#: ../src/common/helpers.py:1339 msgid "I would like to add you to my contact list." msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?" @@ -650,7 +679,8 @@ msgstr "Все статусы" #: ../data/gui/advanced_notifications_window.ui.h:8 -#: ../src/common/commands.py:106 ../src/common/helpers.py:239 +#: ../src/common/commands.py:106 +#: ../src/common/helpers.py:239 #: ../src/tooltips.py:193 msgid "Away" msgstr "Ушел" @@ -705,7 +735,8 @@ msgstr "Выполнить команду" #: ../data/gui/advanced_notifications_window.ui.h:21 -#: ../src/common/helpers.py:222 ../src/tooltips.py:197 +#: ../src/common/helpers.py:222 +#: ../src/tooltips.py:197 msgid "Not Available" msgstr "Недоступен" @@ -848,7 +879,8 @@ msgid "New entry received" msgstr "Получена новая запись" -#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128 +#: ../data/gui/atom_entry_window.ui.h:5 +#: ../src/atom_window.py:128 msgid "You have received new entry:" msgstr "Получена новая запись:" @@ -858,8 +890,10 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:25 -#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5382 -#: ../src/roster_window.py:5510 ../src/roster_window.py:5643 +#: ../data/gui/gc_occupants_menu.ui.h:13 +#: ../src/roster_window.py:5420 +#: ../src/roster_window.py:5548 +#: ../src/roster_window.py:5681 msgid "_Unblock" msgstr "_Разблокировать" @@ -947,7 +981,8 @@ msgstr "_Начать беседу" #. # means number -#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4534 +#: ../data/gui/chat_control.ui.h:1 +#: ../src/dialogs.py:4599 msgid "#" msgstr "№" @@ -955,7 +990,8 @@ msgid "*" msgstr "*" -#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1 +#: ../data/gui/chat_control.ui.h:3 +#: ../data/gui/single_message_window.ui.h:1 msgid "0" msgstr "0" @@ -995,14 +1031,56 @@ msgid "9" msgstr "9" -#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is -#. supposed to show the Emoticon Selector) -#: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2 -#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266 +#: ../data/gui/chat_control.ui.h:13 +msgid "Add this contact to roster (Ctrl+D)" +msgstr "Добавить контакт в ростер (Ctrl+D)" + +#: ../data/gui/chat_control.ui.h:14 +#: ../data/gui/groupchat_control.ui.h:2 +msgid "Browse the chat history (Ctrl+H)" +msgstr "Открыть историю чата (Ctrl+H)" + +#: ../data/gui/chat_control.ui.h:15 +msgid "Invite contacts to the conversation (Ctrl+G)" +msgstr "Пригласить к беседе (Ctrl+G)" + +#: ../data/gui/chat_control.ui.h:16 +#: ../data/gui/groupchat_control.ui.h:5 +msgid "Show a list of emoticons (Alt+M)" +msgstr "Показать набор смайлов (Alt+M)" + +#: ../data/gui/chat_control.ui.h:17 +#: ../data/gui/groupchat_control.ui.h:6 +msgid "Show a list of formattings" +msgstr "Показать список форматирования" + +#: ../data/gui/chat_control.ui.h:18 +#: ../data/gui/groupchat_control.ui.h:7 +msgid "Show a menu of advanced functions (Alt+D)" +msgstr "Показать меню дополнительных функций (Alt+D)" + +#: ../data/gui/chat_control.ui.h:19 +msgid "Show the contact's profile (Ctrl+I)" +msgstr "Показать информацию о контакте (Ctrl+I)" +

1 0

gajim: l10n: Updated Russian (ru) translation to 98%
by dicson_ 03 Oct '10

03 Oct '10

changeset 5ea59a240481 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5ea59a240481 description: l10n: Updated Russian (ru) translation to 98% New status: 2130 messages complete with 9 fuzzies and 21 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/ru.po | 3670 +++++++++++++++++++++++-------------------------------------- 1 files changed, 1393 insertions(+), 2277 deletions(-) diffs (truncated from 6932 to 300 lines): diff -r 51ed1f85a599 -r 5ea59a240481 po/ru.po --- a/po/ru.po Sun Oct 03 20:09:42 2010 +0200 +++ b/po/ru.po Sun Oct 03 19:27:10 2010 +0000 @@ -8,26 +8,21 @@ # Yakov Bezrukov <nebulam51(a)gmail.com>, 2005, 2006, 2007. # Yakov Bezrukov <bezrukov(a)isp.nsc.ru>, 2005. # Dmitry Korzhevin <dkorzhevin(a)lsupport.net>, 2010. -#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228 -#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255 -#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262 -#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264 msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-01 20:39+0200\n" +"POT-Creation-Date: 2010-09-05 02:23+0400\n" "PO-Revision-Date: 2010-09-05 02:43+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Linux Support LLC\n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: ru\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Poedit-Basepath: /home/test/gajim\n" "X-Generator: Virtaal 0.6.1\n" -"X-Poedit-Basepath: /home/test/gajim\n" #: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 msgid "Join _Group Chat..." @@ -127,12 +122,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:17 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694 -#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344 -#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688 -#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514 -#: ../src/dialogs.py:527 ../src/roster_window.py:2956 -#: ../src/roster_window.py:2962 ../src/roster_window.py:2967 +#: ../src/config.py:1295 ../src/config.py:1398 ../src/config.py:1709 +#: ../src/config.py:1714 ../src/config.py:2278 ../src/config.py:2357 +#: ../src/config.py:2370 ../src/config.py:3614 ../src/config.py:3689 +#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513 +#: ../src/dialogs.py:526 ../src/roster_window.py:2918 +#: ../src/roster_window.py:2924 ../src/roster_window.py:2929 msgid "None" msgstr "Нет" @@ -245,12 +240,8 @@ msgstr "И_зменить пароль" #: ../data/gui/accounts_window.ui.h:14 -msgid "" -"Check this so Gajim will ask you before sending your password over an " -"insecure connection." -msgstr "" -"Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля " -"через незащищенное соединение." +msgid "Check this so Gajim will ask you before sending your password over an insecure connection." +msgstr "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля через незащищенное соединение." #: ../data/gui/accounts_window.ui.h:15 msgid "Choose Client Cert" @@ -266,8 +257,7 @@ #: ../data/gui/accounts_window.ui.h:18 msgid "Click to request authorization to all contacts of another account" -msgstr "" -"Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи" +msgstr "Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи" #: ../data/gui/accounts_window.ui.h:19 msgid "Client certificate" @@ -293,67 +283,48 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 -#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600 -#: ../src/notify.py:616 +#: ../src/common/helpers.py:1165 ../src/common/helpers.py:1177 +#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592 +#: ../src/notify.py:608 msgid "Gajim" msgstr "Gajim" #. FIXME: Ugly workaround. -#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General) +#. 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:25 ../data/gui/preferences_window.ui.h:57 -#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122 -#: ../src/roster_window.py:2898 ../src/roster_window.py:5451 +#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61 +#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121 +#: ../src/roster_window.py:2860 ../src/roster_window.py:5413 msgid "General" msgstr "Общие" #: ../data/gui/accounts_window.ui.h:26 -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 адресов в дополнение " -"к вашему, так что передача файла имеет больше шансов на успех." +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 адресов в дополнение к вашему, так что передача файла имеет больше шансов на успех." #: ../data/gui/accounts_window.ui.h:27 msgid "If checked, Gajim will get the password from a GPG agent like seahorse" msgstr "Если отмечено, то Gajim запомнит пароль учетной записи" #: ../data/gui/accounts_window.ui.h:29 -msgid "" -"If checked, Gajim will send keep-alive packets to prevent connection timeout " -"which results in disconnection" -msgstr "" -"Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва " -"соединения по таймауту" +msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection" +msgstr "Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва соединения по таймауту" #: ../data/gui/accounts_window.ui.h:30 -msgid "" -"If checked, Gajim, when launched, will automatically connect to jabber using " -"this account" -msgstr "" -"Если отмечено, Gajim после запуска будет автоматически подсоединяться к " -"jabber серверу с использованием этой учетной записи" +msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account" +msgstr "Если отмечено, Gajim после запуска будет автоматически подсоединяться к jabber серверу с использованием этой учетной записи" #: ../data/gui/accounts_window.ui.h:31 -msgid "" -"If checked, any change to the global status (handled by the combobox at the " -"bottom of the roster window) will change the status of this account " -"accordingly" -msgstr "" -"Если отмечено, то любые изменения глобального статуса (управляемого из " -"выпадающего списка внизу окна ростера) повлекут за собой изменение статуса " -"этой учетной записи" +msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly" +msgstr "Если отмечено, то любые изменения глобального статуса (управляемого из выпадающего списка внизу окна ростера) повлекут за собой изменение статуса этой учетной записи" #: ../data/gui/accounts_window.ui.h:32 msgid "" -"If the default port that is used for incoming messages is unfitting for your " -"setup you can select another one here.\n" +"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n" "You might consider to change possible firewall settings." msgstr "" -"Если порт по умолчанию, который используется для входящих сообщения вас не " -"устраивает, вы можете выбрать другой.\n" +"Если порт по умолчанию, который используется для входящих сообщения вас не устраивает, вы можете выбрать другой.\n" "Также, возможно, придется изменить некоторые настройки брандмауэра." #: ../data/gui/accounts_window.ui.h:34 @@ -361,8 +332,8 @@ msgstr "Информация о вас, сохраненная на сервере" #: ../data/gui/accounts_window.ui.h:35 -#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817 -#: ../src/dialogs.py:831 +#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1832 +#: ../src/dialogs.py:830 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -375,8 +346,8 @@ msgid "Mer_ge accounts" msgstr "_Объединить учетные записи" -#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790 -#: ../src/config.py:2358 +#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1805 +#: ../src/config.py:2371 msgid "No key selected" msgstr "Не выбран ключ" @@ -389,22 +360,15 @@ msgstr "Приори_тет:" #: ../data/gui/accounts_window.ui.h:42 -msgid "" -"Priority is used in Jabber to determine who gets the events from the jabber " -"server when two or more clients are connected using the same account; The " -"client with the highest priority gets the events" -msgstr "" -"Приоритет используется в Jabber для определения того, кто будет получать " -"события от jabber сервера когда подсоединены два и более клиента с одной и " -"той же учетной записью. Клиент с наибольшим приоритетом будет получать " -"события" +msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events" +msgstr "Приоритет используется в Jabber для определения того, кто будет получать события от jabber сервера когда подсоединены два и более клиента с одной и той же учетной записью. Клиент с наибольшим приоритетом будет получать события" #: ../data/gui/accounts_window.ui.h:43 msgid "Priority will change automatically according to your status." msgstr "Изменять приоритет автоматически в соответствии со статусом." #. Rename -#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401 +#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5363 msgid "Re_name" msgstr "П_ереименовать" @@ -413,18 +377,8 @@ msgstr "Ресу_рс: " #: ../data/gui/accounts_window.ui.h:46 -msgid "" -"Resource is sent to the Jabber server in order to separate the same JID in " -"two or more parts depending on the number of the clients connected in the " -"same server with the same account. So you might be connected in the same " -"account with resource 'Home' and 'Work' at the same time. The resource which " -"has the highest priority will get the events. (see below)" -msgstr "" -"Ресурс отправляется Jabber серверу для того, чтобы различать два и более " -"клиентов с одинаковой учетной записью, подключенных к одному и тому же " -"серверу. Таким образом, вы можете одновременно подключиться к одному серверу " -"с ресурсов 'Дом' или 'Работа'. Ресурс, обладающий большим приоритетом, будет " -"получать все события. (См. ниже)" +msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" +msgstr "Ресурс отправляется Jabber серверу для того, чтобы различать два и более клиентов с одинаковой учетной записью, подключенных к одному и тому же серверу. Таким образом, вы можете одновременно подключиться к одному серверу с ресурсов 'Дом' или 'Работа'. Ресурс, обладающий большим приоритетом, будет получать все события. (См. ниже)" #: ../data/gui/accounts_window.ui.h:47 msgid "Save conversation _logs for all contacts" @@ -513,7 +467,7 @@ msgid "Add New Contact" msgstr "Добавить новый контакт" -#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1339 +#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1345 msgid "I would like to add you to my contact list." msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?" @@ -608,9 +562,7 @@ #: ../data/gui/advanced_configuration_window.ui.h:2 msgid "NOTE: You should restart Gajim for some settings to take effect" -msgstr "" -"ПРИМЕЧАНИЕ: Необходимо перезапустить Gajim, чтобы некоторые настройки " -"вступили в силу" +msgstr "ПРИМЕЧАНИЕ: Необходимо перезапустить Gajim, чтобы некоторые настройки вступили в силу" #: ../data/gui/advanced_configuration_window.ui.h:3 msgid "Advanced Configuration Editor" @@ -638,8 +590,7 @@ #: ../data/gui/advanced_menuitem_menu.ui.h:5 msgid "Sends a message to users currently connected to this server" -msgstr "" -"Отправляет сообщение пользователям подсоединенным к серверу в данный момент" +msgstr "Отправляет сообщение пользователям подсоединенным к серверу в данный момент" #: ../data/gui/advanced_menuitem_menu.ui.h:6 msgid "Set MOTD..." @@ -779,11 +730,8 @@ msgstr "Когда " #: ../data/gui/advanced_notifications_window.ui.h:27 -msgid "" -"_Activate window manager's UrgencyHint to make chat window in taskbar flash" -msgstr "" -"_Активировать функцию оконного менеджера «UrgencyHint», чтобы окно чата " -"мигало на панели" +msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash" +msgstr "_Активировать функцию оконного менеджера «UrgencyHint», чтобы окно чата мигало на панели" #: ../data/gui/advanced_notifications_window.ui.h:28 msgid "_Disable auto opening chat window" @@ -910,8 +858,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:25 -#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420 -#: ../src/roster_window.py:5548 ../src/roster_window.py:5681 +#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5382 +#: ../src/roster_window.py:5510 ../src/roster_window.py:5643 msgid "_Unblock" msgstr "_Разблокировать" @@ -999,7 +947,7 @@ msgstr "_Начать беседу" #. # means number -#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596 +#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4534 msgid "#" msgstr "№" @@ -1047,49 +995,14 @@ msgid "9" msgstr "9"

1 0

gajim: select a default activity when enable "choose an activity...
by Yann Leboulanger 03 Oct '10

03 Oct '10

changeset 51ed1f85a599 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=51ed1f85a599 description: select a default activity when enable "choose an activity". Fixes #5960 diffstat: src/dialogs.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (31 lines): diff -r 84fa16ca5ca9 -r 51ed1f85a599 src/dialogs.py --- a/src/dialogs.py Sun Oct 03 19:43:01 2010 +0200 +++ b/src/dialogs.py Sun Oct 03 20:09:42 2010 +0200 @@ -344,8 +344,7 @@ self.activity = activity self.subactivity = subactivity self.text = text - self.xml = gtkgui_helpers.get_gtk_builder( - 'change_activity_dialog.ui') + self.xml = gtkgui_helpers.get_gtk_builder('change_activity_dialog.ui') self.window = self.xml.get_object('change_activity_dialog') self.window.set_transient_for(gajim.interface.roster.window) @@ -411,6 +410,8 @@ vbox.pack_start(rbtns[act], False, False, 0) + self.default_radio = rbtns['doing_chores_other'] + if self.activity in pep.ACTIVITIES: if not self.subactivity in pep.ACTIVITIES[self.activity]: self.subactivity = 'other' @@ -436,6 +437,8 @@ def on_enable_checkbutton_toggled(self, widget): self.notebook.set_sensitive(widget.get_active()) self.entry.set_sensitive(widget.get_active()) + if not self.activity: + self.default_radio.set_active(True) def on_rbtn_toggled(self, widget, data): if widget.get_active():

1 0

gajim: fix typo
by Yann Leboulanger 03 Oct '10

03 Oct '10

changeset 84fa16ca5ca9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=84fa16ca5ca9 description: fix typo diffstat: po/be.po | 3053 ++++++++++++++++------------- po/be(a)latin.po | 3056 ++++++++++++++++------------- po/bg.po | 3066 ++++++++++++++++------------- po/br.po | 3054 ++++++++++++++++------------- po/cs.po | 3139 ++++++++++++++++------------- po/da.po | 3041 ++++++++++++++++------------- po/de.po | 3071 ++++++++++++++++------------- po/el.po | 3070 ++++++++++++++++------------- po/en_GB.po | 3107 ++++++++++++++++------------- po/eo.po | 3122 ++++++++++++++++------------- po/es.po | 3077 ++++++++++++++++------------- po/eu.po | 3063 ++++++++++++++++------------- po/fr.po | 3079 ++++++++++++++++------------- po/gl.po | 3066 ++++++++++++++++------------- po/hr.po | 3134 ++++++++++++++++------------- po/it.po | 3048 ++++++++++++++++------------- po/ja.po | 3030 ++++++++++++++++------------- po/kk.po | 4632 +++++++++++++++++++++++++++----------------- po/lt.po | 3018 ++++++++++++++++------------- po/nb.po | 3066 ++++++++++++++++------------- po/nl.po | 3095 ++++++++++++++++------------- po/no.po | 3066 ++++++++++++++++------------- po/pl.po | 3141 ++++++++++++++++------------- po/pt.po | 3097 ++++++++++++++++------------- po/pt_BR.po | 3071 ++++++++++++++++------------- po/ru.po | 4486 ++++++++++++++++++++++++------------------ po/sk.po | 3060 ++++++++++++++++------------- po/sr.po | 3162 ++++++++++++++++------------- po/sr(a)Latn.po | 3123 ++++++++++++++++------------- po/sv.po | 3077 ++++++++++++++++------------- po/uk.po | 5169 +++++++++++++++++++++++++++++++------------------ po/zh_CN.po | 3056 ++++++++++++++++------------- src/gui_interface.py | 2 +- 33 files changed, 57709 insertions(+), 45888 deletions(-) diffs (truncated from 234414 to 300 lines): diff -r b5f0d7202378 -r 84fa16ca5ca9 po/be.po --- a/po/be.po Fri Oct 01 10:31:26 2010 +0200 +++ b/po/be.po Sun Oct 03 19:43:01 2010 +0200 @@ -3,11 +3,15 @@ # This file is distributed under the same license as Gajim. # # Ihar Hrachyshka <ihar.hrachyshka(a)gmail.com>, 2006, 2009. +#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228 +#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255 +#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262 +#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264 msgid "" msgstr "" "Project-Id-Version: 0.10.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 11:28+0200\n" +"POT-Creation-Date: 2010-10-01 20:39+0200\n" "PO-Revision-Date: 2009-08-19 23:42+0200\n" "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka(a)gmail.com>\n" "Language-Team: Belarusian <i18n(a)mova.org>\n" @@ -27,7 +31,7 @@ msgid "_Add Contact..." msgstr "_Дадаць чалавека..." -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17 +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18 msgid "_Discover Services" msgstr "_Пошук сервісаў" @@ -49,7 +53,7 @@ msgid "_Personal Events" msgstr "Асабістыя звесткі" -#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23 +#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24 #, fuzzy msgid "_Start Chat..." msgstr "_Пачаць размову" @@ -84,76 +88,72 @@ msgstr "" #: ../data/gui/account_creation_wizard_window.ui.h:7 -msgid "@" -msgstr "" - -#: ../data/gui/account_creation_wizard_window.ui.h:8 msgid "" "Add this certificate to the list of trusted certificates.\n" "SHA1 fingerprint of the certificate:\n" msgstr "" -#: ../data/gui/account_creation_wizard_window.ui.h:11 +#: ../data/gui/account_creation_wizard_window.ui.h:10 #, fuzzy msgid "Anon_ymous authentication" msgstr "Аўтарызацыя" -#: ../data/gui/account_creation_wizard_window.ui.h:12 +#: ../data/gui/account_creation_wizard_window.ui.h:11 msgid "Connect when I press Finish" msgstr "Злучыцца па націску кнопкі \"Скончыць\"" -#: ../data/gui/account_creation_wizard_window.ui.h:13 +#: ../data/gui/account_creation_wizard_window.ui.h:12 msgid "Gajim: Account Creation Wizard" msgstr "Gajim: Стварэнне рахунка" -#: ../data/gui/account_creation_wizard_window.ui.h:14 +#: ../data/gui/account_creation_wizard_window.ui.h:13 #, fuzzy msgid "I already have an account I want to _use" msgstr "Я ўжо маю патрэбны рахунак" -#: ../data/gui/account_creation_wizard_window.ui.h:15 +#: ../data/gui/account_creation_wizard_window.ui.h:14 msgid "I want to _register for a new account" msgstr "_Зарэгістраваць новы рахунак" -#: ../data/gui/account_creation_wizard_window.ui.h:16 +#: ../data/gui/account_creation_wizard_window.ui.h:15 #: ../data/gui/accounts_window.ui.h:28 msgid "If checked, Gajim will remember the password for this account" msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка" -#: ../data/gui/account_creation_wizard_window.ui.h:17 +#: ../data/gui/account_creation_wizard_window.ui.h:16 msgid "Manage..." msgstr "Кіраванне..." -#: ../data/gui/account_creation_wizard_window.ui.h:18 +#: ../data/gui/account_creation_wizard_window.ui.h:17 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694 -#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342 -#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671 -#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513 -#: ../src/dialogs.py:526 ../src/roster_window.py:2890 -#: ../src/roster_window.py:2896 ../src/roster_window.py:2901 +#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344 +#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688 +#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514 +#: ../src/dialogs.py:527 ../src/roster_window.py:2956 +#: ../src/roster_window.py:2962 ../src/roster_window.py:2967 msgid "None" msgstr "Ніякі" -#: ../data/gui/account_creation_wizard_window.ui.h:19 +#: ../data/gui/account_creation_wizard_window.ui.h:18 #, fuzzy msgid "Prox_y:" msgstr "Проксі:" -#: ../data/gui/account_creation_wizard_window.ui.h:20 +#: ../data/gui/account_creation_wizard_window.ui.h:19 #: ../data/gui/accounts_window.ui.h:48 msgid "Save pass_word" msgstr "Захоўваць па_роль" -#: ../data/gui/account_creation_wizard_window.ui.h:21 +#: ../data/gui/account_creation_wizard_window.ui.h:20 msgid "Set my profile when I connect" msgstr "Абнавіць профіль па злучэнні" -#: ../data/gui/account_creation_wizard_window.ui.h:22 +#: ../data/gui/account_creation_wizard_window.ui.h:21 msgid "Use custom hostname/port" msgstr "Адмысловы вузел / порт" -#: ../data/gui/account_creation_wizard_window.ui.h:23 +#: ../data/gui/account_creation_wizard_window.ui.h:22 msgid "" "You need to have an account in order to connect\n" "to the Jabber network." @@ -161,35 +161,35 @@ "Трэба зарэгістраваць рахунак, каб далучыцца да\n" "сеткі Jabber." -#: ../data/gui/account_creation_wizard_window.ui.h:25 -#: ../data/gui/roster_window.ui.h:15 +#: ../data/gui/account_creation_wizard_window.ui.h:24 +#: ../data/gui/roster_window.ui.h:16 msgid "_Advanced" msgstr "_Адмысловыя" -#: ../data/gui/account_creation_wizard_window.ui.h:26 +#: ../data/gui/account_creation_wizard_window.ui.h:25 msgid "_Finish" msgstr "_Скончыць" -#: ../data/gui/account_creation_wizard_window.ui.h:27 +#: ../data/gui/account_creation_wizard_window.ui.h:26 #, fuzzy msgid "_Hostname:" msgstr "Назва вузла: " -#: ../data/gui/account_creation_wizard_window.ui.h:28 +#: ../data/gui/account_creation_wizard_window.ui.h:27 #: ../data/gui/accounts_window.ui.h:62 msgid "_Jabber ID:" msgstr "_Jabber ID:" -#: ../data/gui/account_creation_wizard_window.ui.h:29 +#: ../data/gui/account_creation_wizard_window.ui.h:28 #: ../data/gui/accounts_window.ui.h:64 msgid "_Password:" msgstr "_Пароль:" -#: ../data/gui/account_creation_wizard_window.ui.h:30 +#: ../data/gui/account_creation_wizard_window.ui.h:29 msgid "_Port:" msgstr "_Порт:" -#: ../data/gui/account_creation_wizard_window.ui.h:31 +#: ../data/gui/account_creation_wizard_window.ui.h:30 msgid "_Server:" msgstr "_Сервер:" @@ -300,17 +300,17 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 -#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592 -#: ../src/notify.py:608 +#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600 +#: ../src/notify.py:616 msgid "Gajim" msgstr "Gajim" #. 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:25 ../data/gui/preferences_window.ui.h:61 -#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121 -#: ../src/roster_window.py:2832 ../src/roster_window.py:5379 +#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57 +#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122 +#: ../src/roster_window.py:2898 ../src/roster_window.py:5451 msgid "General" msgstr "Агульная" @@ -367,7 +367,7 @@ #: ../data/gui/accounts_window.ui.h:35 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817 -#: ../src/dialogs.py:830 +#: ../src/dialogs.py:831 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -381,7 +381,7 @@ msgstr "_Аб'яднаць рахункі" #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790 -#: ../src/config.py:2356 +#: ../src/config.py:2358 msgid "No key selected" msgstr "Ключ не выбраны" @@ -408,7 +408,7 @@ msgstr "Прыярытэт будзе змяняцца згодна з станам." #. Rename -#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329 +#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401 msgid "Re_name" msgstr "_Змяніць імя" @@ -642,40 +642,45 @@ #: ../data/gui/advanced_menuitem_menu.ui.h:3 #, fuzzy +msgid "Edit Archi_ving Preferences" +msgstr "_Настаўленні" + +#: ../data/gui/advanced_menuitem_menu.ui.h:4 +#, fuzzy msgid "Edit _Privacy Lists..." msgstr "_Спісы прыватнасці" -#: ../data/gui/advanced_menuitem_menu.ui.h:4 +#: ../data/gui/advanced_menuitem_menu.ui.h:5 msgid "Sends a message to users currently connected to this server" msgstr "Адправіць паведамленне ўсім далучаным людзям з гэтага сервера" -#: ../data/gui/advanced_menuitem_menu.ui.h:5 +#: ../data/gui/advanced_menuitem_menu.ui.h:6 #, fuzzy msgid "Set MOTD..." msgstr "Вызначыць MOTD" -#: ../data/gui/advanced_menuitem_menu.ui.h:6 +#: ../data/gui/advanced_menuitem_menu.ui.h:7 msgid "Sets Message of the Day" msgstr "Вызначыць паведамленне дня" -#: ../data/gui/advanced_menuitem_menu.ui.h:7 +#: ../data/gui/advanced_menuitem_menu.ui.h:8 msgid "Show _XML Console" msgstr "Паказаць _кансоль XML" -#: ../data/gui/advanced_menuitem_menu.ui.h:8 +#: ../data/gui/advanced_menuitem_menu.ui.h:9 #, fuzzy msgid "Update MOTD..." msgstr "Абнавіць MOTD" -#: ../data/gui/advanced_menuitem_menu.ui.h:9 +#: ../data/gui/advanced_menuitem_menu.ui.h:10 msgid "Updates Message of the Day" msgstr "Абнавіць паведамленне дня" -#: ../data/gui/advanced_menuitem_menu.ui.h:10 +#: ../data/gui/advanced_menuitem_menu.ui.h:11 msgid "_Administrator" msgstr "_Адміністратар" -#: ../data/gui/advanced_menuitem_menu.ui.h:11 +#: ../data/gui/advanced_menuitem_menu.ui.h:12 #, fuzzy msgid "_Send Server Message..." msgstr "Ад_правіць паведамленне серверу" @@ -710,7 +715,7 @@ msgstr "Усе станы" #: ../data/gui/advanced_notifications_window.ui.h:8 -#: ../src/common/commands.py:106 ../src/common/helpers.py:233 +#: ../src/common/commands.py:106 ../src/common/helpers.py:239 #: ../src/tooltips.py:193 msgid "Away" msgstr "Сышоў" @@ -763,7 +768,7 @@ msgstr "Мае " #: ../data/gui/advanced_notifications_window.ui.h:19 -#: ../src/common/helpers.py:243 +#: ../src/common/helpers.py:249 msgid "Invisible" msgstr "Нябачны" @@ -772,7 +777,7 @@

1 0

← Newer
1
...
6
7
8
9
10
11
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2010