From 4415d770fc082d66ca7e35b18f79643e610960bd Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Mon, 20 Feb 2006 11:02:35 +0000 Subject: [PATCH] not_in_the_roster.png -> not_in_roster.png --- .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_the_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_the_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin .../{not_in_the_roster.png => not_in_roster.png} | Bin src/common/helpers.py | 2 +- src/dialogs.py | 2 +- src/roster_window.py | 12 ++++++------ 31 files changed, 8 insertions(+), 8 deletions(-) rename data/iconsets/crystal/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/dcraven/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/dcraven/32x32/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/gnome/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/gnome/32x32/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/gossip/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/gota/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/gota/32x32/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/jabberbulb/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/jabberbulb/32x32/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/nuvola/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/simplebulb/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/stellar/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/sun/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/transports/aim/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/transports/aim/32x32/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/transports/gadugadu/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/transports/gadugadu/32x32/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/transports/icq/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/transports/icq/32x32/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/transports/irc/16x16/{not_in_the_roster.png => not_the_roster.png} (100%) rename data/iconsets/transports/msn/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/transports/msn/32x32/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/transports/tlen/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/transports/tlen/32x32/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/transports/weather/16x16/{not_in_the_roster.png => not_the_roster.png} (100%) rename data/iconsets/transports/yahoo/16x16/{not_in_the_roster.png => not_in_roster.png} (100%) rename data/iconsets/transports/yahoo/32x32/{not_in_the_roster.png => not_in_roster.png} (100%) diff --git a/data/iconsets/crystal/16x16/not_in_the_roster.png b/data/iconsets/crystal/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/crystal/16x16/not_in_the_roster.png rename to data/iconsets/crystal/16x16/not_in_roster.png diff --git a/data/iconsets/dcraven/16x16/not_in_the_roster.png b/data/iconsets/dcraven/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/dcraven/16x16/not_in_the_roster.png rename to data/iconsets/dcraven/16x16/not_in_roster.png diff --git a/data/iconsets/dcraven/32x32/not_in_the_roster.png b/data/iconsets/dcraven/32x32/not_in_roster.png similarity index 100% rename from data/iconsets/dcraven/32x32/not_in_the_roster.png rename to data/iconsets/dcraven/32x32/not_in_roster.png diff --git a/data/iconsets/gnome/16x16/not_in_the_roster.png b/data/iconsets/gnome/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/gnome/16x16/not_in_the_roster.png rename to data/iconsets/gnome/16x16/not_in_roster.png diff --git a/data/iconsets/gnome/32x32/not_in_the_roster.png b/data/iconsets/gnome/32x32/not_in_roster.png similarity index 100% rename from data/iconsets/gnome/32x32/not_in_the_roster.png rename to data/iconsets/gnome/32x32/not_in_roster.png diff --git a/data/iconsets/gossip/16x16/not_in_the_roster.png b/data/iconsets/gossip/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/gossip/16x16/not_in_the_roster.png rename to data/iconsets/gossip/16x16/not_in_roster.png diff --git a/data/iconsets/gota/16x16/not_in_the_roster.png b/data/iconsets/gota/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/gota/16x16/not_in_the_roster.png rename to data/iconsets/gota/16x16/not_in_roster.png diff --git a/data/iconsets/gota/32x32/not_in_the_roster.png b/data/iconsets/gota/32x32/not_in_roster.png similarity index 100% rename from data/iconsets/gota/32x32/not_in_the_roster.png rename to data/iconsets/gota/32x32/not_in_roster.png diff --git a/data/iconsets/jabberbulb/16x16/not_in_the_roster.png b/data/iconsets/jabberbulb/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/jabberbulb/16x16/not_in_the_roster.png rename to data/iconsets/jabberbulb/16x16/not_in_roster.png diff --git a/data/iconsets/jabberbulb/32x32/not_in_the_roster.png b/data/iconsets/jabberbulb/32x32/not_in_roster.png similarity index 100% rename from data/iconsets/jabberbulb/32x32/not_in_the_roster.png rename to data/iconsets/jabberbulb/32x32/not_in_roster.png diff --git a/data/iconsets/nuvola/16x16/not_in_the_roster.png b/data/iconsets/nuvola/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/nuvola/16x16/not_in_the_roster.png rename to data/iconsets/nuvola/16x16/not_in_roster.png diff --git a/data/iconsets/simplebulb/16x16/not_in_the_roster.png b/data/iconsets/simplebulb/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/simplebulb/16x16/not_in_the_roster.png rename to data/iconsets/simplebulb/16x16/not_in_roster.png diff --git a/data/iconsets/stellar/16x16/not_in_the_roster.png b/data/iconsets/stellar/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/stellar/16x16/not_in_the_roster.png rename to data/iconsets/stellar/16x16/not_in_roster.png diff --git a/data/iconsets/sun/16x16/not_in_the_roster.png b/data/iconsets/sun/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/sun/16x16/not_in_the_roster.png rename to data/iconsets/sun/16x16/not_in_roster.png diff --git a/data/iconsets/transports/aim/16x16/not_in_the_roster.png b/data/iconsets/transports/aim/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/transports/aim/16x16/not_in_the_roster.png rename to data/iconsets/transports/aim/16x16/not_in_roster.png diff --git a/data/iconsets/transports/aim/32x32/not_in_the_roster.png b/data/iconsets/transports/aim/32x32/not_in_roster.png similarity index 100% rename from data/iconsets/transports/aim/32x32/not_in_the_roster.png rename to data/iconsets/transports/aim/32x32/not_in_roster.png diff --git a/data/iconsets/transports/gadugadu/16x16/not_in_the_roster.png b/data/iconsets/transports/gadugadu/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/transports/gadugadu/16x16/not_in_the_roster.png rename to data/iconsets/transports/gadugadu/16x16/not_in_roster.png diff --git a/data/iconsets/transports/gadugadu/32x32/not_in_the_roster.png b/data/iconsets/transports/gadugadu/32x32/not_in_roster.png similarity index 100% rename from data/iconsets/transports/gadugadu/32x32/not_in_the_roster.png rename to data/iconsets/transports/gadugadu/32x32/not_in_roster.png diff --git a/data/iconsets/transports/icq/16x16/not_in_the_roster.png b/data/iconsets/transports/icq/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/transports/icq/16x16/not_in_the_roster.png rename to data/iconsets/transports/icq/16x16/not_in_roster.png diff --git a/data/iconsets/transports/icq/32x32/not_in_the_roster.png b/data/iconsets/transports/icq/32x32/not_in_roster.png similarity index 100% rename from data/iconsets/transports/icq/32x32/not_in_the_roster.png rename to data/iconsets/transports/icq/32x32/not_in_roster.png diff --git a/data/iconsets/transports/irc/16x16/not_in_the_roster.png b/data/iconsets/transports/irc/16x16/not_the_roster.png similarity index 100% rename from data/iconsets/transports/irc/16x16/not_in_the_roster.png rename to data/iconsets/transports/irc/16x16/not_the_roster.png diff --git a/data/iconsets/transports/msn/16x16/not_in_the_roster.png b/data/iconsets/transports/msn/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/transports/msn/16x16/not_in_the_roster.png rename to data/iconsets/transports/msn/16x16/not_in_roster.png diff --git a/data/iconsets/transports/msn/32x32/not_in_the_roster.png b/data/iconsets/transports/msn/32x32/not_in_roster.png similarity index 100% rename from data/iconsets/transports/msn/32x32/not_in_the_roster.png rename to data/iconsets/transports/msn/32x32/not_in_roster.png diff --git a/data/iconsets/transports/tlen/16x16/not_in_the_roster.png b/data/iconsets/transports/tlen/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/transports/tlen/16x16/not_in_the_roster.png rename to data/iconsets/transports/tlen/16x16/not_in_roster.png diff --git a/data/iconsets/transports/tlen/32x32/not_in_the_roster.png b/data/iconsets/transports/tlen/32x32/not_in_roster.png similarity index 100% rename from data/iconsets/transports/tlen/32x32/not_in_the_roster.png rename to data/iconsets/transports/tlen/32x32/not_in_roster.png diff --git a/data/iconsets/transports/weather/16x16/not_in_the_roster.png b/data/iconsets/transports/weather/16x16/not_the_roster.png similarity index 100% rename from data/iconsets/transports/weather/16x16/not_in_the_roster.png rename to data/iconsets/transports/weather/16x16/not_the_roster.png diff --git a/data/iconsets/transports/yahoo/16x16/not_in_the_roster.png b/data/iconsets/transports/yahoo/16x16/not_in_roster.png similarity index 100% rename from data/iconsets/transports/yahoo/16x16/not_in_the_roster.png rename to data/iconsets/transports/yahoo/16x16/not_in_roster.png diff --git a/data/iconsets/transports/yahoo/32x32/not_in_the_roster.png b/data/iconsets/transports/yahoo/32x32/not_in_roster.png similarity index 100% rename from data/iconsets/transports/yahoo/32x32/not_in_the_roster.png rename to data/iconsets/transports/yahoo/32x32/not_in_roster.png diff --git a/src/common/helpers.py b/src/common/helpers.py index 8ee0ed04d..b6d77e683 100644 --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -224,7 +224,7 @@ def get_uf_show(show, use_mnemonic = False): uf_show = _('_Invisible') else: uf_show = _('Invisible') - elif show == 'Not in Roster': + elif show == 'not in roster': uf_show = _('Not in Roster') elif show == 'requested': uf_show = Q_('?contact has status:Unknown') diff --git a/src/dialogs.py b/src/dialogs.py index 5fa94a379..d90e255d5 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -1021,7 +1021,7 @@ class PopupNotificationWindow: else: contact = gajim.contacts.create_contact(jid = self.jid, name = self.jid.split('@')[0], - groups = [_('Not in Roster')], show = 'Not in Roster', + groups = [_('Not in Roster')], show = 'not in roster', status = '', sub = 'none', keyID = keyID) gajim.contacts.add_contact(self.account, contact) gajim.interface.roster.add_contact_to_roster(contact.jid, diff --git a/src/roster_window.py b/src/roster_window.py index c79ff106b..f8b941497 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -1552,7 +1552,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid) if gajim.interface.msg_win_mgr.has_window(contact.jid, account): c = gajim.contacts.create_contact(jid = contact.jid, name = contact.name, groups = [_('Not in Roster')], - show = 'Not in Roster', status = '', ask = 'none', + show = 'not in roster', status = '', ask = 'none', keyID = contact.keyID) gajim.contacts.add_contact(account, c) self.add_contact_to_roster(contact.jid, account) @@ -1819,7 +1819,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid) keyID = attached_keys[attached_keys.index(jid) + 1] contact = gajim.contacts.create_contact(jid = jid, name = jid.split('@')[0], groups = [_('Not in Roster')], - show = 'Not in Roster', status = '', sub = 'none', + show = 'not in roster', status = '', sub = 'none', keyID = keyID) gajim.contacts.add_contact(account, contact) self.add_contact_to_roster(contact.jid, account) @@ -1852,7 +1852,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid) keyID = attached_keys[attached_keys.index(jid) + 1] contact = gajim.contacts.create_contact(jid = jid, name = jid.split('@')[0], groups = [_('Not in Roster')], - show = 'Not in Roster', status = '', ask = 'none', + show = 'not in roster', status = '', ask = 'none', keyID = keyID, resource = resource) gajim.contacts.add_contact(account, contact) self.add_contact_to_roster(jid, account) @@ -2319,11 +2319,11 @@ _('If "%s" accepts this request you will know his or her status.') % jid) path += '/' list = ('connecting', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible', 'offline', 'error', 'requested', 'message', 'opened', 'closed', - 'Not in Roster', 'muc_active', 'muc_inactive') + 'not in roster', 'muc_active', 'muc_inactive') if pixbuf2: list = ('connecting', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible','offline', 'error', 'requested', 'message', - 'Not in Roster') + 'not in roster') for state in list: # try to open a pixfile with the correct method state_file = state.replace(' ', '_') @@ -2589,7 +2589,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid) (gajim.config.get('sort_by_show') or gajim.contacts.is_subcontact( account1, contact1)): cshow = {'online':0, 'chat': 1, 'away': 2, 'xa': 3, 'dnd': 4, - 'invisible': 5, 'offline': 6, 'Not in Roster': 7, 'error': 8} + 'invisible': 5, 'offline': 6, 'not in roster': 7, 'error': 8} s = self.get_show(lcontact1) if s in cshow: show1 = cshow[s]