[campey] not in the roster -> Not in Roster. Fixes #1054

This commit is contained in:
Yann Leboulanger 2006-01-19 21:55:01 +00:00
parent 00fcf1d617
commit 2dc4eb3f21
25 changed files with 84 additions and 84 deletions

View File

@ -69,7 +69,7 @@ msgid "account: "
msgstr "акаунт: "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -78,7 +78,7 @@ msgstr "акаунт: "
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "не е в списъка"
#: ../src/chat.py:555
@ -4358,7 +4358,7 @@ msgid "Invisible"
msgstr "Невидим"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Не е в списъка"
#: ../src/common/helpers.py:230

View File

@ -82,7 +82,7 @@ msgid "account: "
msgstr "účet: "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -91,7 +91,7 @@ msgstr "účet: "
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "není v seznamu"
#: ../src/chat.py:555
@ -4338,7 +4338,7 @@ msgid "Invisible"
msgstr "Neviditelný"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Není v seznamu"
#: ../src/common/helpers.py:230

View File

@ -67,7 +67,7 @@ msgid "account: "
msgstr "Konto: "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -76,7 +76,7 @@ msgstr "Konto: "
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "Nicht in der Liste"
#: ../src/chat.py:555
@ -4377,7 +4377,7 @@ msgid "Invisible"
msgstr "Unsichtbar"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Nicht in der Liste"
#: ../src/common/helpers.py:230

View File

@ -73,7 +73,7 @@ msgid "account: "
msgstr "λογαριασμός: "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -82,7 +82,7 @@ msgstr "λογαριασμός: "
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "εκτός λίστας επαφών"
#: ../src/chat.py:555
@ -4415,7 +4415,7 @@ msgid "Invisible"
msgstr "Αφανής"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Εκτός λίστας επαφών"
#: ../src/common/helpers.py:230

View File

@ -68,7 +68,7 @@ msgid "account: "
msgstr "cuenta: "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -77,7 +77,7 @@ msgstr "cuenta: "
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "no está en el roster"
#: ../src/chat.py:555
@ -4353,7 +4353,7 @@ msgid "Invisible"
msgstr "Invisible"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "No está en el roster"
#: ../src/common/helpers.py:230

View File

@ -72,7 +72,7 @@ msgid "account: "
msgstr "kontua: "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467
#: ../src/conversation_textview.py:376
#: ../src/dialogs.py:120
@ -91,7 +91,7 @@ msgstr "kontua: "
#: ../src/roster_window.py:2392
#: ../src/roster_window.py:2485
#: ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "Zerrendan ez dago"
#: ../src/chat.py:555
@ -4162,7 +4162,7 @@ msgid "Invisible"
msgstr "Ikusezin"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Zerrendan ez dago"
#: ../src/common/helpers.py:230

View File

@ -71,7 +71,7 @@ msgid "account: "
msgstr "compte : "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -80,7 +80,7 @@ msgstr "compte : "
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "Absent de la liste"
#: ../src/chat.py:555
@ -4375,7 +4375,7 @@ msgid "Invisible"
msgstr "Invisible"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Absent de la liste"
#: ../src/common/helpers.py:230

View File

@ -68,7 +68,7 @@ msgid "account: "
msgstr ""
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -77,7 +77,7 @@ msgstr ""
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr ""
#: ../src/chat.py:555
@ -4138,7 +4138,7 @@ msgid "Invisible"
msgstr ""
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr ""
#: ../src/common/helpers.py:230

View File

@ -69,7 +69,7 @@ msgid "account: "
msgstr "account: "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -78,7 +78,7 @@ msgstr "account: "
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "non nel roster"
#: ../src/chat.py:555
@ -4366,7 +4366,7 @@ msgid "Invisible"
msgstr "Invisibile"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Non presente nel roster"
#: ../src/common/helpers.py:230

View File

@ -66,7 +66,7 @@ msgid "account: "
msgstr "konto:"
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -75,7 +75,7 @@ msgstr "konto:"
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "ikke i kontaktliste"
#: ../src/chat.py:555
@ -4340,7 +4340,7 @@ msgid "Invisible"
msgstr "Usynlig"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Ikke i kontaktlisten"
#: ../src/common/helpers.py:230

View File

@ -71,7 +71,7 @@ msgid "account: "
msgstr "account: "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -80,7 +80,7 @@ msgstr "account: "
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "niet in het rooster"
#: ../src/chat.py:555
@ -4380,7 +4380,7 @@ msgid "Invisible"
msgstr "Onzichtbaar"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Niet in het rooster"
#: ../src/common/helpers.py:230

View File

@ -66,7 +66,7 @@ msgid "account: "
msgstr "konto:"
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -75,7 +75,7 @@ msgstr "konto:"
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "ikke i kontaktliste"
#: ../src/chat.py:555
@ -4340,7 +4340,7 @@ msgid "Invisible"
msgstr "Usynlig"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Ikke i kontaktlisten"
#: ../src/common/helpers.py:230

View File

@ -70,7 +70,7 @@ msgid "account: "
msgstr "konto: "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -79,7 +79,7 @@ msgstr "konto: "
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "spoza listy kontaktów"
#: ../src/chat.py:555
@ -4354,7 +4354,7 @@ msgid "Invisible"
msgstr "Niewidoczny"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Spoza listy kontaktów"
#: ../src/common/helpers.py:230

View File

@ -66,7 +66,7 @@ msgid "account: "
msgstr "conta: "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -75,7 +75,7 @@ msgstr "conta: "
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "Fora da lista"
#: ../src/chat.py:555
@ -4357,7 +4357,7 @@ msgid "Invisible"
msgstr "Invisível"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Fora da lista"
#: ../src/common/helpers.py:230

View File

@ -69,7 +69,7 @@ msgid "account: "
msgstr "conta: "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -78,7 +78,7 @@ msgstr "conta: "
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "Fora da lista"
#: ../src/chat.py:555
@ -4352,7 +4352,7 @@ msgid "Invisible"
msgstr "Invisível"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Fora da lista"
#: ../src/common/helpers.py:230

View File

@ -75,7 +75,7 @@ msgid "account: "
msgstr "учетная запись: "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -84,7 +84,7 @@ msgstr "учетная запись: "
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "не в ростере"
#: ../src/chat.py:555
@ -4358,7 +4358,7 @@ msgid "Invisible"
msgstr "Невидимка"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Не в ростере"
#: ../src/common/helpers.py:230

View File

@ -70,7 +70,7 @@ msgid "account: "
msgstr "účet:"
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -79,7 +79,7 @@ msgstr "účet:"
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "nie je v zozname"
#: ../src/chat.py:555
@ -4336,7 +4336,7 @@ msgid "Invisible"
msgstr "Neviditeľný"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Nie je v zozname"
#: ../src/common/helpers.py:230

View File

@ -73,7 +73,7 @@ msgid "account: "
msgstr "konto: "
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:467 ../src/conversation_textview.py:376
#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
@ -82,7 +82,7 @@ msgstr "konto: "
#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
msgid "not in the roster"
msgid "Not in Roster"
msgstr "inte i registret"
#: ../src/chat.py:555
@ -4361,7 +4361,7 @@ msgid "Invisible"
msgstr "Osynlig"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "Inte i registret"
#: ../src/common/helpers.py:230

View File

@ -73,7 +73,7 @@ msgid "account: "
msgstr "账户:"
#. Check if jid is already in roster
#. Groups maynot change name from or to 'not in the roster'
#. Groups maynot change name from or to 'Not in Roster'
#: ../src/chat.py:468
#: ../src/conversation_textview.py:376
#: ../src/dialogs.py:126
@ -93,7 +93,7 @@ msgstr "账户:"
#: ../src/roster_window.py:2374
#: ../src/roster_window.py:2461
#: ../src/roster_window.py:2469
msgid "not in the roster"
msgid "Not in Roster"
msgstr "不在名单中"
#: ../src/chat.py:556
@ -4137,7 +4137,7 @@ msgid "Invisible"
msgstr "隐身"
#: ../src/common/helpers.py:228
msgid "Not in the roster"
msgid "Not in Roster"
msgstr "不在名单中"
#: ../src/common/helpers.py:230

View File

@ -623,7 +623,7 @@ class ChatControlBase(MessageControl):
if self.type_id == message_control.TYPE_GC:
start_removing_from = 7 # # this is from the seperator and after
else:
if _('not in the roster') in contact.groups: # for add_to_roster_menuitem
if _('Not in Roster') in contact.groups: # for add_to_roster_menuitem
childs[5].show()
childs[5].set_no_show_all(False)
else:

View File

@ -224,7 +224,7 @@ def get_uf_show(show, use_mnemonic = False):
uf_show = _('_Invisible')
else:
uf_show = _('Invisible')
elif show == 'not in the roster':
elif show == 'Not in Roster':
uf_show = _('Not in Roster')
elif show == 'requested':
uf_show = Q_('?contact has status:Unknown')
@ -523,7 +523,7 @@ def get_icon_name_to_show(contact, account = None):
transport = gajim.get_transport_name_from_jid(contact.jid)
if transport:
return contact.show
return 'not in the roster'
return 'Not in Roster'
def decode_string(string):
'''try to decode (to make it Unicode instance) given string'''

View File

@ -371,7 +371,7 @@ class ConversationTextview(gtk.TextView):
allow_add = False
c = gajim.contacts.get_first_contact_from_jid(self.account, text)
if c and not gajim.contacts.is_pm_from_contact(self.account, c):
if _('not in the roster') in c.groups:
if _('Not in Roster') in c.groups:
allow_add = True
else: # he or she's not at all in the account contacts
allow_add = True

View File

@ -117,7 +117,7 @@ class EditGroupsDialog:
store = gtk.ListStore(str, bool)
self.list.set_model(store)
for g in gajim.groups[self.account].keys():
if g in (_('Transports'), _('not in the roster')):
if g in (_('Transports'), _('Not in Roster')):
continue
iter = store.append()
store.set(iter, 0, g)
@ -338,7 +338,7 @@ _('Please fill in the data of the contact you want to add in account %s') %accou
liststore = gtk.ListStore(str)
self.group_comboboxentry.set_model(liststore)
for g in gajim.groups[account].keys():
if g != _('not in the roster') and g != _('Transports'):
if g != _('Not in Roster') and g != _('Transports'):
self.group_comboboxentry.append_text(g)
if not jid_agents:
@ -377,7 +377,7 @@ _('Please fill in the data of the contact you want to add in account %s') %accou
# Check if jid is already in roster
if jid in gajim.contacts.get_jid_list(self.account) and \
_('not in the roster') not in \
_('Not in Roster') not in \
gajim.contacts.get_first_contact_from_jid(self.account, jid).groups:
ErrorDialog(_('Contact already in roster'),
_('This contact is already listed in your roster.')).get_response()
@ -1058,7 +1058,7 @@ class PopupNotificationWindow:
else:
contact = gajim.contacts.create_contact(jid = self.jid,
name = self.jid.split('@')[0],
groups = [_('not in the roster')], show = 'not in the 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,

View File

@ -536,8 +536,8 @@ class Interface:
c = gajim.contacts.get_first_contact_from_jid(account, jid)
c.resource = array[1]
self.roster.remove_contact(c, account)
if _('not in the roster') in c.groups:
c.groups.remove(_('not in the roster'))
if _('Not in Roster') in c.groups:
c.groups.remove(_('Not in Roster'))
self.roster.add_contact_to_roster(c.jid, account)
gajim.connections[account].update_contact(c.jid, c.name, c.groups)
else:

View File

@ -1003,7 +1003,7 @@ class RosterWindow:
history_menuitem.connect('activate', self.on_history, contact,
account)
if _('not in the roster') not in contact.groups:
if _('Not in Roster') not in contact.groups:
#contact is in normal group
edit_groups_menuitem.set_no_show_all(False)
assign_openpgp_key_menuitem.set_no_show_all(False)
@ -1031,7 +1031,7 @@ class RosterWindow:
revoke_auth_menuitem.connect('activate', self.revoke_auth, jid,
account)
else: # contact is in group 'not in the roster'
else: # contact is in group 'Not in Roster'
add_to_roster_menuitem.set_no_show_all(False)
edit_groups_menuitem.hide()
edit_groups_menuitem.set_no_show_all(True)
@ -1274,7 +1274,7 @@ class RosterWindow:
sub = 'subscribe', keyID = keyID)
gajim.contacts.add_contact(account, contact)
else:
if not _('not in the roster') in contact.groups:
if not _('Not in Roster') in contact.groups:
dialogs.InformationDialog(_('Subscription request has been sent'),
_('If "%s" accepts this request you will know his or her status.') % jid)
return
@ -1450,8 +1450,8 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
gajim.contacts.remove_jid(account, u.jid)
if gajim.interface.msg_win_mgr.has_window(contact.jid):
c = gajim.contacts.create_contact(jid = contact.jid,
name = contact.name, groups = [_('not in the roster')],
show = 'not in the roster', status = '', ask = 'none',
name = contact.name, groups = [_('Not in Roster')],
show = 'Not in Roster', status = '', ask = 'none',
keyID = contact.keyID)
gajim.contacts.add_contact(account, c)
self.add_contact_to_roster(contact.jid, account)
@ -1708,8 +1708,8 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
if jid in attached_keys:
keyID = attached_keys[attached_keys.index(jid) + 1]
contact = gajim.contacts.create_contact(jid = jid,
name = jid.split('@')[0], groups = [_('not in the roster')],
show = 'not in the roster', status = '', sub = 'none',
name = jid.split('@')[0], groups = [_('Not in Roster')],
show = 'Not in Roster', status = '', sub = 'none',
keyID = keyID)
gajim.contacts.add_contact(account, contact)
self.add_contact_to_roster(contact.jid, account)
@ -1741,8 +1741,8 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
if jid in attached_keys:
keyID = attached_keys[attached_keys.index(jid) + 1]
contact = gajim.contacts.create_contact(jid = jid,
name = jid.split('@')[0], groups = [_('not in the roster')],
show = 'not in the roster', status = '', ask = 'none',
name = jid.split('@')[0], groups = [_('Not in Roster')],
show = 'Not in Roster', status = '', ask = 'none',
keyID = keyID, resource = resource)
gajim.contacts.add_contact(account, contact)
self.add_contact_to_roster(jid, account)
@ -2163,8 +2163,8 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
elif type == 'group':
# in C_JID cilumn it's not escaped
old_name = model[iter][C_JID].decode('utf-8')
# Groups maynot change name from or to 'not in the roster'
if _('not in the roster') in (new_text, old_name):
# Groups maynot change name from or to 'Not in Roster'
if _('Not in Roster') in (new_text, old_name):
return
# get all contacts in that group
for jid in gajim.contacts.get_jid_list(account):
@ -2196,7 +2196,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
path += '/'
for state in ('connecting', 'online', 'chat', 'away', 'xa',
'dnd', 'invisible', 'offline', 'error', 'requested',
'message', 'opened', 'closed', 'not in the roster',
'message', 'opened', 'closed', 'Not in Roster',
'muc_active'):
# try to open a pixfile with the correct method
@ -2403,9 +2403,9 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
return 1
if name2 == _('Transports'):
return -1
if name1 == _('not in the roster'):
if name1 == _('Not in Roster'):
return 1
if name2 == _('not in the roster'):
if name2 == _('Not in Roster'):
return -1
account1 = model[iter1][C_ACCOUNT]
account2 = model[iter2][C_ACCOUNT]
@ -2431,7 +2431,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
if type1 == 'contact' and type2 == 'contact' and \
gajim.config.get('sort_by_show'):
cshow = {'online':0, 'chat': 1, 'away': 2, 'xa': 3, 'dnd': 4,
'invisible': 5, 'offline': 6, 'not in the 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]
@ -2518,7 +2518,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
return
iter_group_source = model.iter_parent(iter_source)
grp_source = model[iter_group_source][C_JID].decode('utf-8')
if grp_source == _('Transports') or grp_source == _('not in the roster'):
if grp_source == _('Transports') or grp_source == _('Not in Roster'):
return
account = model[iter_dest][C_ACCOUNT].decode('utf-8')
type_dest = model.get_value(iter_dest, C_TYPE)
@ -2526,7 +2526,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
grp_dest = model[iter_dest][C_JID].decode('utf-8')
else:
grp_dest = model[model.iter_parent(iter_dest)][C_JID].decode('utf-8')
if grp_dest == _('Transports') or grp_dest == _('not in the roster'):
if grp_dest == _('Transports') or grp_dest == _('Not in Roster'):
return
if grp_source == grp_dest:
return