Author: asterix
Date: 2008-10-20 17:24:54 +0200 (Mon, 20 Oct 2008)
New Revision: 10542
Modified:
trunk/src/common/GnuPG.py
trunk/src/common/proxy65_manager.py
trunk/src/remote_control.py
trunk/src/roster_window.py
Log:
[thorstenp] fix unreachable code
Modified: trunk/src/common/GnuPG.py
===================================================================
--- trunk/src/common/GnuPG.py 2008-10-20 15:21:26 UTC (rev 10541)
+++ trunk/src/common/GnuPG.py 2008-10-20 15:24:54 UTC (rev 10542)
@@ -182,6 +182,9 @@
output = proc.handles['stdout'].read()
proc.handles['stdout'].close()
+ try: proc.wait()
+ except IOError: pass
+
keys = {}
lines = output.split('\n')
for line in lines:
@@ -193,8 +196,6 @@
# make it unicode instance
keys[sline[4][8:]] = helpers.decode_string(name)
return keys
- try: proc.wait()
- except IOError: pass
def get_secret_keys(self):
return self.get_keys(True)
Modified: trunk/src/common/proxy65_manager.py
===================================================================
--- trunk/src/common/proxy65_manager.py 2008-10-20 15:21:26 UTC (rev 10541)
+++ trunk/src/common/proxy65_manager.py 2008-10-20 15:24:54 UTC (rev 10542)
@@ -107,11 +107,10 @@
self.state = S_RESOLVED
#FIXME: re-enable proxy testing
self.state = S_FINISHED
- return
- self.receiver_tester = ReceiverTester(self.host, self.port, self.jid,
- self.sid, self.sender_jid, self._on_receiver_success,
- self._on_connect_failure)
- self.receiver_tester.connect()
+ #self.receiver_tester = ReceiverTester(self.host, self.port, self.jid,
+ # self.sid, self.sender_jid, self._on_receiver_success,
+ # self._on_connect_failure)
+ #self.receiver_tester.connect()
def _on_receiver_success(self):
self.host_tester = HostTester(self.host, self.port, self.jid,
Modified: trunk/src/remote_control.py
===================================================================
--- trunk/src/remote_control.py 2008-10-20 15:21:26 UTC (rev 10541)
+++ trunk/src/remote_control.py 2008-10-20 15:24:54 UTC (rev 10542)
@@ -328,7 +328,6 @@
(optional) 'account' '''
if not jid:
raise MissingArgument
- return DBUS_BOOLEAN(False)
jid = self._get_real_jid(jid, account)
try:
jid = helpers.parse_jid(jid)
@@ -409,7 +408,6 @@
jid = unicode(jid)
if not jid:
raise MissingArgument
- return DBUS_DICT_SV()
jid = self._get_real_jid(jid)
cached_vcard = gajim.connections.values()[0].get_cached_vcard(jid)
Modified: trunk/src/roster_window.py
===================================================================
--- trunk/src/roster_window.py 2008-10-20 15:21:26 UTC (rev 10541)
+++ trunk/src/roster_window.py 2008-10-20 15:24:54 UTC (rev 10542)
@@ -6050,52 +6050,52 @@
return True
def setup_for_osx(self):
- # This is broken
- return
'''Massage the GTK menu so it will match up to the OS/X nib style menu
when passed to sync-menu and merged'''
- main_menu = self.xml.get_widget('menubar')
- app_item = gtk.MenuItem('Gajim')
- main_menu.insert(app_item, 0)
- win_item = gtk.MenuItem('Window')
- main_menu.insert(win_item, 4)
- actions_menu = self.xml.get_widget('actions_menu_menu')
- quit_item = self.xml.get_widget('quit_menuitem')
- actions_menu.remove(quit_item)
- actions_menu.remove(self.xml.get_widget('separator1'))
- edit_menu = self.xml.get_widget('edit_menu_menu')
- #edit_menu.remove(self.xml.get_widget('preferences_menuitem'))
- edit_menu.remove(self.xml.get_widget('separator2'))
- help_menu = self.xml.get_widget('help_menu_menu')
- about_item = self.xml.get_widget('about_menuitem')
- help_menu.remove(about_item)
- # Build up App menu
- app_menu = gtk.Menu()
- app_item.set_submenu(app_menu)
- app_menu.append(about_item)
- app_menu.append(gtk.MenuItem('__SKIP__'))
- prefs_item = gtk.MenuItem('Preferences...')
- prefs_item.connect('activate', self.on_preferences_menuitem_activate)
- accels = gtk.AccelGroup()
- self.xml.get_widget('roster_window').add_accel_group(accels)
- prefs_item.add_accelerator('activate', accels, ord(','),
- gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
- app_menu.append(prefs_item)
- app_menu.append(gtk.MenuItem('__SKIP__'))
- app_menu.append(gtk.MenuItem('__SKIP__'))
- app_menu.append(gtk.MenuItem('__SKIP__'))
- app_menu.append(gtk.MenuItem('__SKIP__'))
- app_menu.append(gtk.MenuItem('__SKIP__'))
- app_menu.append(gtk.MenuItem('__SKIP__'))
- app_menu.append(gtk.MenuItem('__SKIP__'))
- app_menu.append(quit_item)
- app_menu.show_all()
- # Do the merge baby!
- syncmenu.takeover_menu(main_menu)
- self.make_menu(force=True)
- # Hide the GTK menubar itself and let the OS/X menubar do its thing
- #self.xml.get_widget('menubar').hide()
- return
+ pass
+ # This is broken
+# main_menu = self.xml.get_widget('menubar')
+# app_item = gtk.MenuItem('Gajim')
+# main_menu.insert(app_item, 0)
+# win_item = gtk.MenuItem('Window')
+# main_menu.insert(win_item, 4)
+# actions_menu = self.xml.get_widget('actions_menu_menu')
+# quit_item = self.xml.get_widget('quit_menuitem')
+# actions_menu.remove(quit_item)
+# actions_menu.remove(self.xml.get_widget('separator1'))
+# edit_menu = self.xml.get_widget('edit_menu_menu')
+# #edit_menu.remove(self.xml.get_widget('preferences_menuitem'))
+# edit_menu.remove(self.xml.get_widget('separator2'))
+# help_menu = self.xml.get_widget('help_menu_menu')
+# about_item = self.xml.get_widget('about_menuitem')
+# help_menu.remove(about_item)
+# # Build up App menu
+# app_menu = gtk.Menu()
+# app_item.set_submenu(app_menu)
+# app_menu.append(about_item)
+# app_menu.append(gtk.MenuItem('__SKIP__'))
+# prefs_item = gtk.MenuItem('Preferences...')
+# prefs_item.connect('activate', self.on_preferences_menuitem_activate)
+# accels = gtk.AccelGroup()
+# self.xml.get_widget('roster_window').add_accel_group(accels)
+# prefs_item.add_accelerator('activate', accels, ord(','),
+# gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
+# app_menu.append(prefs_item)
+# app_menu.append(gtk.MenuItem('__SKIP__'))
+# app_menu.append(gtk.MenuItem('__SKIP__'))
+# app_menu.append(gtk.MenuItem('__SKIP__'))
+# app_menu.append(gtk.MenuItem('__SKIP__'))
+# app_menu.append(gtk.MenuItem('__SKIP__'))
+# app_menu.append(gtk.MenuItem('__SKIP__'))
+# app_menu.append(gtk.MenuItem('__SKIP__'))
+# app_menu.append(quit_item)
+# app_menu.show_all()
+# # Do the merge baby!
+# syncmenu.takeover_menu(main_menu)
+# self.make_menu(force=True)
+# # Hide the GTK menubar itself and let the OS/X menubar do its thing
+# #self.xml.get_widget('menubar').hide()
+# return
################################################################################
###
1
0
Author: asterix
Date: 2008-10-20 17:21:26 +0200 (Mon, 20 Oct 2008)
New Revision: 10541
Modified:
trunk/src/common/xmpp/idlequeue.py
trunk/src/common/xmpp/protocol.py
Log:
[thorstenp] remove useless pass
Modified: trunk/src/common/xmpp/idlequeue.py
===================================================================
--- trunk/src/common/xmpp/idlequeue.py 2008-10-20 15:20:51 UTC (rev 10540)
+++ trunk/src/common/xmpp/idlequeue.py 2008-10-20 15:21:26 UTC (rev 10541)
@@ -19,7 +19,6 @@
'''
def __init__(self):
self.fd = -1
- pass
def pollend(self):
''' called on stream failure '''
@@ -220,4 +219,4 @@
self.check_time_events()
return True
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
Modified: trunk/src/common/xmpp/protocol.py
===================================================================
--- trunk/src/common/xmpp/protocol.py 2008-10-20 15:20:51 UTC (rev 10540)
+++ trunk/src/common/xmpp/protocol.py 2008-10-20 15:21:26 UTC (rev 10541)
@@ -458,7 +458,7 @@
self.setTag('html',namespace=NS_XHTML_IM).addChild(node=dom)
except Exception, e:
print "Error", e
- pass #FIXME: log. we could not set xhtml (parse error, whatever)
+ #FIXME: log. we could not set xhtml (parse error, whatever)
def setSubject(self,val):
""" Sets the subject of the message. """
self.setTagData('subject',val)
1
0
20 Oct '08
Author: asterix
Date: 2008-10-20 17:20:51 +0200 (Mon, 20 Oct 2008)
New Revision: 10540
Modified:
trunk/src/common/socks5.py
trunk/src/common/xmpp/session.py
trunk/src/ipython_view.py
Log:
[thorstenp] remove statements without effect
Modified: trunk/src/common/socks5.py
===================================================================
--- trunk/src/common/socks5.py 2008-10-20 15:16:01 UTC (rev 10539)
+++ trunk/src/common/socks5.py 2008-10-20 15:20:51 UTC (rev 10540)
@@ -485,8 +485,7 @@
return -1
def get_file_contents(self, timeout):
- ''' read file contents from socket and write them to file ''', \
- self.file_props['type'], self.file_props['sid']
+ ''' read file contents from socket and write them to file '''
if self.file_props is None or \
('file-name' in self.file_props) is False:
self.file_props['error'] = -2
Modified: trunk/src/common/xmpp/session.py
===================================================================
--- trunk/src/common/xmpp/session.py 2008-10-20 15:16:01 UTC (rev 10539)
+++ trunk/src/common/xmpp/session.py 2008-10-20 15:20:51 UTC (rev 10540)
@@ -249,7 +249,6 @@
features=Node('stream:features')
if NS_TLS in self.waiting_features:
features.T.starttls.setNamespace(NS_TLS)
- features.T.starttls.T.required
if NS_SASL in self.waiting_features:
features.T.mechanisms.setNamespace(NS_SASL)
for mec in self._owner.SASL.mechanisms:
Modified: trunk/src/ipython_view.py
===================================================================
--- trunk/src/ipython_view.py 2008-10-20 15:16:01 UTC (rev 10539)
+++ trunk/src/ipython_view.py 2008-10-20 15:20:51 UTC (rev 10540)
@@ -214,7 +214,7 @@
possibilities = self.IP.complete(split_line[-1])
try:
- __builtins__.all
+ all(())
except AttributeError:
def all(iterable):
for element in iterable:
1
0
20 Oct '08
Author: asterix
Date: 2008-10-20 17:16:01 +0200 (Mon, 20 Oct 2008)
New Revision: 10539
Modified:
trunk/src/chat_control.py
trunk/src/common/connection_handlers.py
trunk/src/common/logger.py
trunk/src/common/zeroconf/client_zeroconf.py
trunk/src/groupchat_control.py
Log:
[thorstenp] remove useless ;
Modified: trunk/src/chat_control.py
===================================================================
--- trunk/src/chat_control.py 2008-10-20 11:46:09 UTC (rev 10538)
+++ trunk/src/chat_control.py 2008-10-20 15:16:01 UTC (rev 10539)
@@ -152,7 +152,7 @@
contact = c
MessageControl.__init__(self, type_id, parent_win, widget_name,
- contact, acct, resource = resource);
+ contact, acct, resource = resource)
widget = self.xml.get_widget('history_button')
id = widget.connect('clicked', self._on_history_menuitem_activate)
@@ -956,7 +956,7 @@
conv_buf.set_text(self.sent_history[self.sent_history_pos])
elif direction == 'down':
if self.sent_history_pos >= size - 1:
- conv_buf.set_text(self.orig_msg);
+ conv_buf.set_text(self.orig_msg)
self.orig_msg = None
self.sent_history_pos = size
return
Modified: trunk/src/common/connection_handlers.py
===================================================================
--- trunk/src/common/connection_handlers.py 2008-10-20 11:46:09 UTC (rev 10538)
+++ trunk/src/common/connection_handlers.py 2008-10-20 15:16:01 UTC (rev 10539)
@@ -1414,7 +1414,7 @@
method = iq_obj.getTagAttr('confirm', 'method')
url = iq_obj.getTagAttr('confirm', 'url')
msg = iq_obj.getTagData('body') # In case it's a message with a body
- self.dispatch('HTTP_AUTH', (method, url, id, iq_obj, msg));
+ self.dispatch('HTTP_AUTH', (method, url, id, iq_obj, msg))
raise common.xmpp.NodeProcessed
def _ErrorCB(self, con, iq_obj):
@@ -1518,7 +1518,7 @@
iq_obj = iq_obj.buildReply('result')
qp = iq_obj.getTag('query')
if not HAS_IDLE:
- qp.attrs['seconds'] = '0';
+ qp.attrs['seconds'] = '0'
else:
qp.attrs['seconds'] = idle.getIdleSec()
Modified: trunk/src/common/logger.py
===================================================================
--- trunk/src/common/logger.py 2008-10-20 11:46:09 UTC (rev 10538)
+++ trunk/src/common/logger.py 2008-10-20 15:16:01 UTC (rev 10539)
@@ -708,7 +708,7 @@
# the data field contains binary object (gzipped data), this is a hack
# to get that data without trying to convert it to unicode
try:
- self.cur.execute('SELECT hash_method, hash, data FROM caps_cache;');
+ self.cur.execute('SELECT hash_method, hash, data FROM caps_cache;')
except sqlite.OperationalError:
# might happen when there's no caps_cache table yet
# -- there's no data to read anyway then
Modified: trunk/src/common/zeroconf/client_zeroconf.py
===================================================================
--- trunk/src/common/zeroconf/client_zeroconf.py 2008-10-20 11:46:09 UTC (rev 10538)
+++ trunk/src/common/zeroconf/client_zeroconf.py 2008-10-20 15:16:01 UTC (rev 10539)
@@ -94,7 +94,7 @@
entry = self.conn_holder.getRoster().getItem(jid)
if (entry['address'] == ipaddr):
from_jid = jid
- break;
+ break
P2PClient(sock[0], ipaddr, sock[1][1], self.conn_holder, [], from_jid)
def disconnect(self):
Modified: trunk/src/groupchat_control.py
===================================================================
--- trunk/src/groupchat_control.py 2008-10-20 11:46:09 UTC (rev 10538)
+++ trunk/src/groupchat_control.py 2008-10-20 15:16:01 UTC (rev 10539)
@@ -175,7 +175,7 @@
def __init__(self, parent_win, contact, acct, is_continued=False):
ChatControlBase.__init__(self, self.TYPE_ID, parent_win,
- 'muc_child_vbox', contact, acct);
+ 'muc_child_vbox', contact, acct)
self.is_continued=is_continued
self.is_anonymous = True
1
0
Author: asterix
Date: 2008-10-20 13:46:09 +0200 (Mon, 20 Oct 2008)
New Revision: 10538
Modified:
trunk/po/sv.po
Log:
fix errors in swedish translation. Fixes #4414
Modified: trunk/po/sv.po
===================================================================
--- trunk/po/sv.po 2008-10-19 17:36:36 UTC (rev 10537)
+++ trunk/po/sv.po 2008-10-20 11:46:09 UTC (rev 10538)
@@ -2584,9 +2584,9 @@
msgstr "Chattar"
#: ../src/chat_control.py:1034
-#, fuzzy, python-format
+#, python-format
msgid "%(nickname)s from group chat %(room_name)s"
-msgstr "%(nickname) frƄn gruppchatt %(room_name)"
+msgstr "%(nickname)s frƄn gruppchatt %(room_name)s"
#. we talk about a contact here
#: ../src/chat_control.py:1123
@@ -3528,7 +3528,7 @@
#: ../src/dialogs.py:2244
#, fuzzy, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
-msgstr "%(contact_jid)s har bjudit in dig till %(room_jid)s"
+msgstr "$Contact har bjudit in dig till %(room_jid)s"
#. only if not None and not ''
#: ../src/dialogs.py:2256
@@ -4028,7 +4028,7 @@
"From: %(from_address)s"
msgstr ""
"\n"
-"FrƄn: %(from_address)"
+"FrƄn: %(from_address)s"
#: ../src/gajim.py:1375
#, python-format
@@ -4815,7 +4815,7 @@
#: ../src/gtkgui_helpers.py:752
#, python-format
msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Bilden kan inte sparas i %(type) format. Spara som %(new_filename)?"
+msgstr "Bilden kan inte sparas i %(type)s format. Spara som %(new_filename)s?"
#: ../src/gtkgui_helpers.py:761
#, fuzzy
@@ -5313,7 +5313,7 @@
#: ../src/roster_window.py:2966
#, python-format
msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)\" av %(artist)"
+msgstr "\"%(title)s\" av %(artist)s"
#: ../src/roster_window.py:3395 ../src/roster_window.py:3402
msgid ""
@@ -5385,7 +5385,7 @@
#: ../src/tooltips.py:317
#, python-format
msgid "%(owner_or_admin_or_member)s of this group chat"
-msgstr "%(owner_or_admin_or_member) av den hƤr gruppchatten"
+msgstr "%(owner_or_admin_or_member)s av den hƤr gruppchatten"
#: ../src/tooltips.py:430 ../src/tooltips.py:610
msgid "Status: "
1
0
Author: asterix
Date: 2008-10-19 19:36:36 +0200 (Sun, 19 Oct 2008)
New Revision: 10537
Modified:
trunk/po/sr.po
Log:
Fix swedish translation syntax. Fixes #4414
Modified: trunk/po/sr.po
===================================================================
--- trunk/po/sr.po 2008-10-16 18:40:00 UTC (rev 10536)
+++ trunk/po/sr.po 2008-10-19 17:36:36 UTC (rev 10537)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: sr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-25 11:26+0200\n"
+"POT-Creation-Date: 2008-10-19 19:19+0200\n"
"PO-Revision-Date: 2008-08-15 22:36+0200\n"
"Last-Translator: Branko Kokanovic <branko.kokanovic(a)gmail.com>\n"
"Language-Team: <sr(a)li.org>\n"
@@ -33,7 +33,7 @@
msgstr "ŠŠ°Š±ŠµŃ IM ŠŠ»ŠøŃŠµŠ½Ń"
#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:7
msgid "Join _Group Chat..."
msgstr "ŠŃŠøŠŗŃŃŃŠø ŃŠµ _Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ..."
@@ -293,8 +293,8 @@
#. No configured account
#: ../data/glade/account_modification_window.glade.h:16
#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:6 ../src/common/helpers.py:1030
-#: ../src/common/helpers.py:1042 ../src/notify.py:502 ../src/notify.py:533
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1038
+#: ../src/common/helpers.py:1050 ../src/notify.py:502 ../src/notify.py:533
#: ../src/notify.py:545
msgid "Gajim"
msgstr "ŠŠ°ŃŠøŠ¼"
@@ -304,11 +304,11 @@
#. General group cannot be changed
#: ../data/glade/account_modification_window.glade.h:17
#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:49
#: ../data/glade/zeroconf_properties_window.glade.h:7
#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:165 ../src/roster_window.py:2690
-#: ../src/roster_window.py:5170
+#: ../src/dialogs.py:166 ../src/roster_window.py:2659
+#: ../src/roster_window.py:5148
msgid "General"
msgstr "ŠŠæŃŃŠµ"
@@ -373,20 +373,20 @@
#: ../data/glade/account_modification_window.glade.h:27
#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1551
-#: ../src/config.py:2045
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1558
+#: ../src/config.py:2058
msgid "No key selected"
msgstr "ŠŠøŃŠµ Š¾Š“Š°Š±ŃŠ°Š½ Š½ŠøŃŠµŠ“Š°Š½ ŠŗŃŃŃ"
#. None means no proxy profile selected
#: ../data/glade/account_modification_window.glade.h:29
#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1140
-#: ../src/config.py:1211 ../src/config.py:1459 ../src/config.py:1464
-#: ../src/config.py:1953 ../src/config.py:2031 ../src/config.py:2044
-#: ../src/config.py:3147 ../src/config.py:3215 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:514 ../src/roster_window.py:2758
-#: ../src/roster_window.py:2764 ../src/roster_window.py:2769
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1148
+#: ../src/config.py:1219 ../src/config.py:1466 ../src/config.py:1471
+#: ../src/config.py:1966 ../src/config.py:2044 ../src/config.py:2057
+#: ../src/config.py:3152 ../src/config.py:3220 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:514 ../src/roster_window.py:2728
+#: ../src/roster_window.py:2734 ../src/roster_window.py:2739
msgid "None"
msgstr "ŠŠøŃŃŠ°"
@@ -564,7 +564,7 @@
msgstr "_Š”ŠæŠ¾ŃŠø Š½Š°Š»Š¾Š³Šµ"
#. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5122
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5099
msgid "Re_name"
msgstr "ŠŃŠµŠø_Š¼ŠµŠ½ŃŃ"
@@ -783,7 +783,7 @@
msgstr "Š”Š²Šø ŃŃŠ°ŃŃŃŠø"
#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:277
+#: ../src/common/commands.py:102 ../src/common/helpers.py:287
msgid "Away"
msgstr "ŠŠ“ŃŃŃŠ°Š½"
@@ -800,7 +800,7 @@
msgstr "ŠŠ¼Š°Š¼ "
#: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:297
msgid "Invisible"
msgstr "ŠŠµŠ²ŠøŠ“ŃŠøŠ²"
@@ -809,7 +809,7 @@
msgstr "ŠŠ¾ŠŗŃŠµŠ½ŠøŃŠµ ŠŗŠ¾Š¼Š°Š½Š“Ń"
#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
msgid "Not Available"
msgstr "ŠŠµŠ“Š¾ŃŃŃŠæŠ°Š½"
@@ -985,7 +985,7 @@
msgstr "ŠŃŠøŠŗŃŃŃŠø ŃŠµ _Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ"
#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
msgid "_Add to Roster..."
msgstr "_ŠŠ¾Š“Š°Ń Š½Š° Š»ŠøŃŃŃ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°..."
@@ -1037,10 +1037,10 @@
#: ../data/glade/chat_control_popup_menu.glade.h:6
#: ../data/glade/gc_control_popup_menu.glade.h:6
#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:17
#: ../data/glade/roster_window.glade.h:20
#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5797
+#: ../src/roster_window.py:5795
msgid "_History"
msgstr "_ŠŃŃŠ¾ŃŠøŃŠ°Ń"
@@ -1149,7 +1149,7 @@
msgid "When a file transfer is complete show a popup notification"
msgstr "ŠŃŠøŠŗŠ°Š¶Šø ŠøŃŠŗŠ°ŃŃŃŠµ Š¾Š±Š°Š²ŠµŃŃŠµŃŠµ ŠŗŠ°Š“Š° ŃŠµ Š·Š°Š²ŃŃŠø ŠæŃŠµŠ½Š¾Ń Š“Š°ŃŠ¾ŃŠµŠŗŠµ"
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:795
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:797
msgid "_Continue"
msgstr "_ŠŠ°ŃŃŠ°Š²Šø"
@@ -1313,7 +1313,7 @@
msgid "Create new post"
msgstr "ŠŠ°ŠæŃŠ°Š²Šø Š½Š¾Š²Ń Š¾Š±ŃŠ°Š²Ń"
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:302
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:312
msgid "From"
msgstr "ŠŠ“"
@@ -1390,7 +1390,7 @@
msgid "_Log conversation history"
msgstr "_ŠŠ°Š¼ŃŠø Ń Š“Š½ŠµŠ²Š½ŠøŠŗŃ ŠøŃŃŠ¾ŃŠøŃŠ°Ń ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°"
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1696
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1689
msgid "Join Group Chat"
msgstr "ŠŃŠøŠ“ŃŃŠ¶Šø ŃŠµ Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ"
@@ -1417,8 +1417,8 @@
msgid "Room:"
msgstr "Š”Š¾Š±Š°:"
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1182
-#: ../src/disco.py:1603
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
msgid "_Join"
msgstr "_ŠŃŠøŠ“ŃŃŠ¶Šø ŃŠµ"
@@ -1716,10 +1716,6 @@
msgstr "ŠŃŠøŠŗŠ°Š¶Šø ŃŃŠ°ŃŃŃŠ½Šµ ŠæŠ¾ŃŃŠŗŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° Š½Š° Š»ŠøŃŃŠø"
#: ../data/glade/preferences_window.glade.h:46
-msgid "Emoticons:"
-msgstr "Š”Š¼Š°ŃŠ»ŠøŃŠø:"
-
-#: ../data/glade/preferences_window.glade.h:47
msgid ""
"Gajim can send and receive meta-information related to a conversation you "
"may have with a contact. Here you can specify which chatstates you want to "
@@ -1729,7 +1725,7 @@
"ŃŠ° ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ¾Š¼. ŠŠ²Š“Šµ Š¼Š¾Š¶ŠµŃŠµ Š¾Š“ŃŠµŠ“ŠøŃŠø ŠŗŠ¾ŃŠ° ŃŃŠ°ŃŠ° ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° ŃŠµ ŃŠµ ŠæŃŠøŠŗŠ°Š·ŠøŠ²Š°ŃŠø Ń "
"ŠæŃŠ¾Š·Š¾ŃŠøŠ¼Š° ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°."
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:47
msgid ""
"Gajim can send and receive meta-information related to a conversation you "
"may have with a contact. Here you can specify which chatstates you want to "
@@ -1739,7 +1735,7 @@
"ŃŠ° ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ¾Š¼. ŠŠ²Š“Šµ Š¼Š¾Š¶ŠµŃŠµ Š¾Š“ŃŠµŠ“ŠøŃŠø ŠŗŠ¾ŃŠ° ŃŃŠ°ŃŠ° ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° ŃŠµ ŃŠµ ŃŠ»Š°ŃŠø Š“ŃŃŠ³Š¾Ń "
"Š¾ŃŠ¾Š±Šø."
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:48
msgid ""
"Gajim will notify you via a popup window in the bottom right of the screen "
"about contacts that just signed out"
@@ -1747,11 +1743,11 @@
"ŠŠ°ŃŠøŠ¼ ŃŠµ ŠŠ°Ń Š¾Š±Š°Š²ŠµŃŃŠøŃŠø Š¾ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠøŠ¼Š° ŠŗŠ¾ŃŠø ŃŃ ŃŠµ ŃŠæŃŠ°Š²Š¾ Š¾Š“ŃŠ°Š²ŠøŠ»Šø ŃŠ° ŠøŃŠŗŠ°ŃŃŃŠøŠ¼ "
"ŠæŃŠ¾Š·Š¾ŃŠ¾Š¼ Ń Š“Š¾ŃŠµŠ¼ Š“ŠµŃŠ½Š¾Š¼ ŃŠ³Š»Ń ŠµŠŗŃŠ°Š½Š°"
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:50
msgid "Hide all buttons in chat windows"
msgstr "Š”Š°ŠŗŃŠøŃ ŃŠ²Ń Š“ŃŠ³Š¼Š°Š“ Ń ŠæŃŠ¾Š·Š¾ŃŃ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°"
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:51
msgid ""
"If checked, Gajim will allow others to detect the operation system you are "
"using"
@@ -1759,7 +1755,7 @@
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š°, ŠŠ°ŃŠøŠ¼ ŃŠµ Š“Š¾Š·Š²Š¾Š»ŠøŃŠø Š“ŃŃŠ³ŠøŠ¼Š° Š“Š° ŠæŠ¾Š³Š»ŠµŠ“Š°ŃŃ ŠŗŠ¾ŃŠø Š¾ŠæŠµŃŠ°ŃŠøŠ²Š½Šø "
"ŃŠøŃŃŠµŠ¼ ŠŗŠ¾ŃŠøŃŃŠøŃŠµ"
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:52
msgid ""
"If checked, Gajim will also include information about the sender of the new "
"emails"
@@ -1767,14 +1763,14 @@
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š°, ŠŠ°ŃŠøŠ¼ ŃŠµ ŃŃŠµŠ“Š½Š¾ ŃŠŗŃŃŃŠøŃŠø Šø ŠøŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠµ Š¾ ŠæŠ¾ŃŠøŃŠ°Š¾ŃŃ Š½Š¾Š²ŠøŃ
Šµ-"
"Š¼ŠµŃŠ»Š¾Š²Š°"
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:53
msgid ""
"If checked, Gajim will change status to Away when the computer is unused."
msgstr ""
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š°, ŠŠ°ŃŠøŠ¼ ŃŠµ Š°ŃŃŠ¾Š¼Š°ŃŃŠŗŠø ŠæŃŠ¾Š¼ŠµŠ½ŠøŃŠø ŃŃŠ°ŃŃŃ Ń ŠŠ“ŃŃŃŠ°Š½ ŠŗŠ°Š“Š° ŃŠ°ŃŃŠ½Š°Ń "
"Š½ŠøŃŠµ Ń ŃŠæŠ¾ŃŃŠµŠ±Šø."
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:54
msgid ""
"If checked, Gajim will change status to Not Available when the computer has "
"not been used even longer"
@@ -1782,7 +1778,7 @@
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š°, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠæŃŠ¾Š¼ŠµŠ½ŠøŃŠø ŃŃŠ°ŃŃŃ Ń ŠŠµŠ“Š¾ŃŃŃŠæŠ°Š½ ŠŗŠ°Š“Š° ŃŠ°ŃŃŠ½Š°Ń ŃŠ¾Ń "
"Š“ŃŠ¶Šµ Š½ŠøŃŠµ Ń ŃŠæŠ¾ŃŃŠµŠ±Šø"
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:55
msgid ""
"If checked, Gajim will display avatars of contacts in roster window and in "
"group chats"
@@ -1790,7 +1786,7 @@
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š°, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠæŃŠøŠŗŠ°Š·ŠøŠ²Š°ŃŠø Š°Š²Š°ŃŠ°ŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° Ń Š»ŠøŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° Šø "
"Ń Š³ŃŃŠæŠ½ŠøŠ¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠøŠ¼Š°"
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:56
msgid ""
"If checked, Gajim will display status messages of contacts under the contact "
"name in roster window and in group chats"
@@ -1798,25 +1794,25 @@
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š°, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠæŃŠøŠŗŠ°Š·ŠøŠ²Š°ŃŠø ŃŃŠ°ŃŃŃŠ½Šµ ŠæŠ¾ŃŃŠŗŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° ŠøŃŠæŠ¾Š“ ŠøŠ¼ŠµŠ½Š° "
"ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° Ń Š»ŠøŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° Šø Ń Š³ŃŃŠæŠ½ŠøŠ¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠøŠ¼Š°"
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:57
msgid ""
"If checked, Gajim will display the activity of contacts in the roster window"
msgstr ""
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š°, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠæŃŠøŠŗŠ°Š·ŠøŠ²Š°ŃŠø Š°ŠŗŃŠøŠ²Š½Š¾ŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° Ń Š»ŠøŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°"
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:58
msgid ""
"If checked, Gajim will display the mood of contacts in the roster window"
msgstr ""
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š°, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠæŃŠøŠŗŠ°Š·ŠøŠ²Š°ŃŠø ŃŠ°ŃŠæŠ¾Š»Š¾Š¶ŠµŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° Ń Š»ŠøŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°"
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:59
msgid ""
"If checked, Gajim will display the tunes of contacts in the roster window"
msgstr ""
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š°, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠæŃŠøŠŗŠ°Š·ŠøŠ²Š°ŃŠø ŠæŠµŃŠ¼Šµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° Ń Š»ŠøŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°"
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:60
msgid ""
"If checked, Gajim will highlight spelling errors in input fields of chat "
"windows. If no language is explicitly set via right click on the input "
@@ -1827,7 +1823,7 @@
"ŠæŠ¾ŃŠµ Š·Š° ŃŠ½Š¾Ń, ŠæŠ¾Š“ŃŠ°Š·ŃŠ¼ŠµŠ²Š°Š½Šø ŃŠµŠ·ŠøŠŗ ŃŠµ Š±ŠøŃŠø ŠŗŠ¾ŃŠøŃŃŠµŠ½ Š·Š° Š¾Š²Š°Ń ŠŗŠ¾Š½ŃŠ°ŠŗŃ ŠøŠ»Šø "
"Š³ŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń."
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:61
msgid ""
"If checked, Gajim will ignore incoming events from unauthorized contacts. "
"Use with caution, because it blocks all messages from any contact that is "
@@ -1836,7 +1832,7 @@
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š°, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠøŠ³Š½Š¾ŃŠøŃŠ°ŃŠø ŃŠ²Šµ Š“Š¾Š»Š°Š·Š½Šµ Š“Š¾Š³Š°ŃŠ°ŃŠµŠŠ¾ŃŠøŃŃŠøŃŠµ ŃŠ° "
"Š¾ŠæŃŠµŠ·Š¾Š¼, Š±Š»Š¾ŠŗŠøŃŠ°ŃŠµ ŃŠ²Šµ ŠæŠ¾ŃŃŠŗŠµ ŠŗŠ¾ŃŠµ Š“Š¾Š»Š°Š·Šµ Š¾Š“ ŃŃŠ“Šø Š²Š°Š½ ŠŠ°ŃŠµ Š»ŠøŃŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°"
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:62
msgid ""
"If checked, Gajim will keep logs for encrypted messages. Please note that "
"when using E2E encryption the remote party has to agree on logging, else the "
@@ -1846,7 +1842,7 @@
"ŠŗŠ°Š“Š° ŃŠµ ŠŗŠ¾ŃŠøŃŃŠø E2E ŠµŠ½ŠŗŃŠøŠæŃŠøŃŠ°, Š“ŃŃŠ³Š° ŃŃŃŠ°Š½Š° Š¼Š¾ŃŠ° Š“Š° ŃŠµ ŃŠ»Š¾Š¶Šø ŃŠ° ŃŃŠ²Š°ŃŠµŠ¼ "
"Š“Š½ŠµŠ²Š½ŠøŠŗŠ°, Ń ŃŃŠæŃŠ¾ŃŠ½Š¾Š¼ ŃŠµ ŠæŠ¾ŃŃŠŗŠµ Š½ŠµŃŠµ ŠæŠ°Š¼ŃŠøŃŠø."
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:63
msgid ""
"If checked, Gajim will show a notification when a new e-mail is received via "
"GMail"
@@ -1854,16 +1850,8 @@
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š°, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠæŃŠøŠŗŠ°Š·Š°ŃŠø ŠæŠ¾ŃŃŠŗŃ ŠŗŠ°Š“Š° ŃŠµ ŠæŃŠøŠ¼Šø Š½Š¾Š²Šø Šµ-Š¼ŠµŃŠ» ŠæŃŠµŠŗŠ¾ "
"GMail-Š°Š¼ŠµŃŠ»Š¾Š²Š°"
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:64
msgid ""
-"If checked, Gajim will sort contacts in roster window and groupchats by "
-"their status and not by the shown name"
-msgstr ""
-"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š¾, ŠŠ°ŃŠøŠ¼ ŃŠµ ŃŠ¾ŃŃŠøŃŠ°ŃŠø Š°Š²Š°ŃŠ°ŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° Ń Š»ŠøŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° ŠæŠ¾ "
-"ŃŃŠ°ŃŃŃŃ, Š° Š½Šµ ŠæŠ¾ ŠæŃŠøŠŗŠ°Š·Š°Š½Š¾Š¼ ŠøŠ¼ŠµŠ½Ń"
-
-#: ../data/glade/preferences_window.glade.h:66
-msgid ""
"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
"from MSN will have the equivalent msn icon for status online, away, busy, "
"etc...)"
@@ -1871,7 +1859,7 @@
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š¾, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠŗŠ¾ŃŠøŃŃŠøŃŠø ŃŃŠ°ŃŃŃŠ½Šµ ŠøŠŗŠ¾Š½Šµ ŃŠæŠµŃŠøŃŠøŃŠ½Šµ Š·Š° ŠæŃŠ¾ŃŠ¾ŠŗŠ¾Š». "
"(Š½ŠæŃ. ŠŗŠ¾Š½ŃŠ°ŠŗŃ ŃŠ° ŠŠ”Š-Š° ŃŠµ ŠøŠ¼Š°ŃŠø Š¼ŃŠ½ ŠøŠŗŠ¾Š½Šµ Š·Š° ŃŠ²Š¾ŃŠµ ŃŃŠ°ŃŃŃŠµ)"
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:65
msgid ""
"If enabled, Gajim will not ask for a status message. The specified default "
"message will be used instead."
@@ -1879,7 +1867,7 @@
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š°, ŠŠ°ŃŠøŠ¼ Š½ŠµŃŠµ ŠæŠøŃŠ°ŃŠø Š·Š° ŃŃŠ°ŃŃŃŠ½Ń ŠæŠ¾ŃŃŠŗŃ. ŠŠµŃ ŠæŠ¾ŃŃŠ°Š²ŃŠµŠ½Š° "
"ŠæŠ¾Š“ŃŠ°Š·ŃŠ¼ŠµŠ²Š°Š½Š° ŠæŠ¾ŃŃŠŗŠ° ŃŠµ Š±ŠøŃŠø ŠŗŠ¾ŃŠøŃŃŠµŠ½Š°."
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:66
msgid ""
"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
"animated or static graphical emoticons"
@@ -1887,47 +1875,43 @@
"ŠŠŗŠ¾ Š½ŠøŃŠµ Š¾Š½ŠµŠ¼Š¾Š³ŃŃŠµŠ½Š¾, ŠŠ°ŃŠøŠ¼ ŃŠµ Š·Š°Š¼ŠµŠ½ŠøŃŠø ascii ŃŠ¼Š°ŃŠ»ŠøŃŠµ ŠŗŠ°Š¾ Š½ŠæŃ. ':)' ŃŠ° "
"ŠµŠŗŠ²ŠøŠ²Š°Š»ŠµŠ½ŃŠ½ŠøŠ¼ Š°Š½ŠøŠ¼ŠøŃŠ°Š½ŠøŠ¼ ŠøŠ»Šø ŃŃŠ°ŃŠøŃŠ½ŠøŠ¼ Š³ŃŠ°ŃŠøŃŠŗŠøŠ¼ ŃŠ¼Š°ŃŠ»ŠøŃŠøŠ¼Š°"
-#: ../data/glade/preferences_window.glade.h:69
-msgid "Ignore rich content in incoming messages"
-msgstr "ŠŠ³Š½Š¾ŃŠøŃŠø Š±Š¾Š³Š°ŃŠ¾ ŃŠ¾ŃŠ¼Š°ŃŠøŃŠ°Š½Šø ŃŠ°Š“ŃŠ¶Š°Ń Ń ŠæŃŠøŃŃŠøŠ³Š»ŠøŠ¼ ŠæŠ¾ŃŃŠŗŠ°Š¼Š°"
-
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:67
msgid "Log _encrypted chat session"
msgstr "Š£ŠæŠøŃŃŃ Ń Š“Š½ŠµŠ²Š½ŠøŠŗ ŃŠøŃŃŠ¾Š²Š°Š½Šµ ŃŠµŃŠøŃŠµ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°"
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:68
msgid "Ma_ke message windows compact"
msgstr "ŠŠ°ŃŠøŠ½Šø ŠæŃŠ¾Š·Š¾Ń ŠæŠ¾ŃŃŠŗŠµ ŠŗŠ¾Š¼ŠæŠ°ŠŗŃŠ½ŠøŠ¼"
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:69
msgid "Ma_nage..."
msgstr "ŠŠ¾Š“Šµ_ŃŠø..."
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:70
msgid "Notifications"
msgstr "ŠŠ±Š°Š²ŠµŃŃŠµŃŠ°"
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:71
msgid "Notify me about contacts that sign _in"
msgstr "ŠŠ±Š°Š²ŠµŃŃŠø Š¼Šµ Š¾ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠøŠ¼Š° ŠŗŠ¾ŃŠø ŃŠµ _ŠæŃŠøŃŠ°Š²Šµ"
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:72
msgid "Notify me about contacts that sign _out"
msgstr "ŠŠ±Š°Š²ŠµŃŃŠø Š¼Šµ Š¾ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠøŠ¼Š° ŠŗŠ¾ŃŠø ŃŠµ _Š¾Š“ŃŠ°Š²Šµ"
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:73
msgid "Notify on new _GMail email"
msgstr "ŠŠ±Š°Š²ŠµŃŃŠø Š¼Šµ Š¾ Š½Š¾Š²Š¾ŠæŃŠøŃŃŠøŠ³Š»Š¾Ń ŠŠ¼Š°ŠøŠ» Šµ-Š¼ŠµŃŠ» ŠæŠ¾ŃŃŠø"
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:74
msgid "Personal Events"
msgstr "ŠŠøŃŠ½Šø Š“Š¾Š³Š°ŃŠ°ŃŠø"
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:75
msgid "Play _sounds"
msgstr "ŠŃŃŃŠ°Ń Š·Š²ŃŠŗŠ¾Š²Šµ"
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:76
msgid ""
"Pop it up\n"
"Notify me about it\n"
@@ -1937,19 +1921,19 @@
"ŠŠ±Š°Š²ŠµŃŃŠø Š¼Šµ Š¾ ŃŠ¾Š¼Šµ\n"
"ŠŃŠøŠŗŠ°Š¶Šø ŃŠ°Š¼Š¾ Ń Š»ŠøŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°"
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:79
msgid "Preferences"
msgstr "ŠŠ¾Š“ŠµŃŠ°Š²Š°ŃŠ°"
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:80
msgid "Sign _in"
msgstr "ŠŃŠøŃŠ°Š²ŃŠøŠ²Š°ŃŃ"
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:81
msgid "Sign _out"
msgstr "ŠŠ“ŃŠ°Š²ŃŠøŠ²Š°ŃŃ"
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:82
msgid ""
"Some messages may include rich content (formatting, colors etc). If checked, "
"Gajim will just display the raw message text."
@@ -1957,23 +1941,28 @@
"ŠŠµŠŗŠµ ŠæŠ¾ŃŃŠŗŠµ Š¼Š¾Š³Ń ŃŠŗŃŃŃŠøŠ²Š°ŃŠø Š±Š¾Š³Š°ŃŠø ŃŠ°Š“ŃŠ¶Š°Ń (ŃŠ¾ŃŠ¼Š°ŃŠøŃŠ°ŃŠµ, Š±Š¾ŃŠµ ŠøŃŠ“.). ŠŠŗŠ¾ ŃŠµ "
"Š¾Š·Š½Š°ŃŠµŠ½Š¾, ŠŠ°ŃŠøŠ¼ ŃŠµ ŃŠ°Š¼Š¾ ŠæŃŠøŠŗŠ°Š·ŠøŠ²Š°ŃŠø ŃŠøŃŠ¾Š²Šø ŃŠµŠŗŃŃ ŠæŠ¾ŃŃŠŗŠµ."
-#: ../data/glade/preferences_window.glade.h:86 ../src/config.py:398
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Š”Š¾ŃŃŠøŃŠ°Ń ŠŗŠ¾Š½ŃŠ°ŠŗŃŠµ ŠæŠ¾ ŃŃŠ°ŃŃŃŃ"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
msgid "Status"
msgstr "Š”ŃŠ°ŃŃŃ"
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:85
msgid "Status _iconset:"
msgstr "Š”ŠŗŃŠæ ŃŃŠ°ŃŃŃŠ½ŠøŃ
ŠøŠŗŠ¾Š½Š°:"
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:86
msgid "Style"
msgstr "Š”ŃŠøŠ»"
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:87
msgid "T_heme:"
msgstr "Š¢_ŠµŠ¼Š°:"
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:88
msgid ""
"The auto away status message. If empty, Gajim will not change the current "
"status message"
@@ -1981,7 +1970,7 @@
"ŠŃŃŠ¾ ŃŃŠ°ŃŃŃŠ½Š° ŠæŠ¾ŃŃŠŗŠ° ŠæŃŠø Š¾Š“ŃŃŃŠ½Š¾ŃŃŠø. ŠŠŗŠ¾ ŃŠµ ŠæŃŠ°Š·Š½Š¾, ŠŠ°ŃŠøŠ¼ Š½ŠµŃŠµ ŠøŠ·Š¼ŠµŠ½ŠøŃŠø "
"ŃŃŠµŠ½ŃŃŠ½Ń ŃŃŠ°ŃŃŃŠ½Ń ŠæŠ¾ŃŃŠŗŃ"
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:89
msgid ""
"The auto not available status message. If empty, Gajim will not change the "
"current status message"
@@ -1989,42 +1978,52 @@
"ŠŃŃŠ¾ ŃŃŠ°ŃŃŃŠ½Š° ŠæŠ¾ŃŃŠŗŠ° ŠæŃŠø Š½ŠµŠ“Š¾ŃŃŃŠæŠ½Š¾ŃŃŠø. ŠŠŗŠ¾ ŃŠµ ŠæŃŠ°Š·Š½Š¾, ŠŠ°ŃŠøŠ¼ Š½ŠµŃŠµ ŠøŠ·Š¼ŠµŠ½ŠøŃŠø "
"ŃŃŠµŠ½ŃŃŠ½Ń ŃŃŠ°ŃŃŃŠ½Ń ŠæŠ¾ŃŃŠŗŃ"
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:90
msgid "Use _transports icons"
msgstr "ŠŠ¾ŃŠøŃŃŠø ŠøŠŗŠ¾Š½Šµ Š·Š° _ŃŃŠ°Š½ŃŠæŠ¾ŃŃŠµ"
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:91
msgid "Use system _default"
msgstr "ŠŠ¾ŃŠøŃŃŠø ŃŠøŃŃŠµŠ¼ŃŠŗŠø ŠæŠ¾Š“ŃŠ°Š·ŃŠ¼ŠµŠ²Š°Š½Š¾"
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:92
msgid "When new event is received:"
msgstr "ŠŠ°Š“Š° ŃŠµ ŠæŃŠøŠ¼Šø Š½Š¾Š²Šø Š“Š¾Š³Š°ŃŠ°Ń:"
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:93
msgid "_Away after:"
msgstr "ŠŃŃŠ¾Š¼_Š°ŃŃŠŗŠø Š¾Š“ŃŃŃŠ°Š½ ŠæŠ¾ŃŠ»Šµ:"
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:94
msgid "_Browser:"
msgstr "_ŠŠ½ŃŠµŃŠ½ŠµŃ ŠæŃŠµŠ³Š»ŠµŠ“Š°Ń:"
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:95
msgid "_Display chat state notifications:"
msgstr "_ŠŃŠøŠŗŠ°Š·Š°Š½Š° Š¾Š±Š°Š²ŠµŃŃŠµŃŠ° Š¾ ŃŃŠ°ŃŃ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°:"
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Š”Š¼Š°ŃŠ»ŠøŃŠø:"
+
+#: ../data/glade/preferences_window.glade.h:97
msgid "_File manager:"
msgstr "_ŠŃŠµŠ³Š»ŠµŠ“Š°Ń Š“Š°ŃŠ¾ŃŠµŠŗŠ°:"
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:98
msgid "_Highlight misspelled words"
msgstr "_ŠŠ±Š¾ŃŠø ŠæŠ¾Š³ŃŠµŃŠ½Š¾ Š½Š°ŠæŠøŃŠ°Š½Šµ ŃŠµŃŠø"
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:99
msgid "_Ignore events from contacts not in the roster"
msgstr "_ŠŠ³Š½Š¾ŃŠøŃŠø Š“Š¾Š³Š°ŃŠ°ŃŠµ Š¾Š“ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° ŠŗŠ¾ŃŠø Š½ŠøŃŃ Š½Š° Š»ŠøŃŃŠø"
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "ŠŠ³Š½Š¾ŃŠøŃŠø Š±Š¾Š³Š°ŃŠ¾ ŃŠ¾ŃŠ¼Š°ŃŠøŃŠ°Š½Šø ŃŠ°Š“ŃŠ¶Š°Ń Ń ŠæŃŠøŃŃŠøŠ³Š»ŠøŠ¼ ŠæŠ¾ŃŃŠŗŠ°Š¼Š°"
+
#: ../data/glade/preferences_window.glade.h:101
msgid "_Incoming message:"
msgstr "_ŠŠ¾Š»Š°Š·Š½Š° ŠæŠ¾ŃŃŠŗŠ°:"
@@ -2058,22 +2057,28 @@
msgstr "ŠŠ¾ŃŠ°ŃŠø Š¾Š±Š°Š²ŠµŃŃŠµŃŠ° Š¾ ŃŃŠ°ŃŃ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°:"
#: ../data/glade/preferences_window.glade.h:109
-msgid "_Sort contacts by status"
-msgstr "_Š”Š¾ŃŃŠøŃŠ°Ń ŠŗŠ¾Š½ŃŠ°ŠŗŃŠµ ŠæŠ¾ ŃŃŠ°ŃŃŃŃ"
-
-#: ../data/glade/preferences_window.glade.h:110
msgid "_Status message:"
msgstr "_Š”ŃŠ°ŃŃŃŠ½Š° ŠæŠ¾ŃŃŠŗŠ°:"
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:110
msgid "_URL highlight:"
msgstr "URL Š¾ŃŠ²ŠµŃŃŠ°Š²Š°ŃŠµ:"
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:111
msgid "_Window behavior:"
msgstr "ŠŠ¾Š½Š°ŃŠ°ŃŠµ ŠæŃŠ¾Š·Š¾ŃŠ°:"
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "ŠŃŠøŠŗŃŃŃŠø ŃŠµ _Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ"
+
#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "ŠŠøŃŠµ Ń Š»ŠøŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°"
+
+#: ../data/glade/preferences_window.glade.h:114
msgid "minutes"
msgstr "Š¼ŠøŠ½ŃŃŠ°"
@@ -2121,7 +2126,7 @@
msgid "Order:"
msgstr "ŠŠ¾ŃŠµŠ“Š°Šŗ:"
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2556
msgid "Privacy List"
msgstr "ŠŠøŃŃŠ° ŠæŃŠøŠ²Š°ŃŠ½Š¾ŃŃŠø"
@@ -2325,10 +2330,8 @@
#. Remove group
#. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../src/roster_window.py:5158 ../src/roster_window.py:5615
-#: ../src/roster_window.py:5744
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5136
+#: ../src/roster_window.py:5613 ../src/roster_window.py:5742
msgid "_Remove"
msgstr "_Š£ŠŗŠ»Š¾Š½Šø"
@@ -2350,59 +2353,64 @@
#. Execute Command
#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5687
+#: ../src/roster_window.py:5685
msgid "Execute Command..."
msgstr "ŠŠ·Š²ŃŃŠø Š½Š°ŃŠµŠ“Š±Ń..."
#. Invite to
#. Invite to Groupchat
#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5077 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5054 ../src/roster_window.py:5566
msgid "In_vite to"
msgstr "ŠŠ¾Š·Š¾_Š²Šø Ń"
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Š£ŠŗŠ»Š¾Š½Šø"
+
#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:5087 ../src/roster_window.py:5653
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5651
msgid "Send Cus_tom Status"
msgstr "ŠŠ¾ŃŠ°ŃŠø ŠŗŠ¾ŃŠøŃŠ½ŠøŃŠŗŠø Š“ŠµŃŠøŠ½ŠøŃŠ°Š½ ŃŃŠ°ŃŃŃ"
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
msgid "Send Single _Message..."
msgstr "ŠŠ¾ŃŠ°ŃŠø ŃŠµŠ“Š½Ń _ŠæŠ¾ŃŃŠŗŃ..."
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
msgid "Send _File..."
msgstr "ŠŠ¾ŃŠ°ŃŠø _Š“Š°ŃŠ¾ŃŠµŠŗŃ..."
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
msgid "Set Custom _Avatar..."
msgstr "ŠŠ¾ŃŃŠ°Š²Šø ŠŗŠ¾ŃŠøŃŠ½ŠøŃŠŗŠø Š“ŠµŃŠøŠ½ŠøŃŠ°Š½ Š°Š²Š°ŃŠ°Ń..."
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
msgid "Start _Chat"
msgstr "ŠŠ°ŠæŠ¾ŃŠ½Šø ŃŠ°_Š·Š³Š¾Š²Š¾Ń"
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/roster_contact_context_menu.glade.h:14
msgid "_Allow him/her to see my status"
msgstr "_ŠŠ¾Š·Š²Š¾Š»Šø Š¼Ń/ŃŠ¾Ń Š“Š° Š²ŠøŠ“Šø Š¼Š¾Ń ŃŃŠ°ŃŃŃ"
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:5149 ../src/roster_window.py:5605
-#: ../src/roster_window.py:5734
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5127 ../src/roster_window.py:5603
+#: ../src/roster_window.py:5732
msgid "_Block"
msgstr "_ŠŠ»Š¾ŠŗŠøŃŠ°Ń"
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
msgid "_Forbid him/her to see my status"
msgstr "_ŠŠ°Š±ŃŠ°Š½Šø Š¼Ń/ŃŠ¾Ń Š“Š° Š²ŠøŠ“Šø Š¼Š¾Ń ŃŃŠ°ŃŃŃ"
-#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_contact_context_menu.glade.h:18
msgid "_Ignore"
msgstr "_ŠŠ³Š½Š¾ŃŠøŃŠø"
-#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../data/glade/roster_contact_context_menu.glade.h:19
#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
msgid "_Manage Contact"
msgstr "_Š£ŠæŃŠ°Š²ŃŠ°ŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠøŠ¼Š°"
@@ -2416,8 +2424,8 @@
msgstr "_ŠŃŠµŃŠæŠ»Š°ŃŠ°"
#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5143 ../src/roster_window.py:5599
-#: ../src/roster_window.py:5731
+#: ../src/roster_window.py:5121 ../src/roster_window.py:5597
+#: ../src/roster_window.py:5729
msgid "_Unblock"
msgstr "_ŠŠ“Š±Š»Š¾ŠŗŠøŃŠ°Ń"
@@ -2426,45 +2434,46 @@
msgstr "_ŠŠ¾Š½ŠøŃŃŠø ŠøŠ³Š½ŃŠøŃŠ°ŃŠµ"
#: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "ŠŠ°Š»Š¾_Š·Šø"
-
-#: ../data/glade/roster_window.glade.h:2
msgid "Add _Contact..."
msgstr "_ŠŠ¾Š“Š°Ń ŠŗŠ¾Š½ŃŠ°ŠŗŃ..."
-#: ../data/glade/roster_window.glade.h:3
+#: ../data/glade/roster_window.glade.h:2
msgid "Fea_tures"
msgstr "_ŠŠ¾Š³ŃŃŠ½Š¾ŃŃŠø"
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:3
msgid "File _Transfers"
msgstr "ŠŃŠµŠ½Š¾ŃŠø Š“Š°_ŃŠ¾ŃŠµŠŗŠ°"
-#: ../data/glade/roster_window.glade.h:5
+#: ../data/glade/roster_window.glade.h:4
msgid "Frequently Asked Questions (online)"
msgstr "Š§ŠµŃŃŠ¾ ŠæŠ¾ŃŃŠ°Š²ŃŠ°Š½Š° ŠæŠøŃŠ°ŃŠ° (ŠøŠ½ŃŠµŃŠ½ŠµŃ)"
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:6
msgid "Help online"
msgstr "ŠŠ¾Š¼Š¾Ń ŃŠ° ŠøŠ½ŃŠµŃŠ½ŠµŃŠ°"
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:8
msgid "Profile, A_vatar"
msgstr "ŠŃŠ¾ŃŠøŠ», Š_Š²Š°ŃŠ°Ń"
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:9
msgid "Show Trans_ports"
msgstr "ŠŃŠøŠŗŠ°Š¶Šø ŃŃŠ°Š½Ń_ŠæŠ¾ŃŃŠµ"
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:10
msgid "Show _Offline Contacts"
msgstr "ŠŃŠøŠŗŠ°Š¶Šø ŠŗŠ¾Š½ŃŠ°ŠŗŃŠµ ŠŗŠ¾ŃŠø Š½ŠøŃŃ Š½Š° Š²ŠµŠ·Šø"
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:11
msgid "Show _roster"
msgstr "_ŠŃŠøŠŗŠ°Š¶Šø Š»ŠøŃŃŃ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°"
+#: ../data/glade/roster_window.glade.h:12
+#, fuzzy
+msgid "_Accounts"
+msgstr "ŠŠ°Š»Š¾Š·Šø"
+
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
#: ../data/glade/roster_window.glade.h:13
#: ../data/glade/subscription_request_window.glade.h:6
@@ -2475,7 +2484,7 @@
msgid "_Contents"
msgstr "_Š”Š°Š“ŃŠ¶Š°Ń"
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1336
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
msgid "_Edit"
msgstr "_ŠŠ·Š¼ŠµŠ½Šø"
@@ -2516,11 +2525,11 @@
msgstr "ŠŠ¾Š“Š°Ń _ŠŗŠ¾Š½ŃŠ°ŠŗŃ"
#. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5756
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5754
msgid "_Information"
msgstr "ŠŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠµ"
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1194
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
msgid "_Search"
msgstr "_ŠŃŠµŃŃŠ°Š³Š°"
@@ -2738,13 +2747,13 @@
#. Edit Groups
#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5586
msgid "Edit _Groups"
msgstr "ŠŠ·Š¼ŠµŠ½Šø _Š³ŃŃŠæŠµ"
#. Rename
#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5714
+#: ../src/roster_window.py:5712
msgid "_Rename"
msgstr "_ŠŃŠµŠøŠ¼ŠµŠ½ŃŃ"
@@ -2846,232 +2855,336 @@
#. #!/bin/sh
#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "English"
msgstr "ŠŠ½Š³Š»ŠµŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Belarusian"
msgstr "ŠŠµŠ»Š¾ŃŃŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Bulgarian"
msgstr "ŠŃŠ³Š°ŃŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Breton"
msgstr "ŠŃŠµŃŠ°Š½ŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Czech"
msgstr "Š§ŠµŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "German"
msgstr "ŠŠµŠ¼Š°ŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Greek"
msgstr "ŠŃŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "British"
msgstr "ŠŃŠøŃŠ°Š½ŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Esperanto"
msgstr "ŠŃŠæŠµŃŠ°Š½ŃŠ¾"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Spanish"
msgstr "ŠØŠæŠ°Š½ŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Basque"
msgstr "ŠŠ°ŃŠŗŠøŃŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "French"
msgstr "Š¤ŃŠ°Š½ŃŃŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Croatian"
msgstr "Š„ŃŠ²Š°ŃŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Italian"
msgstr "ŠŃŠ°Š»ŠøŃŠ°Š½ŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Norwegian (b)"
msgstr "ŠŠ¾ŃŠ²ŠµŃŠŗŠø (Š±)"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Dutch"
msgstr "Š„Š¾Š»Š°Š½Š“ŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Norwegian"
msgstr "ŠŠ¾ŃŠ²ŠµŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Polish"
msgstr "ŠŠ¾ŃŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Portuguese"
msgstr "ŠŠ¾ŃŃŃŠ³Š°Š»ŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Brazilian Portuguese"
msgstr "ŠŃŠ°Š·ŠøŠ»ŃŠŗŠø ŠæŠ¾ŃŃŃŠ³Š°Š»ŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Russian"
msgstr "Š ŃŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Serbian"
msgstr "Š”ŃŠæŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Slovak"
msgstr "Š”Š»Š¾Š²Š°ŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Swedish"
msgstr "ŠØŠ²ŠµŠ“ŃŠŗŠø"
-#: ../src/chat_control.py:69
+#: ../src/chat_control2.py:60 ../src/chat_control.py:69
msgid "Chinese (Ch)"
msgstr "ŠŠøŠ½ŠµŃŠŗŠø (Ch)"
-#: ../src/chat_control.py:333
+#: ../src/chat_control2.py:310 ../src/chat_control.py:333
msgid "Spelling language"
msgstr "ŠŠµŠ·ŠøŠŗ Š·Š° ŠæŃŠ°Š²Š¾ŠæŠøŃ"
#. we are not connected
+#: ../src/chat_control2.py:333 ../src/chat_control2.py:549
#: ../src/chat_control.py:356 ../src/chat_control.py:549
msgid "A connection is not available"
msgstr "ŠŠµŠ·Š° Š½ŠøŃŠµ Š“Š¾ŃŃŃŠæŠ½Š°"
+#: ../src/chat_control2.py:334 ../src/chat_control2.py:550
#: ../src/chat_control.py:357 ../src/chat_control.py:550
msgid "Your message can not be sent until you are connected."
msgstr "ŠŠ°ŃŠ° ŠæŠ¾ŃŃŠŗŠ° Š½Šµ Š¼Š¾Š¶Šµ Š±ŠøŃŠø ŠæŠ¾ŃŠ»Š°ŃŠ° Š°ŠŗŠ¾ Š½ŠøŃŃŠµ ŠæŠ¾Š²ŠµŠ·Š°Š½Šø."
-#: ../src/chat_control.py:1142 ../src/chat_control.py:1534
-msgid "GPG encryption enabled"
-msgstr "GPG ŠµŠ½ŠŗŃŠøŠæŃŠøŃŠ° Š¾Š¼Š¾Š³ŃŃŠµŠ½Š°"
+#: ../src/chat_control2.py:1176 ../src/chat_control.py:1435
+#, python-format
+msgid "%(nickname)s from group chat %(room_name)s"
+msgstr "%(nickname)s ŃŠ° Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° Ń ŃŠ¾Š±Šø %(room_name)s"
+#: ../src/chat_control2.py:1257
+#, fuzzy
+msgid "OpenPGP Encryption"
+msgstr "Š£ŠŗŃŃŃŠø/ŠøŃŠŗŃŃŃŠø Open_PGP ŠµŠ½ŠŗŃŠøŠæŃŠøŃŃ"
+
+#. we talk about a contact here
+#: ../src/chat_control2.py:1271
+#, python-format
+msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgstr "%s Š½ŠøŃŠµ ŠµŠ¼ŠøŃŠ¾Š²Š°Š¾ OpenPGP ŠŗŃŃŃ, Š½ŠøŃŠø Š¼Ń ŃŠµ ŠøŃŠµŠ“Š°Š½ Š“Š¾Š“ŠµŃŠµŠ½"
+
+#: ../src/chat_control2.py:1314
+#, python-format
+msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+msgstr ""
+"ŠŠµ ŠæŠ¾ŃŃŠ¾ŃŠø ŠŗŠ¾Š¼Š°Š½Š“Š°: /%s (Š°ŠŗŠ¾ Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŠæŠ¾ŃŠ°ŃŠµŃŠµ ŃŠ¾ ŠŗŠ°Š¾ ŠæŠ¾ŃŃŠŗŃ, ŠæŃŠµŃŠøŠŗŃŠøŃŠ°ŃŃŠµ "
+"ŃŠµ ŃŠ° /say)"
+
+#: ../src/chat_control2.py:1321 ../src/chat_control.py:1646
+#: ../src/groupchat_control.py:1635
+#, python-format
+msgid "Commands: %s"
+msgstr "ŠŠ¾Š¼Š°Š½Š“Š°: %s"
+
+#: ../src/chat_control2.py:1324 ../src/chat_control.py:1649
+#: ../src/groupchat_control.py:1649
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s, ŠæŃŠ°Š·Š½Šø ŃŠµŠŗŃŃŃŠ°Š»Š½Šø ŠæŃŠ¾Š·Š¾Ń"
+
+#: ../src/chat_control2.py:1327 ../src/chat_control.py:1652
+#: ../src/groupchat_control.py:1654
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s, ŃŠ°ŠŗŃŠøŠ²Š° Š“ŃŠ³Š¼Š°Š“."
+
+#: ../src/chat_control2.py:1330
+#, fuzzy, python-format
+msgid ""
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
+msgstr ""
+"ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%(command)s <action>, ŃŠ°ŃŠµ Š°ŠŗŃŠøŃŃ ŃŃŠµŠ½ŃŃŠ½Š¾Š¼ Š³ŃŃŠæŠ½Š¾Š¼ "
+"ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ. ŠŠ¾ŃŠøŃŃŠøŃŠøŃŃŠµŃŠµ Š»ŠøŃŠµ. (Š½ŠæŃ. /%(command)s ŃŠµ ŠµŠŗŃŠæŠ»Š¾Š“ŠøŃŠ°Š¾.)"
+
+#: ../src/chat_control2.py:1334 ../src/chat_control.py:1660
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s, ŃŠ°ŃŠµ ŠæŠøŠ½Šŗ ŠŗŠ¾Š½ŃŠ°ŠŗŃŃ"
+
+#: ../src/chat_control2.py:1337 ../src/chat_control.py:1663
+#, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s, ŃŠ°ŃŠµ ŠæŠ¾ŃŃŠŗŃ ŠŗŠ¾Š½ŃŠ°ŠŗŃŃ"
+
+#: ../src/chat_control2.py:1340 ../src/chat_control.py:1666
+#: ../src/groupchat_control.py:1693
+#, python-format
+msgid "No help info for /%s"
+msgstr "ŠŠµŠ¼Š° ŠøŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠ° Š½Šø ŠæŠ¾Š¼Š¾ŃŠø Š·Š° /%s"
+
+#: ../src/chat_control2.py:1478 ../src/chat_control2.py:1504
+#, fuzzy
+msgid "Encryption enabled"
+msgstr "E2E ŠµŠ½ŠŗŃŠøŠæŃŠøŃŠ° Š¾Š¼Š¾Š³ŃŃŠµŠ½Š°"
+
+#: ../src/chat_control2.py:1483 ../src/chat_control.py:1555
+msgid "Session WILL be logged"
+msgstr "Š”ŠµŃŠøŃŠ° ŠŠ Š±ŠøŃŠø ŠæŠ°Š¼ŃŠµŠ½Š°"
+
+#: ../src/chat_control2.py:1485 ../src/chat_control.py:1557
+msgid "Session WILL NOT be logged"
+msgstr "Š”ŠµŃŠøŃŠ° ŠŠŠŠ Š±ŠøŃŠø ŠæŠ°Š¼ŃŠµŠ½Š°"
+
+#: ../src/chat_control2.py:1492 ../src/chat_control.py:1845
+#: ../src/chat_control.py:1858
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "ŠŠ¾ŃŃŠŗŠ° Š³Š»Š°ŃŠø "
+
+#: ../src/chat_control2.py:1496 ../src/chat_control2.py:1509
+#: ../src/chat_control2.py:2155
+#, fuzzy
+msgid "Encryption disabled"
+msgstr "E2E ŠµŠ½ŠŗŃŠøŠæŃŠøŃŠ° Š¾Š½ŠµŠ¼Š¾Š³ŃŃŠµŠ½Š°"
+
+#. add_to_roster_menuitem
#. Add to roster
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1164 ../src/chat_control.py:2014
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:75
-#: ../src/common/helpers.py:289 ../src/conversation_textview.py:843
-#: ../src/dialogs.py:896 ../src/gajim.py:1622 ../src/roster_window.py:926
-#: ../src/roster_window.py:1527 ../src/roster_window.py:1529
-#: ../src/roster_window.py:1869 ../src/roster_window.py:5262
-#: ../src/roster_window.py:5439
+#: ../src/chat_control2.py:1672 ../src/chat_control.py:1169
+#: ../src/chat_control.py:2033 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:75 ../src/common/helpers.py:299
+#: ../src/conversation_textview.py:844 ../src/dialogs.py:895
+#: ../src/gajim.py:1628 ../src/normal_control.py:483
+#: ../src/roster_window.py:932 ../src/roster_window.py:1532
+#: ../src/roster_window.py:1534 ../src/roster_window.py:1870
+#: ../src/roster_window.py:3097 ../src/roster_window.py:3121
+#: ../src/roster_window.py:5248 ../src/roster_window.py:5432
msgid "Not in Roster"
msgstr "ŠŠøŃŠµ Š½Š° Š»ŠøŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°"
-#: ../src/chat_control.py:1293 ../src/tooltips.py:629
+#. %s is being replaced in the code with JID
+#: ../src/chat_control2.py:1825 ../src/chat_control.py:2221
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "\"%s\" ŠŠ°Š¼ ŃŠµ ŃŠæŃŠ°Š²Š¾ ŠæŠ¾ŃŠ»Š°Š¾ ŠæŠ¾ŃŃŠŗŃ"
+
+#: ../src/chat_control2.py:1826 ../src/chat_control.py:2222
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"ŠŠŗŠ¾ Š·Š°ŃŠ²Š¾ŃŠøŃŠµ Š¾Š²Š°Ń ŃŠµŠ·ŠøŃŠ°Šŗ, Š° ŠøŃŃŠ¾ŃŠøŃŠ°Ń ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° Š½ŠøŃŠµ Š¾Š¼Š¾Š³ŃŃŠµŠ½, Š¾Š²Š° ŠæŠ¾ŃŃŠŗŠ° "
+"ŃŠµ Š±ŠøŃŠø ŠøŠ·Š³ŃŠ±ŃŠµŠ½Š°."
+
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1540
+msgid "GPG encryption enabled"
+msgstr "GPG ŠµŠ½ŠŗŃŠøŠæŃŠøŃŠ° Š¾Š¼Š¾Š³ŃŃŠµŠ½Š°"
+
+#: ../src/chat_control.py:1298 ../src/tooltips.py:627
msgid "Unknown Artist"
msgstr "ŠŠµŠæŠ¾Š·Š½Š°Ń ŠøŠ·Š²Š¾ŃŠ°Ń"
-#: ../src/chat_control.py:1295 ../src/tooltips.py:634
+#: ../src/chat_control.py:1300 ../src/tooltips.py:632
msgid "Unknown Title"
msgstr "ŠŠµŠæŠ¾Š·Š½Š°Ń Š½Š°ŃŠ»Š¾Š²"
-#: ../src/chat_control.py:1297 ../src/tooltips.py:639
+#: ../src/chat_control.py:1302 ../src/tooltips.py:637
msgid "Unknown Source"
msgstr "ŠŠµŠæŠ¾Š·Š½Š°Ń ŠøŠ·Š²Š¾Ń"
-#: ../src/chat_control.py:1301
+#: ../src/chat_control.py:1306 ../src/tooltips.py:639
#, python-format
-msgid "<b>\"%(title)s\"</b> by "
-msgstr "<b>\"%(title)s\"</b> Š¾Š“ "
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> Š¾Š“ <i>%(artist)s</i>\n"
+"ŠøŠ· <i>%(source)s</i>"
-#: ../src/chat_control.py:1308
-#, python-format
-msgid "%(title)s by %(artist)s\n"
-msgstr "%(title)s Š¾Š“ %(artist)s\n"
+#: ../src/chat_control.py:1311
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr ""
+"<b>\"%(title)s\"</b> Š¾Š“ <i>%(artist)s</i>\n"
+"ŠøŠ· <i>%(source)s</i>"
-#: ../src/chat_control.py:1435
-#, python-format
-msgid "%(nickname)s from group chat %(room_name)s"
-msgstr "%(nickname)s ŃŠ° Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° Ń ŃŠ¾Š±Šø %(room_name)s"
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1520 ../src/dialogs.py:3902
+msgid "No GPG key assigned"
+msgstr ""
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1521
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1530
msgid "GPG encryption disabled"
msgstr "GPG ŠµŠ½ŠŗŃŠøŠæŃŠøŃŠ° Š¾Š½ŠµŠ¼Š¾Š³ŃŃŠµŠ½Š°"
-#: ../src/chat_control.py:1542 ../src/chat_control.py:1796
-msgid "Session WILL NOT be logged"
-msgstr "Š”ŠµŃŠøŃŠ° ŠŠŠŠ Š±ŠøŃŠø ŠæŠ°Š¼ŃŠµŠ½Š°"
-
-#: ../src/chat_control.py:1544 ../src/chat_control.py:1794
-msgid "Session WILL be logged"
-msgstr "Š”ŠµŃŠøŃŠ° ŠŠ Š±ŠøŃŠø ŠæŠ°Š¼ŃŠµŠ½Š°"
-
#. encryption %s active
-#: ../src/chat_control.py:1562
+#: ../src/chat_control.py:1571
msgid "is"
msgstr ""
-#: ../src/chat_control.py:1562
+#: ../src/chat_control.py:1571
msgid "is NOT"
msgstr ""
#. chat session %s be logged
-#: ../src/chat_control.py:1564
+#: ../src/chat_control.py:1573
msgid "will"
msgstr ""
-#: ../src/chat_control.py:1564
+#: ../src/chat_control.py:1573
msgid "will NOT"
msgstr ""
#. About encrypted chat session
-#: ../src/chat_control.py:1568
+#: ../src/chat_control.py:1577
#, fuzzy
msgid "and authenticated"
msgstr "ŠŠ¾ŃŠøŃŃŠø Š°ŃŃŠµŠ½ŃŠøŠŗŠ°ŃŠøŃŃ"
#. About encrypted chat session
-#: ../src/chat_control.py:1572
+#: ../src/chat_control.py:1581
#, fuzzy
msgid "and NOT authenticated"
msgstr "ŠŠ¾ŃŠøŃŃŠø Š°ŃŃŠµŠ½ŃŠøŠŗŠ°ŃŠøŃŃ"
-#: ../src/chat_control.py:1575
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1587
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
"Your chat session %(logged)s be logged."
msgstr ""
-#: ../src/chat_control.py:1621
+#: ../src/chat_control.py:1635
msgid "Command not supported for zeroconf account."
msgstr "ŠŠ¾Š¼Š°Š½Š“Š° Š½ŠøŃŠµ ŠæŠ¾Š“ŃŠ¶Š°Š½Š° Š·Š° zeroconf Š½Š°Š»Š¾Š³."
-#: ../src/chat_control.py:1632 ../src/groupchat_control.py:1524
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1670
#, python-format
-msgid "Commands: %s"
-msgstr "ŠŠ¾Š¼Š°Š½Š“Š°: %s"
-
-#: ../src/chat_control.py:1635 ../src/groupchat_control.py:1538
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s, ŠæŃŠ°Š·Š½Šø ŃŠµŠŗŃŃŃŠ°Š»Š½Šø ŠæŃŠ¾Š·Š¾Ń"
-
-#: ../src/chat_control.py:1638 ../src/groupchat_control.py:1543
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s, ŃŠ°ŠŗŃŠøŠ²Š° Š“ŃŠ³Š¼Š°Š“."
-
-#: ../src/chat_control.py:1641 ../src/groupchat_control.py:1559
-#, python-format
msgid ""
"Usage: /%(command)s <action>, sends action to the current group chat. Use "
"third person. (e.g. /%(command)s explodes.)"
@@ -3079,73 +3192,55 @@
"ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%(command)s <action>, ŃŠ°ŃŠµ Š°ŠŗŃŠøŃŃ ŃŃŠµŠ½ŃŃŠ½Š¾Š¼ Š³ŃŃŠæŠ½Š¾Š¼ "
"ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ. ŠŠ¾ŃŠøŃŃŠøŃŠøŃŃŠµŃŠµ Š»ŠøŃŠµ. (Š½ŠæŃ. /%(command)s ŃŠµ ŠµŠŗŃŠæŠ»Š¾Š“ŠøŃŠ°Š¾.)"
-#: ../src/chat_control.py:1646
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s, ŃŠ°ŃŠµ ŠæŠøŠ½Šŗ ŠŗŠ¾Š½ŃŠ°ŠŗŃŃ"
+#: ../src/chat_control.py:1797
+msgid "Session negotiation cancelled"
+msgstr "Š£ŃŠæŠ¾ŃŃŠ°Š²ŃŠ°ŃŠµ ŃŠµŃŠøŃŠµ ŠæŃŠµŠŗŠøŠ½ŃŃŠ¾"
-#: ../src/chat_control.py:1649
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s, ŃŠ°ŃŠµ ŠæŠ¾ŃŃŠŗŃ ŠŗŠ¾Š½ŃŠ°ŠŗŃŃ"
+#: ../src/chat_control.py:1804
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[ŠŠ²Š° ŠæŠ¾ŃŃŠŗŠ° ŃŠµ ŃŠøŃŃŠ¾Š²Š°Š½Š°]"
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1582
-#, python-format
-msgid "No help info for /%s"
-msgstr "ŠŠµŠ¼Š° ŠøŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠ° Š½Šø ŠæŠ¾Š¼Š¾ŃŠø Š·Š° /%s"
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid " and WILL be logged"
+msgstr "Š”ŠµŃŠøŃŠ° ŠŠ Š±ŠøŃŠø ŠæŠ°Š¼ŃŠµŠ½Š°"
-#: ../src/chat_control.py:1783
-msgid "Session negotiation cancelled"
-msgstr "Š£ŃŠæŠ¾ŃŃŠ°Š²ŃŠ°ŃŠµ ŃŠµŃŠøŃŠµ ŠæŃŠµŠŗŠøŠ½ŃŃŠ¾"
+#: ../src/chat_control.py:1809
+#, fuzzy
+msgid " and WILL NOT be logged"
+msgstr "Š”ŠµŃŠøŃŠ° ŠŠŠŠ Š±ŠøŃŠø ŠæŠ°Š¼ŃŠµŠ½Š°"
-#: ../src/chat_control.py:1790
-msgid "E2E encryption enabled"
-msgstr "E2E ŠµŠ½ŠŗŃŠøŠæŃŠøŃŠ° Š¾Š¼Š¾Š³ŃŃŠµŠ½Š°"
-
-#: ../src/chat_control.py:1801
+#: ../src/chat_control.py:1814
msgid ""
"Remote contact's identity not verified. Click the shield button for more "
"details."
msgstr ""
"ŠŠ“ŠµŠ½ŃŠøŃŠµŃ Š“ŃŃŠ³Š¾Š³ ŠŗŠ¾ŃŠøŃŠ½ŠøŠŗŠ° Š½ŠøŃŠµ ŠæŠ¾ŃŠ²ŃŃŠµŠ½. ŠŠ»ŠøŠŗŠ½ŠøŃŠµ Š½Š° ŃŃŠøŃ Š·Š° Š²ŠøŃŠµ Š“ŠµŃŠ°ŃŠ°."
-#: ../src/chat_control.py:1803
+#: ../src/chat_control.py:1816
msgid "E2E encryption disabled"
msgstr "E2E ŠµŠ½ŠŗŃŠøŠæŃŠøŃŠ° Š¾Š½ŠµŠ¼Š¾Š³ŃŃŠµŠ½Š°"
-#: ../src/chat_control.py:1832 ../src/chat_control.py:1839
-#: ../src/chat_control.py:1845
-msgid "The following message was "
+#: ../src/chat_control.py:1851
+#, fuzzy
+msgid "The following message was encrypted"
msgstr "ŠŠ¾ŃŃŠŗŠ° Š³Š»Š°ŃŠø "
-#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2193
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "\"%s\" ŠŠ°Š¼ ŃŠµ ŃŠæŃŠ°Š²Š¾ ŠæŠ¾ŃŠ»Š°Š¾ ŠæŠ¾ŃŃŠŗŃ"
-
-#: ../src/chat_control.py:2194
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"ŠŠŗŠ¾ Š·Š°ŃŠ²Š¾ŃŠøŃŠµ Š¾Š²Š°Ń ŃŠµŠ·ŠøŃŠ°Šŗ, Š° ŠøŃŃŠ¾ŃŠøŃŠ°Ń ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° Š½ŠøŃŠµ Š¾Š¼Š¾Š³ŃŃŠµŠ½, Š¾Š²Š° ŠæŠ¾ŃŃŠŗŠ° "
-"ŃŠµ Š±ŠøŃŠø ŠøŠ·Š³ŃŠ±ŃŠµŠ½Š°."
-
-#: ../src/chat_control.py:2345 ../src/gajim.py:170
+#: ../src/chat_control.py:2372 ../src/gajim.py:170
msgid "Database Error"
msgstr "ŠŃŠµŃŠŗŠ° ŃŠ° Š±Š°Š·Š¾Š¼ ŠæŠ¾Š“Š°ŃŠ°ŠŗŠ°"
-#: ../src/chat_control.py:2346 ../src/gajim.py:171
-#, python-format
+#: ../src/chat_control.py:2373 ../src/gajim.py:171
+#, fuzzy, python-format
msgid ""
-"The database file (%s) cannot be read. Try to repare it or remove it (all "
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
"history will be lost)."
msgstr ""
"ŠŠ°ŃŠ¾ŃŠµŠŗŠ° Š±Š°Š·Šµ ŠæŠ¾Š“Š°ŃŠ°ŠŗŠ° (%s) ŃŠµ Š½Šµ Š¼Š¾Š¶Šµ ŃŠøŃŠ°ŃŠø. ŠŠ¾ŠŗŃŃŠ°ŃŃŠµ Š“Š° ŃŠµ ŠæŠ¾ŠæŃŠ°Š²ŠøŃŠµ ŠøŠ»Šø "
"ŃŠŗŠ»Š¾Š½ŠøŃŠµ (ŠøŃŃŠ¾ŃŠøŃŠ°Ń ŠæŠ¾ŃŃŠŗŠ° ŃŠµ Š±ŠøŃŠø ŠøŠ·Š³ŃŠ±ŃŠµŠ½)."
-#: ../src/chat_control.py:2578
+#: ../src/chat_control.py:2604
#, python-format
msgid "%(name)s is now %(status)s"
msgstr "%(name)s ŃŠµ ŃŠ°Š“Š° %(status)s"
@@ -3215,40 +3310,40 @@
msgid "The status has been changed."
msgstr "Š”ŃŠ°ŃŃŃ ŃŠµ ŠæŃŠ¾Š¼ŠµŠ½ŠøŠ¾."
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
msgid "Leave Groupchats"
msgstr "ŠŠ°ŠæŃŃŃŠø Š³ŃŃŠæŠ½Šµ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠµ"
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:191
#, python-format
msgid "%(nickname)s on %(room_jid)s"
msgstr "%(nickname)s ŃŠ° Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° Ń ŃŠ¾Š±Šø %(room_jid)s"
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:195
msgid "You have not joined a groupchat."
msgstr "ŠŠæŃŠøŠ“ŃŃŠ¶ŠøŠ»Šø ŃŃŠµ ŃŠµ Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ."
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:202
msgid "Choose the groupchats you want to leave"
msgstr "ŠŠ“Š°Š±ŠµŃŠøŃŠµ Š³ŃŃŠæŠ½Šµ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠµ ŠŗŠ¾ŃŠµ Š¶ŠµŠ»ŠøŃŠµ Š“Š° Š½Š°ŠæŃŃŃŠøŃŠµ"
#. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
#: ../src/common/contacts.py:126 ../src/common/helpers.py:75
-#: ../src/roster_window.py:794 ../src/roster_window.py:1531
-#: ../src/roster_window.py:1533 ../src/roster_window.py:5047
+#: ../src/roster_window.py:800 ../src/roster_window.py:1536
+#: ../src/roster_window.py:1538 ../src/roster_window.py:5024
msgid "Groupchats"
msgstr "ŠŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾ŃŠø"
-#: ../src/common/commands.py:241
+#: ../src/common/commands.py:247
msgid "You left the following groupchats:"
msgstr "ŠŠ°ŠæŃŃŃŠøŠ»Šø ŃŃŠµ ŃŠ»ŠµŠ“ŠµŃŠµ Š³ŃŃŠæŠ½Šµ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠµ:"
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:259
msgid "Forward unread messages"
msgstr "ŠŃŠ¾ŃŠ»ŠµŠ“Šø Š½ŠµŠæŃŠ¾ŃŠøŃŠ°Š½Šµ ŠæŠ¾ŃŃŠŗŠµ"
-#: ../src/common/commands.py:273
+#: ../src/common/commands.py:279
msgid "All unread messages have been forwarded."
msgstr "Š”Š²Šµ Š½ŠµŠæŃŠ¾ŃŠøŃŠ°Š½Šµ ŠæŠ¾ŃŃŠŗŠµ ŃŃ ŠæŃŠ¾ŃŠ»ŠµŃŠµŠ½Šµ."
@@ -3291,21 +3386,21 @@
"ŠŠøŃŃŠ° (Š¾Š“Š²Š¾ŃŠµŠ½Š° Š±Š»Š°Š½ŠŗŠ¾ Š·Š½Š°ŠŗŠ¾Š²ŠøŠ¼Š°) ŃŠµŠ“Š¾Š²Š° (Š½Š°Š»Š¾Š³Š° Šø Š³ŃŃŠæŠ°) ŠŗŠ¾ŃŠø ŃŃ Š¾ŃŠ²Š¾ŃŠµŠ½Šø."
#. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/config.py:112 ../src/common/config.py:449
#: ../src/common/optparser.py:220 ../src/common/optparser.py:438
-#: ../src/common/optparser.py:472 ../src/gajim.py:3087
+#: ../src/common/optparser.py:472 ../src/gajim.py:3090
msgid "default"
msgstr "ŠæŠ¾Š“ŃŠ°Š·ŃŠ¼ŠµŠ²Š°Š½Š¾"
-#: ../src/common/config.py:115
+#: ../src/common/config.py:116
msgid "Enable link-local/zeroconf messaging"
msgstr "ŠŠ¼Š¾Š³ŃŃŠø Š»Š¾ŠŗŠ°Š»Š½Ń Š²ŠµŠ·Ń/zeroconf ŠæŠ¾ŃŃŠŗŠµ"
-#: ../src/common/config.py:118
+#: ../src/common/config.py:119
msgid "Language used by speller"
msgstr "ŠŠµŠ·ŠøŠŗ ŠŗŠ¾ŃŠø ŠŗŠ¾ŃŠøŃŃŠø ŠæŃŠ°Š²Š¾ŠæŠøŃ"
-#: ../src/common/config.py:119
+#: ../src/common/config.py:120
msgid ""
"'always' - print time for every message.\n"
"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3315,7 +3410,7 @@
"'ŠæŠ¾Š½ŠµŠŗŠ°Š“' - ŠøŃŠæŠøŃŃŃ Š²ŃŠµŠ¼Šµ ŃŠ²Š°ŠŗŠøŃ
print_ichat_every_foo_minutes Š¼ŠøŠ½ŃŃŠ°.\n"
"'Š½ŠøŠŗŠ°Š“' - Š½ŠøŠŗŠ°Š“ Š½Šµ ŠøŃŠæŠøŃŃŃ Š²ŃŠµŠ¼Šµ."
-#: ../src/common/config.py:120
+#: ../src/common/config.py:121
msgid ""
"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3326,18 +3421,18 @@
"Š½Š°ŃŠ½ŠµŠæŃŠµŃŠøŠ·Š½ŠøŃŠø. ŠŠ²Š¾ ŃŠµ ŠŗŠ¾ŃŠøŃŃŠø ŃŠ°Š¼Š¾ ŃŠŗŠ¾Š»ŠøŠŗŠ¾ ŃŠµ ŠæŃŠøŠŗŠ°Š·ŠøŠ²Š°ŃŠµ_Š²ŃŠµŠ¼ŠµŠ½Š° "
"ŠæŠ¾ŃŃŠ°Š²ŃŠµŠ½Š¾ Š½Š° 'ŠæŠ¾Š½ŠµŠŗŠ°Š“'."
-#: ../src/common/config.py:123
+#: ../src/common/config.py:124
msgid "Treat * / _ pairs as possible formatting characters."
msgstr "Š”Š¼Š°ŃŃŠ°Ń * / _ ŠæŠ°ŃŠ¾Š²Šµ ŠŗŠ°Š¾ Š·Š½Š°ŠŗŠ¾Š²Šµ Š·Š° ŃŠ¾ŃŠ¼Š°ŃŠøŃŠ°ŃŠµ."
-#: ../src/common/config.py:124
+#: ../src/common/config.py:125
msgid ""
"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
msgstr ""
"ŠŠŗŠ¾ ŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, Š½Šµ ŃŠŗŠ»Š°ŃŠ°Ń */_ . Š¢Š°ŠŗŠ¾ ŃŠµ *Š°Š±Š²* Š±ŠøŃŠø ŠæŠ¾Š“ŠµŠ±ŃŠ°Š½Š¾, Š°Š»Šø "
"ŠøŠ¾ŠŗŃŃŠ¶ŠµŠ½Š¾ ŃŠ° * *."
-#: ../src/common/config.py:127
+#: ../src/common/config.py:128
msgid ""
"Uses ReStructured text markup to send HTML, plus ascii formatting if "
"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3348,7 +3443,7 @@
"ref/rst/restructuredtext.html (ŠŠŗŠ¾ Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŠŗŠ¾ŃŠøŃŃŠøŃŠµ Š¾Š²Š¾, ŠøŠ½ŃŃŠ°Š»ŠøŃŠ°ŃŃŠµ "
"docutils)"
-#: ../src/common/config.py:136
+#: ../src/common/config.py:137
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -3356,7 +3451,7 @@
"ŠŠ°ŃŠ°ŠŗŃŠµŃ Š·Š° Š“Š¾Š“Š°Š²Š°ŃŠµ ŠæŠ¾ŃŠ»Šµ Š½Š°Š“ŠøŠ¼ŠŗŠ° ŠŗŠ°Š“Š° ŃŠµ ŠŗŠ¾ŃŠøŃŃŠø Š“Š¾Š²ŃŃŠ°Š²Š°ŃŠµ Š½Š°Š“ŠøŠ¼ŠŗŠ° "
"(ŃŠ°ŃŃŠµŃŠ¾Š¼ tab) Ń Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ"
-#: ../src/common/config.py:137
+#: ../src/common/config.py:138
msgid ""
"Character to propose to add after desired nickname when desired nickname is "
"used by someone else in group chat."
@@ -3364,7 +3459,7 @@
"ŠŠ°ŃŠ°ŠŗŃŠµŃ ŠŗŠ¾ŃŠø Š¶ŠµŠ»ŠøŃŠµ Š“Š¾Š“Š°ŃŠø ŠæŠ¾ŃŠ»Šµ Š¶ŠµŃŠµŠ½Š¾Š³ Š½Š°Š“ŠøŠ¼ŠŗŠ° ŃŠŗŠ¾Š»ŠøŠŗŠ¾ ŃŠµ Š¶ŠµŃŠµŠ½Šø Š½Š°Š“ŠøŠ¼Š°Šŗ "
"Ń Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ Š²ŠµŃ ŃŠæŠ¾ŃŃŠµŠ±ŃŠµŠ½"
-#: ../src/common/config.py:160
+#: ../src/common/config.py:161
msgid ""
"This option let you customize timestamp that is printed in conversation. For "
"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3375,23 +3470,23 @@
"Š“Š¾ŠŗŃŠ¼ŠµŠ½ŃŠ°ŃŠøŃŃ Š·Š° strftime, Š·Š° ŠæŃŠ½Ń Š“Š¾ŠŗŃŠ¼ŠµŠ½ŃŠ°ŃŠøŃŃ: http://docs.python.org/lib/"
"module-time.html"
-#: ../src/common/config.py:161
+#: ../src/common/config.py:162
msgid "Characters that are printed before the nickname in conversations"
msgstr "ŠŠ°ŃŠ°ŠŗŃŠµŃŠø ŠŗŠ¾ŃŠø ŃŠµ Š±ŠøŃŠø ŠæŃŠøŠŗŠ°Š·Š°Š½Šø ŠæŃŠµ Š½Š°Š“ŠøŠ¼ŠŗŠ° Ń ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ"
-#: ../src/common/config.py:162
+#: ../src/common/config.py:163
msgid "Characters that are printed after the nickname in conversations"
msgstr "ŠŠ°ŃŠ°ŠŗŃŠµŃŠø ŠŗŠ¾ŃŠø ŃŠµ Š±ŠøŃŠø ŠæŃŠøŠŗŠ°Š·Š°Š½Šø ŠæŠ¾ŃŠ»Šµ Š½Š°Š“ŠøŠ¼ŠŗŠ° Ń ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ"
-#: ../src/common/config.py:164
+#: ../src/common/config.py:165
msgid "The username used to identify the Last.fm account."
msgstr "ŠŠ¾ŃŠøŃŠ½ŠøŃŠŗŠ¾ ŠøŠ¼Šµ Š·Š° Last.fm Š½Š°Š»Š¾Š³."
-#: ../src/common/config.py:168
+#: ../src/common/config.py:169
msgid "Add * and [n] in roster title?"
msgstr "ŠŠ¾Š“Š°Ń * Šø [n] Ń Š½Š°ŃŠ»Š¾Š² Š»ŠøŃŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°?"
-#: ../src/common/config.py:169
+#: ../src/common/config.py:170
msgid ""
"How many lines to remember from previous conversation when a chat tab/window "
"is reopened."
@@ -3399,11 +3494,11 @@
"ŠŠ¾Š»ŠøŠŗŠ¾ Š»ŠøŠ½ŠøŃŠ° ŠæŃŠµŃŃ
Š¾Š“Š½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° ŠæŠ°Š¼ŃŠøŃŠø ŠŗŠ°Š“Š° ŃŠµ ŠæŃŠ¾Š·Š¾Ń/ŃŠµŠ·ŠøŃŠ°Šŗ Š·Š° "
"ŃŠ°Š·Š³Š¾Š²Š¾Ń ŠæŠ¾Š½Š¾Š²Š¾ Š¾ŃŠ²Š¾ŃŠø."
-#: ../src/common/config.py:170
+#: ../src/common/config.py:171
msgid "How many minutes should last lines from previous conversation last."
msgstr "ŠŠ¾Š»ŠøŠŗŠ¾ Š¼ŠøŠ½ŃŃŠ° Š“Š° ŃŃŠ°ŃŃ Š»ŠøŠ½ŠøŃŠµ ŠæŃŠµŃŃ
Š¾Š“Š½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°."
-#: ../src/common/config.py:171
+#: ../src/common/config.py:172
msgid ""
"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
"Client default behaviour)."
@@ -3411,11 +3506,11 @@
"ŠŠ¾ŃŠ°ŃŠø ŠæŠ¾ŃŃŠŗŃ ŃŠ° Ctrl+Enter, Š° ŃŠ° Enter ŠæŃŠ°Š²Šø Š½Š¾Š²Ń Š»ŠøŠ½ŠøŃŃ. (ŠŠ¾Š“ŃŠ°Š·ŃŠ¼ŠµŠ²Š°Š½Š¾ "
"ŠæŠ¾Š½Š°ŃŠ°ŃŠµ ŠŠøŃŠ°Š»Š°Š±ŠøŃŠ¾Š²Š¾Š³ ICQ ŠŗŠ»ŠøŃŠµŠ½ŃŠ°)"
-#: ../src/common/config.py:173
+#: ../src/common/config.py:174
msgid "How many lines to store for Ctrl+KeyUP."
msgstr "ŠŠ¾Š»ŠøŠŗŠ¾ Š»ŠøŠ½ŠøŃŠ° ŃŠ°ŃŃŠ²Š°ŃŠø ŃŠ° Ctrl+KeyUP"
-#: ../src/common/config.py:176
+#: ../src/common/config.py:177
#, python-format
msgid ""
"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3424,11 +3519,11 @@
"ŠŠ»Šø ŠŠ°Ń ŃŠæŠµŃŠøŃŠøŃŠøŃŠ°Š½Šø Š£Š Š ŃŠ° %s Ń ŃŠµŠ¼Ń Š³Š“Šµ ŃŠµ %s ŃŠµŃ ŠøŠ»Šø ŃŃŠ°Š·Š° ŠøŠ»Šø 'ŠŠŠŠ-"
"Š ŠŠ§ŠŠŠ' ŃŃŠ¾ Š·Š½Š°ŃŠø ŠŗŠ¾ŃŠøŃŃŠµŃŠµ Š²ŠøŠŗŠø-ŃŠµŃŠ½ŠøŠŗŠ°."
-#: ../src/common/config.py:179
+#: ../src/common/config.py:180
msgid "If checked, Gajim can be controlled remotely using gajim-remote."
msgstr "ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š¾, ŠŠ°ŃŠøŠ¼ ŃŠµ Š¼Š¾Š¶Šµ ŠŗŠ¾Š½ŃŃŠ¾Š»ŠøŃŠ°ŃŠø ŠŗŠ¾ŃŠøŃŃŠµŃŠµŠ¼ gajim-remote."
-#: ../src/common/config.py:180
+#: ../src/common/config.py:181
msgid ""
"If True, listen to D-Bus signals from NetworkManager and change the status "
"of accounts (provided they do not have listen_to_network_manager set to "
@@ -3439,14 +3534,14 @@
"ŃŠ°ŃŃŠ½Š° (Š°ŠŗŠ¾ Š½ŠµŠ¼Š°ŃŃ listen_to_network_manager ŠæŠ¾ŃŃŠ°Š²ŃŠµŠ½ Š½Š° Š½ŠµŠøŃŃŠøŠ½ŠøŃŠ¾ Šø "
"ŃŠøŠ½Ń
ŃŠ¾Š½ŠøŠ·ŃŃ ŃŠ° Š³Š»Š¾Š±Š°Š»Š½ŠøŠ¼ ŃŃŠ°ŃŃŃŠ¾Š¼) Ń Š·Š°Š²ŠøŃŠ½Š¾ŃŃŠø Š¾Š“ ŃŃŠ°ŃŃŃŠ° Š¼ŃŠµŠ¶Š½Šµ ŠŗŠ¾Š½ŠµŠŗŃŠøŃŠµ."
-#: ../src/common/config.py:181
+#: ../src/common/config.py:182
msgid ""
"Sent chat state notifications. Can be one of all, composing_only, disabled."
msgstr ""
"ŠŠ¾ŃŠ»Š°ŃŠ° Š¾Š±Š°Š²ŠµŃŃŠµŃŠ° Š¾ ŃŃŠ°ŃŃ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°. ŠŠ¾Š¶Šµ Š±ŠøŃŠø ŃŠµŠ“Š½Š¾ Š¾Š“ "
"'ŃŠ²Šø','ŃŠ°Š¼Š¾_ŃŠ°ŃŃŠ°Š²ŃŠ°ŃŠµ', 'Š¾Š½ŠµŠ¼Š¾Š³ŃŃŠµŠ½Š¾'."
-#: ../src/common/config.py:182
+#: ../src/common/config.py:183
msgid ""
"Displayed chat state notifications in chat windows. Can be one of all, "
"composing_only, disabled."
@@ -3454,7 +3549,7 @@
"ŠŃŠøŠŗŠ°Š·Š°Š½Š° Š¾Š±Š°Š²ŠµŃŃŠµŃŠ° Š¾ ŃŃŠ°ŃŃ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° Ń ŠæŃŠ¾Š·Š¾ŃŃ Š·Š° ŃŠ°Š·Š³Š¾Š²Š¾Ń. ŠŠ¾Š¶Šµ Š±ŠøŃŠø "
"ŃŠµŠ“Š½Š¾ Š¾Š“ 'ŃŠ²Šø', 'ŃŠ°Š¼Š¾_ŃŠ°ŃŃŠ°Š²ŃŠ°ŃŠµ', 'Š¾Š½ŠµŠ¼Š¾Š³ŃŃŠµŠ½Š¾'."
-#: ../src/common/config.py:184
+#: ../src/common/config.py:185
msgid ""
"When not printing time for every message (print_time==sometimes), print it "
"every x minutes."
@@ -3462,11 +3557,11 @@
"ŠŠŗŠ¾ ŃŠµ Š½Šµ ŠøŃŠæŠøŃŃŃŠµ Š²ŃŠµŠ¼Šµ Š·Š° ŃŠ²Š°ŠŗŃ ŠæŠ¾ŃŃŠŗŃ (print_time==ŠæŠ¾Š½ŠµŠŗŠ°Š“), ŠøŃŠæŠøŃŠ°ŃŠø Š³Š° "
"ŃŠ²Š°ŠŗŠøŃ
x Š¼ŠøŠ½ŃŃŠ°"
-#: ../src/common/config.py:185
+#: ../src/common/config.py:186
msgid "Ask before closing a group chat tab/window."
msgstr "ŠŠøŃŠ°Ń ŠæŃŠµ Š·Š°ŃŠ²Š°ŃŠ°ŃŠ° ŠæŃŠ¾Š·Š¾ŃŠ°/ŃŠµŠ·ŠøŃŠŗŠ° Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°."
-#: ../src/common/config.py:186
+#: ../src/common/config.py:187
msgid ""
"Always ask before closing group chat tab/window in this space separated list "
"of group chat jids."
@@ -3474,7 +3569,7 @@
"Š£Š²ŠµŠŗ ŠæŠøŃŠ°Ń ŠæŃŠµ Š·Š°ŃŠ²Š°ŃŠ°ŃŠ° ŃŠµŠ·ŠøŃŠŗŠ°/ŠæŃŠ¾Š·Š¾ŃŠ° ŠŗŠ°Š“Š° ŃŠµ Ń ŠæŠøŃŠ°ŃŃ Š¾Š²Š° Š»ŠøŃŃŠ° Š¾Š“Š²Š¾ŃŠµŠ½Š° "
"Š±Š»Š°Š½ŠŗŠ¾ ŠŗŠ°ŃŠ°ŠŗŃŠµŃŠøŠ¼Š° ŃŠ°Š±ŠµŃ ŠŠ-Š¾Š²Š° Š³ŃŃŠæŠ½ŠøŃ
ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°."
-#: ../src/common/config.py:187
+#: ../src/common/config.py:188
msgid ""
"Never ask before closing group chat tab/window in this space separated list "
"of group chat jids."
@@ -3482,7 +3577,7 @@
"ŠŠøŠŗŠ°Š“ Š½Šµ ŠæŠøŃŠ°Ń ŠæŃŠµ Š·Š°ŃŠ²Š°ŃŠ°ŃŠ° ŃŠµŠ·ŠøŃŠŗŠ°/ŠæŃŠ¾Š·Š¾ŃŠ° Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° ŠŗŠ°Š“Š° ŃŠµ Ń "
"ŠæŠøŃŠ°ŃŃ Š¾Š²Š° Š»ŠøŃŃŠ°Š¾Š“Š¾Š²Š¾ŃŠµŠ½Š° Š±Š»Š°Š½ŠŗŠ¾ Š·Š½Š°ŃŠøŠ¼Š° ŃŠ°Š±ŠµŃ ŠŠ-Š¾Š²Š° Š³ŃŃŠæŠ½ŠøŃ
ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°."
-#: ../src/common/config.py:190
+#: ../src/common/config.py:191
msgid ""
"Comma separated list of hosts that we send, in addition of local interfaces, "
"for File Transfer in case of address translation/port forwarding."
@@ -3490,27 +3585,27 @@
"ŠŠøŃŃŠ° Ń
Š¾ŃŃŠ¾Š²Š° Š¾Š“Š²Š¾ŃŠµŠ½Š° Š·Š°ŃŠµŠ·ŠøŠ¼Š°, ŠŗŠ¾ŃŃ ŃŠ°ŃŠµŠ¼Š¾, ŃŠ· Š»Š¾ŠŗŠ°Š»Š½Šµ ŠøŠ½ŃŠµŃŠµŃŠµŃŃŠµ, Š·Š° "
"ŃŃŠ°Š½ŃŃŠµŃ Š“Š°ŃŠ¾ŃŠµŠŗŠ°, Ń ŃŠ»ŃŃŠ°ŃŃ ŠæŃŠ¾ŃŠ»ŠµŃŠøŠ²Š°ŃŠ° ŠæŠ¾ŃŃŠ°/ŠŠŠ¢Š¾Š²Š°ŃŠ°."
-#: ../src/common/config.py:192
+#: ../src/common/config.py:193
msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
msgstr "IEC ŃŃŠ°Š½Š“Š°ŃŠ“ Š“ŠµŃŠøŠ½ŠøŃŠµ ŠiŠ = 1024 Š±Š°ŃŃŠ¾Š²Š°, ŠŠ = 1000 Š±Š°ŃŃŠ¾Š²Š°"
-#: ../src/common/config.py:194
+#: ../src/common/config.py:195
msgid "Notify of events in the system trayicon."
msgstr "ŠŠ±Š°Š²ŠµŃŃŠø Š¼Šµ Š¾ ŃŠ²ŠøŠ¼ Š“Š¾Š³Š°ŃŠ°ŃŠøŠ¼Š° Ń ŠøŠŗŠ¾Š½Šø ŃŠøŃŃŠµŠ¼ŃŠŗŠµ ŠŗŠ°ŃŠµŃŠµ."
-#: ../src/common/config.py:200
+#: ../src/common/config.py:201
msgid "Show tab when only one conversation?"
msgstr "ŠŃŠøŠŗŠ°Š¶Šø ŃŠµŠ·ŠøŃŠ°Šŗ ŠøŠ°ŠŗŠ¾ ŃŠµ ŃŠ°Š¼Š¾ ŃŠµŠ“Š°Š½ ŃŠ°Š·Š³Š¾Š²Š¾Ń?"
-#: ../src/common/config.py:201
+#: ../src/common/config.py:202
msgid "Show tabbed notebook border in chat windows?"
msgstr "ŠŃŠøŠŗŠ°ŃŠø Š³ŃŠ°Š½ŠøŃŃ ŃŠ²ŠµŃŠŗŠµ Ń ŠæŃŠ¾Š·Š¾ŃŠøŠ¼Š° ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°?"
-#: ../src/common/config.py:202
+#: ../src/common/config.py:203
msgid "Show close button in tab?"
msgstr "ŠŃŠøŠŗŠ°ŃŠø Š“ŃŠ³Š¼Šµ Š·Š° Š·Š°ŃŠ²Š°ŃŠ°ŃŠµ Ń ŃŠµŠ·ŠøŃŠŗŃ?"
-#: ../src/common/config.py:203
+#: ../src/common/config.py:204
msgid ""
"When negotiating an encrypted session, should Gajim assume you want your "
"messages to be logged?"
@@ -3518,7 +3613,7 @@
"ŠŠ°Š“Š° ŃŠµ ŃŃŠæŠ¾ŃŃŠ°Š²ŃŠ° ŃŠøŃŃŠ¾Š²Š°Š½Š° ŃŠµŃŠøŃŠ°, Š“Š° Š»Šø ŠŠ°ŃŠøŠ¼ ŃŃŠµŠ±Š° Š“Š° ŠæŃŠµŃŠæŠ¾ŃŃŠ°Š²Šø Š“Š° "
"Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŃŃŠ²Š°ŃŠµ ŠæŠ¾ŃŃŠŗŠµ Ń Š“Š½ŠµŠ²Š½ŠøŠŗŃ?"
-#: ../src/common/config.py:204
+#: ../src/common/config.py:205
msgid ""
"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3529,18 +3624,18 @@
"ŠæŃŠøŠ¾ŃŠøŃŠµŃ, Š¾Š“Š²Š¾ŃŠµŠ½Šø Š·Š°ŃŠµŠ·ŠøŠ¼Š°. ŠŠ°Š»ŠøŠ“Š½Šµ Š³ŃŃŠæŠµ ŃŃ 1, 2, 5, 14, 15, 16, 17 Šø 18. "
"ŠŠøŃŃŠø Š±ŃŠ¾ŃŠµŠ²Šø ŃŃ ŃŃŠ³ŃŃŠ½ŠøŃŠø, Š°Š»Šø ŃŠ°Š“Š° ŃŃŠµŠ±Š° Š²ŠøŃŠµ Š²ŃŠµŠ¼ŠµŠ½Š° Š·Š° ŠæŠ¾ŃŠµŃŠ°Šŗ ŃŠµŃŠøŃŠµ."
-#: ../src/common/config.py:213
+#: ../src/common/config.py:214
msgid "Preview new messages in notification popup?"
msgstr "ŠŃŠµŠ³Š»ŠµŠ“Š°Ń Š½Š¾Š²Šµ ŠæŠ¾ŃŃŠŗŠµ Ń ŠøŃŠŗŠ°ŃŃŃŠøŠ¼ Š¾Š±Š°Š²ŠµŃŃŠµŃŠøŠ¼Š°?"
-#: ../src/common/config.py:218
+#: ../src/common/config.py:219
msgid ""
"A semicolon-separated list of words that will be highlighted in group chats."
msgstr ""
"ŠŠøŃŃŠ° ŃŠµŃŠø Š¾Š“Š²Š¾ŃŠµŠ½Š° Š±Š»Š°Š½ŠŗŠ¾ ŠŗŠ°ŃŠ°ŠŗŃŠµŃŠøŠ¼Š° ŠŗŠ¾ŃŠµ ŃŠµ Š±ŠøŃŠø Š¾Š±Š¾ŃŠµŠ½Šµ Ń Š³ŃŃŠæŠ½ŠøŠ¼ "
"ŃŠ°Š·Š³Š¾Š²Š¾ŃŠøŠ¼Š°"
-#: ../src/common/config.py:219
+#: ../src/common/config.py:220
msgid ""
"If True, quits Gajim when X button of Window Manager is clicked. This "
"setting is taken into account only if trayicon is used."
@@ -3548,14 +3643,14 @@
"ŠŠŗŠ¾ ŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, ŠŠ°ŃŠøŠ¼ ŃŠµ Š·Š°Š²ŃŃŠ°Š²Š° ŠŗŠ°Š“Š° ŃŠµ ŠæŃŠøŃŠøŃŠ½Šµ X Š“ŃŠ³Š¼Šµ. ŠŠ²Š¾ ŠæŠ¾Š“ŠµŃŠ°Š²Š°ŃŠµ "
"ŃŠµ ŠŗŠ¾ŃŠøŃŃŠø ŃŠ°Š¼Š¾ Š°ŠŗŠ¾ ŃŠµ ŠøŠŗŠ¾Š½Š° ŃŠøŃŃŠµŠ¼ŃŠŗŠµ ŠŗŠ°ŃŠµŃŠµ Ń ŃŠæŠ¾ŃŃŠµŠ±Šø."
-#: ../src/common/config.py:220
+#: ../src/common/config.py:221
msgid ""
"If True, Gajim will check if it's the default jabber client on each startup."
msgstr ""
"ŠŠŗŠ¾ ŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, ŠŠ°ŃŠøŠ¼ ŠæŃŠ¾Š²ŠµŃŠ°Š²Š° Š“Š° Š»Šø ŃŠµ ŠæŠ¾Š“ŃŠ°Š·ŃŠ¼ŠµŠ²Š°Š½Šø ŃŠ°Š±ŠµŃ ŠŗŠ»ŠøŃŠµŠ½Ń Š½Š° "
"ŃŠ²Š°ŠŗŠ¾Š¼ ŃŃŠ°ŃŃŠ¾Š²Š°ŃŃ."
-#: ../src/common/config.py:221
+#: ../src/common/config.py:222
msgid ""
"If True, Gajim will display an icon on each tab containing unread messages. "
"Depending on the theme, this icon may be animated."
@@ -3563,7 +3658,7 @@
"ŠŠŗŠ¾ ŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠæŃŠøŠŗŠ°Š·ŠøŠ²Š°ŃŠø ŠøŠŗŠ¾Š½Ń Š½Š° ŃŠ²Š°ŠŗŠ¾Š¼ ŃŠµŠ·ŠøŃŠŗŃ ŠŗŠ¾ŃŠø ŃŠ°Š“ŃŠ¶Šø "
"Š½ŠµŠæŃŠ¾ŃŠøŃŠ°Š½Šµ ŠæŠ¾ŃŃŠŗŠµ. Š£ Š·Š°Š²ŠøŃŠ½Š¾ŃŃŠø Š¾Š“ ŃŠµŠ¼Šµ, ŠøŠŗŠ¾Š½Š° Š¼Š¾Š¶Šµ Š±ŠøŃŠø Šø Š°Š½ŠøŠ¼ŠøŃŠ°Š½Š°."
-#: ../src/common/config.py:222
+#: ../src/common/config.py:223
msgid ""
"If True, Gajim will display the status message, if not empty, for every "
"contact under the contact name in roster window."
@@ -3571,12 +3666,12 @@
"ŠŠŗŠ¾ ŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠæŃŠøŠŗŠ°Š·ŠøŠ²Š°ŃŠø ŃŃŠ°ŃŃŃŠ½Ń ŠæŠ¾ŃŃŠŗŃ (Š°ŠŗŠ¾ Š½ŠøŃŠµ ŠæŃŠ°Š·Š½Š°) Š·Š° "
"ŃŠ²Š°ŠŗŠø ŠŗŠ¾Š½ŃŠ°ŠŗŃ Ń Š»ŠøŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°"
-#: ../src/common/config.py:227
+#: ../src/common/config.py:228
msgid "Define the position of the avatar in roster. Can be left or right"
msgstr ""
"ŠŠµŃŠøŠ½ŠøŃŠøŃŠµ ŠæŠ¾Š·ŠøŃŠøŃŃ Š°Š²Š°ŃŠ°ŃŠ° Ń Š»ŠøŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°. ŠŠ¾Š¶Šµ Š±ŠøŃŠø Š»ŠµŠ²Š¾ ŠøŠ»Šø Š“ŠµŃŠ½Š¾"
-#: ../src/common/config.py:228
+#: ../src/common/config.py:229
msgid ""
"If True, Gajim will ask for avatar each contact that did not have an avatar "
"last time or has one cached that is too old."
@@ -3584,7 +3679,7 @@
"ŠŠŗŠ¾ ŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠæŠ¾ŃŠ»Š°ŃŠø ŃŠæŠøŃ Š·Š° Š°Š²Š°ŃŠ°Ń Š·Š° ŃŠ²Š°ŠŗŠø ŠŗŠ¾Š½ŃŠ°ŠŗŃ ŠŗŠ¾ŃŠø "
"ŠæŃŠ¾ŃŠ»Š¾Š³ ŠæŃŃŠ° Š½ŠøŃŠµ ŠøŠ¼Š°Š¾ Š°Š²Š°ŃŠ°Ń ŠøŠ»Šø ŃŠµ Š¾Š½Š°Ń Ń Š¼ŠµŠ¼Š¾ŃŠøŃŠø ŠæŃŠµŃŃŠ°Ń"
-#: ../src/common/config.py:229
+#: ../src/common/config.py:230
msgid ""
"If False, Gajim will no longer print status line in chats when a contact "
"changes his or her status and/or his or her status message."
@@ -3592,7 +3687,7 @@
"ŠŠŗŠ¾ ŃŠµ Š½ŠµŠøŃŃŠøŠ½ŠøŃŠ¾, Š²ŠøŃŠµ Š½ŠµŃŠµŃŠµ Š²ŠøŠ“ŠµŃŠø ŃŃŠ°ŃŃŃŠ½Ń ŠæŠ¾ŃŃŠŗŃŃ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠøŠ¼Š° ŠŗŠ°Š“Š° "
"ŠŗŠ¾Š½ŃŠ°ŠŗŃ ŠæŃŠ¾Š¼ŠµŠ½Šø ŃŠ²Š¾Ń ŃŃŠ°ŃŃŃ Šø/ŠøŠ»Šø ŃŃŠ°ŃŃŃŠ½Ń ŠæŠ¾ŃŃŠŗŃ."
-#: ../src/common/config.py:230
+#: ../src/common/config.py:231
msgid ""
"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
"longer print status line in groupchats when a member changes his or her "
@@ -3606,30 +3701,30 @@
"ŃŠ²Šµ ŃŃŠ°ŃŃŃŠ½Šµ ŠæŠ¾ŃŃŠŗŠµ. ŠŠŗŠ¾ ŃŠµ \"in_and_out\". ŠŠ°ŃŠøŠ¼ ŃŠµ ŠæŃŠøŠŗŠ°Š·ŠøŠ²Š°ŃŠø ŃŠ°Š¼Š¾ ŠæŠ¾ŃŃŠŗŠµ "
"ŃŠøŠæŠ° ŃŠ°Ń Šø ŃŠ°Ń ŃŠµ ŃŃŠ°Š¾/ŠøŠ·Š°ŃŠ°Š¾ Ń/ŠøŠ· ŃŠ¾Š±Šµ."
-#: ../src/common/config.py:232
+#: ../src/common/config.py:233
msgid "Background color of contacts when they just signed in."
msgstr "ŠŠ¾ŃŠ° ŠæŠ¾Š·Š°Š“ŠøŠ½Šµ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° ŠŗŠ°Š“Š° ŃŠµŠŗ Š“Š¾ŃŃ Š½Š° Š²ŠµŠ·Ń."
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
msgid "Background color of contacts when they just signed out."
msgstr "ŠŠ¾ŃŠ° ŠæŠ¾Š·Š°Š“ŠøŠ½Šµ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° ŠŗŠ°Š“Š° ŃŠµŠŗ Š¾Š“Ń ŃŠ° Š²ŠµŠ·Šµ."
-#: ../src/common/config.py:235
+#: ../src/common/config.py:236
msgid ""
"If True, restored messages will use a smaller font than the default one."
msgstr ""
"ŠŠŗŠ¾ ŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, Š²ŃŠ°ŃŠµŠ½Šµ ŠæŠ¾ŃŃŠŗŠµ ŠøŠ· ŠøŃŃŠ¾ŃŠøŃŠ°ŃŠ° ŃŠµ Š±ŠøŃŠø Š¼Š°ŃŠµŠ³ ŃŠ¾Š½ŃŠ° Š¾Š“ "
"ŠæŠ¾Š“ŃŠ°Š·ŃŠ¼ŠµŠ²Š°Š½Š¾Š³."
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
msgid "Don't show avatar for the transport itself."
msgstr "ŠŠµ ŠæŃŠøŠŗŠ°Š·ŃŃ Š°Š²Š°ŃŠ°Ń Š·Š° ŃŠ°Š¼ ŃŃŠ°Š½ŃŠæŠ¾ŃŃ."
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
msgid "Don't show roster in the system taskbar."
msgstr "ŠŠµ ŠæŃŠøŠŗŠ°Š·ŃŃ Š»ŠøŃŃŃ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° Ń ŃŠøŃŃŠµŠ¼ŃŠŗŠ¾Ń ŠŗŠ°ŃŠµŃŠø."
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
msgid ""
"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
"window flash (the default behaviour in most Window Managers) when holding "
@@ -3639,7 +3734,7 @@
"ŠæŃŠ¾Š·Š¾Ń Š±ŃŠµŃŠŗŠ° (ŠæŠ¾Š“ŃŠ°Š·ŃŠ¼ŠµŠ²Š°Š½Š¾ ŠæŠ¾Š½Š°ŃŠ°ŃŠµ Ń Š²ŠµŃŠøŠ½Šø Š¼ŠµŠ½Š°ŃŠµŃŠ° ŠæŃŠ¾Š·Š¾ŃŠ°) ŠæŃŠø Š½Š¾Š²ŠøŠ¼ "
"Š“Š¾Š³Š°ŃŠ°ŃŠøŠ¼Š°."
-#: ../src/common/config.py:240
+#: ../src/common/config.py:241
msgid ""
"Jabberd1.4 does not like sha info when one join a password protected group "
"chat. Turn this option to False to stop sending sha info in group chat "
@@ -3650,7 +3745,7 @@
"Ń Š³ŃŃŠæŠ½ŠøŠ¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠøŠ¼Š°"
#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:244
msgid ""
"Controls the window where new messages are placed.\n"
"'always' - All messages are sent to a single window.\n"
@@ -3669,31 +3764,31 @@
"'pertype' - ŠŠ¾ŃŃŠŗŠµ ŠøŃŃŠ¾Š³ ŃŠøŠæŠ° (Š½ŠæŃ., ŃŠ°Š·Š³Š¾Š²Š¾ŃŠø Šø Š³ŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾ŃŠø) ŃŠµ ŃŠ°ŃŃ Ń "
"ŠøŃŃŠø ŠæŃŠ¾Š·Š¾Ń."
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
msgid "If False, you will no longer see the avatar in the chat window."
msgstr "ŠŠŗŠ¾ Š½ŠøŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, Š½ŠµŃŠµŃŠµ Š²ŠøŃŠµ Š²ŠøŠ“ŠµŃŠø Š°Š²Š°ŃŠ°Ń Ń ŠæŃŠ¾Š·Š¾ŃŃ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°."
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
msgid "If True, pressing the escape key closes a tab/window."
msgstr "ŠŠŗŠ¾ ŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, ŠæŃŠøŃŠøŃŠ°Šŗ Š½Š° ŃŠ°ŃŃŠµŃ 'esc' Š·Š°ŃŠ²Š°ŃŠ° ŃŠµŠ·ŠøŃŠ°Šŗ/ŠæŃŠ¾Š·Š¾Ń."
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
msgid "Hides the buttons in chat windows."
msgstr "Š”Š°ŠŗŃŠøŠ²Š° Š“ŃŠ³Š¼Š°Š“ Ń ŠæŃŠ¾Š·Š¾ŃŠøŠ¼Š° ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°."
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
msgid "Hides the banner in a group chat window"
msgstr "Š”Š°ŠŗŃŠøŠ²Š° Š±Š°Š½ŠµŃ Ń ŠæŃŠ¾Š·Š¾ŃŃ Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°."
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
msgid "Hides the banner in two persons chat window"
msgstr "Š”Š°ŠŗŃŠøŠ²Š° Š±Š°Š½ŠµŃ Ń ŠæŃŠ¾Š·Š¾ŃŃ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° Š“Š²Šµ Š¾ŃŠ¾Š±Šµ"
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
msgid "Hides the group chat occupants list in group chat window."
msgstr "Š”Š°ŠŗŃŠøŠ²Š° Š»ŠøŃŃŃ ŃŃŠµŃŠ½ŠøŠŗŠ° Ń ŠæŃŠ¾Š·Š¾ŃŃ Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°"
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
msgid ""
"In a chat, show the nickname at the beginning of a line only when it's not "
"the same person talking than in previous message."
@@ -3701,24 +3796,24 @@
"Š£ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ, ŠæŃŠøŠŗŠ°Š¶Šø Š½Š°Š“ŠøŠ¼Š°Šŗ Š½Š° ŠæŠ¾ŃŠµŃŠŗŃ Š½Š¾Š²Š¾Š³ ŃŠµŠ“Š° ŃŠ°Š¼Š¾ ŠŗŠ°Š“Š° ŃŠµ Š½Šµ ŃŠ°Š“Šø Š¾ "
"ŠøŃŃŠ¾Ń Š¾ŃŠ¾Š±Šø ŠŗŠ¾ŃŠ° ŃŠµ ŠæŃŠøŃŠ°Š»Š° Šø Ń ŠæŃŠ¾ŃŠ»Š¾Ń ŠæŠ¾ŃŃŃŠø."
-#: ../src/common/config.py:251
+#: ../src/common/config.py:252
msgid "Indentation when using merge consecutive nickname."
msgstr "Š£Š²Š»Š°ŃŠµŃŠµ ŠæŃŠø ŠŗŠ¾ŃŠøŃŃŠµŃŃ ŃŠæŠ°ŃŠ°ŃŠ° ŃŠ·Š°ŃŃŠ¾ŠæŠ½ŠøŃ
Š½Š°Š“ŠøŠ¼Š°ŠŗŠ°."
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
msgid "Smooth scroll message in conversation window"
msgstr "ŠŠ»Š°ŃŠŗŠ¾ ŃŠŗŃŠ¾Š»Š¾Š²Š°ŃŠµ Ń ŠæŃŠ¾Š·Š¾ŃŃ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°"
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
msgid "List of colors that will be used to color nicknames in group chats."
msgstr ""
"ŠŠøŃŃŠ° Š±Š¾ŃŠ° ŠŗŠ¾ŃŠµ ŃŠµ Š±ŠøŃŠø ŠŗŠ¾ŃŠøŃŃŠµŠ½Šµ Š·Š° Š±Š¾ŃŠµŃŠµ Š½Š°Š“ŠøŠ¼Š°ŠŗŠ° Ń Š³ŃŃŠæŠ½ŠøŠ¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠøŠ¼Š°."
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
msgid "Ctrl-Tab go to next composing tab when none is unread."
msgstr "Ctrl-Tab ŠøŠ“Šµ Š½Š° ŃŠ»ŠµŠ“ŠµŃŠø ŃŠµŠ·ŠøŃŠ°Šŗ ŠŗŠ°Š“Š° Š½ŠµŠ¼Š° Š½ŠµŠæŃŠ¾ŃŠøŃŠ°Š½ŠøŃ
ŃŠµŠ·ŠøŃŠ°ŠŗŠ°"
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
msgid ""
"Should we show the confirm metacontacts creation dialog or not? Empty string "
"means we never show the dialog."
@@ -3726,7 +3821,7 @@
"Š¢ŃŠµŠ±Š° Š»Šø ŠæŠøŃŠ°ŃŠø Š·Š° ŠæŠ¾ŃŠ²ŃŠ“Ń ŃŃŠ²Š°ŃŠ°ŃŠ° ŠæŃŠµŃŠ“Š¾ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° ŠøŠ»Šø Š½Šµ? ŠŃŠ°Š·Š°Š½ Š½ŠøŠ· Š·Š½Š°ŃŠø "
"Š“Š° Š½ŠøŠŗŠ°Š“Š° Š½Šµ ŠæŃŠøŠŗŠ°Š·ŃŃŠµŠ¼Š¾ ŃŠæŠøŃ."
-#: ../src/common/config.py:256
+#: ../src/common/config.py:257
msgid ""
"If True, you will be able to set a negative priority to your account in "
"account modification window. BE CAREFUL, when you are logged in with a "
@@ -3736,7 +3831,7 @@
"Š½Š°Š»Š¾Š³ Ń ŠæŃŠ¾Š·Š¾ŃŃ Š·Š° ŠøŠ·Š¼ŠµŠ½Ń ŠæŠ¾Š“ŠµŃŠ°Š²Š°ŃŠ° Š½Š°Š»Š¾Š³Š°. ŠŠ£ŠŠŠ¢Š ŠŠŠ ŠŠŠŠ, ŠŗŠ°Š“Š° ŃŃŠµ "
"ŠæŠ¾Š²ŠµŠ·Š°Š½Šø ŃŠ° Š½ŠµŠ³Š°ŃŠøŠ²Š½ŠøŠ¼ ŠæŃŠøŠ¾ŃŠøŃŠµŃŠ¾Š¼ ŠŠŠŠŠ¢Š ŠæŃŠøŠ¼Š°ŃŠø Š½ŠøŠŗŠ°ŠŗŠ²Šµ ŠæŠ¾ŃŃŠŗŠµ Š¾Š“ ŃŠµŃŠ²ŠµŃŠ°."
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
msgid ""
"If True, Gajim will use Gnome Keyring (if available) to store account "
"passwords."
@@ -3744,7 +3839,7 @@
"ŠŠŗŠ¾ ŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠŗŠ¾ŃŠøŃŃŠøŃŠø ŠŠ½Š¾Š¼Š¾Š² Keyring (Š°ŠŗŠ¾ ŃŠµ Š“Š¾ŃŃŃŠæŠ°Š½) Š“Š° "
"ŃŃŠŗŠ»Š°Š“ŠøŃŃŠø Š»Š¾Š·ŠøŠ½ŠŗŠµ Š½Š°Š»Š¾Š³Š°."
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
msgid ""
"If True, Gajim will show number of online and total contacts in account and "
"group rows."
@@ -3752,7 +3847,7 @@
"ŠŠŗŠ¾ ŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠæŃŠøŠŗŠ°Š·ŠøŠ²Š°ŃŠø ŃŠŗŃŠæŠ°Š½ Š±ŃŠ¾Ń ŠŗŠ¾ŃŠøŃŠ½ŠøŠŗŠ° Šø Š±ŃŠ¾Ń ŠŗŠ¾ŃŠøŠ½ŃŠøŠŗŠ° "
"Š½Š° Š²ŠµŠ·Šø Ń Š³ŃŃŠæŠ½ŠøŠ¼ ŃŠµŠ“Š¾Š²ŠøŠ¼Š°."
-#: ../src/common/config.py:259
+#: ../src/common/config.py:260
msgid ""
"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
"as if they were of this type"
@@ -3760,7 +3855,7 @@
"ŠŠ¾Š¶Šµ Š±ŠøŃŠø ŠæŃŠ°Š·Š½Š¾, 'chat' ŠøŠ»Šø 'normal'. ŠŠŗŠ¾ Š½ŠøŃŠµ ŠæŃŠ°Š·Š½Š¾, ŃŃŠµŃŠøŃŠ° ŃŠ²Šµ Š“Š¾Š»Š°Š·Š½Šµ "
"ŠæŠ¾ŃŃŠŗŠµ ŠŗŠ°Š¾ ŠæŠ¾ŃŃŠŗŠµ ŠæŠ¾ŃŃŠ°Š²ŃŠµŠ½Š¾Š³ ŃŠøŠæŠ°"
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
msgid ""
"If True, Gajim will scroll and select the contact who sent you the last "
"message, if chat window is not already opened."
@@ -3768,7 +3863,7 @@
"ŠŠŗŠ¾ ŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, ŠŠ°ŃŠøŠ¼ ŃŠµ ŃŠŗŃŠ¾Š»Š¾Š²Š°ŃŠø Šø Š¾Š·Š½Š°ŃŠøŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŃ ŠŗŠ¾ŃŠø ŠŠ°Š¼ ŃŠµ ŠæŠ¾ŃŠ»ŠµŠ“ŃŠø "
"ŠæŠ¾ŃŠ»Š°Š¾ ŠæŠ¾ŃŃŠŗŃ, Š°ŠŗŠ¾ ŠæŃŠ¾Š·Š¾Ń ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° Š½ŠøŃŠµ Š¾ŃŠ²Š¾ŃŠµŠ½."
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
msgid ""
"If True, Gajim will convert string between $$ and $$ to an image using dvips "
"and convert before insterting it in chat window."
@@ -3776,11 +3871,11 @@
"ŠŠŗŠ¾ ŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠŗŠ¾Š½Š²ŠµŃŃŠ¾Š²Š°ŃŠø ŃŠ²Šµ ŠŗŠ°ŃŠ°ŠŗŃŠµŃ ŠøŠ·Š¼ŠµŃŃ $$ Šø $$ Ń ŃŠ»ŠøŠŗŃ "
"ŠŗŠ¾ŃŠøŃŃŠµŃŠø dvips Ń ŠøŠ±Š°ŃŠøŃŠø ŃŠµ Ń ŠæŃŠ¾Š·Š¾Ń ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°."
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
msgid "Time of inactivity needed before the change status window closes down."
msgstr "ŠŃŠµŠ¼Šµ Š½ŠµŠ°ŠŗŃŠøŠ²Š½Š¾ŃŃŠø ŠæŠ¾ŃŠ»Šµ ŠŗŠ¾Š³Š° ŃŠµ ŠæŃŠ¾Š·Š¾Ń Š·Š° ŠøŠ·Š¼ŠµŠ½Ń ŃŃŠ°ŃŃŃŠ° Š·Š°ŃŠ²Š°ŃŠ°."
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
msgid ""
"Maximum number of lines that are printed in conversations. Oldest lines are "
"cleared."
@@ -3788,7 +3883,7 @@
"ŠŠ°ŠŗŃŠøŠ¼ŃŠ¼ ŠæŠ¾ŃŃŠŗŠ° ŠŗŠ¾ŃŠµ ŃŠµ ŠæŃŠøŠŗŠ°Š·ŃŃŃ Ń ŃŠ°Š·Š¾Š³Š¾Š²Š¾ŃŃ. ŠŠ°ŃŃŃŠ°ŃŠøŃŠµ Š»ŠøŠ½ŠøŃŠµ ŃŠµ "
"ŃŠŗŠ»Š°ŃŠ°ŃŃ."
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
msgid ""
"If True, notification windows from notification-daemon will be attached to "
"systray icon."
@@ -3796,18 +3891,18 @@
"ŠŠŗŠ¾ ŃŠµ ŠøŃŃŠøŠ½ŠøŃŠ¾, ŠæŃŠ¾Š·Š¾Ń Š¾Š±Š°Š²ŠµŃŃŠµŃŠ° Š¾Š“ ŃŠµŃŠ²ŠøŃŠ° Š¾Š±Š°Š²ŠµŃŃŠµŃŠ° ŃŠµ Š±ŠøŃŠø Š·Š°ŠŗŠ°ŃŠµŠ½ Š·Š° "
"ŃŠøŃŃŠµŠ¼ŃŠŗŃ ŠŗŠ°ŃŠµŃŃ."
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
msgid "Choose interval between 2 checks of idleness."
msgstr ""
"ŠŠ“Š°Š±ŠµŃŠøŃŠµ ŠøŠ½ŃŠµŃŠ²Š°Š» ŠøŠ·Š¼ŠµŃŃ Š“Š²Šµ ŠæŃŠ¾Š²ŠµŃŠµ Š“Š° ŃŠµ Š½ŠøŃŃŠ° Š½Šµ Š“ŠµŃŠ°Š²Š° Š½Š° ŃŠ°ŃŃŠ½Š°ŃŃ."
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
msgid ""
"Change the value to change the size of latex formulas displayed. The higher "
"is larger."
msgstr "ŠŃŠ¾Š¼ŠµŠ½ŠøŃŠµ Š²ŃŠµŠ“Š½Š¾ŃŃ Š“Š° ŠæŃŠ¾Š¼ŠµŠ½ŠøŃŠµ Š²ŠµŠ»ŠøŃŠøŠ½Ń ŠŠ°ŃŠµŠŗŃ ŃŠ¾ŃŠ¼ŃŠ»Š°. ŠŠøŃŠµ ŃŠµ Š²ŠµŃŠµ."
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
msgid ""
"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
"\" uri."
@@ -3815,7 +3910,7 @@
"ŠŃŠæŃŠ°Š²Š½Šµ uri ŃŠµŠ¼Šµ. Š”Š°Š¼Š¾ ŃŠµŠ¼Šµ ŃŠ° Š¾Š²Šµ Š»ŠøŃŃŠµ ŃŠµ Š±ŠøŃŠø ŠæŃŠøŃ
Š²Š°ŃŠµŠ½Šµ ŠŗŠ°Š¾ \"ŃŃŠ²Š°ŃŠ½Šµ\" "
"uri."
-#: ../src/common/config.py:278
+#: ../src/common/config.py:279
msgid ""
"Priority will change automatically according to your status. Priorities are "
"defined in autopriority_* options."
@@ -3823,7 +3918,7 @@
"ŠŃŠøŠ¾ŃŠøŃŠµŃ ŃŠµ ŃŠµ Š°ŃŃŠ¾Š¼Š°ŃŃŠŗŠø ŠæŃŠ¾Š¼ŠµŠ½ŠøŃŠø Ń Š·Š°Š²ŠøŃŠ½Š¾ŃŃŠø Š¾Š“ ŠŠ°ŃŠµŠ³ ŃŃŠ°ŃŃŃŠ°. "
"ŠŃŠøŠ¾ŃŠøŃŠµŃŠø ŃŃ Š“ŠµŃŠøŠ½ŃŠ°Š½Šø Ń autopriority_* ŠæŠ¾Š“ŠµŃŠ°Š²Š°ŃŠøŠ¼Š°."
-#: ../src/common/config.py:286
+#: ../src/common/config.py:287
msgid ""
"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
"invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -3832,26 +3927,26 @@
"dnd, invisible. ŠŠŠŠŠ: Š¾Š²Š° Š¾ŠæŃŠøŃŠ° ŃŠµ ŠŗŠ¾ŃŠøŃŃŠø ŃŠ°Š¼Š¾ Š°ŠŗŠ¾ ŃŠµ "
"restore_last_status Š¾Š½ŠµŠ¼Š¾Š³ŃŃŠµŠ½Š°."
-#: ../src/common/config.py:287
+#: ../src/common/config.py:288
msgid "If enabled, restore the last status that was used."
msgstr "ŠŠŗŠ¾ ŃŠµ Š¾Š¼Š¾Š³ŃŃŠµŠ½Š¾, ŠæŠ¾ŃŃŠ°Š²Šø ŠæŠ¾ŃŠ»ŠµŠ“ŃŠø ŠŗŠ¾ŃŠøŃŃŠµŠ½Šø ŃŃŠ°ŃŃŃ."
-#: ../src/common/config.py:292
+#: ../src/common/config.py:293
msgid ""
"If disabled, don't sign presences with GPG key, even if GPG is configured."
msgstr ""
"ŠŠŗŠ¾ ŃŠµ Š¾Š½ŠµŠ¼Š¾Š³ŃŃŠµŠ½Š¾, Š½Šµ ŠæŠ¾ŃŠæŠøŃŃŃ ŠæŃŠøŃŃŃŃŠ²Š¾ ŃŠ° GPG ŠŗŃŃŃŠµŠ¼, ŃŠ°Šŗ ŠøŠ°ŠŗŠ¾ ŃŠµ GPG "
"ŠŗŠ¾Š½ŃŠøŠ³ŃŃŠøŃŠ°Š½."
-#: ../src/common/config.py:294
+#: ../src/common/config.py:295
msgid "Enable ESessions encryption for this account."
msgstr "ŠŠ¼Š¾Š³ŃŃŠø ESessions ŠµŠ½ŠŗŃŠøŠæŃŠøŃŃ Š·Š° Š¾Š²Š°Ń Š½Š°Š»Š¾Š³."
-#: ../src/common/config.py:295
+#: ../src/common/config.py:296
msgid "Should Gajim automatically start an encrypted session when possible?"
msgstr "ŠŠ° Š»Šø ŃŠµ ŠŠ°ŃŠøŠ¼ Š°ŃŃŠ¾Š¼Š°ŃŃŠŗŠø ŃŃŠ°ŃŃŠ¾Š²Š°ŃŠø ŃŠøŃŃŠ¾Š²Š°Š½Ń ŃŠµŃŠøŃŃ Š°ŠŗŠ¾ ŃŠµ Š¼Š¾Š³ŃŃŠµ?"
-#: ../src/common/config.py:296
+#: ../src/common/config.py:297
msgid ""
"Ordered list (space separated) of connection type to try. Can contain tls, "
"ssl or plain"
@@ -3859,21 +3954,21 @@
"Š£ŃŠµŃŠµŠ½Š° Š»ŠøŃŃŠ° (Š¾Š“Š²Š¾ŃŠµŠ½Š° Š·Š°ŃŠµŠ·ŠøŠ¼Š°) ŃŠøŠæŠ¾Š²Š° ŠŗŠ¾Š½ŠµŠŗŃŠøŃŠµ Š·Š° ŠæŃŠ¾Š±Ń. ŠŠ¾Š¶Šµ ŃŠ°Š“ŃŠ¶Š°ŃŠø "
"tls, ssl ŠøŠ»Šø plain"
-#: ../src/common/config.py:297
+#: ../src/common/config.py:298
msgid ""
"Show a warning dialog before sending password on an plaintext connection."
msgstr ""
"ŠŃŠøŠŗŠ°Š¶Šø ŠæŃŠ¾Š·Š¾Ń ŃŠæŠ¾Š·Š¾ŃŠµŃŠ° ŠæŃŠµ ŃŠ»Š°ŃŠ° Š½ŠµŃŠøŃŃŠ¾Š²Š°Š½Šµ Š»Š¾Š·ŠøŠ½ŠŗŠµ ŠæŃŠµŠŗŠ¾ Š¾Š±ŠøŃŠ½Šµ Š²ŠµŠ·Šµ."
-#: ../src/common/config.py:298
+#: ../src/common/config.py:299
msgid "Show a warning dialog before using standard SSL library."
msgstr "ŠŃŠøŠŗŠ°Š¶Šø ŠæŃŠ¾Š·Š¾Ń ŃŠæŠ¾Š·Š¾ŃŠµŃŠ° ŠæŃŠµ ŠŗŠ¾ŃŠøŃŃŠµŃŠ° ŃŃŠ°Š½Š“Š°ŃŠ“Š½Šµ SSL Š±ŠøŠ±Š»ŠøŠ¾ŃŠµŠŗŠµ."
-#: ../src/common/config.py:300
+#: ../src/common/config.py:301
msgid "Space separated list of ssl errors to ignore."
msgstr "ŠŠøŃŃŠ° ssl Š³ŃŠµŃŠ°ŠŗŠ° Š·Š° ŠøŠ³Š½Š¾ŃŠøŃŠ°ŃŠµ, Š¾Š“Š²Š¾ŃŠµŠ½Š° ŃŠ°Š·Š¼Š°ŃŠøŠ¼Š°."
-#: ../src/common/config.py:312
+#: ../src/common/config.py:313
msgid ""
"How many seconds to wait for the answer of keepalive packet before we try to "
"reconnect."
@@ -3882,11 +3977,11 @@
"ŠæŠ¾Š½Š¾Š²Š½Š¾ ŃŃŠæŠ¾ŃŃŠ°Š²ŃŠ°ŃŠµ Š²ŠµŠ·Šµ."
#. yes, no, ask
-#: ../src/common/config.py:316
+#: ../src/common/config.py:317
msgid "Jabberd2 workaround"
msgstr "Jabberd2 ŠæŃŠøŠ²ŃŠµŠ¼ŠµŠ½Š¾ ŃŠµŃŠµŃŠµ"
-#: ../src/common/config.py:320
+#: ../src/common/config.py:321
msgid ""
"If checked, Gajim will use your IP and proxies defined in "
"file_transfer_proxies option for file transfer."
@@ -3894,19 +3989,19 @@
"ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š¾, ŠŠ°ŃŠøŠ¼ ŃŠµ ŠŗŠ¾ŃŠøŃŃŠøŃŠø ŠŠ°ŃŃ ŠŠ Š°Š“ŃŠµŃŃ Ń ŠæŃŠ¾ŠŗŃŠø ŠŗŠ¾ŃŠø ŃŠµ "
"Š“ŠøŃŠøŠ½ŠøŃŠ°Š½ Ń file_transfer_proxies ŠæŠ¾Š“ŠµŃŠ°Š²Š°ŃŠøŠ¼Š° Š·Š° ŠæŃŠµŠ½Š¾Ń."
-#: ../src/common/config.py:334
+#: ../src/common/config.py:335
msgid "Answer to receipt requests"
msgstr "ŠŠ“Š³Š¾Š²Š¾Ń Š½Š° Š·Š°Ń
ŃŠµŠ² ŠæŃŠøŠ¼Š°ŃŠ°"
-#: ../src/common/config.py:335
+#: ../src/common/config.py:336
msgid "Sent receipt requests"
msgstr "ŠŠ¾ŃŠ»Š°ŃŠø Š·Š°Ń
ŃŠµŠ² ŠæŃŠøŠ¼Š°ŃŠ°"
-#: ../src/common/config.py:389
+#: ../src/common/config.py:390
msgid "Is OpenPGP enabled for this contact?"
msgstr "ŠŠ° Š»Šø ŃŠµ OpenPGP Š¾Š¼Š¾Š³ŃŃŠµŠ½ Š·Š° Š¾Š²Š°Ń ŠŗŠ¾Š½ŃŠ°ŠŗŃ?"
-#: ../src/common/config.py:390
+#: ../src/common/config.py:391
msgid ""
"Should Gajim automatically start an encrypted session with this contact when "
"possible?"
@@ -3914,101 +4009,101 @@
"ŠŠ° Š»Šø ŠŠ°ŃŠøŠ¼ ŃŃŠµŠ±Š° Š°ŃŃŠ¾Š¼Š°ŃŃŠŗŠø Š“Š° Š·Š°ŠæŠ¾ŃŠ½Šµ ŃŠøŃŃŠ¾Š²Š°Š½Ń Š²ŠµŠ·Ń ŃŠ° Š¾Š²ŠøŠ¼ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ¾Š¼ "
"ŠŗŠ°Š“Š° ŃŠµ Š¼Š¾Š³ŃŃŠµ?"
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:392 ../src/common/config.py:395
msgid "Language for which we want to check misspelled words"
msgstr "ŠŠµŠ·ŠøŠŗ Ń ŠŗŠ¾Š¼Šµ Š¶ŠµŠ»ŠøŃŠµ ŠæŃŠ¾Š²ŠµŃŠ°Š²Š°ŃŠø Š½ŠµŠøŃŠæŃŠ°Š²Š½Š¾ Š½Š°ŠæŠøŃŠ°Š½Šµ ŃŠµŃŠø"
-#: ../src/common/config.py:400
+#: ../src/common/config.py:401
msgid "all or space separated status"
msgstr "ŃŠ²Šµ ŠøŠ»Šø ŃŠ°Š·Š¼Š°ŠŗŠ¾Š¼ Š¾Š“Š²Š¾ŃŠµŠ½ ŃŃŠ°ŃŃŃ"
-#: ../src/common/config.py:401
+#: ../src/common/config.py:402
msgid "'yes', 'no', or 'both'"
msgstr "'Š“Š°', 'Š½Šµ', ŠøŠ»Šø 'Š¾Š±Š¾ŃŠµ'"
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../src/common/config.py:403 ../src/common/config.py:405
+#: ../src/common/config.py:406 ../src/common/config.py:409
+#: ../src/common/config.py:410
msgid "'yes', 'no' or ''"
msgstr "'Š“Š°', 'Š½Šµ' ŠøŠ»Šø ''"
-#: ../src/common/config.py:415 ../src/common/pep.py:106
+#: ../src/common/config.py:416 ../src/common/pep.py:106
msgid "Sleeping"
msgstr "Š”ŠæŠ°Š²Š°Š¼"
-#: ../src/common/config.py:416
+#: ../src/common/config.py:417
msgid "Back soon"
msgstr "ŠŃŠ°ŃŠ°Š¼ ŃŠµ Š±ŃŠ·Š¾"
-#: ../src/common/config.py:416
+#: ../src/common/config.py:417
msgid "Back in some minutes."
msgstr "ŠŃŠ°ŃŠ°Š¼ ŃŠµ Š·Š° ŠæŠ°Ń Š¼ŠøŠ½ŃŃŠ°."
-#: ../src/common/config.py:417 ../src/common/pep.py:79
+#: ../src/common/config.py:418 ../src/common/pep.py:79
msgid "Eating"
msgstr "ŠŠµŠ“ŠµŠ¼"
-#: ../src/common/config.py:417
+#: ../src/common/config.py:418
msgid "I'm eating, so leave me a message."
msgstr "ŠŠµŠ“ŠµŠ¼, Š¾ŃŃŠ°Š²ŠøŃŠµ ŠæŠ¾ŃŃŠŗŃ."
-#: ../src/common/config.py:418
+#: ../src/common/config.py:419
msgid "Movie"
msgstr "Š¤ŠøŠ»Š¼"
-#: ../src/common/config.py:418
+#: ../src/common/config.py:419
msgid "I'm watching a movie."
msgstr "ŠŠ»ŠµŠ“Š°Š¼ ŃŠøŠ»Š¼."
-#: ../src/common/config.py:419 ../src/common/pep.py:132
+#: ../src/common/config.py:420 ../src/common/pep.py:132
msgid "Working"
msgstr "Š Š°Š“ŠøŠ¼."
-#: ../src/common/config.py:419
+#: ../src/common/config.py:420
msgid "I'm working."
msgstr "Š Š°Š“ŠøŠ¼."
-#: ../src/common/config.py:420
+#: ../src/common/config.py:421
msgid "Phone"
msgstr "Š¢ŠµŠ»ŠµŃŠ¾Š½"
-#: ../src/common/config.py:420
+#: ../src/common/config.py:421
msgid "I'm on the phone."
msgstr "Š¢ŠµŠ»ŠµŃŠ¾Š½ŠøŃŠ°Š¼."
-#: ../src/common/config.py:421
+#: ../src/common/config.py:422
msgid "Out"
msgstr "ŠŠ°ŠæŠ¾ŃŃ"
-#: ../src/common/config.py:421
+#: ../src/common/config.py:422
msgid "I'm out enjoying life."
msgstr "ŠŠ°ŠæŠ¾ŃŃ ŃŠ°Š¼, ŃŠ¶ŠøŠ²Š°Š¼ Ń Š¶ŠøŠ²Š¾ŃŃ."
-#: ../src/common/config.py:425
+#: ../src/common/config.py:426
msgid "I'm available."
msgstr "ŠŠ¾ŃŃŃŠæŠ°Š½ ŃŠ°Š¼."
-#: ../src/common/config.py:426
+#: ../src/common/config.py:427
msgid "I'm free for chat."
msgstr "Š”Š»Š¾Š±Š¾Š“Š°Š½ ŃŠ°Š¼ Š·Š° ŃŠ°Š·Š³Š¾Š²Š¾Ń."
-#: ../src/common/config.py:427 ../src/config.py:1391
+#: ../src/common/config.py:428 ../src/config.py:1398
msgid "Be right back."
msgstr "ŠŠ“Š¼Š°Ń
ŃŠµ Š²ŃŠ°ŃŠ°Š¼."
-#: ../src/common/config.py:428
+#: ../src/common/config.py:429
msgid "I'm not available."
msgstr "ŠŠµŠ“Š¾ŃŃŃŠæŠ°Š½ ŃŠ°Š¼."
-#: ../src/common/config.py:429
+#: ../src/common/config.py:430
msgid "Do not disturb."
msgstr "ŠŠµ ŃŠ¼ŠµŃŠ°Ń."
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:431 ../src/common/config.py:432
msgid "Bye!"
msgstr "ŠŠ¾Š·Š“ŃŠ°Š²!"
-#: ../src/common/config.py:441
+#: ../src/common/config.py:442
msgid ""
"Sound to play when a group chat message contains one of the words in "
"muc_highlight_words, or when a group chat message contains your nickname."
@@ -4017,27 +4112,27 @@
"muc_highlight_words, ŠøŠ»Šø ŠŗŠ°Š“Š° Š½ŠµŠŗŠ° ŠæŠ¾ŃŃŠŗŠ° Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° ŃŠ°Š“ŃŠ¶Šø ŠŠ°Ń "
"Š½Š°Š“ŠøŠ¼Š°Šŗ."
-#: ../src/common/config.py:442
+#: ../src/common/config.py:443
msgid "Sound to play when any MUC message arrives."
msgstr "ŠŠ²ŃŠŗ ŠŗŠ¾ŃŠø ŃŠµ ŃŠµ ŠæŃŃŃŠøŃŠø ŠŗŠ°Š“Š° ŃŃŠøŠ³Š½Šµ Š½ŠµŠŗŠ° MUC ŠæŠ¾ŃŃŠŗŠ°."
-#: ../src/common/config.py:451 ../src/common/optparser.py:234
+#: ../src/common/config.py:452 ../src/common/optparser.py:234
msgid "green"
msgstr "Š·ŠµŠ»ŠµŠ½Š°"
-#: ../src/common/config.py:455 ../src/common/optparser.py:220
+#: ../src/common/config.py:456 ../src/common/optparser.py:220
msgid "grocery"
msgstr "Š½Š°Š¼ŠøŃŠ½ŠøŃŠµ"
-#: ../src/common/config.py:459
+#: ../src/common/config.py:460
msgid "human"
msgstr "ŃŃŠ“ŃŠŗŠ°"
-#: ../src/common/config.py:463
+#: ../src/common/config.py:464
msgid "marine"
msgstr "Š¼Š¾ŃŃŠŗŠ°"
-#: ../src/common/connection_handlers.py:75
+#: ../src/common/connection_handlers.py:71
#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
msgid "Unable to load idle module"
msgstr "ŠŠøŃŠµ Š¼Š¾Š³ŃŃŠµ ŃŃŠøŃŠ°Š²Š°ŃŠµ Š¼Š¾Š“ŃŠ»Š° idle"
@@ -4051,112 +4146,101 @@
msgid "Invalid local address? :-O"
msgstr "ŠŠµŠ²Š°Š»ŠøŠ“Š½Š° Š»Š¾ŠŗŠ°Š»Š½Š° Š°Š“ŃŠµŃŠ°? :-O"
-#: ../src/common/connection_handlers.py:635
+#: ../src/common/connection_handlers.py:639
#, python-format
msgid "Registration information for transport %s has not arrived in time"
msgstr "ŠŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠµ Š¾ ŃŠµŠ³ŠøŃŃŃŠ°ŃŠøŃŠø Š·Š° ŃŃŠ°Š½ŃŠæŠ¾ŃŃ %s Š½ŠøŃŃ Š“Š¾ŃŠ»Šµ Š½Š° Š²ŃŠµŠ¼Šµ"
-#: ../src/common/connection_handlers.py:918
-#: ../src/common/connection_handlers.py:1813
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:2043
-#: ../src/common/connection_handlers.py:2162 ../src/common/connection.py:1203
+#: ../src/common/connection_handlers.py:926
+#: ../src/common/connection_handlers.py:1839
+#: ../src/common/connection_handlers.py:1879
+#: ../src/common/connection_handlers.py:2061
+#: ../src/common/connection_handlers.py:2180 ../src/common/connection.py:1220
#: ../src/gajim.py:392
msgid "Disk Write Error"
msgstr "ŠŃŠµŃŠŗŠ° ŠæŃŠø ŃŠæŠøŃŃ Š½Š° Š“ŠøŃŠŗ"
-#: ../src/common/connection_handlers.py:1121 ../src/common/connection.py:840
+#: ../src/common/connection_handlers.py:1133 ../src/common/connection.py:850
msgid "Invisibility not supported"
msgstr "ŠŠµŠ²ŠøŠ“ŃŠøŠ²Š¾ŃŃ Š½ŠøŃŠµ ŠæŠ¾Š“ŃŠ¶Š°Š½Š°"
-#: ../src/common/connection_handlers.py:1122 ../src/common/connection.py:841
+#: ../src/common/connection_handlers.py:1134 ../src/common/connection.py:851
#, python-format
msgid "Account %s doesn't support invisibility."
msgstr "ŠŠ°Š»Š¾Š³ %s Š½Šµ ŠæŠ¾Š“ŃŠ¶Š°Š²Š° Š½ŠµŠ²ŠøŠ“ŃŠøŠ²Š¾ŃŃ."
-#: ../src/common/connection_handlers.py:1929
+#: ../src/common/connection_handlers.py:1948
#, python-format
msgid "Nickname not allowed: %s"
msgstr "ŠŠµŠ“Š¾Š·Š²Š¾ŃŠµŠ½ Š½Š°Š“ŠøŠ¼Š°Šŗ: %s "
#. we are banned
#. group chat does not exist
-#: ../src/common/connection_handlers.py:2000
-#: ../src/common/connection_handlers.py:2003
-#: ../src/common/connection_handlers.py:2006
-#: ../src/common/connection_handlers.py:2009
-#: ../src/common/connection_handlers.py:2013
-#: ../src/common/connection_handlers.py:2022
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2023
+#: ../src/common/connection_handlers.py:2026
+#: ../src/common/connection_handlers.py:2029
+#: ../src/common/connection_handlers.py:2032
+#: ../src/common/connection_handlers.py:2036 ../src/gajim.py:554
msgid "Unable to join group chat"
msgstr "ŠŠøŃŠµ Š¼Š¾Š³ŃŃŠµ ŠæŃŠøŠ“ŃŃŠ¶ŠøŃŠø ŃŠµ Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ"
-#: ../src/common/connection_handlers.py:2001
+#: ../src/common/connection_handlers.py:2024
#, python-format
msgid "You are banned from group chat %s."
msgstr "ŠŠ°Š±ŃŠ°ŃŠµŠ½ ŠŠ°Š¼ ŃŠµ ŠæŃŠøŃŃŃŠæ Š¾Š²Š¾Š¼ Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ %s."
-#: ../src/common/connection_handlers.py:2004
+#: ../src/common/connection_handlers.py:2027
#, python-format
msgid "Group chat %s does not exist."
msgstr "ŠŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń.%s Š½Šµ ŠæŠ¾ŃŃŠ¾ŃŠø."
-#: ../src/common/connection_handlers.py:2007
+#: ../src/common/connection_handlers.py:2030
msgid "Group chat creation is restricted."
msgstr "Š”ŃŠ²Š°ŃŠ°ŃŠµ Š³ŃŃŠæŠ½ŠøŃ
ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° ŠŠ°Š¼ Š½ŠøŃŠµ Š“Š¾Š·Š²Š¾ŃŠµŠ½Š¾."
-#: ../src/common/connection_handlers.py:2010
+#: ../src/common/connection_handlers.py:2033
#, python-format
msgid "Your registered nickname must be used in group chat %s."
msgstr "ŠŠ¾ŃŠ°ŃŠµ ŠŗŠ¾ŃŠøŃŃŠøŃŠø ŠŠ°Ń ŃŠµŠ³ŠøŃŃŃŠ¾Š²Š°Š½Šø Š½Š°Š“ŠøŠ¼Š°Šŗ Ń Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ %s."
-#: ../src/common/connection_handlers.py:2014
+#: ../src/common/connection_handlers.py:2037
#, python-format
msgid "You are not in the members list in groupchat %s."
msgstr "ŠŠøŃŃŠµ Ń Š»ŠøŃŃŠø ŃŠ»Š°Š½Š¾Š²Š° Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° %s."
-#: ../src/common/connection_handlers.py:2023
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"ŠŠ°Ń Š¶ŠµŃŠµŠ½Šø Š½Š°Š“ŠøŠ¼Š°Šŗ ŃŠµ ŃŃŠµŠ½ŃŃŠ½Š¾ Ń ŃŠæŠ¾ŃŃŠµŠ±Šø Ń Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ %s ŠøŠ»Šø ŃŠµ "
-"ŃŠµŠ³ŠøŃŃŃŠ¾Š²Š°Š½ Š¾Š“ ŃŃŃŠ°Š½Šµ Š½ŠµŠŗŠ¾Š³ Š¾Š“ ŃŃŠµŃŠ½ŠøŠŗŠ°.\n"
-"ŠŠ¾Š»ŠøŠ¼Š¾ Š¾Š“ŃŠµŠ“ŠøŃŠµ Š“ŃŃŠ³Šø Š½Š°Š“ŠøŠ¼Š°Šŗ ŠøŃŠæŠ¾Š“:"
-
#. Room has been destroyed. see
#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2072
msgid "Room has been destroyed"
msgstr "Š”Š¾Š±Š° Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° ŃŠµ ŃŠ½ŠøŃŃŠµŠ½Š°"
-#: ../src/common/connection_handlers.py:2061
+#: ../src/common/connection_handlers.py:2079
#, python-format
msgid "You can join this room instead: %s"
msgstr "ŠŠ¾Š¶ŠµŃŠµ ŃŠµ ŠæŃŠøŠŗŃŃŃŠøŃŠø ŃŠ¾Š±Šø %s ŃŠ¼ŠµŃŃŠ¾ Š¾Š²Šµ"
-#: ../src/common/connection_handlers.py:2088
+#: ../src/common/connection_handlers.py:2106
msgid "I would like to add you to my roster."
msgstr "ŠŠµŠ»ŠµŠ¾ Š±ŠøŃ
Š“Š° ŃŠµ Š“Š¾Š“Š°Š¼ Š½Š° Š¼Š¾ŃŃ Š»ŠøŃŃŃ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°."
#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2127
#, python-format
msgid "we are now subscribed to %s"
msgstr "ŃŠ°Š“Š° ŃŃŠµ ŠæŃŠµŃŠæŠ»Š°ŃŠµŠ½Šø Š½Š° %s"
-#: ../src/common/connection_handlers.py:2111
+#: ../src/common/connection_handlers.py:2129
#, python-format
msgid "unsubscribe request from %s"
msgstr "Š·Š°Ń
ŃŠµŠ² Š·Š° ŃŠŗŠøŠ“Š°ŃŠµ ŠæŃŠµŃŠæŠ»Š°ŃŠµ Š¾Š“ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° %s"
-#: ../src/common/connection_handlers.py:2113
+#: ../src/common/connection_handlers.py:2131
#, python-format
msgid "we are now unsubscribed from %s"
msgstr "ŃŠ°Š“Š° ŠŠ°Š¼ ŃŠµ ŃŠŗŠøŠ½ŃŃŠ° ŠæŃŠµŃŠæŠ»Š°ŃŠ° Š¾Š“ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° %s"
-#: ../src/common/connection_handlers.py:2275
+#: ../src/common/connection_handlers.py:2299
#, python-format
msgid ""
"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4166,15 +4250,15 @@
"Š£ŠæŠ¾ŃŃŠµŠ±ŠøŃŠµ Š°Š»Š°ŃŠµ ŠŗŠ°Š¾ ŃŃŠ¾ ŃŠµ http://jru.jabberstudio.org/ Š“Š° Š±ŠøŃŃŠµ Š³Š° ŃŠŗŠ»Š¾Š½ŠøŠ»Šø"
#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2300
+#: ../src/common/connection_handlers.py:2324
#: ../src/common/zeroconf/connection_zeroconf.py:172
msgid "OpenPGP passphrase was not given"
msgstr "ŠŠ¾Š·ŠøŠ½ŠŗŠ° Š·Š° OpenPGP Š½ŠøŃŠµ ŃŠ½ŠµŃŠ°"
#. %s is the account name here
-#: ../src/common/connection_handlers.py:2302
+#: ../src/common/connection_handlers.py:2326
#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../src/roster_window.py:1921 ../src/roster_window.py:1941
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "ŠŠ¾Š²ŠµŠ·Š°ŃŠµŃŠµ ŃŠµ Š½Š° %s Š±ŠµŠ· OpenPGP ŠŗŃŃŃŠ°."
@@ -4327,42 +4411,52 @@
msgid "Server %s provided a different registration form"
msgstr "Š”ŠµŃŠ²ŠµŃ %s ŃŠµ ŠæŠ¾Š½ŃŠ“ŠøŠ¾ Š“ŃŃŠ³Š°ŃŠøŃŃ ŃŠ¾ŃŠ¼Ń Š·Š° ŃŠµŠ³ŠøŃŃŃŠ°ŃŠøŃŃ"
-#: ../src/common/connection.py:330
+#: ../src/common/connection.py:327
#, python-format
msgid "Unknown SSL error: %d"
msgstr "ŠŠµŠæŠ¾Š·Š½Š°ŃŠ° SSL Š³ŃŠµŃŠŗŠ°: %d"
#. wrong answer
-#: ../src/common/connection.py:345
+#: ../src/common/connection.py:342
msgid "Invalid answer"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ Š¾Š“Š³Š¾Š²Š¾Ń"
-#: ../src/common/connection.py:346
+#: ../src/common/connection.py:343
#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
msgstr "Š¢ŃŠ°Š½ŃŠæŠ¾ŃŃ %(name)s ŃŠµ Š»Š¾ŃŠµ Š¾Š“Š³Š¾Š²Š¾ŃŠøŠ¾ Š½Š° Š·Š°Ń
ŃŠµŠ² ŃŠµŠ³ŠøŃŃŃŠ°ŃŠøŃŠµ: %(error)s"
-#: ../src/common/connection.py:527
+#: ../src/common/connection.py:524
msgid "Connection to proxy failed"
msgstr "ŠŠµŠ·Š° ŃŠ° ŠæŃŠ¾ŠŗŃŠøŃŠµŠ¼ ŠæŃŠµŠŗŠøŠ½ŃŃŠ°"
-#: ../src/common/connection.py:612 ../src/common/connection.py:703
-#: ../src/common/connection.py:1332
+#: ../src/common/connection.py:612 ../src/common/connection.py:713
+#: ../src/common/connection.py:1349
#: ../src/common/zeroconf/connection_zeroconf.py:248
#, python-format
msgid "Could not connect to \"%s\""
msgstr "ŠŠµŠ·Š° ŃŠ° \"%s\" Š½ŠøŃŠµ Š¼Š¾Š³ŃŃŠ°"
-#: ../src/common/connection.py:613 ../src/gajim.py:1040
+#: ../src/common/connection.py:613 ../src/gajim.py:1050
msgid "Check your connection or try again later."
msgstr "ŠŃŠ¾Š²ŠµŃŠøŃŠµ ŠŠ°ŃŃ ŠŗŠ¾Š½ŠµŠŗŃŠøŃŃ ŠøŠ»Šø ŠæŠ¾ŠŗŃŃŠ°ŃŃŠµ ŠŗŠ°ŃŠ½ŠøŃŠµ."
-#: ../src/common/connection.py:660
+#: ../src/common/connection.py:645 ../src/common/connection.py:693
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "ŠŠµŠ·Š° ŃŠ° \"%s\" Š½ŠøŃŠµ Š¼Š¾Š³ŃŃŠ°"
+
+#: ../src/common/connection.py:646 ../src/common/connection.py:694
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "ŠŠ·Š³ŃŠ±ŃŠµŠ½Š° Š²ŠµŠ·Š° ŃŠ° ŃŠ°ŃŃŠ½Š¾Š¼ \"%s\""
+
+#: ../src/common/connection.py:668
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
msgstr "ŠŃŃŠµŠ½ŃŠøŃŠ½Š¾ŃŃ ŃŠµŃŃŠøŃŠøŠŗŠ°ŃŠ° %s Š¼Š¾Š¶Šµ Š±ŠøŃŠø Š½ŠµŠøŃŠæŃŠ°Š²Š½Š°."
-#: ../src/common/connection.py:663
+#: ../src/common/connection.py:671
#, python-format
msgid ""
"\n"
@@ -4371,7 +4465,7 @@
"\n"
"SSL Š³ŃŠµŃŠŗŠ°: <b>%s</b>"
-#: ../src/common/connection.py:665
+#: ../src/common/connection.py:673
#, python-format
msgid ""
"\n"
@@ -4380,24 +4474,24 @@
"\n"
"ŠŠµŠæŠ¾Š·Š½Š°ŃŠ° SSL Š³ŃŠµŃŠŗŠ°: %d"
-#: ../src/common/connection.py:704
+#: ../src/common/connection.py:714
msgid "Check your connection or try again later"
msgstr "ŠŃŠ¾Š²ŠµŃŠøŃŠµ ŠŠ°ŃŃ ŠŗŠ¾Š½ŠµŠŗŃŠøŃŃ ŠøŠ»Šø ŠæŠ¾ŠŗŃŃŠ°ŃŃŠµ ŠŗŠ°ŃŠ½ŠøŃŠµ"
-#: ../src/common/connection.py:729
+#: ../src/common/connection.py:739
#, python-format
msgid "Authentication failed with \"%s\""
msgstr "ŠŃŃŠµŠ½ŃŠøŠŗŠ°ŃŠøŃŠ° ŃŠ° \"%s\" Š½ŠµŃŃŠæŠµŃŠ½Š°"
-#: ../src/common/connection.py:731
+#: ../src/common/connection.py:741
msgid "Please check your login and password for correctness."
msgstr "ŠŠ¾Š»ŠøŠ¼Š¾ ŠŠ°Ń Š“Š° ŠæŃŠ¾Š²ŠµŃŠøŃŠµ ŠŠ°ŃŠµ ŠŗŠ¾ŃŠøŃŠ½ŠøŃŠŗŠ¾ ŠøŠ¼Šµ Šø Š»Š¾Š·ŠøŠ½ŠŗŃ Š¾Š“ Š³ŃŠµŃŠ°ŠŗŠ°."
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:802
msgid "Error while removing privacy list"
msgstr "ŠŃŠµŃŠŗŠ° ŠæŃŠøŠ»ŠøŠŗŠ¾Š¼ ŃŠŗŠ»Š°ŃŠ°ŃŠ° Š»ŠøŃŃŠ° ŠæŃŠøŠ²Š°ŃŠ½Š¾ŃŃŠø"
-#: ../src/common/connection.py:793
+#: ../src/common/connection.py:803
#, python-format
msgid ""
"Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4406,12 +4500,12 @@
"ŠŠøŃŃŠ° ŠæŃŠøŠ²Š°ŃŠ½Š¾ŃŃŠø %s Š½ŠøŃŠµ ŃŠŗŠ»Š¾ŃŠµŠ½Š°. ŠŠ¾Š¶Š“Š° ŃŠµ Š°ŠŗŃŠøŠ²Š½Š° Ń Š½ŠµŠŗŠ¾Š¼ Š¾Š“ ŠŠ°ŃŠøŃ
"
"ŃŠµŃŃŃŃŠ° Š½Š° Š²ŠµŠ·Šø. ŠŠµŠ°ŠŗŃŠøŠ²ŠøŃŠ°ŃŃŠµ ŃŠµ ŃŠ°Š¼Š¾ Šø ŠæŠ¾ŠŗŃŃŠ°ŃŃŠµ ŠæŠ¾Š½Š¾Š²Š¾."
-#: ../src/common/connection.py:1084
+#: ../src/common/connection.py:1095
#: ../src/common/zeroconf/connection_zeroconf.py:381
msgid "Neither the remote presence is signed, nor a key was assigned."
msgstr "ŠŠøŃŠø ŃŠµ ŃŠ“Š°ŃŠµŠ½Š¾ ŠæŃŠøŃŃŃŃŠ²Š¾ ŠæŠ¾ŃŠæŠøŃŠ°Š½Š¾, Š½ŠøŃŠø ŃŠµ ŠŗŃŃŃ Š“Š¾Š“ŠµŃŠµŠ½."
-#: ../src/common/connection.py:1086
+#: ../src/common/connection.py:1097
#: ../src/common/zeroconf/connection_zeroconf.py:383
#, python-format
msgid "The contact's key (%s) does not match the key assigned in Gajim."
@@ -4419,11 +4513,11 @@
#. we're not english
#. one in locale and one en
-#: ../src/common/connection.py:1095
+#: ../src/common/connection.py:1106
msgid "[This message is *encrypted* (See :XEP:`27`]"
msgstr "[ŠŠ²Š° ŠæŠ¾ŃŃŠŗŠ° ŃŠµ *ŃŠøŃŃŠ¾Š²Š°Š½Š°* (ŠŠ¾Š³Š»ŠµŠ“Š°ŃŃŠµ :XEP:`27`]"
-#: ../src/common/connection.py:1193
+#: ../src/common/connection.py:1210
#: ../src/common/zeroconf/connection_zeroconf.py:445
#, python-format
msgid ""
@@ -4433,7 +4527,7 @@
"Š¢ŠµŠ¼Š°: %(subject)s\n"
"%(message)s"
-#: ../src/common/connection.py:1365
+#: ../src/common/connection.py:1382
msgid "Not fetched because of invisible status"
msgstr "ŠŠøŃŠµ Š“Š¾Ń
Š²Š°ŃŠµŠ½Š¾ Š·Š±Š¾Š³ ŃŃŠ°ŃŃŃŠ° Š½ŠµŠ²ŠøŠ“ŃŠøŠ²Š¾ŃŃŠø"
@@ -4442,10 +4536,10 @@
msgstr "ŠŠ¾ŃŠ¼Š°ŃŃŠ°ŃŠø"
#: ../src/common/contacts.py:96 ../src/common/contacts.py:347
-#: ../src/common/helpers.py:75 ../src/disco.py:116 ../src/disco.py:117
-#: ../src/disco.py:1333 ../src/gajim.py:791 ../src/roster_window.py:828
-#: ../src/roster_window.py:1456 ../src/roster_window.py:1523
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1668
+#: ../src/common/helpers.py:75 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:800 ../src/roster_window.py:834
+#: ../src/roster_window.py:1461 ../src/roster_window.py:1528
+#: ../src/roster_window.py:1530 ../src/roster_window.py:1667
msgid "Transports"
msgstr "ŠŃŠµŠ½Š¾ŃŠø"
@@ -4638,206 +4732,206 @@
msgid "Weekend!"
msgstr "ŠŠøŠŗŠµŠ½Š“!"
-#: ../src/common/helpers.py:146
+#: ../src/common/helpers.py:156
msgid "Invalid character in username."
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ ŠŗŠ°ŃŠ°ŠŗŃŠµŃ Ń ŠŗŠ¾ŃŠøŃŠ½ŠøŃŠŗŠ¾Š¼ ŠøŠ¼ŠµŠ½Ń."
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:161
msgid "Server address required."
msgstr "ŠŠ¾ŃŃŠµŠ±Š½Š° ŃŠµ Š°Š“ŃŠµŃŠ° ŃŠµŃŠ²ŠµŃŠ°."
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:166
msgid "Invalid character in hostname."
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ ŠŗŠ°ŃŠ°ŠŗŃŠµŃ Ń ŠøŠ¼ŠµŠ½Ń Ń
Š¾ŃŃŠ°."
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:172
msgid "Invalid character in resource."
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ ŠŗŠ°ŃŠ°ŠŗŃŠµŃ Ń ŃŠµŃŃŃŃŃ."
#. GiB means gibibyte
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:212
#, python-format
msgid "%s GiB"
msgstr "%s GiB"
#. GB means gigabyte
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:215
#, python-format
msgid "%s GB"
msgstr "%s GB"
#. MiB means mibibyte
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:219
#, python-format
msgid "%s MiB"
msgstr "%s MiB"
#. MB means megabyte
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:222
#, python-format
msgid "%s MB"
msgstr "%s MB"
#. KiB means kibibyte
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:226
#, python-format
msgid "%s KiB"
msgstr "%s KiB"
#. KB means kilo bytes
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:229
#, python-format
msgid "%s KB"
msgstr "%s KB"
#. B means bytes
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:232
#, python-format
msgid "%s B"
msgstr "%s B"
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:263
msgid "_Busy"
msgstr "_ŠŠ°ŃŠ·ŠµŃ"
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
msgid "Busy"
msgstr "ŠŠ°ŃŠ·ŠµŃ"
-#: ../src/common/helpers.py:258
+#: ../src/common/helpers.py:268
msgid "_Not Available"
msgstr "_ŠŠµŠ“Š¾ŃŃŃŠæŠ°Š½"
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:273
msgid "_Free for Chat"
msgstr "_Š”Š»Š¾Š±Š¾Š“Š°Š½ Š·Š° ŃŠ°Š·Š³Š¾Š²Š¾Ń"
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:275
msgid "Free for Chat"
msgstr "Š”Š»Š¾Š±Š¾Š“Š°Š½ Š·Š° ŃŠ°Š·Š³Š¾Š²Š¾Ń"
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:278
msgid "_Available"
msgstr "_ŠŠ¾ŃŃŃŠæŠ°Š½"
-#: ../src/common/helpers.py:270 ../src/features_window.py:121
+#: ../src/common/helpers.py:280 ../src/features_window.py:121
msgid "Available"
msgstr "ŠŠ¾ŃŃŃŠæŠ°Š½"
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:282
msgid "Connecting"
msgstr "ŠŠ¾Š²ŠµŠ·ŠøŠ²Š°ŃŠµ"
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:285
msgid "A_way"
msgstr "Š_Š“ŃŃŃŠ°Š½"
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:290
msgid "_Offline"
msgstr "_ŠŠøŃŠµ Š½Š° Š²ŠµŠ·Šø"
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:292
msgid "Offline"
msgstr "ŠŠøŃŠµ Š½Š° Š²ŠµŠ·Šø"
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
msgid "_Invisible"
msgstr "_ŠŠµŠ²ŠøŠ“ŃŠøŠ²"
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:301
msgid "?contact has status:Unknown"
msgstr "?ŠŗŠ¾Š½ŃŠ°ŠŗŃ ŠøŠ¼Š° ŃŃŠ°ŃŃŃ:ŠŠµŠæŠ¾Š·Š½Š°Ń"
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
msgid "?contact has status:Has errors"
msgstr "?ŠŗŠ¾Š½ŃŠ°ŠŗŃ ŠøŠ¼Š° ŃŃŠ°ŃŃŃ:ŠŠ¾ŃŃŠ¾ŃŠµ Š³ŃŠµŃŠŗŠµ"
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
msgid "?Subscription we already have:None"
msgstr "?Š¢ŃŠµŠ½ŃŃŠ½Š° ŠæŃŠµŃŠæŠ»Š°ŃŠ°:ŠŠøŃŠµŠ“Š½Š°"
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
msgid "To"
msgstr "ŠŠ°"
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:314
msgid "Both"
msgstr "ŠŠ±Š¾ŃŠµ"
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:322
msgid "?Ask (for Subscription):None"
msgstr "?ŠŠøŃŠ°Ń (Š·Š° ŠæŃŠµŃŠæŠ»Š°ŃŃ):ŠŠøŃŠµŠ“Š½Š°"
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:324
msgid "Subscribe"
msgstr "ŠŃŠµŃŠæŠ»Š°ŃŠøŃŠµ ŃŠµ"
-#: ../src/common/helpers.py:323
+#: ../src/common/helpers.py:333
msgid "?Group Chat Contact Role:None"
msgstr "?Š£Š»Š¾Š³Š° ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° Ń Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ:ŠŠøŠŗŠ°ŠŗŠ²Š°"
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:336
msgid "Moderators"
msgstr "ŠŠ¾Š“ŠµŃŠ°ŃŠ¾ŃŠø"
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:338
msgid "Moderator"
msgstr "ŠŠ¾Š“ŠµŃŠ°ŃŠ¾Ń"
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:341
msgid "Participants"
msgstr "Š£ŃŠµŃŠ½ŠøŃŠø"
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:343
msgid "Participant"
msgstr "Š£ŃŠµŃŠ½ŠøŠŗ"
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:346
msgid "Visitors"
msgstr "Posjetitelji"
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:348
msgid "Visitor"
msgstr "ŠŠ¾ŃŠµŃŠøŠ»Š°Ń"
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:354
msgid "?Group Chat Contact Affiliation:None"
msgstr "?ŠŠµŠ·Š°Š½Š¾ŃŃ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° Ń Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š¾Š³Š¾Š²ŃŃ:ŠŠøŠŗŠ°ŠŗŠ²Š°"
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:356
msgid "Owner"
msgstr "ŠŠ»Š°ŃŠ½ŠøŠŗ"
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:358
msgid "Administrator"
msgstr "ŠŠ“Š¼ŠøŠ½ŠøŃŃŃŠ°ŃŠ¾Ń"
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:360
msgid "Member"
msgstr "Š§Š»Š°Š½"
-#: ../src/common/helpers.py:388
+#: ../src/common/helpers.py:397
msgid "is paying attention to the conversation"
msgstr "ŃŠ»ŃŃŠ° ŠŗŠ¾Š½Š²ŠµŃŠ·Š°ŃŠøŃŃ"
-#: ../src/common/helpers.py:390
+#: ../src/common/helpers.py:399
msgid "is doing something else"
msgstr "ŃŠ°Š“Šø Š½ŠµŃŃŠ¾ Š“ŃŃŠ³Š¾"
-#: ../src/common/helpers.py:392
+#: ../src/common/helpers.py:401
msgid "is composing a message..."
msgstr "ŠæŠøŃŠµ ŠæŠ¾ŃŃŠŗŃ..."
#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:395
+#: ../src/common/helpers.py:404
msgid "paused composing a message"
msgstr "ŠæŠ°ŃŠ·Š° ŠæŃŠø ŠæŠøŃŠ°ŃŃ ŠæŠ¾ŃŃŠŗŠµ"
-#: ../src/common/helpers.py:397
+#: ../src/common/helpers.py:406
msgid "has closed the chat window or tab"
msgstr "ŃŠµ Š·Š°ŃŠ²Š¾ŃŠøŠ¾/Š·Š°ŃŠ²Š¾ŃŠøŠ»Š° ŠæŃŠ¾Š·Š¾Ń ŠøŠ»Šø ŃŠµŠ·ŠøŃŠ°Šŗ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°"
-#: ../src/common/helpers.py:979 ../src/common/helpers.py:986
+#: ../src/common/helpers.py:987 ../src/common/helpers.py:994
#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
@@ -4845,22 +4939,22 @@
msgstr[1] "%d ŠæŠ¾ŃŃŠŗŠ° ŃŠµŠŗŠ°ŃŃ"
msgstr[2] "%d ŠæŠ¾ŃŃŠŗŠ° ŃŠµŠŗŠ°"
-#: ../src/common/helpers.py:992
+#: ../src/common/helpers.py:1000
#, python-format
msgid " from room %s"
msgstr " ŠøŠ· ŃŠ¾Š±Šµ %s"
-#: ../src/common/helpers.py:995 ../src/common/helpers.py:1014
+#: ../src/common/helpers.py:1003 ../src/common/helpers.py:1022
#, python-format
msgid " from user %s"
msgstr " Š¾Š“ ŠŗŠ¾ŃŠøŃŠ½ŠøŠŗŠ° %s"
-#: ../src/common/helpers.py:997
+#: ../src/common/helpers.py:1005
#, python-format
msgid " from %s"
msgstr " Š¾Š“ %s"
-#: ../src/common/helpers.py:1004 ../src/common/helpers.py:1011
+#: ../src/common/helpers.py:1012 ../src/common/helpers.py:1019
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
@@ -4868,7 +4962,7 @@
msgstr[1] "%d Š“Š¾Š³Š°ŃŠ°ŃŠ° Š½Š° ŃŠµŠŗŠ°ŃŃ"
msgstr[2] "%d Š“Š¾Š³Š°ŃŠ°Ń Š½Š° ŃŠµŠŗŠ°ŃŃ"
-#: ../src/common/helpers.py:1044
+#: ../src/common/helpers.py:1052
#, python-format
msgid "Gajim - %s"
msgstr "ŠŠ°ŃŠøŠ¼ - %s"
@@ -4969,7 +5063,8 @@
msgstr "ŠŠ¼ŠµŃŠµŠ½"
#: ../src/common/pep.py:38
-msgid "Embarassed"
+#, fuzzy
+msgid "Embarrassed"
msgstr "ŠŠ¾ŃŃŠøŃŠµŠ½"
#: ../src/common/pep.py:39
@@ -5408,8 +5503,21 @@
msgid "Writing"
msgstr "ŠŠøŃŠµ"
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "ŠŠµ Š¼Š¾Š³Ń Š“Š° ŃŠµ ŠæŠ¾Š²ŠµŠ¶ŠµŠ¼ Š½Š° ŠæŠ¾ŃŃ %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"ŠŠ¾Š¶Š“Š° Š²ŠµŃ ŠøŠ¼Š°ŃŠµ ŠæŠ¾ŠŗŃŠµŠ½ŃŃŃ ŠøŠ½ŃŃŠ°Š½ŃŃ ŠŠ°ŃŠøŠ¼Š°. ŠŃŠµŠ½Š¾Ń Š“Š°ŃŠ¾ŃŠµŠŗŠ° ŃŠµ Š±ŠøŃŠø ŠæŃŠµŠŗŠøŠ½ŃŃ."
+
#. we're not english
-#: ../src/common/stanza_session.py:282
+#: ../src/common/stanza_session.py:278
msgid ""
"[This is part of an encrypted session. If you see this message, something "
"went wrong.]"
@@ -5501,40 +5609,40 @@
msgid "Error while adding service. %s"
msgstr "ŠŃŠµŃŠŗŠ° ŠæŃŠøŠ»ŠøŠŗŠ¾Š¼ Š“Š¾Š“Š°Š²Š°ŃŠ° ŃŠµŃŠ²ŠøŃŠ°. %s"
-#: ../src/config.py:148 ../src/config.py:574
+#: ../src/config.py:150 ../src/config.py:582
msgid "Disabled"
msgstr "ŠŠ½ŠµŠ¼Š¾Š³ŃŃŠµŠ½Š¾"
-#: ../src/config.py:319
+#: ../src/config.py:321
msgid "Active"
msgstr "ŠŠŗŃŠøŠ²Š½Š¾"
-#: ../src/config.py:327
+#: ../src/config.py:329
msgid "Event"
msgstr "Š“Š¾Š³Š°ŃŠ°Ń"
-#: ../src/config.py:403
+#: ../src/config.py:405
msgid "Default Message"
msgstr "ŠŠ¾Š“ŃŠ°Š·ŃŠ¼ŠµŠ²Š°Š½Š° ŠæŠ¾ŃŃŠŗŠ°"
-#: ../src/config.py:410
+#: ../src/config.py:412
msgid "Enabled"
msgstr "ŠŠ¼Š¾Š³ŃŃŠµŠ½"
-#: ../src/config.py:452
+#: ../src/config.py:454
msgid "Always use OS/X default applications"
msgstr "Š£Š²ŠµŠŗ ŠŗŠ¾ŃŠøŃŃŠø Š°ŠæŠ»ŠøŠŗŠ°ŃŠøŃŃ ŠŗŠ¾ŃŃ Š¾ŠæŠµŃŠ°ŃŠøŠ²Š½Šø ŃŠøŃŃŠµŠ¼ Š½ŃŠ“Šø"
-#: ../src/config.py:453
+#: ../src/config.py:455
msgid "Custom"
msgstr "ŠŠ¾ŃŠøŃŠ½ŠøŃŠŗŠø"
-#: ../src/config.py:643 ../src/dialogs.py:1198
+#: ../src/config.py:651 ../src/dialogs.py:1191
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "Š ŠµŃŠ½ŠøŠŗ Š·Š° ŃŠµŠ·ŠøŠŗ %s Š½ŠøŃŠµ Š“Š¾ŃŃŃŠæŠ°Š½"
-#: ../src/config.py:644
+#: ../src/config.py:652
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -5543,251 +5651,251 @@
"ŠŠ¾ŃŠ°ŃŠµ ŠøŠ½ŃŃŠ°Š»ŠøŃŠ°ŃŠø %s ŃŠµŃŠ½ŠøŠŗ ŠŗŠ°ŠŗŠ¾ Š±ŠøŃŃŠµ Š¼Š¾Š³Š»Šø ŠŗŠ¾ŃŠøŃŃŠøŃŠø ŠæŃŠ¾Š²ŠµŃŃ ŠæŃŠ°Š²Š¾ŠæŠøŃŠ°, "
"ŠøŠ»Šø Š¾Š“Š°Š±ŠµŃŠøŃŠµ Š“ŃŃŠ³Šø ŃŠµŠ·ŠøŠŗ ŠæŠ¾ŃŃŠ°Š²ŠŗŠ¾Š¼ speller_language Š¾ŠæŃŠøŃŠµ."
-#: ../src/config.py:1009
+#: ../src/config.py:1017
msgid "status message title"
msgstr "Š½Š°ŃŠ»Š¾Š² ŃŃŠ°ŃŃŃŠ½Šµ ŠæŠ¾ŃŃŠŗŠµ"
-#: ../src/config.py:1009
+#: ../src/config.py:1017
msgid "status message text"
msgstr "ŃŠµŠŗŃŃ ŃŃŠ°ŃŃŃŠ½Šµ ŠæŠ¾ŃŃŠŗŠµ"
-#: ../src/config.py:1046
+#: ../src/config.py:1054
msgid "First Message Received"
msgstr "ŠŃŠøŠ¼ŃŠµŠ½Š° ŠŃŠ²Š° ŠŠ¾ŃŃŠŗŠ°"
-#: ../src/config.py:1047
+#: ../src/config.py:1055
msgid "Next Message Received Focused"
msgstr "Š”Š»ŠµŠ“ŠµŃŠ° ŠŃŠøŠ¼ŃŠµŠ½Š° ŠŠ¾ŃŃŠŗŠ° Š¤Š¾ŠŗŃŃŠøŃŠ°Š½Š°"
-#: ../src/config.py:1049
+#: ../src/config.py:1057
msgid "Next Message Received Unfocused"
msgstr "Š”Š»ŠµŠ“ŠµŃŠ° ŠŃŠøŠ¼ŃŠµŠ½Š° ŠŠ¾ŃŃŠŗŠ° ŠŠµŃŠ¾ŠŗŃŃŠøŃŠ°Š½Š°"
-#: ../src/config.py:1050
+#: ../src/config.py:1058
msgid "Contact Connected"
msgstr "ŠŠ¾Š½ŃŠ°ŠŗŃ ŠŠ° ŠŠµŠ·Šø"
-#: ../src/config.py:1051
+#: ../src/config.py:1059
msgid "Contact Disconnected"
msgstr "ŠŠ¾Š½ŃŠ°ŠŗŃ ŠŃŠøŃŠ°Š¾ Š”Š° ŠŠµŠ·Šµ"
-#: ../src/config.py:1052
+#: ../src/config.py:1060
msgid "Message Sent"
msgstr "ŠŠ¾ŃŃŠŗŠ° ŠŠ¾ŃŠ»Š°ŃŠ°"
-#: ../src/config.py:1053
+#: ../src/config.py:1061
msgid "Group Chat Message Highlight"
msgstr "ŠŠ¾ŃŠµŃŠµ ŠŠ¾ŃŃŠŗŠ° Š”Š° ŠŃŃŠæŠ½Š¾Š³ Š Š°Š·Š³Š¾Š²Š¾ŃŠ°"
-#: ../src/config.py:1054
+#: ../src/config.py:1062
msgid "Group Chat Message Received"
msgstr "ŠŃŠøŠ¼ŃŠµŠ½Š° ŠŠ¾ŃŃŠŗŠ° Š”Š° ŠŃŃŠæŠ½Š¾Š³ Š Š°Š·Š³Š¾Š²Š¾ŃŠ°"
-#: ../src/config.py:1055
+#: ../src/config.py:1063
msgid "GMail Email Received"
msgstr "ŠŃŠøŠ¼ŃŠµŠ½ ŠŠ¼Š°ŠøŠ» Šµ-Š¼ŠµŃŠ»"
#. Name column
-#: ../src/config.py:1312 ../src/dialogs.py:1822 ../src/dialogs.py:1886
-#: ../src/disco.py:755 ../src/disco.py:1547 ../src/disco.py:1793
+#: ../src/config.py:1320 ../src/dialogs.py:1815 ../src/dialogs.py:1879
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
#: ../src/history_window.py:86
msgid "Name"
msgstr "ŠŠ¼Šµ"
-#: ../src/config.py:1400
+#: ../src/config.py:1406
msgid "Relogin now?"
msgstr "ŠŃŠøŃŠø ŃŠ° Š²ŠµŠ·Šµ Šø ŠæŠ¾Š²ŠµŠ·Š°ŃŠø ŃŠµ Š¾Š“Š¼Š°Ń
?"
-#: ../src/config.py:1401
+#: ../src/config.py:1407
msgid "If you want all the changes to apply instantly, you must relogin."
msgstr ""
"ŠŠŗŠ¾ Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŃŠµ ŃŠ²Šµ ŠæŃŠ¾Š¼ŠµŠ½Šµ ŃŃŠµŠ½ŃŃŠ½Š¾ ŠæŃŠøŠ¼ŠµŠ½Šµ, Š¼Š¾ŃŠ°ŃŠµ Š“Š° ŃŠµ ŠæŠ¾Š½Š¾Š²Š¾ ŠæŠ¾Š²ŠµŠ¶ŠµŃŠµ."
-#: ../src/config.py:1525 ../src/config.py:1624
+#: ../src/config.py:1532 ../src/config.py:1631
msgid "OpenPGP is not usable in this computer"
msgstr "OpenPGP Š½ŠøŃŠµ Š¼Š¾Š³ŃŃŠµ ŠŗŠ¾ŃŠøŃŃŠøŃŠø Š½Š° Š¾Š²Š¾Š¼ ŃŠ°ŃŃŠ½Š°ŃŃ"
-#: ../src/config.py:1660 ../src/config.py:1701
+#: ../src/config.py:1667 ../src/config.py:1710
msgid "Unread events"
msgstr "ŠŠµŠæŃŠ¾ŃŠøŃŠ°Š½Šø Š“Š¾Š³Š°ŃŠ°ŃŠø"
-#: ../src/config.py:1661
+#: ../src/config.py:1668
msgid "Read all pending events before removing this account."
msgstr "ŠŃŠ¾ŃŠøŃŠ°ŃŃŠµ ŃŠ²Šµ Š“Š¾Š³Š°ŃŠ°ŃŠµ Š½Š° ŃŠµŠŗŠ°ŃŃ ŠæŃŠµ ŃŠŗŠ»Š°ŃŠ°ŃŠ° Š½Š°Š»Š¾Š³Š°."
-#: ../src/config.py:1687
+#: ../src/config.py:1694
#, python-format
msgid "You have opened chat in account %s"
msgstr "ŠŃŠ²Š¾ŃŠøŠ»Šø ŃŃŠµ ŃŠ°Š·Š³Š¾Š²Š¾Ń Ń ŃŠ°ŃŃŠ½Ń %s"
-#: ../src/config.py:1688
+#: ../src/config.py:1695
msgid "All chat and groupchat windows will be closed. Do you want to continue?"
msgstr ""
"ŠŃŠ¾Š·Š¾ŃŠø ŃŠ²ŠøŃ
ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° Šø Š³ŃŃŠæŠ½ŠøŃ
ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° ŃŠµ Š±ŠøŃŠø Š·Š°ŃŠ²Š¾ŃŠµŠ½Šø. ŠŠµŠ»ŠøŃŠµ Š»Šø Š“Š° "
"Š½Š°ŃŃŠ°Š²ŠøŃŠµ?"
-#: ../src/config.py:1697
+#: ../src/config.py:1706
msgid "You are currently connected to the server"
msgstr "Š¢ŃŠµŠ½ŃŃŠ½Š¾ ŃŃŠµ ŃŠæŠ¾ŃŠµŠ½Šø Š½Š° ŃŠµŃŠ²ŠµŃ"
-#: ../src/config.py:1698
+#: ../src/config.py:1707
msgid "To change the account name, you must be disconnected."
msgstr "ŠŠ° ŠæŃŠ¾Š¼ŠµŠ½Ń ŠøŠ¼ŠµŠ½Š° Š½Š°Š»Š¾Š³Š°, Š¼Š¾ŃŠ°ŃŠµ Š¾ŃŠøŃŠø ŃŠ° Š²ŠµŠ·Šµ."
-#: ../src/config.py:1702
+#: ../src/config.py:1711
msgid "To change the account name, you must read all pending events."
msgstr ""
"ŠŠ° Š±ŠøŃŃŠµ ŠæŃŠ¾Š¼ŠµŠ½ŠøŠ»Šø ŠøŠ¼Šµ Š½Š°Š»Š¾Š³Š°, Š¼Š¾ŃŠ°ŃŠµ ŠæŃŠ²Š¾ ŠæŃŠ¾ŃŠøŃŠ°ŃŠø ŃŠ²Šµ Š“Š¾Š³Š°ŃŠ°ŃŠµ Š½Š° ŃŠµŠŗŠ°ŃŃ."
-#: ../src/config.py:1708
+#: ../src/config.py:1717
msgid "Account Name Already Used"
msgstr "ŠŠ¼Šµ ŠŠ°Š»Š¾Š³Š° ŠŠµŃ Š£ Š£ŠæŠ¾ŃŃŠµŠ±Šø"
-#: ../src/config.py:1709
+#: ../src/config.py:1718
msgid ""
"This name is already used by another of your accounts. Please choose another "
"name."
msgstr ""
"ŠŠ²Š¾ ŠøŠ¼Šµ Š²ŠµŃ ŠŗŠ¾ŃŠøŃŃŠø ŃŠµŠ“Š°Š½ Š¾Š“ ŠŠ°ŃŠøŃ
Š½Š°Š»Š¾Š³Š°. ŠŠ¾Š»ŠøŠ¼Š¾ ŠŠ°Ń, Š¾Š“Š°Š±ŠµŃŠøŃŠµ Š“ŃŃŠ³Š¾ ŠøŠ¼Šµ."
-#: ../src/config.py:1713 ../src/config.py:1717
+#: ../src/config.py:1722 ../src/config.py:1726
msgid "Invalid account name"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š½Š¾ ŠøŠ¼Šµ Š½Š°Š»Š¾Š³Š°"
-#: ../src/config.py:1714
+#: ../src/config.py:1723
msgid "Account name cannot be empty."
msgstr "ŠŠ¼Šµ Š½Š°Š»Š¾Š³Š° Š½Šµ Š¼Š¾Š¶Šµ Š±ŠøŃŠø ŠæŃŠ°Š·Š½Š¾."
-#: ../src/config.py:1718
+#: ../src/config.py:1727
msgid "Account name cannot contain spaces."
msgstr "ŠŠ¼Šµ Š½Š°Š»Š¾Š³Š° Š½Šµ Š¼Š¾Š¶Šµ Š“Š° ŃŠ°Š“ŃŠ¶Šø Š±ŠµŠ»ŠøŠ½Šµ."
-#: ../src/config.py:1789
+#: ../src/config.py:1801
msgid "Rename Account"
msgstr "ŠŃŠµŠøŠ¼ŠµŠ½ŃŃ Š½Š°Š»Š¾Š³"
-#: ../src/config.py:1790
+#: ../src/config.py:1802
#, python-format
msgid "Enter a new name for account %s"
msgstr "Š£Š½ŠµŃŠøŃŠµ Š½Š¾Š²Š¾ ŠøŠ¼Šµ Š·Š° Š½Š°Š»Š¾Š³%s"
-#: ../src/config.py:1808 ../src/config.py:1816 ../src/config.py:1858
-#: ../src/config.py:3085 ../src/dataforms_widget.py:536
+#: ../src/config.py:1820 ../src/config.py:1828 ../src/config.py:1871
+#: ../src/config.py:3090 ../src/dataforms_widget.py:536
msgid "Invalid Jabber ID"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ ŃŠ°Š±ŠµŃ ŠŠ"
-#: ../src/config.py:1817
+#: ../src/config.py:1829
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "ŠŠ°Š±ŠµŃ ŠŠ Š¼Š¾ŃŠ° Š±ŠøŃŠø Š¾Š±Š»ŠøŠŗŠ° \"ŠŗŠ¾ŃŠøŃŠ½ŠøŠŗ@ŃŠµŃŠ²ŠµŃ\"."
-#: ../src/config.py:2006 ../src/config.py:3157
+#: ../src/config.py:2019 ../src/config.py:3162
msgid "Invalid entry"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ ŃŠ½Š¾Ń"
-#: ../src/config.py:2007 ../src/config.py:3158
+#: ../src/config.py:2020 ../src/config.py:3163
msgid "Custom port must be a port number."
msgstr "ŠŠ°Ń ŠæŠ¾ŃŃ Š¼Š¾ŃŠ° Š±ŠøŃŠø Š±ŃŠ¾Ń ŠæŠ¾ŃŃŠ°."
-#: ../src/config.py:2028
+#: ../src/config.py:2041
msgid "Failed to get secret keys"
msgstr "ŠŠµŃŃŠæŠµŠ»Š¾ ŃŠ·ŠøŠ¼Š°ŃŠµ ŃŠ°ŃŠ½ŠøŃ
ŠŗŃŃŃŠµŠ²Š°"
-#: ../src/config.py:2029
+#: ../src/config.py:2042
msgid "There was a problem retrieving your OpenPGP secret keys."
msgstr "ŠŠ¾ŃŠ»Š¾ ŃŠµ Š“Š¾ ŠæŃŠ¾Š±Š»ŠµŠ¼Š° Ń ŃŠ·ŠøŠ¼Š°ŃŃ ŠŠ°ŃŠøŃ
OpenPGP ŃŠ°ŃŠ½ŠøŃ
ŠŗŃŃŃŠµŠ²Š°."
-#: ../src/config.py:2064
+#: ../src/config.py:2077
msgid "OpenPGP Key Selection"
msgstr "ŠŠ“Š°Š±ŠøŃ OpenPGP ŠŃŃŃŠµŠ²Š°"
-#: ../src/config.py:2065
+#: ../src/config.py:2078
msgid "Choose your OpenPGP key"
msgstr "ŠŠ“Š°Š±ŠµŃŠøŃŠµ ŠŠ°Ń OpenPGP ŠŗŃŃŃ"
-#: ../src/config.py:2076
+#: ../src/config.py:2089
msgid "No such account available"
msgstr "ŠŠøŃŠµ Š“Š¾ŃŃŃŠæŠ°Š½ ŃŠ°ŠŗŠ°Š² Š½Š°Š»Š¾Š³"
-#: ../src/config.py:2077
+#: ../src/config.py:2090
msgid "You must create your account before editing your personal information."
msgstr "ŠŠ¾ŃŠ°ŃŠµ Š½Š°ŠæŃŠ°Š²ŠøŃŠø ŠŠ°Ń Š½Š°Š»Š¾Š³ ŠæŃŠµ ŠøŠ·Š¼ŠµŠ½Š° Š»ŠøŃŠ½ŠøŃ
ŠøŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠ°."
-#: ../src/config.py:2084 ../src/dialogs.py:1674 ../src/dialogs.py:1810
-#: ../src/dialogs.py:1990 ../src/disco.py:438 ../src/profile_window.py:320
+#: ../src/config.py:2097 ../src/dialogs.py:1667 ../src/dialogs.py:1803
+#: ../src/dialogs.py:1982 ../src/disco.py:439 ../src/profile_window.py:320
msgid "You are not connected to the server"
msgstr "ŠŠøŃŃŠµ ŠæŠ¾Š²ŠµŠ·Š°Š½Šø Š½Š° ŃŠµŃŠ²ŠµŃ"
-#: ../src/config.py:2085
+#: ../src/config.py:2098
msgid "Without a connection, you can not edit your personal information."
msgstr "ŠŠµŠ· Š²ŠµŠ·Šµ ŃŠ° ŃŠµŃŠ²ŠµŃŠ¾Š¼, Š½ŠøŃŠµ Š¼Š¾Š³ŃŃŠ° ŠøŠ·Š¼ŠµŠ½Š° Š»ŠøŃŠ½ŠøŃ
ŠøŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠ°."
-#: ../src/config.py:2089
+#: ../src/config.py:2102
msgid "Your server doesn't support Vcard"
msgstr "ŠŠ°Ń ŃŠµŃŠ²ŠµŃ Š½Šµ ŠæŠ¾Š“ŃŠ¶Š°Š²Š° Vcard"
-#: ../src/config.py:2090
+#: ../src/config.py:2103
msgid "Your server can't save your personal information."
msgstr "ŠŠ°Ń ŃŠµŃŠ²ŠµŃ Š½Šµ Š¼Š¾Š¶Šµ Š“Š° ŃŠ°ŃŃŠ²Š° ŠŠ°ŃŠµ Š»ŠøŃŠ½Šµ ŠøŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠµ."
-#: ../src/config.py:2121
+#: ../src/config.py:2134
msgid "Account Local already exists."
msgstr "Š Š°ŃŃŠ½ Š»Š¾ŠŗŠ°Š» Š²ŠµŃ ŠæŠ¾ŃŃŠ¾ŃŠø."
-#: ../src/config.py:2122
+#: ../src/config.py:2135
msgid "Please rename or remove it before enabling link-local messaging."
msgstr "ŠŠ¾Š»ŠøŠ¼Š¾ ŠŠ°Ń, ŠæŃŠµŠøŠ¼ŠµŠ½ŃŃŃŠµ ŠøŠ»Šø ŃŠŗŠ»Š¾Š½ŠøŃŠµ ŠæŃŠµ Š¾Š¼Š¾Š³ŃŃŠ°Š²Š°ŃŠ° Š»Š¾ŠŗŠ°Š»Š½ŠøŃ
ŠæŠ¾ŃŃŠŗŠ°."
-#: ../src/config.py:2305
+#: ../src/config.py:2318
#, python-format
msgid "Edit %s"
msgstr "ŠŠ·Š¼ŠµŠ½Šø %s"
-#: ../src/config.py:2307
+#: ../src/config.py:2320
#, python-format
msgid "Register to %s"
msgstr "Š ŠµŠ³ŠøŃŃŃŃŃ ŃŠµ Š½Š° %s"
#. list at the beginning
-#: ../src/config.py:2343
+#: ../src/config.py:2356
msgid "Ban List"
msgstr "ŠŠøŃŃŠ° Š·Š°Š±ŃŠ°Š½Š°"
-#: ../src/config.py:2344
+#: ../src/config.py:2357
msgid "Member List"
msgstr "ŠŠøŃŃŠ° ŃŠ»Š°Š½Š¾Š²Š°"
-#: ../src/config.py:2345
+#: ../src/config.py:2358
msgid "Owner List"
msgstr "ŠŠøŃŃŠ° Š²Š»Š°ŃŠ½ŠøŠŗŠ°"
-#: ../src/config.py:2346
+#: ../src/config.py:2359
msgid "Administrator List"
msgstr "ŠŠøŃŃŠ° Š°Š“Š¼ŠøŠ½ŠøŃŃŃŠ°ŃŠ¾ŃŠ°"
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2395 ../src/disco.py:762 ../src/history_manager.py:184
+#: ../src/config.py:2408 ../src/disco.py:775 ../src/history_manager.py:184
msgid "JID"
msgstr "ŠŠŠ"
-#: ../src/config.py:2403
+#: ../src/config.py:2416
msgid "Reason"
msgstr "Š Š°Š·Š»Š¾Š³"
-#: ../src/config.py:2408
+#: ../src/config.py:2421
msgid "Nick"
msgstr "ŠŠ°Š“ŠøŠ¼Š°Šŗ"
-#: ../src/config.py:2412
+#: ../src/config.py:2425
msgid "Role"
msgstr "Š£Š»Š¾Š³Š°"
-#: ../src/config.py:2437
+#: ../src/config.py:2450
msgid "Banning..."
msgstr "ŠŠ°Š±ŃŠ°Š½Š°..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2439
+#: ../src/config.py:2452
msgid ""
"<b>Whom do you want to ban?</b>\n"
"\n"
@@ -5795,11 +5903,11 @@
"<b>ŠŠ¾Š³Š° Š¶ŠµŠ»ŠøŃŠµ Š·Š°Š±ŃŠ°Š½ŠøŃŠø?</b>\n"
"\n"
-#: ../src/config.py:2441
+#: ../src/config.py:2454
msgid "Adding Member..."
msgstr "ŠŠ¾Š“Š°Š²Š°ŃŠµ ŃŠ»Š°Š½Š°..."
-#: ../src/config.py:2442
+#: ../src/config.py:2455
msgid ""
"<b>Whom do you want to make a member?</b>\n"
"\n"
@@ -5807,11 +5915,11 @@
"<b>ŠŠ¾Š³Š° Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŠæŠ¾ŃŃŠ°Š²ŠøŃŠµ ŃŠ»Š°Š½Š¾Š¼?</b>\n"
"\n"
-#: ../src/config.py:2444
+#: ../src/config.py:2457
msgid "Adding Owner..."
msgstr "ŠŠ¾Š“Š°Š²Š°ŃŠµ Š²Š»Š°ŃŠ½ŠøŠŗŠ°..."
-#: ../src/config.py:2445
+#: ../src/config.py:2458
msgid ""
"<b>Whom do you want to make an owner?</b>\n"
"\n"
@@ -5819,11 +5927,11 @@
"<b>ŠŠ¾Š³Š° Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŠæŠ¾ŃŃŠ°Š²ŠøŃŠµ Š·Š° Š²Š»Š°ŃŠ½ŠøŠŗŠ°?</b>\n"
"\n"
-#: ../src/config.py:2447
+#: ../src/config.py:2460
msgid "Adding Administrator..."
msgstr "ŠŠ¾Š“Š°Š²Š°ŃŠµ Š°Š“Š¼ŠøŠ½ŠøŃŃŃŠ°ŃŠ¾ŃŠ°..."
-#: ../src/config.py:2448
+#: ../src/config.py:2461
msgid ""
"<b>Whom do you want to make an administrator?</b>\n"
"\n"
@@ -5831,7 +5939,7 @@
"<b>ŠŠ¾Š³Š° Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŠæŠ¾ŃŃŠ°Š²ŠøŃŠµ Š·Š° Š°Š“Š¼ŠøŠ½ŠøŃŃŃŠ°ŃŠ¾ŃŠ°?</b>\n"
"\n"
-#: ../src/config.py:2449
+#: ../src/config.py:2462
msgid ""
"Can be one of the following:\n"
"1. user@domain/resource (only that resource matches).\n"
@@ -5847,83 +5955,83 @@
"4. Š“Š¾Š¼ŠµŠ½ (ŃŠ°Š¼Š¾ ŃŠµ Š“Š¾Š¼ŠµŠ½ ŠæŠ¾ŠŗŠ»Š°ŠæŠ°, ŠŗŠ°Š¾ Šø Š±ŠøŠ»Š¾ ŠŗŠ¾ŃŠø ŠŗŠ¾ŃŠøŃŠ½ŠøŠŗ@Š“Š¾Š¼ŠµŠ½,\n"
"Š“Š¾Š¼ŠµŠ½/ŃŠµŃŃŃŃ, ŠøŠ»Šø Š°Š“ŃŠµŃŠ° ŠŗŠ¾ŃŠ° ŃŠ°Š“ŃŠ¶Šø ŠæŠ¾Š“Š“Š¾Š¼ŠµŠ½."
-#: ../src/config.py:2552
+#: ../src/config.py:2559
#, python-format
msgid "Removing %s account"
msgstr "Š£ŠŗŠ»Š°ŃŠ°ŃŠµ ŃŠ°ŃŃŠ½Š° %s"
-#: ../src/config.py:2574 ../src/gajim.py:1411 ../src/roster_window.py:1932
+#: ../src/config.py:2581 ../src/gajim.py:1419 ../src/roster_window.py:1933
msgid "Password Required"
msgstr "ŠŠ¾Š·ŠøŠ½ŠŗŠ° Š·Š°Ń
ŃŠµŠ²Š°Š½Š°"
-#: ../src/config.py:2575 ../src/roster_window.py:1906
+#: ../src/config.py:2582 ../src/roster_window.py:1907
#, python-format
msgid "Enter your password for account %s"
msgstr "Š£Š½ŠµŃŠøŃŠµ ŠŠ°ŃŃ Š»Š¾Š·ŠøŠ½ŠŗŃ Š·Š° ŃŠ°ŃŃŠ½ %s"
-#: ../src/config.py:2576 ../src/roster_window.py:1933
+#: ../src/config.py:2583 ../src/roster_window.py:1934
msgid "Save password"
msgstr "Š”Š°ŃŃŠ²Š°Ń Š»Š¾Š·ŠøŠ½ŠŗŃ"
-#: ../src/config.py:2585
+#: ../src/config.py:2592
#, python-format
msgid "Account \"%s\" is connected to the server"
msgstr "Š Š°ŃŃŠ½ \"%s\" ŃŠµ ŠæŠ¾Š²ŠµŠ·Š°Š½ Š½Š° ŃŠµŃŠ²ŠµŃ"
-#: ../src/config.py:2586
+#: ../src/config.py:2593
msgid "If you remove it, the connection will be lost."
msgstr "Š£ŠŗŠ¾Š»ŠøŠŗŠ¾ Š³Š° ŃŠŗŠ»Š¾Š½ŠøŃŠµ, Š²ŠµŠ·Š° ŃŠµ Š±ŠøŃŠø ŠøŠ·Š³ŃŠ±ŃŠµŠ½Š°."
-#: ../src/config.py:2682
+#: ../src/config.py:2689
msgid "Default"
msgstr "ŠŠ¾Š“ŃŠ°Š·ŃŠ¼ŠµŠ²Š°Š½Š¾"
-#: ../src/config.py:2682
+#: ../src/config.py:2689
msgid "?print_status:All"
msgstr "?ŠøŃŠæŠøŃ ŃŃŠ°ŃŃŃŠ°:Š”Š²Šµ"
-#: ../src/config.py:2683
+#: ../src/config.py:2690
msgid "Enter and leave only"
msgstr "Š”Š°Š¼Š¾ ŃŃŠø Šø Š½Š°ŠæŃŃŃŠøŃŠø"
-#: ../src/config.py:2684
+#: ../src/config.py:2691
msgid "?print_status:None"
msgstr "?print_status:None"
-#: ../src/config.py:2753
+#: ../src/config.py:2759
msgid "New Group Chat"
msgstr "ŠŠ¾Š²Šø Š³ŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń"
-#: ../src/config.py:2786
+#: ../src/config.py:2792
msgid "This bookmark has invalid data"
msgstr "ŠŠ²Š°Ń Š¼Š°ŃŠŗŠµŃ ŠøŠ¼Š° Š½ŠµŠøŃŠæŃŠ°Š²Š½Šµ ŠæŠ¾Š“Š°ŃŠŗŠµ"
-#: ../src/config.py:2787
+#: ../src/config.py:2793
msgid ""
"Please be sure to fill out server and room fields or remove this bookmark."
msgstr "ŠŠ¾Š»ŠøŠ¼Š¾ Š¾Š±Š°Š²ŠµŠ·Š½Š¾ ŠøŃŠæŃŠ½ŠøŃŠµ ŠæŠ¾ŃŠ° ŃŠµŃŠ²ŠµŃŠ° Šø ŃŠ¾Š±Šµ ŠøŠ»Šø ŃŠŗŠ»Š¾Š½ŠøŃŠµ Š¾Š²Š°Ń Š¼Š°ŃŠŗŠµŃ."
-#: ../src/config.py:3068
+#: ../src/config.py:3073
msgid "Invalid username"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š½Š¾ ŠŗŠ¾ŃŠøŃŠ½ŠøŃŠŗŠ¾ ŠøŠ¼Šµ"
-#: ../src/config.py:3070
+#: ../src/config.py:3075
msgid "You must provide a username to configure this account."
msgstr "ŠŠ¾ŃŠ°ŃŠµ ŃŠæŠøŃŠ°ŃŠø ŠŗŠ¾ŃŠøŃŠ½ŠøŃŠŗŠ¾ ŠøŠ¼Šµ Š“Š° Š±ŠøŃŃŠµ ŠŗŠ¾Š½ŃŠøŠ³ŃŃŠøŃŠ°Š»Šø Š¾Š²Š°Ń Š½Š°Š»Š¾Š³."
-#: ../src/config.py:3096
+#: ../src/config.py:3101
msgid "Duplicate Jabber ID"
msgstr "ŠŃŠæŠ»ŠøŃŠ°Ń ŠŠ°Š±ŠµŃ ŠŠ"
-#: ../src/config.py:3097
+#: ../src/config.py:3102
msgid "This account is already configured in Gajim."
msgstr "ŠŠ²Š°Ń Š½Š°Š»Š¾Š³ ŃŠµ Š²ŠµŃ ŠŗŠ¾Š½ŃŠøŠ³ŃŃŠøŃŠ°Š½ Ń ŠŠ°ŃŠøŠ¼Ń."
-#: ../src/config.py:3114
+#: ../src/config.py:3119
msgid "Account has been added successfully"
msgstr "ŠŠ°Š»Š¾Š³ ŃŠµ ŃŃŠæŠµŃŠ½Š¾ Š“Š¾Š“Š°Ń"
-#: ../src/config.py:3115 ../src/config.py:3302
+#: ../src/config.py:3120 ../src/config.py:3309
msgid ""
"You can set advanced account options by pressing the Advanced button, or "
"later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -5932,24 +6040,24 @@
"ŠŠ¾Š¶ŠµŃŠµ ŠæŠ¾ŃŃŠ°Š²ŠøŃŠø Š½Š°ŠæŃŠµŠ“Š½Š° ŠæŠ¾Š“ŠµŃŠ°Š²Š°ŃŠ° Š½Š°Š»Š¾Š³Š° ŠæŃŠøŃŠøŃŠŗŠ¾Š¼ Š½Š° Š“ŃŠ³Š¼Šµ ŠŠ°ŠæŃŠµŠ“Š½Š¾, ŠøŠ»Šø "
"ŠŗŠ°ŃŠ½ŠøŃŠµ, ŠŗŠ»ŠøŠŗŠ¾Š¼ Š½Š° ŃŃŠ°Š²ŠŗŃ Š¼ŠµŠ½ŠøŃŠ° ŠŠ°Š»Š¾Š·Šø ŠæŠ¾Š“ Š¼ŠµŠ½ŠøŃŠµŠ¼ Š£ŃŠµŠ“Šø ŠøŠ· Š³Š»Š°Š²Š½Š¾Š³ ŠæŃŠ¾Š·Š¾ŃŠ°."
-#: ../src/config.py:3133
+#: ../src/config.py:3138
msgid "Invalid server"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ ŃŠµŃŠ²ŠµŃ"
-#: ../src/config.py:3134
+#: ../src/config.py:3139
msgid "Please provide a server on which you want to register."
msgstr "ŠŠ¾Š»ŠøŠ¼Š¾ Š¾Š“ŃŠµŠ“ŠøŃŠµ ŃŠµŃŠ²ŠµŃ Š½Š° ŠŗŠ¾Š¼Šµ Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŃŠµ ŃŠµŠ³ŠøŃŃŃŃŃŠµŃŠµ."
-#: ../src/config.py:3185 ../src/gajim.py:1983
+#: ../src/config.py:3190 ../src/gajim.py:1991
msgid "Certificate Already in File"
msgstr "Š”ŠµŃŃŠøŃŠøŠŗŠ°Ń ŃŠµ Š²ŠµŃ Ń Š“Š°ŃŠ¾ŃŠµŃŠø"
-#: ../src/config.py:3186 ../src/gajim.py:1984
+#: ../src/config.py:3191 ../src/gajim.py:1992
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr "Š”ŠµŃŃŠøŃŠøŠŗŠ°Ń ŃŠµ Š²ŠµŃ Ń Š“Š°ŃŠ¾ŃŠµŃŠø %s, ŠæŠ° Š½ŠøŃŠµ ŠæŠ¾Š½Š¾Š²Š¾ Š“Š¾Š“Š°Ń."
-#: ../src/config.py:3254
+#: ../src/config.py:3259
#, python-format
msgid ""
"<b>Security Warning</b>\n"
@@ -5964,7 +6072,7 @@
"SSL Š³ŃŠµŃŠŗŠ°: %(error)s\n"
"ŠŠ° Š»Šø Šø Š“Š°ŃŠµ Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŃŠµ ŠæŠ¾Š²ŠµŠ¶ŠµŃŠµ Š½Š° Š¾Š²Š°Ń ŃŠµŃŠ²ŠµŃ?"
-#: ../src/config.py:3260 ../src/gajim.py:2007
+#: ../src/config.py:3265 ../src/gajim.py:2015
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -5975,23 +6083,23 @@
"SHA1 Š¾ŃŠøŃŠ°Šŗ Š¾Š²Š¾Š³ ŃŠµŃŃŠøŃŠøŠŗŠ°ŃŠ°:\n"
"%s"
-#: ../src/config.py:3281 ../src/config.py:3320
+#: ../src/config.py:3288 ../src/config.py:3327
msgid "An error occurred during account creation"
msgstr "ŠŠ¾ŃŠ°Š²ŠøŠ»Š° ŃŠµ Š³ŃŠµŃŠŗŠ° ŠæŃŠø ŠŗŃŠµŠøŃŠ°ŃŃ Š½Š°Š»Š¾Š³Š°"
-#: ../src/config.py:3301
+#: ../src/config.py:3308
msgid "Your new account has been created successfully"
msgstr "ŠŠ°Ń Š½Š¾Š²Šø Š½Š°Š»Š¾Š³ ŃŠµ ŃŃŠæŠµŃŠ½Š¾ Š½Š°ŠæŃŠ°Š²ŃŠµŠ½"
-#: ../src/config.py:3404
+#: ../src/config.py:3411
msgid "Account name is in use"
msgstr "ŠŠ¼Šµ Š½Š°Š»Š¾Š³Š° ŃŠµ Š²ŠµŃ ŃŠæŠ¾ŃŃŠµŠ±ŃŠµŠ½Š¾"
-#: ../src/config.py:3405
+#: ../src/config.py:3412
msgid "You already have an account using this name."
msgstr "ŠŠµŃ ŠøŠ¼Š°ŃŠµ Š½Š°Š»Š¾Š³ ŃŠ° ŃŠøŠ¼ ŠøŠ¼ŠµŠ½Š¾Š¼."
-#: ../src/conversation_textview.py:547
+#: ../src/conversation_textview.py:548
msgid ""
"This icon indicates that this message has not yet\n"
"been received by the remote end. If this icon stays\n"
@@ -6001,7 +6109,7 @@
"ŃŃŠøŠ³Š»Š° Š½Š° Š“ŃŃŠ³Šø ŠŗŃŠ°Ń. ŠŠŗŠ¾ Š¾Š²Š° ŠøŠŗŠ¾Š½Š° Š¾ŃŃŠ°Š½Šµ Š¾Š²Š°ŠŗŠ¾ \n"
"Š“ŃŠ³Š¾ Š²ŃŠµŠ¼ŠµŠ½Š°, Š²ŠµŃŠ¾Š²Š°ŃŠ½Š¾ ŃŠµ Š“Š° ŃŠµ ŠæŠ¾ŃŃŠŗŠ° ŠøŠ·Š³ŃŠ±ŠøŠ»Š°."
-#: ../src/conversation_textview.py:566
+#: ../src/conversation_textview.py:567
msgid ""
"Text below this line is what has been said since the\n"
"last time you paid attention to this group chat"
@@ -6009,51 +6117,51 @@
"Š¢ŠµŠŗŃŃ ŠøŃŠæŠ¾Š“ Š¾Š²Šµ Š»ŠøŠ½ŠøŃŠµ ŃŠµ Š¾Š½Š¾ ŃŃŠ¾ ŃŠµ ŃŠµŃŠµŠ½Š¾ Š¾Š“ ŠŗŠ°Š“Š° ŃŃŠµ ŠæŠ¾ŃŠ»ŠµŠ“ŃŠø ŠæŃŃ\n"
"Š¾Š±ŃŠ°ŃŠøŠ»Šø ŠæŠ°Š¶ŃŃ Š½Š° Š¾Š²Š°Ń Š³ŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń"
-#: ../src/conversation_textview.py:676
+#: ../src/conversation_textview.py:677
#, python-format
msgid "_Actions for \"%s\""
msgstr "_ŠŠŗŃŠøŃŠµ Š·Š° Š½Š°Š»Š¾Š³ \"%s\""
-#: ../src/conversation_textview.py:688
+#: ../src/conversation_textview.py:689
msgid "Read _Wikipedia Article"
msgstr "ŠŃŠ¾ŃŠøŃŠ°ŃŃŠµ ŃŠ»Š°Š½Š°Šŗ Š½Š° _ŠŠøŠŗŠøŠæŠµŠ“ŠøŃŠø"
-#: ../src/conversation_textview.py:693
+#: ../src/conversation_textview.py:694
msgid "Look it up in _Dictionary"
msgstr "ŠŠ¾ŃŃŠ°Š¶Šø Ń Š ŠµŃŠ½ŠøŠŗŃ"
-#: ../src/conversation_textview.py:710
+#: ../src/conversation_textview.py:711
#, python-format
msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
msgstr "Š£Š Š-Ń Š ŠµŃŠ½ŠøŠŗŠ° Š½ŠµŠ“Š¾ŃŃŠ°ŃŠµ \"%s\" Šø Š½ŠøŃŠµ ŠŠøŠŗŠø ŃŠµŃŠ½ŠøŠŗ"
#. we must have %s in the url
-#: ../src/conversation_textview.py:723
+#: ../src/conversation_textview.py:724
#, python-format
msgid "Web Search URL is missing an \"%s\""
msgstr "Š£Š Š-Ń ŠŠµŠ± ŠæŃŠµŃŃŠ°Š³Šµ Š½ŠµŠ“Š¾ŃŃŠ°ŃŠµ \"%s\""
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:727
msgid "Web _Search for it"
msgstr "_ŠŃŠµŃŃŠ°Š¶Šø ŠŠµŠ±"
-#: ../src/conversation_textview.py:732
+#: ../src/conversation_textview.py:733
msgid "Open as _Link"
msgstr "ŠŃŠ²Š¾ŃŠø ŠŗŠ°Š¾ _ŠŠµŠ·Ń"
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1218
msgid "Yesterday"
msgstr "ŠŃŃŠµ"
#. the number is >= 2
#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1222
#, python-format
msgid "%i days ago"
msgstr "ŠŃŠµ %i Š“Š°Š½Š°"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1256
#, python-format
msgid "Subject: %s\n"
msgstr "Š¢ŠµŠ¼Š°: %s\n"
@@ -6086,19 +6194,19 @@
msgid "Jabber ID: <i>%s</i>"
msgstr "ŠŠ°Š±ŠµŃ ŠŠ: <i>%s</i>"
-#: ../src/dialogs.py:186
+#: ../src/dialogs.py:187
msgid "Group"
msgstr "ŠŃŃŠæŠ°"
-#: ../src/dialogs.py:193
+#: ../src/dialogs.py:194
msgid "In the group"
msgstr "Š£ Š³ŃŃŠæŠø"
-#: ../src/dialogs.py:278
+#: ../src/dialogs.py:279
msgid "KeyID"
msgstr "ŠŠ ŠŃŃŃŠ°"
-#: ../src/dialogs.py:283
+#: ../src/dialogs.py:284
msgid "Contact name"
msgstr "ŠŠ¼Šµ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ°"
@@ -6152,89 +6260,77 @@
msgid "Yahoo! Address:"
msgstr "Yahoo! Š°Š“ŃŠµŃŠ°:"
-#: ../src/dialogs.py:712
+#: ../src/dialogs.py:711
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr "ŠŠ¾Š»ŠøŠ¼Š¾ ŠŠ°Ń ŠøŃŠæŃŠ½ŠøŃŠµ ŠæŠ¾Š“Š°ŃŠŗŠµ Š·Š° ŠŗŠ¾Š½ŃŠ°ŠŗŃ ŠŗŠ¾Š³Š° Š¶ŠµŠ»ŠøŃŠµ Š“Š¾Š“Š°ŃŠø Š½Š° Š½Š°Š»Š¾Š³ %s"
-#: ../src/dialogs.py:714
+#: ../src/dialogs.py:713
msgid "Please fill in the data of the contact you want to add"
msgstr "ŠŠ¾Š»ŠøŠ¼Š¾ ŠŠ°Ń ŠøŃŠæŃŠ½ŠøŃŠµ ŠæŠ¾Š“Š°ŃŠŗŠµ Š·Š° ŠŗŠ¾Š½ŃŠ°ŠŗŃ ŠŗŠ¾Š³Š° Š¶ŠµŠ»ŠøŃŠµ Š“Š¾Š“Š°ŃŠø"
-#: ../src/dialogs.py:871 ../src/dialogs.py:877 ../src/dialogs.py:882
+#: ../src/dialogs.py:870 ../src/dialogs.py:876 ../src/dialogs.py:881
msgid "Invalid User ID"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ ŠŗŠ¾ŃŠøŃŠ½ŠøŃŠŗŠø ŠŠ"
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:877
msgid "The user ID must not contain a resource."
msgstr "ŠŠ ŠŗŠ¾ŃŠøŃŠ½ŠøŠŗŠ° Š½Šµ ŃŠ¼Šµ ŃŠ°Š“ŃŠ¶Š°Š²Š°ŃŠø ŃŠµŃŃŃŃ."
-#: ../src/dialogs.py:883
+#: ../src/dialogs.py:882
msgid "You cannot add yourself to your roster."
msgstr "ŠŠµ Š¼Š¾Š¶ŠµŃŠµ Š“Š¾Š“Š°ŃŠø ŃŠµŠ±Šµ Ń ŠŠ°ŃŃ Š»ŠøŃŃŃ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°."
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:896
msgid "Contact already in roster"
msgstr "ŠŠ¾Š½ŃŠ°ŠŗŃ ŃŠµ Š²ŠµŃ Ń Š»ŠøŃŃŠø"
-#: ../src/dialogs.py:898
+#: ../src/dialogs.py:897
msgid "This contact is already listed in your roster."
msgstr "ŠŠ¾Š½ŃŠ°ŠŗŃ ŃŠµ Š²ŠµŃ Ń Š»ŠøŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°."
-#: ../src/dialogs.py:934
+#: ../src/dialogs.py:933
msgid "User ID:"
msgstr "ŠŠ ŠŗŠ¾ŃŠøŃŠ½ŠøŠŗŠ°:"
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:991
msgid "A GTK+ jabber client"
msgstr "ŠŠ¢Š+ ŃŠ°Š±ŠµŃ ŠŗŠ»ŠøŃŠµŠ½Ń"
-#: ../src/dialogs.py:993
+#: ../src/dialogs.py:992
msgid "GTK+ Version:"
msgstr "ŠŠ¢Š+ Š²ŠµŃŠ·ŠøŃŠ°:"
-#: ../src/dialogs.py:994
+#: ../src/dialogs.py:993
msgid "PyGTK Version:"
msgstr "PyŠŠ¢Š Š²ŠµŃŠ·ŠøŃŠ°:"
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1003
msgid "Current Developers:"
msgstr "Š¢ŃŠµŠ½ŃŃŠ½Šø ŠæŃŠ¾Š³ŃŠ°Š¼ŠµŃŠø:"
-#: ../src/dialogs.py:1006
+#: ../src/dialogs.py:1005
msgid "Past Developers:"
msgstr "ŠŃŠ¾ŃŠ»Šø ŠæŃŠ¾Š³ŃŠ°Š¼ŠµŃŠø:"
-#: ../src/dialogs.py:1012
+#: ../src/dialogs.py:1011
msgid "THANKS:"
msgstr "ŠŠŠ„ŠŠŠŠŠŠ¦Š:"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1017
msgid "Last but not least, we would like to thank all the package maintainers."
msgstr ""
"ŠŠ¾ŃŠ»ŠµŠ“ŃŠµ, Š°Š»Šø Š½Šµ Šø Š½Š°ŃŠ¼Š°ŃŠµ Š²Š°Š¶Š½Š¾, Š¶ŠµŠ»ŠµŠ»Šø Š±ŠøŃŠ¼Š¾ Š·Š°Ń
Š²Š°Š»ŠøŃŠø ŃŠ²ŠøŠ¼ Š¾Š“ŃŠ¶Š°Š²Š°ŃŠµŃŠøŠ¼Š° "
"ŠæŠ°ŠŗŠµŃŠ°"
#. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1031
+#: ../src/dialogs.py:1030
msgid "translator-credits"
msgstr "Š. ŠŠ¾ŠŗŠ°Š½Š¾Š²ŠøŃ. <branko.kokanovic(a)gmail.com>"
-#: ../src/dialogs.py:1191
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "ŠŠµ Š¼Š¾Š³Ń Š“Š° ŃŠµ ŠæŠ¾Š²ŠµŠ¶ŠµŠ¼ Š½Š° ŠæŠ¾ŃŃ %s."
-
#: ../src/dialogs.py:1192
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"ŠŠ¾Š¶Š“Š° Š²ŠµŃ ŠøŠ¼Š°ŃŠµ ŠæŠ¾ŠŗŃŠµŠ½ŃŃŃ ŠøŠ½ŃŃŠ°Š½ŃŃ ŠŠ°ŃŠøŠ¼Š°. ŠŃŠµŠ½Š¾Ń Š“Š°ŃŠ¾ŃŠµŠŗŠ° ŃŠµ Š±ŠøŃŠø ŠæŃŠµŠŗŠøŠ½ŃŃ."
-
-#: ../src/dialogs.py:1199
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -6247,88 +6343,88 @@
"\n"
"ŠŃŠ²ŠµŃŃŠ°Š²Š°ŃŠµ Š»Š¾ŃŠµ Š½Š°ŠæŠøŃŠ°Š½ŠøŃ
ŃŠµŃŠø Š½ŠµŃŠµ Š±ŠøŃŠø Ń ŃŠæŠ¾ŃŃŠµŠ±Šø"
-#: ../src/dialogs.py:1603
+#: ../src/dialogs.py:1596
#, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
msgstr "ŠŠ°Ń
ŃŠµŠ² ŠæŃŠµŃŠæŠ»Š°ŃŠµ Š½Š° ŃŠ°ŃŃŠ½ %(account)s Š¾Š“ %(jid)s"
-#: ../src/dialogs.py:1606
+#: ../src/dialogs.py:1599
#, python-format
msgid "Subscription request from %s"
msgstr "ŠŠ°Ń
ŃŠµŠ² ŠæŃŠµŃŠæŠ»Š°ŃŠµ Š¾Š“ %s"
-#: ../src/dialogs.py:1667 ../src/gajim.py:2589
+#: ../src/dialogs.py:1660 ../src/gajim.py:2594
#, python-format
msgid "You are already in group chat %s"
msgstr "ŠŠµŃ ŃŃŠµ Ń Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ %s"
-#: ../src/dialogs.py:1675
+#: ../src/dialogs.py:1668
msgid "You can not join a group chat unless you are connected."
msgstr "ŠŠµ Š¼Š¾Š¶ŠµŃŠµ ŃŠµ ŠæŃŠøŠŗŃŃŃŠøŃŠø Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ Š°ŠŗŠ¾ Š½ŠøŃŃŠµ ŠæŠ¾Š²ŠµŠ·Š°Š½Šø."
-#: ../src/dialogs.py:1694
+#: ../src/dialogs.py:1687
#, python-format
msgid "Join Group Chat with account %s"
msgstr "ŠŃŠøŠ“ŃŃŠ¶ŠøŃŠµ ŃŠµ Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ ŠæŃŠµŠŗŠ¾ Š½Š°Š»Š¾Š³Š° %s"
-#: ../src/dialogs.py:1765
+#: ../src/dialogs.py:1758
msgid "Invalid Nickname"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ Š½Š°Š“ŠøŠ¼Š°Šŗ"
-#: ../src/dialogs.py:1766 ../src/groupchat_control.py:1329
-#: ../src/groupchat_control.py:1601
+#: ../src/dialogs.py:1759 ../src/groupchat_control.py:1435
+#: ../src/groupchat_control.py:1716
msgid "The nickname has not allowed characters."
msgstr "ŠŠ°Š“ŠøŠ¼Š°Šŗ ŃŠ°Š“ŃŠ¶Šø Š½ŠµŠ“Š¾Š·Š²Š¾ŃŠµŠ½Šµ ŠŗŠ°ŃŠ°ŠŗŃŠµŃŠµ."
-#: ../src/dialogs.py:1770 ../src/dialogs.py:1776
-#: ../src/groupchat_control.py:1766
+#: ../src/dialogs.py:1763 ../src/dialogs.py:1769
+#: ../src/groupchat_control.py:1883
msgid "Invalid group chat Jabber ID"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ ŠŠ°Š±ŠµŃ ŠŠ Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°"
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1767
+#: ../src/dialogs.py:1764 ../src/dialogs.py:1770
+#: ../src/groupchat_control.py:1884
msgid "The group chat Jabber ID has not allowed characters."
msgstr "ŠŠ°Š±ŠµŃ ŠŠ Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° ŠøŠ¼Š° Š½ŠµŠ“Š¾Š·Š²Š¾ŃŠµŠ½Šµ Š·Š½Š°ŠŗŠµ."
-#: ../src/dialogs.py:1783
+#: ../src/dialogs.py:1776
msgid "This is not a group chat"
msgstr "ŠŠ²Š¾ Š½ŠøŃŠµ Š³ŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń"
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:1777
#, python-format
msgid "%s is not the name of a group chat."
msgstr "%s Š½ŠøŃŠµ ŠøŠ¼Šµ Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°."
-#: ../src/dialogs.py:1811
+#: ../src/dialogs.py:1804
msgid "Without a connection, you can not synchronise your contacts."
msgstr "ŠŠµŠ· Š²ŠµŠ·Šµ, Š½ŠøŃŠµ Š¼Š¾Š³ŃŃŠµ ŃŠøŠ½Ń
ŃŠ¾Š½ŠøŠ·Š¾Š²Š°ŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŃŠµ."
-#: ../src/dialogs.py:1825
+#: ../src/dialogs.py:1818
msgid "Server"
msgstr "Š”ŠµŃŠ²ŠµŃ"
-#: ../src/dialogs.py:1858
+#: ../src/dialogs.py:1851
msgid "This account is not connected to the server"
msgstr "ŠŠ²Š°Ń Š½Š°Š»Š¾Š³ Š½ŠøŃŠµ ŠæŠ¾Š²ŠµŠ·Š°Š½ Š½Š° ŃŠµŃŠ²ŠµŃ"
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1852
msgid "You cannot synchronize with an account unless it is connected."
msgstr "ŠŠµ Š¼Š¾Š¶ŠµŃŠµ ŃŠµ ŃŠøŠ½Ń
ŃŠ¾Š½ŠøŠ·Š¾Š²Š°ŃŠø ŃŠ° Š½Š°Š»Š¾Š³Š¾Š¼ Š°ŠŗŠ¾ Š½ŠøŃŃŠµ ŠæŠ¾Š²ŠµŠ·Š°Š½Šø."
-#: ../src/dialogs.py:1883
+#: ../src/dialogs.py:1876
msgid "Synchronise"
msgstr "Š”ŠøŠ½Ń
ŃŠ¾Š½ŠøŠ·ŃŃ"
-#: ../src/dialogs.py:1941
+#: ../src/dialogs.py:1934
#, python-format
msgid "Start Chat with account %s"
msgstr "ŠŠ°ŠæŠ¾ŃŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń ŃŠ° ŃŠ°Š·ŃŠ½Š¾Š¼ %s"
-#: ../src/dialogs.py:1943
+#: ../src/dialogs.py:1936
msgid "Start Chat"
msgstr "ŠŠ°ŠæŠ¾ŃŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń"
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:1937
msgid ""
"Fill in the nickname or the Jabber ID of the contact you would like\n"
"to send a chat message to:"
@@ -6337,312 +6433,325 @@
"ŠæŠ¾ŃŠ»Š°ŃŠø ŠæŠ¾ŃŃŠŗŃ:"
#. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2344 ../src/dialogs.py:2487
+#: ../src/dialogs.py:1961 ../src/dialogs.py:2335 ../src/dialogs.py:2478
+#: ../src/normal_control.py:640
msgid "Connection not available"
msgstr "ŠŠµŠ·Š° Š½ŠøŃŠµ Š“Š¾ŃŃŃŠæŠ½Š°"
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
+#: ../src/dialogs.py:1962 ../src/dialogs.py:2336 ../src/dialogs.py:2479
+#: ../src/normal_control.py:641
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "ŠŠ¾Š»ŠøŠ¼Š¾ ŠæŠ¾ŃŠ²ŃŠ“ŠøŃŠµ Š“Š° ŃŃŠµ ŃŠæŠ¾ŃŠµŠ½Šø Š½Š° \"%s\"."
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:1971 ../src/dialogs.py:1974
msgid "Invalid JID"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ ŃŠ°Š±ŠµŃ ŠŠ"
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:1974
#, python-format
msgid "Unable to parse \"%s\"."
msgstr "ŠŠøŃŠµ Š¼Š¾Š³ŃŃŠµ ŃŠ°Š·Š»Š¾Š¶ŠøŃŠø \"%s\"."
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:1983
msgid "Without a connection, you can not change your password."
msgstr "ŠŠµŠ· Š²ŠµŠ·Šµ Š½ŠøŃŠµ Š¼Š¾Š³ŃŃŠ° ŠæŃŠ¾Š¼ŠµŠ½Š° Š»Š¾Š·ŠøŠ½ŠŗŠµ."
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2002
msgid "Invalid password"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š½Š° Š»Š¾Š·ŠøŠ½ŠŗŠ°"
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2002
msgid "You must enter a password."
msgstr "ŠŠ¾ŃŠ°ŃŠµ Š“Š° ŃŠ½ŠµŃŠµŃŠµ Š»Š¾Š·ŠøŠ½ŠŗŃ"
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2006
msgid "Passwords do not match"
msgstr "ŠŠ¾Š·ŠøŠ½ŠŗŠµ ŃŠµ Š½Šµ ŠæŠ¾ŠŗŠ»Š°ŠæŠ°ŃŃ"
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2007
msgid "The passwords typed in both fields must be identical."
msgstr "ŠŠ¾Š·ŠøŠ½ŠŗŠµ ŃŠæŠøŃŠ°Š½Šµ Ń Š¾Š±Š° ŠæŠ¾ŃŠ° Š¼Š¾ŃŠ°ŃŃ Š±ŠøŃŠø ŠøŠ“ŠµŠ½ŃŠøŃŠ½Šµ."
#. img to display
#. default value
-#: ../src/dialogs.py:2054 ../src/notify.py:246 ../src/notify.py:460
+#: ../src/dialogs.py:2046 ../src/notify.py:246 ../src/notify.py:460
#: ../src/osx/growler.py:12
msgid "Contact Signed In"
msgstr "ŠŠ¾Š½ŃŠ°ŠŗŃ ŃŠµ Š½Š° Š²ŠµŠ·Šø"
-#: ../src/dialogs.py:2056 ../src/notify.py:254 ../src/notify.py:462
+#: ../src/dialogs.py:2048 ../src/notify.py:254 ../src/notify.py:462
#: ../src/osx/growler.py:12
msgid "Contact Signed Out"
msgstr "ŠŠ¾Š½ŃŠ°ŠŗŃ ŃŠµ Š¾ŃŠøŃŠ°Š¾ ŃŠ° Š²ŠµŠ·Šµ"
#. chat message
-#: ../src/dialogs.py:2058 ../src/notify.py:277 ../src/notify.py:464
+#: ../src/dialogs.py:2050 ../src/notify.py:277 ../src/notify.py:464
#: ../src/osx/growler.py:12
msgid "New Message"
msgstr "ŠŠ¾Š²Š° ŠŠ¾ŃŃŠŗŠ°"
#. single message
-#: ../src/dialogs.py:2058 ../src/notify.py:258 ../src/notify.py:464
+#: ../src/dialogs.py:2050 ../src/notify.py:258 ../src/notify.py:464
#: ../src/osx/growler.py:13
msgid "New Single Message"
msgstr "ŠŠ¾Š²Š° Š”Š°Š¼Š¾ŃŃŠ°Š»Š½Š° ŠŠ¾ŃŃŠŗŠ°"
#. private message
-#: ../src/dialogs.py:2059 ../src/notify.py:265 ../src/notify.py:465
+#: ../src/dialogs.py:2051 ../src/notify.py:265 ../src/notify.py:465
#: ../src/osx/growler.py:13
msgid "New Private Message"
msgstr "ŠŠ¾Š²Š° ŠŃŠøŠ²Š°ŃŠ½Š° ŠŠ¾ŃŃŠŗŠ°"
-#: ../src/dialogs.py:2059 ../src/gajim.py:1576 ../src/notify.py:473
+#: ../src/dialogs.py:2051 ../src/gajim.py:1582 ../src/notify.py:473
#: ../src/osx/growler.py:13
msgid "New E-mail"
msgstr "ŠŠ¾Š²Šø Š-Š¼ŠµŃŠ»"
-#: ../src/dialogs.py:2061 ../src/gajim.py:1642 ../src/notify.py:467
+#: ../src/dialogs.py:2053 ../src/gajim.py:1648 ../src/notify.py:467
#: ../src/osx/growler.py:14
msgid "File Transfer Request"
msgstr "ŠŠ°Ń
ŃŠµŠ² Š·Š° ŠæŃŠµŠ½Š¾ŃŠ¾Š¼ Š“Š°ŃŠ¾ŃŠµŠŗŠµ"
-#: ../src/dialogs.py:2063 ../src/gajim.py:1541 ../src/gajim.py:1609
+#: ../src/dialogs.py:2055 ../src/gajim.py:1548 ../src/gajim.py:1615
#: ../src/notify.py:469 ../src/osx/growler.py:14
msgid "File Transfer Error"
msgstr "ŠŃŠµŃŠŗŠ° ŠæŃŠø ŠæŃŠµŠ½Š¾ŃŃ Š“Š°ŃŠ¾ŃŠµŠŗŠµ"
-#: ../src/dialogs.py:2065 ../src/gajim.py:1681 ../src/gajim.py:1703
-#: ../src/gajim.py:1720 ../src/notify.py:471 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2057 ../src/gajim.py:1690 ../src/gajim.py:1712
+#: ../src/gajim.py:1729 ../src/notify.py:471 ../src/osx/growler.py:15
msgid "File Transfer Completed"
msgstr "ŠŃŠµŠ½Š¾Ń Š“Š°ŃŠ¾ŃŠµŠŗŠµ Š·Š°Š²ŃŃŠµŠ½"
-#: ../src/dialogs.py:2066 ../src/gajim.py:1684 ../src/notify.py:471
+#: ../src/dialogs.py:2058 ../src/gajim.py:1693 ../src/notify.py:471
#: ../src/osx/growler.py:15
msgid "File Transfer Stopped"
msgstr "ŠŃŠµŠ½Š¾Ń Š“Š°ŃŠ¾ŃŠµŠŗŠµ Š·Š°ŃŃŃŠ°Š²ŃŠµŠ½"
-#: ../src/dialogs.py:2068 ../src/gajim.py:1432 ../src/notify.py:475
+#: ../src/dialogs.py:2060 ../src/gajim.py:1440 ../src/notify.py:475
#: ../src/osx/growler.py:16
msgid "Groupchat Invitation"
msgstr "ŠŠ¾Š·ŠøŠ² Š½Š° Š³ŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń"
-#: ../src/dialogs.py:2070 ../src/notify.py:238 ../src/notify.py:477
+#: ../src/dialogs.py:2062 ../src/notify.py:238 ../src/notify.py:477
#: ../src/osx/growler.py:16
msgid "Contact Changed Status"
msgstr "ŠŠ¾Š½ŃŠ°ŠŗŃ ŠæŃŠ¾Š¼ŠµŠ½ŠøŠ¾ ŃŃŠ°ŃŃŃ"
-#: ../src/dialogs.py:2263
+#: ../src/dialogs.py:2254 ../src/normal_control.py:241
#, python-format
msgid "Single Message using account %s"
msgstr "Š”Š°Š¼Š¾ŃŃŠ°Š»Š½Š° ŠæŠ¾ŃŃŠŗŠ° ŠŗŠ¾ŃŠøŃŃŠµŃŠø Š½Š°Š»Š¾Š³ %s"
-#: ../src/dialogs.py:2265
+#: ../src/dialogs.py:2256 ../src/normal_control.py:243
#, python-format
msgid "Single Message in account %s"
msgstr "Š”Š°Š¼Š¾ŃŃŠ°Š»Š½Š° ŠæŠ¾ŃŃŠŗŠ° Š½Š° Š½Š°Š»Š¾Š³Ń %s"
-#: ../src/dialogs.py:2267
+#: ../src/dialogs.py:2258 ../src/normal_control.py:245
msgid "Single Message"
msgstr "Š”Š°Š¼Š¾ŃŃŠ°Š»Š½Š° ŠŠ¾ŃŃŠŗŠ°"
#. prepare UI for Sending
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2261 ../src/normal_control.py:248
#, python-format
msgid "Send %s"
msgstr "ŠŠ¾ŃŠ»Š°ŃŠµ %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2293
+#: ../src/dialogs.py:2284 ../src/normal_control.py:290
#, python-format
msgid "Received %s"
msgstr "ŠŃŠøŠ¼ŃŠµŠ½Šµ %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2316
+#: ../src/dialogs.py:2307 ../src/normal_control.py:324
#, python-format
msgid "Form %s"
msgstr "Š¤Š¾ŃŠ¼Š° %s"
#. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2379 ../src/normal_control.py:692
#, python-format
msgid "RE: %s"
msgstr "RE: %s"
-#: ../src/dialogs.py:2389
+#: ../src/dialogs.py:2380 ../src/normal_control.py:696
#, python-format
msgid "%s wrote:\n"
msgstr "%s ŠæŠøŃŠµ:\n"
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2424
#, python-format
msgid "XML Console for %s"
msgstr "XML ŠŠ¾Š½Š·Š¾Š»Š° Š·Š° %s"
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2426
msgid "XML Console"
msgstr "XML ŠŠ¾Š½Š·Š¾Š»Š°"
-#: ../src/dialogs.py:2559
+#: ../src/dialogs.py:2550
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "ŠŠøŃŃŠ° ŠæŃŠøŠ²Š°ŃŠ½Š¾ŃŃŠø <b><i>%s</i></b>"
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:2554
#, python-format
msgid "Privacy List for %s"
msgstr "ŠŠøŃŃŠ° ŠæŃŠøŠ²Š°ŃŠ½Š¾ŃŃŠø Š·Š° %s"
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:2610
#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
msgstr ""
"Š ŠµŠ“Š¾ŃŠ»ŠµŠ“: %(order)s, Š°ŠŗŃŠøŃŠ°: %(action)s, ŃŠøŠæ: %(type)s, Š²ŃŠµŠ“Š½Š¾ŃŃ: %(value)s"
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:2615
#, python-format
msgid "Order: %(order)s, action: %(action)s"
msgstr "Š ŠµŠ“Š¾ŃŠ»ŠµŠ“: %(order)s, Š°ŠŗŃŠøŃŠ°: %(action)s"
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:2657
msgid "<b>Edit a rule</b>"
msgstr "<b>ŠŠ·Š¼ŠµŠ½Šø ŠæŃŠ°Š²ŠøŠ»Š¾</b>"
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:2744
msgid "<b>Add a rule</b>"
msgstr "<b>ŠŠ¾Š“Š°Ń ŠæŃŠ°Š²ŠøŠ»Š¾</b>"
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:2840
#, python-format
msgid "Privacy Lists for %s"
msgstr "ŠŠøŃŃŠ° ŠæŃŠøŠ²Š°ŃŠ½Š¾ŃŃŠø Š·Š° %s"
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:2842
msgid "Privacy Lists"
msgstr "ŠŠøŃŃŠ° ŠæŃŠøŠ²Š°ŃŠ½Š¾ŃŃŠø"
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:2912
msgid "Invalid List Name"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š½Š¾ ŠøŠ¼Šµ Š»ŠøŃŃŠµ"
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:2913
msgid "You must enter a name to create a privacy list."
msgstr "ŠŠ¾ŃŠ°ŃŠµ ŃŠ½ŠµŃŠø ŠøŠ¼Šµ Š·Š° ŠŗŃŠµŠøŃŠ°ŃŠµ Š»ŠøŃŃŠµ ŠæŃŠøŠ²Š°ŃŠ½Š¾ŃŃŠø"
-#: ../src/dialogs.py:2955
+#: ../src/dialogs.py:2945
msgid "You are invited to a groupchat"
msgstr "ŠŠ¾Š·Š²Š°Š½Šø ŃŃŠµ Ń Š³ŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń"
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:2948
msgid "$Contact has invited you to join a discussion"
msgstr "$Contact ŠŠ°Ń ŃŠµ ŠæŠ¾Š·Š²Š°Š¾ Š½Š° ŃŠ°Š·Š³Š¾Š²Š¾Ń"
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:2950
#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr "$Contact ŠŠ°Ń ŃŠµ ŠæŠ¾Š·Š²Š°Š¾ Š½Š° Š³ŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń Ń ŃŠ¾Š±Ń %(room_jid)s"
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:2958
#, python-format
msgid "Comment: %s"
msgstr "ŠŠ¾Š¼ŠµŠ½ŃŠ°Ń: %s"
-#: ../src/dialogs.py:2970
+#: ../src/dialogs.py:2960
msgid "Do you want to accept the invitation?"
msgstr "ŠŠ° Š»Šø Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŠæŃŠøŃ
Š²Š°ŃŠøŃŠµ Š¾Š²Ń ŠæŠ¾Š·ŠøŠ²Š½ŠøŃŃ?"
-#: ../src/dialogs.py:3025
+#: ../src/dialogs.py:3015
msgid "Choose Sound"
msgstr "ŠŠ“Š°Š±ŠµŃŠøŃŠµ Š·Š²ŃŠŗ"
-#: ../src/dialogs.py:3035 ../src/dialogs.py:3086
+#: ../src/dialogs.py:3025 ../src/dialogs.py:3076
msgid "All files"
msgstr "Š”Š²Šµ Š“Š°ŃŠ¾ŃŠµŠŗŠµ"
-#: ../src/dialogs.py:3040
+#: ../src/dialogs.py:3030
msgid "Wav Sounds"
msgstr "Wav ŠŠ²ŃŠŗŠ¾Š²Šø"
-#: ../src/dialogs.py:3073
+#: ../src/dialogs.py:3063
msgid "Choose Image"
msgstr "ŠŠ“Š°Š±ŠµŃŠøŃŠµ ŃŠ»ŠøŠŗŃ"
-#: ../src/dialogs.py:3091
+#: ../src/dialogs.py:3081
msgid "Images"
msgstr "Š”Š»ŠøŠŗŠµ"
-#: ../src/dialogs.py:3156
+#: ../src/dialogs.py:3146
#, python-format
msgid "When %s becomes:"
msgstr "ŠŠ°Š“ %s ŠæŠ¾ŃŃŠ°Š½Šµ:"
-#: ../src/dialogs.py:3158
+#: ../src/dialogs.py:3148
#, python-format
msgid "Adding Special Notification for %s"
msgstr "ŠŠ¾Š“Š°Š²Š°ŃŠµ ŠæŠ¾ŃŠµŠ±Š½Š¾Š³ Š¾Š±Š°Š²ŠµŃŃŠµŃŠ° Š·Š° %s"
#. # means number
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3219
msgid "#"
msgstr "#"
-#: ../src/dialogs.py:3235
+#: ../src/dialogs.py:3225
msgid "Condition"
msgstr "Š£ŃŠ»Š¾Š²"
-#: ../src/dialogs.py:3353
+#: ../src/dialogs.py:3343
msgid "when I am "
msgstr "ŠŗŠ°Š“Š° ŃŠ°Š¼ "
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:3818
#, fuzzy, python-format
msgid ""
-"Your chat session with %(jid)s is encrypted.\n"
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
"\n"
-"This session's Short Authentication String is %(sas)s."
+"This session's Short Authentication String is <b>%(sas)s</b>."
msgstr ""
"ŠŠ°ŃŠ° ŃŠµŃŠøŃŠ° ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° ŃŠ° %(jid)s ŃŠµ ŃŠøŃŃŠ¾Š²Š°Š½Š°.\n"
"\n"
"ŠŃŠ°ŃŠŗŠ° ŠŃŃŠµŠ½ŃŠøŠŗŠ°ŃŠøŠ¾Š½Š° ŠŠøŃŠŗŠ° (ŠŠŠ) Š¾Š²Šµ ŃŠµŃŠøŃŠµ ŃŠµ: %(sas)s"
-#: ../src/dialogs.py:3831
+#: ../src/dialogs.py:3822
msgid "You have already verified this contact's identity."
msgstr "ŠŠµŃ ŃŃŠµ ŠæŠ¾ŃŠ²ŃŠ“ŠøŠ»Šø ŠøŠ“ŠµŠ½ŃŠøŃŠµŃ Š¾Š²Š¾Š³ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ°."
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:3828 ../src/dialogs.py:3915
msgid "Contact's identity verified"
msgstr ""
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:3836
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3841
+#, fuzzy
msgid ""
-"To be certain that only the expected person can read your messages or send "
-"you messages, you need to verify their identity."
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
msgstr ""
"ŠŠ° Š±ŠøŃŃŠµ Š±ŠøŠ»Šø ŃŠøŠ³ŃŃŠ½Šø Š“Š° ŃŠ°Š¼Š¾ Š¾ŃŠµŠŗŠøŠ²Š°Š½Šµ Š¾ŃŠ¾Š±Šµ Š¼Š¾Š³Ń Š“Š° ŃŠøŃŠ°ŃŃ ŠŠ°ŃŠµ ŠæŠ¾ŃŃŠŗŠµ ŠøŠ»Šø "
"Š“Š° ŠŠ°Š¼ ŃŠ°ŃŃ ŠæŠ¾ŃŃŠŗŠµ, Š¼Š¾ŃŠ°ŃŠµ ŠæŠ¾ŃŠ²ŃŠ“ŠøŃŠø ŃŠøŃ
Š¾Š² ŠøŠ“ŠµŠ½ŃŠøŃŠµŃ."
-#: ../src/dialogs.py:3842
+#: ../src/dialogs.py:3844 ../src/dialogs.py:3896 ../src/dialogs.py:3909
msgid "Contact's identity NOT verified"
msgstr ""
-#: ../src/dialogs.py:3854
-msgid "Have you verified the remote contact's identity?"
+#: ../src/dialogs.py:3851
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3863
+#, fuzzy
+msgid "Have you verified the contact's identity?"
msgstr "ŠŠ° Š»Šø ŃŃŠµ ŠæŃŠ¾Š²ŠµŃŠøŠ»Šø ŠøŠ“ŠµŠ½ŃŠøŃŠµŃ ŃŠ“Š°ŃŠµŠ½Š¾Š³ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ°?"
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:3864
#, fuzzy, python-format
msgid ""
-"To prevent a man-in-the-middle attack, you should speak to %(jid)s directly "
-"(in person or on the phone) and verify that they see the same Short "
+"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
+"directly (in person or on the phone) and verify that they see the same Short "
"Authentication String (SAS) as you.\n"
"\n"
"This session's Short Authentication String is <b>%(sas)s</b>."
@@ -6652,37 +6761,58 @@
"ŠøŃŃŃ ŠŗŃŠ°ŃŠŗŃ ŠŃŃŠµŠ½ŃŠøŠŗŠ°ŃŠøŠ¾Š½Ń Š½ŠøŃŠŗŃ ŠŗŠ°Š¾ Š²Šø.\n"
"ŠŃŠ°ŃŠŗŠ° ŠŃŃŠµŠ½ŃŠøŠŗŠ°ŃŠøŠ¾Š½Š° ŠŠøŃŠŗŠ° (ŠŠŠ) Š¾Š²Šµ ŃŠµŃŠøŃŠµ: <b>%(sas)s</b>"
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:3865
msgid "Did you talk to the remote contact and verify the SAS?"
msgstr "ŠŠ° Š»Šø ŃŃŠµ ŃŠ°Š·Š³Š¾Š²Š°ŃŠ°Š»Šø ŃŠ° ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ¾Š¼ Šø ŠæŠ¾ŃŠ²ŃŠ“ŠøŠ»Šø ŠŠŠ?"
-#: ../src/disco.py:115
+#: ../src/dialogs.py:3897
+#, fuzzy, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr "ŠŃŃŃ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° (%s) Š½Šµ ŠæŠ¾ŠŗŠ»Š°ŠæŠ° ŃŠµ ŃŠ° ŠŗŃŃŃŠµŠ¼ ŠæŃŠøŠ“ŃŃŠ¶ŠµŠ½ŠøŠ¼ Ń ŠŠ°ŃŠøŠ¼Ń."
+
+#: ../src/dialogs.py:3903
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3910
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3916
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
msgid "Others"
msgstr "ŠŃŃŠ°Š»Šø"
#. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:119
+#: ../src/disco.py:120
msgid "Conference"
msgstr "ŠŠ¾Š½ŃŠµŃŠµŠ½ŃŠøŃŠ°"
-#: ../src/disco.py:439
+#: ../src/disco.py:440
msgid "Without a connection, you can not browse available services"
msgstr "ŠŠµŠ· ŃŃŠæŠ¾ŃŃŠ°Š²ŃŠµŠ½Šµ Š²ŠµŠ·Šµ, Š½Šµ Š¼Š¾Š¶ŠµŃŠµ ŃŠ°Š·Š³Š»ŠµŠ“Š°ŃŠø Š“Š¾ŃŃŃŠæŠ½Šµ ŃŃŠ»ŃŠ³Šµ"
-#: ../src/disco.py:513
+#: ../src/disco.py:514
#, python-format
msgid "Service Discovery using account %s"
msgstr "ŠŃŠŗŃŠøŠ²Š°ŃŠµ ŃŃŠ»ŃŠ³Š° ŃŠ° Š½Š°Š»Š¾Š³Š° %s"
-#: ../src/disco.py:515
+#: ../src/disco.py:516
msgid "Service Discovery"
msgstr "ŠŃŠŗŃŠøŠ²Š°ŃŠµ Š£ŃŠ»ŃŠ³Š°"
-#: ../src/disco.py:655
+#: ../src/disco.py:656
msgid "The service could not be found"
msgstr "Š£ŃŠ»ŃŠ³Š° Š½Šµ Š¼Š¾Š¶Šµ Š±ŠøŃŠø Š½Š°ŃŠµŠ½Š°"
-#: ../src/disco.py:656
+#: ../src/disco.py:657
msgid ""
"There is no service at the address you entered, or it is not responding. "
"Check the address and try again."
@@ -6690,72 +6820,77 @@
"ŠŠ° Š½Š°Š²ŠµŠ“ŠµŠ½Š¾Ń Š°Š“ŃŠµŃŠø Š½ŠµŠ¼Š° ŃŃŃŠ³Š°, ŠøŠ»Šø Š½ŠµŠ¼Š° Š¾Š“Š³Š¾Š²Š¾ŃŠ°. ŠŃŠ¾Š²ŠµŃŠøŃŠµ Š°Š“ŃŠµŃŃ Šø "
"ŠæŠ¾ŠŗŃŃŠ°ŃŃŠµ ŠæŠ¾Š½Š¾Š²Š¾."
-#: ../src/disco.py:660 ../src/disco.py:942
+#: ../src/disco.py:661 ../src/disco.py:955
msgid "The service is not browsable"
msgstr "Š£ŃŠ»ŃŠ³Šµ Š½ŠøŃŃ ŠæŃŠµŃŃŠ°Š¶ŠøŠ²Šµ"
-#: ../src/disco.py:661
+#: ../src/disco.py:662
msgid "This type of service does not contain any items to browse."
msgstr "ŠŠ²Š°Ń ŃŠøŠæ ŃŃŠ»ŃŠ³Šµ Š½Šµ ŃŠ°Š“ŃŠ¶Šø ŠµŠ»ŠµŠ¼ŠµŠ½ŃŠµ Š·Š° ŠæŃŠµŃŃŠ°Š³Ń"
-#: ../src/disco.py:741
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ ŃŠµŃŠ²ŠµŃ"
+
+#: ../src/disco.py:754
#, python-format
msgid "Browsing %(address)s using account %(account)s"
msgstr "ŠŃŠµŃŃŠ°Š¶ŃŃŠµŠ¼ %(address)s ŠŗŠ¾ŃŠøŃŃŠµŃŠø Š½Š°Š»Š¾Š³ %(account)s"
-#: ../src/disco.py:781
+#: ../src/disco.py:794
msgid "_Browse"
msgstr "_ŠŃŠµŠ³Š»ŠµŠ“"
-#: ../src/disco.py:943
+#: ../src/disco.py:956
msgid "This service does not contain any items to browse."
msgstr "ŠŠ²Š° ŃŃŠ»ŃŠ³Š° Š½Šµ ŃŠ°Š“ŃŠ¶Šø ŠµŠ»ŠµŠ¼ŠµŠ½ŃŠµ Š·Š° ŠæŃŠµŃŃŠ°Š³Ń"
-#: ../src/disco.py:1164
+#: ../src/disco.py:1179
msgid "_Execute Command"
msgstr "_ŠŠ·Š²ŃŃŠø Š½Š°ŃŠµŠ“Š±Ń"
-#: ../src/disco.py:1174 ../src/disco.py:1338
+#: ../src/disco.py:1189 ../src/disco.py:1353
msgid "Re_gister"
msgstr "Š Šµ_Š³ŠøŃŃŃŠ°ŃŠøŃŠ°"
-#: ../src/disco.py:1375
+#: ../src/disco.py:1390
#, python-format
msgid "Scanning %(current)d / %(total)d.."
msgstr "Š”ŠŗŠµŠ½ŠøŃŠ°ŃŠµ %(current)d / %(total)d.."
#. Users column
-#: ../src/disco.py:1557
+#: ../src/disco.py:1572
msgid "Users"
msgstr "ŠŠ¾ŃŠøŃŠ½ŠøŃŠø"
#. Description column
-#: ../src/disco.py:1565
+#: ../src/disco.py:1580
msgid "Description"
msgstr "ŠŠæŠøŃ"
#. Id column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1588
msgid "Id"
msgstr "ŠŠ“ŠµŠ½ŃŠøŃŠøŠŗŠ°ŃŠøŃŠ°"
-#: ../src/disco.py:1802
+#: ../src/disco.py:1818
msgid "Subscribed"
msgstr "ŠŃŠµŃŠæŠ»Š°ŃŠµŠ½"
-#: ../src/disco.py:1810
+#: ../src/disco.py:1826
msgid "Node"
msgstr "Š§Š²Š¾Ń"
-#: ../src/disco.py:1867
+#: ../src/disco.py:1883
msgid "New post"
msgstr "ŠŠ¾Š²Š° Š¾Š±ŃŠ°Š²Š°"
-#: ../src/disco.py:1873
+#: ../src/disco.py:1889
msgid "_Subscribe"
msgstr "_ŠŃŠµŃŠæŠ»Š°ŃŠø ŃŠµ"
-#: ../src/disco.py:1879
+#: ../src/disco.py:1895
msgid "_Unsubscribe"
msgstr "_Š£ŠŗŠøŠ½Šø ŠæŃŠµŃŠæŠ»Š°ŃŃ"
@@ -6795,7 +6930,8 @@
msgstr "gajim-remote"
#: ../src/features_window.py:60
-msgid "A script to controle Gajim via commandline."
+#, fuzzy
+msgid "A script to control Gajim via commandline."
msgstr "Š”ŠŗŃŠøŠæŃŠ° Š·Š° ŠŗŠ¾Š½ŃŃŠ¾Š»Ń ŠŠ°ŃŠøŠ¼Š° ŠøŠ· ŠŗŠ¾Š¼Š°Š½Š“Š½Šµ Š»ŠøŠ½ŠøŃŠµ."
#: ../src/features_window.py:61
@@ -6805,7 +6941,7 @@
#: ../src/features_window.py:62 ../src/features_window.py:66
#: ../src/features_window.py:70 ../src/features_window.py:74
#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90 ../src/features_window.py:102
+#: ../src/features_window.py:90
msgid "Feature not available under Windows."
msgstr "ŠŠ¾Š³ŃŃŠ½Š¾ŃŃ Š½ŠøŃŠµ Š“Š¾ŃŃŃŠæŠ½Š° ŠæŠ¾Š“ ŠŠøŠ½Š“Š¾ŃŠ· ŃŠøŃŃŠµŠ¼Š¾Š¼."
@@ -6947,8 +7083,18 @@
msgstr "ŠŃŠµŃŠ²Š°ŃŠ° LaTeX ŠøŠ·ŃŠ°Š·Šµ ŠøŠ·Š¼ŠµŃŃ $$ $$."
#: ../src/features_window.py:101
+#, fuzzy
msgid ""
-"Requires texlive-latex-base, dvips and imagemagick. You have to set "
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+"ŠŠ°Ń
ŃŠµŠ²Š° texlive-latex-base, dvips Šø imagemagick. ŠŠ¾ŃŠ°ŃŠµ ŠæŠ¾Š“ŠµŃŠøŃŠø'use_latex' "
+"Š½Š° True Ń ŠµŠ“ŠøŃŠ¾ŃŃ Š½Š°ŠæŃŠµŠ“Š½ŠøŃ
ŠæŠ¾Š“ŠµŃŠ°Š²Š°ŃŠ°."
+
+#: ../src/features_window.py:102
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
"'use_latex' to True in the Advanced Configuration Editor."
msgstr ""
"ŠŠ°Ń
ŃŠµŠ²Š° texlive-latex-base, dvips Šø imagemagick. ŠŠ¾ŃŠ°ŃŠµ ŠæŠ¾Š“ŠµŃŠøŃŠø'use_latex' "
@@ -7033,8 +7179,8 @@
msgid "Sender: %s"
msgstr "ŠŠ¾ŃŠ°ŃŠøŠ»Š°Ń: %s"
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:598
-#: ../src/tooltips.py:673
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:600
+#: ../src/tooltips.py:671
msgid "Recipient: "
msgstr "ŠŃŠøŠ¼Š°Š¾Ń: "
@@ -7073,7 +7219,7 @@
msgid "Choose File to Send..."
msgstr "ŠŠ“Š°Š±ŠµŃŠøŃŠµ Š“Š°ŃŠ¾ŃŠµŠŗŃ Š·Š° ŃŠ»Š°ŃŠµ..."
-#: ../src/filetransfers_window.py:258 ../src/tooltips.py:713
+#: ../src/filetransfers_window.py:258 ../src/tooltips.py:709
msgid "Description: "
msgstr "ŠŠæŠøŃ:"
@@ -7150,32 +7296,32 @@
#. This should make the string Kb/s,
#. where 'Kb' part is taken from %s.
#. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:530
#, python-format
msgid "(%(filesize_unit)s/s)"
msgstr "(%(filesize_unit)s/ŃŠµŠŗ)"
-#: ../src/filetransfers_window.py:568 ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:570 ../src/filetransfers_window.py:573
msgid "Invalid File"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š½Š° Š“Š°ŃŠ¾ŃŠµŠŗŠ°"
-#: ../src/filetransfers_window.py:568
+#: ../src/filetransfers_window.py:570
msgid "File: "
msgstr "ŠŠ°ŃŠ¾ŃŠµŠŗŠ°: "
-#: ../src/filetransfers_window.py:572
+#: ../src/filetransfers_window.py:574
msgid "It is not possible to send empty files"
msgstr "ŠŠøŃŠµ Š¼Š¾Š³ŃŃŠµ ŠæŠ¾ŃŠ»Š°ŃŠø ŠæŃŠ°Š·Š½Ń Š“Š°ŃŠ¾ŃŠµŠŗŃ"
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:663
+#: ../src/filetransfers_window.py:596 ../src/tooltips.py:661
msgid "Name: "
msgstr "ŠŠ¼Šµ: "
-#: ../src/filetransfers_window.py:596 ../src/tooltips.py:667
+#: ../src/filetransfers_window.py:598 ../src/tooltips.py:665
msgid "Sender: "
msgstr "ŠŠ¾ŃŠ°ŃŠøŠ»Š°Ń: "
-#: ../src/filetransfers_window.py:784
+#: ../src/filetransfers_window.py:786
msgid "Pause"
msgstr "ŠŠ°ŃŠ·Š°"
@@ -7253,68 +7399,79 @@
"ŠŠµŠ“Š½Š° ŠøŠ½ŃŃŠ°Š½ŃŠ° ŠŠ°ŃŠøŠ¼Š° ŠøŠ·Š³Š»ŠµŠ“Š° Š²ŠµŃ ŃŠ°Š“Šø\n"
"Š”Š²ŠµŃŠµŠ“Š½Š¾ Š¶ŠµŠ»ŠøŃŠµ ŠæŠ¾ŠŗŃŠµŠ½ŃŃŠø?"
-#: ../src/gajim.py:483
+#: ../src/gajim.py:491
msgid "Passphrase Required"
msgstr "ŠŠ¾Š·ŠøŠ½ŠŗŠ° Š½ŠµŠ¾ŠæŃ
Š¾Š“Š½Š°"
-#: ../src/gajim.py:484
+#: ../src/gajim.py:492
#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
msgstr "Š£Š½ŠµŃŠøŃŠµ Š»Š¾Š·ŠøŠ½ŠŗŃ GPG ŠŗŃŃŃŠ° %(keyid)s (Š½Š°Š»Š¾Š³ %(account)s)."
#. ask again
-#: ../src/gajim.py:499
+#: ../src/gajim.py:507
msgid "Wrong Passphrase"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š½Š° Š»Š¾Š·ŠøŠ½ŠŗŠ°"
-#: ../src/gajim.py:500
+#: ../src/gajim.py:508
msgid "Please retype your GPG passphrase or press Cancel."
msgstr "ŠŠ¾Š»ŠøŠ¼Š¾ ŠæŠ¾Š½Š¾Š²Š¾ ŃŠŗŃŃŠ°ŃŃŠµ ŠŠ°ŃŃ GPG Š»Š¾Š·ŠøŠ½ŠŗŃ ŠøŠ»Šø ŠæŃŠøŃŠøŃŠ½ŠøŃŠµ ŠŠ“ŃŃŃŠ°Š½Šø"
-#: ../src/gajim.py:560
+#: ../src/gajim.py:555
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"ŠŠ°Ń Š¶ŠµŃŠµŠ½Šø Š½Š°Š“ŠøŠ¼Š°Šŗ ŃŠµ ŃŃŠµŠ½ŃŃŠ½Š¾ Ń ŃŠæŠ¾ŃŃŠµŠ±Šø Ń Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ %s ŠøŠ»Šø ŃŠµ "
+"ŃŠµŠ³ŠøŃŃŃŠ¾Š²Š°Š½ Š¾Š“ ŃŃŃŠ°Š½Šµ Š½ŠµŠŗŠ¾Š³ Š¾Š“ ŃŃŠµŃŠ½ŠøŠŗŠ°.\n"
+"ŠŠ¾Š»ŠøŠ¼Š¾ Š¾Š“ŃŠµŠ“ŠøŃŠµ Š“ŃŃŠ³Šø Š½Š°Š“ŠøŠ¼Š°Šŗ ŠøŃŠæŠ¾Š“:"
+
+#: ../src/gajim.py:569
msgid "Do you accept this request?"
msgstr "ŠŃŠøŃ
Š²Š°ŃŠ°ŃŠµ Š»Šø Š¾Š²Š°Ń Š·Š°Ń
ŃŠµŠ²?"
-#: ../src/gajim.py:562
+#: ../src/gajim.py:571
#, python-format
msgid "Do you accept this request on account %s?"
msgstr "ŠŃŠøŃ
Š²Š°ŃŠ°ŃŠµ Š»Šø Š¾Š²Š°Ń Š·Š°Ń
ŃŠµŠ² Š½Š° Š½Š°Š»Š¾Š³Ń %s?"
-#: ../src/gajim.py:565
+#: ../src/gajim.py:574
#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
msgstr "HTTP (%(method)s) ŠŃŃŠ¾ŃŠøŠ·Š°ŃŠøŃŠ° Š·Š° %(url)s (ŠøŠ“: %(id)s)"
-#: ../src/gajim.py:613 ../src/notify.py:479 ../src/osx/growler.py:17
+#: ../src/gajim.py:622 ../src/notify.py:479 ../src/osx/growler.py:17
msgid "Connection Failed"
msgstr "ŠŠµŠ·Š° ŠæŃŠµŠŗŠøŠ½ŃŃŠ°"
-#: ../src/gajim.py:919 ../src/gajim.py:923
+#: ../src/gajim.py:928 ../src/gajim.py:932
#, python-format
msgid "Error %(code)s: %(msg)s"
msgstr "ŠŃŠµŃŠŗŠ° %(code)s: %(msg)s"
#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:933 ../src/gajim.py:946
+#: ../src/gajim.py:942 ../src/gajim.py:955
#, python-format
msgid "error while sending %(message)s ( %(error)s )"
msgstr "Š³ŃŠµŃŠŗŠ° ŠæŃŠøŠ»ŠøŠŗŠ¾Š¼ ŃŠ»Š°ŃŠ° %(message)s ( %(error)s )"
-#: ../src/gajim.py:977
+#: ../src/gajim.py:987
msgid "Authorization accepted"
msgstr "ŠŃŃŠ¾ŃŠøŠ·Š°ŃŠøŃŠ° ŠæŃŠøŃ
Š²Š°ŃŠµŠ½Š°"
-#: ../src/gajim.py:978
+#: ../src/gajim.py:988
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "ŠŠ¾Š½ŃŠ°ŠŗŃ \"%s\" ŃŠµ ŠæŃŠøŃ
Š²Š°ŃŠøŠ¾ Š“Š° Š²ŠøŠ“ŠøŃŠµ ŃŠµŠ³Š¾Š²/ŃŠµŠ½ ŃŃŠ°ŃŃŃ."
-#: ../src/gajim.py:997
+#: ../src/gajim.py:1007
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "ŠŠ¾Š½ŃŠ°ŠŗŃ \"%s\" ŃŠµ ŃŠŗŠøŠ½ŃŠ¾ ŠæŃŠµŃŠæŠ»Š°ŃŃ Š½Š° ŃŠµŠ³Š°"
-#: ../src/gajim.py:998
+#: ../src/gajim.py:1008
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
@@ -7322,74 +7479,74 @@
"Š£Š²ŠµŠŗ ŃŠµŃŠµ Š³Š°/ŃŠµ Š²ŠøŠ“ŠµŃŠø ŠŗŠ°Š¾ Š“Š° Š½ŠøŃŠµ Š½Š° Š²ŠµŠ·Šø.\n"
"ŠŠ° Š»Šø Š¶ŠµŠ»ŠøŃŠµ Š“Š° Š³Š°/ŃŠµ ŃŠŗŠ»Š¾Š½ŠøŃŠµ ŃŠ° Š»ŠøŃŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°?"
-#: ../src/gajim.py:1039
+#: ../src/gajim.py:1049
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "ŠŠ¾Š½ŃŠ°ŠŗŃ ŃŠ° \"%s\" ŃŠµ Š½Šµ Š¼Š¾Š¶Šµ ŃŃŠæŠ¾ŃŃŠ°Š²ŠøŃŠø"
-#: ../src/gajim.py:1218 ../src/groupchat_control.py:1066
+#: ../src/gajim.py:1225 ../src/groupchat_control.py:1146
#, python-format
msgid "%(nick)s is now known as %(new_nick)s"
msgstr "%(nick)s ŃŠµ Š¾Š“ ŃŠ°Š“Š° ŠæŠ¾Š·Š½Š°Ń ŠŗŠ°Š¾ %(new_nick)s"
-#: ../src/gajim.py:1233 ../src/groupchat_control.py:1216
-#: ../src/history_window.py:408 ../src/notify.py:233
+#: ../src/gajim.py:1240 ../src/groupchat_control.py:1321
+#: ../src/history_window.py:410 ../src/notify.py:233
#, python-format
msgid "%(nick)s is now %(status)s"
msgstr "%(nick)s ŃŠµ ŃŃŠµŠ½ŃŃŠ½Š¾ %(status)s"
-#: ../src/gajim.py:1296
+#: ../src/gajim.py:1303
#, python-format
-msgid "%s has set the subject to %s"
+msgid "%(jid)s has set the subject to %(subject)s"
msgstr ""
#. Can be a presence (see chg_contact_status in groupchat_control.py)
#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1359 ../src/groupchat_control.py:1026
+#: ../src/gajim.py:1367 ../src/groupchat_control.py:1106
msgid "Any occupant is allowed to see your full JID"
msgstr "Š”Š²ŠøŠ¼Š° ŠæŃŠøŃŃŃŠ½ŠøŠ¼Š° ŃŠµ Š“Š¾Š·Š²Š¾ŃŠµŠ½Š¾ Š“Š° Š²ŠøŠ“Šµ Š²Š°Ń ŠæŃŠ½ ŃŠ°Š±ŠµŃ ID"
-#: ../src/gajim.py:1362
+#: ../src/gajim.py:1370
msgid "Room now shows unavailable member"
msgstr "Š”Š¾Š±Š° ŃŠ°Š“Š° ŠæŃŠøŠŗŠ°Š·ŃŃŠµ Š½ŠµŠ“Š¾ŃŃŃŠæŠ½Šµ ŃŠ»Š°Š½Š¾Š²Šµ"
-#: ../src/gajim.py:1364
+#: ../src/gajim.py:1372
msgid "room now does not show unavailable members"
msgstr "ŃŠ¾Š±Š° ŃŠ°Š“Š° Š½Šµ ŠæŃŠøŠŗŠ°Š·ŃŃŠµ Š½ŠµŠ“Š¾ŃŃŃŠæŠ½Šµ ŃŠ»Š°Š½Š¾Š²Šµ"
-#: ../src/gajim.py:1367
+#: ../src/gajim.py:1375
msgid "A non-privacy-related room configuration change has occurred"
msgstr ""
"ŠŠµŃŠøŠ»Š° ŃŠµ ŠæŃŠ¾Š¼ŠµŠ½Š° Ń ŠŗŠ¾Š½ŃŠøŠ³ŃŃŠ°ŃŠøŃŠø ŃŠ¾Š±Šµ (Š½Š°ŠæŠ¾Š¼ŠµŠ½Š°: Š½Šµ ŃŃŠøŃŠµ Š½Š° ŠæŃŠøŠ²Š°ŃŠ½Š¾ŃŃ "
"ŠŗŠ¾ŃŠøŃŠ½ŠøŠŗŠ°)"
#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1370
+#: ../src/gajim.py:1378
msgid "Room logging is now enabled"
msgstr "ŠŠ¾Š³Š¾Š²Š°ŃŠµ Ń ŃŠ¾Š±Šø ŃŠµ ŃŠ°Š“Š° Š¾Š¼Š¾Š³ŃŃŠµŠ½Š¾"
-#: ../src/gajim.py:1372
+#: ../src/gajim.py:1380
msgid "Room logging is now disabled"
msgstr "ŠŠ¾Š³Š¾Š²Š°ŃŠµ Ń ŃŠ¾Š±Šø ŃŠµ ŃŠ°Š“Š° Š¾Š½ŠµŠ¼Š¾Š³ŃŃŠµŠ½Š¾"
-#: ../src/gajim.py:1374
+#: ../src/gajim.py:1382
msgid "Room is now non-anonymous"
msgstr "Š”Š¾Š±Š° ŃŠ°Š“Š° Š²ŠøŃŠµ Š½ŠøŃŠµ Š°Š½Š¾Š½ŠøŠ¼Š½Š°"
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1385
msgid "Room is now semi-anonymous"
msgstr "Š”Š¾Š±Š° ŃŠµ ŃŠ°Š“Š° ŠæŠ¾Š»Ń Š°Š½Š¾Š½ŠøŠ¼Š½Š°"
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1388
msgid "Room is now fully-anonymous"
msgstr "Š”Š¾Š±Š° ŃŠµ ŃŠ°Š“Š° ŠæŠ¾ŃŠæŃŠ½Š¾ Š°Š½Š¾Š½ŠøŠ¼Š½Š°"
-#: ../src/gajim.py:1412
+#: ../src/gajim.py:1420
#, python-format
msgid "A Password is required to join the room %s. Please type it."
msgstr "ŠŠ¾Š·ŠøŠ½ŠŗŠ° ŠæŠ¾ŃŃŠµŠ±Š½Š° Š·Š° ŠæŃŠøŠ“ŃŃŠ¶ŠøŠ²Š°ŃŠµ Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ %s. Š£Š½ŠµŃŠøŃŠµ ŃŠµ."
-#: ../src/gajim.py:1446
+#: ../src/gajim.py:1454
msgid ""
"You configured Gajim to use GPG agent, but there is no GPG agent running or "
"it returned a wrong passphrase.\n"
@@ -7397,20 +7554,20 @@
"ŠŠ¾Š½ŃŠøŠ³ŃŃŠøŃŠ°Š»Šø ŃŃŠµ ŠŠ°ŃŠøŠ¼ Š“Š° ŠŗŠ¾ŃŠøŃŃŠø GPG Š°Š³ŠµŠ½ŃŠ°, Š°Š»Šø Š½Šµ ŠæŠ¾ŃŃŠ¾ŃŠø GPG Š°Š³ŠµŠ½Ń ŠŗŠ¾ŃŠø "
"ŃŠ°Š“Šø ŠøŠ»Šø ŃŠµ Š²ŃŠ°ŃŠøŠ¾ Š»Š¾ŃŃ ŃŃŠ°Š·Ń Š»Š¾Š·ŠøŠ½ŠŗŠµ.\n"
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1456
msgid "You are currently connected without your OpenPGP key."
msgstr "Š¢ŃŠµŠ½ŃŃŠ½Š¾ ŃŃŠµ ŠæŠ¾Š²ŠµŠ·Š°Š½Šø Š±ŠµŠ· OpenPGP ŠŗŃŃŃŠ°."
-#: ../src/gajim.py:1451
+#: ../src/gajim.py:1459
msgid "Your passphrase is incorrect"
msgstr "ŠŠ°ŃŠ° Š»Š¾Š·ŠøŠ½ŠŗŠ° Š½ŠøŃŠµ ŃŠ°ŃŠ½Š°"
-#: ../src/gajim.py:1552
+#: ../src/gajim.py:1559
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "ŠŠ¾Š²Šø Šµ-Š¼ŠµŃŠ» Š·Š° %(gmail_mail_address)s"
-#: ../src/gajim.py:1554
+#: ../src/gajim.py:1561
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
@@ -7418,7 +7575,7 @@
msgstr[1] "ŠŠ¼Š°ŃŠµ %d Š½Š¾Š²Š° Šµ-Š¼ŠµŃŠ» ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°"
msgstr[2] "ŠŠ¼Š°ŃŠµ %d Š½Š¾Š²ŠøŃ
Šµ-Š¼ŠµŃŠ» ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°"
-#: ../src/gajim.py:1568
+#: ../src/gajim.py:1574
#, python-format
msgid ""
"\n"
@@ -7433,34 +7590,34 @@
"Š¢ŠµŠ¼Š°: %(subject)s\n"
"%(snippet)s"
-#: ../src/gajim.py:1639
+#: ../src/gajim.py:1645
#, python-format
msgid "%s wants to send you a file."
msgstr "%s ŠŠ°Š¼ Š¶ŠµŠ»Šø ŠæŠ¾ŃŠ»Š°ŃŠø Š“Š°ŃŠ¾ŃŠµŠŗŃ."
-#: ../src/gajim.py:1704
+#: ../src/gajim.py:1713
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "Š£ŃŠæŠµŃŠ½Š¾ ŃŃŠµ ŠæŃŠøŠ¼ŠøŠ»Šø Š“Š°ŃŠ¾ŃŠµŠŗŃ %(filename)s Š¾Š“ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° %(name)s."
#. ft stopped
-#: ../src/gajim.py:1708
+#: ../src/gajim.py:1717
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "ŠŃŠµŠ½Š¾Ń Š“Š°ŃŠ¾ŃŠµŠŗŠµ %(filename)s Š¾Š“ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° %(name)s ŃŠµ Š·Š°ŃŃŃŠ°Š²ŃŠµŠ½."
-#: ../src/gajim.py:1721
+#: ../src/gajim.py:1730
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "Š£ŃŠæŠµŃŠ½Š¾ ŃŃŠµ ŠæŠ¾ŃŠ»Š°Š»Šø Š“Š°ŃŠ¾ŃŠµŠŗŃ %(filename)s Š·Š° ŠŗŠ¾Š½ŃŠ°ŠŗŃ %(name)s"
#. ft stopped
-#: ../src/gajim.py:1725
+#: ../src/gajim.py:1734
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "ŠŃŠµŠ½Š¾Ń %(filename)s Š·Š° ŠŗŠ¾Š½ŃŠ°ŠŗŃ %(name)s ŃŠµ Š·Š°ŃŃŃŠ°Š²ŃŠµŠ½. "
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1818
#, python-format
msgid ""
"Unable to decrypt message from %s\n"
@@ -7469,36 +7626,36 @@
"ŠŠµ Š¼Š¾Š³Ń Š“Š° Š“ŠµŃŠøŃŃŃŃŠµŠ¼ ŠæŠ¾ŃŃŠŗŃ Š¾Š“ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° %s\n"
"ŠŠ¾Š¶Š“Š° ŃŠµ ŠæŃŠ¾Š¼ŠµŃŠµŠ½Š°."
-#: ../src/gajim.py:1818
+#: ../src/gajim.py:1825
msgid "Unable to decrypt message"
msgstr "ŠŠµ Š¼Š¾Š³Ń Š“Š° Š“ŠµŃŠøŃŃŃŃŠµŠ¼ ŠæŠ¾ŃŃŠŗŃ"
-#: ../src/gajim.py:1888
+#: ../src/gajim.py:1896
msgid "Username Conflict"
msgstr "ŠŠ¾Š½ŃŠ»ŠøŠŗŃ ŠŗŠ¾ŃŠøŃŠ½ŠøŃŠŗŠ¾Š³ ŠøŠ¼ŠµŠ½Š°"
-#: ../src/gajim.py:1889
+#: ../src/gajim.py:1897
msgid "Please type a new username for your local account"
msgstr "ŠŠ¾Š»ŠøŠ¼Š¾ ŠŠ°Ń ŃŠ½ŠµŃŠøŃŠµ Š½Š¾Š²Š¾ ŠŗŠ¾ŃŠøŃŠ½ŠøŃŠŗŠ¾ ŠøŠ¼Šµ Š·Š° ŠŠ°Ń Š»Š¾ŠŗŠ°Š»Š½Šø Š½Š°Š»Š¾Š³"
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:1909
msgid "Ping?"
msgstr "ŠŠøŠ½Š³?"
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:1922
#, python-format
msgid "Pong! (%s s.)"
msgstr "ŠŠ¾Š½Š³! (%s s.)"
-#: ../src/gajim.py:1925
+#: ../src/gajim.py:1933
msgid "Error."
msgstr "ŠŃŠµŃŠŗŠ°."
-#: ../src/gajim.py:1950
+#: ../src/gajim.py:1958
msgid "Resource Conflict"
msgstr "ŠŠ¾Š½ŃŠ»ŠøŠŗŃ ŃŠµŃŃŃŃŠ°"
-#: ../src/gajim.py:1951
+#: ../src/gajim.py:1959
msgid ""
"You are already connected to this account with the same resource. Please "
"type a new one"
@@ -7506,11 +7663,11 @@
"ŠŠµŃ ŃŃŠµ ŠŗŠ¾Š½ŠµŠŗŃŠ¾Š²Š°Š½Šø Š½Š° Š¾Š²Š°Ń Š½Š°Š»Š¾Š³ ŃŠ° ŠøŃŃŠøŠ¼ ŃŠµŃŃŃŃŠµŠ¼. ŠŠ¾Š»ŠøŠ¼Š¾ ŠŠ°Ń, Š¾ŃŠŗŃŃŠ°ŃŃŠµ "
"Š½Š¾Š²Š¾ ŠøŠ¼Šµ ŃŠµŃŃŃŃŠ°"
-#: ../src/gajim.py:2004
+#: ../src/gajim.py:2012
msgid "Error verifying SSL certificate"
msgstr "ŠŃŠµŃŠŗŠ° ŠæŃŠø Š²ŠµŃŠøŃŠøŠŗŠ°ŃŠøŃŠø SSL ŃŠµŃŃŠøŃŠøŠŗŠ°ŃŠ°"
-#: ../src/gajim.py:2005
+#: ../src/gajim.py:2013
#, python-format
msgid ""
"There was an error verifying the SSL certificate of your jabber server: %"
@@ -7521,15 +7678,15 @@
"%(error)s\n"
"ŠŠ° Š»Šø Šø Š“Š°ŃŠµ Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŃŠµ ŠŗŠ¾Š½ŠµŠŗŃŃŃŠµŃŠµ Š½Š° Š¾Š²Š°Ń ŃŠµŃŠ²ŠµŃ?"
-#: ../src/gajim.py:2010
+#: ../src/gajim.py:2018
msgid "Ignore this error for this certificate."
msgstr "ŠŠ³Š½Š¾ŃŠøŃŠø Š¾Š²Ń Š³ŃŠµŃŠŗŃ Š·Š° Š¾Š²Š°Ń ŃŠµŃŃŠøŃŠøŠŗŠ°Ń."
-#: ../src/gajim.py:2025
+#: ../src/gajim.py:2033
msgid "SSL certificate error"
msgstr "ŠŃŠµŃŠŗŠ° SSL ŃŠµŃŃŠøŃŠøŠŗŠ°ŃŠ°"
-#: ../src/gajim.py:2026
+#: ../src/gajim.py:2034
#, python-format
msgid ""
"It seems the SSL certificate has changed or your connection is being "
@@ -7545,11 +7702,11 @@
"\n"
"ŠŠ° Š»Šø Šø Š“Š°ŃŠµ Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŃŠµ ŠŗŠ¾Š½ŠµŠŗŃŃŃŠµŃŠµ Šø Š¾ŃŠ²ŠµŠ¶ŠøŃŠµ Š¾ŃŠøŃŠ°Šŗ Š¾Š²Š¾Š³ ŃŠµŃŃŠøŃŠøŠŗŠ°ŃŠ°?"
-#: ../src/gajim.py:2048 ../src/gajim.py:2078
+#: ../src/gajim.py:2056 ../src/gajim.py:2086
msgid "Insecure connection"
msgstr "ŠŠµŃŠøŠ³ŃŃŠ½Š° Š²ŠµŠ·Š°"
-#: ../src/gajim.py:2049
+#: ../src/gajim.py:2057
msgid ""
"You are about to send your password on an unencrypted connection. Are you "
"sure you want to do that?"
@@ -7557,16 +7714,16 @@
"Š£ŠæŃŠ°Š²Š¾ ŃŠµŃŠµ ŠæŠ¾ŃŠ»Š°ŃŠø Š»Š¾Š·ŠøŠ½ŠŗŃ ŠæŃŠµŠŗŠ¾ Š½ŠµŃŠøŃŃŠ¾Š²Š°Š½Šµ Š²ŠµŠ·Šµ. ŠŠµŃŃŠµ Š»Šø ŃŠøŠ³ŃŃŠ½Šø Š“Š° "
"Š¶ŠµŠ»ŠøŃŠµ ŃŠ¾ Š“Š° ŃŃŠ°Š“ŠøŃŠµ?"
-#: ../src/gajim.py:2051 ../src/gajim.py:2081
+#: ../src/gajim.py:2059 ../src/gajim.py:2089
msgid "Yes, I really want to connect insecurely"
msgstr "ŠŠ°, Š·Š°ŠøŃŃŠ° Š¶ŠµŠ»ŠøŠ¼ Š“Š° ŃŠµ ŠŗŠ¾Š½ŠµŠŗŃŃŃŠµŠ¼ Š½ŠµŃŠøŠ³ŃŃŠ½Š¾Š¼ Š²ŠµŠ·Š¾Š¼"
-#: ../src/gajim.py:2052 ../src/gajim.py:2082 ../src/groupchat_control.py:1707
-#: ../src/roster_window.py:3806
+#: ../src/gajim.py:2060 ../src/gajim.py:2090 ../src/groupchat_control.py:1825
+#: ../src/roster_window.py:3780
msgid "Do _not ask me again"
msgstr "_ŠŠµ ŠæŠøŃŠ°Ń Š¼Šµ Š²ŠøŃŠµ"
-#: ../src/gajim.py:2079
+#: ../src/gajim.py:2087
msgid ""
"You are about to send your password on an insecure connection. You should "
"install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -7574,27 +7731,27 @@
"Š£ŠæŃŠ°Š²Š¾ ŃŠµŃŠµ ŠæŠ¾ŃŠ»Š°ŃŠø Š»Š¾Š·ŠøŠ½ŠŗŃ ŠæŃŠµŠŗŠ¾ Š½ŠµŃŠøŠ³ŃŃŠ½Šµ Š²ŠµŠ·Šµ. Š¢ŃŠµŠ±Š°Š»Š¾ Š±Šø Š“Š° ŠøŠ½ŃŃŠ°Š»ŠøŃŠ°ŃŠµ "
"PyOpenSSL Š“Š° ŃŠæŃŠµŃŠøŃŠµ Š¾Š²Š¾. ŠŠ° Š»Šø Š¶ŠµŠ»ŠøŃŠµ Š“Š° Š½Š°ŃŃŠ°Š²ŠøŃŠµ?"
-#: ../src/gajim.py:2096
+#: ../src/gajim.py:2104
msgid "PEP node was not removed"
msgstr "PEP ŃŠ²Š¾Ń Š½ŠøŃŠµ ŃŠŗŠ»Š¾ŃŠµŠ½"
-#: ../src/gajim.py:2097
+#: ../src/gajim.py:2105
#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
msgstr "PEP ŃŠ²Š¾Ń %(node)s Š½ŠøŃŠµ ŃŠŗŠ»Š¾ŃŠµŠ½: %(message)s"
#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2547 ../src/gajim.py:2568
+#: ../src/gajim.py:2552 ../src/gajim.py:2573
msgid "Emoticons disabled"
msgstr "Š”Š¼Š°ŃŠ»ŠøŃŠø ŠøŃŠŗŃŃŃŠµŠ½Šø"
-#: ../src/gajim.py:2548
+#: ../src/gajim.py:2553
msgid ""
"Your configured emoticons theme has not been found, so emoticons have been "
"disabled."
msgstr "ŠŠ°ŃŠ° ŃŠµŠ¼Š° Š·Š° ŃŠ¼Š°ŃŠ»ŠøŃŠµ Š½ŠøŃŠµ Š½Š°ŃŠµŠ½Š°, ŠæŠ° ŃŃ ŃŠ¼Š°ŃŠ»ŠøŃŠø ŠøŃŠŗŃŃŃŠµŠ½Šø."
-#: ../src/gajim.py:2569
+#: ../src/gajim.py:2574
msgid ""
"Your configured emoticons theme cannot been loaded. You maybe need to update "
"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -7604,40 +7761,40 @@
"emoticons.py Š“Š°ŃŠ¾ŃŠµŠŗŠµ. ŠŠ¾Š³Š»ŠµŠ“Š°ŃŃŠµ http://trac.gajim.org/wiki/Emoticons Š·Š° "
"Š²ŠøŃŠµ Š“ŠµŃŠ°ŃŠ°."
-#: ../src/gajim.py:2595 ../src/roster_window.py:3334
+#: ../src/gajim.py:2600 ../src/roster_window.py:3310
msgid "You cannot join a group chat while you are invisible"
msgstr "ŠŠµŠ¼Š¾Š³ŃŃŠµ ŃŠµ ŠæŃŠøŃŃŃŠæŠøŃŠø Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ Š°ŠŗŠ¾ ŃŃŠµ Š½ŠµŠ²ŠøŠ“ŃŠøŠ²Šø"
#. it is good to notify the user
#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2876
+#: ../src/gajim.py:2879
msgid "Could not save your settings and preferences"
msgstr "ŠŠøŃŠµ Š¼Š¾Š³ŃŃŠµ ŃŃŠ²Š°ŃŠµ ŠŠ°ŃŠøŃ
ŠæŠ¾Š“ŠµŃŠ°Š²Š°ŃŠ°"
-#: ../src/gajim.py:2973
+#: ../src/gajim.py:2976
msgid "Bookmark already set"
msgstr "ŠŠ°ŃŠŗŠµŃ ŃŠµ Š²ŠµŃ ŠæŠ¾ŃŃŠ°Š²ŃŠµŠ½"
-#: ../src/gajim.py:2974
+#: ../src/gajim.py:2977
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "ŠŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń \"%s\" ŃŠµ Š²ŠµŃ Š¼Š°ŃŠŗŠøŃŠ°Š½."
-#: ../src/gajim.py:2987
+#: ../src/gajim.py:2990
msgid "Bookmark has been added successfully"
msgstr "ŠŠ°ŃŠŗŠµŃ ŃŃŠæŠµŃŠ½Š¾ Š“Š¾Š“Š°Ń"
-#: ../src/gajim.py:2988
+#: ../src/gajim.py:2991
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr ""
"ŠŠ¾Š¶ŠµŃŠµ ŃŠæŃŠ°Š²ŃŠ°ŃŠø ŠŠ°ŃŠøŠ¼ Š¼Š°ŃŠŗŠµŃŠøŠ¼Š° ŠæŠ¾Š¼Š¾ŃŃ Š¼ŠµŠ½ŠøŃŠ° ŠŠŗŃŠøŃŠµ ŠøŠ· ŠŠ°ŃŠµ Š»ŠøŃŃŠµ "
"ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°."
-#: ../src/gajim.py:3175
+#: ../src/gajim.py:3180
msgid "Network Manager support not available"
msgstr "ŠŠ¾Š“ŃŃŠŗŠ° Š·Š° ŃŠæŃŠ°Š²ŠøŃŠµŃŠ° Š¼ŃŠµŠ¶Šµ Š½ŠøŃŠµ Š“Š¾ŃŃŃŠæŠ½Š°"
-#: ../src/gajim.py:3299
+#: ../src/gajim.py:3305
msgid "Session Management support not available (missing gnome.ui module)"
msgstr "ŠŠ¾Š“ŃŃŠŗŠ° Š·Š° ŃŠæŃŠ°Š²ŃŠ°ŃŠµ ŃŠµŃŠøŃŠ°Š¼Š° Š½ŠøŃŠµ Š“Š¾ŃŃŃŠæŠ½Š° (Š½ŠµŠ“Š¾ŃŃŠ°ŃŠµ gnome.ui Š¼Š¾Š“ŃŠ»)"
@@ -7963,15 +8120,15 @@
msgid "Check if Gajim is running"
msgstr "ŠŠ¾Š»ŠøŠ¼Š¾ ŠæŃŠ¾Š²ŠµŃŠøŃŠµ Š“Š° Š»Šø ŃŠµ ŠŠ°ŃŠøŠ¼ ŠæŠ¾ŠŗŃŠµŠ½ŃŃ"
-#: ../src/gajim-remote.py:280 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:280
msgid "Shows or hides the ipython window"
msgstr "ŠŃŠøŠŗŠ°Š·ŃŃŠµ ŠøŠ»Šø ŃŠŗŃŠøŠ²Š° ipython ŠæŃŠ¾Š·Š¾Ń"
-#: ../src/gajim-remote.py:314
+#: ../src/gajim-remote.py:307
msgid "Missing argument \"contact_jid\""
msgstr "ŠŠµŠ“Š¾ŃŃŠ°ŃŠµ Š°ŃŠ³ŃŠ¼ŠµŠ½Ń \"contact_jid\""
-#: ../src/gajim-remote.py:333
+#: ../src/gajim-remote.py:326
#, python-format
msgid ""
"'%s' is not in your roster.\n"
@@ -7980,15 +8137,15 @@
"'%s' Š½ŠøŃŠµ Š½Š° ŠŠ°ŃŃ Š»ŠøŃŃŠø.\n"
"ŠŠ¾Š»ŠøŠ¼Š¾ Š¾Š“ŃŠµŠ“ŠøŃŠµ Š½Š°Š»Š¾Š³ Š·Š° ŃŠ»Š°ŃŠµ ŠæŠ¾ŃŃŠŗŠµ."
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:329
msgid "You have no active account"
msgstr "Š½ŠµŠ¼Š°ŃŠµ Š°ŠŗŃŠøŠ²Š½ŠøŃ
ŃŠ°ŃŃŠ½Š°"
-#: ../src/gajim-remote.py:389
+#: ../src/gajim-remote.py:381
msgid "It seems Gajim is not running. So you can't use gajim-remote."
msgstr "Š§ŠøŠ½Šø ŃŠµ Š“Š° ŠŠ°ŃŠøŠ¼ Š½Šµ ŃŠ°Š“Šø. ŠŠµ Š¼Š¾Š¶ŠµŃŠµ Š“Š° ŠŗŠ¾ŃŠøŃŃŠøŃŠµ gajim-remote."
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:410
#, python-format
msgid ""
"Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -7997,16 +8154,16 @@
"ŠŠ¾ŃŠøŃŃŠµŃŠµ: %(basename)s %(command)s %(arguments)s \n"
"\t %(help)s"
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:414
msgid "Arguments:"
msgstr "ŠŃŠ³ŃŠ¼ŠµŠ½ŃŠø:"
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:418
#, python-format
msgid "%s not found"
msgstr "%s Š½ŠøŃŠµ ŠæŃŠ¾Š½Š°ŃŠµŠ½"
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:422
#, python-format
msgid ""
"Usage: %s command [arguments]\n"
@@ -8015,7 +8172,7 @@
"ŠŠ¾ŃŠøŃŃŠµŃŠµ: %s Š½Š°ŃŠµŠ“Š±Š° [Š°ŃŠ³ŃŠ¼ŠµŠ½ŃŠø]\n"
"ŠŠ°ŃŠµŠ“Š±Š° ŃŠµ ŃŠµŠ“Š½Š° Š¾Š“:\n"
-#: ../src/gajim-remote.py:503
+#: ../src/gajim-remote.py:494
#, python-format
msgid ""
"Too many arguments. \n"
@@ -8024,7 +8181,7 @@
"ŠŃŠµŠ²ŠøŃŠµ Š°ŃŠ³ŃŠ¼ŠµŠ½Š°ŃŠ°\n"
"Š£ŠŗŃŃŠ°ŃŃŠµ \"%(basename)s help %(command)s\" Š·Š° Š²ŠøŃŠµ ŠøŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠ°"
-#: ../src/gajim-remote.py:508
+#: ../src/gajim-remote.py:499
#, python-format
msgid ""
"Argument \"%(arg)s\" is not specified. \n"
@@ -8033,7 +8190,7 @@
"ŠŃŠ³ŃŠ¼ŠµŠ½Ń \"%(arg)s\" Š½ŠøŃŠµ Š½Š°Š²ŠµŠ“ŠµŠ½. \n"
"Š£ŠŗŃŃŠ°ŃŃŠµ \"%(basename)s help %(command)s\" Š·Š° Š²ŠøŃŠµ ŠøŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠ°"
-#: ../src/gajim-remote.py:527
+#: ../src/gajim-remote.py:518
msgid "Wrong uri"
msgstr "ŠŠ¾Ń uri"
@@ -8062,128 +8219,148 @@
msgid "Please first choose another for your current theme."
msgstr "ŠŠ¾Š»ŠøŠ¼Š¾ ŠŠ°Ń Š“Š° ŠæŃŠ²Š¾ Š¾Š“Š°Š±ŠµŃŠµŃŠµ Š½ŠµŠŗŃ Š“ŃŃŠ³Ń ŃŠµŠ¼Ń."
-#: ../src/groupchat_control.py:145
+#: ../src/groupchat_control.py:150
msgid "Sending private message failed"
msgstr "ŠŠµŃŃŠæŠµŃŠ½Š¾ ŃŠ»Š°ŃŠµ ŠæŃŠøŠ²Š°ŃŠ½Šµ ŠæŠ¾ŃŃŠŗŠµ"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:147
+#: ../src/groupchat_control.py:152
#, python-format
msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
msgstr ""
"ŠŠøŃŠµ Š½ŠøŃŃŠµ Ń Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ \"%(room)s\" ŠøŠ»Šø ŃŠµ \"%(nick)s\" Š¾ŃŠøŃŠ°Š¾."
-#: ../src/groupchat_control.py:383
+#: ../src/groupchat_control.py:438
msgid "Insert Nickname"
msgstr "Š£Š±Š°ŃŠø Š½Š°Š“ŠøŠ¼Š°Šŗ"
-#: ../src/groupchat_control.py:535
+#: ../src/groupchat_control.py:590
msgid "Conversation with "
msgstr "Š Š°Š·Š³Š¾Š²Š¾Ń ŃŠ° "
-#: ../src/groupchat_control.py:537
+#: ../src/groupchat_control.py:592
msgid "Continued conversation"
msgstr "ŠŠ°ŃŃŠ°Š²ŃŠµŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń"
-#: ../src/groupchat_control.py:954
+#: ../src/groupchat_control.py:1009
msgid "Really send file?"
msgstr "Š”ŃŠ²Š°ŃŠ½Š¾ ŠæŠ¾ŃŠ°ŃŠø Š“Š°ŃŠ¾ŃŠµŠŗŃ?"
-#: ../src/groupchat_control.py:955
+#: ../src/groupchat_control.py:1010
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
msgstr "ŠŠŗŠ¾ ŠæŠ¾ŃŠ°ŃŠµŃŠµ Š“Š°ŃŠ¾ŃŠµŠŗŃ ŠŗŠ¾Š½ŃŠ°ŠŗŃŃ %s, Š¾Š½/Š¾Š½Š° ŃŠµ Š·Š½Š°ŃŠø ŠŠ°Ń ŠæŃŠ°Š²Šø ŃŠ°Š±ŠµŃ ID."
#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1029
+#: ../src/groupchat_control.py:1109
msgid "Room logging is enabled"
msgstr "ŠŠ¾Š³Š¾Š²Š°ŃŠµ ŃŠ¾Š±Šµ ŃŠµ Š¾Š¼Š¾Š³ŃŃŠµŠ½Š¾"
-#: ../src/groupchat_control.py:1031
+#: ../src/groupchat_control.py:1111
msgid "A new room has been created"
msgstr "ŠŠ¾Š²Š° ŃŠ¾Š±Š° ŃŠµ Š½Š°ŠæŃŠ°Š²ŃŠµŠ½Š°"
-#: ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1114
msgid "The server has assigned or modified your roomnick"
msgstr "Š”ŠµŃŠ²ŠµŃ ŠŠ°Š¼ ŃŠµ ŠøŠ»Šø Š“Š¾Š“ŠµŠ»ŠøŠ¾ Š½Š°Š“ŠøŠ¼Š°Šŗ ŠøŠ»Šø ŠæŃŠ¾Š¼ŠµŠ½ŠøŠ¾ ŠæŠ¾ŃŃŠ¾ŃŠµŃŠø"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1120
#, python-format
msgid "%(nick)s has been kicked: %(reason)s"
msgstr "%(nick)s ŃŠµ ŠøŠ·Š±Š°ŃŠµŠ½: %(reason)s"
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1124
#, python-format
msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
msgstr "%(nick)s ŃŠµ ŠøŠ·Š±Š°ŃŠµŠ½ Š¾Š“ ŃŃŃŠ°Š½Šµ %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:1051
+#: ../src/groupchat_control.py:1131
#, python-format
msgid "%(nick)s has been banned: %(reason)s"
msgstr "%(nick)s ŠøŠ¼Š° Š·Š°Š±ŃŠ°Š½Ń: %(reason)s"
-#: ../src/groupchat_control.py:1055
+#: ../src/groupchat_control.py:1135
#, python-format
msgid "%(nick)s has been banned by %(who)s: %(reason)s"
msgstr "%(nick)s ŠøŠ¼Š° Š·Š°Š±ŃŠ°Š½Ń Š¾Š“ ŃŠ»Š°Š½Š° %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:1064
+#: ../src/groupchat_control.py:1144
#, python-format
msgid "You are now known as %s"
msgstr "ŠŠ“ ŃŠ°Š“Š° ŃŃŠµ ŠæŠ¾Š·Š½Š°ŃŠø ŠŗŠ°Š¾ %s"
-#: ../src/groupchat_control.py:1101 ../src/groupchat_control.py:1105
-#: ../src/groupchat_control.py:1110
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1186
+#: ../src/groupchat_control.py:1191
#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
msgstr "%(nick)s ŃŠµ ŠøŠ·Š±Š°ŃŠµŠ½ ŠøŠ· ŃŠ¾Š±Šµ (%(reason)s)"
-#: ../src/groupchat_control.py:1102
+#: ../src/groupchat_control.py:1183
msgid "affiliation changed"
msgstr "Š²ŠµŠ·Š°Š½Š¾ŃŃ ŠøŠ·Š¼ŠµŃŠµŠ½Š°"
-#: ../src/groupchat_control.py:1107
+#: ../src/groupchat_control.py:1188
msgid "room configuration changed to members-only"
msgstr "ŠŗŠ¾Š½ŃŠøŠ³ŃŃŠ°ŃŠøŃŠ° ŃŠ¾Š±Šµ ŃŠµ ŠæŃŠ¾Š¼ŠµŠ½ŠøŠ»Š° Š½Š° \"ŃŠ°Š¼Š¾ ŃŠ»Š°Š½Š¾Š²Šø\""
-#: ../src/groupchat_control.py:1112
+#: ../src/groupchat_control.py:1193
msgid "system shutdown"
msgstr "Š³Š°ŃŠµŃŠµ ŃŠøŃŃŠµŠ¼Š°"
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1262
#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1266
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1281
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s ŃŠµ ŠøŠ·Š±Š°ŃŠµŠ½ Š¾Š“ ŃŃŃŠ°Š½Šµ %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1285
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s ŃŠµ ŠøŠ·Š±Š°ŃŠµŠ½: %(reason)s"
+
+#: ../src/groupchat_control.py:1314
+#, python-format
msgid "%s has left"
msgstr "%s ŃŠµ Š¾ŃŠøŃŠ°Š¾"
-#: ../src/groupchat_control.py:1214
+#: ../src/groupchat_control.py:1319
#, python-format
msgid "%s has joined the group chat"
msgstr "%s ŃŠµ ŠæŃŠøŠ“ŃŃŠ¶ŠøŠ¾ Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ"
#. Invalid Nickname
#. invalid char
-#: ../src/groupchat_control.py:1328 ../src/groupchat_control.py:1600
+#: ../src/groupchat_control.py:1434 ../src/groupchat_control.py:1715
msgid "Invalid nickname"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ Š½Š°Š“ŠøŠ¼Š°Šŗ"
-#: ../src/groupchat_control.py:1352 ../src/groupchat_control.py:1370
-#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458 ../src/groupchat_control.py:1476
+#: ../src/groupchat_control.py:1560 ../src/groupchat_control.py:1577
#, python-format
msgid "Nickname not found: %s"
msgstr "ŠŠ°Š“ŠøŠ¼Š°Šŗ Š½ŠøŃŠµ ŠæŃŠ¾Š½Š°ŃŠµŠ½: %s "
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1492
msgid "This group chat has no subject"
msgstr "ŠŠ²Š°Ń Š³ŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń Š½ŠµŠ¼Š° ŃŠµŠ¼Ń"
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1503
#, python-format
msgid "Invited %(contact_jid)s to %(room_jid)s."
msgstr "ŠŠ¾Š·Š²Š°Š»Šø ŃŃŠµ %(contact_jid)s Ń ŃŠ¾Š±Ń %(room_jid)s"
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1638
#, python-format
msgid ""
"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8196,14 +8373,14 @@
"ŠŠ ŃŃŠµŠ½ŃŃŠ½Š¾ Ń ŃŠ¾Š±Šø, Š¾Š½/Š¾Š½Š° ŃŠµ Š±ŠøŃŠø ŠøŠ·Š±Š°ŃŠµŠ½(Š°). Š Š°Š·Š¼Š°ŃŠø Ń ŠøŠ¼ŠµŠ½ŠøŠ¼Š° ŠŠŠ”Š£ "
"ŠæŠ¾Š“ŃŠ¶Š°Š½Šø."
-#: ../src/groupchat_control.py:1534
+#: ../src/groupchat_control.py:1645
#, python-format
msgid ""
"Usage: /%s <nickname>, opens a private chat window with the specified "
"occupant."
msgstr "ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s <Š½Š°Š“ŠøŠ¼Š°Šŗ>, Š¾ŃŠ²Š°ŃŠ° ŠæŃŠøŠ²Š°ŃŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń ŃŠ° ŃŃŠµŃŠ½ŠøŠŗŠ¾Š¼."
-#: ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1651
#, python-format
msgid ""
"Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8212,7 +8389,7 @@
"ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s [ŃŠ°Š·Š»Š¾Š³], Š·Š°ŃŠ²Š°ŃŠ° ŃŃŠµŠ½ŃŃŠ½Šø ŠæŃŠ¾Š·Š¾Ń ŠøŠ»Šø ŃŠµŠ·ŠøŃŠ°Šŗ, Šø "
"ŠæŃŠøŠŗŠ°Š·ŃŃŠµ ŃŠ°Š·Š»Š¾Š³ Š°ŠŗŠ¾ ŃŠµ Š½Š°Š·Š½Š°ŃŠµŠ½."
-#: ../src/groupchat_control.py:1546
+#: ../src/groupchat_control.py:1657
#, python-format
msgid ""
"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8221,7 +8398,7 @@
"ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s ŠŠŠ> [ŃŠ°Š·Š»Š¾Š³], ŠæŠ¾Š·ŠøŠ²Š° ŠŠ°Š±ŠµŃ ŠŠ Ń ŃŃŠµŠ½ŃŃŠ½Šø Š³ŃŃŠæŠ½Šø "
"ŃŠ°Š·Š³Š¾Š²Š¾Ń, Š¾ŠæŃŠøŠ¾Š½Š¾ Š“Š°ŃŃŃŠø ŃŠ°Š·Š»Š¾Š³."
-#: ../src/groupchat_control.py:1550
+#: ../src/groupchat_control.py:1661
#, python-format
msgid ""
"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8230,7 +8407,7 @@
"ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s <ŃŠ¾Š±Š°>@<ŃŠµŃŠ²ŠµŃ>[/Š½Š°Š“ŠøŠ¼Š°Šŗ], Š½ŃŠ“Šø Š¼Š¾Š³ŃŃŠ½Š¾ŃŃ ŃŠæŠ°ŃŠ°ŃŠ° Š½Š° "
"ŃŠ¾Š±Š°@ŃŠµŃŠ²ŠµŃ ŠŗŠ¾ŃŠøŃŃŠµŃŠø Š½Š°Š²ŠµŠ“ŠµŠ½Šø Š½Š°Š“ŠøŠ¼Š°Šŗ."
-#: ../src/groupchat_control.py:1554
+#: ../src/groupchat_control.py:1665
#, python-format
msgid ""
"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8241,7 +8418,7 @@
"ŠøŠ· Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° Šø Š¾ŠæŃŠøŠ¾Š½Š¾ ŠæŃŠøŠŗŠ°Š·ŃŃŠµ ŃŠ°Š·Š»Š¾Š³. ŠŠ ŠæŠ¾Š“ŃŠ¶Š°Š²Š° Š±Š»Š°Š½ŠŗŠ¾ Š·Š½Š°ŠŗŠ¾Š²Šµ "
"Ń Š½Š°Š“ŠøŠ¼ŠŗŃ."
-#: ../src/groupchat_control.py:1563
+#: ../src/groupchat_control.py:1674
#, python-format
msgid ""
"Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8250,64 +8427,64 @@
"ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s <Š½Š°Š“ŠøŠ¼Š°Šŗ> [ŠæŠ¾ŃŃŠŗŠ°], Š¾ŃŠ²Š°ŃŠ° ŠæŃŠ¾Š·Š¾Ń ŠæŃŠøŠ²Š°ŃŠ½Šµ ŠæŠ¾ŃŃŠŗŠµ Šø "
"ŃŠ°ŃŠµ ŠæŠ¾ŃŃŠŗŃ ŃŃŠµŃŠ½ŠøŠŗŃ ŃŠ° Š·Š°Š“Š°ŃŠøŠ¼ Š½Š°Š“ŠøŠ¼ŠŗŠ¾Š¼."
-#: ../src/groupchat_control.py:1568
+#: ../src/groupchat_control.py:1679
#, python-format
msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
msgstr ""
"ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s <Š½Š°Š“ŠøŠ¼Š°Šŗ>, Š¼ŠµŃŠ° ŠŠ°Ń Š½Š°Š“ŠøŠ¼Š°Šŗ Ń ŃŃŠµŠ½ŃŃŠ½Š¾Š¼ Š³ŃŃŠæŠ½Š¾Š¼ "
"ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ."
-#: ../src/groupchat_control.py:1572
+#: ../src/groupchat_control.py:1683
#, python-format
msgid "Usage: /%s , display the names of group chat occupants."
msgstr "ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s , ŠæŃŠøŠŗŠ°Š·ŃŃŠµ ŠøŠ¼ŠµŠ½Š° ŃŃŠµŃŠ½ŠøŠŗŠ° Ń Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ."
-#: ../src/groupchat_control.py:1576
+#: ../src/groupchat_control.py:1687
#, python-format
msgid "Usage: /%s [topic], displays or updates the current group chat topic."
msgstr ""
"ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s [ŃŠµŠ¼Š°], ŠæŃŠøŠŗŠ°Š·ŃŃŠµ ŠøŠ»Šø Š°Š¶ŃŃŠøŃŠ° ŃŠµŠ¼Ń Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°."
-#: ../src/groupchat_control.py:1579
+#: ../src/groupchat_control.py:1690
#, python-format
msgid ""
"Usage: /%s <message>, sends a message without looking for other commands."
msgstr ""
"ŠŠ°ŃŠøŠ½ ŠŗŠ¾ŃŠøŃŃŠµŃŠ°: /%s <ŠæŠ¾ŃŃŠŗŠ°>, ŃŠ°ŃŠµ ŠæŠ¾ŃŃŠŗŃ Š½Šµ Š³Š»ŠµŠ“Š°ŃŃŃŠø Š¾ŃŃŠ°Š»Šµ ŠŗŠ¾Š¼Š°Š½Š“Šµ."
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1819
#, python-format
msgid "Are you sure you want to leave group chat \"%s\"?"
msgstr "ŠŠµŃŃŠµ Š»Šø ŃŠøŠ³ŃŃŠ½Šø Š“Š° Š¶ŠµŠ»ŠøŃŠµ Š½Š°ŠæŃŃŃŠøŃŠø Š³ŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń \"%s\"?"
-#: ../src/groupchat_control.py:1703
+#: ../src/groupchat_control.py:1821
msgid ""
"If you close this window, you will be disconnected from this group chat."
msgstr "ŠŠŗŠ¾ Š·Š°ŃŠ²Š¾ŃŠøŃŠµ Š¾Š²Š°Ń ŠæŃŠ¾Š·Š¾Ń, Š±ŠøŃŠµŃŠµ ŠøŃŠŗŃŃŃŠµŠ½Šø ŃŠ° Š¾Š²Š¾Ń
Š³ŃŃŠæŠ½Š¾Š³ ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°."
-#: ../src/groupchat_control.py:1740
+#: ../src/groupchat_control.py:1858
msgid "Changing Subject"
msgstr "ŠŃŠ¾Š¼ŠµŠ½Š° Š¢ŠµŠ¼Šµ"
-#: ../src/groupchat_control.py:1741
+#: ../src/groupchat_control.py:1859
msgid "Please specify the new subject:"
msgstr "ŠŠ¾Š»ŠøŠ¼Š¾ Š¾Š“ŃŠµŠ“ŠøŃŠµ Š½Š¾Š²Ń ŃŠµŠ¼Ń:"
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1863
msgid "Changing Nickname"
msgstr "ŠŃŠ¾Š¼ŠµŠ½Š° Š½Š°Š“ŠøŠ¼ŠŗŠ°"
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1864
msgid "Please specify the new nickname you want to use:"
msgstr "ŠŠ¾Š»ŠøŠ¼Š¾ Š¾Š“ŃŠµŠ“ŠøŃŠµ Š½Š¾Š²Šø Š½Š°Š“ŠøŠ¼Š°Šŗ ŠŗŠ¾ŃŠø Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŠŗŠ¾ŃŠøŃŃŠøŃŠµ:"
#. Ask for a reason
-#: ../src/groupchat_control.py:1773
+#: ../src/groupchat_control.py:1890
#, python-format
msgid "Destroying %s"
msgstr "Š£Š½ŠøŃŃŠ°Š²Š°Š¼ %s"
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:1891
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
@@ -8315,22 +8492,22 @@
"Š£ŠæŃŠ°Š²Š¾ ŃŠµŃŠµ Š·Š°ŃŠ²ŠµŠŗ ŃŠ½ŠøŃŃŠøŃŠø Š¾Š²Ń ŃŠ¾Š±Ń.\n"
"ŠŠ¾Š¶ŠµŃŠµ ŠøŃŠæŠ¾Š“ Š½Š°ŠæŠøŃŠ°ŃŠø ŃŠ°Š·Š»Š¾Š³:"
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:1893
msgid "You may also enter an alternate venue:"
msgstr "ŠŠ¾Š¶ŠµŃŠµ ŃŠ°ŠŗŠ¾ŃŠµ ŃŠ½ŠµŃŠø Šø Š°Š»ŃŠµŃŠ½Š°ŃŠøŠ²Š½Ń Š»Š¾ŠŗŠ°ŃŠøŃŃ:"
#. ask for reason
-#: ../src/groupchat_control.py:1950
+#: ../src/groupchat_control.py:2065
#, python-format
msgid "Kicking %s"
msgstr "ŠŠ·Š±Š°ŃŃŃŠµŠ¼ %s"
-#: ../src/groupchat_control.py:1951 ../src/groupchat_control.py:2248
+#: ../src/groupchat_control.py:2066 ../src/groupchat_control.py:2370
msgid "You may specify a reason below:"
msgstr "ŠŠ¾Š¶ŠµŃŠµ Š½Š°Š²ŠµŃŃŠø ŃŠ°Š·Š»Š¾Š³ ŠøŃŠæŠ¾Š“:"
#. ask for reason
-#: ../src/groupchat_control.py:2247
+#: ../src/groupchat_control.py:2369
#, python-format
msgid "Banning %s"
msgstr "ŠŠ°Š±ŃŠ°ŃŃŃŠµŠ¼ %s"
@@ -8482,17 +8659,17 @@
msgid "Conversation History with %s"
msgstr "ŠŃŃŠ¾ŃŠøŃŠ°Ń ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ° ŃŠ° %s"
-#: ../src/history_window.py:404
+#: ../src/history_window.py:406
#, python-format
msgid "%(nick)s is now %(status)s: %(status_msg)s"
msgstr "%(nick)s ŃŠµ ŃŃŠµŠ½ŃŃŠ½Š¾ %(status)s: %(status_msg)s"
-#: ../src/history_window.py:414
+#: ../src/history_window.py:416
#, python-format
msgid "Status is now: %(status)s: %(status_msg)s"
msgstr "Š”ŃŠ°ŃŃŃ ŃŠµ ŃŃŠµŠ½ŃŃŠ½Š¾: %(status)s: %(status_msg)s"
-#: ../src/history_window.py:417
+#: ../src/history_window.py:419
#, python-format
msgid "Status is now: %(status)s"
msgstr "Š”ŃŠ°ŃŃŃ ŃŠµ ŃŃŠµŠ½ŃŃŠ½Š¾: %(status)s"
@@ -8505,19 +8682,19 @@
msgid "Image is too big"
msgstr "Š”Š»ŠøŠŗŠ° ŃŠµ ŠæŃŠµŠ²ŠµŠ»ŠøŠŗŠ°"
-#: ../src/message_window.py:440
+#: ../src/message_window.py:446
msgid "Chats"
msgstr "Š Š°Š·Š³Š¾Š²Š¾ŃŠø"
-#: ../src/message_window.py:442
+#: ../src/message_window.py:448
msgid "Group Chats"
msgstr "ŠŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾ŃŠø"
-#: ../src/message_window.py:444
+#: ../src/message_window.py:450
msgid "Private Chats"
msgstr "ŠŃŠøŠ²Š°ŃŠ½Šø Š Š°Š·Š³Š¾Š²Š¾ŃŠø"
-#: ../src/message_window.py:450
+#: ../src/message_window.py:456
msgid "Messages"
msgstr "ŠŠ¾ŃŃŠŗŠµ"
@@ -8577,18 +8754,18 @@
msgid "Retrieving profile..."
msgstr "ŠŠ¾Ń
Š²Š°ŃŠ°ŃŠµ ŠæŃŠ¾ŃŠøŠ»Š°..."
-#: ../src/profile_window.py:109 ../src/roster_window.py:2803
+#: ../src/profile_window.py:109 ../src/roster_window.py:2773
msgid "File is empty"
msgstr "ŠŠ°ŃŠ¾ŃŠµŠŗŠ° ŃŠµ ŠæŃŠ°Š·Š½Š°"
-#: ../src/profile_window.py:112 ../src/roster_window.py:2806
+#: ../src/profile_window.py:112 ../src/roster_window.py:2776
msgid "File does not exist"
msgstr "ŠŠ°ŃŠ¾ŃŠµŠŗŠ° Š½Šµ ŠæŠ¾ŃŃŠ¾ŃŠø"
#. keep identation
#. unknown format
#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2808 ../src/roster_window.py:2819
+#: ../src/roster_window.py:2778 ../src/roster_window.py:2789
msgid "Could not load image"
msgstr "ŠŠµ Š¼Š¾Š³Ń ŃŃŠøŃŠ°ŃŠø ŃŠ»ŠøŠŗŃ"
@@ -8620,38 +8797,38 @@
"ŠŠ°ŃŃŠ°Š»Š° ŃŠµ Š³ŃŠµŃŠŗŠ° ŠæŃŠøŠ»ŠøŠŗŠ¾Š¼ Š¾Š±ŃŠ°Š²ŃŠøŠ²Š°ŃŠ° ŠŠ°ŃŠøŃ
Š»ŠøŃŠ½ŠøŃ
ŠøŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠ°, ŠæŠ¾ŠŗŃŃŠ°ŃŃŠµ "
"ŠæŠ¾Š½Š¾Š²Š¾ ŠŗŠ°ŃŠ½ŠøŃŠµ."
-#: ../src/roster_window.py:290 ../src/roster_window.py:955
+#: ../src/roster_window.py:290 ../src/roster_window.py:961
msgid "Merged accounts"
msgstr "Š”ŠæŠ¾ŃŠµŠ½Šø Š½Š°Š»Š¾Š·Šø"
-#: ../src/roster_window.py:1849
+#: ../src/roster_window.py:1850
msgid "Authorization has been sent"
msgstr "ŠŃŃŠ¾ŃŠøŠ·Š°ŃŠøŃŠ° ŠæŠ¾ŃŠ»Š°ŃŠ°"
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1851
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "Š”Š°Š“Š° ŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŃ \"%s\" Š·Š½Š°ŃŠø ŠŠ°Ń ŃŃŠ°ŃŃŃ."
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1871
msgid "Subscription request has been sent"
msgstr "ŠŠ°Ń
ŃŠµŠ² Š·Š° ŠæŃŠµŃŠæŠ»Š°ŃŠ¾Š¼ ŠæŠ¾ŃŠ»Š°Ń"
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1872
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr "ŠŠŗŠ¾ ŠŗŠ¾Š½ŃŠ°ŠŗŃ \"%s\" ŠæŃŠøŃ
Š²Š°ŃŠø Š¾Š²Š°Ń Š·Š°Ń
ŃŠµŠ², Š·Š½Š°ŃŠµŃŠµ ŃŠµŠ³Š¾Š²/ŃŠµŠ½ ŃŃŠ°ŃŃŃ."
-#: ../src/roster_window.py:1883
+#: ../src/roster_window.py:1884
msgid "Authorization has been removed"
msgstr "ŠŃŃŠ¾ŃŠøŠ·Š°ŃŠøŃŠ° ŃŠŗŠ»Š¾ŃŠµŠ½Š°"
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1885
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "Š”Š°Š“Š° ŃŠµ ŠŠ°Ń ŠŗŠ¾Š½ŃŠ°ŠŗŃ \"%s\" ŃŠ²ŠµŠŗ Š²ŠøŠ“ŠµŃŠø ŠŗŠ°Š¾ Š“Š° Š½ŠøŃŃŠµ Š½Š° Š²ŠµŠ·Šø."
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1910
msgid ""
"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
@@ -8659,15 +8836,15 @@
"Gnome Keyring ŃŠµ ŠøŠ½ŃŃŠ°Š»ŠøŃŠ°Š½, Š°Š»Šø Š½ŠøŃŠµ \t\t\t\t\t\t\tŠæŃŠ°Š²ŠøŠ»Š½Š¾ ŃŃŠ°ŃŃŠ¾Š²Š°Š½"
"(ŠæŃŠ¾Š¼ŠµŠ½ŃŠøŠ²Šµ Š¾ŠŗŃŃŠ¶ŠµŃŠ° Š²ŠµŃŠ¾Š²Š°ŃŠ½Š¾ Š½ŠøŃŃ \t\t\t\t\t\t\tŠæŃŠ°Š²ŠøŠ»Š½Š¾ ŠæŠ¾Š“ŠµŃŠµŠ½Šµ)"
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1939
+#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
msgid "GPG is not usable"
msgstr "GPG Š½ŠøŃŠµ ŃŠæŠ¾ŃŃŠµŠ±ŃŠøŠ²"
-#: ../src/roster_window.py:2095 ../src/roster_window.py:3277
+#: ../src/roster_window.py:2109 ../src/roster_window.py:3253
msgid "You are participating in one or more group chats"
msgstr "Š£ŃŠµŃŃŠ²ŃŃŠµŃŠµ Ń ŃŠµŠ“Š½Š¾Š¼ ŠøŠ»Šø Š²ŠøŃŠµ Š³ŃŃŠæŠ½ŠøŃ
ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°"
-#: ../src/roster_window.py:2096 ../src/roster_window.py:3278
+#: ../src/roster_window.py:2110 ../src/roster_window.py:3254
msgid ""
"Changing your status to invisible will result in disconnection from those "
"group chats. Are you sure you want to go invisible?"
@@ -8675,15 +8852,15 @@
"ŠŃŠ¾Š¼ŠµŠ½Š° ŠŠ°ŃŠµŠ³ ŃŃŠ°ŃŃŃŠ° Ń ŠŠµŠ²ŠøŠ“ŃŠøŠ² ŃŠµ ŃŠµŠ·ŃŠ»ŃŠ¾Š²Š°ŃŠø Š¾Š“Š²ŠµŠ·ŠøŠ²Š°ŃŠµŠ¼ ŃŠ° ŃŠøŃ
Š³ŃŃŠæŠ½ŠøŃ
"
"ŃŠ°Š·Š³Š¾Š²Š¾ŃŠ°. ŠŠµŃŃŠµ Š»Šø ŃŠøŠ³ŃŃŠ½Šø Š“Š° Š¶ŠµŠ»ŠøŃŠµ ŠøŃŠø Š½Š° Š½ŠµŠ²ŠøŠ“ŃŠøŠ²Š¾?"
-#: ../src/roster_window.py:2122
+#: ../src/roster_window.py:2136
msgid "desync'ed"
msgstr "Š“ŠµŃŠøŠ½Ń
ŃŠ¾Š½ŠøŠ·Š¾Š²Š°Š½"
-#: ../src/roster_window.py:2256 ../src/roster_window.py:2493
+#: ../src/roster_window.py:2270 ../src/roster_window.py:2507
msgid "You have unread messages"
msgstr "ŠŠ¼Š°ŃŠµ Š½ŠµŠæŃŠ¾ŃŠøŃŠ°Š½ŠøŃ
ŠæŠ¾ŃŃŠŗŠ°"
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2271
msgid ""
"Messages will only be available for reading them later if you have history "
"enabled and contact is in your roster."
@@ -8691,16 +8868,16 @@
"ŠŠ¾ŃŃŠŗŠµ ŃŠµ Š±ŠøŃŠø Š“Š¾ŃŃŃŠæŠ½Šµ Š·Š° ŃŠøŃŠ°ŃŠµ Šø ŠŗŠ°ŃŠ½ŠøŃŠµ Š°ŠŗŠ¾ ŠøŠ¼Š°ŃŠµ Š¾Š¼Š¾Š³ŃŃŠµŠ½ ŠøŃŃŠ¾ŃŠøŃŠ°Ń Šø "
"ŃŠ°Ń ŠŗŠ¾Š½ŃŠ°ŠŗŃ Ń Š»ŠøŃŃŠø."
-#: ../src/roster_window.py:2494
+#: ../src/roster_window.py:2508
msgid "You must read them before removing this transport."
msgstr "ŠŠ¾ŃŠ°ŃŠµ ŠøŃ
ŠæŃŠ¾ŃŠøŃŠ°ŃŠø ŠæŃŠµ ŃŠŗŠ»Š°ŃŠ°ŃŠ° Š¾Š²Š¾Š³ ŃŃŠ°Š½ŃŠæŠ¾ŃŃŠ°."
-#: ../src/roster_window.py:2497
+#: ../src/roster_window.py:2511
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "Š¢ŃŠ°Š½ŃŠæŠ¾ŃŃ \"%s\" ŃŠµ Š±ŠøŃŠø ŃŠŗŠ»Š¾ŃŠµŠ½"
-#: ../src/roster_window.py:2498
+#: ../src/roster_window.py:2512
msgid ""
"You will no longer be able to send and receive messages from contacts using "
"this transport."
@@ -8708,11 +8885,11 @@
"ŠŠµŃŠµŃŠµ Š²ŠøŃŠµ Š±ŠøŃŠø Ń Š¼Š¾Š³ŃŃŠ½Š¾ŃŃŠø Š“Š° ŃŠ°Š·Š¼ŠµŃŃŃŠµŃŠµ ŠæŠ¾ŃŃŠŗŠµ ŃŠ° ŠŗŠ¾Š½ŃŠŗŠ°ŃŠøŠ¼Š° ŃŠ° Š¾Š²Š¾Š³ "
"ŃŃŠ°Š½ŃŠæŠ¾ŃŃŠ°."
-#: ../src/roster_window.py:2501
+#: ../src/roster_window.py:2515
msgid "Transports will be removed"
msgstr "Š¢ŃŠ°Š½ŃŠæŠ¾ŃŃ ŃŠµ Š±ŠøŃŠø ŃŠŗŠ»Š¾ŃŠµŠ½"
-#: ../src/roster_window.py:2506
+#: ../src/roster_window.py:2520
#, python-format
msgid ""
"You will no longer be able to send and receive messages to contacts from "
@@ -8722,51 +8899,52 @@
"ŃŃŠ°Š½ŃŠæŠ¾ŃŃŠ°: %s"
#. it's jid
-#: ../src/roster_window.py:2685
+#: ../src/roster_window.py:2654
msgid "Rename Contact"
msgstr "ŠŃŠµŠøŠ¼ŠµŠ½ŃŃ ŠŗŠ¾Š½ŃŠ°ŠŗŃ"
-#: ../src/roster_window.py:2686
+#: ../src/roster_window.py:2655
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "Š£Š½ŠµŃŠøŃŠµ Š½Š¾Š²Šø Š½Š°Š“ŠøŠ¼Š°Šŗ Š·Š° ŠŗŠ¾Š½ŃŠ°ŠŗŃ %s"
-#: ../src/roster_window.py:2693
+#: ../src/roster_window.py:2662
msgid "Rename Group"
msgstr "ŠŃŠµŠøŠ¼ŠµŠ½ŃŃ Š³ŃŃŠæŃ"
-#: ../src/roster_window.py:2694
+#: ../src/roster_window.py:2663
#, python-format
msgid "Enter a new name for group %s"
msgstr "Š£Š½ŠµŃŠøŃŠµ Š½Š¾Š²Š¾ ŠøŠ¼Šµ Š·Š° Š³ŃŃŠæŃ %s"
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2719
msgid "Remove Group"
msgstr "Š£ŠŗŠ»Š¾Š½Šø Š³ŃŃŠæŃ"
-#: ../src/roster_window.py:2743
+#: ../src/roster_window.py:2720
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "ŠŠµŠ»ŠøŃŠµ Š»Šø ŃŠŗŠ»Š¾Š½ŠøŃŠø Š³ŃŃŠæŃ %s ŃŠ° Š»ŠøŃŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°?"
-#: ../src/roster_window.py:2744
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2721
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
msgstr "Š£ŃŠµŠ“Š½Š¾ ŃŠŗŠ»Š¾Š½Šø Šø ŃŠ²Šµ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠµ ŠøŠ· Š¾Š²Šµ Š³ŃŃŠæŠµ ŠøŠ· Š»ŠøŃŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°"
-#: ../src/roster_window.py:2790
+#: ../src/roster_window.py:2760
msgid "Assign OpenPGP Key"
msgstr "ŠŃŠøŠ“ŃŃŠ¶Šø OpenPGP ŠŃŃŃ"
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2761
msgid "Select a key to apply to the contact"
msgstr "ŠŠ“Š°Š±ŠµŃŠøŃŠµ ŠŗŃŃŃ Š·Š° ŠæŃŠøŠ“ŃŃŠ¶ŠøŠ²Š°ŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŃŃ"
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3114
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "ŠŠ¾Š½ŃŠ°ŠŗŃ \"%s\" ŃŠµ Š±ŠøŃŠø ŃŠŗŠ»Š¾ŃŠµŠ½ ŃŠ° ŠŠ°ŃŠµ Š»ŠøŃŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°"
-#: ../src/roster_window.py:3146
+#: ../src/roster_window.py:3118
msgid ""
"By removing this contact you also remove authorization resulting in him or "
"her always seeing you as offline."
@@ -8774,7 +8952,13 @@
"Š£ŠŗŠ»Š°ŃŠ°ŃŠµŠ¼ Š¾Š²Š¾Š³ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° ŃŃŠµŠ“Š½Š¾ ŃŠŗŠ»Š°ŃŠ°ŃŠµ Šø Š¾Š“Š¾Š±ŃŠµŃŠµ ŃŃŠ¾ Š·Š½Š°ŃŠø Š“Š° ŃŠµ ŠŠ°Ń ŃŠ° "
"Š¾ŃŠ¾Š±Š° ŃŠ²ŠµŠŗ Š²ŠøŠ“ŠµŃŠø ŠŗŠ°Š¾ Š“Š° Š½ŠøŃŃŠµ Š½Š° Š²ŠµŠ·Šø."
-#: ../src/roster_window.py:3151
+#. Contact is not in roster
+#: ../src/roster_window.py:3123
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "ŠŠ° Š»Šø Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŠæŃŠøŃ
Š²Š°ŃŠøŃŠµ Š¾Š²Ń ŠæŠ¾Š·ŠøŠ²Š½ŠøŃŃ?"
+
+#: ../src/roster_window.py:3127
msgid ""
"By removing this contact you also by default remove authorization resulting "
"in him or her always seeing you as offline."
@@ -8782,16 +8966,16 @@
"Š£ŠŗŠ»Š°ŃŠ°ŃŠµŠ¼ Š¾Š²Š¾Š³ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠ° ŃŃŠµŠ“Š½Š¾ ŠæŠ¾Š“ŃŠ°Š·ŃŠ¼ŠµŠ²Š°Š½Š¾ ŃŠŗŠ»Š°ŃŠ°ŃŠµ Šø Š¾Š“Š¾Š±ŃŠµŃŠµ ŃŃŠ¾ Š·Š½Š°ŃŠø "
"Š“Š° ŃŠµ ŠŠ°Ń ŃŠ° Š¾ŃŠ¾Š±Š° ŃŠ²ŠµŠŗ Š²ŠøŠ“ŠµŃŠø ŠŗŠ°Š¾ Š“Š° Š½ŠøŃŃŠµ Š½Š° Š²ŠµŠ·Šø."
-#: ../src/roster_window.py:3154
+#: ../src/roster_window.py:3130
msgid "I want this contact to know my status after removal"
msgstr "ŠŠµŠ»ŠøŠ¼ Š“Š° Š¾Š²Š°Ń ŠŗŠ¾Š½ŃŠ°ŠŗŃ Š·Š½Š° Š¼Š¾Ń ŃŃŠ°ŃŃŃ Šø Š½Š°ŠŗŠ¾Š½ ŃŠŗŠ»Š°ŃŠ°ŃŠ°"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3158
+#: ../src/roster_window.py:3134
msgid "Contacts will be removed from your roster"
msgstr "ŠŠ¾Š½ŃŠ°ŠŗŃŠø ŃŠµ Š±ŠøŃŠø ŃŠŗŠ»Š¾ŃŠµŠ½Šø ŃŠ° ŠŠ°ŃŠµ Š»ŠøŃŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°"
-#: ../src/roster_window.py:3162
+#: ../src/roster_window.py:3138
#, python-format
msgid ""
"By removing these contacts:%s\n"
@@ -8801,21 +8985,21 @@
"ŃŃŠµŠ“Š½Š¾ ŃŠŗŠ»Š°ŃŠ°ŃŠµ Šø Š¾Š“Š¾Š±ŃŠµŃŠµ ŠæŃŠ¾ Š·Š½Š°ŃŠø Š“Š° ŃŠµ ŠŠ°Ń ŃŠµ Š¾ŃŠ¾Š±Šµ ŃŠ²ŠµŠŗ Š²ŠøŠ“ŠµŃŠø ŠŗŠ°Š¾ Š“Š° "
"Š½ŠøŃŃŠµ Š½Š° Š²ŠµŠ·Šø."
-#: ../src/roster_window.py:3201
+#: ../src/roster_window.py:3177
msgid "No account available"
msgstr "ŠŠµŠ¼Š° Š“Š¾ŃŃŃŠæŠ½ŠøŃ
Š½Š°Š»Š¾Š³Š°"
-#: ../src/roster_window.py:3202
+#: ../src/roster_window.py:3178
msgid "You must create an account before you can chat with other contacts."
msgstr ""
"ŠŠ¾ŃŠ°ŃŠµ ŠŗŃŠµŠøŃŠ°ŃŠø Š½Š°Š»Š¾Š³ ŠæŃŠµ Š½ŠµŠ³Š¾ ŃŃŠ¾ Š¼Š¾Š¶ŠµŃŠµ Š“Š° ŃŠ°Š·Š³Š¾Š²Š°ŃŠ°ŃŠµ ŃŠ° Š¾ŃŃŠ°Š»ŠøŠ¼ "
"ŠŗŠ¾Š½ŃŠ°ŠŗŃŠøŠ¼Š°."
-#: ../src/roster_window.py:3720
+#: ../src/roster_window.py:3694
msgid "Metacontacts storage not supported by your server"
msgstr "Š§ŃŠ²Š°ŃŠµ ŠæŃŠµŃŠ“Š¾ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° Š½ŠøŃŠµ ŠæŠ¾Š“ŃŠ¶Š°Š½Š¾ Š¾Š“ ŃŃŃŠ°Š½Šµ ŠŠ°ŃŠµŠ³ ŃŠµŃŠ²ŠµŃŠ°"
-#: ../src/roster_window.py:3722
+#: ../src/roster_window.py:3696
msgid ""
"Your server does not support storing metacontacts information. So those "
"information will not be saved on next reconnection."
@@ -8823,13 +9007,13 @@
"ŠŠ°Ń ŃŠµŃŠ²ŠµŃ Š½Šµ ŠæŠ¾Š“ŃŠ¶Š°Š²Š° ŃŃŠ²Š°ŃŠµ ŠøŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠ° ŠæŃŠµŃŠ“Š¾ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°. Š¢Šµ ŠøŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠµ "
"Š½ŠµŃŠµ Š±ŠøŃŠø ŃŠ°ŃŃŠ²Š°Š½Šµ ŠæŃŠø ŃŠ»ŠµŠ“ŠµŃŠµŠ¼ ŠæŠ¾Š²ŠµŠ·ŠøŠ²Š°ŃŃ."
-#: ../src/roster_window.py:3800
+#: ../src/roster_window.py:3774
msgid ""
"You are about to create a metacontact. Are you sure you want to continue?"
msgstr ""
"Š£ŠæŃŠ°Š²Š¾ ŃŠµŃŠµ Š½Š°ŠæŃŠ°Š²ŠøŃŠø ŠæŃŠµŃŠ“Š¾ŠŗŠ¾Š½ŃŠŗŠ°Ń. ŠŠµŃŃŠµ Š»Šø ŃŠøŠ³ŃŃŠ½Šø Š“Š° Š¶ŠµŠ»ŠøŃŠµ Š½Š°ŃŃŠ°Š²ŠøŃŠø?"
-#: ../src/roster_window.py:3802
+#: ../src/roster_window.py:3776
msgid ""
"Metacontacts are a way to regroup several contacts in one line. Generally it "
"is used when the same person has several Jabber accounts or transport "
@@ -8839,14 +9023,14 @@
"ŠŠµŠ½ŠµŃŠ°Š»Š½Š¾, Š¾Š½Šø ŃŠµ ŠŗŠ¾ŃŠøŃŃŠµ ŠŗŠ°Š“Š° ŠøŃŃŠ° Š¾ŃŠ¾Š±Š° ŠøŠ¼Š° Š½ŠµŠŗŠ¾Š»ŠøŠŗŠ¾ ŠŠ°Š±ŠµŃ Š½Š°Š»Š¾Š³Š° ŠøŠ»Šø "
"ŃŃŠ°Š½ŃŠæŠ¾ŃŃŠ½ŠøŃ
Š½Š°Š»Š¾Š³Š°."
-#: ../src/roster_window.py:3915
+#: ../src/roster_window.py:3889
msgid "Invalid file URI:"
msgstr "ŠŠµŠøŃŠæŃŠ°Š²Š°Š½ URI Š“Š°ŃŠ¾ŃŠµŠŗŠµ:"
-#: ../src/roster_window.py:3926
-#, python-format
+#: ../src/roster_window.py:3900
+#, fuzzy, python-format
msgid "Do you want to send this file to %s:"
-msgid_plural "Do you want to send those files to %s:"
+msgid_plural "Do you want to send these files to %s:"
msgstr[0] "ŠŠ° Š»Šø Š¶ŠµŠ»ŠøŃŠµ ŠæŠ¾ŃŠ»Š°ŃŠø Š¾Š²Ń Š“Š°ŃŠ¾ŃŠµŠŗŃ ŠŗŠ¾Š½ŃŠ°ŠŗŃŃ %s:"
msgstr[1] "ŠŠ° Š»Šø Š¶ŠµŠ»ŠøŃŠµ ŠæŠ¾ŃŠ»Š°ŃŠø Š¾Š²Šµ Š“Š°ŃŠ¾ŃŠµŠŗŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŃŃ %s:"
msgstr[2] "ŠŠ° Š»Šø Š¶ŠµŠ»ŠøŃŠµ ŠæŠ¾ŃŠ»Š°ŃŠø Š¾Š²Šµ Š“Š°ŃŠ¾ŃŠµŠŗŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŃŃ %s:"
@@ -8856,123 +9040,123 @@
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:4598 ../src/roster_window.py:4669
-#: ../src/roster_window.py:4678 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../src/roster_window.py:4577 ../src/roster_window.py:4648
+#: ../src/roster_window.py:4657 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
#, python-format
msgid "using account %s"
msgstr "ŠŗŠ¾ŃŠøŃŃŠµŃŠø ŃŠ°ŃŃŠ½ %s"
#. add
-#: ../src/roster_window.py:4685
+#: ../src/roster_window.py:4664
#, python-format
msgid "to %s account"
msgstr "Š½Š° %s Š½Š°Š»Š¾Š³"
#. disco
-#: ../src/roster_window.py:4690
+#: ../src/roster_window.py:4669
#, python-format
msgid "using %s account"
msgstr "ŠŗŠ¾ŃŠøŃŃŠµŃŠø %s ŃŠ°ŃŃŠ½"
-#: ../src/roster_window.py:4730
+#: ../src/roster_window.py:4706 ../src/systray.py:303
msgid "_Manage Bookmarks..."
msgstr "Š£ŠæŃŠ°Š²ŃŠ°ŃŠµ _Š¼Š°ŃŠŗŠµŃŠøŠ¼Š°..."
#. profile, avatar
-#: ../src/roster_window.py:4749
+#: ../src/roster_window.py:4726
#, python-format
msgid "of account %s"
msgstr "Š½Š°Š»Š¾Š³Š° %s"
-#: ../src/roster_window.py:4789
+#: ../src/roster_window.py:4766
#, python-format
msgid "for account %s"
msgstr "Š·Š° Š½Š°Š»Š¾Š³ %s"
-#: ../src/roster_window.py:4851 ../src/roster_window.py:4960
+#: ../src/roster_window.py:4828 ../src/roster_window.py:4937
msgid "_Change Status Message"
msgstr "_ŠŠ·Š¼ŠµŠ½Šø ŃŃŠ°ŃŃŃŠ½Ń ŠæŠ¾ŃŃŠŗŃ"
-#: ../src/roster_window.py:4878
+#: ../src/roster_window.py:4855
msgid "Publish Tune"
msgstr "ŠŠ±ŃŠ°Š²Šø ŠæŠµŃŠ¼Ń"
-#: ../src/roster_window.py:4885
+#: ../src/roster_window.py:4862
msgid "Mood"
msgstr "Š Š°ŃŠæŠ¾Š»Š¾Š¶ŠµŃŠµ"
-#: ../src/roster_window.py:4889
+#: ../src/roster_window.py:4866
msgid "Activity"
msgstr "ŠŠŗŃŠøŠ²Š½Š¾ŃŃ"
-#: ../src/roster_window.py:4894
+#: ../src/roster_window.py:4871
msgid "Configure Services..."
msgstr "ŠŠ¾Š½ŃŠøŠ³ŃŃŠøŃŠø ŃŠµŃŠ²ŠøŃŠµ..."
-#: ../src/roster_window.py:5048
+#: ../src/roster_window.py:5025
msgid "_Maximize All"
msgstr "_Š£Š²ŠµŃŠ°Ń ŃŠ²Šµ"
#. Send Group Message
-#: ../src/roster_window.py:5056 ../src/roster_window.py:5560
+#: ../src/roster_window.py:5033 ../src/roster_window.py:5558
msgid "Send Group M_essage"
msgstr "Š_Š¾ŃŠ°ŃŠø Š³ŃŃŠæŠ½Ń ŠæŠ¾ŃŃŠŗŃ"
-#: ../src/roster_window.py:5064
+#: ../src/roster_window.py:5041
msgid "To all users"
msgstr "Š”Š²ŠøŠ¼ ŠŗŠ¾ŃŠøŃŠ½ŠøŃŠøŠ¼Š°"
-#: ../src/roster_window.py:5068
+#: ../src/roster_window.py:5045
msgid "To all online users"
msgstr "Š”Š²ŠøŠ¼ ŠŗŠ¾ŃŠøŃŠ½ŠøŃŠøŠ¼Š° Š½Š° Š²ŠµŠ·Šø"
-#: ../src/roster_window.py:5462
+#: ../src/roster_window.py:5455
msgid "I would like to add you to my roster"
msgstr "ŠŠµŠ»ŠµŠ¾ Š±ŠøŃ
ŠŠ°Ń Š“Š¾Š“Š°ŃŠø Š½Š° Š¼Š¾ŃŃ Š»ŠøŃŃŃ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ°"
#. Manage Transport submenu
-#: ../src/roster_window.py:5580
+#: ../src/roster_window.py:5578
msgid "_Manage Contacts"
msgstr "_Š£ŠæŃŠ°Š²ŃŠ°ŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŃŠøŠ¼Š°"
#. Send single message
-#: ../src/roster_window.py:5641
+#: ../src/roster_window.py:5639
msgid "Send Single Message"
msgstr "ŠŠ¾ŃŠ°ŃŠø ŃŠµŠ“Š½Ń ŠæŠ¾ŃŃŠŗŃ"
#. Manage Transport submenu
-#: ../src/roster_window.py:5697
+#: ../src/roster_window.py:5695
msgid "_Manage Transport"
msgstr "_Š£ŠæŃŠ°Š²ŃŠ°ŃŠµ ŃŃŠ°Š½ŃŠæŠ¾ŃŃŠøŠ¼Š°"
#. Modify Transport
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5703
msgid "_Modify Transport"
msgstr "_ŠŠ·Š¼ŠµŠ½Šø ŃŃŠ°Š½ŃŠæŠ¾ŃŃ"
-#: ../src/roster_window.py:5780
+#: ../src/roster_window.py:5778
msgid "_Maximize"
msgstr "_Š£Š²ŠµŃŠ°Ń"
-#: ../src/roster_window.py:5787
+#: ../src/roster_window.py:5785
msgid "_Disconnect"
msgstr "_ŠŠ·Š»Š¾Š³ŃŃ ŃŠµ"
-#: ../src/roster_window.py:5867
+#: ../src/roster_window.py:5865
msgid "_New Group Chat"
msgstr "_ŠŠ¾Š²Šø Š³ŃŃŠæŠ½Šø ŃŠ°Š·Š³Š¾Š²Š¾Ń"
#. History manager
-#: ../src/roster_window.py:5980
+#: ../src/roster_window.py:5978
msgid "History Manager"
msgstr "Š£ŠæŃŠ°Š²Š½ŠøŠŗ ŠøŃŃŠ¾ŃŠøŃŠ°ŃŠ¾Š¼"
-#: ../src/roster_window.py:5989
+#: ../src/roster_window.py:5987 ../src/systray.py:341
msgid "_Join New Group Chat"
msgstr "_ŠŃŠøŠ“ŃŃŠ¶ŠøŠ²Š°ŃŠµ Š½Š¾Š²Š¾Š¼ Š³ŃŃŠæŠ½Š¾Š¼ ŃŠ°Š·Š³Š¾Š²Š¾ŃŃ"
-#: ../src/roster_window.py:6199
+#: ../src/roster_window.py:6197
msgid "Change Status Message..."
msgstr "ŠŃŠ¾Š¼ŠµŠ½Šø ŃŃŠ°ŃŃŃŠ½Ń ŠæŠ¾ŃŃŠŗŃ..."
@@ -8989,27 +9173,27 @@
msgid "No result"
msgstr "ŠŠµŠ¼Š° ŃŠµŠ·ŃŠ»ŃŠ°ŃŠ°"
-#: ../src/session.py:122
+#: ../src/session.py:124
msgid "Disk WriteError"
msgstr "ŠŃŠµŃŠŗŠ° ŠæŃŠø ŃŠæŠøŃŃ Š½Š° Š“ŠøŃŠŗ"
-#: ../src/session.py:232
+#: ../src/session.py:238
#, python-format
msgid "Subject: %s"
msgstr "Š¢ŠµŠ¼Š°: %s"
-#: ../src/session.py:392 ../src/session.py:430
+#: ../src/session.py:399 ../src/session.py:434
msgid "Confirm these session options"
msgstr "ŠŠ¾ŃŠ²ŃŠ“Šø Š¾Š²Šµ Š¾ŠæŃŠøŃŠµ ŃŠµŃŠøŃŠµ"
-#: ../src/session.py:393
-#, python-format
+#: ../src/session.py:401
+#, fuzzy, python-format
msgid ""
"The remote client wants to negotiate an session with these features:\n"
"\n"
-"\t\t%s\n"
+"\t%s\n"
"\n"
-"\t\tAre these options acceptable?"
+"\tAre these options acceptable?"
msgstr ""
"Š£Š“Š°ŃŠµŠ½Šø ŠŗŠ»ŠøŃŠµŠ½Ń Š¶ŠµŠ»Šø Š“Š° Š·Š°ŠæŠ¾ŃŠ½Šµ ŃŠµŃŠøŃŃ ŃŠ° Š¾Š²ŠøŠ¼ Š¼Š¾Š³ŃŃŠ½Š¾ŃŃŠøŠ¼Š°:\n"
"\n"
@@ -9017,7 +9201,7 @@
"\n"
"\t\tŠŠ° Š»Šø ŃŃ Š¾Š²Šµ ŃŃŠ°Š²ŠŗŠµ ŠæŃŠøŃ
Š²Š°ŃŃŠøŠ²Šµ?"
-#: ../src/session.py:431
+#: ../src/session.py:435
#, python-format
msgid ""
"The remote client selected these options:\n"
@@ -9032,19 +9216,19 @@
"\n"
"ŠŠ°ŃŃŠ°Š²ŠøŃŠø ŃŠ° ŃŠµŃŠøŃŠ¾Š¼?"
-#: ../src/systray.py:176
+#: ../src/systray.py:188
msgid "_Change Status Message..."
msgstr "_ŠŃŠ¾Š¼ŠµŠ½Šø ŃŃŠ°ŃŃŃŠ½Ń ŠæŠ¾ŃŃŠŗŃ..."
-#: ../src/systray.py:261
+#: ../src/systray.py:322
msgid "Hide this menu"
msgstr "Š”Š°ŠŗŃŠøŃ Š¾Š²Š°Ń Š¼ŠµŠ½Šø"
-#: ../src/tooltips.py:327 ../src/tooltips.py:522
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
msgid "Jabber ID: "
msgstr "ŠŠ°Š±ŠµŃ ŠŠ: "
-#: ../src/tooltips.py:330 ../src/tooltips.py:526
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
msgid "Resource: "
msgstr "Š ŠµŃŃŃŃ: "
@@ -9061,104 +9245,95 @@
msgid " [minimized]"
msgstr " [ŃŠ¼Š°ŃŠµŠ½]"
-#: ../src/tooltips.py:451 ../src/tooltips.py:710
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
msgid "Status: "
msgstr "Š”ŃŠ°ŃŃŃ: "
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
#, python-format
msgid "Last status: %s"
msgstr "ŠŠ¾ŃŠ»ŠµŠ“ŃŠø ŃŃŠ°ŃŃŃ: %s"
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
#, python-format
msgid " since %s"
msgstr " Š¾Š“ %s"
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
msgid "Connected"
msgstr "ŠŠ° Š²ŠµŠ·Šø"
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
msgid "Disconnected"
msgstr "ŠŠ°Š½ Š²ŠµŠ·Šµ"
#. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:532
msgid "Subscription: "
msgstr "ŠŃŠµŃŠæŠ»Š°ŃŠ°: "
-#: ../src/tooltips.py:543
+#: ../src/tooltips.py:542
msgid "OpenPGP: "
msgstr "OpenPGP: "
-#: ../src/tooltips.py:589
+#: ../src/tooltips.py:587
msgid "Mood:"
msgstr "Š Š°ŃŠæŠ¾Š»Š¾Š¶ŠµŃŠµ:"
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:602
msgid "Activity:"
msgstr "ŠŠŗŃŠøŠ²Š½Š¾ŃŃ:"
-#: ../src/tooltips.py:640
+#: ../src/tooltips.py:638
msgid "Tune:"
msgstr "ŠŠµŃŠ¼Š°:"
-#: ../src/tooltips.py:641
-#, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
-msgstr ""
-"<b>\"%(title)s\"</b> Š¾Š“ <i>%(artist)s</i>\n"
-"ŠøŠ· <i>%(source)s</i>"
-
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:664
msgid "Download"
msgstr "Š”ŠŗŠøŠ“Š°ŃŠµ"
-#: ../src/tooltips.py:672
+#: ../src/tooltips.py:670
msgid "Upload"
msgstr "Š”Š»Š°ŃŠµ"
-#: ../src/tooltips.py:679
+#: ../src/tooltips.py:677
msgid "Type: "
msgstr "Š¢ŠøŠæ: "
-#: ../src/tooltips.py:685
+#: ../src/tooltips.py:681
msgid "Transferred: "
msgstr "ŠŃŠµŠ½ŠµŃŠµŠ½Š¾: "
-#: ../src/tooltips.py:688 ../src/tooltips.py:709
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
msgid "Not started"
msgstr "ŠŠøŃŠµ ŠæŠ¾ŃŠµŠ¾"
-#: ../src/tooltips.py:692
+#: ../src/tooltips.py:688
msgid "Stopped"
msgstr "ŠŠ°ŃŃŃŠ°Š²ŃŠµŠ½"
-#: ../src/tooltips.py:694 ../src/tooltips.py:697
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
msgid "Completed"
msgstr "ŠŠ°Š²ŃŃŠµŠ½"
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:697
msgid "?transfer status:Paused"
msgstr "?ŃŃŠ°ŃŃŃ ŠæŃŠµŠ½Š¾ŃŠ°:ŠŠ°ŃŠ·ŠøŃŠ°Š½"
#. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:701
msgid "Stalled"
msgstr "ŠŠ°ŃŃŠ¾Ń"
-#: ../src/tooltips.py:707
+#: ../src/tooltips.py:703
msgid "Transferring"
msgstr "ŠŃŠµŠ½Š¾Ń Ń ŃŠ¾ŠŗŃ"
-#: ../src/tooltips.py:743
+#: ../src/tooltips.py:739
msgid "This service has not yet responded with detailed information"
msgstr "ŠŠ²Š°Ń ŃŠµŃŠ²ŠøŃ ŃŠ¾Ń Š½ŠøŃŠµ ŠæŃŃŠ¶ŠøŠ¾ Š“ŠµŃŠ°ŃŠ½Šµ ŠøŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃŠµ"
-#: ../src/tooltips.py:746
+#: ../src/tooltips.py:742
msgid ""
"This service could not respond with detailed information.\n"
"It is most likely legacy or broken"
@@ -9225,6 +9400,22 @@
msgid " resource with priority "
msgstr " ŃŠµŃŃŃŃ ŃŠ° ŠæŃŠøŠ¾ŃŠøŃŠµŃŠ¾Š¼ "
+#~ msgid ""
+#~ "If checked, Gajim will sort contacts in roster window and groupchats by "
+#~ "their status and not by the shown name"
+#~ msgstr ""
+#~ "ŠŠŗŠ¾ ŃŠµ Š¾Š·Š½Š°ŃŠµŠ½Š¾, ŠŠ°ŃŠøŠ¼ ŃŠµ ŃŠ¾ŃŃŠøŃŠ°ŃŠø Š°Š²Š°ŃŠ°ŃŠµ ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° Ń Š»ŠøŃŃŠø ŠŗŠ¾Š½ŃŠ°ŠŗŠ°ŃŠ° "
+#~ "ŠæŠ¾ ŃŃŠ°ŃŃŃŃ, Š° Š½Šµ ŠæŠ¾ ŠæŃŠøŠŗŠ°Š·Š°Š½Š¾Š¼ ŠøŠ¼ŠµŠ½Ń"
+
+#~ msgid "A_ccounts"
+#~ msgstr "ŠŠ°Š»Š¾_Š·Šø"
+
+#~ msgid "<b>\"%(title)s\"</b> by "
+#~ msgstr "<b>\"%(title)s\"</b> Š¾Š“ "
+
+#~ msgid "%(title)s by %(artist)s\n"
+#~ msgstr "%(title)s Š¾Š“ %(artist)s\n"
+
#~ msgid "Close"
#~ msgstr "ŠŠ°ŃŠ²Š¾ŃŠø"
@@ -9382,9 +9573,6 @@
#~ "\n"
#~ "ŠŠ¾Š³ŃŃŠ½Š¾ŃŃ Š±Š¾ŃŠµŃŠ° Š»Š¾ŃŠµ Š½Š°ŠæŠøŃŠ°Š½ŠøŃ
ŃŠµŃŠø Š½ŠµŃŠµ Š±ŠøŃŠø ŠŗŠ¾ŃŠøŃŃŠµŠ½Š°"
-#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-#~ msgstr "%s Š½ŠøŃŠµ ŠµŠ¼ŠøŃŠ¾Š²Š°Š¾ OpenPGP ŠŗŃŃŃ, Š½ŠøŃŠø Š¼Ń ŃŠµ ŠøŃŠµŠ“Š°Š½ Š“Š¾Š“ŠµŃŠµŠ½"
-
#~ msgid "Every %s _minutes"
#~ msgstr "Š”Š²Š°ŠŗŠ° %s _Š¼ŠøŠ½ŃŃŠ°"
@@ -9408,11 +9596,6 @@
#~ msgid "%s does not appear to be a valid JID"
#~ msgstr "%s Š½Šµ Š»ŠøŃŠø Š“Š° ŃŠµ Š²Š°Š»ŠøŠ“Š°Š½ ŠŠ°Š±ŠµŃ ŠŠ"
-#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-#~ msgstr ""
-#~ "ŠŠµ ŠæŠ¾ŃŃŠ¾ŃŠø ŠŗŠ¾Š¼Š°Š½Š“Š°: /%s (Š°ŠŗŠ¾ Š¶ŠµŠ»ŠøŃŠµ Š“Š° ŠæŠ¾ŃŠ°ŃŠµŃŠµ ŃŠ¾ ŠŗŠ°Š¾ ŠæŠ¾ŃŃŠŗŃ, "
-#~ "ŠæŃŠµŃŠøŠŗŃŠøŃŠ°ŃŃŠµ ŃŠµ ŃŠ° /say)"
-
#~ msgid "_Log on"
#~ msgstr "_ŠŃŠøŃŠ°Š²Š°"
1
0
Author: asterix
Date: 2008-10-16 20:40:00 +0200 (Thu, 16 Oct 2008)
New Revision: 10536
Modified:
trunk/src/common/xmpp/client_nb.py
Log:
fix typo
Modified: trunk/src/common/xmpp/client_nb.py
===================================================================
--- trunk/src/common/xmpp/client_nb.py 2008-10-16 17:19:22 UTC (rev 10535)
+++ trunk/src/common/xmpp/client_nb.py 2008-10-16 18:40:00 UTC (rev 10536)
@@ -292,7 +292,7 @@
def _on_auth_bind(self, data):
if data:
self.Dispatcher.ProcessNonBlocking(data)
- if not hasattr(self, NonBlockingBind) or self.NonBlockingBind.bound is \
+ if not hasattr(self, 'NonBlockingBind') or self.NonBlockingBind.bound is \
None:
return
self.NonBlockingBind.NonBlockingBind(self._Resource, self._on_sasl_auth)
1
0
Author: asterix
Date: 2008-10-16 19:19:22 +0200 (Thu, 16 Oct 2008)
New Revision: 10535
Modified:
trunk/src/common/xmpp/client_nb.py
Log:
prevent traceback. Fixes #4319
Modified: trunk/src/common/xmpp/client_nb.py
===================================================================
--- trunk/src/common/xmpp/client_nb.py 2008-10-14 15:33:20 UTC (rev 10534)
+++ trunk/src/common/xmpp/client_nb.py 2008-10-16 17:19:22 UTC (rev 10535)
@@ -292,7 +292,8 @@
def _on_auth_bind(self, data):
if data:
self.Dispatcher.ProcessNonBlocking(data)
- if self.NonBlockingBind.bound is None:
+ if not hasattr(self, NonBlockingBind) or self.NonBlockingBind.bound is \
+ None:
return
self.NonBlockingBind.NonBlockingBind(self._Resource, self._on_sasl_auth)
return True
@@ -408,4 +409,4 @@
self.NBComponentBind.PlugOut()
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
1
0
[commit-gajim] r10534 - in branches/osx_newbuildsys: . src src/common src/common/idle_c src/common/xmpp src/common/zeroconf src/osx src/osx/growl test test/lib
by jsļ¼ gajim.org 14 Oct '08
by jsļ¼ gajim.org 14 Oct '08
14 Oct '08
Author: js
Date: 2008-10-14 17:33:20 +0200 (Tue, 14 Oct 2008)
New Revision: 10534
Removed:
branches/osx_newbuildsys/gajim.iss
Modified:
branches/osx_newbuildsys/setup_osx.py
branches/osx_newbuildsys/src/advanced.py
branches/osx_newbuildsys/src/cell_renderer_image.py
branches/osx_newbuildsys/src/chat_control.py
branches/osx_newbuildsys/src/common/GnuPG.py
branches/osx_newbuildsys/src/common/atom.py
branches/osx_newbuildsys/src/common/caps.py
branches/osx_newbuildsys/src/common/commands.py
branches/osx_newbuildsys/src/common/config.py
branches/osx_newbuildsys/src/common/connection.py
branches/osx_newbuildsys/src/common/connection_handlers.py
branches/osx_newbuildsys/src/common/crypto.py
branches/osx_newbuildsys/src/common/dataforms.py
branches/osx_newbuildsys/src/common/helpers.py
branches/osx_newbuildsys/src/common/idle_c/Makefile
branches/osx_newbuildsys/src/common/logger.py
branches/osx_newbuildsys/src/common/nslookup.py
branches/osx_newbuildsys/src/common/optparser.py
branches/osx_newbuildsys/src/common/pubsub.py
branches/osx_newbuildsys/src/common/sleepy.py
branches/osx_newbuildsys/src/common/socks5.py
branches/osx_newbuildsys/src/common/stanza_session.py
branches/osx_newbuildsys/src/common/xmpp/auth.py
branches/osx_newbuildsys/src/common/xmpp/auth_nb.py
branches/osx_newbuildsys/src/common/xmpp/browser.py
branches/osx_newbuildsys/src/common/xmpp/c14n.py
branches/osx_newbuildsys/src/common/xmpp/client.py
branches/osx_newbuildsys/src/common/xmpp/client_nb.py
branches/osx_newbuildsys/src/common/xmpp/commands.py
branches/osx_newbuildsys/src/common/xmpp/debug.py
branches/osx_newbuildsys/src/common/xmpp/dispatcher.py
branches/osx_newbuildsys/src/common/xmpp/dispatcher_nb.py
branches/osx_newbuildsys/src/common/xmpp/features.py
branches/osx_newbuildsys/src/common/xmpp/filetransfer.py
branches/osx_newbuildsys/src/common/xmpp/protocol.py
branches/osx_newbuildsys/src/common/xmpp/roster.py
branches/osx_newbuildsys/src/common/xmpp/session.py
branches/osx_newbuildsys/src/common/xmpp/simplexml.py
branches/osx_newbuildsys/src/common/xmpp/transports.py
branches/osx_newbuildsys/src/common/xmpp/transports_nb.py
branches/osx_newbuildsys/src/common/zeroconf/connection_handlers_zeroconf.py
branches/osx_newbuildsys/src/common/zeroconf/connection_zeroconf.py
branches/osx_newbuildsys/src/common/zeroconf/roster_zeroconf.py
branches/osx_newbuildsys/src/common/zeroconf/zeroconf_bonjour.py
branches/osx_newbuildsys/src/config.py
branches/osx_newbuildsys/src/conversation_textview.py
branches/osx_newbuildsys/src/dataforms_widget.py
branches/osx_newbuildsys/src/dialogs.py
branches/osx_newbuildsys/src/disco.py
branches/osx_newbuildsys/src/features_window.py
branches/osx_newbuildsys/src/filetransfers_window.py
branches/osx_newbuildsys/src/gajim-remote.py
branches/osx_newbuildsys/src/gajim.py
branches/osx_newbuildsys/src/groupchat_control.py
branches/osx_newbuildsys/src/gtkexcepthook.py
branches/osx_newbuildsys/src/gtkgui_helpers.py
branches/osx_newbuildsys/src/htmltextview.py
branches/osx_newbuildsys/src/ipython_view.py
branches/osx_newbuildsys/src/lastfm.py
branches/osx_newbuildsys/src/message_control.py
branches/osx_newbuildsys/src/message_window.py
branches/osx_newbuildsys/src/music_track_listener.py
branches/osx_newbuildsys/src/network_manager_listener.py
branches/osx_newbuildsys/src/notify.py
branches/osx_newbuildsys/src/osx/growl/Growl.py
branches/osx_newbuildsys/src/osx/growler.py
branches/osx_newbuildsys/src/remote_control.py
branches/osx_newbuildsys/src/roster_window.py
branches/osx_newbuildsys/src/session.py
branches/osx_newbuildsys/src/systray.py
branches/osx_newbuildsys/src/tooltips.py
branches/osx_newbuildsys/src/vcard.py
branches/osx_newbuildsys/test/lib/mock.py
branches/osx_newbuildsys/test/lib/mocks.py
branches/osx_newbuildsys/test/runtests.py
branches/osx_newbuildsys/test/test_misc_interface.py
Log:
Merge with trunk r10533.
Deleted: branches/osx_newbuildsys/gajim.iss
===================================================================
--- branches/osx_newbuildsys/gajim.iss 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/gajim.iss 2008-10-14 15:33:20 UTC (rev 10534)
@@ -1,89 +0,0 @@
-[Setup]
-AppName=Gajim
-AppVerName=Gajim version 0.11.4
-OutputBaseFilename=gajim-0.11.4-1
-DefaultDirName={pf}\Gajim
-DefaultGroupName=Gajim
-UninstallDisplayIcon={app}\src\Gajim.exe
-Compression=lzma
-SolidCompression=yes
-SetupIconFile=data\pixmaps\gajim.ico
-
-[Components]
-Name: "main"; Description: "Main Files"; Types: full compact custom; Flags: fixed
-
-[Tasks]
-Name: desktopicon; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"; Components: main
-Name: removeprevious; Description: "Remove previously installed version"; GroupDescription: "Previous install:"; Components: main; Check: IsAlreadyInstalled('Gajim');
-
-[Files]
-Source: "dist\*.pyd"; DestDir: "{app}\src"
-Source: "dist\*.dll"; DestDir: "{app}\src"
-Source: "dist\*.zip"; DestDir: "{app}\src"
-Source: "COPYING"; DestDir: "{app}"
-Source: "THANKS"; DestDir: "{app}"
-Source: "AUTHORS"; DestDir: "{app}"
-Source: "dist\gajim.exe"; DestDir: "{app}\src"; components: main
-Source: "dist\history_manager.exe"; DestDir: "{app}\src"; components: main
-Source: "data\*"; DestDir: "{app}\data"; Flags: recursesubdirs
-Source: "po\*.mo"; DestDir: "{app}\po"; Flags: recursesubdirs
-;Source: "gtk\*"; DestDir: "{app}\src\gtk"; Flags: recursesubdirs
-;Source: "gtk\bin\xmlparse.dll"; DestDir: "{app}\src"
-;Source: "gtk\bin\xmltok.dll"; DestDir: "{app}\src"
-
-[Icons]
-Name: "{group}\Gajim"; Filename: "{app}\src\Gajim.exe"; WorkingDir: "{app}\src"
-Name: "{group}\History Manager"; Filename: "{app}\src\history_manager.exe"; WorkingDir: "{app}\src"
-Name: "{group}\Uninstall Gajim"; Filename: "{app}\unins000.exe"; WorkingDir: "{app}"
-Name: "{userdesktop}\Gajim"; Filename: "{app}\src\gajim.exe"; WorkingDir: "{app}\src"; IconFilename: "{app}\data\pixmaps\gajim.ico"; Components: main; Tasks: desktopicon
-
-[Run]
-Filename: "{app}\src\gajim.exe"; Description: "Launch application"; Flags: postinstall nowait skipifsilent
-
-[Code]
-
-function GetUninstallPath( AppID: String ): String;
-var
- sPrevPath: String;
-begin
- sPrevPath := '';
- if not RegQueryStringValue( HKLM,
- 'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1',
- 'UninstallString', sPrevpath) then
- RegQueryStringValue( HKCU, 'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1' ,
- 'UninstallString', sPrevpath);
-
- Result := sPrevPath;
-end;
-
-function IsAlreadyInstalled( AppID: String ): Boolean;
-var
- sPrevPath: String;
-begin
- sPrevPath := GetUninstallPath( AppID );
-
-
- if ( Length(sPrevPath) > 0 ) then
- Result:=true
- else
- Result:=false;
- end;
-
-procedure CurStepChanged(CurStep: TSetupStep);
-var
- sUninstPath: String;
- sPrevID: String;
- ResultCode: Integer;
-begin
- if CurStep = ssInstall then
- begin
- sPrevID := 'Gajim';
- sUninstPath := GetUninstallPath( sprevID );
-
- if ( Length(sUninstPath) > 0 ) then
- begin
- sUninstPath := RemoveQuotes(sUninstPath);
- Exec( RemoveQuotes(sUninstPath), '/silent', '', SW_SHOW, ewWaitUntilTerminated, ResultCode);
- end;
- end;
-end;
Modified: branches/osx_newbuildsys/setup_osx.py
===================================================================
--- branches/osx_newbuildsys/setup_osx.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/setup_osx.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -70,10 +70,10 @@
###
def check(ret):
- if type(ret) == types.ListType:
+ if isinstance(ret, list):
if ret[0] != 0:
raise Exception("Command failed: " + ret[1])
- elif type(ret) == types.IntType:
+ elif isinstance(ret, int):
if ret != 0:
raise Exception("Command failed")
return
@@ -82,13 +82,13 @@
def force(func):
try:
func()
- except:
+ except Exception:
pass
return
def writeScript(filename, contents):
- script = file(filename, "w+")
+ script = open(filename, "w+")
script.write(contents)
script.close()
system("chmod +x %s" % filename)
@@ -148,8 +148,8 @@
copy("src/osx/prep_py2app.py", APP_RS)
move("dist/Gajim.app/Contents/Resources/__boot__.py",
"dist/Gajim.app/Contents/Resources/__boot__.py.org")
- new = file("dist/Gajim.app/Contents/Resources/__boot__.py", "w+")
- org = file("dist/Gajim.app/Contents/Resources/__boot__.py.org")
+ new = open("dist/Gajim.app/Contents/Resources/__boot__.py", "w+")
+ org = open("dist/Gajim.app/Contents/Resources/__boot__.py.org")
for line in org:
new.write(line)
if (('site.addsitedir' in line) and ('Python' in line)):
Modified: branches/osx_newbuildsys/src/advanced.py
===================================================================
--- branches/osx_newbuildsys/src/advanced.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/advanced.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -102,24 +102,24 @@
self.restart_label.hide()
gajim.interface.instances['advanced_config'] = self
- def cb_value_column_data(self, col, cell, model, iter):
+ def cb_value_column_data(self, col, cell, model, iter_):
'''check if it's boolen or holds password stuff and if yes
make the cellrenderertext not editable else it's editable'''
- optname = model[iter][C_PREFNAME]
- opttype = model[iter][C_TYPE]
+ optname = model[iter_][C_PREFNAME]
+ opttype = model[iter_][C_TYPE]
if opttype == self.types['boolean'] or optname == 'password':
cell.set_property('editable', False)
else:
cell.set_property('editable', True)
- def get_option_path(self, model, iter):
+ def get_option_path(self, model, iter_):
# It looks like path made from reversed array
# path[0] is the true one optname
# path[1] is the key name
# path[2] is the root of tree
# last two is optional
- path = [model[iter][0].decode('utf-8')]
- parent = model.iter_parent(iter)
+ path = [model[iter_][0].decode('utf-8')]
+ parent = model.iter_parent(iter_)
while parent:
path.append(model[parent][0].decode('utf-8'))
parent = model.iter_parent(parent)
@@ -249,14 +249,14 @@
value = self.right_true_dict[value]
model.append(iter, [name, value, type])
- def visible_func(self, model, iter):
+ def visible_func(self, model, iter_):
str = self.entry.get_text().decode('utf-8')
if str in (None, ''):
return True # show all
- name = model[iter][C_PREFNAME].decode('utf-8')
+ name = model[iter_][C_PREFNAME].decode('utf-8')
# If a child of the iter matches, we return True
- if model.iter_has_child(iter):
- iterC = model.iter_children(iter)
+ if model.iter_has_child(iter_):
+ iterC = model.iter_children(iter_)
while iterC:
nameC = model[iterC][C_PREFNAME].decode('utf-8')
if model.iter_has_child(iterC):
Modified: branches/osx_newbuildsys/src/cell_renderer_image.py
===================================================================
--- branches/osx_newbuildsys/src/cell_renderer_image.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/cell_renderer_image.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -45,8 +45,9 @@
def do_get_property(self, pspec):
return getattr(self, pspec.name)
- def func(self, model, path, iter, (image, tree)):
- if model.get_value(iter, self.tv_index) != image:
+ def func(self, model, path, iter_, image_tree):
+ image, tree = image_tree
+ if model.get_value(iter_, self.tv_index) != image:
return
self.redraw = 1
col = tree.get_column(self.col_index)
Modified: branches/osx_newbuildsys/src/chat_control.py
===================================================================
--- branches/osx_newbuildsys/src/chat_control.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/chat_control.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -56,7 +56,7 @@
try:
import gtkspell
HAS_GTK_SPELL = True
-except:
+except Exception:
HAS_GTK_SPELL = False
HAVE_MARKUP_TOOLTIPS = gtk.pygtk_version >= (2, 12, 0)
@@ -281,7 +281,7 @@
for lang in dict(langs):
try:
spell.set_language(langs[lang])
- except:
+ except Exception:
del langs[lang]
# now set the one the user selected
per_type = 'contacts'
@@ -593,7 +593,7 @@
return True
return False
- def send_message(self, message, keyID = '', type = 'chat', chatstate = None,
+ def send_message(self, message, keyID = '', type_ = 'chat', chatstate = None,
msg_id = None, composing_xep = None, resource = None,
process_command = True):
'''Send the given message to the active tab. Doesn't return None if error
@@ -604,7 +604,7 @@
ret = None
if not process_command or not self._process_command(message):
- ret = MessageControl.send_message(self, message, keyID, type = type,
+ ret = MessageControl.send_message(self, message, keyID, type_ = type_,
chatstate = chatstate, msg_id = msg_id,
composing_xep = composing_xep, resource = resource,
user_nick = self.user_nick)
@@ -1720,7 +1720,7 @@
self._schedule_activity_timers()
id = ChatControlBase.send_message(self, message, keyID,
- type = 'chat', chatstate = chatstate_to_send,
+ type_ = 'chat', chatstate = chatstate_to_send,
composing_xep = composing_xep,
process_command = process_command)
if id:
@@ -2342,7 +2342,6 @@
NS_ESESSION) and not gajim.capscache.is_supported(
self.contact, 'notexistant'):
self.begin_e2e_negotiation()
- self.no_autonegotiation = True
else:
self.send_chatstate('active', self.contact)
@@ -2577,6 +2576,8 @@
self.begin_e2e_negotiation()
def begin_e2e_negotiation(self):
+ self.no_autonegotiation = True
+
if not self.session:
fjid = self.contact.get_full_jid()
new_sess = gajim.connections[self.account].make_new_session(fjid)
Modified: branches/osx_newbuildsys/src/common/GnuPG.py
===================================================================
--- branches/osx_newbuildsys/src/common/GnuPG.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/GnuPG.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -53,7 +53,7 @@
# for that keyword.
resp = {}
- while 1:
+ while True:
line = helpers.temp_failure_retry(child_stdout.readline)
if line == "": break
line = line.rstrip()
@@ -68,12 +68,12 @@
resp[ keyword ] = ""
return resp
- def encrypt(self, str, recipients):
+ def encrypt(self, str_, recipients):
self.options.recipients = recipients # a list!
proc = self.run(['--encrypt'], create_fhs=['stdin', 'stdout', 'status',
'stderr'])
- proc.handles['stdin'].write(str)
+ proc.handles['stdin'].write(str_)
try:
proc.handles['stdin'].close()
except IOError:
@@ -103,9 +103,9 @@
error = ''
return self._stripHeaderFooter(output), error
- def decrypt(self, str, keyID):
+ def decrypt(self, str_, keyID):
proc = self.run(['--decrypt', '-q', '-u %s'%keyID], create_fhs=['stdin', 'stdout'])
- enc = self._addHeaderFooter(str, 'MESSAGE')
+ enc = self._addHeaderFooter(str_, 'MESSAGE')
proc.handles['stdin'].write(enc)
proc.handles['stdin'].close()
@@ -116,9 +116,9 @@
except IOError: pass
return output
- def sign(self, str, keyID):
+ def sign(self, str_, keyID):
proc = self.run(['-b', '-u %s'%keyID], create_fhs=['stdin', 'stdout', 'status', 'stderr'])
- proc.handles['stdin'].write(str)
+ proc.handles['stdin'].write(str_)
try:
proc.handles['stdin'].close()
except IOError:
@@ -144,12 +144,12 @@
return self._stripHeaderFooter(output)
return 'BAD_PASSPHRASE'
- def verify(self, str, sign):
- if str is None:
+ def verify(self, str_, sign):
+ if str_ is None:
return ''
f = tmpfile()
fd = f.fileno()
- f.write(str)
+ f.write(str_)
f.seek(0)
proc = self.run(['--verify', '--enable-special-filenames', '-', '-&%s'%fd], create_fhs=['stdin', 'status', 'stderr'])
@@ -215,13 +215,13 @@
line = '\n'.join(lines[0:i])
return line
- def _addHeaderFooter(self, data, type):
+ def _addHeaderFooter(self, data, type_):
"""Add header and footer from data"""
- out = "-----BEGIN PGP %s-----\n" % type
+ out = "-----BEGIN PGP %s-----\n" % type_
out = out + "Version: PGP\n"
out = out + "\n"
out = out + data + "\n"
- out = out + "-----END PGP %s-----\n" % type
+ out = out + "-----END PGP %s-----\n" % type_
return out
# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/common/atom.py
===================================================================
--- branches/osx_newbuildsys/src/common/atom.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/atom.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -107,7 +107,7 @@
''' Get source link '''
try:
return self.getTag('feed').getTags('link',{'rel':'alternate'})[1].getData()
- except:
+ except Exception:
return None
feed_link = property(get_feed_link, None, None,
@@ -124,7 +124,7 @@
''' Get the uri the entry points to (entry's first link element with rel='alternate'
or without rel attribute). '''
for element in self.getTags('link'):
- if 'rel' in element.attrs and element.attrs['rel']<>'alternate': continue
+ if 'rel' in element.attrs and element.attrs['rel']!='alternate': continue
try:
return element.attrs['href']
except AttributeError:
Modified: branches/osx_newbuildsys/src/common/caps.py
===================================================================
--- branches/osx_newbuildsys/src/common/caps.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/caps.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -89,10 +89,10 @@
# TODO: maybe put all known xmpp namespace strings here
# (strings given in xmpppy)?
__names = {}
- def __init__(ciself, hash_method, hash):
+ def __init__(ciself, hash_method, hash_):
# cached into db
ciself.hash_method = hash_method
- ciself.hash = hash
+ ciself.hash = hash_
ciself._features = []
ciself._identities = []
@@ -174,14 +174,14 @@
self.__cache[(hash_method, hash)] = x
return x
- def preload(self, con, jid, node, hash_method, hash):
+ def preload(self, con, jid, node, hash_method, hash_):
''' Preload data about (node, ver, exts) caps using disco
query to jid using proper connection. Don't query if
the data is already in cache. '''
if hash_method == 'old':
- q = self[(hash_method, node + '#' + hash)]
+ q = self[(hash_method, node + '#' + hash_)]
else:
- q = self[(hash_method, hash)]
+ q = self[(hash_method, hash_)]
if q.queried==0:
# do query for bare node+hash pair
@@ -190,7 +190,7 @@
if hash_method == 'old':
con.discoverInfo(jid)
else:
- con.discoverInfo(jid, '%s#%s' % (node, hash))
+ con.discoverInfo(jid, '%s#%s' % (node, hash_))
def is_supported(self, contact, feature):
if not contact:
@@ -228,12 +228,14 @@
# we will put these into proper Contact object and ask
# for disco... so that disco will learn how to interpret
# these caps
+ pm_ctrl = None
jid = helpers.get_full_jid_from_iq(presence)
contact = gajim.contacts.get_contact_from_full_jid(self.name, jid)
if contact is None:
room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
contact = gajim.contacts.get_gc_contact(
self.name, room_jid, nick)
+ pm_ctrl = gajim.interface.msg_win_mgr.get_control(jid, self.name)
if contact is None:
# TODO: a way to put contact not-in-roster
# into Contacts
@@ -267,6 +269,8 @@
contact.caps_node = node
contact.caps_hash_method = hash_method
contact.caps_hash = hash
+ if pm_ctrl:
+ pm_ctrl.update_contact()
def _capsDiscoCB(self, jid, node, identities, features, dataforms):
contact = gajim.contacts.get_contact_from_full_jid(self.name, jid)
Modified: branches/osx_newbuildsys/src/common/commands.py
===================================================================
--- branches/osx_newbuildsys/src/common/commands.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/commands.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -121,7 +121,7 @@
try:
form = dataforms.SimpleDataForm(extend = request.getTag('command').\
getTag('x'))
- except:
+ except Exception:
self.badRequest(request)
return False
@@ -131,14 +131,14 @@
('free-for-chat', 'online', 'away', 'xa', 'dnd', 'offline'):
self.badRequest(request)
return False
- except: # KeyError if there's no presence-type field in form or
+ except Exception: # KeyError if there's no presence-type field in form or
# AttributeError if that field is of wrong type
self.badRequest(request)
return False
try:
presencedesc = form['presence-desc'].value
- except: # same exceptions as in last comment
+ except Exception: # same exceptions as in last comment
presencedesc = u''
response, cmd = self.buildResponse(request, status = 'completed')
@@ -219,13 +219,13 @@
try:
form = dataforms.SimpleDataForm(extend = request.getTag('command').\
getTag('x'))
- except:
+ except Exception:
self.badRequest(request)
return False
try:
gc = form['groupchats'].values
- except: # KeyError if there's no groupchats in form
+ except Exception: # KeyError if there's no groupchats in form
self.badRequest(request)
return False
account = self.connection.name
@@ -240,7 +240,7 @@
gajim.interface.roster.remove_groupchat(room_jid, account)
continue
gc_control.parent_win.remove_tab(gc_control, None, force = True)
- except: # KeyError if there's no such room opened
+ except Exception: # KeyError if there's no such room opened
self.badRequest(request)
return False
response, cmd = self.buildResponse(request, status = 'completed')
@@ -271,7 +271,7 @@
for jid in events:
for event in events[jid]:
self.connection.send_message(j, event.parameters[0], '',
- type=event.type_, subject=event.parameters[1],
+ type_=event.type_, subject=event.parameters[1],
resource=resource, forward_from=jid, delayed=event.time_)
# Inform other client of completion
Modified: branches/osx_newbuildsys/src/common/config.py
===================================================================
--- branches/osx_newbuildsys/src/common/config.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/config.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -481,7 +481,7 @@
def is_valid_int(self, val):
try:
ival = int(val)
- except:
+ except Exception:
return None
return ival
@@ -502,17 +502,17 @@
def is_valid_string(self, val):
return val
- def is_valid(self, type, val):
- if not type:
+ def is_valid(self, type_, val):
+ if not type_:
return None
- if type[0] == 'boolean':
+ if type_[0] == 'boolean':
return self.is_valid_bool(val)
- elif type[0] == 'integer':
+ elif type_[0] == 'integer':
return self.is_valid_int(val)
- elif type[0] == 'string':
+ elif type_[0] == 'string':
return self.is_valid_string(val)
else:
- if re.match(type[1], val):
+ if re.match(type_[1], val):
return val
else:
return None
Modified: branches/osx_newbuildsys/src/common/connection.py
===================================================================
--- branches/osx_newbuildsys/src/common/connection.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/connection.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -41,7 +41,7 @@
try:
randomsource = random.SystemRandom()
-except:
+except Exception:
randomsource = random.Random()
randomsource.seed()
@@ -324,10 +324,7 @@
errnum = -1 # we don't have an errnum
ssl_msg = ''
if errnum > 0:
- if errnum in ssl_error:
- ssl_msg = ssl_error[errnum]
- else:
- ssl_msg = _('Unknown SSL error: %d') % errnum
+ ssl_msg = ssl_error.get(errnum, _('Unknown SSL error: %d') % errnum)
ssl_cert = ''
if hasattr(self.connection.Connection, 'ssl_cert_pem'):
ssl_cert = self.connection.Connection.ssl_cert_pem
@@ -450,7 +447,7 @@
try:
try:
env_http_proxy = os.environ['HTTP_PROXY']
- except:
+ except Exception:
env_http_proxy = os.environ['http_proxy']
env_http_proxy = env_http_proxy.strip('"')
# Dispose of the http:// prefix
@@ -477,7 +474,7 @@
else:
proxy['password'] = u''
- except:
+ except Exception:
proxy = None
else:
proxy = None
@@ -577,7 +574,10 @@
if len(self._hosts):
# No config option exist when creating a new account
if self.last_connection_type:
- self._connection_types = [self.last_connection_type]
+ if self.last_connection_type == 'tcp':
+ self._connection_types = ['plain']
+ else:
+ self._connection_types = [self.last_connection_type]
elif self.name in gajim.config.get_per('accounts'):
self._connection_types = gajim.config.get_per('accounts', self.name,
'connection_types').split()
@@ -1071,7 +1071,7 @@
self.connection.send(msg_iq)
- def send_message(self, jid, msg, keyID, type='chat', subject='',
+ def send_message(self, jid, msg, keyID, type_='chat', subject='',
chatstate=None, msg_id=None, composing_xep=None, resource=None,
user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None,
original_message=None, delayed=None):
@@ -1093,7 +1093,7 @@
if keyID and self.USE_GPG:
if keyID == 'UNKNOWN':
error = _('Neither the remote presence is signed, nor a key was assigned.')
- elif keyID[8:] == 'MISMATCH':
+ elif keyID.endswith('MISMATCH'):
error = _('The contact\'s key (%s) does not match the key assigned in Gajim.' % keyID[:8])
else:
#encrypt
@@ -1114,8 +1114,8 @@
'rst_formatting_outgoing_messages'):
# Generate a XHTML part using reStructured text markup
xhtml = create_xhtml(msgtxt)
- if type == 'chat':
- msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type,
+ if type_ == 'chat':
+ msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type_,
xhtml = xhtml)
else:
if subject:
@@ -1204,13 +1204,13 @@
ji = gajim.get_jid_without_resource(jid)
if gajim.config.should_log(self.name, ji):
log_msg = msg
- if original_message != None:
+ if original_message is not None:
log_msg = original_message
if subject:
log_msg = _('Subject: %(subject)s\n%(message)s') % \
{'subject': subject, 'message': msg}
if log_msg:
- if type == 'chat':
+ if type_ == 'chat':
kind = 'chat_msg_sent'
else:
kind = 'single_msg_sent'
Modified: branches/osx_newbuildsys/src/common/connection_handlers.py
===================================================================
--- branches/osx_newbuildsys/src/common/connection_handlers.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/connection_handlers.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -67,7 +67,7 @@
HAS_IDLE = True
try:
import idle
-except:
+except Exception:
gajim.log.debug(_('Unable to load idle module'))
HAS_IDLE = False
@@ -153,7 +153,7 @@
''' send iq for the present streamhosts and proxies '''
if not self.connection or self.connected < 2:
return
- if type(self.peerhost) != tuple:
+ if not isinstance(self.peerhost, tuple):
return
port = gajim.config.get('file_transfers_port')
ft_add_hosts_to_send = gajim.config.get('ft_add_hosts_to_send')
@@ -461,7 +461,7 @@
try:
streamhost = query.getTag('streamhost-used')
- except: # this bytestream result is not what we need
+ except Exception: # this bytestream result is not what we need
pass
id = real_id[3:]
if id in self.files_props:
@@ -470,7 +470,7 @@
raise common.xmpp.NodeProcessed
if streamhost is None:
# proxy approves the activate query
- if real_id[:3] == 'au_':
+ if real_id.startswith('au_'):
id = real_id[3:]
if 'streamhost-used' not in file_props or \
file_props['streamhost-used'] is False:
@@ -488,7 +488,7 @@
file_props['streamhost-used'] is True:
raise common.xmpp.NodeProcessed
- if real_id[:3] == 'au_':
+ if real_id.startswith('au_'):
if 'stopped' in file and file_props['stopped']:
self.remove_transfer(file_props)
else:
@@ -944,7 +944,7 @@
f.close()
try:
card = common.xmpp.Node(node = c)
- except:
+ except Exception:
# We are unable to parse it. Remove it
os.remove(path_to_file)
return None
@@ -998,7 +998,7 @@
iq3 = iq2.addChild(i)
for j in vcard[i]:
iq3.addChild(j).setData(vcard[i][j])
- elif type(vcard[i]) == type([]):
+ elif isinstance(vcard[i], list):
for j in vcard[i]:
iq3 = iq2.addChild(i)
for k in j:
@@ -1107,7 +1107,7 @@
order = meta.getAttr('order')
try:
order = int(order)
- except:
+ except Exception:
order = 0
if order is not None:
data['order'] = order
@@ -1174,7 +1174,7 @@
try:
photo_decoded = base64.decodestring(photo)
avatar_sha = sha.sha(photo_decoded).hexdigest()
- except:
+ except Exception:
avatar_sha = ''
else:
avatar_sha = ''
@@ -1280,7 +1280,7 @@
return session
if pm:
- return self.make_new_session(fjid, thread_id, type='pm')
+ return self.make_new_session(fjid, thread_id, type_='pm')
else:
return self.make_new_session(fjid, thread_id)
@@ -1349,15 +1349,15 @@
except (KeyError, IndexError):
return None
- def make_new_session(self, jid, thread_id=None, type='chat', cls=None):
+ def make_new_session(self, jid, thread_id=None, type_='chat', cls=None):
if not cls:
cls = gajim.default_session_type
- sess = cls(self, common.xmpp.JID(jid), thread_id, type)
+ sess = cls(self, common.xmpp.JID(jid), thread_id, type_)
# determine if this session is a pm session
# if not, discard the resource so that all sessions are stored bare
- if not type == 'pm':
+ if not type_ == 'pm':
jid = gajim.get_jid_without_resource(jid)
if not jid in self.sessions:
@@ -1388,7 +1388,7 @@
try:
idle.init()
- except:
+ except Exception:
HAS_IDLE = False
self.gmail_last_tid = None
@@ -1532,7 +1532,7 @@
status = qp.getData()
try:
seconds = int(seconds)
- except:
+ except Exception:
return
id = iq_obj.getID()
if id in self.groupchat_jids:
@@ -1771,7 +1771,7 @@
try:
msg = session.decrypt_stanza(msg)
msgtxt = msg.getBody()
- except:
+ except Exception:
self.dispatch('FAILED_DECRYPT', (frm, tim, session))
# Receipt requested
@@ -1938,7 +1938,7 @@
gajim.log.debug('PresenceCB: %s' % ptype)
try:
who = helpers.get_full_jid_from_iq(prs)
- except:
+ except Exception:
if prs.getTag('error').getTag('jid-malformed'):
# wrong jid, we probably tried to change our nick in a room to a non
# valid one
@@ -2000,7 +2000,7 @@
prio = prs.getPriority()
try:
prio = int(prio)
- except:
+ except Exception:
prio = 0
keyID = ''
if sigTag and self.USE_GPG and ptype != 'error':
Modified: branches/osx_newbuildsys/src/common/crypto.py
===================================================================
--- branches/osx_newbuildsys/src/common/crypto.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/crypto.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -75,8 +75,8 @@
else:
return base28_chr[n]
-def random_bytes(bytes):
- return os.urandom(bytes)
+def random_bytes(bytes_):
+ return os.urandom(bytes_)
def generate_nonce():
return random_bytes(8)
Modified: branches/osx_newbuildsys/src/common/dataforms.py
===================================================================
--- branches/osx_newbuildsys/src/common/dataforms.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/dataforms.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -351,12 +351,12 @@
return self.vars[item]
class DataForm(ExtendedNode):
- def __init__(self, type=None, title=None, instructions=None, extend=None):
+ def __init__(self, type_=None, title=None, instructions=None, extend=None):
if extend is None:
# we have to build form from scratch
xmpp.Node.__init__(self, 'x', attrs={'xmlns': xmpp.NS_DATA})
- if type is not None: self.type=type
+ if type_ is not None: self.type_=type_
if title is not None: self.title=title
if instructions is not None: self.instructions=instructions
@@ -367,9 +367,9 @@
filledform = DataForm(replyto=thisform)...'''
def fget(self):
return self.getAttr('type')
- def fset(self, type):
- assert type in ('form', 'submit', 'cancel', 'result')
- self.setAttr('type', type)
+ def fset(self, type_):
+ assert type_ in ('form', 'submit', 'cancel', 'result')
+ self.setAttr('type', type_)
return locals()
@nested_property
@@ -406,8 +406,8 @@
return locals()
class SimpleDataForm(DataForm, DataRecord):
- def __init__(self, type=None, title=None, instructions=None, fields=None, extend=None):
- DataForm.__init__(self, type=type, title=title, instructions=instructions, extend=extend)
+ def __init__(self, type_=None, title=None, instructions=None, fields=None, extend=None):
+ DataForm.__init__(self, type_=type_, title=title, instructions=instructions, extend=extend)
DataRecord.__init__(self, fields=fields, extend=self, associated=self)
def get_purged(self):
@@ -430,8 +430,8 @@
return c
class MultipleDataForm(DataForm):
- def __init__(self, type=None, title=None, instructions=None, items=None, extend=None):
- DataForm.__init__(self, type=type, title=title, instructions=instructions, extend=extend)
+ def __init__(self, type_=None, title=None, instructions=None, items=None, extend=None):
+ DataForm.__init__(self, type_=type_, title=title, instructions=instructions, extend=extend)
# all records, recorded into DataRecords
if extend is None:
Modified: branches/osx_newbuildsys/src/common/helpers.py
===================================================================
--- branches/osx_newbuildsys/src/common/helpers.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/helpers.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -69,7 +69,7 @@
import winsound # windows-only built-in module for playing wav
import win32api
import win32con
-except:
+except Exception:
pass
special_groups = (_('Transports'), _('Not in Roster'), _('Observers'), _('Groupchats'))
@@ -363,8 +363,7 @@
return affiliation_name
def get_sorted_keys(adict):
- keys = adict.keys()
- keys.sort()
+ keys = sorted(adict.keys())
return keys
def to_one_line(msg):
@@ -447,7 +446,7 @@
if os.name == 'nt':
try:
os.startfile(uri) # if pywin32 is installed we open
- except:
+ except Exception:
pass
else:
@@ -474,14 +473,14 @@
command = build_command(command, uri)
try:
exec_command(command)
- except:
+ except Exception:
pass
def launch_file_manager(path_to_open):
if os.name == 'nt':
try:
os.startfile(path_to_open) # if pywin32 is installed we open
- except:
+ except Exception:
pass
else:
if gajim.config.get('openwith') == 'gnome-open':
@@ -500,7 +499,7 @@
command = build_command(command, path_to_open)
try:
exec_command(command)
- except:
+ except Exception:
pass
def play_sound(event):
@@ -524,7 +523,7 @@
try:
winsound.PlaySound(path_to_soundfile,
winsound.SND_FILENAME|winsound.SND_ASYNC)
- except:
+ except Exception:
pass
elif os.name == 'posix':
if gajim.config.get('soundplayer') == '':
@@ -660,7 +659,7 @@
'''make sure string is in UTF-8'''
try:
string = decode_string(string).encode('utf-8')
- except:
+ except Exception:
pass
return string
@@ -702,7 +701,7 @@
try:
val = str(win32api.RegQueryValueEx(rkey, varname)[0])
val = win32api.ExpandEnvironmentStrings(val) # expand using environ
- except:
+ except Exception:
pass
finally:
win32api.RegCloseKey(rkey)
@@ -770,8 +769,7 @@
rng.extend(range(48, 57))
char_sequence = map(lambda e:chr(e), rng)
from random import sample
- return reduce(lambda e1, e2: e1 + e2,
- sample(char_sequence, 16))
+ return ''.join(sample(char_sequence, 16))
def get_os_info():
if os.name == 'nt':
@@ -854,7 +852,7 @@
return filename
-def allow_showing_notification(account, type = 'notify_on_new_message',
+def allow_showing_notification(account, type_ = 'notify_on_new_message',
advanced_notif_num = None, is_first_message = True):
'''is it allowed to show nofication?
check OUR status and if we allow notifications for that status
@@ -867,7 +865,7 @@
return True
if popup == 'no':
return False
- if type and (not gajim.config.get(type) or not is_first_message):
+ if type_ and (not gajim.config.get(type_) or not is_first_message):
return False
if gajim.config.get('autopopupaway'): # always show notification
return True
@@ -946,7 +944,7 @@
if lines:
lines = map(lambda e: _cut_if_long(e), lines)
if lines:
- reduced_text = reduce(lambda e, e1: e + '\n' + e1, lines)
+ reduced_text = '\n'.join(lines)
if reduced_text != text:
reduced_text += '...'
else:
@@ -1073,8 +1071,7 @@
def get_accounts_info():
'''helper for notification icon tooltip'''
accounts = []
- accounts_list = gajim.contacts.get_accounts()
- accounts_list.sort()
+ accounts_list = sorted(gajim.contacts.get_accounts())
for account in accounts_list:
status_idx = gajim.connections[account].connected
# uncomment the following to hide offline accounts
@@ -1192,26 +1189,14 @@
return -1
if cat1 > cat2:
return 1
- if 'type' in i1:
- type1 = i1['type']
- else:
- type1 = ''
- if 'type' in i2:
- type2 = i2['type']
- else:
- type2 = ''
+ type1 = i1.get('type', '')
+ type2 = i2.get('type', '')
if type1 < type2:
return -1
if type1 > type2:
return 1
- if 'xml:lang' in i1:
- lang1 = i1['xml:lang']
- else:
- lang1 = ''
- if 'xml:lang' in i2:
- lang2 = i2['xml:lang']
- else:
- lang2 = ''
+ lang1 = i1.get('xml:lang', '')
+ lang2 = i2.get('xml:lang', '')
if lang1 < lang2:
return -1
if lang1 > lang2:
@@ -1234,18 +1219,9 @@
identities.sort(cmp=sort_identities_func)
for i in identities:
c = i['category']
- if 'type' in i:
- type_ = i['type']
- else:
- type_ = ''
- if 'xml:lang' in i:
- lang = i['xml:lang']
- else:
- lang = ''
- if 'name' in i:
- name = i['name']
- else:
- name = ''
+ type_ = i.get('type', '')
+ lang = i.get('xml:lang', '')
+ name = i.get('name', '')
S += '%s/%s/%s/%s<' % (c, type_, lang, name)
features.sort()
for f in features:
@@ -1260,12 +1236,10 @@
if form_type:
S += form_type.getValue() + '<'
del fields['FORM_TYPE']
- vars = fields.keys()
- vars.sort()
+ vars = sorted(fields.keys())
for var in vars:
S += '%s<' % var
- values = fields[var].getValues()
- values.sort()
+ values = sorted(fields[var].getValues())
for value in values:
S += '%s<' % value
Modified: branches/osx_newbuildsys/src/common/idle_c/Makefile
===================================================================
--- branches/osx_newbuildsys/src/common/idle_c/Makefile 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/idle_c/Makefile 2008-10-14 15:33:20 UTC (rev 10534)
@@ -1,5 +1,3 @@
-# FIXME: Install files
-
# Python calls these .so, even on OS X, which is very wrong. It should be .impl!
PLUGIN = idle.so
SRCS = idle.c
Modified: branches/osx_newbuildsys/src/common/logger.py
===================================================================
--- branches/osx_newbuildsys/src/common/logger.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/logger.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -369,7 +369,7 @@
self.cur.execute(
'SELECT message_id from unread_messages')
results = self.cur.fetchall()
- except:
+ except Exception:
pass
for message in results:
msg_id = message[0]
@@ -749,7 +749,7 @@
sql = 'DELETE FROM caps_cache WHERE hash_method = "%s" AND hash = "%s"' % (hash_method, hash)
self.simple_commit(sql)
- def add_caps_entry(self, hash_method, hash, identities, features):
+ def add_caps_entry(self, hash_method, hash_, identities, features):
data=[]
for identity in identities:
# there is no FEAT category
@@ -770,7 +770,7 @@
self.cur.execute('''
INSERT INTO caps_cache ( hash_method, hash, data )
VALUES (?, ?, ?);
- ''', (hash_method, hash, buffer(data))) # (1) -- note above
+ ''', (hash_method, hash_, buffer(data))) # (1) -- note above
try:
self.con.commit()
except sqlite.OperationalError, e:
Modified: branches/osx_newbuildsys/src/common/nslookup.py
===================================================================
--- branches/osx_newbuildsys/src/common/nslookup.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/nslookup.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -208,7 +208,7 @@
def _compose_command_line(self):
''' return one line representation of command and its arguments '''
- return reduce(lambda left, right: left + ' ' + right, self._compose_command_args())
+ return ' '.join(self._compose_command_args())
def wait_child(self):
if self.pipe.poll() is None:
@@ -257,7 +257,7 @@
self.idlequeue.unplug_idle(self.fd)
try:
self.pipe.close()
- except:
+ except Exception:
pass
def pollend(self):
@@ -280,11 +280,11 @@
self._return_result()
class NsLookup(IdleCommand):
- def __init__(self, on_result, host='_xmpp-client', type = 'srv'):
+ def __init__(self, on_result, host='_xmpp-client', type_ = 'srv'):
IdleCommand.__init__(self, on_result)
self.commandtimeout = 10
self.host = host.lower()
- self.type = type.lower()
+ self.type = type_.lower()
if not host_pattern.match(self.host):
# invalid host name
print >> sys.stderr, 'Invalid host: %s' % self.host
@@ -337,7 +337,7 @@
def process():
try:
idlequeue.process()
- except:
+ except Exception:
# Otherwise, an exception will stop our loop
gobject.timeout_add(200, process)
raise
Modified: branches/osx_newbuildsys/src/common/optparser.py
===================================================================
--- branches/osx_newbuildsys/src/common/optparser.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/optparser.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -67,7 +67,7 @@
def read(self):
try:
fd = open(self.__filename)
- except:
+ except Exception:
if os.path.exists(self.__filename):
#we talk about a file
print _('error: cannot open %s for reading') % self.__filename
@@ -128,7 +128,7 @@
# win32 needs this
try:
os.remove(self.__filename)
- except:
+ except Exception:
pass
try:
os.rename(self.__tempfile, self.__filename)
@@ -291,8 +291,8 @@
proxies = proxies_str.split(',')
for i in range(0, len(proxies)):
proxies[i] = proxies[i].strip()
- for wrong_proxy in ['proxy65.jabber.autocom.pl',
- 'proxy65.jabber.ccc.de']:
+ for wrong_proxy in ('proxy65.jabber.autocom.pl',
+ 'proxy65.jabber.ccc.de'):
if wrong_proxy in proxies:
proxies.remove(wrong_proxy)
if not 'transfer.jabber.freenet.de' in proxies:
@@ -360,7 +360,7 @@
)
con.commit()
- except:
+ except Exception:
pass
con.close()
gajim.config.set('version', '0.10.1.4')
Modified: branches/osx_newbuildsys/src/common/pubsub.py
===================================================================
--- branches/osx_newbuildsys/src/common/pubsub.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/pubsub.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -58,21 +58,21 @@
self.__callbacks[id]=(cb, args, kwargs)
- def send_pb_publish(self, jid, node, item, id):
+ def send_pb_publish(self, jid, node, item, id_):
'''Publish item to a node.'''
query = xmpp.Iq('set', to=jid)
e = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB)
e = e.addChild('publish', {'node': node})
- e = e.addChild('item', {'id': id}, [item]) # TODO: we should generate id... or we shouldn't?
+ e = e.addChild('item', {'id': id_}, [item]) # TODO: we should generate id... or we shouldn't?
self.connection.send(query)
- def send_pb_retract(self, jid, node, id):
+ def send_pb_retract(self, jid, node, id_):
'''Delete item from a node'''
query = xmpp.Iq('set', to=jid)
r = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB)
r = r.addChild('retract', {'node': node, 'notify': '1'})
- r = r.addChild('item', {'id': id})
+ r = r.addChild('item', {'id': id_})
self.connection.send(query)
@@ -116,7 +116,7 @@
try:
cb, args, kwargs = self.__callbacks.pop(stanza.getID())
cb(conn, stanza, *args, **kwargs)
- except:
+ except Exception:
pass
def request_pb_configuration(self, jid, node):
Modified: branches/osx_newbuildsys/src/common/sleepy.py
===================================================================
--- branches/osx_newbuildsys/src/common/sleepy.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/sleepy.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -48,7 +48,7 @@
import osx.idle as idle
else: # unix
import idle
-except:
+except Exception:
gajim.log.debug('Unable to load idle module')
SUPPORTED = False
@@ -92,7 +92,7 @@
self.state = STATE_AWAKE # assume we are awake
try:
idle.init()
- except:
+ except Exception:
SUPPORTED = False
self.state = STATE_UNKNOWN
Modified: branches/osx_newbuildsys/src/common/socks5.py
===================================================================
--- branches/osx_newbuildsys/src/common/socks5.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/socks5.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -382,7 +382,7 @@
if not self.file.closed:
try:
self.file.close()
- except:
+ except Exception:
pass
self.file = None
@@ -410,7 +410,7 @@
del(self.file_props['fd'])
try:
fd.close()
- except:
+ except Exception:
pass
@@ -559,7 +559,7 @@
try:
self._sock.shutdown(socket.SHUT_RDWR)
self._sock.close()
- except:
+ except Exception:
# socket is already closed
pass
self.connected = False
@@ -580,7 +580,7 @@
for i in xrange(num_auth):
mechanism, = struct.unpack('!B', buff[1 + i])
auth_mechanisms.append(mechanism)
- except:
+ except Exception:
return None
return auth_mechanisms
def _get_auth_response(self):
@@ -609,7 +609,7 @@
struct.unpack('!BBBB', buff[:4])
if host_type == 0x01:
host_arr = struct.unpack('!iiii', buff[4:8])
- host, = reduce(lambda e1, e2: str(e1) + "." + str(e2), host_arr)
+ host, = '.'.join(str(s) for s in host_arr)
host_len = len(host)
elif host_type == 0x03:
host_len, = struct.unpack('!B' , buff[4])
@@ -623,7 +623,7 @@
else:
port, = struct.unpack('!H', buff[host_len + 5: host_len + 7])
self.remaining_buff = buff[host_len + 7:]
- except:
+ except Exception:
return (None, None, None)
return (req_type, host, port)
@@ -632,7 +632,7 @@
buff = self._recv()
try:
version, method = struct.unpack('!BB', buff)
- except:
+ except Exception:
version, method = None, None
if version != 0x05 or method == 0xff:
self.disconnect()
@@ -814,7 +814,7 @@
self._serv.bind(ai[4])
self.ai = ai
break
- except:
+ except Exception:
self.ai = None
continue
if not self.ai:
@@ -844,7 +844,7 @@
self.started = False
try:
self._serv.close()
- except:
+ except Exception:
pass
def accept_conn(self):
@@ -893,7 +893,7 @@
def connect(self):
''' create the socket and plug it to the idlequeue '''
- if self.ais == None:
+ if self.ais is None:
return None
for ai in self.ais:
@@ -903,7 +903,7 @@
self._sock.setblocking(False)
self._server=ai[4]
break
- except:
+ except Exception:
if sys.exc_value[0] == errno.EINPROGRESS:
break
#for all errors, we try other addresses
Modified: branches/osx_newbuildsys/src/common/stanza_session.py
===================================================================
--- branches/osx_newbuildsys/src/common/stanza_session.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/stanza_session.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -41,19 +41,19 @@
XmlDsig = 'http://www.w3.org/2000/09/xmldsig#'
class StanzaSession(object):
- def __init__(self, conn, jid, thread_id, type):
+ def __init__(self, conn, jid, thread_id, type_):
self.conn = conn
self.jid = jid
- self.type = type
+ self.type = type_
if thread_id:
self.received_thread_id = True
self.thread_id = thread_id
else:
self.received_thread_id = False
- if type == 'normal':
+ if type_ == 'normal':
self.thread_id = None
else:
self.thread_id = self.generate_thread_id()
@@ -189,8 +189,8 @@
# handle_session_negotiation method.
class EncryptedStanzaSession(StanzaSession):
- def __init__(self, conn, jid, thread_id, type='chat'):
- StanzaSession.__init__(self, conn, jid, thread_id, type='chat')
+ def __init__(self, conn, jid, thread_id, type_='chat'):
+ StanzaSession.__init__(self, conn, jid, thread_id, type_='chat')
self.xes = {}
self.es = {}
@@ -339,7 +339,7 @@
try:
parsed = xmpp.Node(node='<node>' + plaintext + '</node>')
- except:
+ except Exception:
raise exceptions.DecryptionError, 'decrypted <data/> not parseable as XML'
for child in parsed.getChildren():
Modified: branches/osx_newbuildsys/src/common/xmpp/auth.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/auth.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/auth.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -152,7 +152,7 @@
def SASLHandler(self,conn,challenge):
""" Perform next SASL auth step. Used internally. """
- if challenge.getNamespace()<>NS_SASL: return
+ if challenge.getNamespace()!=NS_SASL: return
if challenge.getName()=='failure':
self.startsasl='failure'
try: reason=challenge.getChildren()[0]
@@ -175,7 +175,7 @@
self.DEBUG('Got challenge:'+data,'ok')
for pair in data.split(','):
key,value=pair.split('=', 1)
- if value[:1]=='"' and value[-1:]=='"': value=value[1:-1]
+ if value.startswith('"') and value.endswith('"'): value=value[1:-1]
chal[key]=value
if 'qop' in chal and chal['qop']=='auth':
resp={}
@@ -195,7 +195,7 @@
resp['response']=response
resp['charset']='utf-8'
sasl_data=''
- for key in ['charset','username','realm','nonce','nc','cnonce','digest-uri','response','qop']:
+ for key in ('charset','username','realm','nonce','nc','cnonce','digest-uri','response','qop'):
if key in ['nc','qop','response','charset']: sasl_data+="%s=%s,"%(key,resp[key])
else: sasl_data+='%s="%s",'%(key,resp[key])
########################################3333
Modified: branches/osx_newbuildsys/src/common/xmpp/auth_nb.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/auth_nb.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/auth_nb.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -168,13 +168,13 @@
def SASLHandler(self, conn, challenge):
''' Perform next SASL auth step. Used internally. '''
- if challenge.getNamespace() <> NS_SASL:
+ if challenge.getNamespace() != NS_SASL:
return
if challenge.getName() == 'failure':
self.startsasl = 'failure'
try:
reason = challenge.getChildren()[0]
- except:
+ except Exception:
reason = challenge
self.DEBUG('Failed SASL authentification: %s' % reason, 'error')
if self.on_sasl :
@@ -214,8 +214,8 @@
chal = challenge_splitter(data)
if not self.realm and 'realm' in chal:
self.realm = chal['realm']
- if 'qop' in chal and ((type(chal['qop']) == str and \
- chal['qop'] =='auth') or (type(chal['qop']) == list and 'auth' in \
+ if 'qop' in chal and ((isinstance(chal['qop'], str) and \
+ chal['qop'] =='auth') or (isinstance(chal['qop'], list) and 'auth' in \
chal['qop'])):
resp={}
resp['username'] = self.username
@@ -239,7 +239,7 @@
resp['response'] = response
resp['charset'] = 'utf-8'
sasl_data=''
- for key in ['charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', 'digest-uri', 'response', 'qop']:
+ for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', 'digest-uri', 'response', 'qop'):
if key in ['nc','qop','response','charset']:
sasl_data += "%s=%s," % (key,resp[key])
else:
Modified: branches/osx_newbuildsys/src/common/xmpp/browser.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/browser.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/browser.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -96,7 +96,7 @@
self._owner.UnregisterHandler('iq',self._DiscoveryHandler,typ='get',ns=NS_DISCO_INFO)
self._owner.UnregisterHandler('iq',self._DiscoveryHandler,typ='get',ns=NS_DISCO_ITEMS)
- def _traversePath(self,node,jid,set=0):
+ def _traversePath(self,node,jid,set_=0):
""" Returns dictionary and key or None,None
None - root node (w/o "node" attribute)
/a/b/c - node
@@ -105,18 +105,18 @@
get returns '' or None as the key or None as the dict.
Used internally."""
if jid in self._handlers: cur=self._handlers[jid]
- elif set:
+ elif set_:
self._handlers[jid]={}
cur=self._handlers[jid]
else: cur=self._handlers['']
if node is None: node=[None]
else: node=node.replace('/',' /').split('/')
for i in node:
- if i<>'' and i in cur: cur=cur[i]
- elif set and i<>'': cur[i]={dict:cur,str:i}; cur=cur[i]
- elif set or '' in cur: return cur,''
+ if i!='' and i in cur: cur=cur[i]
+ elif set_ and i!='': cur[i]={dict:cur,str:i}; cur=cur[i]
+ elif set_ or '' in cur: return cur,''
else: return None,None
- if 1 in cur or set: return cur,1
+ if 1 in cur or set_: return cur,1
raise "Corrupted data"
def setDiscoHandler(self,handler,node='',jid=''):
@@ -195,16 +195,16 @@
q=rep.getTag('query')
if request.getQueryNS()==NS_DISCO_ITEMS:
# handler must return list: [{jid,action,node,name}]
- if type(handler)==dict: lst=handler['items']
+ if isinstance(handler, dict): lst=handler['items']
else: lst=handler(conn,request,'items')
- if lst==None:
+ if lst is None:
conn.send(Error(request,ERR_ITEM_NOT_FOUND))
raise NodeProcessed
for item in lst: q.addChild('item',item)
elif request.getQueryNS()==NS_DISCO_INFO:
- if type(handler)==dict: dt=handler['info']
+ if isinstance(handler, dict): dt=handler['info']
else: dt=handler(conn,request,'info')
- if dt==None:
+ if dt is None:
conn.send(Error(request,ERR_ITEM_NOT_FOUND))
raise NodeProcessed
# handler must return dictionary:
Modified: branches/osx_newbuildsys/src/common/xmpp/c14n.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/c14n.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/c14n.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -7,8 +7,7 @@
if not node.parent or node.parent.namespace != node.namespace:
s = s + ' xmlns="%s"' % node.namespace
- sorted_attrs = node.attrs.keys()
- sorted_attrs.sort()
+ sorted_attrs = sorted(node.attrs.keys())
for key in sorted_attrs:
val = ustr(node.attrs[key])
# like XMLescape() but with whitespace and without >
@@ -22,7 +21,7 @@
s = s + c14n(a)
cnt=cnt+1
if (len(node.data)-1) >= cnt: s = s + normalise_text(node.data[cnt])
- if not node.kids and s[-1:]=='>':
+ if not node.kids and s.endswith('>'):
s=s[:-1]+' />'
else:
s = s + "</" + node.name + ">"
Modified: branches/osx_newbuildsys/src/common/xmpp/client.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/client.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/client.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -104,7 +104,7 @@
# Who initiated this client
# Used to register the EventDispatcher
self._caller=caller
- if debug and type(debug)<>list: debug=['always', 'nodebuilder']
+ if debug and not isinstance(debug, list): debug=['always', 'nodebuilder']
self._DEBUG=Debug.Debug(debug)
self.DEBUG=self._DEBUG.Show
self.debug_flags=self._DEBUG.debug_flags
@@ -203,7 +203,7 @@
If you want to disable tls/ssl support completely, set it to 0.
Example: connect(('192.168.5.5',5222),{'host':'proxy.my.net','port':8080,'user':'me','password':'secret'})
Returns '' or 'tcp' or 'tls', depending on the result."""
- if not CommonClient.connect(self,server,proxy,secure,use_srv) or secure<>None and not secure: return self.connected
+ if not CommonClient.connect(self,server,proxy,secure,use_srv) or secure!=None and not secure: return self.connected
transports.TLS().PlugIn(self)
if 'version' not in self.Dispatcher.Stream._document_attrs or not self.Dispatcher.Stream._document_attrs['version']=='1.0': return self.connected
while not self.Dispatcher.Stream.features and self.Process(): pass # If we get version 1.0 stream the features tag MUST BE presented
@@ -318,7 +318,7 @@
return 'sasl'
else:
raise auth.NotAuthorized(self.SASL.startsasl)
- except:
+ except Exception:
self.DEBUG(self.DBG,"Failed to authenticate %s"%name,'error')
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/common/xmpp/client_nb.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/client_nb.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/client_nb.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -52,7 +52,7 @@
# Who initiated this client
# Used to register the EventDispatcher
self._caller = caller
- if debug and type(debug) != list:
+ if debug and not isinstance(debug, list):
debug = ['always', 'nodebuilder']
self._DEBUG = Debug.Debug(debug)
self.DEBUG = self._DEBUG.Show
@@ -378,7 +378,7 @@
return
self.SASL.auth()
self.onreceive(self._on_auth_component)
- except:
+ except Exception:
self.DEBUG(self.DBG,"Failed to authenticate %s" % name,'error')
def _on_auth_component(self, data):
Modified: branches/osx_newbuildsys/src/common/xmpp/commands.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/commands.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/commands.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -75,7 +75,7 @@
jid = str(request.getTo())
try:
node = request.getTagAttr('command','node')
- except:
+ except Exception:
conn.send(Error(request,ERR_BAD_REQUEST))
raise NodeProcessed
if jid in self._handlers:
@@ -221,11 +221,11 @@
# New request or old?
try:
session = request.getTagAttr('command','sessionid')
- except:
+ except Exception:
session = None
try:
action = request.getTagAttr('command','action')
- except:
+ except Exception:
action = None
if action is None: action = 'execute'
# Check session is in session list
@@ -251,13 +251,13 @@
# New session
self.initial[action](conn,request)
- def _DiscoHandler(self,conn,request,type):
+ def _DiscoHandler(self,conn,request,type_):
"""The handler for discovery events"""
- if type == 'list':
+ if type_ == 'list':
return (request.getTo(),self.name,self.description)
- elif type == 'items':
+ elif type_ == 'items':
return []
- elif type == 'info':
+ elif type_ == 'info':
return self.discoinfo
class TestCommand(Command_Handler_Prototype):
@@ -277,7 +277,7 @@
# This is the only place this should be repeated as all other stages should have SessionIDs
try:
session = request.getTagAttr('command','sessionid')
- except:
+ except Exception:
session = None
if session is None:
session = self.getSessionID()
@@ -309,7 +309,7 @@
form = DataForm(node = result.getTag(name='command').getTag(name='x',namespace=NS_DATA))
try:
num = float(form.getField('radius'))
- except:
+ except Exception:
self.cmdSecondStageReply(conn,request)
if sessions[request.getTagAttr('command','sessionid')]['data']['type'] == 'circlearea':
result = num*(pi**2)
Modified: branches/osx_newbuildsys/src/common/xmpp/debug.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/debug.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/debug.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -170,10 +170,10 @@
self._remove_dupe_flags()
if log_file:
- if type( log_file ) is type(''):
+ if isinstance(log_file, str):
try:
self._fh = open(log_file,'w')
- except:
+ except Exception:
print 'ERROR: can open %s for writing'
sys.exit(0)
else: ## assume its a stream type object
@@ -196,13 +196,13 @@
caller = sys._getframe(1) # used to get name of caller
try:
mod_name= ":%s" % caller.f_locals['__name__']
- except:
+ except Exception:
mod_name = ""
self.show('Debug created for %s%s' % (caller.f_code.co_filename,
mod_name ))
self.show(' flags defined: %s' % ','.join( self.active ))
- if type(flag_show) in (type(''), type(None)):
+ if type(flag_show) in (str, type(None)):
self.flag_show = flag_show
else:
msg2 = '%s' % type(flag_show )
@@ -272,7 +272,7 @@
output = output[:-1]
try:
self._fh.write( output )
- except:
+ except Exception:
# unicode strikes again ;)
s=u''
for i in range(len(output)):
@@ -291,7 +291,7 @@
if not active_flags:
#no debuging at all
self.active = []
- elif type( active_flags ) in ( types.TupleType, types.ListType ):
+ elif isinstance(active_flags, (tuple, list)):
flags = self._as_one_list( active_flags )
for t in flags:
if t not in self.debug_flags:
@@ -304,7 +304,7 @@
# assume comma string
try:
flags = active_flags.split(',')
- except:
+ except Exception:
self.show( '***' )
self.show( '*** Invalid debug param given: %s' % active_flags )
self.show( '*** please correct your param!' )
@@ -329,11 +329,11 @@
This code organises lst and remves dupes
"""
- if type( items ) <> type( [] ) and type( items ) <> type( () ):
+ if not isinstance(items, (list, tuple)):
return [ items ]
r = []
for l in items:
- if type( l ) == type([]):
+ if isinstance(l, list):
lst2 = self._as_one_list( l )
for l2 in lst2:
self._append_unique_str(r, l2 )
@@ -346,7 +346,7 @@
def _append_unique_str( self, lst, item ):
"""filter out any dupes."""
- if type(item) <> type(''):
+ if not isinstance(item, str):
msg2 = '%s' % item
raise 'Invalid item type (should be string)',msg2
if item not in lst:
@@ -401,4 +401,4 @@
##Uncomment this to effectively disable all debugging and all debugging overhead.
#Debug=NoDebug
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/common/xmpp/dispatcher.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/dispatcher.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/dispatcher.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -49,7 +49,7 @@
def getAnID(self):
global ID
ID+=1
- return `ID`
+ return repr(ID)
def dumpHandlers(self):
""" Return set of user-registered callbacks in it's internal format.
@@ -107,7 +107,7 @@
self._owner.send("<?xml version='1.0'?>%s>"%str(self._metastream)[:-2])
def _check_stream_start(self,ns,tag,attrs):
- if ns<>NS_STREAMS or tag<>'stream':
+ if ns!=NS_STREAMS or tag!='stream':
raise ValueError('Incorrect stream start: (%s,%s). Terminating.'%(tag,ns))
def Process(self, timeout=0):
@@ -209,7 +209,7 @@
def returnStanzaHandler(self,conn,stanza):
""" Return stanza back to the sender with <feature-not-implemennted/> error set. """
- if stanza.getType() in ['get','set']:
+ if stanza.getType() in ('get','set'):
conn.send(Error(stanza,ERR_FEATURE_NOT_IMPLEMENTED))
def streamErrorHandler(self,conn,error):
@@ -295,12 +295,12 @@
output=''
if ID in session._expected:
user=0
- if type(session._expected[ID])==type(()):
+ if isinstance(session._expected[ID], tuple):
cb,args=session._expected[ID]
session.DEBUG("Expected stanza arrived. Callback %s(%s) found!"%(cb,args),'ok')
try: cb(session,stanza,**args)
except Exception, typ:
- if typ.__class__.__name__<>'NodeProcessed': raise
+ if typ.__class__.__name__!='NodeProcessed': raise
else:
session.DEBUG("Expected stanza arrived!",'ok')
session._expected[ID]=stanza
@@ -310,7 +310,7 @@
try:
handler['func'](session,stanza)
except Exception, typ:
- if typ.__class__.__name__<>'NodeProcessed':
+ if typ.__class__.__name__!='NodeProcessed':
self._pendingExceptions.insert(0, sys.exc_info())
return
user=0
@@ -354,12 +354,12 @@
def send(self,stanza):
""" Serialise stanza and put it on the wire. Assign an unique ID to it before send.
Returns assigned ID."""
- if type(stanza) in [type(''), type(u'')]: return self._owner_send(stanza)
+ if isinstance(stanza, basestring): return self._owner_send(stanza)
if not isinstance(stanza,Protocol): _ID=None
elif not stanza.getID():
global ID
ID+=1
- _ID=`ID`
+ _ID=repr(ID)
stanza.setID(_ID)
else: _ID=stanza.getID()
if self._owner._registered_name and not stanza.getAttr('from'): stanza.setAttr('from',self._owner._registered_name)
@@ -382,4 +382,4 @@
self._owner_send('</stream:stream>')
while self.Process(1): pass
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/common/xmpp/dispatcher_nb.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/dispatcher_nb.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/dispatcher_nb.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -53,7 +53,7 @@
def getAnID(self):
global ID
ID += 1
- return `ID`
+ return repr(ID)
def dumpHandlers(self):
''' Return set of user-registered callbacks in it's internal format.
@@ -117,7 +117,7 @@
self._owner.send("<?xml version='1.0'?>%s>" % str(self._metastream)[:-2])
def _check_stream_start(self, ns, tag, attrs):
- if ns<>NS_STREAMS or tag<>'stream':
+ if ns!=NS_STREAMS or tag!='stream':
raise ValueError('Incorrect stream start: (%s,%s). Terminating.' % (tag, ns))
def ProcessNonBlocking(self, data=None):
@@ -243,7 +243,7 @@
def returnStanzaHandler(self,conn,stanza):
''' Return stanza back to the sender with <feature-not-implemennted/> error set. '''
- if stanza.getType() in ['get','set']:
+ if stanza.getType() in ('get','set'):
conn.send(Error(stanza,ERR_FEATURE_NOT_IMPLEMENTED))
def streamErrorHandler(self,conn,error):
@@ -337,13 +337,13 @@
output=''
if ID in session._expected:
user=0
- if type(session._expected[ID]) == type(()):
+ if isinstance(session._expected[ID], tuple):
cb,args = session._expected[ID]
session.DEBUG("Expected stanza arrived. Callback %s(%s) found!" % (cb, args), 'ok')
try:
cb(session,stanza,**args)
except Exception, typ:
- if typ.__class__.__name__ <>'NodeProcessed': raise
+ if typ.__class__.__name__ !='NodeProcessed': raise
else:
session.DEBUG("Expected stanza arrived!",'ok')
session._expected[ID]=stanza
@@ -354,7 +354,7 @@
try:
handler['func'](session,stanza)
except Exception, typ:
- if typ.__class__.__name__ <> 'NodeProcessed':
+ if typ.__class__.__name__ != 'NodeProcessed':
self._pendingExceptions.insert(0, sys.exc_info())
return
user=0
@@ -404,14 +404,14 @@
def send(self, stanza, is_message = False, now = False):
''' Serialise stanza and put it on the wire. Assign an unique ID to it before send.
Returns assigned ID.'''
- if type(stanza) in [type(''), type(u'')]:
+ if isinstance(stanza, basestring):
return self._owner.Connection.send(stanza, now = now)
if not isinstance(stanza, Protocol):
_ID=None
elif not stanza.getID():
global ID
ID+=1
- _ID=`ID`
+ _ID=repr(ID)
stanza.setID(_ID)
else:
_ID=stanza.getID()
@@ -438,4 +438,4 @@
''' Send a stream terminator. '''
self._owner.Connection.send('</stream:stream>')
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/common/xmpp/features.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/features.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/features.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -101,7 +101,7 @@
return
df=DataForm(typ='form')
for i in resp.getQueryPayload():
- if type(i)<>type(iq): pass
+ if type(i)!=type(iq): pass
elif i.getName()=='instructions': df.addInstructions(i.getData())
else: df.setField(i.getName()).setValue(i.getData())
con.Event(NS_REGISTER,REGISTER_DATA_RECEIVED,(agent,df,False))
@@ -114,7 +114,7 @@
attributes lastErrNode, lastErr and lastErrCode.
"""
iq=Iq('set',NS_REGISTER,to=host)
- if type(info)<>type({}): info=info.asDict()
+ if not isinstance(info, dict): info=info.asDict()
for i in info.keys(): iq.setTag('query').setTagData(i,info[i])
resp=disp.SendAndWaitForResponse(iq)
if isResultNode(resp): return 1
@@ -171,11 +171,11 @@
""" Sets the default privacy list as 'listname'. Returns true on success."""
return setActivePrivacyList(disp,listname,'default')
-def setPrivacyList(disp,list):
+def setPrivacyList(disp,list_):
""" Set the ruleset. 'list' should be the simpleXML node formatted
according to RFC 3921 (XMPP-IM) (I.e. Node('list',{'name':listname},payload=[...]) )
Returns true on success."""
- resp=disp.SendAndWaitForResponse(Iq('set',NS_PRIVACY,payload=[list]))
+ resp=disp.SendAndWaitForResponse(Iq('set',NS_PRIVACY,payload=[list_]))
if isResultNode(resp): return 1
def delPrivacyList(disp,listname):
@@ -183,4 +183,4 @@
resp=disp.SendAndWaitForResponse(Iq('set',NS_PRIVACY,payload=[Node('list',{'name':listname})]))
if isResultNode(resp): return 1
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/common/xmpp/filetransfer.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/filetransfer.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/filetransfer.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -147,7 +147,7 @@
else:
stream=self._streams[sid]
if not data: err=ERR_BAD_REQUEST
- elif seq<>stream['seq']: err=ERR_UNEXPECTED_REQUEST
+ elif seq!=stream['seq']: err=ERR_UNEXPECTED_REQUEST
else:
self.DEBUG('Successfull receive sid->%s %s+%s bytes'%(sid,stream['fp'].tell(),len(data)),'ok')
stream['seq']+=1
Modified: branches/osx_newbuildsys/src/common/xmpp/protocol.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/protocol.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/protocol.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -173,9 +173,9 @@
temporary-auth-failure -- -- -- The authentication failed because of a temporary error condition within the receiving entity; sent in reply to an <auth/> element or <response/> element."""
ERRORS,_errorcodes={},{}
-for ns,errname,errpool in [(NS_XMPP_STREAMS,'STREAM',xmpp_stream_error_conditions),
+for ns,errname,errpool in ((NS_XMPP_STREAMS,'STREAM',xmpp_stream_error_conditions),
(NS_STANZAS ,'ERR' ,xmpp_stanza_error_conditions),
- (NS_SASL ,'SASL' ,sasl_error_conditions)]:
+ (NS_SASL ,'SASL' ,sasl_error_conditions)):
for err in errpool.split('\n')[1:]:
cond,code,typ,text=err.split(' -- ')
name=errname+'_'+cond.upper().replace('-','_')
@@ -254,7 +254,7 @@
JID(node='node',domain='domain.org')
"""
if not jid and not domain: raise ValueError('JID must contain at least domain name')
- elif type(jid)==type(self): self.node,self.domain,self.resource=jid.node,jid.domain,jid.resource
+ elif isinstance(jid, type(self)): self.node,self.domain,self.resource=jid.node,jid.domain,jid.resource
elif domain: self.node,self.domain,self.resource=node,domain,resource
else:
if jid.find('@')+1: self.node,jid=jid.split('@',1)
@@ -321,7 +321,7 @@
if not node and xmlns: self.setNamespace(xmlns)
if self['to']: self.setTo(self['to'])
if self['from']: self.setFrom(self['from'])
- if node and type(self)==type(node) and self.__class__==node.__class__ and 'id' in self.attrs: del self.attrs['id']
+ if node and isinstance(self, type(node)) and self.__class__==node.__class__ and 'id' in self.attrs: del self.attrs['id']
self.timestamp=None
for d in self.getTags('delay',namespace=NS_DELAY2):
try:
@@ -372,7 +372,7 @@
errtag=self.getTag('error')
if errtag:
for tag in errtag.getChildren():
- if tag.getName()<>'text': return tag.getName()
+ if tag.getName()!='text': return tag.getName()
return errtag.getData()
def getErrorMsg(self):
""" Return the textual description of the error (if present) or the error condition """
@@ -389,7 +389,7 @@
if code:
if str(code) in _errorcodes.keys(): error=ErrorNode(_errorcodes[str(code)],text=error)
else: error=ErrorNode(ERR_UNDEFINED_CONDITION,code=code,typ='cancel',text=error)
- elif type(error) in [type(''),type(u'')]: error=ErrorNode(error)
+ elif isinstance(error, basestring): error=ErrorNode(error)
self.setType('error')
self.addChild(node=error)
def setTimestamp(self,val=None):
@@ -638,7 +638,7 @@
"""
Node.__init__(self,'field',node=node)
if name: self.setVar(name)
- if type(value) in [list,tuple]: self.setValues(value)
+ if isinstance(value, (list, tuple)): self.setValues(value)
elif value: self.setValue(value)
if typ: self.setType(typ)
elif not typ and not node: self.setType('text-single')
@@ -689,7 +689,7 @@
for opt in lst: self.addOption(opt)
def addOption(self,opt):
""" Add one more label-option pair to this field."""
- if type(opt) in [str,unicode]: self.addChild('option').setTagData('value',opt)
+ if isinstance(opt, basestring): self.addChild('option').setTagData('value',opt)
else: self.addChild('option',{'label':opt[0]}).setTagData('value',opt[1])
def getType(self):
""" Get type of this field. """
@@ -732,12 +732,12 @@
if typ: self.setType(typ)
self.setNamespace(NS_DATA)
if title: self.setTitle(title)
- if type(data)==type({}):
+ if isinstance(data, dict):
newdata=[]
for name in data.keys(): newdata.append(DataField(name,data[name]))
data=newdata
for child in data:
- if type(child) in [type(''),type(u'')]: self.addInstructions(child)
+ if isinstance(child, basestring): self.addInstructions(child)
elif child.__class__.__name__=='DataField': self.kids.append(child)
else: self.kids.append(DataField(node=child))
def getType(self):
@@ -775,7 +775,7 @@
for field in self.getTags('field'):
name=field.getAttr('var')
typ=field.getType()
- if type(typ) in [type(''),type(u'')] and typ[-6:]=='-multi':
+ if isinstance(typ, basestring) and typ.endswith('-multi'):
val=[]
for i in field.getTags('value'): val.append(i.getData())
else: val=field.getTagData('value')
Modified: branches/osx_newbuildsys/src/common/xmpp/roster.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/roster.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/roster.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -93,7 +93,7 @@
jid=self._owner.Server
jid=JID(jid)
if jid.getStripped() not in self._data: self._data[jid.getStripped()]={'name':None,'ask':None,'subscription':'none','groups':['Not in roster'],'resources':{}}
- if type(self._data[jid.getStripped()]['resources'])!=type(dict()):
+ if not isinstance(self._data[jid.getStripped()]['resources'], dict):
self._data[jid.getStripped()]['resources']={}
item=self._data[jid.getStripped()]
typ=pres.getType()
@@ -194,4 +194,4 @@
"""Returns the internal data representation of the roster."""
return self._data
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/common/xmpp/session.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/session.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/session.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -85,7 +85,7 @@
self.DEBUG=owner.Dispatcher.DEBUG
self._expected={}
self._owner=owner
- if self.TYP=='server': self.ID=`random.random()`[2:]
+ if self.TYP=='server': self.ID=repr(random.random())[2:]
else: self.ID=None
self.sendbuffer=''
@@ -97,7 +97,7 @@
self._session_state=SESSION_NOT_AUTHED
self.waiting_features=[]
- for feature in [NS_TLS,NS_SASL,NS_BIND,NS_SESSION]:
+ for feature in (NS_TLS,NS_SASL,NS_BIND,NS_SESSION):
if feature in owner.features: self.waiting_features.append(feature)
self.features=[]
self.feature_in_process=None
@@ -128,7 +128,7 @@
except: received = ''
if len(received): # length of 0 means disconnect
- self.DEBUG(`self.fileno()`+' '+received,'got')
+ self.DEBUG(repr(self.fileno())+' '+received,'got')
else:
self.DEBUG('Socket error while receiving data','error')
self.set_socket_state(SOCKET_DEAD)
@@ -141,7 +141,7 @@
If you just want to shedule regular stanza for delivery use enqueue method.
"""
if isinstance(chunk,Node): chunk = chunk.__str__().encode('utf-8')
- elif type(chunk)==type(u''): chunk = chunk.encode('utf-8')
+ elif isinstance(chunk, unicode): chunk = chunk.encode('utf-8')
self.enqueue(chunk)
def enqueue(self,stanza):
@@ -184,12 +184,12 @@
try:
# LOCK_QUEUE
sent=self._send(self.sendbuffer) # blocking socket
- except:
+ except Exception:
# UNLOCK_QUEUE
self.set_socket_state(SOCKET_DEAD)
self.DEBUG("Socket error while sending data",'error')
return self.terminate_stream()
- self.DEBUG(`self.fileno()`+' '+self.sendbuffer[:sent],'sent')
+ self.DEBUG(repr(self.fileno())+' '+self.sendbuffer[:sent],'sent')
self._stream_pos_sent+=sent
self.sendbuffer=self.sendbuffer[sent:]
self._stream_pos_delivered=self._stream_pos_sent # Should be acquired from socket somehow. Take SSL into account.
@@ -238,9 +238,9 @@
self.sendnow(text+'>')
self.set_stream_state(STREAM__OPENED)
if self.TYP=='client': return
- if tag<>'stream': return self.terminate_stream(STREAM_INVALID_XML)
- if ns<>NS_STREAMS: return self.terminate_stream(STREAM_INVALID_NAMESPACE)
- if self.Stream.xmlns<>self.xmlns: return self.terminate_stream(STREAM_BAD_NAMESPACE_PREFIX)
+ if tag!='stream': return self.terminate_stream(STREAM_INVALID_XML)
+ if ns!=NS_STREAMS: return self.terminate_stream(STREAM_INVALID_NAMESPACE)
+ if self.Stream.xmlns!=self.xmlns: return self.terminate_stream(STREAM_BAD_NAMESPACE_PREFIX)
if 'to' not in attrs: return self.terminate_stream(STREAM_IMPROPER_ADDRESSING)
if attrs['to'] not in self._owner.servernames: return self.terminate_stream(STREAM_HOST_UNKNOWN)
self.ourname=attrs['to'].lower()
@@ -320,7 +320,7 @@
def stop_feature(self,f):
""" Declare some feature as "negotiated" to allow other features start negotiating. """
- if self.feature_in_process<>f: raise "Stopping feature %s instead of %s !"%(f,self.feature_in_process)
+ if self.feature_in_process!=f: raise "Stopping feature %s instead of %s !"%(f,self.feature_in_process)
self.feature_in_process=None
def set_socket_state(self,newstate):
@@ -349,4 +349,4 @@
requires stream re-start so this state can have non-linear changes. """
if self._stream_state<newstate: self._stream_state=newstate
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/common/xmpp/simplexml.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/simplexml.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/simplexml.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -27,10 +27,10 @@
ENCODING='utf-8'
def ustr(what):
"""Converts object "what" to unicode string using it's own __str__ method if accessible or unicode method otherwise."""
- if type(what) == type(u''): return what
+ if isinstance(what, unicode): return what
try: r=what.__str__()
except AttributeError: r=str(what)
- if type(r)<>type(u''): return unicode(r,ENCODING)
+ if not isinstance(r, unicode): return unicode(r,ENCODING)
return r
class Node(object):
@@ -129,7 +129,7 @@
cnt=cnt+1
if not fancy and (len(self.data)-1) >= cnt: s = s + XMLescape(self.data[cnt])
elif (len(self.data)-1) >= cnt: s = s + XMLescape(self.data[cnt].strip())
- if not self.kids and s[-1:]=='>':
+ if not self.kids and s.endswith('>'):
s=s[:-1]+' />'
if fancy: s = s + "\n"
else:
@@ -214,10 +214,10 @@
Returns the list of nodes found. """
nodes=[]
for node in self.kids:
- if namespace and namespace<>node.getNamespace(): continue
+ if namespace and namespace!=node.getNamespace(): continue
if node.getName() == name:
for key in attrs.keys():
- if key not in node.attrs or node.attrs[key]<>attrs[key]: break
+ if key not in node.attrs or node.attrs[key]!=attrs[key]: break
else: nodes.append(node)
if one and nodes: return nodes[0]
if not one: return nodes
@@ -252,7 +252,7 @@
def setPayload(self,payload,add=0):
""" Sets node payload according to the list specified. WARNING: completely replaces all node's
previous content. If you wish just to add child or CDATA - use addData or addChild methods. """
- if type(payload) in (type(''),type(u'')): payload=[payload]
+ if isinstance(payload, basestring): payload=[payload]
if add: self.kids+=payload
else: self.kids=payload
def setTag(self, name, attrs={}, namespace=None):
@@ -363,7 +363,7 @@
"""XML Parser callback. Used internally"""
self.check_data_buffer()
self._inc_depth()
- self.DEBUG(DBG_NODEBUILDER, "DEPTH -> %i , tag -> %s, attrs -> %s" % (self.__depth, tag, `attrs`), 'down')
+ self.DEBUG(DBG_NODEBUILDER, "DEPTH -> %i , tag -> %s, attrs -> %s" % (self.__depth, tag, repr(attrs)), 'down')
if self.__depth == self._dispatch_depth:
if not self._mini_dom :
self._mini_dom = Node(tag=tag, attrs=attrs, nsp = self._document_nsp, node_built=True)
Modified: branches/osx_newbuildsys/src/common/xmpp/transports.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/transports.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/transports.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -103,7 +103,7 @@
self._sock.connect(ai[4])
self._send=self._sock.sendall
self._recv=self._sock.recv
- self.DEBUG("Successfully connected to remote host %s"%`server`,'start')
+ self.DEBUG("Successfully connected to remote host %s"%repr(server),'start')
return 'ok'
except: continue
except: pass
@@ -138,15 +138,15 @@
def send(self,raw_data):
""" Writes raw outgoing data. Blocks until done.
If supplied data is unicode string, encodes it to utf-8 before send."""
- if type(raw_data)==type(u''): raw_data = raw_data.encode('utf-8')
- elif type(raw_data)<>type(''): raw_data = ustr(raw_data).encode('utf-8')
+ if isinstance(raw_data, unicode): raw_data = raw_data.encode('utf-8')
+ elif not isinstance(raw_data, str): raw_data = ustr(raw_data).encode('utf-8')
try:
self._send(raw_data)
# Avoid printing messages that are empty keepalive packets.
if raw_data.strip():
self.DEBUG(raw_data,'sent')
self._owner.Dispatcher.Event('', DATA_SENT, raw_data)
- except:
+ except Exception:
self.DEBUG("Socket error while sending data",'error')
self._owner.disconnected()
@@ -207,7 +207,7 @@
return
try: proto,code,desc=reply.split('\n')[0].split(' ',2)
except: raise error('Invalid proxy reply')
- if code<>'200':
+ if code!='200':
self.DEBUG('Invalid proxy reply: %s %s %s'%(proto,code,desc),'error')
self._owner.disconnected()
return
@@ -278,7 +278,7 @@
def StartTLSHandler(self, conn, starttls):
""" Handle server reply if TLS is allowed to process. Behaves accordingly.
Used internally."""
- if starttls.getNamespace()<>NS_TLS: return
+ if starttls.getNamespace()!=NS_TLS: return
self.starttls=starttls.getName()
if self.starttls=='failure':
self.DEBUG("Got starttls response: "+self.starttls,'error')
@@ -288,4 +288,4 @@
self._owner.Dispatcher.PlugOut()
dispatcher.Dispatcher().PlugIn(self._owner)
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/common/xmpp/transports_nb.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/transports_nb.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/xmpp/transports_nb.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -69,7 +69,7 @@
def gattr(obj, attr, default=None):
try:
return getattr(obj, attr)
- except:
+ except Exception:
return default
class SSLWrapper:
@@ -368,7 +368,7 @@
self.remove_timeout()
try:
self._owner.disconnected()
- except:
+ except Exception:
pass
self.idlequeue.unplug_idle(self.fd)
sock = getattr(self, '_sock', None)
@@ -652,7 +652,7 @@
retval = None
try:
retval = gattr(self._owner, 'name')
- except:
+ except Exception:
pass
if retval: return retval
return self.getHost()
@@ -768,7 +768,7 @@
cacerts = os.path.join(common.gajim.DATA_DIR, 'other', 'cacerts.pem')
try:
tcpsock._sslContext.load_verify_locations(cacerts)
- except:
+ except Exception:
log.warning('Unable to load SSL certificats from file %s' % \
os.path.abspath(cacerts))
# load users certs
@@ -811,7 +811,7 @@
self.starttls='in progress'
tcpsock._sslObj.do_handshake()
# Errors are handeled in _do_receive function
- except:
+ except Exception:
pass
tcpsock._sslObj.setblocking(False)
log.debug("Synchronous handshake completed")
@@ -843,14 +843,14 @@
self._owner.Connection.ssl_cert_pem = OpenSSL.crypto.dump_certificate(
OpenSSL.crypto.FILETYPE_PEM, cert)
return True
- except:
+ except Exception:
log.error("Exception caught in _ssl_info_callback:", exc_info=True)
traceback.print_exc() # Make sure something is printed, even if log is disabled.
def StartTLSHandler(self, conn, starttls):
''' Handle server reply if TLS is allowed to process. Behaves accordingly.
Used internally.'''
- if starttls.getNamespace() <> NS_TLS:
+ if starttls.getNamespace() != NS_TLS:
return
self.starttls = starttls.getName()
if self.starttls == 'failure':
@@ -920,12 +920,12 @@
self.reply = reply.replace('\r', '')
try:
proto, code, desc = reply.split('\n')[0].split(' ', 2)
- except:
+ except Exception:
log.error("_on_headers_sent:", exc_info=True)
#traceback.print_exc()
self.on_proxy_failure('Invalid proxy reply')
return
- if code <> '200':
+ if code != '200':
self.DEBUG('Invalid proxy reply: %s %s %s' % (proto, code, desc),'error')
self._owner.disconnected()
self.on_proxy_failure('Invalid proxy reply')
Modified: branches/osx_newbuildsys/src/common/zeroconf/connection_handlers_zeroconf.py
===================================================================
--- branches/osx_newbuildsys/src/common/zeroconf/connection_handlers_zeroconf.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/zeroconf/connection_handlers_zeroconf.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -45,7 +45,7 @@
HAS_IDLE = True
try:
import idle
-except:
+except Exception:
gajim.log.debug(_('Unable to load idle module'))
HAS_IDLE = False
@@ -69,7 +69,7 @@
def send_socks5_info(self, file_props, fast = True, receiver = None,
sender = None):
''' send iq for the present streamhosts and proxies '''
- if type(self.peerhost) != tuple:
+ if not isinstance(self.peerhost, tuple):
return
port = gajim.config.get('file_transfers_port')
ft_add_hosts_to_send = gajim.config.get('ft_add_hosts_to_send')
@@ -93,7 +93,7 @@
self.dispatch('ERROR', (_('Wrong host'), _('The host %s you configured as the ft_add_hosts_to_send advanced option is not valid, so ignored.') % ft_host))
listener = gajim.socks5queue.start_listener(port,
sha_str, self._result_socks5_sid, file_props['sid'])
- if listener == None:
+ if listener is None:
file_props['error'] = -5
self.dispatch('FILE_REQUEST_ERROR', (unicode(receiver), file_props,
''))
@@ -226,7 +226,7 @@
try:
streamhost = query.getTag('streamhost-used')
- except: # this bytestream result is not what we need
+ except Exception: # this bytestream result is not what we need
pass
id = real_id[3:]
if id in self.files_props:
@@ -235,7 +235,7 @@
raise common.xmpp.NodeProcessed
if streamhost is None:
# proxy approves the activate query
- if real_id[:3] == 'au_':
+ if real_id.startswith('au_'):
id = real_id[3:]
if 'streamhost-used' not in file_props or \
file_props['streamhost-used'] is False:
@@ -253,7 +253,7 @@
file_props['streamhost-used'] is True:
raise common.xmpp.NodeProcessed
- if real_id[:3] == 'au_':
+ if real_id.startswith('au_'):
gajim.socks5queue.send_file(file_props, self.name)
raise common.xmpp.NodeProcessed
@@ -263,7 +263,7 @@
if proxyhost['jid'] == jid:
proxy = proxyhost
- if proxy != None:
+ if proxy is not None:
file_props['streamhost-used'] = True
if 'streamhosts' not in file_props:
file_props['streamhosts'] = []
@@ -382,7 +382,7 @@
try:
idle.init()
- except:
+ except Exception:
HAS_IDLE = False
def _messageCB(self, ip, con, msg):
@@ -397,7 +397,7 @@
if not mtype:
mtype = 'normal'
- if frm == None:
+ if frm is None:
for key in self.connection.zeroconf.contacts:
if ip == self.connection.zeroconf.contacts[key][zeroconf.C_ADDRESS]:
frm = key
@@ -429,7 +429,7 @@
try:
msg = session.decrypt_stanza(msg)
- except:
+ except Exception:
self.dispatch('FAILED_DECRYPT', (frm, tim))
msgtxt = msg.getBody()
Modified: branches/osx_newbuildsys/src/common/zeroconf/connection_zeroconf.py
===================================================================
--- branches/osx_newbuildsys/src/common/zeroconf/connection_zeroconf.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/zeroconf/connection_zeroconf.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -360,7 +360,7 @@
def get_status(self):
return STATUS_LIST[self.connected]
- def send_message(self, jid, msg, keyID, type = 'chat', subject='',
+ def send_message(self, jid, msg, keyID, type_ = 'chat', subject='',
chatstate = None, msg_id = None, composing_xep = None, resource = None,
user_nick = None, session=None, forward_from=None, form_node=None, original_message=None):
fjid = jid
@@ -379,7 +379,7 @@
if keyID and self.USE_GPG:
if keyID == 'UNKNOWN':
error = _('Neither the remote presence is signed, nor a key was assigned.')
- elif keyID[8:] == 'MISMATCH':
+ elif keyID.endswith('MISMATCH'):
error = _('The contact\'s key (%s) does not match the key assigned in Gajim.' % keyID[:8])
else:
# encrypt
@@ -396,8 +396,8 @@
self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session))
return 3
- if type == 'chat':
- msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type)
+ if type_ == 'chat':
+ msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type_)
else:
if subject:
@@ -445,7 +445,7 @@
log_msg = _('Subject: %(subject)s\n%(message)s') % \
{'subject': subject, 'message': msg}
if log_msg:
- if type == 'chat':
+ if type_ == 'chat':
kind = 'chat_msg_sent'
else:
kind = 'single_msg_sent'
@@ -457,7 +457,7 @@
reason += ' ' + _('Your message could not be sent.')
self.dispatch('MSGERROR', [jid, '-1', reason, None, None, session])
- ret = self.connection.send(msg_iq, msg != None, on_ok=on_send_ok,
+ ret = self.connection.send(msg_iq, msg is not None, on_ok=on_send_ok,
on_not_ok=on_send_not_ok)
if ret == -1:
# Contact Offline
Modified: branches/osx_newbuildsys/src/common/zeroconf/roster_zeroconf.py
===================================================================
--- branches/osx_newbuildsys/src/common/zeroconf/roster_zeroconf.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/zeroconf/roster_zeroconf.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -68,15 +68,10 @@
self._data[jid]['host'] = host
self._data[jid]['port'] = port
txt_dict = self.zeroconf.txt_array_to_dict(txt)
- if 'status' in txt_dict:
- status = txt_dict['status']
- else:
- status = ''
+ status = txt_dict.get('status', '')
if not status:
status = 'avail'
- nm = ''
- if '1st' in txt_dict:
- nm = txt_dict['1st']
+ nm = txt_dict.get('1st', '')
if 'last' in txt_dict:
if nm != '':
nm += ' '
@@ -162,4 +157,4 @@
def Unauthorize(self,jid):
pass
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/common/zeroconf/zeroconf_bonjour.py
===================================================================
--- branches/osx_newbuildsys/src/common/zeroconf/zeroconf_bonjour.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/common/zeroconf/zeroconf_bonjour.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -186,7 +186,7 @@
#check if last part is a number and if, increment it
try:
stripped = str(int(parts[-1]))
- except:
+ except Exception:
stripped = 1
alternative_name = self.username + str(stripped+1)
self.name_conflictCB(alternative_name)
Modified: branches/osx_newbuildsys/src/config.py
===================================================================
--- branches/osx_newbuildsys/src/config.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/config.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -48,7 +48,7 @@
try:
import gtkspell
HAS_GTK_SPELL = True
-except:
+except Exception:
HAS_GTK_SPELL = False
from common import helpers
@@ -618,7 +618,7 @@
if isinstance(ctrl, chat_control.ChatControlBase):
try:
spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
- except:
+ except Exception:
spell_obj = None
if not spell_obj:
@@ -630,7 +630,7 @@
if isinstance(ctrl, chat_control.ChatControlBase):
try:
spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
- except:
+ except Exception:
spell_obj = None
if spell_obj:
spell_obj.detach()
@@ -759,12 +759,12 @@
[self.xml.get_widget('sounds_scrolledwindow'),
self.xml.get_widget('browse_sounds_hbox')])
- def on_sounds_treemodel_row_changed(self, model, path, iter):
- sound_event = model[iter][3].decode('utf-8')
+ def on_sounds_treemodel_row_changed(self, model, path, iter_):
+ sound_event = model[iter_][3].decode('utf-8')
gajim.config.set_per('soundevents', sound_event, 'enabled',
bool(model[path][0]))
gajim.config.set_per('soundevents', sound_event, 'path',
- model[iter][2].decode('utf-8'))
+ model[iter_][2].decode('utf-8'))
gajim.interface.save_config()
def update_text_tags(self):
@@ -891,11 +891,11 @@
model = self.default_msg_tree.get_model()
model[path][3] = not model[path][3]
- def on_default_msg_treemodel_row_changed(self, model, path, iter):
- status = model[iter][0]
- message = model[iter][2].decode('utf-8')
+ def on_default_msg_treemodel_row_changed(self, model, path, iter_):
+ status = model[iter_][0]
+ message = model[iter_][2].decode('utf-8')
gajim.config.set_per('defaultstatusmsg', status, 'enabled',
- model[iter][3])
+ model[iter_][3])
gajim.config.set_per('defaultstatusmsg', status, 'message', message)
def on_default_status_expander_activate(self, expander):
@@ -919,7 +919,7 @@
iter = model.iter_next(iter)
gajim.interface.save_config()
- def on_msg_treemodel_row_changed(self, model, path, iter):
+ def on_msg_treemodel_row_changed(self, model, path, iter_):
self.save_status_messages(model)
def on_msg_treemodel_row_deleted(self, model, path):
@@ -2014,7 +2014,7 @@
custom_port = widget.get_text()
try:
custom_port = int(custom_port)
- except:
+ except Exception:
if not widget.is_focus():
dialogs.ErrorDialog(_('Invalid entry'),
_('Custom port must be a port number.'))
@@ -2499,15 +2499,9 @@
self.start_users_dict[affiliation][jid] = users_dict[jid]
tv = self.affiliation_treeview[affiliation]
model = tv.get_model()
- reason = ''
- if 'reason' in users_dict[jid]:
- reason = users_dict[jid]['reason']
- nick = ''
- if 'nick' in users_dict[jid]:
- nick = users_dict[jid]['nick']
- role = ''
- if 'role' in users_dict[jid]:
- role = users_dict[jid]['role']
+ reason = users_dict[jid].get('reason', '')
+ nick = users_dict[jid].get('nick', '')
+ role = users_dict[jid].get('role', '')
model.append((jid, reason, nick, role))
def on_data_form_window_destroy(self, widget):
@@ -2695,8 +2689,7 @@
self.option_list = {'': _('Default'), 'all': Q_('?print_status:All'),
'in_and_out': _('Enter and leave only'),
'none': Q_('?print_status:None')}
- opts = self.option_list.keys()
- opts.sort()
+ opts = sorted(self.option_list.keys())
for opt in opts:
model.append([self.option_list[opt], opt])
@@ -2898,8 +2891,7 @@
self.nick_entry.set_text('')
print_status = model[iter][7]
- opts = self.option_list.keys()
- opts.sort()
+ opts = sorted(self.option_list.keys())
self.print_status_combobox.set_active(opts.index(print_status))
def on_title_entry_changed(self, widget):
@@ -3166,7 +3158,7 @@
custom_port = self.xml.get_widget('custom_port_entry').get_text()
try:
custom_port = int(custom_port)
- except:
+ except Exception:
dialogs.ErrorDialog(_('Invalid entry'),
_('Custom port must be a port number.'))
return
Modified: branches/osx_newbuildsys/src/conversation_textview.py
===================================================================
--- branches/osx_newbuildsys/src/conversation_textview.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/conversation_textview.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -408,53 +408,53 @@
self.smooth_id = None
self.smooth_scroll_timer.cancel()
- def show_xep0184_warning(self, id):
- if id in self.xep0184_marks:
+ def show_xep0184_warning(self, id_):
+ if id_ in self.xep0184_marks:
return
buffer = self.tv.get_buffer()
buffer.begin_user_action()
- self.xep0184_marks[id] = buffer.create_mark(None,
+ self.xep0184_marks[id_] = buffer.create_mark(None,
buffer.get_end_iter(), left_gravity=True)
- self.xep0184_shown[id] = NOT_SHOWN
+ self.xep0184_shown[id_] = NOT_SHOWN
def show_it():
- if (not id in self.xep0184_shown) or \
- self.xep0184_shown[id] == ALREADY_RECEIVED:
+ if (not id_ in self.xep0184_shown) or \
+ self.xep0184_shown[id_] == ALREADY_RECEIVED:
return False
end_iter = buffer.get_iter_at_mark(
- self.xep0184_marks[id])
+ self.xep0184_marks[id_])
buffer.insert(end_iter, ' ')
buffer.insert_pixbuf(end_iter,
ConversationTextview.XEP0184_WARNING_PIXBUF)
before_img_iter = buffer.get_iter_at_mark(
- self.xep0184_marks[id])
+ self.xep0184_marks[id_])
before_img_iter.forward_char()
post_img_iter = before_img_iter.copy()
post_img_iter.forward_char()
buffer.apply_tag_by_name('xep0184-warning', before_img_iter,
post_img_iter)
- self.xep0184_shown[id] = SHOWN
+ self.xep0184_shown[id_] = SHOWN
return False
- gobject.timeout_add_seconds(2, show_it)
+ gobject.timeout_add_seconds(4, show_it)
buffer.end_user_action()
- def hide_xep0184_warning(self, id):
- if id not in self.xep0184_marks:
+ def hide_xep0184_warning(self, id_):
+ if id_ not in self.xep0184_marks:
return
- if self.xep0184_shown[id] == NOT_SHOWN:
- self.xep0184_shown[id] = ALREADY_RECEIVED
+ if self.xep0184_shown[id_] == NOT_SHOWN:
+ self.xep0184_shown[id_] = ALREADY_RECEIVED
return
buffer = self.tv.get_buffer()
buffer.begin_user_action()
- begin_iter = buffer.get_iter_at_mark(self.xep0184_marks[id])
+ begin_iter = buffer.get_iter_at_mark(self.xep0184_marks[id_])
end_iter = begin_iter.copy()
# XXX: Is there a nicer way?
@@ -462,12 +462,12 @@
end_iter.forward_char()
buffer.delete(begin_iter, end_iter)
- buffer.delete_mark(self.xep0184_marks[id])
+ buffer.delete_mark(self.xep0184_marks[id_])
buffer.end_user_action()
- del self.xep0184_marks[id]
- del self.xep0184_shown[id]
+ del self.xep0184_marks[id_]
+ del self.xep0184_shown[id_]
def show_focus_out_line(self):
if not self.allow_focus_out_line:
@@ -859,13 +859,13 @@
menu.popup(None, None, None, event.button, event.time)
- def hyperlink_handler(self, texttag, widget, event, iter, kind):
+ def hyperlink_handler(self, texttag, widget, event, iter_, kind):
if event.type == gtk.gdk.BUTTON_PRESS:
- begin_iter = iter.copy()
+ begin_iter = iter_.copy()
# we get the begining of the tag
while not begin_iter.begins_tag(texttag):
begin_iter.backward_char()
- end_iter = iter.copy()
+ end_iter = iter_.copy()
# we get the end of the tag
while not end_iter.ends_tag(texttag):
end_iter.forward_char()
@@ -877,7 +877,7 @@
# we launch the correct application
helpers.launch_browser_mailer(kind, word)
- def html_hyperlink_handler(self, texttag, widget, event, iter, kind, href):
+ def html_hyperlink_handler(self, texttag, widget, event, iter_, kind, href):
if event.type == gtk.gdk.BUTTON_PRESS:
if event.button == 3: # right click
self.make_link_menu(event, kind, href)
@@ -922,7 +922,7 @@
return index # the position after *last* special text
- def latex_to_image(self, str):
+ def latex_to_image(self, str_):
result = None
exitcode = 0
@@ -938,11 +938,11 @@
'\\item', '\\section', '\\mbox', '\\DeclareRobustCommand', '\\[',
'\\]']
- str = str[2:len(str)-2]
+ str_ = str_[2:len(str_)-2]
# filter latex code with bad commands
for word in blacklist:
- if word in str:
+ if word in str_:
exitcode = 1
break
@@ -956,7 +956,7 @@
texstr += '\\usepackage{amsmath}\\usepackage{amssymb}'
texstr += '\\pagestyle{empty}'
texstr += '\\begin{document}\\begin{large}\\begin{gather*}'
- texstr += str
+ texstr += str_
texstr += '\\end{gather*}\\end{large}\\end{document}'
file = open(os.path.join(tmpfile + '.tex'), 'w+')
Modified: branches/osx_newbuildsys/src/dataforms_widget.py
===================================================================
--- branches/osx_newbuildsys/src/dataforms_widget.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/dataforms_widget.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -570,9 +570,9 @@
model = treeview.get_model()
deleted = []
- def remove(model, path, iter, deleted):
- deleted+=model[iter]
- model.remove(iter)
+ def remove(model, path, iter_, deleted):
+ deleted+=model[iter_]
+ model.remove(iter_)
selection.selected_foreach(remove, deleted)
field.values = (v for v in field.values if v not in deleted)
Modified: branches/osx_newbuildsys/src/dialogs.py
===================================================================
--- branches/osx_newbuildsys/src/dialogs.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/dialogs.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -45,7 +45,7 @@
try:
import gtkspell
HAS_GTK_SPELL = True
-except:
+except Exception:
HAS_GTK_SPELL = False
# those imports are not used in this file, but in files that 'import dialogs'
@@ -68,7 +68,7 @@
self.dialog.set_transient_for(gajim.interface.roster.window)
self.list_ = list_
self.changes_made = False
- self.list = self.xml.get_widget('groups_treeview')
+ self.treeview = self.xml.get_widget('groups_treeview')
if len(list_) == 1:
contact = list_[0][0]
self.xml.get_widget('nickname_label').set_markup(
@@ -118,7 +118,7 @@
if group in helpers.special_groups:
return
# check if it already exists
- model = self.list.get_model()
+ model = self.treeview.get_model()
iter = model.get_iter_root()
while iter:
if model.get_value(iter, 0).decode('utf-8') == group:
@@ -131,7 +131,7 @@
def group_toggled_cb(self, cell, path):
self.changes_made = True
- model = self.list.get_model()
+ model = self.treeview.get_model()
if model[path][2]:
model[path][2] = False
model[path][1] = True
@@ -145,9 +145,10 @@
def init_list(self):
store = gtk.ListStore(str, bool, bool)
- self.list.set_model(store)
- for column in self.list.get_columns(): # Clear treeview when re-drawing
- self.list.remove_column(column)
+ self.treeview.set_model(store)
+ for column in self.treeview.get_columns():
+ # Clear treeview when re-drawing
+ self.treeview.remove_column(column)
accounts = []
# Store groups in a list so we can sort them and the number of contacts in
# it
@@ -185,14 +186,14 @@
store.set(iter, 2, True)
column = gtk.TreeViewColumn(_('Group'))
column.set_expand(True)
- self.list.append_column(column)
+ self.treeview.append_column(column)
renderer = gtk.CellRendererText()
column.pack_start(renderer)
column.set_attributes(renderer, text=0)
column = gtk.TreeViewColumn(_('In the group'))
column.set_expand(False)
- self.list.append_column(column)
+ self.treeview.append_column(column)
renderer = gtk.CellRendererToggle()
column.pack_start(renderer)
renderer.set_property('activatable', True)
@@ -309,12 +310,12 @@
self.on_response(keyID)
self.window.destroy()
- def fill_tree(self, list, selected):
+ def fill_tree(self, list_, selected):
model = self.keys_treeview.get_model()
- for keyID in list.keys():
- iter = model.append((keyID, list[keyID]))
+ for keyID in list_.keys():
+ iter_ = model.append((keyID, list_[keyID]))
if keyID == selected:
- path = model.get_path(iter)
+ path = model.get_path(iter_)
self.keys_treeview.set_cursor(path)
@@ -1104,12 +1105,12 @@
class HigDialog(gtk.MessageDialog):
- def __init__(self, parent, type, buttons, pritext, sectext,
+ def __init__(self, parent, type_, buttons, pritext, sectext,
on_response_ok = None, on_response_cancel = None, on_response_yes = None,
on_response_no = None):
gtk.MessageDialog.__init__(self, parent,
gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL,
- type, buttons, message_format = pritext)
+ type_, buttons, message_format = pritext)
self.format_secondary_markup(sectext)
@@ -1753,7 +1754,7 @@
password = self._password_entry.get_text().decode('utf-8')
try:
nickname = helpers.parse_resource(nickname)
- except:
+ except Exception:
ErrorDialog(_('Invalid Nickname'),
_('The nickname has not allowed characters.'))
return
@@ -1764,7 +1765,7 @@
return
try:
room_jid = helpers.parse_jid(room_jid)
- except:
+ except Exception:
ErrorDialog(_('Invalid group chat Jabber ID'),
_('The group chat Jabber ID has not allowed characters.'))
return
@@ -1940,8 +1941,7 @@
liststore = gtkgui_helpers.get_completion_liststore(self.input_entry)
self.completion_dict = helpers.get_contact_dict_for_account(account)
# add all contacts to the model
- keys = self.completion_dict.keys()
- keys.sort()
+ keys = sorted(self.completion_dict.keys())
for jid in keys:
contact = self.completion_dict[jid]
img = gajim.interface.jabber_state_images['16'][contact.show]
@@ -2180,7 +2180,7 @@
self.cancel_button = self.xml.get_widget('cancel_button')
self.close_button = self.xml.get_widget('close_button')
self.message_tv_buffer.connect('changed', self.update_char_counter)
- if type(to) == type([]):
+ if isinstance(to, list):
jid = ', '.join( [i[0].jid + '/' + i[0].resource for i in to])
self.to_entry.set_text(jid)
self.to_entry.set_sensitive(False)
@@ -2209,8 +2209,7 @@
if to == '':
liststore = gtkgui_helpers.get_completion_liststore(self.to_entry)
self.completion_dict = helpers.get_contact_dict_for_account(account)
- keys = self.completion_dict.keys()
- keys.sort()
+ keys = sorted(self.completion_dict.keys())
for jid in keys:
contact = self.completion_dict[jid]
img = gajim.interface.jabber_state_images['16'][contact.show]
@@ -2366,7 +2365,7 @@
form_node = None
# FIXME: allow GPG message some day
gajim.connections[self.account].send_message(to_whom_jid, message,
- keyID=None, type='normal', subject=subject, session=session,
+ keyID=None, type_='normal', subject=subject, session=session,
form_node=form_node)
self.subject_entry.set_text('') # we sent ok, clear the subject
@@ -2530,7 +2529,7 @@
# Add Widgets
- for widget_to_add in ['title_hbox', 'privacy_lists_title_label',
+ for widget_to_add in ('title_hbox', 'privacy_lists_title_label',
'list_of_rules_label', 'add_edit_rule_label', 'delete_open_buttons_hbox',
'privacy_list_active_checkbutton', 'privacy_list_default_checkbutton',
'list_of_rules_combobox', 'delete_open_buttons_hbox',
@@ -2544,7 +2543,7 @@
'new_rule_button', 'save_rule_button', 'privacy_list_refresh_button',
'privacy_list_close_button', 'edit_send_status_checkbutton',
'add_edit_vbox', 'privacy_list_active_checkbutton',
- 'privacy_list_default_checkbutton']:
+ 'privacy_list_default_checkbutton'):
self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add)
self.privacy_lists_title_label.set_label(
@@ -2825,10 +2824,10 @@
self.xml = gtkgui_helpers.get_glade('privacy_lists_window.glade')
self.window = self.xml.get_widget('privacy_lists_first_window')
- for widget_to_add in ['list_of_privacy_lists_combobox',
+ for widget_to_add in ('list_of_privacy_lists_combobox',
'delete_privacy_list_button', 'open_privacy_list_button',
'new_privacy_list_button', 'new_privacy_list_entry',
- 'privacy_lists_refresh_button', 'close_privacy_lists_window_button']:
+ 'privacy_lists_refresh_button', 'close_privacy_lists_window_button'):
self.__dict__[widget_to_add] = self.xml.get_widget(
widget_to_add)
@@ -3058,7 +3057,7 @@
path = helpers.get_my_pictures_path()
else:
path = os.environ['HOME']
- except:
+ except Exception:
path = ''
FileChooserDialog.__init__(self,
title_text = _('Choose Image'),
@@ -3285,7 +3284,7 @@
else:
self.special_status_rb.set_active(True)
values = value.split()
- for v in ['online', 'away', 'xa', 'dnd', 'invisible']:
+ for v in ('online', 'away', 'xa', 'dnd', 'invisible'):
if v in values:
self.__dict__[v + '_cb'].set_active(True)
else:
@@ -3305,7 +3304,7 @@
'sound_file')
self.sound_entry.set_text(value)
# sound, popup, auto_open, systray, roster
- for option in ['sound', 'popup', 'auto_open', 'systray', 'roster']:
+ for option in ('sound', 'popup', 'auto_open', 'systray', 'roster'):
value = gajim.config.get_per('notifications', str(self.active_num),
option)
if value == 'yes':
@@ -3342,7 +3341,7 @@
status = ''
else:
status = _('when I am ')
- for st in ['online', 'away', 'xa', 'dnd', 'invisible']:
+ for st in ('online', 'away', 'xa', 'dnd', 'invisible'):
if self.__dict__[st + '_cb'].get_active():
status += helpers.get_uf_show(st) + ' '
model[iter][1] = "When %s for %s %s %s" % (event, recipient_type,
@@ -3475,7 +3474,7 @@
if self.active_num < 0:
return
status = ''
- for st in ['online', 'away', 'xa', 'dnd', 'invisible']:
+ for st in ('online', 'away', 'xa', 'dnd', 'invisible'):
if self.__dict__[st + '_cb'].get_active():
status += st + ' '
if status:
@@ -3491,14 +3490,14 @@
gajim.config.set_per('notifications', str(self.active_num), 'status',
'all')
# 'All status' clicked
- for st in ['online', 'away', 'xa', 'dnd', 'invisible']:
+ for st in ('online', 'away', 'xa', 'dnd', 'invisible'):
self.__dict__[st + '_cb'].hide()
self.special_status_rb.show()
else:
self.set_status_config()
# 'special status' clicked
- for st in ['online', 'away', 'xa', 'dnd', 'invisible']:
+ for st in ('online', 'away', 'xa', 'dnd', 'invisible'):
self.__dict__[st + '_cb'].show()
self.special_status_rb.hide()
@@ -3893,7 +3892,7 @@
verify_now_button.set_no_show_all(True)
verify_now_button.hide()
- if keyID[8:] == 'MISMATCH':
+ if keyID.endswith('MISMATCH'):
verification_status = _('''Contact's identity NOT verified''')
info = _('The contact\'s key (%s) <b>does not match</b> the key '
'assigned in Gajim.') % keyID[:8]
Modified: branches/osx_newbuildsys/src/disco.py
===================================================================
--- branches/osx_newbuildsys/src/disco.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/disco.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -240,9 +240,9 @@
self._items.cleanup()
self._info.cleanup()
- def _clean_closure(self, cb, type, addr):
+ def _clean_closure(self, cb, type_, addr):
# A closure died, clean up
- cbkey = (type, addr)
+ cbkey = (type_, addr)
try:
self._cbs[cbkey].remove(cb)
except KeyError:
@@ -989,20 +989,20 @@
get_agent_address(jid, node)))
self.cache.get_info(jid, node, self._agent_info, force = force)
- def _update_item(self, iter, jid, node, item):
+ def _update_item(self, iter_, jid, node, item):
'''Called when an item should be updated in the model. The result of a
disco#items query. (seldom)'''
if 'name' in item:
- self.model[iter][2] = item['name']
+ self.model[iter_][2] = item['name']
- def _update_info(self, iter, jid, node, identities, features, data):
+ def _update_info(self, iter_, jid, node, identities, features, data):
'''Called when an item should be updated in the model with further info.
The result of a disco#info query.'''
name = identities[0].get('name', '')
if name:
- self.model[iter][2] = name
+ self.model[iter_][2] = name
- def _update_error(self, iter, jid, node):
+ def _update_error(self, iter_, jid, node):
'''Called when a disco#info query failed for an item.'''
pass
@@ -1024,21 +1024,21 @@
self._view_signals = []
self._scroll_signal = None
- def _pixbuf_renderer_data_func(self, col, cell, model, iter):
+ def _pixbuf_renderer_data_func(self, col, cell, model, iter_):
'''Callback for setting the pixbuf renderer's properties.'''
- jid = model.get_value(iter, 0)
+ jid = model.get_value(iter_, 0)
if jid:
- pix = model.get_value(iter, 2)
+ pix = model.get_value(iter_, 2)
cell.set_property('visible', True)
cell.set_property('pixbuf', pix)
else:
cell.set_property('visible', False)
- def _text_renderer_data_func(self, col, cell, model, iter):
+ def _text_renderer_data_func(self, col, cell, model, iter_):
'''Callback for setting the text renderer's properties.'''
- jid = model.get_value(iter, 0)
- markup = model.get_value(iter, 3)
- state = model.get_value(iter, 4)
+ jid = model.get_value(iter_, 0)
+ markup = model.get_value(iter_, 3)
+ state = model.get_value(iter_, 4)
cell.set_property('markup', markup)
if jid:
cell.set_property('cell_background_set', False)
@@ -1103,7 +1103,7 @@
iter = None
try:
iter = self.model.get_iter(row)
- except:
+ except Exception:
self.tooltip.hide_tooltip()
return
jid = self.model[iter][0]
@@ -1407,13 +1407,13 @@
self.window.progressbar.hide()
return False
- def _friendly_category(self, category, type=None):
+ def _friendly_category(self, category, type_=None):
'''Get the friendly category name and priority.'''
cat = None
- if type:
+ if type_:
# Try type-specific override
try:
- cat, prio = _cat_to_descr[(category, type)]
+ cat, prio = _cat_to_descr[(category, type_)]
except KeyError:
pass
if not cat:
@@ -1423,14 +1423,14 @@
cat, prio = _cat_to_descr['other']
return cat, prio
- def _create_category(self, cat, type=None):
+ def _create_category(self, cat, type_=None):
'''Creates a category row.'''
- cat, prio = self._friendly_category(cat, type)
+ cat, prio = self._friendly_category(cat, type_)
return self.model.append(None, ('', '', None, cat, prio))
- def _find_category(self, cat, type=None):
+ def _find_category(self, cat, type_=None):
'''Looks up a category row and returns the iterator to it, or None.'''
- cat, prio = self._friendly_category(cat, type)
+ cat, prio = self._friendly_category(cat, type_)
iter = self.model.get_iter_root()
while iter:
if self.model.get_value(iter, 3).decode('utf-8') == cat:
@@ -1486,15 +1486,15 @@
self.cache.get_info(jid, node, self._agent_info, force = force)
self._update_progressbar()
- def _update_item(self, iter, jid, node, item):
+ def _update_item(self, iter_, jid, node, item):
addr = get_agent_address(jid, node)
if 'name' in item:
descr = "<b>%s</b>\n%s" % (item['name'], addr)
else:
descr = "<b>%s</b>" % addr
- self.model[iter][3] = descr
+ self.model[iter_][3] = descr
- def _update_info(self, iter, jid, node, identities, features, data):
+ def _update_info(self, iter_, jid, node, identities, features, data):
addr = get_agent_address(jid, node)
name = identities[0].get('name', '')
if name:
@@ -1516,16 +1516,16 @@
break
# Check if we have to move categories
- old_cat_iter = self.model.iter_parent(iter)
+ old_cat_iter = self.model.iter_parent(iter_)
old_cat = self.model.get_value(old_cat_iter, 3).decode('utf-8')
if self.model.get_value(old_cat_iter, 3) == cat:
# Already in the right category, just update
- self.model[iter][2] = pix
- self.model[iter][3] = descr
- self.model[iter][4] = 0
+ self.model[iter_][2] = pix
+ self.model[iter_][3] = descr
+ self.model[iter_][4] = 0
return
# Not in the right category, move it.
- self.model.remove(iter)
+ self.model.remove(iter_)
# Check if the old category is empty
if not self.model.iter_is_valid(old_cat_iter):
@@ -1539,9 +1539,9 @@
self.model.append(cat_iter, (jid, node, pix, descr, 0))
self._expand_all()
- def _update_error(self, iter, jid, node):
+ def _update_error(self, iter_, jid, node):
addr = get_agent_address(jid, node)
- self.model[iter][4] = 2
+ self.model[iter_][4] = 2
self._progress += 1
self._update_progressbar()
@@ -1738,7 +1738,7 @@
if not self._fetch_source:
self._fetch_source = gobject.idle_add(self._start_info_query)
- def _update_info(self, iter, jid, node, identities, features, data):
+ def _update_info(self, iter_, jid, node, identities, features, data):
name = identities[0].get('name', '')
for form in data:
typefield = form.getField('FORM_TYPE')
@@ -1748,15 +1748,15 @@
users = form.getField('muc#roominfo_occupants')
descr = form.getField('muc#roominfo_description')
if users:
- self.model[iter][3] = int(users.getValue())
- self.model[iter][4] = users.getValue()
+ self.model[iter_][3] = int(users.getValue())
+ self.model[iter_][4] = users.getValue()
if descr:
- self.model[iter][5] = descr.getValue()
+ self.model[iter_][5] = descr.getValue()
# Only set these when we find a form with additional info
# Some servers don't support forms and put extra info in
# the name attribute, so we preserve it in that case.
- self.model[iter][2] = name
- self.model[iter][6] = True
+ self.model[iter_][2] = name
+ self.model[iter_][6] = True
break
else:
# We didn't find a form, switch to alternate query mode
@@ -1766,7 +1766,7 @@
self._fetch_source = None
self._query_visible()
- def _update_error(self, iter, jid, node):
+ def _update_error(self, iter_, jid, node):
# switch to alternate query mode
self.cache.get_items(jid, node, self._channel_altinfo)
@@ -1836,7 +1836,7 @@
self._total_items += 1
self._add_item(jid, node, item, force)
- def _in_list_foreach(self, model, path, iter, node):
+ def _in_list_foreach(self, model, path, iter_, node):
if model[path][1] == node:
self.in_list = True
@@ -1961,7 +1961,7 @@
have items on the list, we should actualize them. '''
try:
subscriptions = request.getTag('pubsub').getTag('subscriptions')
- except:
+ except Exception:
return
groups = set()
Modified: branches/osx_newbuildsys/src/features_window.py
===================================================================
--- branches/osx_newbuildsys/src/features_window.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/features_window.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -164,17 +164,17 @@
try:
import OpenSSL.SSL
import OpenSSL.crypto
- except:
+ except Exception:
return False
return True
def zeroconf_available(self):
try:
import avahi
- except:
+ except Exception:
try:
import pybonjour
- except:
+ except Exception:
return False
return True
@@ -201,7 +201,7 @@
return False
try:
import gnome.ui
- except:
+ except Exception:
return False
return True
@@ -210,7 +210,7 @@
return False
try:
import gnomekeyring
- except:
+ except Exception:
return False
return True
@@ -222,7 +222,7 @@
return False
try:
import gtkspell
- except:
+ except Exception:
return False
return True
@@ -232,7 +232,7 @@
elif sys.platform == 'darwin':
try:
import osx.growler
- except:
+ except Exception:
return False
return True
from common import dbus_support
@@ -240,7 +240,7 @@
return True
try:
import pynotify
- except:
+ except Exception:
return False
return True
@@ -250,7 +250,7 @@
return True
try:
import systray
- except:
+ except Exception:
return False
return True
@@ -280,14 +280,14 @@
p = Popen(['latex', '--interaction=nonstopmode', tmpfile + '.tex'],
cwd=gettempdir())
exitcode = p.wait()
- except:
+ except Exception:
exitcode = 1
if exitcode == 0:
try:
p = Popen(['dvipng', '-bg', 'white', '-T', 'tight',
tmpfile + '.dvi', '-o', tmpfile + '.png'], cwd=gettempdir())
exitcode = p.wait()
- except:
+ except Exception:
exitcode = 1
extensions = ['.tex', '.log', '.aux', '.dvi', '.png']
for ext in extensions:
@@ -306,7 +306,7 @@
def docutils_available(self):
try:
import docutils
- except:
+ except Exception:
return False
return True
Modified: branches/osx_newbuildsys/src/filetransfers_window.py
===================================================================
--- branches/osx_newbuildsys/src/filetransfers_window.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/filetransfers_window.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -458,8 +458,8 @@
eta = remaining_size / speed
return eta, speed
- def _remove_transfer(self, iter, sid, file_props):
- self.model.remove(iter)
+ def _remove_transfer(self, iter_, sid, file_props):
+ self.model.remove(iter_)
if 'tt_account' in file_props:
# file transfer is set
account = file_props['tt_account']
@@ -484,7 +484,7 @@
del(self.files_props[sid[0]][sid[1:]])
del(file_props)
- def set_progress(self, typ, sid, transfered_size, iter = None):
+ def set_progress(self, typ, sid, transfered_size, iter_ = None):
''' change the progress of a transfer with new transfered size'''
if sid not in self.files_props[typ]:
return
@@ -494,11 +494,11 @@
percent = 0
else:
percent = round(float(transfered_size) / full_size * 100, 1)
- if iter is None:
- iter = self.get_iter_by_sid(typ, sid)
- if iter is not None:
+ if iter_ is None:
+ iter_ = self.get_iter_by_sid(typ, sid)
+ if iter_ is not None:
just_began = False
- if self.model[iter][C_PERCENT] == 0 and int(percent > 0):
+ if self.model[iter_][C_PERCENT] == 0 and int(percent > 0):
just_began = True
text = self._format_percent(percent)
if transfered_size == 0:
@@ -520,8 +520,8 @@
eta, speed = self._get_eta_and_speed(full_size, transfered_size,
file_props)
- self.model.set(iter, C_PROGRESS, text)
- self.model.set(iter, C_PERCENT, int(percent))
+ self.model.set(iter_, C_PROGRESS, text)
+ self.model.set(iter_, C_PERCENT, int(percent))
text = self._format_time(eta)
text += '\n'
#This should make the string Kb/s,
@@ -529,7 +529,7 @@
#Only the 's' after / (which means second) should be translated.
text += _('(%(filesize_unit)s/s)') % {'filesize_unit':
helpers.convert_bytes(speed)}
- self.model.set(iter, C_TIME, text)
+ self.model.set(iter_, C_TIME, text)
# try to guess what should be the status image
if file_props['type'] == 'r':
@@ -542,11 +542,11 @@
status = 'waiting'
if 'connected' in file_props and file_props['connected'] == False:
status = 'stop'
- self.model.set(iter, 0, self.images[status])
+ self.model.set(iter_, 0, self.images[status])
if transfered_size == full_size:
self.set_status(typ, sid, 'ok')
elif just_began:
- path = self.model.get_path(iter)
+ path = self.model.get_path(iter_)
self.select_func(path)
def get_iter_by_sid(self, typ, sid):
@@ -632,7 +632,7 @@
iter = None
try:
iter = self.model.get_iter(row)
- except:
+ except Exception:
self.tooltip.hide_tooltip()
return
sid = self.model[iter][C_SID].decode('utf-8')
@@ -873,11 +873,11 @@
def on_close_button_clicked(self, widget):
self.window.hide()
- def show_context_menu(self, event, iter):
+ def show_context_menu(self, event, iter_):
# change the sensitive propery of the buttons and menuitems
path = None
- if iter is not None:
- path = self.model.get_path(iter)
+ if iter_ is not None:
+ path = self.model.get_path(iter_)
self.set_buttons_sensitive(path, True)
event_button = gtkgui_helpers.get_possible_button_event(event)
Modified: branches/osx_newbuildsys/src/gajim-remote.py
===================================================================
--- branches/osx_newbuildsys/src/gajim-remote.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/gajim-remote.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -38,7 +38,7 @@
try:
PREFERRED_ENCODING = locale.getpreferredencoding()
-except:
+except Exception:
PREFERRED_ENCODING = 'UTF-8'
def send_error(error_message):
@@ -50,7 +50,7 @@
import dbus
import dbus.service
import dbus.glib
-except:
+except Exception:
print str(exceptions.DbusNotSupported())
sys.exit(1)
@@ -338,8 +338,7 @@
for account_dict in res:
print self.print_info(0, account_dict, True)
elif self.command == 'prefs_list':
- pref_keys = res.keys()
- pref_keys.sort()
+ pref_keys = sorted(res.keys())
for pref_key in pref_keys:
result = '%s = %s' % (pref_key, res[pref_key])
if isinstance(result, unicode):
@@ -355,7 +354,7 @@
if not self.sbus:
try:
self.sbus = dbus.SessionBus()
- except:
+ except Exception:
raise exceptions.SessionBusNotPresent
test = False
@@ -372,7 +371,7 @@
or exit if it is not possible '''
try:
self.sbus = dbus.SessionBus()
- except:
+ except Exception:
raise exceptions.SessionBusNotPresent
if not self.check_gajim_running():
@@ -418,8 +417,7 @@
def compose_help(self):
''' print usage, and list available commands '''
str = _('Usage: %s command [arguments]\nCommand is one of:\n' ) % BASENAME
- commands = self.commands.keys()
- commands.sort()
+ commands = sorted(self.commands.keys())
for command in commands:
str += ' ' + command
for argument in self.commands[command][1]:
@@ -481,7 +479,7 @@
if (encode_return):
try:
ret_str = ret_str.encode(PREFERRED_ENCODING)
- except:
+ except Exception:
pass
return ret_str
Modified: branches/osx_newbuildsys/src/gajim.py
===================================================================
--- branches/osx_newbuildsys/src/gajim.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/gajim.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -186,7 +186,7 @@
import dl
libc = dl.open('/lib/libc.so.6')
libc.call('prctl', 15, 'gajim\0', 0, 0, 0)
- except:
+ except Exception:
pass
if gtk.pygtk_version < (2, 8, 0):
@@ -215,7 +215,7 @@
try:
import winsound # windows-only built-in module for playing wav
import win32api # do NOT remove. we req this module
- except:
+ except Exception:
pritext = _('Gajim needs pywin32 to run')
sectext = _('Please make sure that Pywin32 is installed on your system. You can get it at %s') % 'http://sourceforge.net/project/showfiles.php?group_id=78018'
@@ -288,7 +288,7 @@
try:
pid = int(pf.read().strip())
pf.close()
- except:
+ except Exception:
traceback.print_exc()
# PID file exists, but something happened trying to read PID
# Could be 0.10 style empty PID file, so assume Gajim is running
@@ -297,7 +297,7 @@
if os.name == 'nt':
try:
from ctypes import (windll, c_ulong, c_int, Structure, c_char, POINTER, pointer, )
- except:
+ except Exception:
return True
class PROCESSENTRY32(Structure):
@@ -359,7 +359,7 @@
if n.find('gajim') < 0:
return False
return True # Running Gajim found at pid
- except:
+ except Exception:
traceback.print_exc()
# If we are here, pidfile exists, but some unexpected error occured.
@@ -450,7 +450,7 @@
def _process_events(self, fd, flags):
try:
return self.process_events(fd, flags)
- except:
+ except Exception:
self.remove_idle(fd)
self.add_idle(fd, flags)
raise
@@ -1124,10 +1124,7 @@
# ('VCARD', account, data)
'''vcard holds the vcard data'''
jid = vcard['jid']
- resource = ''
- if 'resource' in vcard:
- resource = vcard['resource']
-
+ resource = vcard.get('resource', '')
fjid = jid + '/' + str(resource)
# vcard window
@@ -1580,8 +1577,7 @@
# 'Subject' and 'Snippet' field
if cnt >=5:
break
- senders = reduce(lambda b, a: a + ',\n ' + b,
- gmessage['From'])
+ senders = ',\n '.join(reversed(gmessage['From']))
text += _('\n\nFrom: %(from_address)s\nSubject: %(subject)s\n%(snippet)s') % \
{'from_address': senders, 'subject': gmessage['Subject'],
'snippet': gmessage['Snippet']}
@@ -1813,9 +1809,7 @@
gajim.gc_connected[account][room_jid]:
continue
nick = gc_control.nick
- password = ''
- if room_jid in gajim.gc_passwords:
- password = gajim.gc_passwords[room_jid]
+ password = gajim.gc_passwords.get(room_jid, '')
gajim.connections[account].join_gc(nick, room_jid, password)
def handle_event_metacontacts(self, account, tags_list):
@@ -1831,9 +1825,9 @@
details = _('Unable to decrypt message from '
'%s\nIt may have been tampered with.') % jid
- if session.control:
- session.control.print_conversation_line(details,
- 'status', '', tim)
+ ctrl = session.control
+ if ctrl:
+ ctrl.print_conversation_line(details, 'status', '', tim)
else:
dialogs.WarningDialog(_('Unable to decrypt message'),
details)
@@ -1843,7 +1837,8 @@
session.conn.delete_session(jid, session.thread_id)
# restart the session
- session.negotiate_e2e(False)
+ if ctrl:
+ ctrl.begin_e2e_negotiation()
def handle_event_privacy_lists_received(self, account, data):
# ('PRIVACY_LISTS_RECEIVED', account, list)
@@ -2210,14 +2205,12 @@
# Do we have a queue?
jid = gajim.get_jid_without_resource(jid)
no_queue = len(gajim.events.get_events(account, jid)) == 0
- event_type = None
# type_ can be gc-invitation file-send-error file-error file-request-error
# file-request file-completed file-stopped
# event_type can be in advancedNotificationWindow.events_list
event_types = {'file-request': 'ft_request',
'file-completed': 'ft_finished'}
- if type_ in event_types:
- event_type = event_types[type_]
+ event_type = event_types.get(type_)
show_in_roster = notify.get_show_in_roster(event_type, account, jid)
show_in_systray = notify.get_show_in_systray(event_type, account, jid)
event = gajim.events.create_event(type_, event_args,
@@ -2322,7 +2315,8 @@
room_jid = room_jid, name = nick, show = show)
if not session:
- session = gajim.connections[account].make_new_session(fjid, None, type='pm')
+ session = gajim.connections[account].make_new_session(
+ fjid, None, type_='pm')
self.new_private_chat(gc_contact, account, session=session)
ctrl = session.control
@@ -2371,7 +2365,7 @@
img = gtk.Image()
try:
img.set_from_file(image)
- except:
+ except Exception:
return False
t = img.get_storage_type()
if t != gtk.IMAGE_PIXBUF and t != gtk.IMAGE_ANIMATION:
@@ -2509,7 +2503,7 @@
for image in self.emoticons_images:
item = gtk.MenuItem()
img = gtk.Image()
- if type(image[1]) == gtk.gdk.PixbufAnimation:
+ if isinstance(image[1], gtk.gdk.PixbufAnimation):
img.set_from_animation(image[1])
else:
img.set_from_pixbuf(image[1])
@@ -2580,7 +2574,7 @@
fd.close()
del emoticons
self._init_emoticons(path, need_reload=True)
- except:
+ except Exception:
pass
if len(self.emoticons) == 0:
dialogs.WarningDialog(_('Emoticons disabled'),
@@ -2874,7 +2868,7 @@
'''
try:
gajim.idlequeue.process()
- except:
+ except Exception:
# Otherwise, an exception will stop our loop
if gajim.idlequeue.__class__ == GlibIdleQueue:
gobject.timeout_add_seconds(2, self.process_connections)
@@ -3089,7 +3083,7 @@
'/apps/nautilus/preferences/click_policy')
if click_policy == 'single':
gajim.single_click = True
- except:
+ except Exception:
pass
# add default status messages if there is not in the config file
if len(gajim.config.get_per('statusmsg')) == 0:
@@ -3182,7 +3176,7 @@
try:
import remote_control
self.remote_ctrl = remote_control.Remote()
- except:
+ except Exception:
self.remote_ctrl = None
else:
self.remote_ctrl = None
@@ -3220,7 +3214,7 @@
bus = dbus.SessionBus()
bus.add_signal_receiver(gnome_screensaver_ActiveChanged_cb,
'ActiveChanged', 'org.gnome.ScreenSaver')
- except:
+ except Exception:
pass
self.show_vcard_when_connect = []
@@ -3280,7 +3274,7 @@
try:
import gtkspell
spell = gtkspell.Spell(tv, lang)
- except:
+ except Exception:
dialogs.AspellDictError(lang)
if gajim.config.get('soundplayer') == '':
Modified: branches/osx_newbuildsys/src/groupchat_control.py
===================================================================
--- branches/osx_newbuildsys/src/groupchat_control.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/groupchat_control.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -66,19 +66,19 @@
fgcolor = treeview.style.fg[gtk.STATE_PRELIGHT]
renderer.set_property('foreground-gdk', fgcolor)
-def tree_cell_data_func(column, renderer, model, iter, tv=None):
+def tree_cell_data_func(column, renderer, model, iter_, tv=None):
# cell data func is global, because we don't want it to keep
# reference to GroupchatControl instance (self)
theme = gajim.config.get('roster_theme')
# allocate space for avatar only if needed
- parent_iter = model.iter_parent(iter)
+ parent_iter = model.iter_parent(iter_)
if isinstance(renderer, gtk.CellRendererPixbuf):
avatar_position = gajim.config.get('avatar_position_in_roster')
if avatar_position == 'right':
renderer.set_property('xalign', 1) # align pixbuf to the right
else:
renderer.set_property('xalign', 0.5)
- if parent_iter and (model[iter][C_AVATAR] or avatar_position == 'left'):
+ if parent_iter and (model[iter_][C_AVATAR] or avatar_position == 'left'):
renderer.set_property('visible', True)
renderer.set_property('width', gajim.config.get('roster_avatar_width'))
else:
@@ -162,7 +162,10 @@
self.got_connected()
ChatControl.update_ui(self)
+ def update_contact(self):
+ self.contact = gajim.contacts.contact_from_gc_contact(self.gc_contact)
+
class GroupchatControl(ChatControlBase):
TYPE_ID = message_control.TYPE_GC
# alphanum sorted
@@ -541,8 +544,8 @@
for nick in gajim.contacts.get_nick_list(self.account, self.room_jid):
self.draw_contact(nick)
- def _change_style(self, model, path, iter):
- model[iter][C_NICK] = model[iter][C_NICK]
+ def _change_style(self, model, path, iter_):
+ model[iter_][C_NICK] = model[iter_][C_NICK]
def change_roster_style(self):
model = self.list_treeview.get_model()
@@ -815,6 +818,8 @@
# muc-specific chatstate
if self.parent_win:
self.parent_win.redraw_tab(self, 'attention')
+ else:
+ self.attention_flag = True
other_tags_for_name.append('bold')
other_tags_for_text.append('marked')
@@ -942,8 +947,6 @@
if self.parent_win:
self.parent_win.redraw_tab(self)
- self.msg_textview.grab_focus()
-
def got_disconnected(self):
self.list_treeview.get_model().clear()
nick_list = gajim.contacts.get_nick_list(self.account, self.room_jid)
@@ -982,16 +985,16 @@
# Recalculate column width for ellipsizin
self.list_treeview.columns_autosize()
- def on_send_pm(self, widget=None, model=None, iter=None, nick=None,
+ def on_send_pm(self, widget=None, model=None, iter_=None, nick=None,
msg=None):
'''opens a chat window and if msg is not None sends private message to a
contact in a room'''
if nick is None:
- nick = model[iter][C_NICK].decode('utf-8')
+ nick = model[iter_][C_NICK].decode('utf-8')
fjid = gajim.construct_fjid(self.room_jid, nick) # 'fake' jid
ctrl = self._start_private_message(nick)
- if msg:
+ if ctrl and msg:
ctrl.send_message(msg)
def on_send_file(self, widget, gc_contact):
@@ -1426,7 +1429,7 @@
nick = message_array[0]
try:
nick = helpers.parse_resource(nick)
- except:
+ except Exception:
# Invalid Nickname
dialogs.ErrorDialog(_('Invalid nickname'),
_('The nickname has not allowed characters.'))
@@ -1447,7 +1450,7 @@
else:
nick1 = nick0
nicks = gajim.contacts.get_nick_list(self.account, self.room_jid)
- for nick in [nick0, nick1]:
+ for nick in (nick0, nick1):
if nick in nicks:
self.on_send_pm(nick = nick)
self.clear(self.msg_textview)
@@ -1707,7 +1710,7 @@
self.change_nick_dialog = None
try:
nick = helpers.parse_resource(nick)
- except:
+ except Exception:
# invalid char
dialogs.ErrorDialog(_('Invalid nickname'),
_('The nickname has not allowed characters.'))
@@ -1876,7 +1879,7 @@
# Test jid
try:
jid = helpers.parse_jid(jid)
- except:
+ except Exception:
dialogs.ErrorDialog(_('Invalid group chat Jabber ID'),
_('The group chat Jabber ID has not allowed characters.'))
return
@@ -1891,9 +1894,7 @@
def _on_bookmark_room_menuitem_activate(self, widget):
'''bookmark the room, without autojoin and not minimized'''
- password = ''
- if self.room_jid in gajim.gc_passwords:
- password = gajim.gc_passwords[self.room_jid]
+ password = gajim.gc_passwords.get(self.room_jid, '')
gajim.interface.add_gc_bookmark(self.account, self.name, self.room_jid, \
'0', '0', password, self.nick)
@@ -2042,17 +2043,17 @@
widget.get_selection().unselect_all()
return True
- def on_list_treeview_row_expanded(self, widget, iter, path):
+ def on_list_treeview_row_expanded(self, widget, iter_, path):
'''When a row is expanded: change the icon of the arrow'''
model = widget.get_model()
image = gajim.interface.jabber_state_images['16']['opened']
- model[iter][C_IMG] = image
+ model[iter_][C_IMG] = image
- def on_list_treeview_row_collapsed(self, widget, iter, path):
+ def on_list_treeview_row_collapsed(self, widget, iter_, path):
'''When a row is collapsed: change the icon of the arrow'''
model = widget.get_model()
image = gajim.interface.jabber_state_images['16']['closed']
- model[iter][C_IMG] = image
+ model[iter_][C_IMG] = image
def kick(self, widget, nick):
'''kick a user'''
@@ -2064,10 +2065,10 @@
instance = dialogs.InputDialog(_('Kicking %s') % nick,
_('You may specify a reason below:'), ok_handler=on_ok)
- def mk_menu(self, event, iter):
+ def mk_menu(self, event, iter_):
'''Make contact's popup menu'''
model = self.list_treeview.get_model()
- nick = model[iter][C_NICK].decode('utf-8')
+ nick = model[iter_][C_NICK].decode('utf-8')
c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick)
jid = c.jid
target_affiliation = c.affiliation
@@ -2161,7 +2162,7 @@
self.handlers[id] = item
item = xml.get_widget('send_private_message_menuitem')
- id = item.connect('activate', self.on_send_pm, model, iter)
+ id = item.connect('activate', self.on_send_pm, model, iter_)
self.handlers[id] = item
item = xml.get_widget('send_file_menuitem')
@@ -2190,7 +2191,8 @@
if not ctrl:
ctrl = gajim.interface.new_private_chat(gc_c, self.account)
- ctrl.parent_win.set_active_tab(ctrl)
+ if ctrl:
+ ctrl.parent_win.set_active_tab(ctrl)
return ctrl
@@ -2298,7 +2300,7 @@
iter = None
try:
iter = model.get_iter(row)
- except:
+ except Exception:
self.tooltip.hide_tooltip()
return
typ = model[iter][C_TYPE].decode('utf-8')
Modified: branches/osx_newbuildsys/src/gtkexcepthook.py
===================================================================
--- branches/osx_newbuildsys/src/gtkexcepthook.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/gtkexcepthook.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -35,11 +35,11 @@
_exception_in_progress = threading.Lock()
-def _info(type, value, tb):
+def _info(type_, value, tb):
if not _exception_in_progress.acquire(False):
# Exceptions have piled up, so we use the default exception
# handler for such exceptions
- _excepthook_save(type, value, tb)
+ _excepthook_save(type_, value, tb)
return
dialog = dialogs.HigDialog(None, gtk.MESSAGE_WARNING, gtk.BUTTONS_NONE,
@@ -69,7 +69,7 @@
frame.set_border_width(6)
textbuffer = textview.get_buffer()
trace = StringIO()
- traceback.print_exception(type, value, tb, None, trace)
+ traceback.print_exception(type_, value, tb, None, trace)
textbuffer.set_text(trace.getvalue())
textview.set_size_request(
gtk.gdk.screen_width() / 3,
Modified: branches/osx_newbuildsys/src/gtkgui_helpers.py
===================================================================
--- branches/osx_newbuildsys/src/gtkgui_helpers.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/gtkgui_helpers.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -141,7 +141,7 @@
return client.get_string('/desktop/gnome/interface/font_name'
).decode('utf-8')
- except:
+ except Exception:
pass
# try to get xfce default font
@@ -157,17 +157,17 @@
if os.path.exists(xfce_config_file):
try:
- for line in file(xfce_config_file):
+ for line in open(xfce_config_file):
if line.find('name="Gtk/FontName"') != -1:
start = line.find('value="') + 7
return line[start:line.find('"', start)].decode('utf-8')
- except:
+ except Exception:
#we talk about file
print >> sys.stderr, _('Error: cannot open %s for reading') % xfce_config_file
elif os.path.exists(kde_config_file):
try:
- for line in file(kde_config_file):
+ for line in open(kde_config_file):
if line.find('font=') == 0: # font=Verdana,9,other_numbers
start = 5 # 5 is len('font=')
line = line[start:]
@@ -176,7 +176,7 @@
font_size = values[1]
font_string = '%s %s' % (font_name, font_size) # Verdana 9
return font_string.decode('utf-8')
- except:
+ except Exception:
#we talk about file
print >> sys.stderr, _('Error: cannot open %s for reading') % kde_config_file
@@ -273,10 +273,10 @@
self.algo = self.cleanID(algo)
self.digest = self.cleanID(digest)
- def cleanID(self, id):
- id = id.strip().lower()
- for strip in (' :.-_'): id = id.replace(strip, '')
- return id
+ def cleanID(self, id_):
+ id_ = id_.strip().lower()
+ for strip in (' :.-_'): id_ = id_.replace(strip, '')
+ return id_
def __eq__(self, other):
sa, sd = self.algo, self.digest
@@ -650,10 +650,10 @@
for file_path in file_paths:
try:
file_path = file_path.decode(sys.getfilesystemencoding())
- except:
+ except Exception:
try:
file_path = file_path.decode('utf-8')
- except:
+ except Exception:
pass
file_paths_list.append(file_path)
@@ -713,7 +713,7 @@
import gconf
# in try because daemon may not be there
client = gconf.client_get_default()
- except:
+ except Exception:
return
old_command = client.get_string('/desktop/gnome/url-handlers/xmpp/command')
Modified: branches/osx_newbuildsys/src/htmltextview.py
===================================================================
--- branches/osx_newbuildsys/src/htmltextview.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/htmltextview.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -222,7 +222,7 @@
'(?:(?<![\w.]' + emoticons_pattern_prematch[:-1] + '))' + \
'(?:' + emoticons_pattern[:-1] + ')' + \
'(?:(?![\w.]' + emoticons_pattern_postmatch[:-1] + '))'
- except:
+ except Exception:
pass
view.emot_pattern_re = re.compile(emoticons_pattern, re.IGNORECASE)
@@ -377,7 +377,7 @@
# validate length
val = sign*max(minl,min(abs(val),maxl))
callback(val, *args)
- except:
+ except Exception:
warnings.warn('Unable to parse length value "%s"' % value)
def __parse_font_size_cb(length, tag):
@@ -510,7 +510,7 @@
def __length_tag_cb(self, value, tag, propname):
try:
tag.set_property(propname, value)
- except:
+ except Exception:
gajim.log.warn( "Error with prop: " + propname + " for tag: " + str(tag))
@@ -528,10 +528,10 @@
# build a dictionary mapping styles to methods, for greater speed
__style_methods = dict()
- for style in ['background-color', 'color', 'font-family', 'font-size',
+ for style in ('background-color', 'color', 'font-family', 'font-size',
'font-style', 'font-weight', 'margin-left', 'margin-right',
'text-align', 'text-decoration', 'white-space', 'display',
- 'width', 'height' ]:
+ 'width', 'height' ):
try:
method = locals()['_parse_style_%s' % style.replace('-', '_')]
except KeyError:
@@ -575,7 +575,7 @@
# Wait 0.1s between each byte
try:
f.fp._sock.fp._sock.settimeout(0.5)
- except:
+ except Exception:
pass
# Max image size = 2 MB (to try to prevent DoS)
mem = ''
@@ -641,11 +641,11 @@
pifbufs for every resize, gtk.gdk.Pixbuf.scale_simple
or similar.
'''
- if type(dims[0]) == float:
+ if isinstance(dims[0], float):
dims[0] = int(dims[0]*w)
elif not dims[0]:
dims[0] = w
- if type(dims[1]) == float:
+ if isinstance(dims[1], float):
dims[1] = int(dims[1]*h)
if not dims[1]:
dims[1] = h
@@ -675,7 +675,7 @@
alt = attrs.get('alt', 'Broken image')
try:
loader.close()
- except:
+ except Exception:
pass
return pixbuf
@@ -728,7 +728,7 @@
else:
self._insert_text(text.strip('\n'))
- def _anchor_event(self, tag, textview, event, iter, href, type_):
+ def _anchor_event(self, tag, textview, event, iter_, href, type_):
if event.type == gtk.gdk.BUTTON_PRESS:
self.textview.emit('url-clicked', href, type_)
return True
@@ -1068,7 +1068,7 @@
htmlview.connect('motion_notify_event', on_textview_motion_notify_event)
- def handler(texttag, widget, event, iter, kind, href):
+ def handler(texttag, widget, event, iter_, kind, href):
if event.type == gtk.gdk.BUTTON_PRESS:
print href
Modified: branches/osx_newbuildsys/src/ipython_view.py
===================================================================
--- branches/osx_newbuildsys/src/ipython_view.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/ipython_view.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -212,25 +212,22 @@
'''
split_line = self.complete_sep.split(line)
possibilities = self.IP.complete(split_line[-1])
+
+ try:
+ __builtins__.all
+ except AttributeError:
+ def all(iterable):
+ for element in iterable:
+ if not element:
+ return False
+ return True
+
+ def common_prefix(seq):
+ """Returns the common prefix of a sequence of strings"""
+ return "".join(c for i, c in enumerate(seq[0])
+ if all(s.startswith(c, i) for s in seq))
if possibilities:
- def _commonPrefix(str1, str2):
- '''
- Reduction function. returns common prefix of two given strings.
-
- @param str1: First string.
- @type str1: string
- @param str2: Second string
- @type str2: string
-
- @return: Common prefix to both strings.
- @rtype: string
- '''
- for i in range(len(str1)):
- if not str2.startswith(str1[:i+1]):
- return str1[:i]
- return str1
- common_prefix = reduce(_commonPrefix, possibilities)
- completed = line[:-len(split_line[-1])]+common_prefix
+ completed = line[:-len(split_line[-1])]+common_prefix(possibilities)
else:
completed = line
return completed, possibilities
Modified: branches/osx_newbuildsys/src/lastfm.py
===================================================================
--- branches/osx_newbuildsys/src/lastfm.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/lastfm.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -75,7 +75,7 @@
xmldocument = urlopen(self.LASTFM_FORMAT_URL % self._username,
self._proxies)
xmltree = minidom.parse(xmldocument)
- except:
+ except Exception:
print 'Error parsing XML from Last.fm...'
return False
@@ -211,7 +211,7 @@
lfm = LastFM(argv[1])
print lfm
- while 1:
+ while True:
if lfm.updateData():
print lfm.formatSongTitle()
sleep(60)
Modified: branches/osx_newbuildsys/src/message_control.py
===================================================================
--- branches/osx_newbuildsys/src/message_control.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/message_control.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -160,7 +160,7 @@
if crypto_changed:
self.print_esession_details()
- def send_message(self, message, keyID = '', type = 'chat',
+ def send_message(self, message, keyID = '', type_ = 'chat',
chatstate = None, msg_id = None, composing_xep = None, resource = None,
user_nick = None):
# Send the given message to the active tab.
@@ -184,7 +184,7 @@
self.set_session(sess)
# Send and update history
- return conn.send_message(jid, message, keyID, type = type,
+ return conn.send_message(jid, message, keyID, type_ = type_,
chatstate = chatstate, msg_id = msg_id,
composing_xep = composing_xep,
resource = self.resource, user_nick = user_nick,
Modified: branches/osx_newbuildsys/src/message_window.py
===================================================================
--- branches/osx_newbuildsys/src/message_window.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/message_window.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -55,7 +55,7 @@
CLOSE_CTRL_KEY
) = range(5)
- def __init__(self, acct, type, parent_window=None, parent_paned=None):
+ def __init__(self, acct, type_, parent_window=None, parent_paned=None):
# A dictionary of dictionaries
# where _contacts[account][jid] == A MessageControl
self._controls = {}
@@ -63,7 +63,7 @@
# If None, the window is not tied to any specific account
self.account = acct
# If None, the window is not tied to any specific type
- self.type = type
+ self.type_ = type_
# dict { handler id: widget}. Keeps callbacks, which
# lead to cylcular references
self.handlers = {}
@@ -442,9 +442,9 @@
window_mode = gajim.interface.msg_win_mgr.mode
if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE:
# Show the plural form since number of tabs > 1
- if self.type == 'chat':
+ if self.type_ == 'chat':
label = _('Chats')
- elif self.type == 'gc':
+ elif self.type_ == 'gc':
label = _('Group Chats')
else:
label = _('Private Chats')
@@ -514,7 +514,7 @@
close(ctrl)
def on_no(ctrl):
- close(ctrl)
+ return
def on_minimize(ctrl):
if method != self.CLOSE_COMMAND:
@@ -636,7 +636,7 @@
jid = key
try:
return self._controls[acct][jid]
- except:
+ except Exception:
return None
else:
page_num = key
@@ -773,7 +773,7 @@
selection.set(selection.target, 8, str(source_page_num))
def on_tab_label_drag_data_received_cb(self, widget, drag_context, x, y,
- selection, type, time):
+ selection, type_, time):
'''Reorder the tabs according to the drop position'''
source_page_num = int(selection.data)
dest_page_num, to_right = self.get_tab_at_xy(x, y)
@@ -869,13 +869,13 @@
for win in self.windows():
win.change_account_name(old_name, new_name)
- def _new_window(self, acct, type):
+ def _new_window(self, acct, type_):
parent_win = None
parent_paned = None
if self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
parent_win = self.parent_win
parent_paned = self.parent_paned
- win = MessageWindow(acct, type, parent_win, parent_paned)
+ win = MessageWindow(acct, type_, parent_win, parent_paned)
# we track the lifetime of this window
win.window.connect('delete-event', self._on_window_delete)
win.window.connect('destroy', self._on_window_destroy)
@@ -897,14 +897,14 @@
def has_window(self, jid, acct):
return self.get_window(jid, acct) is not None
- def one_window_opened(self, contact=None, acct=None, type=None):
+ def one_window_opened(self, contact=None, acct=None, type_=None):
try:
return \
- self._windows[self._mode_to_key(contact, acct, type)] is not None
+ self._windows[self._mode_to_key(contact, acct, type_)] is not None
except KeyError:
return False
- def _resize_window(self, win, acct, type):
+ def _resize_window(self, win, acct, type_):
'''Resizes window according to config settings'''
if self.mode in (self.ONE_MSG_WINDOW_ALWAYS,
self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER):
@@ -920,10 +920,10 @@
size = (gajim.config.get_per('accounts', acct, 'msgwin-width'),
gajim.config.get_per('accounts', acct, 'msgwin-height'))
elif self.mode in (self.ONE_MSG_WINDOW_NEVER, self.ONE_MSG_WINDOW_PERTYPE):
- if type == message_control.TYPE_PM:
- type = message_control.TYPE_CHAT
- opt_width = type + '-msgwin-width'
- opt_height = type + '-msgwin-height'
+ if type_ == message_control.TYPE_PM:
+ type_ = message_control.TYPE_CHAT
+ opt_width = type_ + '-msgwin-width'
+ opt_height = type_ + '-msgwin-height'
size = (gajim.config.get(opt_width), gajim.config.get(opt_height))
else:
return
@@ -931,7 +931,7 @@
if win.parent_paned:
win.parent_paned.set_position(parent_size[0])
- def _position_window(self, win, acct, type):
+ def _position_window(self, win, acct, type_):
'''Moves window according to config settings'''
if (self.mode in [self.ONE_MSG_WINDOW_NEVER,
self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER]):
@@ -944,14 +944,14 @@
pos = (gajim.config.get_per('accounts', acct, 'msgwin-x-position'),
gajim.config.get_per('accounts', acct, 'msgwin-y-position'))
elif self.mode == self.ONE_MSG_WINDOW_PERTYPE:
- pos = (gajim.config.get(type + '-msgwin-x-position'),
- gajim.config.get(type + '-msgwin-y-position'))
+ pos = (gajim.config.get(type_ + '-msgwin-x-position'),
+ gajim.config.get(type_ + '-msgwin-y-position'))
else:
return
gtkgui_helpers.move_window(win.window, pos[0], pos[1])
- def _mode_to_key(self, contact, acct, type, resource = None):
+ def _mode_to_key(self, contact, acct, type_, resource = None):
if self.mode == self.ONE_MSG_WINDOW_NEVER:
key = acct + contact.jid
if resource:
@@ -964,22 +964,22 @@
elif self.mode == self.ONE_MSG_WINDOW_PERACCT:
return acct
elif self.mode == self.ONE_MSG_WINDOW_PERTYPE:
- return type
+ return type_
- def create_window(self, contact, acct, type, resource = None):
+ def create_window(self, contact, acct, type_, resource = None):
win_acct = None
win_type = None
win_role = None # X11 window role
- win_key = self._mode_to_key(contact, acct, type, resource)
+ win_key = self._mode_to_key(contact, acct, type_, resource)
if self.mode == self.ONE_MSG_WINDOW_PERACCT:
win_acct = acct
win_role = acct
elif self.mode == self.ONE_MSG_WINDOW_PERTYPE:
- win_type = type
- win_role = type
+ win_type = type_
+ win_role = type_
elif self.mode == self.ONE_MSG_WINDOW_NEVER:
- win_type = type
+ win_type = type_
win_role = contact.jid
elif self.mode == self.ONE_MSG_WINDOW_ALWAYS:
win_role = 'messages'
@@ -994,9 +994,9 @@
win.window.set_role(win_role)
# Position and size window based on saved state and window mode
- if not self.one_window_opened(contact, acct, type):
- self._resize_window(win, acct, type)
- self._position_window(win, acct, type)
+ if not self.one_window_opened(contact, acct, type_):
+ self._resize_window(win, acct, type_)
+ self._position_window(win, acct, type_)
self._windows[win_key] = win
return win
@@ -1039,12 +1039,12 @@
return ctrl
return None
- def get_controls(self, type = None, acct = None):
+ def get_controls(self, type_=None, acct=None):
ctrls = []
for c in self.controls():
if acct and c.account != acct:
continue
- if not type or c.type_id == type:
+ if not type_ or c.type_id == type_:
ctrls.append(c)
return ctrls
@@ -1084,15 +1084,15 @@
elif self.mode == self.ONE_MSG_WINDOW_PERACCT:
acct = msg_win.account
elif self.mode == self.ONE_MSG_WINDOW_PERTYPE:
- type = msg_win.type
- pos_x_key = type + '-msgwin-x-position'
- pos_y_key = type + '-msgwin-y-position'
- size_width_key = type + '-msgwin-width'
- size_height_key = type + '-msgwin-height'
+ type_ = msg_win.type_
+ pos_x_key = type_ + '-msgwin-x-position'
+ pos_y_key = type_ + '-msgwin-y-position'
+ size_width_key = type_ + '-msgwin-width'
+ size_height_key = type_ + '-msgwin-height'
elif self.mode == self.ONE_MSG_WINDOW_NEVER:
- type = msg_win.type
- size_width_key = type + '-msgwin-width'
- size_height_key = type + '-msgwin-height'
+ type_ = msg_win.type_
+ size_width_key = type_ + '-msgwin-width'
+ size_height_key = type_ + '-msgwin-height'
elif self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
# Ignore any hpaned width
width = msg_win.notebook.allocation.width
Modified: branches/osx_newbuildsys/src/music_track_listener.py
===================================================================
--- branches/osx_newbuildsys/src/music_track_listener.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/music_track_listener.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -62,7 +62,8 @@
bus.add_signal_receiver(self._mpris_playing_changed_cb, 'StatusChange',
'org.freedesktop.MediaPlayer')
bus.add_signal_receiver(self._player_name_owner_changed,
- 'NameOwnerChanged', 'org.freedesktop.DBus', arg0='org.freedesktop.MediaPlayer')
+ 'NameOwnerChanged', 'org.freedesktop.DBus',
+ arg0='org.freedesktop.MediaPlayer')
## Muine
bus.add_signal_receiver(self._muine_music_track_change_cb, 'SongChanged',
@@ -84,7 +85,8 @@
bus.add_signal_receiver(self._banshee_state_changed_cb,
'StateChanged', 'org.bansheeproject.Banshee.PlayerEngine')
bus.add_signal_receiver(self._player_name_owner_changed,
- 'NameOwnerChanged', 'org.freedesktop.DBus', arg0='org.bansheeproject.Banshee')
+ 'NameOwnerChanged', 'org.freedesktop.DBus',
+ arg0='org.bansheeproject.Banshee')
def _player_name_owner_changed(self, name, old, new):
if not new:
@@ -102,27 +104,10 @@
def _mpris_properties_extract(self, song):
info = MusicTrackInfo()
-
- if 'title' in song:
- info.title = song['title']
- else:
- info.title = ''
-
- if 'album' in song:
- info.album = song['album']
- else:
- info.album = ''
-
- if 'artist' in song:
- info.artist = song['artist']
- else:
- info.artist = ''
-
- if 'length' in song:
- info.duration = int(song['length'])
- else:
- info.duration = 0
-
+ info.title = song.get('title', '')
+ info.album = song.get('album', '')
+ info.artist = song.get('artist', '')
+ info.duration = int(song.get('length', 0))
return info
def _mpris_playing_changed_cb(self, playing):
@@ -169,9 +154,11 @@
def _banshee_state_changed_cb(self, state):
if state == 'playing':
bus = dbus.SessionBus()
- banshee = bus.get_object("org.bansheeproject.Banshee", "/org/bansheeproject/Banshee/PlayerEngine")
+ banshee = bus.get_object('org.bansheeproject.Banshee',
+ '/org/bansheeproject/Banshee/PlayerEngine')
currentTrack = banshee.GetCurrentTrack()
- self._last_playing_music = self._banshee_properties_extract(currentTrack)
+ self._last_playing_music = self._banshee_properties_extract(
+ currentTrack)
self.emit('music-track-changed', self._last_playing_music)
elif state == 'paused':
self.emit('music-track-changed', None)
@@ -239,7 +226,7 @@
if __name__ == '__main__':
def music_track_change_cb(listener, music_track_info):
if music_track_info is None:
- print "Stop!"
+ print 'Stop!'
else:
print music_track_info.title
listener = MusicTrackListener.get()
Modified: branches/osx_newbuildsys/src/network_manager_listener.py
===================================================================
--- branches/osx_newbuildsys/src/network_manager_listener.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/network_manager_listener.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -59,7 +59,7 @@
'org.freedesktop.NetworkManager',
'org.freedesktop.NetworkManager',
'/org/freedesktop/NetworkManager')
- except:
+ except Exception:
pass
# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/notify.py
===================================================================
--- branches/osx_newbuildsys/src/notify.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/notify.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -55,7 +55,7 @@
try:
import osx.growler
osx.growler.init()
-except:
+except Exception:
USER_HAS_GROWL = False
def get_show_in_roster(event, account, contact, session=None):
@@ -321,7 +321,7 @@
'command')
try:
helpers.exec_command(command)
- except:
+ except Exception:
pass
def popup(event_type, jid, account, msg_type='', path_to_image=None,
@@ -408,12 +408,12 @@
self.interface.connect_to_signal('ActionInvoked', self.on_action_invoked)
self.interface.connect_to_signal('NotificationClosed', self.on_closed)
- def on_action_invoked(self, id, reason):
- self.received.append((id, time.time(), reason))
- if id in self.pending:
- notification = self.pending[id]
- notification.on_action_invoked(id, reason)
- del self.pending[id]
+ def on_action_invoked(self, id_, reason):
+ self.received.append((id_, time.time(), reason))
+ if id_ in self.pending:
+ notification = self.pending[id_]
+ notification.on_action_invoked(id_, reason)
+ del self.pending[id_]
if len(self.received) > 20:
curt = time.time()
for rec in self.received:
@@ -421,21 +421,21 @@
if diff > 10:
self.received.remove(rec)
- def on_closed(self, id, reason=None):
- if id in self.pending:
- del self.pending[id]
+ def on_closed(self, id_, reason=None):
+ if id_ in self.pending:
+ del self.pending[id_]
- def add_pending(self, id, object):
+ def add_pending(self, id_, object_):
# Check to make sure that we handle an event immediately if we're adding
# an id that's already been triggered
for rec in self.received:
- if rec[0] == id:
- object.on_action_invoked(id, rec[2])
+ if rec[0] == id_:
+ object_.on_action_invoked(id_, rec[2])
self.received.remove(rec)
return
- if id not in self.pending:
+ if id_ not in self.pending:
# Add it
- self.pending[id] = object
+ self.pending[id_] = object_
else:
# We've triggered an event that has a duplicate ID!
gajim.log.debug('Duplicate ID of notification. Can\'t handle this.')
@@ -561,8 +561,8 @@
reply_handler=self.attach_by_id,
error_handler=self.notify_another_way)
- def attach_by_id(self, id):
- self.id = id
+ def attach_by_id(self, id_):
+ self.id = id_
notification_response_manager.attach_to_interface()
notification_response_manager.add_pending(self.id, self)
@@ -570,10 +570,10 @@
gajim.log.debug(str(e))
gajim.log.debug('Need to implement a new way of falling back')
- def on_action_invoked(self, id, reason):
+ def on_action_invoked(self, id_, reason):
if self.notif is None:
return
- self.notif.CloseNotification(dbus.UInt32(id))
+ self.notif.CloseNotification(dbus.UInt32(id_))
self.notif = None
gajim.interface.handle_event(self.account, self.jid, self.msg_type)
Modified: branches/osx_newbuildsys/src/osx/growl/Growl.py
===================================================================
--- branches/osx_newbuildsys/src/osx/growl/Growl.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/osx/growl/Growl.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -12,7 +12,7 @@
try:
import _growl
-except:
+except Exception:
_growl = False
import types
import struct
@@ -70,10 +70,7 @@
self.socket.sendto(data, (self.hostname, GROWL_UDP_PORT))
def PostNotification(self, userInfo):
- if GROWL_NOTIFICATION_PRIORITY in userInfo:
- priority = userInfo[GROWL_NOTIFICATION_PRIORITY]
- else:
- priority = 0
+ priority = userInfo.get(GROWL_NOTIFICATION_PRIORITY, 0)
if GROWL_NOTIFICATION_STICKY in userInfo:
sticky = userInfo[GROWL_NOTIFICATION_STICKY]
else:
Modified: branches/osx_newbuildsys/src/osx/growler.py
===================================================================
--- branches/osx_newbuildsys/src/osx/growler.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/osx/growler.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -23,7 +23,7 @@
def init():
global growler, notifications
- icon = file(os.path.join(gajim.DATA_DIR, "pixmaps", "gajim.icns"), "r")
+ icon = open(os.path.join(gajim.DATA_DIR, "pixmaps", "gajim.icns"), "r")
growler = GrowlNotifier(applicationName = "Gajim",
notifications = notifications,
applicationIcon = icon.read(),
@@ -46,7 +46,7 @@
path_to_image = os.path.abspath(
os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
'chat_msg_recv.png')) # img to display
- icon = file(path_to_image, "r")
+ icon = open(path_to_image, "r")
context = [account, jid, msg_type]
growler.notify(event_type, title, text, icon.read(), False, None,
context)
Modified: branches/osx_newbuildsys/src/remote_control.py
===================================================================
--- branches/osx_newbuildsys/src/remote_control.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/remote_control.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -271,7 +271,7 @@
connected_account, contact = self._get_account_and_contact(account, jid)
if connected_account:
- if file_path[:7] == 'file://':
+ if file_path.startswith('file://'):
file_path=file_path[7:]
if os.path.isfile(file_path): # is it file?
gajim.interface.instances['file_transfers'].send_file(
@@ -279,7 +279,7 @@
return DBUS_BOOLEAN(True)
return DBUS_BOOLEAN(False)
- def _send_message(self, jid, message, keyID, account, type = 'chat',
+ def _send_message(self, jid, message, keyID, account, type_ = 'chat',
subject = None):
'''can be called from send_chat_message (default when send_message)
or send_single_message'''
@@ -291,7 +291,7 @@
connected_account, contact = self._get_account_and_contact(account, jid)
if connected_account:
connection = gajim.connections[connected_account]
- connection.send_message(jid, message, keyID, type, subject)
+ connection.send_message(jid, message, keyID, type_, subject)
return DBUS_BOOLEAN(True)
return DBUS_BOOLEAN(False)
@@ -332,7 +332,7 @@
jid = self._get_real_jid(jid, account)
try:
jid = helpers.parse_jid(jid)
- except:
+ except Exception:
# Jid is not conform, ignore it
return DBUS_BOOLEAN(False)
Modified: branches/osx_newbuildsys/src/roster_window.py
===================================================================
--- branches/osx_newbuildsys/src/roster_window.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/roster_window.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -1568,15 +1568,9 @@
cshow = {'chat':0, 'online': 1, 'away': 2, 'xa': 3, 'dnd': 4,
'invisible': 5, 'offline': 6, 'not in roster': 7, 'error': 8}
s = self.get_show(lcontact1)
- if s in cshow:
- show1 = cshow[s]
- else:
- show1 = 9
+ show1 = cshow.get(s, 9)
s = self.get_show(lcontact2)
- if s in cshow:
- show2 = cshow[s]
- else:
- show2 = 9
+ show2 = cshow.get(s, 9)
removing1 = False
removing2 = False
if show1 == 6 and jid1 in gajim.to_be_removed[account1]:
@@ -1708,7 +1702,7 @@
if not 'com.google.code.Awn' in bus.list_names():
# Awn is not installed
return
- except:
+ except Exception:
return
iconset = gajim.config.get('iconset')
prefix = os.path.join(helpers.get_iconset_path(iconset), '32x32')
@@ -2080,9 +2074,9 @@
for jid in gajim.contacts.get_jid_list(account):
lcontact = gajim.contacts.get_contacts(account, jid)
ctrl = gajim.interface.msg_win_mgr.get_gc_control(jid, account)
- for contact in [c for c in lcontact if ((c.show != 'offline' or
- c.is_transport()) and not ctrl)]:
- self.chg_contact_status(contact, 'offline', '', account)
+ for contact in lcontact:
+ if (contact.show != 'offline' or contact.is_transport()) and not ctrl:
+ self.chg_contact_status(contact, 'offline', '', account)
self.actions_menu_needs_rebuild = True
self.update_status_combobox()
# Force the rebuild now since the on_activates on the menu itself does
@@ -2173,7 +2167,7 @@
def close_all_from_dict(self, dic):
'''close all the windows in the given dictionary'''
for w in dic.values():
- if type(w) == type({}):
+ if isinstance(w, dict):
self.close_all_from_dict(w)
else:
w.window.destroy()
@@ -2391,7 +2385,7 @@
titer = None
try:
titer = model.get_iter(row)
- except:
+ except Exception:
self.tooltip.hide_tooltip()
return
if model[titer][C_TYPE] in ('contact', 'self_contact'):
@@ -2836,7 +2830,7 @@
contact = None):
if contact is None:
dialogs.SingleMessageWindow(account, action='send')
- elif type(contact) == type([]):
+ elif isinstance(contact, list):
dialogs.SingleMessageWindow(account, contact, 'send')
else:
jid = contact.jid
@@ -4252,7 +4246,15 @@
return
jid = model[titer][C_JID].decode('utf-8')
account = model[titer][C_ACCOUNT].decode('utf-8')
- color = gajim.config.get_per('themes', theme, 'contacttextcolor')
+ color = None
+ if type_ == 'groupchat':
+ ctrl = gajim.interface.minimized_controls[account].get(jid, None)
+ if ctrl and ctrl.attention_flag:
+ color = gajim.config.get_per('themes', theme,
+ 'state_muc_directed_msg_color')
+ renderer.set_property('foreground', 'red')
+ if not color:
+ color = gajim.config.get_per('themes', theme, 'contacttextcolor')
if color:
renderer.set_property('foreground', color)
else:
@@ -4569,10 +4571,8 @@
connected_accounts_with_private_storage = 0
- accounts_list = gajim.contacts.get_accounts()
- accounts_list.sort()
-
# items that get shown whether an account is zeroconf or not
+ accounts_list = sorted(gajim.contacts.get_accounts())
if connected_accounts > 1: # 2 or more accounts? make submenus
new_chat_sub_menu = gtk.Menu()
@@ -4689,9 +4689,9 @@
if connected_accounts == 0:
# no connected accounts, make the menuitems insensitive
- for item in [new_chat_menuitem, join_gc_menuitem,\
+ for item in (new_chat_menuitem, join_gc_menuitem,\
add_new_contact_menuitem, service_disco_menuitem,\
- single_message_menuitem]:
+ single_message_menuitem):
item.set_sensitive(False)
else: # we have one or more connected accounts
for item in (new_chat_menuitem, join_gc_menuitem,
@@ -4920,9 +4920,9 @@
# make some items insensitive if account is offline
if gajim.connections[account].connected < 2:
- for widget in [add_contact_menuitem, service_discovery_menuitem,
+ for widget in (add_contact_menuitem, service_discovery_menuitem,
join_group_chat_menuitem, execute_command_menuitem, pep_menuitem,
- start_chat_menuitem]:
+ start_chat_menuitem):
widget.set_sensitive(False)
else:
xml = gtkgui_helpers.get_glade('zeroconf_context_menu.glade')
@@ -5086,7 +5086,7 @@
send_custom_status_menuitem.set_submenu(status_menuitems)
iconset = gajim.config.get('iconset')
path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
- for s in ['online', 'chat', 'away', 'xa', 'dnd', 'offline']:
+ for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'):
# icon MUST be different instance for every item
state_images = gtkgui_helpers.load_iconset(path)
status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s))
@@ -5283,8 +5283,8 @@
# Unsensitive many items when account is offline
if gajim.connections[account].connected < 2:
- for widget in [start_chat_menuitem, rename_menuitem,
- edit_groups_menuitem, send_file_menuitem]:
+ for widget in (start_chat_menuitem, rename_menuitem,
+ edit_groups_menuitem, send_file_menuitem):
widget.set_sensitive(False)
event_button = gtkgui_helpers.get_possible_button_event(event)
@@ -5386,7 +5386,7 @@
send_custom_status_menuitem.set_submenu(status_menuitems)
iconset = gajim.config.get('iconset')
path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
- for s in ['online', 'chat', 'away', 'xa', 'dnd', 'offline']:
+ for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'):
# icon MUST be different instance for every item
state_images = gtkgui_helpers.load_iconset(path)
status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s))
@@ -5490,11 +5490,11 @@
# Unsensitive many items when account is offline
if gajim.connections[account].connected < 2:
- for widget in [start_chat_menuitem, send_single_message_menuitem,
+ for widget in (start_chat_menuitem, send_single_message_menuitem,
rename_menuitem, edit_groups_menuitem, send_file_menuitem,
subscription_menuitem, add_to_roster_menuitem,
remove_from_roster_menuitem, execute_command_menuitem,
- send_custom_status_menuitem]:
+ send_custom_status_menuitem):
widget.set_sensitive(False)
if gajim.connections[account] and gajim.connections[account].\
@@ -5678,7 +5678,7 @@
send_custom_status_menuitem.set_submenu(status_menuitems)
iconset = gajim.config.get('iconset')
path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
- for s in ['online', 'chat', 'away', 'xa', 'dnd', 'offline']:
+ for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'):
# icon MUST be different instance for every item
state_images = gtkgui_helpers.load_iconset(path)
status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s))
Modified: branches/osx_newbuildsys/src/session.py
===================================================================
--- branches/osx_newbuildsys/src/session.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/session.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -38,31 +38,32 @@
import negotiation
class ChatControlSession(stanza_session.EncryptedStanzaSession):
- def __init__(self, conn, jid, thread_id, type='chat'):
+ def __init__(self, conn, jid, thread_id, type_='chat'):
stanza_session.EncryptedStanzaSession.__init__(self, conn, jid, thread_id,
- type='chat')
+ type_='chat')
self.control = None
- def acknowledge_termination(self):
+ def detach_from_control(self):
if self.control:
+ self.control.no_autonegotiation = False
self.control.set_session(None)
+ def acknowledge_termination(self):
+ self.detach_from_control()
stanza_session.EncryptedStanzaSession.acknowledge_termination(self)
def terminate(self):
stanza_session.EncryptedStanzaSession.terminate(self)
+ self.detach_from_control()
- if self.control:
- self.control.set_session(None)
-
# extracts chatstate from a <message/> stanza
def get_chatstate(self, msg, msgtxt):
composing_xep = None
chatstate = None
# chatstates - look for chatstate tags in a message if not delayed
- delayed = msg.getTag('x', namespace=common.xmpp.NS_DELAY) != None
+ delayed = msg.getTag('x', namespace=common.xmpp.NS_DELAY) is not None
if not delayed:
composing_xep = False
children = msg.getChildren()
Modified: branches/osx_newbuildsys/src/systray.py
===================================================================
--- branches/osx_newbuildsys/src/systray.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/systray.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -43,10 +43,10 @@
try:
import egg.trayicon as trayicon # gnomepythonextras trayicon
-except:
+except Exception:
try:
import trayicon # our trayicon
- except:
+ except Exception:
gajim.log.debug('No trayicon module available')
HAS_SYSTRAY_CAPABILITIES = False
@@ -234,8 +234,7 @@
account_menu_for_single_message)
self.popup_menus.append(account_menu_for_single_message)
- accounts_list = gajim.contacts.get_accounts()
- accounts_list.sort()
+ accounts_list = sorted(gajim.contacts.get_accounts())
for account in accounts_list:
if gajim.connections[account].is_zeroconf:
continue
Modified: branches/osx_newbuildsys/src/tooltips.py
===================================================================
--- branches/osx_newbuildsys/src/tooltips.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/tooltips.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -460,8 +460,7 @@
iconset = 'dcraven'
file_path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
- contact_keys = contacts_dict.keys()
- contact_keys.sort()
+ contact_keys = sorted(contacts_dict.keys())
contact_keys.reverse()
for priority in contact_keys:
for contact in contacts_dict[priority]:
@@ -583,8 +582,7 @@
'''
if 'mood' in contact.mood:
mood = contact.mood['mood'].strip()
- if mood in MOODS:
- mood = MOODS[mood]
+ mood = MOODS.get(mood, mood)
mood = gobject.markup_escape_text(mood)
mood_string = _('Mood:') + ' <b>%s</b>' % mood
if 'text' in contact.mood \
@@ -679,9 +677,7 @@
properties.append((_('Type: '), type))
properties.append((actor, gobject.markup_escape_text(name)))
- transfered_len = 0
- if 'received-len' in file_props:
- transfered_len = file_props['received-len']
+ transfered_len = file_props.get('received-len', 0)
properties.append((_('Transferred: '), helpers.convert_bytes(transfered_len)))
status = ''
if 'started' not in file_props or not file_props['started']:
Modified: branches/osx_newbuildsys/src/vcard.py
===================================================================
--- branches/osx_newbuildsys/src/vcard.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/src/vcard.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -58,7 +58,7 @@
avatar_encoded = img_encoded
try:
img_decoded = base64.decodestring(img_encoded)
- except:
+ except Exception:
pass
if img_decoded:
if 'TYPE' in photo:
Modified: branches/osx_newbuildsys/test/lib/mock.py
===================================================================
--- branches/osx_newbuildsys/test/lib/mock.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/test/lib/mock.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -116,7 +116,7 @@
raise a MockInterfaceError.
Based on the Python 2.3.3 Reference Manual section 5.3.4: Calls.
"""
- if self.realClassMethods == None:
+ if self.realClassMethods is None:
return
if name not in self.realClassMethods:
raise MockInterfaceError("Calling mock method '%s' that was not found in the original class" % name)
@@ -228,8 +228,7 @@
for p in self.params:
s = s + sep + repr(p)
sep = ', '
- items = self.kwparams.items()
- items.sort()
+ items = sorted(self.kwparams.items())
for k,v in items:
s = s + sep + k + '=' + repr(v)
sep = ', '
@@ -411,7 +410,7 @@
def MATCHES(regex, *args, **kwargs):
compiled_regex = re.compile(regex, *args, **kwargs)
def testFn(param):
- return compiled_regex.match(param) != None
+ return compiled_regex.match(param) is not None
return testFn
def SEQ(*sequence):
Modified: branches/osx_newbuildsys/test/lib/mocks.py
===================================================================
--- branches/osx_newbuildsys/test/lib/mocks.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/test/lib/mocks.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -122,12 +122,12 @@
import random
class MockSession(Mock):
- def __init__(self, conn, jid, thread_id, type):
+ def __init__(self, conn, jid, thread_id, type_):
Mock.__init__(self)
self.conn = conn
self.jid = jid
- self.type = type
+ self.type = type_
self.thread_id = thread_id
if not self.thread_id:
Modified: branches/osx_newbuildsys/test/runtests.py
===================================================================
--- branches/osx_newbuildsys/test/runtests.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/test/runtests.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -23,7 +23,7 @@
elif o in ('-v', '--verbose'):
try:
verbose = int(a)
- except:
+ except Exception:
print 'verbose must be a number >= 0'
sys.exit(2)
Modified: branches/osx_newbuildsys/test/test_misc_interface.py
===================================================================
--- branches/osx_newbuildsys/test/test_misc_interface.py 2008-10-13 08:09:29 UTC (rev 10533)
+++ branches/osx_newbuildsys/test/test_misc_interface.py 2008-10-14 15:33:20 UTC (rev 10534)
@@ -15,11 +15,11 @@
class TestMiscInterface(unittest.TestCase):
def test_links_regexp_entire(self):
- def assert_matches_all(str):
- m = gajim.interface.basic_pattern_re.match(str)
+ def assert_matches_all(str_):
+ m = gajim.interface.basic_pattern_re.match(str_)
# the match should equal the string
- str_span = (0, len(str))
+ str_span = (0, len(str_))
self.assertEqual(m.span(), str_span)
# these entire strings should be parsed as links
1
0
Author: jim++
Date: 2008-10-13 10:09:29 +0200 (Mon, 13 Oct 2008)
New Revision: 10533
Modified:
trunk/src/conversation_textview.py
Log:
Changing receipt not received warning timeout from 2 to 4 seconds, not everybody has a
good connection.
Modified: trunk/src/conversation_textview.py
===================================================================
--- trunk/src/conversation_textview.py 2008-10-13 08:01:22 UTC (rev 10532)
+++ trunk/src/conversation_textview.py 2008-10-13 08:09:29 UTC (rev 10533)
@@ -439,7 +439,7 @@
self.xep0184_shown[id_] = SHOWN
return False
- gobject.timeout_add_seconds(2, show_it)
+ gobject.timeout_add_seconds(4, show_it)
buffer.end_user_action()
1
0