Commits

commits@gajim.org

17632 discussions

gajim: don't fail to autogen when there is no plugin
by Yann Leboulanger 10 Mar '12

10 Mar '12

changeset 704419e5f5a3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=704419e5f5a3 description: don't fail to autogen when there is no plugin diffstat: autogen.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r ffb5c38728a5 -r 704419e5f5a3 autogen.sh --- a/autogen.sh Fri Mar 09 08:45:47 2012 +0100 +++ b/autogen.sh Sat Mar 10 13:32:34 2012 +0100 @@ -22,8 +22,10 @@ && ls -1 data/gajim.desktop.in.in \ src/*.py src/common/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ po/POTFILES.in \ - && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip \ - && ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip || exit 1 + && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 + if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then + ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip + fi if test -z `which pkg-config 2>/dev/null`;then echo "***Error: pkg-config not found***" echo "See README.html for build requirements."

1 0

gajim: correctly check JID when creating an anonymous account. F...
by Yann Leboulanger 09 Mar '12

09 Mar '12

changeset 1edc01235c3e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1edc01235c3e description: correctly check JID when creating an anonymous account. Fixes #7116 diffstat: src/config.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 2cdc9da8162a -r 1edc01235c3e src/config.py --- a/src/config.py Fri Mar 09 08:40:21 2012 +0100 +++ b/src/config.py Fri Mar 09 08:45:47 2012 +0100 @@ -3655,7 +3655,11 @@ password = self.xml.get_object('password_entry').get_text().decode( 'utf-8') - jid = username + '@' + server + if anonymous: + jid = '' + else: + jid = username + '@' + jid += server # check if jid is conform to RFC and stringprep it try: jid = helpers.parse_jid(jid)

1 0

gajim: don't mark received message as read until it's really rea...
by Yann Leboulanger 09 Mar '12

09 Mar '12

changeset fcbe55925104 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fcbe55925104 description: don't mark received message as read until it's really read by user. Fixes #7094 diffstat: src/chat_control.py | 47 ++++++++++++++++++++++++----------------------- src/roster_window.py | 21 +++++++++++++++++++-- 2 files changed, 43 insertions(+), 25 deletions(-) diffs (146 lines): diff -r dd1c30407de1 -r fcbe55925104 src/chat_control.py --- a/src/chat_control.py Sun Feb 26 20:38:29 2012 +0400 +++ b/src/chat_control.py Thu Mar 08 20:03:17 2012 +0100 @@ -919,10 +919,9 @@ self.received_history_pos = pos def print_conversation_line(self, text, kind, name, tim, - other_tags_for_name=[], other_tags_for_time=[], - other_tags_for_text=[], count_as_new=True, subject=None, - old_kind=None, xhtml=None, simple=False, xep0184_id=None, - graphics=True, displaymarking=None): + other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], + count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, + xep0184_id=None, graphics=True, displaymarking=None, msg_id=None): """ Print 'chat' type messages """ @@ -933,9 +932,9 @@ if self.was_at_the_end or kind == 'outgoing': end = True textview.print_conversation_line(text, jid, kind, name, tim, - other_tags_for_name, other_tags_for_time, other_tags_for_text, - subject, old_kind, xhtml, simple=simple, graphics=graphics, - displaymarking=displaymarking) + other_tags_for_name, other_tags_for_time, other_tags_for_text, + subject, old_kind, xhtml, simple=simple, graphics=graphics, + displaymarking=displaymarking) if xep0184_id is not None: textview.show_xep0184_warning(xep0184_id) @@ -978,18 +977,18 @@ type_ = 'printed_' + self.type_id event = 'message_received' show_in_roster = notify.get_show_in_roster(event, - self.account, self.contact, self.session) + self.account, self.contact, self.session) show_in_systray = notify.get_show_in_systray(event, - self.account, self.contact, type_) - - event = gajim.events.create_event(type_, (self,), + self.account, self.contact, type_) + + event = gajim.events.create_event(type_, (self, msg_id), show_in_roster=show_in_roster, show_in_systray=show_in_systray) gajim.events.add_event(self.account, full_jid, event) # We need to redraw contact if we show in roster if show_in_roster: gajim.interface.roster.draw_contact(self.contact.jid, - self.account) + self.account) if not self.parent_win: return @@ -2425,8 +2424,8 @@ return gajim.nicks[self.account] def print_conversation(self, text, frm='', tim=None, encrypted=False, - subject=None, xhtml=None, simple=False, xep0184_id=None, - displaymarking=None): + subject=None, xhtml=None, simple=False, xep0184_id=None, + displaymarking=None, msg_id=None): """ Print a line in the conversation @@ -2457,21 +2456,22 @@ # ESessions if not encrypted: msg = _('The following message was NOT encrypted') - ChatControlBase.print_conversation_line(self, msg, 'status', '', - tim) + ChatControlBase.print_conversation_line(self, msg, 'status', + '', tim) else: # GPG encryption if encrypted and not self.gpg_is_active: msg = _('The following message was encrypted') - ChatControlBase.print_conversation_line(self, msg, 'status', '', - tim) - # turn on OpenPGP if this was in fact a XEP-0027 encrypted message + ChatControlBase.print_conversation_line(self, msg, 'status', + '', tim) + # turn on OpenPGP if this was in fact a XEP-0027 encrypted + # message if encrypted == 'xep27': self._toggle_gpg() elif not encrypted and self.gpg_is_active: msg = _('The following message was NOT encrypted') - ChatControlBase.print_conversation_line(self, msg, 'status', '', - tim) + ChatControlBase.print_conversation_line(self, msg, 'status', + '', tim) if not frm: kind = 'incoming' name = contact.get_shown_name() @@ -2488,8 +2488,9 @@ if xhtml: xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml) ChatControlBase.print_conversation_line(self, text, kind, name, tim, - subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, - simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking) + subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, + simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking, + msg_id=msg_id) if text.startswith('/me ') or text.startswith('/me\n'): self.old_msg_kind = None else: diff -r dd1c30407de1 -r fcbe55925104 src/roster_window.py --- a/src/roster_window.py Sun Feb 26 20:38:29 2012 +0400 +++ b/src/roster_window.py Thu Mar 08 20:03:17 2012 +0100 @@ -1889,6 +1889,18 @@ Only performed if removal was requested before but the contact still had pending events """ + + msg_ids = [] + for ev in event_list: + if ev.type_ != 'printed_chat': + continue + if len(ev.parameters) > 1 and ev.parameters[1]: + # There is a msg_id + msg_ids.append(ev.parameters[1]) + + if msg_ids: + gajim.logger.set_read_messages(msg_ids) + contact_list = ((event.jid.split('/')[0], event.account) for event in \ event_list) @@ -2632,9 +2644,14 @@ obj.session.control.print_conversation(obj.msgtxt, typ, tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject, - xhtml=obj.xhtml, displaymarking=obj.displaymarking) + xhtml=obj.xhtml, displaymarking=obj.displaymarking, + msg_id=obj.msg_id) if obj.msg_id: - gajim.logger.set_read_messages([obj.msg_id]) + pw = obj.session.control.parent_win + end = obj.session.control.was_at_the_end + if not pw or (pw.get_active_control() and obj.session.control \ + == pw.get_active_control() and pw.is_active() and end): + gajim.logger.set_read_messages([obj.msg_id]) elif obj.popup: contact = gajim.contacts.get_contact(obj.conn.name, obj.jid) obj.session.control = gajim.interface.new_chat(contact,

1 0

gajim: fix focus behaviour when opening chat / groupchat window....
by Yann Leboulanger 09 Mar '12

09 Mar '12

changeset 2cdc9da8162a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2cdc9da8162a description: fix focus behaviour when opening chat / groupchat window. Fixes #7115, see #5740 diffstat: src/chat_control.py | 1 - src/groupchat_control.py | 1 - src/message_window.py | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diffs (33 lines): diff -r fcbe55925104 -r 2cdc9da8162a src/chat_control.py --- a/src/chat_control.py Thu Mar 08 20:03:17 2012 +0100 +++ b/src/chat_control.py Fri Mar 09 08:40:21 2012 +0100 @@ -468,7 +468,6 @@ self.user_nick = None self.smooth = True - self.msg_textview.grab_focus() self.command_hits = [] self.last_key_tabs = False diff -r fcbe55925104 -r 2cdc9da8162a src/groupchat_control.py --- a/src/groupchat_control.py Thu Mar 08 20:03:17 2012 +0100 +++ b/src/groupchat_control.py Fri Mar 09 08:40:21 2012 +0100 @@ -1307,7 +1307,6 @@ self._update_banner_state_image() if self.parent_win: self.parent_win.redraw_tab(self) - gobject.idle_add(self.msg_textview.grab_focus) def got_disconnected(self): self.list_treeview.set_model(None) diff -r fcbe55925104 -r 2cdc9da8162a src/message_window.py --- a/src/message_window.py Thu Mar 08 20:03:17 2012 +0100 +++ b/src/message_window.py Fri Mar 09 08:40:21 2012 +0100 @@ -307,7 +307,6 @@ # NOTE: we do not call set_control_active(True) since we don't know # whether the tab is the active one. self.show_title() - gobject.idle_add(control.msg_textview.grab_focus) def on_tab_eventbox_button_press_event(self, widget, event, child): if event.button == 3: # right click

1 0

gajim: update demandimport module from mercurial
by Fomin Denis 09 Mar '12

09 Mar '12

changeset dd1c30407de1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dd1c30407de1 description: update demandimport module from mercurial diffstat: src/common/demandimport.py | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diffs (86 lines): diff -r 03bb7f66980f -r dd1c30407de1 src/common/demandimport.py --- a/src/common/demandimport.py Fri Feb 24 21:42:50 2012 +0400 +++ b/src/common/demandimport.py Sun Feb 26 20:38:29 2012 +0400 @@ -27,6 +27,17 @@ import __builtin__ _origimport = __import__ +nothing = object() + +try: + _origimport(__builtin__.__name__, {}, {}, None, -1) +except TypeError: # no level argument + def _import(name, globals, locals, fromlist, level): + "call _origimport with no level argument" + return _origimport(name, globals, locals, fromlist) +else: + _import = _origimport + class _demandmod(object): """module demand-loader and proxy""" def __init__(self, name, globals, locals): @@ -50,7 +61,7 @@ h, t = p, None if '.' in p: h, t = p.split('.', 1) - if not hasattr(mod, h): + if getattr(mod, h, nothing) is nothing: setattr(mod, h, _demandmod(p, mod.__dict__, mod.__dict__)) elif t: subload(getattr(mod, h), t) @@ -78,20 +89,17 @@ self._load() setattr(self._module, attr, val) -def _demandimport(name, globals=None, locals=None, fromlist=None, level=None): +def _demandimport(name, globals=None, locals=None, fromlist=None, level=-1): if not locals or name in ignore or fromlist == ('*',): # these cases we can't really delay - if level is None: - return _origimport(name, globals, locals, fromlist) - else: - return _origimport(name, globals, locals, fromlist, level) + return _import(name, globals, locals, fromlist, level) elif not fromlist: # import a [as b] if '.' in name: # a.b base, rest = name.split('.', 1) # email.__init__ loading email.mime if globals and globals.get('__name__', None) == base: - return _origimport(name, globals, locals, fromlist) + return _import(name, globals, locals, fromlist, level) # if a is already demand-loaded, add b to its submodule list if base in locals: if isinstance(locals[base], _demandmod): @@ -99,19 +107,19 @@ return locals[base] return _demandmod(name, globals, locals) else: - if level is not None: + if level != -1: # from . import b,c,d or from .a import b,c,d return _origimport(name, globals, locals, fromlist, level) # from a import b,c,d mod = _origimport(name, globals, locals) # recurse down the module chain for comp in name.split('.')[1:]: - if not hasattr(mod, comp): + if getattr(mod, comp, nothing) is nothing: setattr(mod, comp, _demandmod(comp, mod.__dict__, mod.__dict__)) mod = getattr(mod, comp) for x in fromlist: # set requested submodules for demand load - if not hasattr(mod, x): + if getattr(mod, x, nothing) is nothing: setattr(mod, x, _demandmod(x, mod.__dict__, locals)) return mod @@ -134,6 +142,8 @@ # raise ImportError if x not defined '__main__', '_ssl', # conditional imports in the stdlib, issue1964 + 'rfc822', + 'mimetools', ] def enable():

1 0

gajim: Fix typo in the russian translation
by Fomin Denis 09 Mar '12

09 Mar '12

changeset 03bb7f66980f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=03bb7f66980f description: Fix typo in the russian translation diffstat: po/ru.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 74e958f7f3ba -r 03bb7f66980f po/ru.po --- a/po/ru.po Tue Mar 06 11:51:05 2012 +0100 +++ b/po/ru.po Fri Feb 24 21:42:50 2012 +0400 @@ -2573,7 +2573,7 @@ #: ../data/gui/remove_account_window.ui.h:2 msgid "Remove account _only from Gajim" -msgstr "Удалит учетную запись _только из Gajim" +msgstr "Удалить учетную запись _только из Gajim" #: ../data/gui/remove_account_window.ui.h:3 msgid "Remove account from Gajim and from _server"

1 0

gajim: correctly check JID when creating an anonymous account. F...
by Yann Leboulanger 09 Mar '12

09 Mar '12

changeset ffb5c38728a5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ffb5c38728a5 description: correctly check JID when creating an anonymous account. Fixes #7116 diffstat: src/config.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r f0b060381912 -r ffb5c38728a5 src/config.py --- a/src/config.py Fri Mar 09 08:40:21 2012 +0100 +++ b/src/config.py Fri Mar 09 08:45:47 2012 +0100 @@ -3655,7 +3655,11 @@ password = self.xml.get_object('password_entry').get_text().decode( 'utf-8') - jid = username + '@' + server + if anonymous: + jid = '' + else: + jid = username + '@' + jid += server # check if jid is conform to RFC and stringprep it try: jid = helpers.parse_jid(jid)

1 0

gajim: fix focus behaviour when opening chat / groupchat window....
by Yann Leboulanger 09 Mar '12

09 Mar '12

changeset f0b060381912 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f0b060381912 description: fix focus behaviour when opening chat / groupchat window. Fixes #7115, see #5740 diffstat: src/chat_control.py | 1 - src/groupchat_control.py | 1 - src/message_window.py | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diffs (33 lines): diff -r 97675d403519 -r f0b060381912 src/chat_control.py --- a/src/chat_control.py Thu Mar 08 20:03:17 2012 +0100 +++ b/src/chat_control.py Fri Mar 09 08:40:21 2012 +0100 @@ -469,7 +469,6 @@ self.user_nick = None self.smooth = True - self.msg_textview.grab_focus() self.command_hits = [] self.last_key_tabs = False diff -r 97675d403519 -r f0b060381912 src/groupchat_control.py --- a/src/groupchat_control.py Thu Mar 08 20:03:17 2012 +0100 +++ b/src/groupchat_control.py Fri Mar 09 08:40:21 2012 +0100 @@ -1307,7 +1307,6 @@ self._update_banner_state_image() if self.parent_win: self.parent_win.redraw_tab(self) - gobject.idle_add(self.msg_textview.grab_focus) def got_disconnected(self): self.list_treeview.set_model(None) diff -r 97675d403519 -r f0b060381912 src/message_window.py --- a/src/message_window.py Thu Mar 08 20:03:17 2012 +0100 +++ b/src/message_window.py Fri Mar 09 08:40:21 2012 +0100 @@ -307,7 +307,6 @@ # NOTE: we do not call set_control_active(True) since we don't know # whether the tab is the active one. self.show_title() - gobject.idle_add(control.msg_textview.grab_focus) def on_tab_eventbox_button_press_event(self, widget, event, child): if event.button == 3: # right click

1 0

gajim: don't mark received message as read until it's really rea...
by Yann Leboulanger 08 Mar '12

08 Mar '12

changeset 97675d403519 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=97675d403519 description: don't mark received message as read until it's really read by user. Fixes #7094 diffstat: src/chat_control.py | 47 ++++++++++++++++++++++++----------------------- src/roster_window.py | 21 +++++++++++++++++++-- 2 files changed, 43 insertions(+), 25 deletions(-) diffs (146 lines): diff -r 4a8be3052e4c -r 97675d403519 src/chat_control.py --- a/src/chat_control.py Tue Mar 06 11:51:11 2012 +0100 +++ b/src/chat_control.py Thu Mar 08 20:03:17 2012 +0100 @@ -920,10 +920,9 @@ self.received_history_pos = pos def print_conversation_line(self, text, kind, name, tim, - other_tags_for_name=[], other_tags_for_time=[], - other_tags_for_text=[], count_as_new=True, subject=None, - old_kind=None, xhtml=None, simple=False, xep0184_id=None, - graphics=True, displaymarking=None): + other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], + count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, + xep0184_id=None, graphics=True, displaymarking=None, msg_id=None): """ Print 'chat' type messages """ @@ -934,9 +933,9 @@ if self.was_at_the_end or kind == 'outgoing': end = True textview.print_conversation_line(text, jid, kind, name, tim, - other_tags_for_name, other_tags_for_time, other_tags_for_text, - subject, old_kind, xhtml, simple=simple, graphics=graphics, - displaymarking=displaymarking) + other_tags_for_name, other_tags_for_time, other_tags_for_text, + subject, old_kind, xhtml, simple=simple, graphics=graphics, + displaymarking=displaymarking) if xep0184_id is not None: textview.show_xep0184_warning(xep0184_id) @@ -979,18 +978,18 @@ type_ = 'printed_' + self.type_id event = 'message_received' show_in_roster = notify.get_show_in_roster(event, - self.account, self.contact, self.session) + self.account, self.contact, self.session) show_in_systray = notify.get_show_in_systray(event, - self.account, self.contact, type_) - - event = gajim.events.create_event(type_, (self,), + self.account, self.contact, type_) + + event = gajim.events.create_event(type_, (self, msg_id), show_in_roster=show_in_roster, show_in_systray=show_in_systray) gajim.events.add_event(self.account, full_jid, event) # We need to redraw contact if we show in roster if show_in_roster: gajim.interface.roster.draw_contact(self.contact.jid, - self.account) + self.account) if not self.parent_win: return @@ -2398,8 +2397,8 @@ return gajim.nicks[self.account] def print_conversation(self, text, frm='', tim=None, encrypted=False, - subject=None, xhtml=None, simple=False, xep0184_id=None, - displaymarking=None): + subject=None, xhtml=None, simple=False, xep0184_id=None, + displaymarking=None, msg_id=None): """ Print a line in the conversation @@ -2430,21 +2429,22 @@ # ESessions if not encrypted: msg = _('The following message was NOT encrypted') - ChatControlBase.print_conversation_line(self, msg, 'status', '', - tim) + ChatControlBase.print_conversation_line(self, msg, 'status', + '', tim) else: # GPG encryption if encrypted and not self.gpg_is_active: msg = _('The following message was encrypted') - ChatControlBase.print_conversation_line(self, msg, 'status', '', - tim) - # turn on OpenPGP if this was in fact a XEP-0027 encrypted message + ChatControlBase.print_conversation_line(self, msg, 'status', + '', tim) + # turn on OpenPGP if this was in fact a XEP-0027 encrypted + # message if encrypted == 'xep27': self._toggle_gpg() elif not encrypted and self.gpg_is_active: msg = _('The following message was NOT encrypted') - ChatControlBase.print_conversation_line(self, msg, 'status', '', - tim) + ChatControlBase.print_conversation_line(self, msg, 'status', + '', tim) if not frm: kind = 'incoming' name = contact.get_shown_name() @@ -2461,8 +2461,9 @@ if xhtml: xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml) ChatControlBase.print_conversation_line(self, text, kind, name, tim, - subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, - simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking) + subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, + simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking, + msg_id=msg_id) if text.startswith('/me ') or text.startswith('/me\n'): self.old_msg_kind = None else: diff -r 4a8be3052e4c -r 97675d403519 src/roster_window.py --- a/src/roster_window.py Tue Mar 06 11:51:11 2012 +0100 +++ b/src/roster_window.py Thu Mar 08 20:03:17 2012 +0100 @@ -1889,6 +1889,18 @@ Only performed if removal was requested before but the contact still had pending events """ + + msg_ids = [] + for ev in event_list: + if ev.type_ != 'printed_chat': + continue + if len(ev.parameters) > 1 and ev.parameters[1]: + # There is a msg_id + msg_ids.append(ev.parameters[1]) + + if msg_ids: + gajim.logger.set_read_messages(msg_ids) + contact_list = ((event.jid.split('/')[0], event.account) for event in \ event_list) @@ -2632,9 +2644,14 @@ obj.session.control.print_conversation(obj.msgtxt, typ, tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject, - xhtml=obj.xhtml, displaymarking=obj.displaymarking) + xhtml=obj.xhtml, displaymarking=obj.displaymarking, + msg_id=obj.msg_id) if obj.msg_id: - gajim.logger.set_read_messages([obj.msg_id]) + pw = obj.session.control.parent_win + end = obj.session.control.was_at_the_end + if not pw or (pw.get_active_control() and obj.session.control \ + == pw.get_active_control() and pw.is_active() and end): + gajim.logger.set_read_messages([obj.msg_id]) elif obj.popup: contact = gajim.contacts.get_contact(obj.conn.name, obj.jid) obj.session.control = gajim.interface.new_chat(contact,

1 0

gajim: [Jeff Bailes] updated en_GB translation
by Yann Leboulanger 06 Mar '12

06 Mar '12

changeset 74e958f7f3ba in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=74e958f7f3ba description: [Jeff Bailes] updated en_GB translation diffstat: po/en_GB.po | 1192 ++++++++++++++++++++++++++-------------------------------- 1 files changed, 541 insertions(+), 651 deletions(-) diffs (truncated from 3272 to 300 lines): diff -r f7c26111c533 -r 74e958f7f3ba po/en_GB.po --- a/po/en_GB.po Tue Mar 06 11:44:11 2012 +0100 +++ b/po/en_GB.po Tue Mar 06 11:51:05 2012 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Gajim - A Jabber Instant Messager 0.13\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-14 20:47+0100\n" -"PO-Revision-Date: 2009-11-20 20:49+1100\n" +"POT-Creation-Date: 2012-03-06 11:27+0100\n" +"PO-Revision-Date: 2012-03-04 20:59+1100\n" "Last-Translator: Jeff Bailes <thepizzaking(a)gmail.com>\n" "Language-Team: English <en_gb(a)li.org>\n" "Language: en\n" @@ -230,18 +230,16 @@ msgstr "Auto-reconnect when connection is lost" #: ../data/gui/accounts_window.ui.h:12 -#, fuzzy msgid "Browse..." -msgstr "_Browse" +msgstr "Browse..." #: ../data/gui/accounts_window.ui.h:13 msgid "C_onnect on Gajim startup" msgstr "C_onnect on Gajim startup" #: ../data/gui/accounts_window.ui.h:14 -#, fuzzy msgid "Certificate is e_ncrypted" -msgstr "Certificate rejected" +msgstr "Certificate is e_ncrypted" #: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" @@ -268,9 +266,8 @@ msgstr "Click to request authorisation to all contacts of another account" #: ../data/gui/accounts_window.ui.h:20 -#, fuzzy msgid "Client certificate" -msgstr "Self signed certificate" +msgstr "Client certificate" #: ../data/gui/accounts_window.ui.h:21 msgid "Co_nnect on Gajim startup" @@ -449,7 +446,6 @@ msgstr "Synchroni_se account status with global status" #: ../data/gui/accounts_window.ui.h:54 -#, fuzzy msgid "Synchronize contacts" msgstr "Synchronise contacts" @@ -471,7 +467,7 @@ #: ../data/gui/accounts_window.ui.h:59 msgid "_Client Cert File:" -msgstr "" +msgstr "_Client Cert File:" #: ../data/gui/accounts_window.ui.h:60 msgid "_Edit Personal Information..." @@ -556,9 +552,8 @@ msgstr "_Register" #: ../data/gui/add_new_contact_window.ui.h:15 -#, fuzzy msgid "_Save subscription message" -msgstr "_Subscription" +msgstr "_Save subscription message" #: ../data/gui/add_new_contact_window.ui.h:16 msgid "_User ID:" @@ -586,9 +581,8 @@ msgstr "Error description..." #: ../data/gui/adhoc_commands_window.ui.h:6 -#, fuzzy msgid "F_inish" -msgstr "_Finish" +msgstr "F_inish" #: ../data/gui/adhoc_commands_window.ui.h:7 msgid "Please wait while retrieving command list..." @@ -632,9 +626,8 @@ msgstr "Deletes Message of the Day" #: ../data/gui/advanced_menuitem_menu.ui.h:3 -#, fuzzy msgid "Edit Archi_ving Preferences" -msgstr "_Preferences" +msgstr "Edit Archi_ving Preferences" #: ../data/gui/advanced_menuitem_menu.ui.h:4 msgid "Edit _Privacy Lists..." @@ -674,42 +667,39 @@ #: ../data/gui/archiving_preferences_window.ui.h:1 msgid "Method Auto" -msgstr "" +msgstr "Method Auto" #: ../data/gui/archiving_preferences_window.ui.h:2 msgid "Method Local" -msgstr "" +msgstr "Method Local" #: ../data/gui/archiving_preferences_window.ui.h:3 msgid "Method Manual" -msgstr "" +msgstr "Method Manual" #: ../data/gui/archiving_preferences_window.ui.h:4 -#, fuzzy msgid "Auto" -msgstr "Auto join" +msgstr "Auto" #: ../data/gui/archiving_preferences_window.ui.h:5 msgid "Concede" -msgstr "" +msgstr "Concede" #: ../data/gui/archiving_preferences_window.ui.h:6 msgid "Forbid" -msgstr "" +msgstr "Forbid" #: ../data/gui/archiving_preferences_window.ui.h:7 -#, fuzzy msgid "No" -msgstr "None" +msgstr "No" #: ../data/gui/archiving_preferences_window.ui.h:8 -#, fuzzy msgid "Prefer" -msgstr "Preferences" +msgstr "Prefer" #: ../data/gui/archiving_preferences_window.ui.h:9 msgid "Yes" -msgstr "" +msgstr "Yes" #: ../data/gui/atom_entry_window.ui.h:1 msgid "Entry:" @@ -831,7 +821,7 @@ #: ../data/gui/chat_control.ui.h:2 msgid "*" -msgstr "" +msgstr "*" #: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1 msgid "0" @@ -839,39 +829,39 @@ #: ../data/gui/chat_control.ui.h:4 msgid "1" -msgstr "" +msgstr "1" #: ../data/gui/chat_control.ui.h:5 msgid "2" -msgstr "" +msgstr "2" #: ../data/gui/chat_control.ui.h:6 msgid "3" -msgstr "" +msgstr "3" #: ../data/gui/chat_control.ui.h:7 msgid "4" -msgstr "" +msgstr "4" #: ../data/gui/chat_control.ui.h:8 msgid "5" -msgstr "" +msgstr "5" #: ../data/gui/chat_control.ui.h:9 msgid "6" -msgstr "" +msgstr "6" #: ../data/gui/chat_control.ui.h:10 msgid "7" -msgstr "" +msgstr "7" #: ../data/gui/chat_control.ui.h:11 msgid "8" -msgstr "" +msgstr "8" #: ../data/gui/chat_control.ui.h:12 msgid "9" -msgstr "" +msgstr "9" #: ../data/gui/chat_control.ui.h:13 msgid "Add this contact to roster (Ctrl+D)" @@ -894,23 +884,22 @@ msgstr "Show a list of formattings" #: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7 -#, fuzzy msgid "Show a menu of advanced functions (Alt+D)" -msgstr "Show a menu of advanced functions (Alt+A)" +msgstr "Show a menu of advanced functions (Alt+D)" #: ../data/gui/chat_control.ui.h:19 msgid "Show the contact's profile (Ctrl+I)" msgstr "Show the contact's profile (Ctrl+I)" #: ../data/gui/chat_control.ui.h:20 -#: ../src/command_system/implementation/standard.py:208 +#: ../src/command_system/implementation/standard.py:214 msgid "Toggle audio session" -msgstr "" +msgstr "Toggle audio session" #: ../data/gui/chat_control.ui.h:21 -#: ../src/command_system/implementation/standard.py:218 +#: ../src/command_system/implementation/standard.py:224 msgid "Toggle video session" -msgstr "" +msgstr "Toggle video session" #. 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:23 ../data/gui/groupchat_control.ui.h:9 @@ -920,7 +909,7 @@ #: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10 msgid "label" -msgstr "" +msgstr "label" #: ../data/gui/chat_to_muc_window.ui.h:1 msgid "In_vite" @@ -979,9 +968,8 @@ msgstr "Invite _Contacts" #: ../data/gui/contact_context_menu.ui.h:8 -#, fuzzy msgid "M_anage Contact" -msgstr "_Manage Contact" +msgstr "M_anage Contact" #: ../data/gui/contact_context_menu.ui.h:9 msgid "Remo_ve" @@ -1159,9 +1147,8 @@ msgstr "Chatstate Tab Colours" #: ../data/gui/gajim_themes_window.ui.h:2 -#, fuzzy msgid "Account row" -msgstr "Account" +msgstr "Account row" #: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1041 msgid "Bold" @@ -1169,16 +1156,15 @@ #: ../data/gui/gajim_themes_window.ui.h:4 msgid "Chat Banner" -msgstr "" +msgstr "Chat Banner" #: ../data/gui/gajim_themes_window.ui.h:5 msgid "Composing" msgstr "Composing" #: ../data/gui/gajim_themes_window.ui.h:6 -#, fuzzy msgid "Contact row" -msgstr "Contact" +msgstr "Contact row" #: ../data/gui/gajim_themes_window.ui.h:7 msgid "Font style:" @@ -1193,9 +1179,8 @@ msgstr "Gone" #: ../data/gui/gajim_themes_window.ui.h:10 -#, fuzzy msgid "Group row" -msgstr "Group" +msgstr "Group row" #: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150 msgid "Inactive" @@ -1266,9 +1251,8 @@ msgstr "_Minimise on close" #: ../data/gui/gc_control_popup_menu.ui.h:9

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