Author: asterix
Date: 2008-12-03 21:45:26 +0100 (Wed, 03 Dec 2008)
New Revision: 10760
Modified:
trunk/src/chat_control.py
trunk/src/tooltips.py
Log:
fix some typo. Fixes #4545
Modified: trunk/src/chat_control.py
===================================================================
--- trunk/src/chat_control.py 2008-12-03 19:56:37 UTC (rev 10759)
+++ trunk/src/chat_control.py 2008-12-03 20:45:26 UTC (rev 10760)
@@ -405,11 +405,11 @@
widget.disconnect(id_)
del self.handlers[id_]
break
- if found:
def connect_style_event(self, widget, set_fg = False, set_bg = False):
self.disconnect_style_event(widget)
- id_ = widget.connect('style-set', self._on_style_set_event, set_fg, set_bg)
+ id_ = widget.connect('style-set', self._on_style_set_event, set_fg,
+ set_bg)
self.handlers[id_] = widget
def _on_style_set_event(self, widget, style, *opts):
Modified: trunk/src/tooltips.py
===================================================================
--- trunk/src/tooltips.py 2008-12-03 19:56:37 UTC (rev 10759)
+++ trunk/src/tooltips.py 2008-12-03 20:45:26 UTC (rev 10760)
@@ -342,7 +342,7 @@
file_ = helpers.get_avatar_path(os.path.join(gajim.AVATAR_PATH, puny_room,
puny_name))
if file_:
- _self.avatar_image.set_from_file(file_)
+ self.avatar_image.set_from_file(file_)
pix = self.avatar_image.get_pixbuf()
pix = gtkgui_helpers.get_scaled_pixbuf(pix, 'tooltip')
self.avatar_image.set_from_pixbuf(pix)
1
0
Author: asterix
Date: 2008-12-03 20:56:37 +0100 (Wed, 03 Dec 2008)
New Revision: 10759
Modified:
trunk/src/common/connection_handlers.py
trunk/src/disco.py
Log:
[thorstenp] fix access to members before definition
Modified: trunk/src/common/connection_handlers.py
===================================================================
--- trunk/src/common/connection_handlers.py 2008-12-03 17:38:16 UTC (rev 10758)
+++ trunk/src/common/connection_handlers.py 2008-12-03 19:56:37 UTC (rev 10759)
@@ -74,6 +74,7 @@
class ConnectionBytestream:
def __init__(self):
self.files_props = {}
+ self.awaiting_xmpp_ping_id = None
def is_transfer_stopped(self, file_props):
if 'error' in file_props and file_props['error'] != 0:
@@ -1387,6 +1388,7 @@
self.version_ids = []
# ID of urn:xmpp:ping requests
self.awaiting_xmpp_ping_id = None
+ self.continue_connect_info = None
try:
idle.init()
Modified: trunk/src/disco.py
===================================================================
--- trunk/src/disco.py 2008-12-03 17:38:16 UTC (rev 10758)
+++ trunk/src/disco.py 2008-12-03 19:56:37 UTC (rev 10759)
@@ -432,6 +432,7 @@
self.browser = None
self.children = []
self.dying = False
+ self.node = None
# Check connection
if gajim.connections[account].connected < 2:
1
0
03 Dec '08
Author: asterix
Date: 2008-12-03 18:38:16 +0100 (Wed, 03 Dec 2008)
New Revision: 10758
Modified:
trunk/src/chat_control.py
trunk/src/common/connection.py
trunk/src/common/helpers.py
trunk/src/common/xmpp/dispatcher_nb.py
trunk/src/conversation_textview.py
trunk/src/htmltextview.py
trunk/src/profile_window.py
trunk/src/roster_window.py
trunk/src/tooltips.py
Log:
[thorstenp] fix possible undefined loop variables
Modified: trunk/src/chat_control.py
===================================================================
--- trunk/src/chat_control.py 2008-12-03 17:16:04 UTC (rev 10757)
+++ trunk/src/chat_control.py 2008-12-03 17:38:16 UTC (rev 10758)
@@ -400,14 +400,12 @@
def disconnect_style_event(self, widget):
# Try to find the event_id
- found = False
- for id_ in self.handlers:
+ for id_ in self.handlers.keys():
if self.handlers[id_] == widget:
- found = True
+ widget.disconnect(id_)
+ del self.handlers[id_]
break
if found:
- widget.disconnect(id_)
- del self.handlers[id_]
def connect_style_event(self, widget, set_fg = False, set_bg = False):
self.disconnect_style_event(widget)
Modified: trunk/src/common/connection.py
===================================================================
--- trunk/src/common/connection.py 2008-12-03 17:16:04 UTC (rev 10757)
+++ trunk/src/common/connection.py 2008-12-03 17:38:16 UTC (rev 10758)
@@ -35,6 +35,7 @@
import os
import random
import socket
+import operator
import time
import locale
@@ -379,30 +380,31 @@
self.dispatch('STANZA_SENT', unicode(data))
def _select_next_host(self, hosts):
- '''Chooses best 'real' host basing on the SRV priority and weight data;
- more info in RFC2782'''
- hosts_best_prio = []
- best_prio = 65535
- sum_weight = 0
- for h in hosts:
- if h['prio'] < best_prio:
- hosts_best_prio = [h]
- best_prio = h['prio']
- sum_weight = h['weight']
- elif h['prio'] == best_prio:
- hosts_best_prio.append(h)
- sum_weight += h['weight']
- if len(hosts_best_prio) == 1:
- return hosts_best_prio[0]
- r = random.randint(0, sum_weight)
- min_w = sum_weight
- # We return the one for which has the minimum weight and weight >= r
- for h in hosts_best_prio:
- if h['weight'] >= r:
- if h['weight'] <= min_w:
- min_w = h['weight']
- return h
+ '''Selects the next host according to RFC2782 p.3 based on it's
+ priority. Chooses between hosts with the same priority randomly,
+ where the probability of being selected is proportional to the weight
+ of the host.'''
+ hosts_by_prio = sorted(hosts, key=operator.itemgetter('prio'))
+
+ try:
+ lowest_prio = hosts_by_prio[0]['prio']
+ except IndexError:
+ raise ValueError("No hosts to choose from!")
+
+ hosts_lowest_prio = [h for h in hosts_by_prio if h['prio'] == lowest_prio]
+
+ if len(hosts_lowest_prio) == 1:
+ return hosts_lowest_prio[0]
+ else:
+ rndint = random.randint(0, sum(h['weight'] for h in hosts_lowest_prio))
+ weightsum = 0
+ for host in sorted(hosts_lowest_prio, key=operator.itemgetter(
+ 'weight')):
+ weightsum += host['weight']
+ if weightsum >= rndint:
+ return host
+
def connect(self, data = None):
''' Start a connection to the Jabber server.
Returns connection, and connection type ('tls', 'ssl', 'tcp', '')
Modified: trunk/src/common/helpers.py
===================================================================
--- trunk/src/common/helpers.py 2008-12-03 17:16:04 UTC (rev 10757)
+++ trunk/src/common/helpers.py 2008-12-03 17:38:16 UTC (rev 10758)
@@ -410,31 +410,23 @@
return _('has closed the chat window or tab')
return ''
-def is_in_path(name_of_command, return_abs_path = False):
- # if return_abs_path is True absolute path will be returned
- # for name_of_command
- # on failures False is returned
- is_in_dir = False
- found_in_which_dir = None
- path = os.getenv('PATH').split(os.pathsep)
- for path_to_directory in path:
+def is_in_path(command, return_abs_path=False):
+ '''Returns True if 'command' is found in one of the directories in the
+ user's path. If 'return_abs_path' is True, returns the absolute path of
+ the first found command instead. Returns False otherwise and on errors.'''
+
+ for directory in os.getenv('PATH').split(os.pathsep):
try:
- contents = os.listdir(path_to_directory)
- except OSError: # user can have something in PATH that is not a dir
+ if command in os.listdir(directory):
+ if return_abs_path:
+ return os.path.join(directory, command)
+ else:
+ return True
+ except OSError:
+ # If the user has non directories in his path
pass
- else:
- is_in_dir = name_of_command in contents
- if is_in_dir:
- if return_abs_path:
- found_in_which_dir = path_to_directory
- break
+ return False
- if found_in_which_dir:
- abs_path = os.path.join(path_to_directory, name_of_command)
- return abs_path
- else:
- return is_in_dir
-
def exec_command(command):
subprocess.Popen(command, shell = True)
Modified: trunk/src/common/xmpp/dispatcher_nb.py
===================================================================
--- trunk/src/common/xmpp/dispatcher_nb.py 2008-12-03 17:16:04 UTC (rev 10757)
+++ trunk/src/common/xmpp/dispatcher_nb.py 2008-12-03 17:38:16 UTC (rev 10758)
@@ -227,14 +227,11 @@
if typ+ns not in self.handlers[xmlns][name]:
return
for pack in self.handlers[xmlns][name][typ+ns]:
- if handler==pack['func']:
- break
- else:
- pack=None
- try:
- self.handlers[xmlns][name][typ+ns].remove(pack)
- except ValueError:
- pass
+ if pack['func'] == handler:
+ try:
+ self.handlers[xmlns][name][typ+ns].remove(pack)
+ except ValueError:
+ pass
def RegisterDefaultHandler(self,handler):
''' Specify the handler that will be used if no NodeProcessed exception were raised.
Modified: trunk/src/conversation_textview.py
===================================================================
--- trunk/src/conversation_textview.py 2008-12-03 17:16:04 UTC (rev 10757)
+++ trunk/src/conversation_textview.py 2008-12-03 17:38:16 UTC (rev 10758)
@@ -211,7 +211,7 @@
self.account = account
- self.change_cursor = None
+ self.change_cursor = False
self.last_time_printout = 0
font = pango.FontDescription(gajim.config.get('conversation_font'))
@@ -618,7 +618,7 @@
if self.change_cursor:
self.tv.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(
gtk.gdk.Cursor(gtk.gdk.XTERM))
- self.change_cursor = None
+ self.change_cursor = False
tag_table = self.tv.get_buffer().get_tag_table()
over_line = False
xep0184_warning = False
@@ -627,7 +627,7 @@
tag_table.lookup('xmpp'), tag_table.lookup('sth_at_sth')):
self.tv.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(
gtk.gdk.Cursor(gtk.gdk.HAND2))
- self.change_cursor = tag
+ self.change_cursor = True
elif tag == tag_table.lookup('focus-out-line'):
over_line = True
elif tag == tag_table.lookup('xep0184-warning'):
@@ -642,14 +642,13 @@
self.show_line_tooltip)
self.tv.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(
gtk.gdk.Cursor(gtk.gdk.LEFT_PTR))
- self.change_cursor = tag
+ self.change_cursor = True
if xep0184_warning and not self.xep0184_warning_tooltip.win:
- self.xep0184_warning_tooltip.timeout = \
- gobject.timeout_add(500,
+ self.xep0184_warning_tooltip.timeout = gobject.timeout_add(500,
self.show_xep0184_warning_tooltip)
self.tv.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(
gtk.gdk.Cursor(gtk.gdk.LEFT_PTR))
- self.change_cursor = tag
+ self.change_cursor = True
def clear(self, tv = None):
'''clear text in the textview'''
Modified: trunk/src/htmltextview.py
===================================================================
--- trunk/src/htmltextview.py 2008-12-03 17:16:04 UTC (rev 10757)
+++ trunk/src/htmltextview.py 2008-12-03 17:38:16 UTC (rev 10758)
@@ -967,21 +967,17 @@
x, y, _ = widget.window.get_pointer()
x, y = widget.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, x, y)
tags = widget.get_iter_at_location(x, y).get_tags()
- is_over_anchor = False
- for tag in tags:
- if getattr(tag, 'is_anchor', False):
- is_over_anchor = True
- break
+ anchor_tags = [tag for tag in tags if getattr(tag, 'is_anchor', False)]
if self.tooltip.timeout != 0:
# Check if we should hide the line tooltip
- if not is_over_anchor:
+ if not anchor_tags:
self.tooltip.hide_tooltip()
- if not self._changed_cursor and is_over_anchor:
+ if not self._changed_cursor and anchor_tags:
window = widget.get_window(gtk.TEXT_WINDOW_TEXT)
window.set_cursor(gtk.gdk.Cursor(gtk.gdk.HAND2))
self._changed_cursor = True
- self.tooltip.timeout = gobject.timeout_add(500, self.show_tooltip, tag)
- elif self._changed_cursor and not is_over_anchor:
+ self.tooltip.timeout = gobject.timeout_add(500, self.show_tooltip, anchor_tags[0])
+ elif self._changed_cursor and not anchor_tags:
window = widget.get_window(gtk.TEXT_WINDOW_TEXT)
window.set_cursor(gtk.gdk.Cursor(gtk.gdk.XTERM))
self._changed_cursor = False
Modified: trunk/src/profile_window.py
===================================================================
--- trunk/src/profile_window.py 2008-12-03 17:16:04 UTC (rev 10757)
+++ trunk/src/profile_window.py 2008-12-03 17:38:16 UTC (rev 10758)
@@ -266,10 +266,8 @@
found = False
for e in loc[entries[0]]:
if entries[1] in e:
- found = True
+ e[entries[2]] = txt
break
- if found:
- e[entries[2]] = txt
else:
loc[entries[0]].append({entries[1]: '', entries[2]: txt})
return vcard_
Modified: trunk/src/roster_window.py
===================================================================
--- trunk/src/roster_window.py 2008-12-03 17:16:04 UTC (rev 10757)
+++ trunk/src/roster_window.py 2008-12-03 17:38:16 UTC (rev 10758)
@@ -2512,7 +2512,7 @@
_('You must read them before removing this transport.'))
return
if len(list_) == 1:
- pritext = _('Transport "%s" will be removed') % contact.jid
+ pritext = _('Transport "%s" will be removed') % list_[0][0].jid
sectext = _('You will no longer be able to send and receive messages '
'from contacts using this transport.')
else:
@@ -2564,12 +2564,12 @@
'value' : group, 'child': [u'message', u'iq', u'presence-out']}
gajim.connections[account].blocked_list.append(new_rule)
for account in accounts:
- gajim.connections[account].set_privacy_list(
- 'block', gajim.connections[account].blocked_list)
- if len(gajim.connections[account].blocked_list) == 1:
- gajim.connections[account].set_active_list('block')
- gajim.connections[account].set_default_list('block')
- gajim.connections[account].get_privacy_list('block')
+ connection = gajim.connections[account]
+ connection.set_privacy_list('block', connection.blocked_list)
+ if len(connection.blocked_list) == 1:
+ connection.set_active_list('block')
+ connection.set_default_list('block')
+ connection.get_privacy_list('block')
self.get_status_message('offline', on_continue)
Modified: trunk/src/tooltips.py
===================================================================
--- trunk/src/tooltips.py 2008-12-03 17:16:04 UTC (rev 10757)
+++ trunk/src/tooltips.py 2008-12-03 17:38:16 UTC (rev 10758)
@@ -463,13 +463,13 @@
contact_keys = sorted(contacts_dict.keys())
contact_keys.reverse()
for priority in contact_keys:
- for contact in contacts_dict[priority]:
- status_line = self.get_status_info(contact.resource,
- contact.priority, contact.show, contact.status)
+ for acontact in contacts_dict[priority]:
+ status_line = self.get_status_info(acontact.resource,
+ acontact.priority, acontact.show, acontact.status)
- icon_name = self._get_icon_name_for_tooltip(contact)
+ icon_name = self._get_icon_name_for_tooltip(acontact)
self.add_status_row(file_path, icon_name, status_line,
- contact.last_status_time)
+ acontact.last_status_time)
properties.append((self.table, None))
else: # only one resource
1
0
[commit-gajim] r10757 - in trunk/src: . common common/xmpp common/zeroconf
by asterix＠gajim.org 03 Dec '08
by asterix＠gajim.org 03 Dec '08
03 Dec '08
Author: asterix
Date: 2008-12-03 18:16:04 +0100 (Wed, 03 Dec 2008)
New Revision: 10757
Modified:
trunk/src/advanced.py
trunk/src/cell_renderer_image.py
trunk/src/chat_control.py
trunk/src/common/caps.py
trunk/src/common/config.py
trunk/src/common/connection.py
trunk/src/common/connection_handlers.py
trunk/src/common/helpers.py
trunk/src/common/logger.py
trunk/src/common/pubsub.py
trunk/src/common/stanza_session.py
trunk/src/common/xmpp/auth.py
trunk/src/common/xmpp/auth_nb.py
trunk/src/common/xmpp/browser.py
trunk/src/common/xmpp/commands.py
trunk/src/common/xmpp/dispatcher.py
trunk/src/common/xmpp/dispatcher_nb.py
trunk/src/common/xmpp/features.py
trunk/src/common/xmpp/features_nb.py
trunk/src/common/xmpp/protocol.py
trunk/src/common/zeroconf/client_zeroconf.py
trunk/src/common/zeroconf/connection_handlers_zeroconf.py
trunk/src/common/zeroconf/zeroconf_bonjour.py
trunk/src/config.py
trunk/src/conversation_textview.py
trunk/src/dataforms_widget.py
trunk/src/dialogs.py
trunk/src/disco.py
trunk/src/features_window.py
trunk/src/filetransfers_window.py
trunk/src/gajim-remote.py
trunk/src/gajim.py
trunk/src/gajim_themes_window.py
trunk/src/groupchat_control.py
trunk/src/groups.py
trunk/src/gtkgui_helpers.py
trunk/src/htmltextview.py
trunk/src/ipython_view.py
trunk/src/message_textview.py
trunk/src/message_window.py
trunk/src/search_window.py
trunk/src/tooltips.py
trunk/src/vcard.py
Log:
[thorstenp] fix redefined builtins
Modified: trunk/src/advanced.py
===================================================================
--- trunk/src/advanced.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/advanced.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -162,10 +162,10 @@
return path
def on_advanced_treeview_selection_changed(self, treeselection):
- model, iter = treeselection.get_selected()
+ model, iter_ = treeselection.get_selected()
# Check for GtkTreeIter
- if iter:
- opt_path = self.get_option_path(model, iter)
+ if iter_:
+ opt_path = self.get_option_path(model, iter_)
# Get text from first column in this row
desc = None
if len(opt_path) == 3:
Modified: trunk/src/cell_renderer_image.py
===================================================================
--- trunk/src/cell_renderer_image.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/cell_renderer_image.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -60,13 +60,13 @@
if image.get_storage_type() != gtk.IMAGE_ANIMATION:
return
self.redraw = 0
- iter = self.iters[image]
- iter.advance()
+ iter_ = self.iters[image]
+ iter_.advance()
model = tree.get_model()
if model:
model.foreach(self.func, (image, tree))
if self.redraw:
- gobject.timeout_add(iter.get_delay_time(),
+ gobject.timeout_add(iter_.get_delay_time(),
self.animation_timeout, tree, image)
elif image in self.iters:
del self.iters[image]
@@ -92,9 +92,9 @@
if not isinstance(widget, gtk.TreeView):
return
animation = self.image.get_animation()
- iter = animation.get_iter()
- self.iters[self.image] = iter
- gobject.timeout_add(iter.get_delay_time(),
+ iter_ = animation.get_iter()
+ self.iters[self.image] = iter_
+ gobject.timeout_add(iter_.get_delay_time(),
self.animation_timeout, widget, self.image)
pix = self.iters[self.image].get_pixbuf()
Modified: trunk/src/chat_control.py
===================================================================
--- trunk/src/chat_control.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/chat_control.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -153,20 +153,20 @@
contact, acct, resource = resource)
widget = self.xml.get_widget('history_button')
- id = widget.connect('clicked', self._on_history_menuitem_activate)
- self.handlers[id] = widget
+ id_ = widget.connect('clicked', self._on_history_menuitem_activate)
+ self.handlers[id_] = widget
# when/if we do XHTML we will put formatting buttons back
widget = self.xml.get_widget('emoticons_button')
- id = widget.connect('clicked', self.on_emoticons_button_clicked)
- self.handlers[id] = widget
+ id_ = widget.connect('clicked', self.on_emoticons_button_clicked)
+ self.handlers[id_] = widget
# Create banner and connect signals
widget = self.xml.get_widget('banner_eventbox')
widget.set_property('height-request', gajim.config.get('chat_avatar_height'))
- id = widget.connect('button-press-event',
+ id_ = widget.connect('button-press-event',
self._on_banner_eventbox_button_press_event)
- self.handlers[id] = widget
+ self.handlers[id_] = widget
self.urlfinder = re.compile(r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]")
@@ -187,9 +187,9 @@
self.TARGET_TYPE_URI_LIST = 80
self.dnd_list = [ ( 'text/uri-list', 0, self.TARGET_TYPE_URI_LIST ),
('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_APP, 0)]
- id = self.widget.connect('drag_data_received',
+ id_ = self.widget.connect('drag_data_received',
self._on_drag_data_received)
- self.handlers[id] = self.widget
+ self.handlers[id_] = self.widget
self.widget.drag_dest_set(gtk.DEST_DEFAULT_MOTION |
gtk.DEST_DEFAULT_HIGHLIGHT |
gtk.DEST_DEFAULT_DROP,
@@ -197,18 +197,18 @@
# Create textviews and connect signals
self.conv_textview = ConversationTextview(self.account)
- id = self.conv_textview.tv.connect('key_press_event',
+ id_ = self.conv_textview.tv.connect('key_press_event',
self._conv_textview_key_press_event)
- self.handlers[id] = self.conv_textview.tv
+ self.handlers[id_] = self.conv_textview.tv
# FIXME: DND on non editable TextView, find a better way
self.drag_entered = False
- id = self.conv_textview.tv.connect('drag_data_received',
+ id_ = self.conv_textview.tv.connect('drag_data_received',
self._on_drag_data_received)
- self.handlers[id] = self.conv_textview.tv
- id = self.conv_textview.tv.connect('drag_motion', self._on_drag_motion)
- self.handlers[id] = self.conv_textview.tv
- id = self.conv_textview.tv.connect('drag_leave', self._on_drag_leave)
- self.handlers[id] = self.conv_textview.tv
+ self.handlers[id_] = self.conv_textview.tv
+ id_ = self.conv_textview.tv.connect('drag_motion', self._on_drag_motion)
+ self.handlers[id_] = self.conv_textview.tv
+ id_ = self.conv_textview.tv.connect('drag_leave', self._on_drag_leave)
+ self.handlers[id_] = self.conv_textview.tv
self.conv_textview.tv.drag_dest_set(gtk.DEST_DEFAULT_MOTION |
gtk.DEST_DEFAULT_HIGHLIGHT |
gtk.DEST_DEFAULT_DROP,
@@ -218,34 +218,34 @@
'conversation_scrolledwindow')
self.conv_scrolledwindow.add(self.conv_textview.tv)
widget = self.conv_scrolledwindow.get_vadjustment()
- id = widget.connect('value-changed',
+ id_ = widget.connect('value-changed',
self.on_conversation_vadjustment_value_changed)
- self.handlers[id] = widget
- id = widget.connect('changed',
+ self.handlers[id_] = widget
+ id_ = widget.connect('changed',
self.on_conversation_vadjustment_changed)
- self.handlers[id] = widget
+ self.handlers[id_] = widget
self.scroll_to_end_id = None
self.was_at_the_end = True
# add MessageTextView to UI and connect signals
self.msg_scrolledwindow = self.xml.get_widget('message_scrolledwindow')
self.msg_textview = MessageTextView()
- id = self.msg_textview.connect('mykeypress',
+ id_ = self.msg_textview.connect('mykeypress',
self._on_message_textview_mykeypress_event)
- self.handlers[id] = self.msg_textview
+ self.handlers[id_] = self.msg_textview
self.msg_scrolledwindow.add(self.msg_textview)
- id = self.msg_textview.connect('key_press_event',
+ id_ = self.msg_textview.connect('key_press_event',
self._on_message_textview_key_press_event)
- self.handlers[id] = self.msg_textview
- id = self.msg_textview.connect('size-request', self.size_request)
- self.handlers[id] = self.msg_textview
- id = self.msg_textview.connect('populate_popup',
+ self.handlers[id_] = self.msg_textview
+ id_ = self.msg_textview.connect('size-request', self.size_request)
+ self.handlers[id_] = self.msg_textview
+ id_ = self.msg_textview.connect('populate_popup',
self.on_msg_textview_populate_popup)
- self.handlers[id] = self.msg_textview
+ self.handlers[id_] = self.msg_textview
# Setup DND
- id = self.msg_textview.connect('drag_data_received',
+ id_ = self.msg_textview.connect('drag_data_received',
self._on_drag_data_received)
- self.handlers[id] = self.msg_textview
+ self.handlers[id_] = self.msg_textview
self.msg_textview.drag_dest_set(gtk.DEST_DEFAULT_MOTION |
gtk.DEST_DEFAULT_HIGHLIGHT,
self.dnd_list, gtk.gdk.ACTION_COPY)
@@ -254,12 +254,12 @@
# Hook up send button
widget = self.xml.get_widget('send_button')
- id = widget.connect('clicked', self._on_send_button_clicked)
- self.handlers[id] = widget
+ id_ = widget.connect('clicked', self._on_send_button_clicked)
+ self.handlers[id_] = widget
widget = self.xml.get_widget('formattings_button')
- id = widget.connect('clicked', self.on_formattings_button_clicked)
- self.handlers[id] = widget
+ id_ = widget.connect('clicked', self.on_formattings_button_clicked)
+ self.handlers[id_] = widget
# the following vars are used to keep history of user's messages
self.sent_history = []
@@ -328,8 +328,8 @@
item = gtk.ImageMenuItem(gtk.STOCK_CLEAR)
menu.prepend(item)
- id = item.connect('activate', self.msg_textview.clear)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.msg_textview.clear)
+ self.handlers[id_] = item
if gajim.config.get('use_speller') and HAS_GTK_SPELL:
item = gtk.MenuItem(_('Spelling language'))
@@ -341,8 +341,8 @@
if langs[lang] == self.msg_textview.lang:
item.set_active(True)
submenu.append(item)
- id = item.connect('activate', _on_select_dictionary, langs[lang])
- self.handlers[id] = item
+ id_ = item.connect('activate', _on_select_dictionary, langs[lang])
+ self.handlers[id_] = item
menu.show_all()
@@ -401,18 +401,18 @@
def disconnect_style_event(self, widget):
# Try to find the event_id
found = False
- for id in self.handlers:
- if self.handlers[id] == widget:
+ for id_ in self.handlers:
+ if self.handlers[id_] == widget:
found = True
break
if found:
- widget.disconnect(id)
- del self.handlers[id]
+ widget.disconnect(id_)
+ del self.handlers[id_]
def connect_style_event(self, widget, set_fg = False, set_bg = False):
self.disconnect_style_event(widget)
- id = widget.connect('style-set', self._on_style_set_event, set_fg, set_bg)
- self.handlers[id] = widget
+ id_ = widget.connect('style-set', self._on_style_set_event, set_fg, set_bg)
+ self.handlers[id_] = widget
def _on_style_set_event(self, widget, style, *opts):
'''set style of widget from style class *.Frame.Eventbox
@@ -731,11 +731,11 @@
emoticons_button.set_no_show_all(True)
def append_emoticon(self, str_):
- buffer = self.msg_textview.get_buffer()
- if buffer.get_char_count():
- buffer.insert_at_cursor(' %s ' % str_)
+ buffer_ = self.msg_textview.get_buffer()
+ if buffer_.get_char_count():
+ buffer_.insert_at_cursor(' %s ' % str_)
else: # we are the beginning of buffer
- buffer.insert_at_cursor('%s ' % str_)
+ buffer_.insert_at_cursor('%s ' % str_)
self.msg_textview.grab_focus()
def on_emoticons_button_clicked(self, widget):
@@ -821,9 +821,9 @@
self.conv_textview.update_tags()
def clear(self, tv):
- buffer = tv.get_buffer()
- start, end = buffer.get_bounds()
- buffer.delete(start, end)
+ buffer_ = tv.get_buffer()
+ start, end = buffer_.get_bounds()
+ buffer_.delete(start, end)
def _on_history_menuitem_activate(self, widget = None, jid = None):
'''When history menuitem is pressed: call history window'''
@@ -872,8 +872,8 @@
if self.scroll_to_end_id:
# a scroll is already planned
return
- buffer = textview.get_buffer()
- end_iter = buffer.get_end_iter()
+ buffer_ = textview.get_buffer()
+ end_iter = buffer_.get_end_iter()
end_rect = textview.get_iter_location(end_iter)
visible_rect = textview.get_visible_rect()
# scroll only if expected end is not visible
@@ -882,8 +882,8 @@
textview)
def scroll_to_end_iter(self, textview):
- buffer = textview.get_buffer()
- end_iter = buffer.get_end_iter()
+ buffer_ = textview.get_buffer()
+ end_iter = buffer_.get_end_iter()
textview.scroll_to_iter(end_iter, 0, False, 1, 1)
self.scroll_to_end_id = None
return False
@@ -1081,16 +1081,17 @@
# for muc use:
# widget = self.xml.get_widget('muc_window_actions_button')
self.actions_button = self.xml.get_widget('message_window_actions_button')
- id = self.actions_button.connect('clicked', self.on_actions_button_clicked)
- self.handlers[id] = self.actions_button
+ id_ = self.actions_button.connect('clicked',
+ self.on_actions_button_clicked)
+ self.handlers[id_] = self.actions_button
self._formattings_button = self.xml.get_widget('formattings_button')
self._add_to_roster_button = self.xml.get_widget(
'add_to_roster_button')
- id = self._add_to_roster_button.connect('clicked',
+ id_ = self._add_to_roster_button.connect('clicked',
self._on_add_to_roster_menuitem_activate)
- self.handlers[id] = self._add_to_roster_button
+ self.handlers[id_] = self._add_to_roster_button
self._send_file_button = self.xml.get_widget('send_file_button')
# add a special img for send file button
@@ -1098,21 +1099,21 @@
img = gtk.Image()
img.set_from_file(path_to_upload_img)
self._send_file_button.set_image(img)
- id = self._send_file_button.connect('clicked',
+ id_ = self._send_file_button.connect('clicked',
self._on_send_file_menuitem_activate)
- self.handlers[id] = self._send_file_button
+ self.handlers[id_] = self._send_file_button
self._convert_to_gc_button = self.xml.get_widget(
'convert_to_gc_button')
- id = self._convert_to_gc_button.connect('clicked',
+ id_ = self._convert_to_gc_button.connect('clicked',
self._on_convert_to_gc_menuitem_activate)
- self.handlers[id] = self._convert_to_gc_button
+ self.handlers[id_] = self._convert_to_gc_button
contact_information_button = self.xml.get_widget(
'contact_information_button')
- id = contact_information_button.connect('clicked',
+ id_ = contact_information_button.connect('clicked',
self._on_contact_information_menuitem_activate)
- self.handlers[id] = contact_information_button
+ self.handlers[id_] = contact_information_button
compact_view = gajim.config.get('compact_view')
self.chat_buttons_set_visible(compact_view)
@@ -1121,9 +1122,9 @@
self.authentication_button = self.xml.get_widget(
'authentication_button')
- id = self.authentication_button.connect('clicked',
+ id_ = self.authentication_button.connect('clicked',
self._on_authentication_button_clicked)
- self.handlers[id] = self.authentication_button
+ self.handlers[id_] = self.authentication_button
# Add lock image to show chat encryption
self.lock_image = self.xml.get_widget('lock_image')
@@ -1161,26 +1162,26 @@
self._schedule_activity_timers()
# Hook up signals
- id = self.parent_win.window.connect('motion-notify-event',
+ id_ = self.parent_win.window.connect('motion-notify-event',
self._on_window_motion_notify)
- self.handlers[id] = self.parent_win.window
+ self.handlers[id_] = self.parent_win.window
message_tv_buffer = self.msg_textview.get_buffer()
- id = message_tv_buffer.connect('changed',
+ id_ = message_tv_buffer.connect('changed',
self._on_message_tv_buffer_changed)
- self.handlers[id] = message_tv_buffer
+ self.handlers[id_] = message_tv_buffer
widget = self.xml.get_widget('avatar_eventbox')
- id = widget.connect('enter-notify-event',
+ id_ = widget.connect('enter-notify-event',
self.on_avatar_eventbox_enter_notify_event)
- self.handlers[id] = widget
+ self.handlers[id_] = widget
- id = widget.connect('leave-notify-event',
+ id_ = widget.connect('leave-notify-event',
self.on_avatar_eventbox_leave_notify_event)
- self.handlers[id] = widget
+ self.handlers[id_] = widget
- id = widget.connect('button-press-event',
+ id_ = widget.connect('button-press-event',
self.on_avatar_eventbox_button_press_event)
- self.handlers[id] = widget
+ self.handlers[id_] = widget
if not session:
session = gajim.connections[self.account]. \
@@ -1429,11 +1430,11 @@
if event.button == 3: # right click
menu = gtk.Menu()
menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS)
- id = menuitem.connect('activate',
+ id_ = menuitem.connect('activate',
gtkgui_helpers.on_avatar_save_as_menuitem_activate,
self.contact.jid, self.account, self.contact.get_shown_name() + \
'.jpeg')
- self.handlers[id] = menuitem
+ self.handlers[id_] = menuitem
menu.append(menuitem)
menu.show_all()
menu.connect('selection-done', lambda w:w.destroy())
@@ -1797,17 +1798,17 @@
gobject.source_remove(self.possible_inactive_timeout_id)
self._schedule_activity_timers()
- id = ChatControlBase.send_message(self, message, keyID,
+ id_ = ChatControlBase.send_message(self, message, keyID,
type_ = 'chat', chatstate = chatstate_to_send,
composing_xep = composing_xep,
process_command = process_command, xhtml = xhtml)
- if id:
+ if id_:
# XXX: Once we have fallback to disco, remove notexistant check
if gajim.capscache.is_supported(contact, NS_RECEIPTS) \
and not gajim.capscache.is_supported(contact,
'notexistant') and gajim.config.get_per('accounts',
self.account, 'request_receipt'):
- xep0184_id = id
+ xep0184_id = id_
else:
xep0184_id = None
@@ -2124,27 +2125,27 @@
convert_to_gc_menuitem.set_sensitive(False)
# connect signals
- id = history_menuitem.connect('activate',
+ id_ = history_menuitem.connect('activate',
self._on_history_menuitem_activate)
- self.handlers[id] = history_menuitem
- id = send_file_menuitem.connect('activate',
+ self.handlers[id_] = history_menuitem
+ id_ = send_file_menuitem.connect('activate',
self._on_send_file_menuitem_activate)
- self.handlers[id] = send_file_menuitem
- id = add_to_roster_menuitem.connect('activate',
+ self.handlers[id_] = send_file_menuitem
+ id_ = add_to_roster_menuitem.connect('activate',
self._on_add_to_roster_menuitem_activate)
- self.handlers[id] = add_to_roster_menuitem
- id = toggle_gpg_menuitem.connect('activate',
+ self.handlers[id_] = add_to_roster_menuitem
+ id_ = toggle_gpg_menuitem.connect('activate',
self._on_toggle_gpg_menuitem_activate)
- self.handlers[id] = toggle_gpg_menuitem
- id = toggle_e2e_menuitem.connect('activate',
+ self.handlers[id_] = toggle_gpg_menuitem
+ id_ = toggle_e2e_menuitem.connect('activate',
self._on_toggle_e2e_menuitem_activate)
- self.handlers[id] = toggle_e2e_menuitem
- id = information_menuitem.connect('activate',
+ self.handlers[id_] = toggle_e2e_menuitem
+ id_ = information_menuitem.connect('activate',
self._on_contact_information_menuitem_activate)
- self.handlers[id] = information_menuitem
- id = convert_to_gc_menuitem.connect('activate',
+ self.handlers[id_] = information_menuitem
+ id_ = convert_to_gc_menuitem.connect('activate',
self._on_convert_to_gc_menuitem_activate)
- self.handlers[id] = convert_to_gc_menuitem
+ self.handlers[id_] = convert_to_gc_menuitem
menu.connect('selection-done', self.destroy_menu,
send_file_menuitem, convert_to_gc_menuitem,
@@ -2383,9 +2384,9 @@
model = treeview.get_model()
data = selection.data
path = treeview.get_selection().get_selected_rows()[1][0]
- iter = model.get_iter(path)
- type = model[iter][2]
- if type != 'contact': # source is not a contact
+ iter_ = model.get_iter(path)
+ type_ = model[iter_][2]
+ if type_ != 'contact': # source is not a contact
return
dropped_jid = data.decode('utf-8')
Modified: trunk/src/common/caps.py
===================================================================
--- trunk/src/common/caps.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/caps.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -103,6 +103,7 @@
def _get_features(ciself):
return ciself._features
+
def _set_features(ciself, value):
ciself._features = []
for feature in value:
@@ -128,7 +129,8 @@
ciself._identities = []
for identity in value:
# dict are not hashable, so transform it into a tuple
- t = (identity['category'], identity.get('type'), identity.get('xml:lang'), identity.get('name'))
+ t = (identity['category'], identity.get('type'),
+ identity.get('xml:lang'), identity.get('name'))
ciself._identities.append(ciself.__names.setdefault(t, t))
identities = property(_get_identities, _set_identities)
@@ -155,9 +157,9 @@
def load_from_db(self):
# get data from logger...
if self.logger is not None:
- for hash_method, hash, identities, features in \
+ for hash_method, hash_, identities, features in \
self.logger.iter_caps_data():
- x = self[(hash_method, hash)]
+ x = self[(hash_method, hash_)]
x.identities = identities
x.features = features
x.queried = 2
@@ -166,10 +168,10 @@
if caps in self.__cache:
return self.__cache[caps]
- hash_method, hash = caps
+ hash_method, hash_ = caps
- x = self.__CacheItem(hash_method, hash)
- self.__cache[(hash_method, hash)] = x
+ x = self.__CacheItem(hash_method, hash_)
+ self.__cache[(hash_method, hash_)] = x
return x
def preload(self, con, jid, node, hash_method, hash_):
@@ -247,13 +249,13 @@
contact.caps_hash_method = None
return
- hash_method, node, hash = caps['hash'], caps['node'], caps['ver']
+ hash_method, node, hash_ = caps['hash'], caps['node'], caps['ver']
- if hash_method is None and node and hash:
+ if hash_method is None and node and hash_:
# Old XEP-115 implentation
hash_method = 'old'
- if hash_method is None or node is None or hash is None:
+ if hash_method is None or node is None or hash_ is None:
# improper caps in stanza, ignoring
contact.caps_node = None
contact.caps_hash = None
@@ -261,12 +263,12 @@
return
# start disco query...
- gajim.capscache.preload(self, jid, node, hash_method, hash)
+ gajim.capscache.preload(self, jid, node, hash_method, hash_)
# overwriting old data
contact.caps_node = node
contact.caps_hash_method = hash_method
- contact.caps_hash = hash
+ contact.caps_hash = hash_
if pm_ctrl:
pm_ctrl.update_contact()
Modified: trunk/src/common/config.py
===================================================================
--- trunk/src/common/config.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/config.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -475,11 +475,11 @@
cb(data, opt, None, self.__options[opt])
for opt in self.__options_per_key:
cb(data, opt, None, None)
- dict = self.__options_per_key[opt][1]
- for opt2 in dict.keys():
+ dict_ = self.__options_per_key[opt][1]
+ for opt2 in dict_.keys():
cb(data, opt2, [opt], None)
- for opt3 in dict[opt2]:
- cb(data, opt3, [opt, opt2], dict[opt2][opt3])
+ for opt3 in dict_[opt2]:
+ cb(data, opt3, [opt, opt2], dict_[opt2][opt3])
def get_children(self, node=None):
''' Tree-like interface '''
@@ -599,11 +599,11 @@
return
if not key:
return
- dict = self.__options_per_key[optname][1]
- if key not in dict:
-# raise RuntimeError, '%s is not a key of %s' % (key, dict)
+ dict_ = self.__options_per_key[optname][1]
+ if key not in dict_:
+# raise RuntimeError, '%s is not a key of %s' % (key, dict_)
self.add_per(optname, key)
- obj = dict[key]
+ obj = dict_[key]
if subname not in obj:
# raise RuntimeError, '%s is not a key of %s' % (subname, obj)
return
@@ -617,16 +617,16 @@
def get_per(self, optname, key = None, subname = None): # per_group_of_option
if optname not in self.__options_per_key:
return None
- dict = self.__options_per_key[optname][1]
+ dict_ = self.__options_per_key[optname][1]
if not key:
- return dict.keys()
- if key not in dict:
+ return dict_.keys()
+ if key not in dict_:
if optname in self.__options_per_key \
and subname in self.__options_per_key[optname][0]:
return self.__options_per_key \
[optname][0][subname][1]
return None
- obj = dict[key]
+ obj = dict_[key]
if not subname:
return obj
if subname not in obj:
@@ -636,12 +636,12 @@
def get_desc_per(self, optname, key = None, subname = None):
if optname not in self.__options_per_key:
return None
- dict = self.__options_per_key[optname][1]
+ dict_ = self.__options_per_key[optname][1]
if not key:
return None
- if key not in dict:
+ if key not in dict_:
return None
- obj = dict[key]
+ obj = dict_[key]
if not subname:
return None
if subname not in obj:
@@ -653,12 +653,12 @@
def get_restart_per(self, optname, key = None, subname = None):
if optname not in self.__options_per_key:
return False
- dict = self.__options_per_key[optname][1]
+ dict_ = self.__options_per_key[optname][1]
if not key:
return False
- if key not in dict:
+ if key not in dict_:
return False
- obj = dict[key]
+ obj = dict_[key]
if not subname:
return False
if subname not in obj:
Modified: trunk/src/common/connection.py
===================================================================
--- trunk/src/common/connection.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/connection.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -759,16 +759,16 @@
to server to detect connection failure at application level.'''
if not self.connection:
return
- id = self.connection.getAnID()
+ id_ = self.connection.getAnID()
if pingTo:
to = pingTo.get_full_jid()
self.dispatch('PING_SENT', (pingTo))
else:
to = gajim.config.get_per('accounts', self.name, 'hostname')
- self.awaiting_xmpp_ping_id = id
+ self.awaiting_xmpp_ping_id = id_
iq = common.xmpp.Iq('get', to=to)
iq.addChild(name = 'ping', namespace = common.xmpp.NS_PING)
- iq.setID(id)
+ iq.setID(id_)
def _on_response(resp):
timePong = time_time()
if not common.xmpp.isResultNode(resp):
@@ -945,9 +945,9 @@
self.connection.set_send_timeout(self.keepalives, self.sendPing)
self.connection.onreceive(None)
iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '')
- id = self.connection.getAnID()
- iq.setID(id)
- self.awaiting_answers[id] = (PRIVACY_ARRIVED, )
+ id_ = self.connection.getAnID()
+ iq.setID(id_)
+ self.awaiting_answers[id_] = (PRIVACY_ARRIVED, )
self.connection.send(iq)
def send_custom_status(self, show, msg, jid):
@@ -1299,9 +1299,9 @@
return
iq = common.xmpp.Iq('set', common.xmpp.NS_REGISTER, to = agent)
iq.getTag('query').setTag('remove')
- id = self.connection.getAnID()
- iq.setID(id)
- self.awaiting_answers[id] = (AGENT_REMOVED, agent)
+ id_ = self.connection.getAnID()
+ iq.setID(id_)
+ self.awaiting_answers[id_] = (AGENT_REMOVED, agent)
self.connection.send(iq)
self.connection.getRoster().delItem(agent)
@@ -1364,11 +1364,11 @@
to_whom_jid += '/' + resource
iq = common.xmpp.Iq(to = to_whom_jid, typ = 'get', queryNS =\
common.xmpp.NS_LAST)
- id = self.connection.getAnID()
- iq.setID(id)
+ id_ = self.connection.getAnID()
+ iq.setID(id_)
if groupchat_jid:
- self.groupchat_jids[id] = groupchat_jid
- self.last_ids.append(id)
+ self.groupchat_jids[id_] = groupchat_jid
+ self.last_ids.append(id_)
self.connection.send(iq)
def request_os_info(self, jid, resource, groupchat_jid=None):
@@ -1385,11 +1385,11 @@
to_whom_jid += '/' + resource
iq = common.xmpp.Iq(to = to_whom_jid, typ = 'get', queryNS =\
common.xmpp.NS_VERSION)
- id = self.connection.getAnID()
- iq.setID(id)
+ id_ = self.connection.getAnID()
+ iq.setID(id_)
if groupchat_jid:
- self.groupchat_jids[id] = groupchat_jid
- self.version_ids.append(id)
+ self.groupchat_jids[id_] = groupchat_jid
+ self.version_ids.append(id_)
self.connection.send(iq)
def get_settings(self):
@@ -1467,9 +1467,9 @@
iq = common.xmpp.Iq(typ='get')
iq2 = iq.addChild(name='query', namespace=common.xmpp.NS_PRIVATE)
iq2.addChild(name='storage', namespace='storage:metacontacts')
- id = self.connection.getAnID()
- iq.setID(id)
- self.awaiting_answers[id] = (METACONTACTS_ARRIVED, )
+ id_ = self.connection.getAnID()
+ iq.setID(id_)
+ self.awaiting_answers[id_] = (METACONTACTS_ARRIVED, )
self.connection.send(iq)
def store_metacontacts(self, tags_list):
Modified: trunk/src/common/connection_handlers.py
===================================================================
--- trunk/src/common/connection_handlers.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/connection_handlers.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -375,15 +375,15 @@
# register xmpppy handlers for bytestream and FT stanzas
def _bytestreamErrorCB(self, con, iq_obj):
gajim.log.debug('_bytestreamErrorCB')
- id = unicode(iq_obj.getAttr('id'))
+ id_ = unicode(iq_obj.getAttr('id'))
frm = helpers.get_full_jid_from_iq(iq_obj)
query = iq_obj.getTag('query')
gajim.proxy65_manager.error_cb(frm, query)
jid = helpers.get_jid_from_iq(iq_obj)
- id = id[3:]
- if id not in self.files_props:
+ id_ = id_[3:]
+ if id_ not in self.files_props:
return
- file_props = self.files_props[id]
+ file_props = self.files_props[id_]
file_props['error'] = -4
self.dispatch('FILE_REQUEST_ERROR', (jid, file_props, ''))
raise common.xmpp.NodeProcessed
@@ -391,7 +391,7 @@
def _bytestreamSetCB(self, con, iq_obj):
gajim.log.debug('_bytestreamSetCB')
target = unicode(iq_obj.getAttr('to'))
- id = unicode(iq_obj.getAttr('id'))
+ id_ = unicode(iq_obj.getAttr('id'))
query = iq_obj.getTag('query')
sid = unicode(query.getAttr('sid'))
file_props = gajim.socks5queue.get_file_props(
@@ -402,7 +402,7 @@
host_dict={
'state': 0,
'target': target,
- 'id': id,
+ 'id': id_,
'sid': sid,
'initiator': helpers.get_full_jid_from_iq(iq_obj)
}
@@ -443,9 +443,9 @@
if not real_id.startswith('au_'):
return
frm = helpers.get_full_jid_from_iq(iq_obj)
- id = real_id[3:]
- if id in self.files_props:
- file_props = self.files_props[id]
+ id_ = real_id[3:]
+ if id_ in self.files_props:
+ file_props = self.files_props[id_]
if file_props['streamhost-used']:
for host in file_props['proxyhosts']:
if host['initiator'] == frm and 'idx' in host:
@@ -463,17 +463,16 @@
streamhost = query.getTag('streamhost-used')
except Exception: # this bytestream result is not what we need
pass
- id = real_id[3:]
- if id in self.files_props:
- file_props = self.files_props[id]
+ id_ = real_id[3:]
+ if id_ in self.files_props:
+ file_props = self.files_props[id_]
else:
raise common.xmpp.NodeProcessed
if streamhost is None:
# proxy approves the activate query
if real_id.startswith('au_'):
- id = real_id[3:]
if 'streamhost-used' not in file_props or \
- file_props['streamhost-used'] is False:
+ file_props['streamhost-used'] is False:
raise common.xmpp.NodeProcessed
if 'proxyhosts' not in file_props:
raise common.xmpp.NodeProcessed
@@ -507,7 +506,8 @@
file_props['streamhosts'] = []
file_props['streamhosts'].append(proxy)
file_props['is_a_proxy'] = True
- receiver = socks5.Socks5Receiver(gajim.idlequeue, proxy, file_props['sid'], file_props)
+ receiver = socks5.Socks5Receiver(gajim.idlequeue, proxy,
+ file_props['sid'], file_props)
gajim.socks5queue.add_receiver(self.name, receiver)
proxy['idx'] = receiver.queue_idx
gajim.socks5queue.on_success = self._proxy_auth_ok
@@ -528,11 +528,11 @@
def _siResultCB(self, con, iq_obj):
gajim.log.debug('_siResultCB')
- id = iq_obj.getAttr('id')
- if id not in self.files_props:
+ id_ = iq_obj.getAttr('id')
+ if id_ not in self.files_props:
# no such jid
return
- file_props = self.files_props[id]
+ file_props = self.files_props[id_]
if file_props is None:
# file properties for jid is none
return
@@ -602,11 +602,11 @@
profile = si.getAttr('profile')
if profile != common.xmpp.NS_FILE:
return
- id = iq_obj.getAttr('id')
- if id not in self.files_props:
+ id_ = iq_obj.getAttr('id')
+ if id_ not in self.files_props:
# no such jid
return
- file_props = self.files_props[id]
+ file_props = self.files_props[id_]
if file_props is None:
# file properties for jid is none
return
@@ -632,10 +632,10 @@
if not self.connection or self.connected < 2:
return None
iq=common.xmpp.Iq('get', common.xmpp.NS_REGISTER, to=agent)
- id = self.connection.getAnID()
- iq.setID(id)
+ id_ = self.connection.getAnID()
+ iq.setID(id_)
# Wait the answer during 30 secondes
- self.awaiting_timeouts[gajim.idlequeue.current_time() + 30] = (id,
+ self.awaiting_timeouts[gajim.idlequeue.current_time() + 30] = (id_,
_('Registration information for transport %s has not arrived in time') % \
agent)
self.connection.SendAndCallForResponse(iq, self._ReceivedRegInfo,
@@ -659,8 +659,8 @@
return
iq = common.xmpp.Iq(typ = 'get', to = jid, queryNS = ns)
if id_prefix:
- id = self.connection.getAnID()
- iq.setID('%s%s' % (id_prefix, id))
+ id_ = self.connection.getAnID()
+ iq.setID('%s%s' % (id_prefix, id_))
if node:
iq.setQuerynode(node)
self.connection.send(iq)
@@ -675,10 +675,10 @@
return
frm = helpers.get_full_jid_from_iq(iq_obj)
to = unicode(iq_obj.getAttr('to'))
- id = unicode(iq_obj.getAttr('id'))
+ id_ = unicode(iq_obj.getAttr('id'))
iq = common.xmpp.Iq(to = frm, typ = 'result', queryNS =\
common.xmpp.NS_DISCO, frm = to)
- iq.setAttr('id', id)
+ iq.setAttr('id', id_)
query = iq.setTag('query')
query.setAttr('node','http://gajim.org#' + gajim.version.split('-',
1)[0])
@@ -724,8 +724,8 @@
jid = helpers.get_full_jid_from_iq(iq_obj)
hostname = gajim.config.get_per('accounts', self.name,
'hostname')
- id = iq_obj.getID()
- if jid == hostname and id[0] == 'p':
+ id_ = iq_obj.getID()
+ if jid == hostname and id_[0] == 'p':
for item in items:
self.discoverInfo(item['jid'], id_prefix='p')
else:
@@ -758,8 +758,8 @@
if self.commandInfoQuery(con, iq_obj):
raise common.xmpp.NodeProcessed
- id = unicode(iq_obj.getAttr('id'))
- if id[0] == 'p':
+ id_ = unicode(iq_obj.getAttr('id'))
+ if id_[0] == 'p':
# We get this request from echo.server
raise common.xmpp.NodeProcessed
@@ -822,11 +822,11 @@
if transport_type and jid not in gajim.transport_type:
gajim.transport_type[jid] = transport_type
gajim.logger.save_transport_type(jid, transport_type)
- id = iq_obj.getID()
+ id_ = iq_obj.getID()
if not identities: # ejabberd doesn't send identities when we browse online users
#FIXME: see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225
identities = [{'category': 'server', 'type': 'im', 'name': node}]
- if id[0] == 'p':
+ if id_[0] == 'p':
if jid == gajim.config.get_per('accounts', self.name, 'hostname'):
if features.__contains__(common.xmpp.NS_GMAILNOTIFY):
gajim.gmail_domains.append(jid)
@@ -884,23 +884,22 @@
return p
def node_to_dict(self, node):
- dict = {}
+ dict_ = {}
for info in node.getChildren():
name = info.getName()
if name in ('ADR', 'TEL', 'EMAIL'): # we can have several
- if name not in dict:
- dict[name] = []
+ dict_.setdefault(name, [])
entry = {}
for c in info.getChildren():
entry[c.getName()] = c.getData()
- dict[name].append(entry)
+ dict_[name].append(entry)
elif info.getChildren() == []:
- dict[name] = info.getData()
+ dict_[name] = info.getData()
else:
- dict[name] = {}
+ dict_[name] = {}
for c in info.getChildren():
- dict[name][c.getName()] = c.getData()
- return dict
+ dict_[name][c.getName()] = c.getData()
+ return dict_
def save_vcard_to_hd(self, full_jid, card):
jid, nick = gajim.get_room_and_nick_from_fjid(full_jid)
@@ -974,17 +973,17 @@
iq.setTo(jid)
iq.setTag(common.xmpp.NS_VCARD + ' vCard')
- id = self.connection.getAnID()
- iq.setID(id)
+ id_ = self.connection.getAnID()
+ iq.setID(id_)
j = jid
if not j:
j = gajim.get_jid_from_account(self.name)
- self.awaiting_answers[id] = (VCARD_ARRIVED, j, groupchat_jid)
+ self.awaiting_answers[id_] = (VCARD_ARRIVED, j, groupchat_jid)
if groupchat_jid:
room_jid = gajim.get_room_and_nick_from_fjid(groupchat_jid)[0]
if not room_jid in self.room_jids:
self.room_jids.append(room_jid)
- self.groupchat_jids[id] = groupchat_jid
+ self.groupchat_jids[id_] = groupchat_jid
self.connection.send(iq)
def send_vcard(self, vcard):
@@ -1007,8 +1006,8 @@
else:
iq2.addChild(i).setData(vcard[i])
- id = self.connection.getAnID()
- iq.setID(id)
+ id_ = self.connection.getAnID()
+ iq.setID(id_)
self.connection.send(iq)
our_jid = gajim.get_jid_from_account(self.name)
@@ -1023,25 +1022,25 @@
else:
gajim.interface.remove_avatar_files(our_jid)
- self.awaiting_answers[id] = (VCARD_PUBLISHED, iq2)
+ self.awaiting_answers[id_] = (VCARD_PUBLISHED, iq2)
def _IqCB(self, con, iq_obj):
- id = iq_obj.getID()
+ id_ = iq_obj.getID()
# Check if we were waiting a timeout for this id
found_tim = None
for tim in self.awaiting_timeouts:
- if id == self.awaiting_timeouts[tim][0]:
+ if id_ == self.awaiting_timeouts[tim][0]:
found_tim = tim
break
if found_tim:
del self.awaiting_timeouts[found_tim]
- if id not in self.awaiting_answers:
+ if id_ not in self.awaiting_answers:
return
- if self.awaiting_answers[id][0] == VCARD_PUBLISHED:
+ if self.awaiting_answers[id_][0] == VCARD_PUBLISHED:
if iq_obj.getType() == 'result':
- vcard_iq = self.awaiting_answers[id][1]
+ vcard_iq = self.awaiting_answers[id_][1]
# Save vcard to HD
if vcard_iq.getTag('PHOTO') and vcard_iq.getTag('PHOTO').getTag('SHA'):
new_sha = vcard_iq.getTag('PHOTO').getTagData('SHA')
@@ -1066,11 +1065,11 @@
self.dispatch('VCARD_PUBLISHED', ())
elif iq_obj.getType() == 'error':
self.dispatch('VCARD_NOT_PUBLISHED', ())
- elif self.awaiting_answers[id][0] == VCARD_ARRIVED:
+ elif self.awaiting_answers[id_][0] == VCARD_ARRIVED:
# If vcard is empty, we send to the interface an empty vcard so that
# it knows it arrived
- jid = self.awaiting_answers[id][1]
- groupchat_jid = self.awaiting_answers[id][2]
+ jid = self.awaiting_answers[id_][1]
+ groupchat_jid = self.awaiting_answers[id_][2]
frm = jid
if groupchat_jid:
# We do as if it comes from the fake_jid
@@ -1088,10 +1087,10 @@
self.dispatch('VCARD', {'jid': jid, 'resource': resource})
elif frm == our_jid:
self.dispatch('MYVCARD', {'jid': frm})
- elif self.awaiting_answers[id][0] == AGENT_REMOVED:
- jid = self.awaiting_answers[id][1]
+ elif self.awaiting_answers[id_][0] == AGENT_REMOVED:
+ jid = self.awaiting_answers[id_][1]
self.dispatch('AGENT_REMOVED', jid)
- elif self.awaiting_answers[id][0] == METACONTACTS_ARRIVED:
+ elif self.awaiting_answers[id_][0] == METACONTACTS_ARRIVED:
if not self.connection:
return
if iq_obj.getType() == 'result':
@@ -1122,7 +1121,7 @@
self.private_storage_supported = False
# We can now continue connection by requesting the roster
self.connection.initRoster()
- elif self.awaiting_answers[id][0] == PRIVACY_ARRIVED:
+ elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED:
if iq_obj.getType() != 'error':
self.privacy_rules_supported = True
self.get_privacy_list('block')
@@ -1136,7 +1135,7 @@
return
# Ask metacontacts before roster
self.get_metacontacts()
- elif self.awaiting_answers[id][0] == PEP_CONFIG:
+ elif self.awaiting_answers[id_][0] == PEP_CONFIG:
conf = iq_obj.getTag('pubsub').getTag('configure')
node = conf.getAttr('node')
form_tag = conf.getTag('x', namespace=common.xmpp.NS_DATA)
@@ -1144,7 +1143,7 @@
form = common.dataforms.ExtendForm(node=form_tag)
self.dispatch('PEP_CONFIG', (node, form))
- del self.awaiting_answers[id]
+ del self.awaiting_answers[id_]
def _vCardCB(self, con, vc):
'''Called when we receive a vCard
@@ -1153,14 +1152,14 @@
return
if not vc.getTag('vCard').getNamespace() == common.xmpp.NS_VCARD:
return
- id = vc.getID()
+ id_ = vc.getID()
frm_iq = vc.getFrom()
our_jid = gajim.get_jid_from_account(self.name)
resource = ''
- if id in self.groupchat_jids:
- who = self.groupchat_jids[id]
+ if id_ in self.groupchat_jids:
+ who = self.groupchat_jids[id_]
frm, resource = gajim.get_room_and_nick_from_fjid(who)
- del self.groupchat_jids[id]
+ del self.groupchat_jids[id_]
elif frm_iq:
who = helpers.get_full_jid_from_iq(vc)
frm, resource = gajim.get_room_and_nick_from_fjid(who)
@@ -1414,31 +1413,31 @@
if opt in ('yes', 'no'):
self.build_http_auth_answer(iq_obj, opt)
else:
- id = iq_obj.getTagAttr('confirm', 'id')
+ id_ = iq_obj.getTagAttr('confirm', 'id')
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):
gajim.log.debug('ErrorCB')
jid_from = helpers.get_full_jid_from_iq(iq_obj)
jid_stripped, resource = gajim.get_room_and_nick_from_fjid(jid_from)
- id = unicode(iq_obj.getID())
- if id in self.version_ids:
+ id_ = unicode(iq_obj.getID())
+ if id_ in self.version_ids:
self.dispatch('OS_INFO', (jid_stripped, resource, '', ''))
- self.version_ids.remove(id)
+ self.version_ids.remove(id_)
return
- if id in self.last_ids:
+ if id_ in self.last_ids:
self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, -1, ''))
- self.last_ids.remove(id)
+ self.last_ids.remove(id_)
return
- if id == self.awaiting_xmpp_ping_id:
+ if id_ == self.awaiting_xmpp_ping_id:
self.awaiting_xmpp_ping_id = None
errmsg = iq_obj.getErrorMsg()
errcode = iq_obj.getErrorCode()
- self.dispatch('ERROR_ANSWER', (id, jid_from, errmsg, errcode))
+ self.dispatch('ERROR_ANSWER', (id_, jid_from, errmsg, errcode))
def _PrivateCB(self, con, iq_obj):
'''
@@ -1538,14 +1537,14 @@
seconds = int(seconds)
except Exception:
return
- id = iq_obj.getID()
- if id in self.groupchat_jids:
- who = self.groupchat_jids[id]
- del self.groupchat_jids[id]
+ id_ = iq_obj.getID()
+ if id_ in self.groupchat_jids:
+ who = self.groupchat_jids[id_]
+ del self.groupchat_jids[id_]
else:
who = helpers.get_full_jid_from_iq(iq_obj)
- if id in self.last_ids:
- self.last_ids.remove(id)
+ if id_ in self.last_ids:
+ self.last_ids.remove(id_)
jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who)
self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, seconds, status))
@@ -1560,15 +1559,15 @@
client_info += ' ' + qp.getTag('version').getData()
if qp.getTag('os'):
os_info += qp.getTag('os').getData()
- id = iq_obj.getID()
- if id in self.groupchat_jids:
- who = self.groupchat_jids[id]
- del self.groupchat_jids[id]
+ id_ = iq_obj.getID()
+ if id_ in self.groupchat_jids:
+ who = self.groupchat_jids[id_]
+ del self.groupchat_jids[id_]
else:
who = helpers.get_full_jid_from_iq(iq_obj)
jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who)
- if id in self.version_ids:
- self.version_ids.remove(id)
+ if id_ in self.version_ids:
+ self.version_ids.remove(id_)
self.dispatch('OS_INFO', (jid_stripped, resource, client_info, os_info))
def _TimeCB(self, con, iq_obj):
Modified: trunk/src/common/helpers.py
===================================================================
--- trunk/src/common/helpers.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/helpers.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -1241,20 +1241,19 @@
if form_type:
S += form_type.getValue() + '<'
del fields['FORM_TYPE']
- vars = sorted(fields.keys())
- for var in vars:
+ for var in sorted(fields.keys()):
S += '%s<' % var
values = sorted(fields[var].getValues())
for value in values:
S += '%s<' % value
if hash_method == 'sha-1':
- hash = hash_sha1(S)
+ hash_ = hash_sha1(S)
elif hash_method == 'md5':
- hash = hash_md5(S)
+ hash_ = hash_md5(S)
else:
return ''
- return base64.b64encode(hash.digest())
+ return base64.b64encode(hash_.digest())
def update_optional_features(account = None):
if account:
Modified: trunk/src/common/logger.py
===================================================================
--- trunk/src/common/logger.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/logger.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -759,7 +759,7 @@
# list of corrupted entries that will be removed
to_be_removed = []
- for hash_method, hash, data in self.cur:
+ for hash_method, hash_, data in self.cur:
# for each row: unpack the data field
# (format: (category, type, name, category, type, name, ...
# ..., 'FEAT', feature1, feature2, ...).join(' '))
@@ -768,7 +768,7 @@
data = GzipFile(fileobj=StringIO(str(data))).read().decode('utf-8').split('\0')
except IOError:
# This data is corrupted. It probably contains non-ascii chars
- to_be_removed.append((hash_method, hash))
+ to_be_removed.append((hash_method, hash_))
continue
i=0
identities = list()
@@ -787,9 +787,9 @@
i += 1
# yield the row
- yield hash_method, hash, identities, features
- for hash_method, hash in to_be_removed:
- sql = 'DELETE FROM caps_cache WHERE hash_method = "%s" AND hash = "%s"' % (hash_method, hash)
+ yield hash_method, hash_, identities, features
+ for hash_method, hash_ in to_be_removed:
+ 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):
Modified: trunk/src/common/pubsub.py
===================================================================
--- trunk/src/common/pubsub.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/pubsub.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -36,9 +36,9 @@
pb = query.addChild('pubsub', {'xmlns': xmpp.NS_PUBSUB})
pb.addChild('subscriptions')
- id = self.connection.send(query)
+ id_ = self.connection.send(query)
- self.__callbacks[id]=(cb, args, kwargs)
+ self.__callbacks[id_]=(cb, args, kwargs)
def send_pb_subscribe(self, jid, node, cb, *args, **kwargs):
if not self.connection or self.connected < 2:
@@ -48,9 +48,9 @@
pb = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB)
pb.addChild('subscribe', {'node': node, 'jid': our_jid})
- id = self.connection.send(query)
+ id_ = self.connection.send(query)
- self.__callbacks[id]=(cb, args, kwargs)
+ self.__callbacks[id_]=(cb, args, kwargs)
def send_pb_unsubscribe(self, jid, node, cb, *args, **kwargs):
if not self.connection or self.connected < 2:
@@ -60,9 +60,9 @@
pb = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB)
pb.addChild('unsubscribe', {'node': node, 'jid': our_jid})
- id = self.connection.send(query)
+ id_ = self.connection.send(query)
- self.__callbacks[id]=(cb, args, kwargs)
+ self.__callbacks[id_]=(cb, args, kwargs)
def send_pb_publish(self, jid, node, item, id_):
'''Publish item to a node.'''
@@ -141,9 +141,9 @@
query = xmpp.Iq('get', to=jid)
e = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB_OWNER)
e = e.addChild('configure', {'node': node})
- id = self.connection.getAnID()
- query.setID(id)
- self.awaiting_answers[id] = (connection_handlers.PEP_CONFIG,)
+ id_ = self.connection.getAnID()
+ query.setID(id_)
+ self.awaiting_answers[id_] = (connection_handlers.PEP_CONFIG,)
self.connection.send(query)
# vim: se ts=3:
Modified: trunk/src/common/stanza_session.py
===================================================================
--- trunk/src/common/stanza_session.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/stanza_session.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -240,8 +240,8 @@
def sign(self, string):
if self.negotiated['sign_algs'] == (XmlDsig + 'rsa-sha256'):
- hash = crypto.sha256(string)
- return crypto.encode_mpi(gajim.pubkey.sign(hash, '')[0])
+ hash_ = crypto.sha256(string)
+ return crypto.encode_mpi(gajim.pubkey.sign(hash_, '')[0])
def encrypt_stanza(self, stanza):
encryptable = filter(lambda x: x.getName() not in ('error', 'amp',
@@ -424,9 +424,9 @@
mac_o_calculated = self.hmac(self.ks_o, content)
if self.negotiated['recv_pubkey']:
- hash = crypto.sha256(mac_o_calculated)
+ hash_ = crypto.sha256(mac_o_calculated)
- if not eir_pubkey.verify(hash, signature):
+ if not eir_pubkey.verify(hash_, signature):
raise exceptions.NegotiationError, 'public key signature verification failed!'
elif mac_o_calculated != mac_o:
Modified: trunk/src/common/xmpp/auth.py
===================================================================
--- trunk/src/common/xmpp/auth.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/xmpp/auth.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -68,8 +68,8 @@
def hash_n_times(s, count):
return count and hasher(hash_n_times(s, count-1)) or s
- hash = hash_n_times(hasher(hasher(self.password)+token), int(seq))
- query.setTagData('hash',hash)
+ hash_ = hash_n_times(hasher(hasher(self.password)+token), int(seq))
+ query.setTagData('hash', hash_)
method='0k'
else:
self.DEBUG("Sequre methods unsupported, performing plain text authentication",'warn')
Modified: trunk/src/common/xmpp/auth_nb.py
===================================================================
--- trunk/src/common/xmpp/auth_nb.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/xmpp/auth_nb.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -48,16 +48,17 @@
X_KEYWORD, X_VALUE, X_END = 0, 1, 2
quotes_open = False
keyword, value = '', ''
- dict, arr = {}, None
+ dict_ = {}
+ arr = None
expecting = X_KEYWORD
- for iter in range(len(data) + 1):
+ for iter_ in range(len(data) + 1):
end = False
- if iter == len(data):
+ if iter_ == len(data):
expecting = X_END
end = True
else:
- char = data[iter]
+ char = data[iter_]
if expecting == X_KEYWORD:
if char == '=':
expecting = X_VALUE
@@ -85,14 +86,14 @@
if end:
if arr:
arr.append(value)
- dict[keyword] = arr
+ dict_[keyword] = arr
arr = None
else:
- dict[keyword] = value
+ dict_[keyword] = value
value, keyword = '', ''
expecting = X_KEYWORD
quotes_open = False
- return dict
+ return dict_
class SASL(PlugIn):
''' Implements SASL authentication. '''
@@ -321,8 +322,8 @@
def hash_n_times(s, count):
return count and hasher(hash_n_times(s, count-1)) or s
- hash = hash_n_times(hasher(hasher(self.password) + token), int(seq))
- query.setTagData('hash',hash)
+ hash_ = hash_n_times(hasher(hasher(self.password) + token), int(seq))
+ query.setTagData('hash', hash_)
self._method='0k'
else:
self.DEBUG("Sequre methods unsupported, performing plain text authentication",'warn')
Modified: trunk/src/common/xmpp/browser.py
===================================================================
--- trunk/src/common/xmpp/browser.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/xmpp/browser.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -212,7 +212,7 @@
raise NodeProcessed
# handler must return dictionary:
# {'ids':[{},{},{},{}], 'features':[fe,at,ur,es], 'xdata':DataForm}
- for id in dt['ids']: q.addChild('identity',id)
+ for id_ in dt['ids']: q.addChild('identity',id_)
for feature in dt['features']: q.addChild('feature',{'var':feature})
if 'xdata' in dt: q.addChild(node=dt['xdata'])
conn.send(rep)
Modified: trunk/src/common/xmpp/commands.py
===================================================================
--- trunk/src/common/xmpp/commands.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/xmpp/commands.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -105,7 +105,7 @@
# Enumerate the 'item' disco of each command for the specified jid
# Build responce and send
# To make this code easy to write we add an 'list' disco type, it returns a tuple or 'none' if not advertised
- list = []
+ list_ = []
items = []
jid = str(request.getTo())
# Get specific jid based results
@@ -120,10 +120,10 @@
for each in items:
i = self._handlers[each[0]][each[1]]['disco'](conn,request,'list')
if i is not None:
- list.append(Node(tag='item',attrs={'jid':i[0],'node':i[1],'name':i[2]}))
+ list_.append(Node(tag='item',attrs={'jid':i[0],'node':i[1],'name':i[2]}))
iq = request.buildReply('result')
if request.getQuerynode(): iq.setQuerynode(request.getQuerynode())
- iq.setQueryPayload(list)
+ iq.setQueryPayload(list_)
conn.send(iq)
else:
conn.send(Error(request,ERR_ITEM_NOT_FOUND))
Modified: trunk/src/common/xmpp/dispatcher.py
===================================================================
--- trunk/src/common/xmpp/dispatcher.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/xmpp/dispatcher.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -285,14 +285,14 @@
session.DEBUG("Dispatching %s stanza with type->%s props->%s id->%s"%(name,typ,stanza.props,ID),'ok')
- list=['default'] # we will use all handlers:
- if typ in self.handlers[xmlns][name]: list.append(typ) # from very common...
+ list_=['default'] # we will use all handlers:
+ if typ in self.handlers[xmlns][name]: list_.append(typ) # from very common...
for prop in stanza.props:
- if prop in self.handlers[xmlns][name]: list.append(prop)
- if typ and typ+prop in self.handlers[xmlns][name]: list.append(typ+prop) # ...to very particular
+ if prop in self.handlers[xmlns][name]: list_.append(prop)
+ if typ and typ+prop in self.handlers[xmlns][name]: list_.append(typ+prop) # ...to very particular
chain=self.handlers[xmlns]['default']['default']
- for key in list:
+ for key in list_:
if key: chain = chain + self.handlers[xmlns][name][key]
if ID in session._expected:
Modified: trunk/src/common/xmpp/dispatcher_nb.py
===================================================================
--- trunk/src/common/xmpp/dispatcher_nb.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/xmpp/dispatcher_nb.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -328,14 +328,14 @@
ID=stanza.getID()
session.DEBUG("Dispatching %s stanza with type->%s props->%s id->%s"%(name,typ,stanza.props,ID),'ok')
- list=['default'] # we will use all handlers:
- if typ in self.handlers[xmlns][name]: list.append(typ) # from very common...
+ list_=['default'] # we will use all handlers:
+ if typ in self.handlers[xmlns][name]: list_.append(typ) # from very common...
for prop in stanza.props:
- if prop in self.handlers[xmlns][name]: list.append(prop)
- if typ and typ+prop in self.handlers[xmlns][name]: list.append(typ+prop) # ...to very particular
+ if prop in self.handlers[xmlns][name]: list_.append(prop)
+ if typ and typ+prop in self.handlers[xmlns][name]: list_.append(typ+prop) # ...to very particular
chain=self.handlers[xmlns]['default']['default']
- for key in list:
+ for key in list_:
if key: chain = chain + self.handlers[xmlns][name][key]
if ID in session._expected:
Modified: trunk/src/common/xmpp/features.py
===================================================================
--- trunk/src/common/xmpp/features.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/xmpp/features.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -142,13 +142,13 @@
""" Requests privacy lists from connected server.
Returns dictionary of existing lists on success."""
try:
- dict={'lists':[]}
+ dict_={'lists':[]}
resp=disp.SendAndWaitForResponse(Iq('get',NS_PRIVACY))
if not isResultNode(resp): return
- for list in resp.getQueryPayload():
- if list.getName()=='list': dict['lists'].append(list.getAttr('name'))
- else: dict[list.getName()]=list.getAttr('name')
- return dict
+ for list_ in resp.getQueryPayload():
+ if list_.getName()=='list': dict_['lists'].append(list_.getAttr('name'))
+ else: dict_[list_.getName()]=list_.getAttr('name')
+ return dict_
except: pass
def getPrivacyList(disp,listname):
Modified: trunk/src/common/xmpp/features_nb.py
===================================================================
--- trunk/src/common/xmpp/features_nb.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/xmpp/features_nb.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -177,31 +177,31 @@
Returns dictionary of existing lists on success."""
iq = Iq('get', NS_PRIVACY)
def _on_response(resp):
- dict = {'lists': []}
+ dict_ = {'lists': []}
if not isResultNode(resp):
disp.Event(NS_PRIVACY, PRIVACY_LISTS_RECEIVED, (False))
return
- for list in resp.getQueryPayload():
- if list.getName()=='list':
- dict['lists'].append(list.getAttr('name'))
+ for list_ in resp.getQueryPayload():
+ if list_.getName()=='list':
+ dict_['lists'].append(list_.getAttr('name'))
else:
- dict[list.getName()]=list.getAttr('name')
- disp.Event(NS_PRIVACY, PRIVACY_LISTS_RECEIVED, (dict))
+ dict_[list_.getName()]=list_.getAttr('name')
+ disp.Event(NS_PRIVACY, PRIVACY_LISTS_RECEIVED, (dict_))
disp.SendAndCallForResponse(iq, _on_response)
def getActiveAndDefaultPrivacyLists(disp):
iq = Iq('get', NS_PRIVACY)
def _on_response(resp):
- dict = {'active': '', 'default': ''}
+ dict_ = {'active': '', 'default': ''}
if not isResultNode(resp):
disp.Event(NS_PRIVACY, PRIVACY_LISTS_ACTIVE_DEFAULT, (False))
return
- for list in resp.getQueryPayload():
- if list.getName() == 'active':
- dict['active'] = list.getAttr('name')
- elif list.getName() == 'default':
- dict['default'] = list.getAttr('name')
- disp.Event(NS_PRIVACY, PRIVACY_LISTS_ACTIVE_DEFAULT, (dict))
+ for list_ in resp.getQueryPayload():
+ if list_.getName() == 'active':
+ dict_['active'] = list_.getAttr('name')
+ elif list_.getName() == 'default':
+ dict_['default'] = list_.getAttr('name')
+ disp.Event(NS_PRIVACY, PRIVACY_LISTS_ACTIVE_DEFAULT, (dict_))
disp.SendAndCallForResponse(iq, _on_response)
def getPrivacyList(disp, listname):
Modified: trunk/src/common/xmpp/protocol.py
===================================================================
--- trunk/src/common/xmpp/protocol.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/xmpp/protocol.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -600,14 +600,14 @@
Mandatory parameter: name - name of error condition.
Optional parameters: code, typ, text. Used for backwards compartibility with older jabber protocol."""
if name in ERRORS:
- cod,type,txt=ERRORS[name]
+ cod,type_,txt=ERRORS[name]
ns=name.split()[0]
- else: cod,ns,type,txt='500',NS_STANZAS,'cancel',''
- if typ: type=typ
+ else: cod,ns,type_,txt='500',NS_STANZAS,'cancel',''
+ if typ: type_=typ
if code: cod=code
if text: txt=text
Node.__init__(self,'error',{},[Node(name)])
- if type: self.setAttr('type',type)
+ if type_: self.setAttr('type',type_)
if not cod: self.setName('stream:error')
if txt: self.addChild(node=Node(ns+' text',{},[txt]))
if cod: self.setAttr('code',cod)
Modified: trunk/src/common/zeroconf/client_zeroconf.py
===================================================================
--- trunk/src/common/zeroconf/client_zeroconf.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/zeroconf/client_zeroconf.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -688,23 +688,23 @@
# look for hashed connections
if to in self.recipient_to_hash:
conn = self.connections[self.recipient_to_hash[to]]
- id = conn.Dispatcher.getAnID()
- stanza.setID(id)
+ id_ = conn.Dispatcher.getAnID()
+ stanza.setID(id_)
if conn.add_stanza(stanza, is_message):
if on_ok:
on_ok()
- return id
+ return id_
if item['address'] in self.ip_to_hash:
- hash = self.ip_to_hash[item['address']]
- if self.hash_to_port[hash] == item['port']:
- conn = self.connections[hash]
- id = conn.Dispatcher.getAnID()
- stanza.setID(id)
+ hash_ = self.ip_to_hash[item['address']]
+ if self.hash_to_port[hash_] == item['port']:
+ conn = self.connections[hash_]
+ id_ = conn.Dispatcher.getAnID()
+ stanza.setID(id_)
if conn.add_stanza(stanza, is_message):
if on_ok:
on_ok()
- return id
+ return id_
# otherwise open new connection
stanza.setID('zero')
Modified: trunk/src/common/zeroconf/connection_handlers_zeroconf.py
===================================================================
--- trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -159,7 +159,7 @@
def _bytestreamSetCB(self, con, iq_obj):
gajim.log.debug('_bytestreamSetCB')
target = unicode(iq_obj.getAttr('to'))
- id = unicode(iq_obj.getAttr('id'))
+ id_ = unicode(iq_obj.getAttr('id'))
query = iq_obj.getTag('query')
sid = unicode(query.getAttr('sid'))
file_props = gajim.socks5queue.get_file_props(
@@ -170,7 +170,7 @@
host_dict={
'state': 0,
'target': target,
- 'id': id,
+ 'id': id_,
'sid': sid,
'initiator': unicode(iq_obj.getFrom())
}
@@ -206,9 +206,9 @@
if not real_id.startswith('au_'):
return
frm = unicode(iq_obj.getFrom())
- id = real_id[3:]
- if id in self.files_props:
- file_props = self.files_props[id]
+ id_ = real_id[3:]
+ if id_ in self.files_props:
+ file_props = self.files_props[id_]
if file_props['streamhost-used']:
for host in file_props['proxyhosts']:
if host['initiator'] == frm and 'idx' in host:
@@ -226,15 +226,15 @@
streamhost = query.getTag('streamhost-used')
except Exception: # this bytestream result is not what we need
pass
- id = real_id[3:]
- if id in self.files_props:
- file_props = self.files_props[id]
+ id_ = real_id[3:]
+ if id_ in self.files_props:
+ file_props = self.files_props[id_]
else:
raise common.xmpp.NodeProcessed
if streamhost is None:
# proxy approves the activate query
if real_id.startswith('au_'):
- id = real_id[3:]
+ id_ = real_id[3:]
if 'streamhost-used' not in file_props or \
file_props['streamhost-used'] is False:
raise common.xmpp.NodeProcessed
@@ -286,11 +286,11 @@
def _siResultCB(self, con, iq_obj):
gajim.log.debug('_siResultCB')
self.peerhost = con._owner.Connection._sock.getsockname()
- id = iq_obj.getAttr('id')
- if id not in self.files_props:
+ id_ = iq_obj.getAttr('id')
+ if id_ not in self.files_props:
# no such jid
return
- file_props = self.files_props[id]
+ file_props = self.files_props[id_]
if file_props is None:
# file properties for jid is none
return
@@ -359,11 +359,11 @@
profile = si.getAttr('profile')
if profile != common.xmpp.NS_FILE:
return
- id = iq_obj.getAttr('id')
- if id not in self.files_props:
+ id_ = iq_obj.getAttr('id')
+ if id_ not in self.files_props:
# no such jid
return
- file_props = self.files_props[id]
+ file_props = self.files_props[id_]
if file_props is None:
# file properties for jid is none
return
Modified: trunk/src/common/zeroconf/zeroconf_bonjour.py
===================================================================
--- trunk/src/common/zeroconf/zeroconf_bonjour.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/common/zeroconf/zeroconf_bonjour.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -99,10 +99,7 @@
# takes a TXTRecord instance
def txt_array_to_dict(self, txt):
items = pybonjour.TXTRecord.parse(txt)._items
- dict = {}
- for val in items.values():
- dict[val[0]] = val[1]
- return dict
+ return dict((v[0], v[1]) for v in items.values())
def service_resolved_callback(self, sdRef, flags, interfaceIndex, errorCode, fullname,
hosttarget, port, txtRecord):
Modified: trunk/src/config.py
===================================================================
--- trunk/src/config.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/config.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -141,12 +141,12 @@
model = gtk.ListStore(str)
emoticons_combobox.set_model(model)
l = []
- for dir in emoticons_list:
- if not os.path.isdir(os.path.join(gajim.DATA_DIR, 'emoticons', dir)) \
- and not os.path.isdir(os.path.join(gajim.MY_EMOTS_PATH, dir)) :
+ for dir_ in emoticons_list:
+ if not os.path.isdir(os.path.join(gajim.DATA_DIR, 'emoticons', dir_)) \
+ and not os.path.isdir(os.path.join(gajim.MY_EMOTS_PATH, dir_)) :
continue
- if dir != '.svn':
- l.append(dir)
+ if dir_ != '.svn':
+ l.append(dir_)
l.append(_('Disabled'))
for i in xrange(len(l)):
model.append([l[i]])
@@ -157,9 +157,9 @@
# Set default for single window type
choices = common.config.opt_one_window_types
- type = gajim.config.get('one_message_window')
- if type in choices:
- self.one_window_type_combobox.set_active(choices.index(type))
+ type_ = gajim.config.get('one_message_window')
+ if type_ in choices:
+ self.one_window_type_combobox.set_active(choices.index(type_))
else:
self.one_window_type_combobox.set_active(0)
@@ -216,9 +216,9 @@
'online.png'))
files.append(os.path.join(helpers.get_iconset_path(l[i]), '16x16',
'online.gif'))
- for file in files:
- if os.path.exists(file):
- preview.set_from_file(file)
+ for file_ in files:
+ if os.path.exists(file_):
+ preview.set_from_file(file_)
model.append([preview, l[i]])
if gajim.config.get('iconset') == l[i]:
self.iconset_combobox.set_active(i)
@@ -872,14 +872,14 @@
for status_ in status:
msg = gajim.config.get_per('defaultstatusmsg', status_, 'message')
enabled = gajim.config.get_per('defaultstatusmsg', status_, 'enabled')
- iter = model.append()
+ iter_ = model.append()
uf_show = helpers.get_uf_show(status_)
- model.set(iter, 0, status_, 1, uf_show, 2, msg, 3, enabled)
+ model.set(iter_, 0, status_, 1, uf_show, 2, msg, 3, enabled)
def on_default_msg_cell_edited(self, cell, row, new_text):
model = self.default_msg_tree.get_model()
- iter = model.get_iter_from_string(row)
- model.set_value(iter, 2, new_text)
+ iter_ = model.get_iter_from_string(row)
+ model.set_value(iter_, 2, new_text)
def default_msg_toggled_cb(self, cell, path):
model = self.default_msg_tree.get_model()
@@ -901,16 +901,16 @@
def save_status_messages(self, model):
for msg in gajim.config.get_per('statusmsg'):
gajim.config.del_per('statusmsg', msg)
- iter = model.get_iter_first()
- while iter:
- val = model[iter][0].decode('utf-8')
- if model[iter][1]: # we have a preset message
+ iter_ = model.get_iter_first()
+ while iter_:
+ val = model[iter_][0].decode('utf-8')
+ if model[iter_][1]: # we have a preset message
if not val: # no title, use message text for title
- val = model[iter][1]
+ val = model[iter_][1]
gajim.config.add_per('statusmsg', val)
- msg = helpers.to_one_line(model[iter][1].decode('utf-8'))
+ msg = helpers.to_one_line(model[iter_][1].decode('utf-8'))
gajim.config.set_per('statusmsg', val, 'message', msg)
- iter = model.iter_next(iter)
+ iter_ = model.iter_next(iter_)
gajim.interface.save_config()
def on_msg_treemodel_row_changed(self, model, path, iter_):
@@ -988,45 +988,45 @@
for msg_name in preset_status:
msg_text = gajim.config.get_per('statusmsg', msg_name, 'message')
msg_text = helpers.from_one_line(msg_text)
- iter = model.append()
- model.set(iter, 0, msg_name, 1, msg_text)
+ iter_ = model.append()
+ model.set(iter_, 0, msg_name, 1, msg_text)
def on_msg_cell_edited(self, cell, row, new_text):
model = self.msg_tree.get_model()
- iter = model.get_iter_from_string(row)
- model.set_value(iter, 0, new_text)
+ iter_ = model.get_iter_from_string(row)
+ model.set_value(iter_, 0, new_text)
def on_msg_treeview_cursor_changed(self, widget, data = None):
- (model, iter) = self.msg_tree.get_selection().get_selected()
- if not iter:
+ (model, iter_) = self.msg_tree.get_selection().get_selected()
+ if not iter_:
return
self.xml.get_widget('delete_msg_button').set_sensitive(True)
buf = self.xml.get_widget('msg_textview').get_buffer()
- msg = model[iter][1]
+ msg = model[iter_][1]
buf.set_text(msg)
def on_new_msg_button_clicked(self, widget, data = None):
model = self.msg_tree.get_model()
- iter = model.append()
- model.set(iter, 0, _('status message title'), 1, _('status message text'))
- self.msg_tree.set_cursor(model.get_path(iter))
+ iter_ = model.append()
+ model.set(iter_, 0, _('status message title'), 1, _('status message text'))
+ self.msg_tree.set_cursor(model.get_path(iter_))
def on_delete_msg_button_clicked(self, widget, data = None):
- (model, iter) = self.msg_tree.get_selection().get_selected()
- if not iter:
+ (model, iter_) = self.msg_tree.get_selection().get_selected()
+ if not iter_:
return
buf = self.xml.get_widget('msg_textview').get_buffer()
- model.remove(iter)
+ model.remove(iter_)
buf.set_text('')
self.xml.get_widget('delete_msg_button').set_sensitive(False)
def on_msg_textview_changed(self, widget, data = None):
- (model, iter) = self.msg_tree.get_selection().get_selected()
- if not iter:
+ (model, iter_) = self.msg_tree.get_selection().get_selected()
+ if not iter_:
return
buf = self.xml.get_widget('msg_textview').get_buffer()
first_iter, end_iter = buf.get_bounds()
- model.set_value(iter, 1, buf.get_text(first_iter, end_iter))
+ model.set_value(iter_, 1, buf.get_text(first_iter, end_iter))
def on_msg_treeview_key_press_event(self, widget, event):
if event.keyval == gtk.keysyms.Delete:
@@ -1064,54 +1064,54 @@
model.append((enabled, sound_ui_name, path, sound_event_config_name))
def on_treeview_sounds_cursor_changed(self, widget, data = None):
- (model, iter) = self.sound_tree.get_selection().get_selected()
+ (model, iter_) = self.sound_tree.get_selection().get_selected()
sounds_entry = self.xml.get_widget('sounds_entry')
- if not iter:
+ if not iter_:
sounds_entry.set_text('')
return
- path_to_snd_file = model[iter][2]
+ path_to_snd_file = model[iter_][2]
sounds_entry.set_text(path_to_snd_file)
def on_browse_for_sounds_button_clicked(self, widget, data = None):
- (model, iter) = self.sound_tree.get_selection().get_selected()
- if not iter:
+ (model, iter_) = self.sound_tree.get_selection().get_selected()
+ if not iter_:
return
def on_ok(widget, path_to_snd_file):
self.dialog.destroy()
- model, iter = self.sound_tree.get_selection().get_selected()
+ model, iter_ = self.sound_tree.get_selection().get_selected()
if not path_to_snd_file:
- model[iter][2] = ''
+ model[iter_][2] = ''
self.xml.get_widget('sounds_entry').set_text('')
- model[iter][0] = False
+ model[iter_][0] = False
return
directory = os.path.dirname(path_to_snd_file)
gajim.config.set('last_sounds_dir', directory)
self.xml.get_widget('sounds_entry').set_text(path_to_snd_file)
- model[iter][2] = path_to_snd_file # set new path to sounds_model
- model[iter][0] = True # set the sound to enabled
+ model[iter_][2] = path_to_snd_file # set new path to sounds_model
+ model[iter_][0] = True # set the sound to enabled
def on_cancel(widget):
self.dialog.destroy()
- model, iter = self.sound_tree.get_selection().get_selected()
- model[iter][2] = ''
- model[iter][0] = False
+ model, iter_ = self.sound_tree.get_selection().get_selected()
+ model[iter_][2] = ''
+ model[iter_][0] = False
- path_to_snd_file = model[iter][2].decode('utf-8')
+ path_to_snd_file = model[iter_][2].decode('utf-8')
path_to_snd_file = os.path.join(os.getcwd(), path_to_snd_file)
self.dialog = dialogs.SoundChooserDialog(path_to_snd_file, on_ok,
on_cancel)
def on_sounds_entry_changed(self, widget):
path_to_snd_file = widget.get_text()
- model, iter = self.sound_tree.get_selection().get_selected()
- model[iter][2] = path_to_snd_file # set new path to sounds_model
+ model, iter_ = self.sound_tree.get_selection().get_selected()
+ model[iter_][2] = path_to_snd_file # set new path to sounds_model
def on_play_button_clicked(self, widget):
- model, iter = self.sound_tree.get_selection().get_selected()
- if not iter:
+ model, iter_ = self.sound_tree.get_selection().get_selected()
+ if not iter_:
return
- snd_event_config_name = model[iter][3]
+ snd_event_config_name = model[iter_][3]
helpers.play_sound(snd_event_config_name)
def on_open_advanced_editor_button_clicked(self, widget, data = None):
@@ -1137,11 +1137,11 @@
def fill_proxies_treeview(self):
model = self.proxies_treeview.get_model()
model.clear()
- iter = model.append()
- model.set(iter, 0, _('None'))
+ iter_ = model.append()
+ model.set(iter_, 0, _('None'))
for p in gajim.config.get_per('proxies'):
- iter = model.append()
- model.set(iter, 0, p)
+ iter_ = model.append()
+ model.set(iter_, 0, p)
def init_list(self):
self.xml.get_widget('remove_proxy_button').set_sensitive(False)
@@ -1169,16 +1169,16 @@
i = 1
while ('proxy' + unicode(i)) in proxies:
i += 1
- iter = model.append()
- model.set(iter, 0, 'proxy' + unicode(i))
+ iter_ = model.append()
+ model.set(iter_, 0, 'proxy' + unicode(i))
gajim.config.add_per('proxies', 'proxy' + unicode(i))
def on_remove_proxy_button_clicked(self, widget):
- (model, iter) = self.proxies_treeview.get_selection().get_selected()
- if not iter:
+ (model, iter_) = self.proxies_treeview.get_selection().get_selected()
+ if not iter_:
return
- proxy = model[iter][0].decode('utf-8')
- model.remove(iter)
+ proxy = model[iter_][0].decode('utf-8')
+ model.remove(iter_)
gajim.config.del_per('proxies', proxy)
self.xml.get_widget('remove_proxy_button').set_sensitive(False)
@@ -1193,10 +1193,10 @@
def on_proxies_treeview_cursor_changed(self, widget):
#FIXME: check if off proxy settings are correct (see
# http://trac.gajim.org/changeset/1921#file2 line 1221
- (model, iter) = widget.get_selection().get_selected()
- if not iter:
+ (model, iter_) = widget.get_selection().get_selected()
+ if not iter_:
return
- proxy = model[iter][0]
+ proxy = model[iter_][0]
self.xml.get_widget('proxyname_entry').set_text(proxy)
proxyhost_entry = self.xml.get_widget('proxyhost_entry')
proxyport_entry = self.xml.get_widget('proxyport_entry')
@@ -1238,10 +1238,10 @@
self.on_remove_proxy_button_clicked(widget)
def on_proxyname_entry_changed(self, widget):
- (model, iter) = self.proxies_treeview.get_selection().get_selected()
- if not iter:
+ (model, iter_) = self.proxies_treeview.get_selection().get_selected()
+ if not iter_:
return
- old_name = model.get_value(iter, 0).decode('utf-8')
+ old_name = model.get_value(iter_, 0).decode('utf-8')
new_name = widget.get_text().decode('utf-8')
if new_name == '':
return
@@ -1253,7 +1253,7 @@
for option in config:
gajim.config.set_per('proxies', new_name, option,
config[option][common.config.OPT_VAL])
- model.set_value(iter, 0, new_name)
+ model.set_value(iter_, 0, new_name)
def on_proxytype_combobox_changed(self, widget):
types = ['http', 'socks5']
@@ -1343,13 +1343,13 @@
def select_account(self, account):
model = self.accounts_treeview.get_model()
- iter = model.get_iter_root()
- while iter:
- acct = model[iter][0].decode('utf-8')
+ iter_ = model.get_iter_root()
+ while iter_:
+ acct = model[iter_][0].decode('utf-8')
if account == acct:
- self.accounts_treeview.set_cursor(model.get_path(iter))
+ self.accounts_treeview.set_cursor(model.get_path(iter_))
return
- iter = model.iter_next(iter)
+ iter_ = model.iter_next(iter_)
def init_accounts(self):
'''initialize listStore with existing accounts'''
@@ -1359,8 +1359,8 @@
model = self.accounts_treeview.get_model()
model.clear()
for account in gajim.config.get_per('accounts'):
- iter = model.append()
- model.set(iter, 0, account)
+ iter_ = model.append()
+ model.set(iter_, 0, account)
def resend(self, account):
show = gajim.SHOW_LIST[gajim.connections[account].connected]
@@ -1409,9 +1409,9 @@
def on_accounts_treeview_cursor_changed(self, widget):
'''Activate modify buttons when a row is selected, update accounts info'''
sel = self.accounts_treeview.get_selection()
- (model, iter) = sel.get_selected()
- if iter:
- account = model[iter][0].decode('utf-8')
+ (model, iter_) = sel.get_selected()
+ if iter_:
+ account = model[iter_][0].decode('utf-8')
else:
account = None
if self.current_account and self.current_account == account:
@@ -1441,7 +1441,7 @@
self.remove_button.set_sensitive(True)
self.rename_button.set_sensitive(True)
- if iter:
+ if iter_:
self.current_account = account
if account == gajim.ZEROCONF_ACC_NAME:
self.remove_button.set_sensitive(False)
@@ -2226,11 +2226,11 @@
def on_jabber_id_entry2_changed(self, widget):
if self.ignore_events:
return
- id = widget.get_text().decode('utf-8')
- if self.option_changed('zeroconf_jabber_id', id):
+ id_ = widget.get_text().decode('utf-8')
+ if self.option_changed('zeroconf_jabber_id', id_):
self.need_relogin = True
gajim.config.set_per('accounts', self.current_account,
- 'zeroconf_jabber_id', id)
+ 'zeroconf_jabber_id', id_)
def on_email_entry2_changed(self, widget):
if self.ignore_events:
@@ -2431,8 +2431,8 @@
def on_cell_edited(self, cell, path, new_text):
model = self.affiliation_treeview['outcast'].get_model()
new_text = new_text.decode('utf-8')
- iter = model.get_iter(path)
- model[iter][1] = new_text
+ iter_ = model.get_iter(path)
+ model[iter_][1] = new_text
def on_add_button_clicked(self, widget, affiliation):
if affiliation == 'outcast':
@@ -2470,9 +2470,9 @@
row_refs.append(gtk.TreeRowReference(model, path))
for row_ref in row_refs:
path = row_ref.get_path()
- iter = model.get_iter(path)
- jid = model[iter][0]
- model.remove(iter)
+ iter_ = model.get_iter(path)
+ jid = model[iter_][0]
+ model.remove(iter_)
self.remove_button[affiliation].set_sensitive(False)
def on_affiliation_treeview_cursor_changed(self, widget, affiliation):
@@ -2504,19 +2504,19 @@
users_dict = {}
actual_jid_list = []
model = self.affiliation_treeview[affiliation].get_model()
- iter = model.get_iter_first()
+ iter_ = model.get_iter_first()
# add new jid
- while iter:
- jid = model[iter][0].decode('utf-8')
+ while iter_:
+ jid = model[iter_][0].decode('utf-8')
actual_jid_list.append(jid)
if jid not in self.start_users_dict[affiliation] or \
(affiliation == 'outcast' and 'reason' in self.start_users_dict[affiliation]\
[jid] and self.start_users_dict[affiliation][jid]\
- ['reason'] != model[iter][1].decode('utf-8')):
+ ['reason'] != model[iter_][1].decode('utf-8')):
users_dict[jid] = {'affiliation': affiliation}
if affiliation == 'outcast':
- users_dict[jid]['reason'] = model[iter][1].decode('utf-8')
- iter = model.iter_next(iter)
+ users_dict[jid]['reason'] = model[iter_][1].decode('utf-8')
+ iter_ = model.iter_next(iter_)
# remove removed one
for jid in self.start_users_dict[affiliation]:
if jid not in actual_jid_list:
@@ -2642,7 +2642,7 @@
continue
if not gajim.connections[account].private_storage_supported:
continue
- iter = self.treestore.append(None, [None, account, None, None,
+ iter_ = self.treestore.append(None, [None, account, None, None,
None, None, None, None])
for bookmark in gajim.connections[account].bookmarks:
@@ -2662,7 +2662,7 @@
print_status = bookmark.get('print_status', '')
if print_status not in ('', 'all', 'in_and_out', 'none'):
print_status = ''
- self.treestore.append( iter, [
+ self.treestore.append(iter_, [
account,
bookmark['name'],
bookmark['jid'],
@@ -2714,12 +2714,12 @@
self.window.show_all()
def on_bookmarks_treeview_button_press_event(self, widget, event):
- (model, iter) = self.selection.get_selected()
- if not iter:
+ (model, iter_) = self.selection.get_selected()
+ if not iter_:
# Removed a bookmark before
return
- if model.iter_parent(iter):
+ if model.iter_parent(iter_):
# The currently selected node is a bookmark
return not self.check_valid_bookmark()
@@ -2730,18 +2730,18 @@
'''Add a new bookmark.'''
# Get the account that is currently used
# (the parent of the currently selected item)
- (model, iter) = self.selection.get_selected()
- if not iter: # Nothing selected, do nothing
+ (model, iter_) = self.selection.get_selected()
+ if not iter_: # Nothing selected, do nothing
return
- parent = model.iter_parent(iter)
+ parent = model.iter_parent(iter_)
if parent:
# We got a bookmark selected, so we add_to the parent
add_to = parent
else:
# No parent, so we got an account -> add to this.
- add_to = iter
+ add_to = iter_
account = model[add_to][1].decode('utf-8')
nick = gajim.nicks[account]
@@ -2755,24 +2755,24 @@
'''
Remove selected bookmark.
'''
- (model, iter) = self.selection.get_selected()
- if not iter: # Nothing selected
+ (model, iter_) = self.selection.get_selected()
+ if not iter_: # Nothing selected
return
- if not model.iter_parent(iter):
+ if not model.iter_parent(iter_):
# Don't remove account iters
return
- model.remove(iter)
+ model.remove(iter_)
self.clear_fields()
def check_valid_bookmark(self):
'''
Check if all neccessary fields are entered correctly.
'''
- (model, iter) = self.selection.get_selected()
+ (model, iter_) = self.selection.get_selected()
- if not model.iter_parent(iter):
+ if not model.iter_parent(iter_):
#Account data can't be changed
return
@@ -2790,8 +2790,8 @@
Parse the treestore data into our new bookmarks array,
then send the new bookmarks to the server.
'''
- (model, iter) = self.selection.get_selected()
- if iter and model.iter_parent(iter):
+ (model, iter_) = self.selection.get_selected()
+ if iter_ and model.iter_parent(iter_):
#bookmark selected, check it
if not self.check_valid_bookmark():
return
@@ -2823,9 +2823,9 @@
'''
Fill in the bookmark's data into the fields.
'''
- (model, iter) = selection.get_selected()
+ (model, iter_) = selection.get_selected()
- if not iter:
+ if not iter_:
# After removing the last bookmark for one account
# this will be None, so we will just:
return
@@ -2834,7 +2834,7 @@
self.server_entry, self.pass_entry, self.autojoin_checkbutton,
self.minimize_checkbutton, self.print_status_combobox]
- if model.iter_parent(iter):
+ if model.iter_parent(iter_):
# make the fields sensitive
for field in widgets:
field.set_sensitive(True)
@@ -2847,8 +2847,8 @@
return
# Fill in the data for childs
- self.title_entry.set_text(model[iter][1])
- room_jid = model[iter][2].decode('utf-8')
+ self.title_entry.set_text(model[iter_][1])
+ room_jid = model[iter_][2].decode('utf-8')
try:
(room, server) = room_jid.split('@')
except ValueError:
@@ -2858,13 +2858,13 @@
self.room_entry.set_text(room)
self.server_entry.set_text(server)
- self.autojoin_checkbutton.set_active(model[iter][3])
- self.minimize_checkbutton.set_active(model[iter][4])
+ self.autojoin_checkbutton.set_active(model[iter_][3])
+ self.minimize_checkbutton.set_active(model[iter_][4])
# sensitive only if auto join is checked
- self.minimize_checkbutton.set_sensitive(model[iter][3])
+ self.minimize_checkbutton.set_sensitive(model[iter_][3])
- if model[iter][5] is not None:
- password = model[iter][5].decode('utf-8')
+ if model[iter_][5] is not None:
+ password = model[iter_][5].decode('utf-8')
else:
password = None
@@ -2872,66 +2872,66 @@
self.pass_entry.set_text(password)
else:
self.pass_entry.set_text('')
- nick = model[iter][6]
+ nick = model[iter_][6]
if nick:
nick = nick.decode('utf-8')
self.nick_entry.set_text(nick)
else:
self.nick_entry.set_text('')
- print_status = model[iter][7]
+ print_status = model[iter_][7]
opts = sorted(self.option_list.keys())
self.print_status_combobox.set_active(opts.index(print_status))
def on_title_entry_changed(self, widget):
- (model, iter) = self.selection.get_selected()
- if iter: # After removing a bookmark, we got nothing selected
- if model.iter_parent(iter):
+ (model, iter_) = self.selection.get_selected()
+ if iter_: # After removing a bookmark, we got nothing selected
+ if model.iter_parent(iter_):
# Don't clear the title field for account nodes
- model[iter][1] = self.title_entry.get_text()
+ model[iter_][1] = self.title_entry.get_text()
def on_nick_entry_changed(self, widget):
- (model, iter) = self.selection.get_selected()
- if iter:
- model[iter][6] = self.nick_entry.get_text()
+ (model, iter_) = self.selection.get_selected()
+ if iter_:
+ model[iter_][6] = self.nick_entry.get_text()
def on_server_entry_changed(self, widget):
- (model, iter) = self.selection.get_selected()
- if iter:
+ (model, iter_) = self.selection.get_selected()
+ if iter_:
room_jid = self.room_entry.get_text().decode('utf-8').strip() + '@' + \
self.server_entry.get_text().decode('utf-8').strip()
- model[iter][2] = room_jid.replace(' ', '')
+ model[iter_][2] = room_jid.replace(' ', '')
def on_room_entry_changed(self, widget):
- (model, iter) = self.selection.get_selected()
- if iter:
+ (model, iter_) = self.selection.get_selected()
+ if iter_:
room_jid = self.room_entry.get_text().decode('utf-8') + '@' + \
self.server_entry.get_text().decode('utf-8')
- model[iter][2] = room_jid
+ model[iter_][2] = room_jid
def on_pass_entry_changed(self, widget):
- (model, iter) = self.selection.get_selected()
- if iter:
- model[iter][5] = self.pass_entry.get_text()
+ (model, iter_) = self.selection.get_selected()
+ if iter_:
+ model[iter_][5] = self.pass_entry.get_text()
def on_autojoin_checkbutton_toggled(self, widget):
- (model, iter) = self.selection.get_selected()
- if iter:
- model[iter][3] = self.autojoin_checkbutton.get_active()
- self.minimize_checkbutton.set_sensitive(model[iter][3])
+ (model, iter_) = self.selection.get_selected()
+ if iter_:
+ model[iter_][3] = self.autojoin_checkbutton.get_active()
+ self.minimize_checkbutton.set_sensitive(model[iter_][3])
def on_minimize_checkbutton_toggled(self, widget):
- (model, iter) = self.selection.get_selected()
- if iter:
- model[iter][4] = self.minimize_checkbutton.get_active()
+ (model, iter_) = self.selection.get_selected()
+ if iter_:
+ model[iter_][4] = self.minimize_checkbutton.get_active()
def on_print_status_combobox_changed(self, widget):
active = widget.get_active()
model = widget.get_model()
print_status = model[active][1]
- (model2, iter) = self.selection.get_selected()
- if iter:
- model2[iter][7] = print_status
+ (model2, iter_) = self.selection.get_selected()
+ if iter_:
+ model2[iter_][7] = print_status
def clear_fields(self):
widgets = [ self.title_entry, self.nick_entry, self.room_entry,
@@ -3504,19 +3504,19 @@
def node_removed(self, node):
model = self.treeview.get_model()
- iter = model.get_iter_root()
- while iter:
- if model[iter][0] == node:
- model.remove(iter)
+ iter_ = model.get_iter_root()
+ while iter_:
+ if model[iter_][0] == node:
+ model.remove(iter_)
break
- iter = model.get_iter_next(iter)
+ iter_ = model.get_iter_next(iter_)
def on_delete_button_clicked(self, widget):
selection = self.treeview.get_selection()
if not selection:
return
- model, iter = selection.get_selected()
- node = model[iter][0]
+ model, iter_ = selection.get_selected()
+ node = model[iter_][0]
our_jid = gajim.get_jid_from_account(self.account)
gajim.connections[self.account].send_pb_delete(our_jid, node)
@@ -3524,8 +3524,8 @@
selection = self.treeview.get_selection()
if not selection:
return
- model, iter = selection.get_selected()
- node = model[iter][0]
+ model, iter_ = selection.get_selected()
+ node = model[iter_][0]
our_jid = gajim.get_jid_from_account(self.account)
gajim.connections[self.account].request_pb_configuration(our_jid, node)
Modified: trunk/src/conversation_textview.py
===================================================================
--- trunk/src/conversation_textview.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/conversation_textview.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -79,9 +79,9 @@
def _get_selected(self):
parent = self.get_parent()
if not parent or not self.anchor: return False
- buffer = parent.get_buffer()
- position = buffer.get_iter_at_child_anchor(self.anchor)
- bounds = buffer.get_selection_bounds()
+ buffer_ = parent.get_buffer()
+ position = buffer_.get_iter_at_child_anchor(self.anchor)
+ bounds = buffer_.get_selection_bounds()
if bounds and position.in_range(*bounds):
return True
else:
@@ -106,9 +106,9 @@
self.queue_draw()
def _do_connect(self, widget, signal, callback):
- id = widget.connect(signal, callback)
+ id_ = widget.connect(signal, callback)
def disconnect():
- widget.disconnect(id)
+ widget.disconnect(id_)
self._disconnect_funcs.append(disconnect)
def _disconnect_signals(self):
@@ -196,18 +196,18 @@
self.auto_scrolling = False
# connect signals
- id = self.tv.connect('motion_notify_event',
+ id_ = self.tv.connect('motion_notify_event',
self.on_textview_motion_notify_event)
- self.handlers[id] = self.tv
- id = self.tv.connect('populate_popup', self.on_textview_populate_popup)
- self.handlers[id] = self.tv
- id = self.tv.connect('button_press_event',
+ self.handlers[id_] = self.tv
+ id_ = self.tv.connect('populate_popup', self.on_textview_populate_popup)
+ self.handlers[id_] = self.tv
+ id_ = self.tv.connect('button_press_event',
self.on_textview_button_press_event)
- self.handlers[id] = self.tv
+ self.handlers[id_] = self.tv
- id = self.tv.connect('expose-event',
+ id_ = self.tv.connect('expose-event',
self.on_textview_expose_event)
- self.handlers[id] = self.tv
+ self.handlers[id_] = self.tv
self.account = account
@@ -216,17 +216,17 @@
font = pango.FontDescription(gajim.config.get('conversation_font'))
self.tv.modify_font(font)
- buffer = self.tv.get_buffer()
- end_iter = buffer.get_end_iter()
- buffer.create_mark('end', end_iter, False)
+ buffer_ = self.tv.get_buffer()
+ end_iter = buffer_.get_end_iter()
+ buffer_.create_mark('end', end_iter, False)
- self.tagIn = buffer.create_tag('incoming')
+ self.tagIn = buffer_.create_tag('incoming')
color = gajim.config.get('inmsgcolor')
self.tagIn.set_property('foreground', color)
- self.tagOut = buffer.create_tag('outgoing')
+ self.tagOut = buffer_.create_tag('outgoing')
color = gajim.config.get('outmsgcolor')
self.tagOut.set_property('foreground', color)
- self.tagStatus = buffer.create_tag('status')
+ self.tagStatus = buffer_.create_tag('status')
color = gajim.config.get('statusmsgcolor')
self.tagStatus.set_property('foreground', color)
@@ -234,64 +234,64 @@
colors = colors.split(':')
for i,color in enumerate(colors):
tagname = 'gc_nickname_color_' + str(i)
- tag = buffer.create_tag(tagname)
+ tag = buffer_.create_tag(tagname)
tag.set_property('foreground', color)
- tag = buffer.create_tag('marked')
+ tag = buffer_.create_tag('marked')
color = gajim.config.get('markedmsgcolor')
tag.set_property('foreground', color)
tag.set_property('weight', pango.WEIGHT_BOLD)
- tag = buffer.create_tag('time_sometimes')
+ tag = buffer_.create_tag('time_sometimes')
tag.set_property('foreground', 'darkgrey')
tag.set_property('scale', pango.SCALE_SMALL)
tag.set_property('justification', gtk.JUSTIFY_CENTER)
- tag = buffer.create_tag('small')
+ tag = buffer_.create_tag('small')
tag.set_property('scale', pango.SCALE_SMALL)
- tag = buffer.create_tag('restored_message')
+ tag = buffer_.create_tag('restored_message')
color = gajim.config.get('restored_messages_color')
tag.set_property('foreground', color)
- self.tagURL = buffer.create_tag('url')
+ self.tagURL = buffer_.create_tag('url')
color = gajim.config.get('urlmsgcolor')
self.tagURL.set_property('foreground', color)
self.tagURL.set_property('underline', pango.UNDERLINE_SINGLE)
- id = self.tagURL.connect('event', self.hyperlink_handler, 'url')
- self.handlers[id] = self.tagURL
+ id_ = self.tagURL.connect('event', self.hyperlink_handler, 'url')
+ self.handlers[id_] = self.tagURL
- self.tagMail = buffer.create_tag('mail')
+ self.tagMail = buffer_.create_tag('mail')
self.tagMail.set_property('foreground', color)
self.tagMail.set_property('underline', pango.UNDERLINE_SINGLE)
- id = self.tagMail.connect('event', self.hyperlink_handler, 'mail')
- self.handlers[id] = self.tagMail
+ id_ = self.tagMail.connect('event', self.hyperlink_handler, 'mail')
+ self.handlers[id_] = self.tagMail
- self.tagXMPP = buffer.create_tag('xmpp')
+ self.tagXMPP = buffer_.create_tag('xmpp')
self.tagXMPP.set_property('foreground', color)
self.tagXMPP.set_property('underline', pango.UNDERLINE_SINGLE)
- id = self.tagXMPP.connect('event', self.hyperlink_handler, 'xmpp')
- self.handlers[id] = self.tagXMPP
+ id_ = self.tagXMPP.connect('event', self.hyperlink_handler, 'xmpp')
+ self.handlers[id_] = self.tagXMPP
- self.tagSthAtSth = buffer.create_tag('sth_at_sth')
+ self.tagSthAtSth = buffer_.create_tag('sth_at_sth')
self.tagSthAtSth.set_property('foreground', color)
self.tagSthAtSth.set_property('underline', pango.UNDERLINE_SINGLE)
- id = self.tagSthAtSth.connect('event', self.hyperlink_handler,
+ id_ = self.tagSthAtSth.connect('event', self.hyperlink_handler,
'sth_at_sth')
- self.handlers[id] = self.tagSthAtSth
+ self.handlers[id_] = self.tagSthAtSth
- tag = buffer.create_tag('bold')
+ tag = buffer_.create_tag('bold')
tag.set_property('weight', pango.WEIGHT_BOLD)
- tag = buffer.create_tag('italic')
+ tag = buffer_.create_tag('italic')
tag.set_property('style', pango.STYLE_ITALIC)
- tag = buffer.create_tag('underline')
+ tag = buffer_.create_tag('underline')
tag.set_property('underline', pango.UNDERLINE_SINGLE)
- buffer.create_tag('focus-out-line', justification = gtk.JUSTIFY_CENTER)
+ buffer_.create_tag('focus-out-line', justification = gtk.JUSTIFY_CENTER)
- tag = buffer.create_tag('xep0184-warning')
+ tag = buffer_.create_tag('xep0184-warning')
# One mark at the begining then 2 marks between each lines
size = gajim.config.get('max_conversation_lines')
@@ -327,8 +327,8 @@
self.tagMail.set_property('foreground', gajim.config.get('urlmsgcolor'))
def at_the_end(self):
- buffer = self.tv.get_buffer()
- end_iter = buffer.get_end_iter()
+ buffer_ = self.tv.get_buffer()
+ end_iter = buffer_.get_end_iter()
end_rect = self.tv.get_iter_location(end_iter)
visible_rect = self.tv.get_visible_rect()
if end_rect.y <= (visible_rect.y + visible_rect.height):
@@ -383,8 +383,8 @@
def scroll_to_end(self):
parent = self.tv.get_parent()
- buffer = self.tv.get_buffer()
- end_mark = buffer.get_mark('end')
+ buffer_ = self.tv.get_buffer()
+ end_mark = buffer_.get_mark('end')
if not end_mark:
return False
self.auto_scrolling = True
@@ -397,8 +397,8 @@
def bring_scroll_to_end(self, diff_y = 0,
use_smooth=gajim.config.get('use_smooth_scrolling')):
''' scrolls to the end of textview if end is not visible '''
- buffer = self.tv.get_buffer()
- end_iter = buffer.get_end_iter()
+ buffer_ = self.tv.get_buffer()
+ end_iter = buffer_.get_end_iter()
end_rect = self.tv.get_iter_location(end_iter)
visible_rect = self.tv.get_visible_rect()
# scroll only if expected end is not visible
@@ -409,8 +409,8 @@
gobject.idle_add(self.scroll_to_end_iter)
def scroll_to_end_iter(self):
- buffer = self.tv.get_buffer()
- end_iter = buffer.get_end_iter()
+ buffer_ = self.tv.get_buffer()
+ end_iter = buffer_.get_end_iter()
if not end_iter:
return False
self.tv.scroll_to_iter(end_iter, 0, False, 1, 1)
@@ -426,11 +426,11 @@
if id_ in self.xep0184_marks:
return
- buffer = self.tv.get_buffer()
- buffer.begin_user_action()
+ buffer_ = self.tv.get_buffer()
+ buffer_.begin_user_action()
- self.xep0184_marks[id_] = buffer.create_mark(None,
- buffer.get_end_iter(), left_gravity=True)
+ self.xep0184_marks[id_] = buffer_.create_mark(None,
+ buffer_.get_end_iter(), left_gravity=True)
self.xep0184_shown[id_] = NOT_SHOWN
def show_it():
@@ -438,24 +438,24 @@
self.xep0184_shown[id_] == ALREADY_RECEIVED:
return False
- end_iter = buffer.get_iter_at_mark(
+ end_iter = buffer_.get_iter_at_mark(
self.xep0184_marks[id_])
- buffer.insert(end_iter, ' ')
- buffer.insert_pixbuf(end_iter,
+ buffer_.insert(end_iter, ' ')
+ buffer_.insert_pixbuf(end_iter,
ConversationTextview.XEP0184_WARNING_PIXBUF)
- before_img_iter = buffer.get_iter_at_mark(
+ before_img_iter = buffer_.get_iter_at_mark(
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,
+ buffer_.apply_tag_by_name('xep0184-warning', before_img_iter,
post_img_iter)
self.xep0184_shown[id_] = SHOWN
return False
gobject.timeout_add_seconds(3, show_it)
- buffer.end_user_action()
+ buffer_.end_user_action()
def hide_xep0184_warning(self, id_):
if id_ not in self.xep0184_marks:
@@ -465,20 +465,20 @@
self.xep0184_shown[id_] = ALREADY_RECEIVED
return
- buffer = self.tv.get_buffer()
- buffer.begin_user_action()
+ 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?
end_iter.forward_char()
end_iter.forward_char()
- buffer.delete(begin_iter, end_iter)
- buffer.delete_mark(self.xep0184_marks[id_])
+ buffer_.delete(begin_iter, end_iter)
+ buffer_.delete_mark(self.xep0184_marks[id_])
- buffer.end_user_action()
+ buffer_.end_user_action()
del self.xep0184_marks[id_]
del self.xep0184_shown[id_]
@@ -490,57 +490,57 @@
return
print_focus_out_line = False
- buffer = self.tv.get_buffer()
+ buffer_ = self.tv.get_buffer()
if self.focus_out_end_mark is None:
# this happens only first time we focus out on this room
print_focus_out_line = True
else:
- focus_out_end_iter = buffer.get_iter_at_mark(self.focus_out_end_mark)
+ focus_out_end_iter = buffer_.get_iter_at_mark(self.focus_out_end_mark)
focus_out_end_iter_offset = focus_out_end_iter.get_offset()
- if focus_out_end_iter_offset != buffer.get_end_iter().get_offset():
+ if focus_out_end_iter_offset != buffer_.get_end_iter().get_offset():
# this means after last-focus something was printed
# (else end_iter's offset is the same as before)
# only then print ---- line (eg. we avoid printing many following
# ---- lines)
print_focus_out_line = True
- if print_focus_out_line and buffer.get_char_count() > 0:
- buffer.begin_user_action()
+ if print_focus_out_line and buffer_.get_char_count() > 0:
+ buffer_.begin_user_action()
# remove previous focus out line if such focus out line exists
if self.focus_out_end_mark is not None:
- end_iter_for_previous_line = buffer.get_iter_at_mark(
+ end_iter_for_previous_line = buffer_.get_iter_at_mark(
self.focus_out_end_mark)
begin_iter_for_previous_line = end_iter_for_previous_line.copy()
# img_char+1 (the '\n')
begin_iter_for_previous_line.backward_chars(2)
# remove focus out line
- buffer.delete(begin_iter_for_previous_line,
+ buffer_.delete(begin_iter_for_previous_line,
end_iter_for_previous_line)
- buffer.delete_mark(self.focus_out_end_mark)
+ buffer_.delete_mark(self.focus_out_end_mark)
# add the new focus out line
- end_iter = buffer.get_end_iter()
- buffer.insert(end_iter, '\n')
- buffer.insert_pixbuf(end_iter,
+ end_iter = buffer_.get_end_iter()
+ buffer_.insert(end_iter, '\n')
+ buffer_.insert_pixbuf(end_iter,
ConversationTextview.FOCUS_OUT_LINE_PIXBUF)
- end_iter = buffer.get_end_iter()
+ end_iter = buffer_.get_end_iter()
before_img_iter = end_iter.copy()
# one char back (an image also takes one char)
before_img_iter.backward_char()
- buffer.apply_tag_by_name('focus-out-line', before_img_iter, end_iter)
+ buffer_.apply_tag_by_name('focus-out-line', before_img_iter, end_iter)
self.allow_focus_out_line = False
# update the iter we hold to make comparison the next time
- self.focus_out_end_mark = buffer.create_mark(None,
- buffer.get_end_iter(), left_gravity=True)
+ self.focus_out_end_mark = buffer_.create_mark(None,
+ buffer_.get_end_iter(), left_gravity=True)
- buffer.end_user_action()
+ buffer_.end_user_action()
# scroll to the end (via idle in case the scrollbar has appeared)
gobject.idle_add(self.scroll_to_end)
@@ -653,9 +653,9 @@
def clear(self, tv = None):
'''clear text in the textview'''
- buffer = self.tv.get_buffer()
- start, end = buffer.get_bounds()
- buffer.delete(start, end)
+ buffer_ = self.tv.get_buffer()
+ start, end = buffer_.get_bounds()
+ buffer_.delete(start, end)
size = gajim.config.get('max_conversation_lines')
size = 2 * size - 1
self.marks_queue = Queue.Queue(size)
@@ -679,8 +679,8 @@
item = gtk.ImageMenuItem(gtk.STOCK_CLEAR)
menu.prepend(item)
- id = item.connect('activate', self.clear)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.clear)
+ self.handlers[id_] = item
if self.selected_phrase:
if not separator_menuitem_was_added:
@@ -702,8 +702,8 @@
link = 'http://%s.wikipedia.org/wiki/Special:Search?search=%s'\
% (gajim.LANG, self.selected_phrase)
item = gtk.MenuItem(_('Read _Wikipedia Article'))
- id = item.connect('activate', self.visit_url_from_menuitem, link)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.visit_url_from_menuitem, link)
+ self.handlers[id_] = item
submenu.append(item)
item = gtk.MenuItem(_('Look it up in _Dictionary'))
@@ -717,8 +717,8 @@
else:
link = 'http://%s.wiktionary.org/wiki/Special:Search?search=%s'\
% (gajim.LANG, self.selected_phrase)
- id = item.connect('activate', self.visit_url_from_menuitem, link)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.visit_url_from_menuitem, link)
+ self.handlers[id_] = item
else:
if dict_link.find('%s') == -1:
# we must have %s in the url if not WIKTIONARY
@@ -727,9 +727,9 @@
item.set_property('sensitive', False)
else:
link = dict_link % self.selected_phrase
- id = item.connect('activate', self.visit_url_from_menuitem,
+ id_ = item.connect('activate', self.visit_url_from_menuitem,
link)
- self.handlers[id] = item
+ self.handlers[id_] = item
submenu.append(item)
@@ -741,13 +741,13 @@
else:
item = gtk.MenuItem(_('Web _Search for it'))
link = search_link % self.selected_phrase
- id = item.connect('activate', self.visit_url_from_menuitem, link)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.visit_url_from_menuitem, link)
+ self.handlers[id_] = item
submenu.append(item)
item = gtk.MenuItem(_('Open as _Link'))
- id = item.connect('activate', self.visit_url_from_menuitem, link)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.visit_url_from_menuitem, link)
+ self.handlers[id_] = item
submenu.append(item)
menu.show_all()
@@ -762,8 +762,8 @@
x, y = self.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT,
int(event.x), int(event.y))
- iter = self.tv.get_iter_at_location(x, y)
- tags = iter.get_tags()
+ iter_ = self.tv.get_iter_at_location(x, y)
+ tags = iter_.get_tags()
if tags: # we clicked on sth special (it can be status message too)
@@ -775,22 +775,22 @@
# we check if sth was selected and if it was we assign
# selected_phrase variable
# so on_conversation_textview_populate_popup can use it
- buffer = self.tv.get_buffer()
- return_val = buffer.get_selection_bounds()
+ buffer_ = self.tv.get_buffer()
+ return_val = buffer_.get_selection_bounds()
if return_val: # if sth was selected when we right-clicked
# get the selected text
start_sel, finish_sel = return_val[0], return_val[1]
- self.selected_phrase = buffer.get_text(start_sel, finish_sel).decode(
+ self.selected_phrase = buffer_.get_text(start_sel, finish_sel).decode(
'utf-8')
- elif ord(iter.get_char()) > 31:
+ elif ord(iter_.get_char()) > 31:
# we clicked on a word, do as if it's selected for context menu
- start_sel = iter.copy()
+ start_sel = iter_.copy()
if not start_sel.starts_word():
start_sel.backward_word_start()
- finish_sel = iter.copy()
+ finish_sel = iter_.copy()
if not finish_sel.ends_word():
finish_sel.forward_word_end()
- self.selected_phrase = buffer.get_text(start_sel, finish_sel).decode(
+ self.selected_phrase = buffer_.get_text(start_sel, finish_sel).decode(
'utf-8')
def on_open_link_activate(self, widget, kind, text):
@@ -823,11 +823,11 @@
menu = xml.get_widget('chat_context_menu')
childs = menu.get_children()
if kind == 'url':
- id = childs[0].connect('activate', self.on_copy_link_activate, text)
- self.handlers[id] = childs[0]
- id = childs[1].connect('activate', self.on_open_link_activate, kind,
+ id_ = childs[0].connect('activate', self.on_copy_link_activate, text)
+ self.handlers[id_] = childs[0]
+ id_ = childs[1].connect('activate', self.on_open_link_activate, kind,
text)
- self.handlers[id] = childs[1]
+ self.handlers[id_] = childs[1]
childs[2].hide() # copy mail address
childs[3].hide() # open mail composer
childs[4].hide() # jid section separator
@@ -844,16 +844,16 @@
text = text.lower()
if text.startswith('xmpp:'):
text = text[5:]
- id = childs[2].connect('activate', self.on_copy_link_activate, text)
- self.handlers[id] = childs[2]
- id = childs[3].connect('activate', self.on_open_link_activate, kind,
+ id_ = childs[2].connect('activate', self.on_copy_link_activate, text)
+ self.handlers[id_] = childs[2]
+ id_ = childs[3].connect('activate', self.on_open_link_activate, kind,
text)
- self.handlers[id] = childs[3]
- id = childs[5].connect('activate', self.on_start_chat_activate, text)
- self.handlers[id] = childs[5]
- id = childs[6].connect('activate',
+ self.handlers[id_] = childs[3]
+ id_ = childs[5].connect('activate', self.on_start_chat_activate, text)
+ self.handlers[id_] = childs[5]
+ id_ = childs[6].connect('activate',
self.on_join_group_chat_menuitem_activate, text)
- self.handlers[id] = childs[6]
+ self.handlers[id_] = childs[6]
allow_add = False
c = gajim.contacts.get_first_contact_from_jid(self.account, text)
@@ -864,9 +864,9 @@
allow_add = True
if allow_add:
- id = childs[7].connect('activate', self.on_add_to_roster_activate,
+ id_ = childs[7].connect('activate', self.on_add_to_roster_activate,
text)
- self.handlers[id] = childs[7]
+ self.handlers[id_] = childs[7]
childs[7].show() # show add to roster menuitem
else:
childs[7].hide() # hide add to roster menuitem
@@ -933,7 +933,7 @@
after *last* special text, so we can print it in
print_conversation_line()'''
- buffer = self.tv.get_buffer()
+ buffer_ = self.tv.get_buffer()
start = 0
end = 0
@@ -949,9 +949,9 @@
special_text = otext[start:end]
if start != 0:
text_before_special_text = otext[index:start]
- end_iter = buffer.get_end_iter()
+ end_iter = buffer_.get_end_iter()
# we insert normal text
- buffer.insert_with_tags_by_name(end_iter,
+ buffer_.insert_with_tags_by_name(end_iter,
text_before_special_text, *other_tags)
index = end # update index
@@ -997,10 +997,10 @@
texstr += str_
texstr += '\\end{gather*}\\end{large}\\end{document}'
- file = open(os.path.join(tmpfile + '.tex'), 'w+')
- file.write(texstr)
- file.flush()
- file.close()
+ file_ = open(os.path.join(tmpfile + '.tex'), 'w+')
+ file_.write(texstr)
+ file_.flush()
+ file_.close()
try:
if os.name == 'nt':
@@ -1057,7 +1057,7 @@
text_is_valid_uri = False
show_ascii_formatting_chars = \
gajim.config.get('show_ascii_formatting_chars')
- buffer = self.tv.get_buffer()
+ buffer_ = self.tv.get_buffer()
# Check if we accept this as an uri
schemes = gajim.config.get('uri_schemes').split()
@@ -1070,8 +1070,8 @@
possible_emot_ascii_caps in gajim.interface.emoticons.keys():
# it's an emoticon
emot_ascii = possible_emot_ascii_caps
- end_iter = buffer.get_end_iter()
- anchor = buffer.create_child_anchor(end_iter)
+ end_iter = buffer_.get_end_iter()
+ anchor = buffer_.create_child_anchor(end_iter)
img = TextViewImage(anchor)
animations = gajim.interface.emoticons_animations
if not emot_ascii in animations:
@@ -1150,8 +1150,8 @@
gobject.idle_add(self.print_conversation_line, str(e), '', 'info',
'', None)
imagepath = None
- end_iter = buffer.get_end_iter()
- anchor = buffer.create_child_anchor(end_iter)
+ end_iter = buffer_.get_end_iter()
+ anchor = buffer_.create_child_anchor(end_iter)
if imagepath is not None:
img = gtk.Image()
img.set_from_file(imagepath)
@@ -1164,41 +1164,41 @@
except Exception:
pass
else:
- buffer.insert(end_iter, special_text)
+ buffer_.insert(end_iter, special_text)
use_other_tags = False
else:
# It's nothing special
if use_other_tags:
- end_iter = buffer.get_end_iter()
- buffer.insert_with_tags_by_name(end_iter, special_text, *other_tags)
+ end_iter = buffer_.get_end_iter()
+ buffer_.insert_with_tags_by_name(end_iter, special_text, *other_tags)
if len(tags) > 0:
- end_iter = buffer.get_end_iter()
+ end_iter = buffer_.get_end_iter()
all_tags = tags[:]
if use_other_tags:
all_tags += other_tags
- buffer.insert_with_tags_by_name(end_iter, special_text, *all_tags)
+ buffer_.insert_with_tags_by_name(end_iter, special_text, *all_tags)
def print_empty_line(self):
- buffer = self.tv.get_buffer()
- end_iter = buffer.get_end_iter()
- buffer.insert_with_tags_by_name(end_iter, '\n', 'eol')
+ buffer_ = self.tv.get_buffer()
+ end_iter = buffer_.get_end_iter()
+ buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol')
def print_conversation_line(self, text, jid, kind, name, tim,
other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[],
subject=None, old_kind=None, xhtml=None, simple=False):
'''prints 'chat' type messages'''
- buffer = self.tv.get_buffer()
- buffer.begin_user_action()
+ buffer_ = self.tv.get_buffer()
+ buffer_.begin_user_action()
if self.marks_queue.full():
# remove oldest line
m1 = self.marks_queue.get()
m2 = self.marks_queue.get()
- i1 = buffer.get_iter_at_mark(m1)
- i2 = buffer.get_iter_at_mark(m2)
- buffer.delete(i1, i2)
- buffer.delete_mark(m1)
- end_iter = buffer.get_end_iter()
+ i1 = buffer_.get_iter_at_mark(m1)
+ i2 = buffer_.get_iter_at_mark(m2)
+ buffer_.delete(i1, i2)
+ buffer_.delete_mark(m1)
+ end_iter = buffer_.get_end_iter()
at_the_end = False
if self.at_the_end():
at_the_end = True
@@ -1206,13 +1206,13 @@
# Create one mark and add it to queue once if it's the first line
# else twice (one for end bound, one for start bound)
mark = None
- if buffer.get_char_count() > 0:
+ if buffer_.get_char_count() > 0:
if not simple:
- buffer.insert_with_tags_by_name(end_iter, '\n', 'eol')
- mark = buffer.create_mark(None, end_iter, left_gravity=True)
+ buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol')
+ mark = buffer_.create_mark(None, end_iter, left_gravity=True)
self.marks_queue.put(mark)
if not mark:
- mark = buffer.create_mark(None, end_iter, left_gravity=True)
+ mark = buffer_.create_mark(None, end_iter, left_gravity=True)
self.marks_queue.put(mark)
if kind == 'incoming_queue':
kind = 'incoming'
@@ -1226,7 +1226,7 @@
if current_print_time == 'always' and kind != 'info' and not simple:
timestamp_str = self.get_time_to_show(tim)
timestamp = time.strftime(timestamp_str, tim)
- buffer.insert_with_tags_by_name(end_iter, timestamp,
+ buffer_.insert_with_tags_by_name(end_iter, timestamp,
*other_tags_for_time)
elif current_print_time == 'sometimes' and kind != 'info' and not simple:
every_foo_seconds = 60 * gajim.config.get(
@@ -1234,7 +1234,7 @@
seconds_passed = time.mktime(tim) - self.last_time_printout
if seconds_passed > every_foo_seconds:
self.last_time_printout = time.mktime(tim)
- end_iter = buffer.get_end_iter()
+ end_iter = buffer_.get_end_iter()
if gajim.config.get('print_time_fuzzy') > 0:
fc = FuzzyClock()
fc.setTime(time.strftime('%H:%M', tim))
@@ -1242,7 +1242,7 @@
tim_format = ft.decode(locale.getpreferredencoding())
else:
tim_format = self.get_time_to_show(tim)
- buffer.insert_with_tags_by_name(end_iter, tim_format + '\n',
+ buffer_.insert_with_tags_by_name(end_iter, tim_format + '\n',
'time_sometimes')
# kind = info, we print things as if it was a status: same color, ...
if kind == 'info':
@@ -1273,7 +1273,7 @@
else:
gobject.idle_add(self.scroll_to_end)
- buffer.end_user_action()
+ buffer_.end_user_action()
def get_time_to_show(self, tim):
'''Get the time, with the day before if needed and return it.
@@ -1312,8 +1312,8 @@
def print_name(self, name, kind, other_tags_for_name):
if name:
- buffer = self.tv.get_buffer()
- end_iter = buffer.get_end_iter()
+ buffer_ = self.tv.get_buffer()
+ end_iter = buffer_.get_end_iter()
name_tags = other_tags_for_name[:] # create a new list
name_tags.append(kind)
before_str = gajim.config.get('before_nickname')
@@ -1321,14 +1321,14 @@
after_str = gajim.config.get('after_nickname')
after_str = helpers.from_one_line(after_str)
format = before_str + name + after_str + ' '
- buffer.insert_with_tags_by_name(end_iter, format, *name_tags)
+ buffer_.insert_with_tags_by_name(end_iter, format, *name_tags)
def print_subject(self, subject):
if subject: # if we have subject, show it too!
subject = _('Subject: %s\n') % subject
- buffer = self.tv.get_buffer()
- end_iter = buffer.get_end_iter()
- buffer.insert(end_iter, subject)
+ buffer_ = self.tv.get_buffer()
+ end_iter = buffer_.get_end_iter()
+ buffer_.insert(end_iter, subject)
self.print_empty_line()
def print_real_text(self, text, text_tags=[], name=None, xhtml=None):
@@ -1343,7 +1343,7 @@
gajim.log.debug(str('Error processing xhtml') + str(e))
gajim.log.debug(str('with |' + xhtml + '|'))
- buffer = self.tv.get_buffer()
+ buffer_ = self.tv.get_buffer()
# /me is replaced by name if name is given
if name and (text.startswith('/me ') or text.startswith('/me\n')):
text = '* ' + name + text[3:]
@@ -1352,7 +1352,7 @@
index = self.detect_and_print_special_text(text, text_tags)
# add the rest of text located in the index and after
- end_iter = buffer.get_end_iter()
- buffer.insert_with_tags_by_name(end_iter, text[index:], *text_tags)
+ end_iter = buffer_.get_end_iter()
+ buffer_.insert_with_tags_by_name(end_iter, text[index:], *text_tags)
# vim: se ts=3:
Modified: trunk/src/dataforms_widget.py
===================================================================
--- trunk/src/dataforms_widget.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/dataforms_widget.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -164,9 +164,9 @@
# moving all data to model
for item in self._data_form.iter_records():
- iter = self.multiplemodel.append()
+ iter_ = self.multiplemodel.append()
for field in item.iter_fields():
- self.multiplemodel.set_value(iter, fieldvars.index(field.var),
+ self.multiplemodel.set_value(iter_, fieldvars.index(field.var),
field.value)
# constructing columns...
@@ -214,8 +214,8 @@
self.remove_button.set_sensitive(True)
self.edit_button.set_sensitive(True)
_, (path,) = selection.get_selected_rows()
- iter = model.get_iter(path)
- if model.iter_next(iter) is None:
+ iter_ = model.get_iter(path)
+ if model.iter_next(iter_) is None:
self.up_button.set_sensitive(True)
self.down_button.set_sensitive(False)
elif path == (0, ):
@@ -252,19 +252,19 @@
def on_up_button_clicked(self, widget):
selection = self.records_treeview.get_selection()
model, (path,) = selection.get_selected_rows()
- iter = model.get_iter(path)
+ iter_ = model.get_iter(path)
# constructing path for previous iter
previter = model.get_iter((path[0]-1,))
- model.swap(iter, previter)
+ model.swap(iter_, previter)
self.refresh_multiple_buttons()
def on_down_button_clicked(self, widget):
selection = self.records_treeview.get_selection()
model, (path,) = selection.get_selected_rows()
- iter = model.get_iter(path)
- nextiter = model.iter_next(iter)
- model.swap(iter, nextiter)
+ iter_ = model.get_iter(path)
+ nextiter = model.iter_next(iter_)
+ model.swap(iter_, nextiter)
self.refresh_multiple_buttons()
@@ -356,10 +356,10 @@
else:
# more than 5 options: show combobox
def on_list_single_combobox_changed(combobox, f):
- iter = combobox.get_active_iter()
- if iter:
+ iter_ = combobox.get_active_iter()
+ if iter_:
model = combobox.get_model()
- f.value = model[iter][1]
+ f.value = model[iter_][1]
else:
f.value = ''
widget = gtkgui_helpers.create_combobox(field.options,
@@ -555,15 +555,15 @@
while _('new%d(a)jabber.id') % i in field.values:
i += 1
jid = _('new%d(a)jabber.id') % i
- iter = model.insert(999999, (jid,))
- treeview.set_cursor(model.get_path(iter), treeview.get_column(0), True)
+ iter_ = model.insert(999999, (jid,))
+ treeview.set_cursor(model.get_path(iter_), treeview.get_column(0), True)
field.values = field.values + [jid]
def on_jid_multi_edit_button_clicked(self, widget, treeview):
- model, iter = treeview.get_selection().get_selected()
- assert iter is not None
+ model, iter_ = treeview.get_selection().get_selected()
+ assert iter_ is not None
- treeview.set_cursor(model.get_path(iter), treeview.get_column(0), True)
+ treeview.set_cursor(model.get_path(iter_), treeview.get_column(0), True)
def on_jid_multi_remove_button_clicked(self, widget, treeview, field):
selection = treeview.get_selection()
Modified: trunk/src/dialogs.py
===================================================================
--- trunk/src/dialogs.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/dialogs.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -119,11 +119,11 @@
return
# check if it already exists
model = self.treeview.get_model()
- iter = model.get_iter_root()
- while iter:
- if model.get_value(iter, 0).decode('utf-8') == group:
+ iter_ = model.get_iter_root()
+ while iter_:
+ if model.get_value(iter_, 0).decode('utf-8') == group:
return
- iter = model.iter_next(iter)
+ iter_ = model.iter_next(iter_)
self.changes_made = True
model.append((group, True, False))
self.add_group(group)
@@ -173,17 +173,17 @@
group_list.append(group)
group_list.sort()
for group in group_list:
- iter = store.append()
- store.set(iter, 0, group) # Group name
+ iter_ = store.append()
+ store.set(iter_, 0, group) # Group name
if groups[group] == 0:
- store.set(iter, 1, False)
+ store.set(iter_, 1, False)
else:
- store.set(iter, 1, True)
+ store.set(iter_, 1, True)
if groups[group] == len(self.list_):
# all contacts are in this group
- store.set(iter, 2, False)
+ store.set(iter_, 2, False)
else:
- store.set(iter, 2, True)
+ store.set(iter_, 2, True)
column = gtk.TreeViewColumn(_('Group'))
column.set_expand(True)
self.treeview.append_column(column)
@@ -301,10 +301,10 @@
def on_dialog_response(self, dialog, response):
selection = self.keys_treeview.get_selection()
- (model, iter) = selection.get_selected()
- if iter and response == gtk.RESPONSE_OK:
- keyID = [ model[iter][0].decode('utf-8'),
- model[iter][1].decode('utf-8') ]
+ (model, iter_) = selection.get_selected()
+ if iter_ and response == gtk.RESPONSE_OK:
+ keyID = [ model[iter_][0].decode('utf-8'),
+ model[iter_][1].decode('utf-8') ]
else:
keyID = None
self.on_response(keyID)
@@ -788,25 +788,25 @@
self.uid_entry.set_text(uid.replace('%', '@', 1))
#set protocol_combobox
model = self.protocol_combobox.get_model()
- iter = model.get_iter_first()
+ iter_ = model.get_iter_first()
i = 0
- while iter:
- if model[iter][2] == type_:
+ while iter_:
+ if model[iter_][2] == type_:
self.protocol_combobox.set_active(i)
break
- iter = model.iter_next(iter)
+ iter_ = model.iter_next(iter_)
i += 1
# set protocol_jid_combobox
self.protocol_jid_combobox.set_active(0)
model = self.protocol_jid_combobox.get_model()
- iter = model.get_iter_first()
+ iter_ = model.get_iter_first()
i = 0
- while iter:
- if model[iter][0] == transport:
+ while iter_:
+ if model[iter_][0] == transport:
self.protocol_jid_combobox.set_active(i)
break
- iter = model.iter_next(iter)
+ iter_ = model.iter_next(iter_)
i += 1
if user_nick:
self.nickname_entry.set_text(user_nick)
@@ -864,8 +864,8 @@
return
model = self.protocol_combobox.get_model()
- iter = self.protocol_combobox.get_active_iter()
- type_ = model[iter][2]
+ iter_ = self.protocol_combobox.get_active_iter()
+ type_ = model[iter_][2]
if type_ != 'jabber':
transport = self.protocol_jid_combobox.get_active_text().decode(
'utf-8')
@@ -923,8 +923,8 @@
def on_protocol_combobox_changed(self, widget):
model = widget.get_model()
- iter = widget.get_active_iter()
- type_ = model[iter][2]
+ iter_ = widget.get_active_iter()
+ type_ = model[iter_][2]
model = self.protocol_jid_combobox.get_model()
model.clear()
if len(self.agents[type_]):
@@ -1841,8 +1841,8 @@
if remote_account == self.account:
# Do not show the account we're sync'ing
continue
- iter = model.append()
- model.set(iter, 0, remote_account, 1, gajim.get_hostname_from_account(
+ iter_ = model.append()
+ model.set(iter_, 0, remote_account, 1, gajim.get_hostname_from_account(
remote_account))
def on_cancel_button_clicked(self, widget):
@@ -1850,10 +1850,10 @@
def on_ok_button_clicked(self, widget):
sel = self.accounts_treeview.get_selection()
- (model, iter) = sel.get_selected()
- if not iter:
+ (model, iter_) = sel.get_selected()
+ if not iter_:
return
- remote_account = model.get_value(iter, 0).decode('utf-8')
+ remote_account = model.get_value(iter_, 0).decode('utf-8')
if gajim.connections[remote_account].connected < 2:
ErrorDialog(_('This account is not connected to the server'),
@@ -1892,8 +1892,8 @@
def toggled_callback(self, cell, path):
model = self.contacts_treeview.get_model()
- iter = model.get_iter(path)
- model[iter][0] = not cell.get_active()
+ iter_ = model.get_iter(path)
+ model[iter_][0] = not cell.get_active()
def on_contacts_window_key_press_event(self, widget, event):
if event.keyval == gtk.keysyms.Escape:
@@ -1910,19 +1910,19 @@
remote_jid_list = gajim.contacts.get_jid_list(self.remote_account)
for remote_jid in remote_jid_list:
if remote_jid not in local_jid_list:
- iter = model.append()
- model.set(iter, 0, True, 1, remote_jid)
+ iter_ = model.append()
+ model.set(iter_, 0, True, 1, remote_jid)
def on_cancel_button_clicked(self, widget):
self.dialog.destroy()
def on_ok_button_clicked(self, widget):
model = self.contacts_treeview.get_model()
- iter = model.get_iter_root()
- while iter:
- if model[iter][0]:
+ iter_ = model.get_iter_root()
+ while iter_:
+ if model[iter_][0]:
# it is selected
- remote_jid = model[iter][1].decode('utf-8')
+ remote_jid = model[iter_][1].decode('utf-8')
message = 'I\'m synchronizing my contacts from my %s account, could you please add this address to your contact list?' % \
gajim.get_hostname_from_account(self.remote_account)
remote_contact = gajim.contacts.get_first_contact_from_jid(
@@ -1931,7 +1931,7 @@
gajim.interface.roster.req_sub(self, remote_jid, message,
self.local_account, groups = remote_contact.groups,
nickname = remote_contact.name, auto_auth = True)
- iter = model.iter_next(iter)
+ iter_ = model.iter_next(iter_)
self.dialog.destroy()
class NewChatDialog(InputDialog):
@@ -2413,14 +2413,14 @@
self.input_textview = self.xml.get_widget('input_textview')
self.stanzas_log_textview = self.xml.get_widget('stanzas_log_textview')
self.input_tv_buffer = self.input_textview.get_buffer()
- buffer = self.stanzas_log_textview.get_buffer()
- end_iter = buffer.get_end_iter()
- buffer.create_mark('end', end_iter, False)
+ buffer_ = self.stanzas_log_textview.get_buffer()
+ end_iter = buffer_.get_end_iter()
+ buffer_.create_mark('end', end_iter, False)
- self.tagIn = buffer.create_tag('incoming')
+ self.tagIn = buffer_.create_tag('incoming')
color = gajim.config.get('inmsgcolor')
self.tagIn.set_property('foreground', color)
- self.tagOut = buffer.create_tag('outgoing')
+ self.tagOut = buffer_.create_tag('outgoing')
color = gajim.config.get('outmsgcolor')
self.tagOut.set_property('foreground', color)
@@ -2444,16 +2444,16 @@
return True # do NOT destroy the window
def on_clear_button_clicked(self, widget):
- buffer = self.stanzas_log_textview.get_buffer()
- buffer.set_text('')
+ buffer_ = self.stanzas_log_textview.get_buffer()
+ buffer_.set_text('')
def on_enable_checkbutton_toggled(self, widget):
self.enabled = widget.get_active()
def scroll_to_end(self, ):
parent = self.stanzas_log_textview.get_parent()
- buffer = self.stanzas_log_textview.get_buffer()
- end_mark = buffer.get_mark('end')
+ buffer_ = self.stanzas_log_textview.get_buffer()
+ end_mark = buffer_.get_mark('end')
if not end_mark:
return False
self.stanzas_log_textview.scroll_to_mark(end_mark, 0, True, 0, 1)
@@ -3030,16 +3030,16 @@
on_response_ok = (on_ok, on_response_ok),
on_response_cancel = on_response_cancel)
- filter = gtk.FileFilter()
- filter.set_name(_('All files'))
- filter.add_pattern('*')
- self.add_filter(filter)
+ filter_ = gtk.FileFilter()
+ filter_.set_name(_('All files'))
+ filter_.add_pattern('*')
+ self.add_filter(filter_)
- filter = gtk.FileFilter()
- filter.set_name(_('Wav Sounds'))
- filter.add_pattern('*.wav')
- self.add_filter(filter)
- self.set_filter(filter)
+ filter_ = gtk.FileFilter()
+ filter_.set_name(_('Wav Sounds'))
+ filter_.add_pattern('*.wav')
+ self.add_filter(filter_)
+ self.set_filter(filter_)
if path_to_snd_file:
self.set_filename(path_to_snd_file)
@@ -3081,21 +3081,21 @@
if on_response_cancel:
self.connect('destroy', on_response_cancel)
- filter = gtk.FileFilter()
- filter.set_name(_('All files'))
- filter.add_pattern('*')
- self.add_filter(filter)
+ filter_ = gtk.FileFilter()
+ filter_.set_name(_('All files'))
+ filter_.add_pattern('*')
+ self.add_filter(filter_)
- filter = gtk.FileFilter()
- filter.set_name(_('Images'))
- filter.add_mime_type('image/png')
- filter.add_mime_type('image/jpeg')
- filter.add_mime_type('image/gif')
- filter.add_mime_type('image/tiff')
- filter.add_mime_type('image/svg+xml')
- filter.add_mime_type('image/x-xpixmap') # xpm
- self.add_filter(filter)
- self.set_filter(filter)
+ filter_ = gtk.FileFilter()
+ filter_.set_name(_('Images'))
+ filter_.add_mime_type('image/png')
+ filter_.add_mime_type('image/jpeg')
+ filter_.add_mime_type('image/gif')
+ filter_.add_mime_type('image/tiff')
+ filter_.add_mime_type('image/svg+xml')
+ filter_.add_mime_type('image/x-xpixmap') # xpm
+ self.add_filter(filter_)
+ self.set_filter(filter_)
if path_to_file:
self.set_filename(path_to_file)
@@ -3241,8 +3241,8 @@
# Fill conditions_treeview
num = 0
while gajim.config.get_per('notifications', str(num)):
- iter = model.append((num, ''))
- path = model.get_path(iter)
+ iter_ = model.append((num, ''))
+ path = model.get_path(iter_)
self.conditions_treeview.set_cursor(path)
self.active_num = num
self.initiate_rule_state()
@@ -3337,8 +3337,8 @@
self.urgency_hint_cb.set_active(value)
def set_treeview_string(self):
- (model, iter) = self.conditions_treeview.get_selection().get_selected()
- if not iter:
+ (model, iter_) = self.conditions_treeview.get_selection().get_selected()
+ if not iter_:
return
event = self.event_combobox.get_active_text()
recipient_type = self.recipient_type_combobox.get_active_text()
@@ -3352,15 +3352,15 @@
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,
+ model[iter_][1] = "When %s for %s %s %s" % (event, recipient_type,
recipient, status)
def on_conditions_treeview_cursor_changed(self, widget):
- (model, iter) = widget.get_selection().get_selected()
- if not iter:
+ (model, iter_) = widget.get_selection().get_selected()
+ if not iter_:
self.active_num = -1
return
- self.active_num = model[iter][0]
+ self.active_num = model[iter_][0]
if self.active_num == 0:
self.up_button.set_sensitive(False)
else:
@@ -3378,19 +3378,19 @@
model = self.conditions_treeview.get_model()
num = self.conditions_treeview.get_model().iter_n_children(None)
gajim.config.add_per('notifications', str(num))
- iter = model.append((num, ''))
- path = model.get_path(iter)
+ iter_ = model.append((num, ''))
+ path = model.get_path(iter_)
self.conditions_treeview.set_cursor(path)
self.active_num = num
self.set_treeview_string()
self.config_vbox.set_sensitive(True)
def on_delete_button_clicked(self, widget):
- (model, iter) = self.conditions_treeview.get_selection().get_selected()
- if not iter:
+ (model, iter_) = self.conditions_treeview.get_selection().get_selected()
+ if not iter_:
return
# up all others
- iter2 = model.iter_next(iter)
+ iter2 = model.iter_next(iter_)
num = self.active_num
while iter2:
num = model[iter2][0]
@@ -3399,7 +3399,7 @@
val = gajim.config.get_per('notifications', str(num), opt)
gajim.config.set_per('notifications', str(num - 1), opt, val)
iter2 = model.iter_next(iter2)
- model.remove(iter)
+ model.remove(iter_)
gajim.config.del_per('notifications', str(num)) # delete latest
self.active_num = -1
self.config_vbox.set_sensitive(False)
@@ -3408,9 +3408,9 @@
self.down_button.set_sensitive(False)
def on_up_button_clicked(self, widget):
- (model, iter) = self.conditions_treeview.get_selection().\
+ (model, iter_) = self.conditions_treeview.get_selection().\
get_selected()
- if not iter:
+ if not iter_:
return
for opt in self.config_options:
val = gajim.config.get_per('notifications', str(self.active_num), opt)
@@ -3420,16 +3420,16 @@
gajim.config.set_per('notifications', str(self.active_num - 1), opt,
val)
- model[iter][0] = self.active_num - 1
+ model[iter_][0] = self.active_num - 1
# get previous iter
- path = model.get_path(iter)
- iter = model.get_iter((path[0] - 1,))
- model[iter][0] = self.active_num
+ path = model.get_path(iter_)
+ iter_ = model.get_iter((path[0] - 1,))
+ model[iter_][0] = self.active_num
self.on_conditions_treeview_cursor_changed(self.conditions_treeview)
def on_down_button_clicked(self, widget):
- (model, iter) = self.conditions_treeview.get_selection().get_selected()
- if not iter:
+ (model, iter_) = self.conditions_treeview.get_selection().get_selected()
+ if not iter_:
return
for opt in self.config_options:
val = gajim.config.get_per('notifications', str(self.active_num), opt)
@@ -3439,9 +3439,9 @@
gajim.config.set_per('notifications', str(self.active_num + 1), opt,
val)
- model[iter][0] = self.active_num + 1
- iter = model.iter_next(iter)
- model[iter][0] = self.active_num
+ model[iter_][0] = self.active_num + 1
+ iter_ = model.iter_next(iter_)
+ model[iter_][0] = self.active_num
self.on_conditions_treeview_cursor_changed(self.conditions_treeview)
def on_event_combobox_changed(self, widget):
@@ -3730,10 +3730,10 @@
name = contact.name
if name == '':
name = jid.split('@')[0]
- iter = self.store.append([img.get_pixbuf(), name, jid])
+ iter_ = self.store.append([img.get_pixbuf(), name, jid])
# preselect treeview rows
if self.preselected_jids and jid in self.preselected_jids:
- path = self.store.get_path(iter)
+ path = self.store.get_path(iter_)
self.guests_treeview.get_selection().\
select_path(path)
@@ -3759,8 +3759,8 @@
guest_list = []
guests = self.guests_treeview.get_selection().get_selected_rows()
for guest in guests[1]:
- iter = self.store.get_iter(guest)
- guest_list.append(self.store[iter][2].decode('utf-8'))
+ iter_ = self.store.get_iter(guest)
+ guest_list.append(self.store[iter_][2].decode('utf-8'))
for guest in self.auto_jids:
guest_list.append(guest)
room_jid = room_id + '@' + server
@@ -3821,7 +3821,7 @@
def update_info(self):
labeltext = _('''Your chat session with <b>%(jid)s</b> is encrypted.\n\nThis session's Short Authentication String is <b>%(sas)s</b>.''') % {'jid': self.session.jid, 'sas': self.session.sas}
- dir = os.path.join(gajim.DATA_DIR, 'pixmaps')
+ dir_ = os.path.join(gajim.DATA_DIR, 'pixmaps')
if self.session.verified_identity:
labeltext += '\n\n' + _('''You have already verified this contact's identity.''')
@@ -3855,7 +3855,7 @@
self.button_label.set_text(_('Verify...'))
- path = os.path.join(dir, security_image)
+ path = os.path.join(dir_, security_image)
filename = os.path.abspath(path)
self.security_image.set_from_file(filename)
@@ -3926,8 +3926,8 @@
verification_status)
info_label.set_markup(info)
- dir = os.path.join(gajim.DATA_DIR, 'pixmaps')
- path = os.path.join(dir, image)
+ dir_ = os.path.join(gajim.DATA_DIR, 'pixmaps')
+ path = os.path.join(dir_, image)
filename = os.path.abspath(path)
security_image.set_from_file(filename)
Modified: trunk/src/disco.py
===================================================================
--- trunk/src/disco.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/disco.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -35,9 +35,9 @@
# - def default_action(self)
# - def _find_item(self, jid, node)
# - def _add_item(self, jid, node, item, force)
-# - def _update_item(self, iter, jid, node, item)
-# - def _update_info(self, iter, jid, node, identities, features, data)
-# - def _update_error(self, iter, jid, node)
+# - def _update_item(self, iter_, jid, node, item)
+# - def _update_info(self, iter_, jid, node, identities, features, data)
+# - def _update_error(self, iter_, jid, node)
#
# * Should call the super class for this method.
# All others do not have to call back to the super class. (but can if they want
@@ -258,8 +258,8 @@
# Grab the first identity with an icon
for identity in identities:
try:
- cat, type = identity['category'], identity['type']
- info = _agent_type_info[(cat, type)]
+ cat, type_ = identity['category'], identity['type']
+ info = _agent_type_info[(cat, type_)]
except KeyError:
continue
filename = info[1]
@@ -267,7 +267,6 @@
break
else:
# Loop fell through, default to unknown
- cat = type = 0
info = _agent_type_info[(0, 0)]
filename = info[1]
if not filename: # we don't have an image to show for this type
@@ -865,12 +864,12 @@
def on_browse_button_clicked(self, widget = None):
'''When we want to browse an agent:
Open a new services window with a browser for the agent type.'''
- model, iter = self.window.services_treeview.get_selection().get_selected()
- if not iter:
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ if not iter_:
return
- jid = model[iter][0].decode('utf-8')
+ jid = model[iter_][0].decode('utf-8')
if jid:
- node = model[iter][1].decode('utf-8')
+ node = model[iter_][1].decode('utf-8')
self.window.open(jid, node)
def update_actions(self):
@@ -878,11 +877,11 @@
activate action buttons based on the agent's info.'''
if self.browse_button:
self.browse_button.set_sensitive(False)
- model, iter = self.window.services_treeview.get_selection().get_selected()
- if not iter:
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ if not iter_:
return
- jid = model[iter][0].decode('utf-8')
- node = model[iter][1].decode('utf-8')
+ jid = model[iter_][0].decode('utf-8')
+ node = model[iter_][1].decode('utf-8')
if jid:
self.cache.get_info(jid, node, self._update_actions, nofetch = True)
@@ -897,11 +896,11 @@
def default_action(self):
'''When we double-click a row:
perform the default action on the selected item.'''
- model, iter = self.window.services_treeview.get_selection().get_selected()
- if not iter:
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ if not iter_:
return
- jid = model[iter][0].decode('utf-8')
- node = model[iter][1].decode('utf-8')
+ jid = model[iter_][0].decode('utf-8')
+ node = model[iter_][1].decode('utf-8')
if jid:
self.cache.get_info(jid, node, self._default_action, nofetch = True)
@@ -932,15 +931,15 @@
def _find_item(self, jid, node):
'''Check if an item is already in the treeview. Return an iter to it
if so, None otherwise.'''
- iter = self.model.get_iter_root()
- while iter:
- cjid = self.model.get_value(iter, 0).decode('utf-8')
- cnode = self.model.get_value(iter, 1).decode('utf-8')
+ iter_ = self.model.get_iter_root()
+ while iter_:
+ cjid = self.model.get_value(iter_, 0).decode('utf-8')
+ cnode = self.model.get_value(iter_, 1).decode('utf-8')
if jid == cjid and node == cnode:
break
- iter = self.model.iter_next(iter)
- if iter:
- return iter
+ iter_ = self.model.iter_next(iter_)
+ if iter_:
+ return iter_
return None
def _agent_items(self, jid, node, items, force):
@@ -971,16 +970,16 @@
def _agent_info(self, jid, node, identities, features, data):
'''Callback for when we receive info about an agent's item.'''
- iter = self._find_item(jid, node)
- if not iter:
+ iter_ = self._find_item(jid, node)
+ if not iter_:
# Not in the treeview, stop
return
if identities == 0:
# The server returned an error
- self._update_error(iter, jid, node)
+ self._update_error(iter_, jid, node)
else:
# We got our info
- self._update_info(iter, jid, node, identities, features, data)
+ self._update_info(iter_, jid, node, identities, features, data)
self.update_actions()
def _add_item(self, jid, node, item, force):
@@ -1101,14 +1100,14 @@
self.tooltip.hide_tooltip()
if props:
row = props[0]
- iter = None
+ iter_ = None
try:
- iter = self.model.get_iter(row)
+ iter_ = self.model.get_iter(row)
except Exception:
self.tooltip.hide_tooltip()
return
- jid = self.model[iter][0]
- state = self.model[iter][4]
+ jid = self.model[iter_][0]
+ state = self.model[iter_][4]
# Not a category, and we have something to say about state
if jid and state > 0 and \
(self.tooltip.timeout == 0 or self.tooltip.id != props[0]):
@@ -1235,10 +1234,10 @@
def on_search_button_clicked(self, widget = None):
'''When we want to search something:
open search window'''
- model, iter = self.window.services_treeview.get_selection().get_selected()
- if not iter:
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ if not iter_:
return
- service = model[iter][0].decode('utf-8')
+ service = model[iter_][0].decode('utf-8')
if service in gajim.interface.instances[self.account]['search']:
gajim.interface.instances[self.account]['search'][service].present()
else:
@@ -1259,20 +1258,20 @@
def on_execute_button_clicked(self, widget = None):
'''When we want to execute a command:
open adhoc command window'''
- model, iter = self.window.services_treeview.get_selection().get_selected()
- if not iter:
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ if not iter_:
return
- service = model[iter][0].decode('utf-8')
+ service = model[iter_][0].decode('utf-8')
adhoc_commands.CommandWindow(self.account, service)
def on_register_button_clicked(self, widget = None):
'''When we want to register an agent:
request information about registering with the agent and close the
window.'''
- model, iter = self.window.services_treeview.get_selection().get_selected()
- if not iter:
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ if not iter_:
return
- jid = model[iter][0].decode('utf-8')
+ jid = model[iter_][0].decode('utf-8')
if jid:
gajim.connections[self.account].request_register_agent_info(jid)
self.window.destroy(chain = True)
@@ -1280,10 +1279,10 @@
def on_join_button_clicked(self, widget):
'''When we want to join an IRC room or create a new MUC room:
Opens the join_groupchat_window.'''
- model, iter = self.window.services_treeview.get_selection().get_selected()
- if not iter:
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ if not iter_:
return
- service = model[iter][0].decode('utf-8')
+ service = model[iter_][0].decode('utf-8')
if 'join_gc' not in gajim.interface.instances[self.account]:
try:
dialogs.JoinGroupchatWindow(self.account, service)
@@ -1304,25 +1303,25 @@
self.join_button.set_sensitive(False)
if self.search_button:
self.search_button.set_sensitive(False)
- model, iter = self.window.services_treeview.get_selection().get_selected()
- model, iter = self.window.services_treeview.get_selection().get_selected()
- if not iter:
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ if not iter_:
return
- if not model[iter][0]:
+ if not model[iter_][0]:
# We're on a category row
return
- if model[iter][4] != 0:
+ if model[iter_][4] != 0:
# We don't have the info (yet)
# It's either unknown or a transport, register button should be active
if self.register_button:
self.register_button.set_sensitive(True)
# Guess what kind of service we're dealing with
if self.browse_button:
- jid = model[iter][0].decode('utf-8')
- type = gajim.get_transport_name_from_jid(jid,
+ jid = model[iter_][0].decode('utf-8')
+ type_ = gajim.get_transport_name_from_jid(jid,
use_config_setting = False)
- if type:
- identity = {'category': '_jid', 'type': type}
+ if type_:
+ identity = {'category': '_jid', 'type': type_}
klass = self.cache.get_browser([identity])
if klass:
self.browse_button.set_sensitive(True)
@@ -1393,13 +1392,13 @@
fraction = float(self._progress) / float(self._total_items)
if self._progress >= self._total_items:
# We show the progressbar for just a bit before hiding it.
- id = gobject.timeout_add_seconds(2, self._hide_progressbar_cb)
- self._progressbar_sourceid = id
+ id_ = gobject.timeout_add_seconds(2, self._hide_progressbar_cb)
+ self._progressbar_sourceid = id_
else:
self.window.progressbar.show()
# Hide the progressbar if we're timing out anyways. (20 secs)
- id = gobject.timeout_add_seconds(20, self._hide_progressbar_cb)
- self._progressbar_sourceid = id
+ id_ = gobject.timeout_add_seconds(20, self._hide_progressbar_cb)
+ self._progressbar_sourceid = id_
self.window.progressbar.set_fraction(fraction)
def _hide_progressbar_cb(self, *args):
@@ -1432,29 +1431,29 @@
def _find_category(self, cat, type_=None):
'''Looks up a category row and returns the iterator to it, or None.'''
cat = self._friendly_category(cat, type_)[0]
- iter = self.model.get_iter_root()
- while iter:
- if self.model.get_value(iter, 3).decode('utf-8') == cat:
+ iter_ = self.model.get_iter_root()
+ while iter_:
+ if self.model.get_value(iter_, 3).decode('utf-8') == cat:
break
- iter = self.model.iter_next(iter)
- if iter:
- return iter
+ iter_ = self.model.iter_next(iter_)
+ if iter_:
+ return iter_
return None
def _find_item(self, jid, node):
- iter = None
+ iter_ = None
cat_iter = self.model.get_iter_root()
- while cat_iter and not iter:
- iter = self.model.iter_children(cat_iter)
- while iter:
- cjid = self.model.get_value(iter, 0).decode('utf-8')
- cnode = self.model.get_value(iter, 1).decode('utf-8')
+ while cat_iter and not iter_:
+ iter_ = self.model.iter_children(cat_iter)
+ while iter_:
+ cjid = self.model.get_value(iter_, 0).decode('utf-8')
+ cnode = self.model.get_value(iter_, 1).decode('utf-8')
if jid == cjid and node == cnode:
break
- iter = self.model.iter_next(iter)
+ iter_ = self.model.iter_next(iter_)
cat_iter = self.model.iter_next(cat_iter)
- if iter:
- return iter
+ if iter_:
+ return iter_
return None
def _add_item(self, jid, node, item, force):
@@ -1466,12 +1465,12 @@
descr = "<b>%s</b>" % addr
# Guess which kind of service this is
identities = []
- type = gajim.get_transport_name_from_jid(jid,
+ type_ = gajim.get_transport_name_from_jid(jid,
use_config_setting = False)
- if type:
- identity = {'category': '_jid', 'type': type}
+ if type_:
+ identity = {'category': '_jid', 'type': type_}
identities.append(identity)
- cat_args = ('_jid', type)
+ cat_args = ('_jid', type_)
else:
# Put it in the 'other' category for now
cat_args = ('other',)
@@ -1511,7 +1510,7 @@
pix = self.cache.get_icon(identities)
for identity in identities:
try:
- cat, type = identity['category'], identity['type']
+ cat, type_ = identity['category'], identity['type']
except KeyError:
continue
break
@@ -1534,9 +1533,9 @@
if not self.model.iter_children(old_cat_iter):
self.model.remove(old_cat_iter)
- cat_iter = self._find_category(cat, type)
+ cat_iter = self._find_category(cat, type_)
if not cat_iter:
- cat_iter = self._create_category(cat, type)
+ cat_iter = self._create_category(cat, type_)
self.model.append(cat_iter, (jid, node, pix, descr, 0))
self._expand_all()
@@ -1628,11 +1627,11 @@
def on_join_button_clicked(self, *args):
'''When we want to join a conference:
Ask specific informations about the selected agent and close the window'''
- model, iter = self.window.services_treeview.get_selection().get_selected()
- if not iter:
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ if not iter_:
return
- service = model[iter][0].decode('utf-8')
- room = model[iter][1].decode('utf-8')
+ service = model[iter_][0].decode('utf-8')
+ room = model[iter_][1].decode('utf-8')
if 'join_gc' not in gajim.interface.instances[self.account]:
try:
dialogs.JoinGroupchatWindow(self.account, service)
@@ -1674,12 +1673,12 @@
# We have to do this in a pygtk <2.8 compatible way :/
#start, end = self.window.services_treeview.get_visible_range()
rect = view.get_visible_rect()
- iter = end = None
+ iter_ = end = None
# Top row
try:
sx, sy = view.tree_to_widget_coords(rect.x, rect.y)
spath = view.get_path_at_pos(sx, sy)[0]
- iter = self.model.get_iter(spath)
+ iter_ = self.model.get_iter(spath)
except TypeError:
self._fetch_source = None
return
@@ -1694,14 +1693,14 @@
except TypeError:
# We're at the end of the model, we can leave end=None though.
pass
- while iter and self.model.get_path(iter) != end:
- if not self.model.get_value(iter, 6):
- jid = self.model.get_value(iter, 0).decode('utf-8')
- node = self.model.get_value(iter, 1).decode('utf-8')
+ while iter_ and self.model.get_path(iter_) != end:
+ if not self.model.get_value(iter_, 6):
+ jid = self.model.get_value(iter_, 0).decode('utf-8')
+ node = self.model.get_value(iter_, 1).decode('utf-8')
self.cache.get_info(jid, node, self._agent_info)
self._fetch_source = True
return
- iter = self.model.iter_next(iter)
+ iter_ = self.model.iter_next(iter_)
self._fetch_source = None
def _channel_altinfo(self, jid, node, items, name = None):
@@ -1722,13 +1721,13 @@
self._fetch_source = None
return
else:
- iter = self._find_item(jid, node)
- if iter:
+ iter_ = self._find_item(jid, node)
+ if iter_:
if name:
- self.model[iter][2] = name
- self.model[iter][3] = len(items) # The number of users
- self.model[iter][4] = str(len(items)) # The number of users
- self.model[iter][6] = True
+ self.model[iter_][2] = name
+ self.model[iter_][3] = len(items) # The number of users
+ self.model[iter_][4] = str(len(items)) # The number of users
+ self.model[iter_][6] = True
self._fetch_source = None
self._query_visible()
@@ -1916,42 +1915,42 @@
# we have nothing to do if we don't have buttons...
if self.subscribe_button is None: return
- model, iter = self.window.services_treeview.get_selection().get_selected()
- if not iter or self.subscriptions is None:
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ if not iter_ or self.subscriptions is None:
# no item selected or no subscriptions info, all buttons are insensitive
self.post_button.set_sensitive(False)
self.subscribe_button.set_sensitive(False)
self.unsubscribe_button.set_sensitive(False)
else:
- subscribed = model.get_value(iter, 4) # 4 = subscribed?
+ subscribed = model.get_value(iter_, 4) # 4 = subscribed?
self.post_button.set_sensitive(subscribed)
self.subscribe_button.set_sensitive(not subscribed)
self.unsubscribe_button.set_sensitive(subscribed)
def on_post_button_clicked(self, widget):
'''Called when 'post' button is pressed. Open window to create post'''
- model, iter = self.window.services_treeview.get_selection().get_selected()
- if iter is None: return
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ if iter_ is None: return
- groupnode = model.get_value(iter, 1) # 1 = groupnode
+ groupnode = model.get_value(iter_, 1) # 1 = groupnode
groups.GroupsPostWindow(self.account, self.jid, groupnode)
def on_subscribe_button_clicked(self, widget):
'''Called when 'subscribe' button is pressed. Send subscribtion request.'''
- model, iter = self.window.services_treeview.get_selection().get_selected()
- if iter is None: return
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ if iter_ is None: return
- groupnode = model.get_value(iter, 1) # 1 = groupnode
+ groupnode = model.get_value(iter_, 1) # 1 = groupnode
gajim.connections[self.account].send_pb_subscribe(self.jid, groupnode, self._subscribeCB, groupnode)
def on_unsubscribe_button_clicked(self, widget):
'''Called when 'unsubscribe' button is pressed. Send unsubscription request.'''
- model, iter = self.window.services_treeview.get_selection().get_selected()
- if iter is None: return
+ model, iter_ = self.window.services_treeview.get_selection().get_selected()
+ if iter_ is None: return
- groupnode = model.get_value(iter, 1) # 1 = groupnode
+ groupnode = model.get_value(iter_, 1) # 1 = groupnode
gajim.connections[self.account].send_pb_unsubscribe(self.jid, groupnode, self._unsubscribeCB, groupnode)
Modified: trunk/src/features_window.py
===================================================================
--- trunk/src/features_window.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/features_window.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -268,10 +268,10 @@
texstr += '\\begin{document}\\begin{large}\\begin{gather*}test'
texstr += '\\end{gather*}\\end{large}\\end{document}'
- file = open(os.path.join(tmpfile + ".tex"), "w+")
- file.write(texstr)
- file.flush()
- file.close()
+ file_ = open(os.path.join(tmpfile + ".tex"), "w+")
+ file_.write(texstr)
+ file_.flush()
+ file_.close()
try:
if os.name == 'nt':
# CREATE_NO_WINDOW
Modified: trunk/src/filetransfers_window.py
===================================================================
--- trunk/src/filetransfers_window.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/filetransfers_window.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -395,17 +395,17 @@
def set_status(self, typ, sid, status):
''' change the status of a transfer to state 'status' '''
- iter = self.get_iter_by_sid(typ, sid)
- if iter is None:
+ iter_ = self.get_iter_by_sid(typ, sid)
+ if iter_ is None:
return
- sid = self.model[iter][C_SID].decode('utf-8')
+ sid = self.model[iter_][C_SID].decode('utf-8')
file_props = self.files_props[sid[0]][sid[1:]]
if status == 'stop':
file_props['stopped'] = True
elif status == 'ok':
file_props['completed'] = True
- self.model.set(iter, C_IMAGE, self.get_icon(status))
- path = self.model.get_path(iter)
+ self.model.set(iter_, C_IMAGE, self.get_icon(status))
+ path = self.model.get_path(iter_)
self.select_func(path)
def _format_percent(self, percent):
@@ -548,11 +548,11 @@
def get_iter_by_sid(self, typ, sid):
'''returns iter to the row, which holds file transfer, identified by the
session id'''
- iter = self.model.get_iter_root()
- while iter:
- if typ + sid == self.model[iter][C_SID].decode('utf-8'):
- return iter
- iter = self.model.iter_next(iter)
+ iter_ = self.model.get_iter_root()
+ while iter_:
+ if typ + sid == self.model[iter_][C_SID].decode('utf-8'):
+ return iter_
+ iter_ = self.model.iter_next(iter_)
def get_send_file_props(self, account, contact, file_path, file_name,
file_desc=''):
@@ -588,7 +588,7 @@
return
file_props['elapsed-time'] = 0
self.files_props[file_props['type']][file_props['sid']] = file_props
- iter = self.model.append()
+ iter_ = self.model.append()
text_labels = '<b>' + _('Name: ') + '</b>\n'
if file_props['type'] == 'r':
text_labels += '<b>' + _('Sender: ') + '</b>'
@@ -601,9 +601,9 @@
file_name = file_props['name']
text_props = gobject.markup_escape_text(file_name) + '\n'
text_props += contact.get_shown_name()
- self.model.set(iter, 1, text_labels, 2, text_props, C_SID,
+ self.model.set(iter_, 1, text_labels, 2, text_props, C_SID,
file_props['type'] + file_props['sid'])
- self.set_progress(file_props['type'], file_props['sid'], 0, iter)
+ self.set_progress(file_props['type'], file_props['sid'], 0, iter_)
if 'started' in file_props and file_props['started'] is False:
status = 'waiting'
elif file_props['type'] == 'r':
@@ -624,13 +624,13 @@
self.tooltip.hide_tooltip()
if props:
row = props[0]
- iter = None
+ iter_ = None
try:
- iter = self.model.get_iter(row)
+ iter_ = self.model.get_iter(row)
except Exception:
self.tooltip.hide_tooltip()
return
- sid = self.model[iter][C_SID].decode('utf-8')
+ sid = self.model[iter_][C_SID].decode('utf-8')
file_props = self.files_props[sid[0]][sid[1:]]
if file_props is not None:
if self.tooltip.timeout == 0 or self.tooltip.id != props[0]:
@@ -767,11 +767,11 @@
def on_cleanup_button_clicked(self, widget):
i = len(self.model) - 1
while i >= 0:
- iter = self.model.get_iter((i))
- sid = self.model[iter][C_SID].decode('utf-8')
+ iter_ = self.model.get_iter((i))
+ sid = self.model[iter_][C_SID].decode('utf-8')
file_props = self.files_props[sid[0]][sid[1:]]
if self.is_transfer_stopped(file_props):
- self._remove_transfer(iter, sid, file_props)
+ self._remove_transfer(iter_, sid, file_props)
i -= 1
self.tree.get_selection().unselect_all()
self.set_all_insensitive()
@@ -844,8 +844,8 @@
# check if the current pointer is at the same path
# as it was before setting the timeout
if props and self.tooltip.id == props[0]:
- iter = self.model.get_iter(props[0])
- sid = self.model[iter][C_SID].decode('utf-8')
+ iter_ = self.model.get_iter(props[0])
+ sid = self.model[iter_][C_SID].decode('utf-8')
file_props = self.files_props[sid[0]][sid[1:]]
# bounding rectangle of coordinates for the cell within the treeview
rect = self.tree.get_cell_area(props[0],props[1])
@@ -883,18 +883,18 @@
def on_transfers_list_key_press_event(self, widget, event):
'''when a key is pressed in the treeviews'''
self.tooltip.hide_tooltip()
- iter = None
+ iter_ = None
try:
- iter = self.tree.get_selection().get_selected()[1]
+ iter_ = self.tree.get_selection().get_selected()[1]
except TypeError:
self.tree.get_selection().unselect_all()
- if iter is not None:
- path = self.model.get_path(iter)
+ if iter_ is not None:
+ path = self.model.get_path(iter_)
self.tree.get_selection().select_path(path)
if event.keyval == gtk.keysyms.Menu:
- self.show_context_menu(event, iter)
+ self.show_context_menu(event, iter_)
return True
@@ -914,7 +914,7 @@
def on_transfers_list_button_press_event(self, widget, event):
# hide tooltip, no matter the button is pressed
self.tooltip.hide_tooltip()
- path, iter = None, None
+ path, iter_ = None, None
try:
path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0]
except TypeError:
@@ -922,8 +922,8 @@
if event.button == 3: # Right click
if path is not None:
self.tree.get_selection().select_path(path)
- iter = self.model.get_iter(path)
- self.show_context_menu(event, iter)
+ iter_ = self.model.get_iter(path)
+ self.show_context_menu(event, iter_)
if path is not None:
return True
Modified: trunk/src/gajim-remote.py
===================================================================
--- trunk/src/gajim-remote.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/gajim-remote.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -387,54 +387,41 @@
def make_arguments_row(self, args):
''' return arguments list. Mandatory arguments are enclosed with:
'<', '>', optional arguments - with '[', ']' '''
- str = ''
- for argument in args:
- str += ' '
- if argument[2]:
- str += '<'
+ s = ''
+ for arg in args:
+ if arg[2]:
+ s += ' <' + arg[0] + '>'
else:
- str += '['
- str += argument[0]
- if argument[2]:
- str += '>'
- else:
- str += ']'
- return str
+ s += ' [' + arg[0] + ']'
+ return s
def help_on_command(self, command):
''' return help message for a given command '''
if command in self.commands:
command_props = self.commands[command]
arguments_str = self.make_arguments_row(command_props[1])
- str = _('Usage: %(basename)s %(command)s %(arguments)s \n\t %(help)s')\
+ str_ = _('Usage: %(basename)s %(command)s %(arguments)s \n\t %(help)s')\
% {'basename': BASENAME, 'command': command,
'arguments': arguments_str, 'help': command_props[0]}
if len(command_props[1]) > 0:
- str += '\n\n' + _('Arguments:') + '\n'
+ str_ += '\n\n' + _('Arguments:') + '\n'
for argument in command_props[1]:
- str += ' ' + argument[0] + ' - ' + argument[1] + '\n'
- return str
+ str_ += ' ' + argument[0] + ' - ' + argument[1] + '\n'
+ return str_
send_error(_('%s not found') % command)
def compose_help(self):
''' print usage, and list available commands '''
- str = _('Usage: %s command [arguments]\nCommand is one of:\n' ) % BASENAME
- commands = sorted(self.commands.keys())
- for command in commands:
- str += ' ' + command
- for argument in self.commands[command][1]:
- str += ' '
- if argument[2]:
- str += '<'
+ s = _('Usage: %s command [arguments]\nCommand is one of:\n' ) % BASENAME
+ for command in sorted(self.commands):
+ s += ' ' + command
+ for arg in self.commands[command][1]:
+ if arg[2]:
+ s += ' <' + arg[0] + '>'
else:
- str += '['
- str += argument[0]
- if argument[2]:
- str += '>'
- else:
- str += ']'
- str += '\n'
- return str
+ s += ' [' + arg[0] + ']'
+ s += '\n'
+ return s
def print_info(self, level, prop_dict, encode_return = False):
''' return formated string from data structure '''
Modified: trunk/src/gajim.py
===================================================================
--- trunk/src/gajim.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/gajim.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -584,13 +584,13 @@
def handle_event_error_answer(self, account, array):
#('ERROR_ANSWER', account, (id, jid_from, errmsg, errcode))
- id, jid_from, errmsg, errcode = array
- if unicode(errcode) in ('403', '406') and id:
+ id_, jid_from, errmsg, errcode = array
+ if unicode(errcode) in ('403', '406') and id_:
# show the error dialog
ft = self.instances['file_transfers']
- sid = id
- if len(id) > 3 and id[2] == '_':
- sid = id[3:]
+ sid = id_
+ if len(id_) > 3 and id_[2] == '_':
+ sid = id_[3:]
if sid in ft.files_props['s']:
file_props = ft.files_props['s'][sid]
file_props['error'] = -4
@@ -601,9 +601,9 @@
return
elif unicode(errcode) == '404':
conn = gajim.connections[account]
- sid = id
- if len(id) > 3 and id[2] == '_':
- sid = id[3:]
+ sid = id_
+ if len(id_) > 3 and id_[2] == '_':
+ sid = id_[3:]
if sid in conn.files_props:
file_props = conn.files_props[sid]
self.handle_event_file_send_error(account,
@@ -922,9 +922,9 @@
if not ctrl:
tv = gc_control.list_treeview
model = tv.get_model()
- iter = gc_control.get_contact_iter(nick)
- if iter:
- show = model[iter][3]
+ iter_ = gc_control.get_contact_iter(nick)
+ if iter_:
+ show = model[iter_][3]
else:
show = 'offline'
gc_c = gajim.contacts.create_gc_contact(room_jid = jid,
@@ -2599,8 +2599,9 @@
emots = emoticons.emoticons
fd = open(os.path.join(path, 'emoticons.py'), 'w')
fd.write('emoticons = ')
- pprint.pprint( dict([(file, [i for i in emots.keys() if emots[i] ==\
- file]) for file in set(emots.values())]), fd)
+ pprint.pprint( dict([
+ (file_, [i for i in emots.keys() if emots[i] == file_])
+ for file_ in set(emots.values())]), fd)
fd.close()
del emoticons
self._init_emoticons(path, need_reload=True)
@@ -2934,11 +2935,11 @@
os.remove(path_to_original_file)
if local and photo:
pixbuf = photo
- type = 'png'
+ typ = 'png'
extension = '_local.png' # save local avatars as png file
else:
pixbuf, typ = gtkgui_helpers.get_pixbuf_from_data(photo, want_type = True)
- if pixbuf is None:
+ if pixbuf is None:
return
extension = '.' + typ
if typ not in ('jpeg', 'png'):
Modified: trunk/src/gajim_themes_window.py
===================================================================
--- trunk/src/gajim_themes_window.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/gajim_themes_window.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -87,8 +87,8 @@
def on_theme_cell_edited(self, cell, row, new_name):
model = self.themes_tree.get_model()
- iter = model.get_iter_from_string(row)
- old_name = model.get_value(iter, 0).decode('utf-8')
+ iter_ = model.get_iter_from_string(row)
+ old_name = model.get_value(iter_, 0).decode('utf-8')
new_name = new_name.decode('utf-8')
if old_name == new_name:
return
@@ -106,14 +106,14 @@
properties = ['textcolor', 'bgcolor', 'font', 'fontattrs']
gajim.config.add_per('themes', new_config_name)
for option in self.options:
- for property in properties:
- option_name = option + property
+ for property_ in properties:
+ option_name = option + property_
gajim.config.set_per('themes', new_config_name, option_name,
gajim.config.get_per('themes', old_config_name, option_name))
gajim.config.del_per('themes', old_config_name)
if old_config_name == gajim.config.get('roster_theme'):
gajim.config.set('roster_theme', new_config_name)
- model.set_value(iter, 0, new_name)
+ model.set_value(iter_, 0, new_name)
self.current_theme = new_name
def fill_themes_treeview(self):
@@ -125,12 +125,12 @@
def select_active_theme(self):
model = self.themes_tree.get_model()
- iter = model.get_iter_root()
+ iter_ = model.get_iter_root()
active_theme = gajim.config.get('roster_theme').replace('_', ' ')
- while iter:
- theme = model[iter][0]
+ while iter_:
+ theme = model[iter_][0]
if theme == active_theme:
- self.themes_tree.get_selection().select_iter(iter)
+ self.themes_tree.get_selection().select_iter(iter_)
self.xml.get_widget('remove_button').set_sensitive(True)
self.theme_options_vbox.set_sensitive(True)
self.theme_options_table.set_sensitive(True)
@@ -143,16 +143,16 @@
self.theme_options_vbox.set_sensitive(True)
self.theme_options_table.set_sensitive(True)
break
- iter = model.iter_next(iter)
+ iter_ = model.iter_next(iter_)
def selection_changed(self, widget = None):
- (model, iter) = self.themes_tree.get_selection().get_selected()
+ (model, iter_) = self.themes_tree.get_selection().get_selected()
selected = self.themes_tree.get_selection().get_selected_rows()
- if not iter or selected[1] == []:
+ if not iter_ or selected[1] == []:
self.theme_options_vbox.set_sensitive(False)
self.theme_options_table.set_sensitive(False)
return
- self.current_theme = model.get_value(iter, 0).decode('utf-8')
+ self.current_theme = model.get_value(iter_, 0).decode('utf-8')
self.current_theme = self.current_theme.replace(' ', '_')
self.set_theme_options(self.current_theme)
if self.current_theme == 'default':
@@ -166,23 +166,23 @@
def on_add_button_clicked(self, widget):
model = self.themes_tree.get_model()
- iter = model.append()
+ iter_ = model.append()
i = 0
# don't confuse translators
theme_name = _('theme name')
theme_name_ns = theme_name.replace(' ', '_')
while theme_name_ns + unicode(i) in gajim.config.get_per('themes'):
i += 1
- model.set_value(iter, 0, theme_name + unicode(i))
+ model.set_value(iter_, 0, theme_name + unicode(i))
gajim.config.add_per('themes', theme_name_ns + unicode(i))
- self.themes_tree.get_selection().select_iter(iter)
+ self.themes_tree.get_selection().select_iter(iter_)
col = self.themes_tree.get_column(0)
- path = model.get_path(iter)
+ path = model.get_path(iter_)
self.themes_tree.set_cursor(path, col, True)
def on_remove_button_clicked(self, widget):
- (model, iter) = self.themes_tree.get_selection().get_selected()
- if not iter:
+ (model, iter_) = self.themes_tree.get_selection().get_selected()
+ if not iter_:
return
if self.current_theme == gajim.config.get('roster_theme'):
dialogs.ErrorDialog(
@@ -193,7 +193,7 @@
self.theme_options_table.set_sensitive(False)
self.xml.get_widget('remove_button').set_sensitive(False)
gajim.config.del_per('themes', self.current_theme)
- model.remove(iter)
+ model.remove(iter_)
def set_theme_options(self, theme, option = 'account'):
self.no_update = True
Modified: trunk/src/groupchat_control.py
===================================================================
--- trunk/src/groupchat_control.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/groupchat_control.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -181,16 +181,17 @@
self.change_nick_dialog = None
self.actions_button = self.xml.get_widget('muc_window_actions_button')
- id = self.actions_button.connect('clicked', self.on_actions_button_clicked)
- self.handlers[id] = self.actions_button
+ id_ = self.actions_button.connect('clicked',
+ self.on_actions_button_clicked)
+ self.handlers[id_] = self.actions_button
widget = self.xml.get_widget('change_nick_button')
- id = widget.connect('clicked', self._on_change_nick_menuitem_activate)
- self.handlers[id] = widget
+ id_ = widget.connect('clicked', self._on_change_nick_menuitem_activate)
+ self.handlers[id_] = widget
widget = self.xml.get_widget('change_subject_button')
- id = widget.connect('clicked', self._on_change_subject_menuitem_activate)
- self.handlers[id] = widget
+ id_ = widget.connect('clicked', self._on_change_subject_menuitem_activate)
+ self.handlers[id_] = widget
widget = self.xml.get_widget('bookmark_button')
for bm in gajim.connections[self.account].bookmarks:
@@ -198,38 +199,38 @@
widget.hide()
break
else:
- id = widget.connect('clicked',
+ id_ = widget.connect('clicked',
self._on_bookmark_room_menuitem_activate)
- self.handlers[id] = widget
+ self.handlers[id_] = widget
widget.show()
widget = self.xml.get_widget('list_treeview')
- id = widget.connect('row_expanded', self.on_list_treeview_row_expanded)
- self.handlers[id] = widget
+ id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded)
+ self.handlers[id_] = widget
- id = widget.connect('row_collapsed',
+ id_ = widget.connect('row_collapsed',
self.on_list_treeview_row_collapsed)
- self.handlers[id] = widget
+ self.handlers[id_] = widget
- id = widget.connect('row_activated',
+ id_ = widget.connect('row_activated',
self.on_list_treeview_row_activated)
- self.handlers[id] = widget
+ self.handlers[id_] = widget
- id = widget.connect('button_press_event',
+ id_ = widget.connect('button_press_event',
self.on_list_treeview_button_press_event)
- self.handlers[id] = widget
+ self.handlers[id_] = widget
- id = widget.connect('key_press_event',
+ id_ = widget.connect('key_press_event',
self.on_list_treeview_key_press_event)
- self.handlers[id] = widget
+ self.handlers[id_] = widget
- id = widget.connect('motion_notify_event',
+ id_ = widget.connect('motion_notify_event',
self.on_list_treeview_motion_notify_event)
- self.handlers[id] = widget
+ self.handlers[id_] = widget
- id = widget.connect('leave_notify_event',
+ id_ = widget.connect('leave_notify_event',
self.on_list_treeview_leave_notify_event)
- self.handlers[id] = widget
+ self.handlers[id_] = widget
self.room_jid = self.contact.jid
self.nick = contact.name.decode('utf-8')
@@ -277,39 +278,39 @@
xm = gtkgui_helpers.get_glade('gc_control_popup_menu.glade')
self.bookmark_room_menuitem = xm.get_widget('bookmark_room_menuitem')
- id = self.bookmark_room_menuitem.connect('activate',
+ id_ = self.bookmark_room_menuitem.connect('activate',
self._on_bookmark_room_menuitem_activate)
- self.handlers[id] = self.bookmark_room_menuitem
+ self.handlers[id_] = self.bookmark_room_menuitem
self.change_nick_menuitem = xm.get_widget('change_nick_menuitem')
- id = self.change_nick_menuitem.connect('activate',
+ id_ = self.change_nick_menuitem.connect('activate',
self._on_change_nick_menuitem_activate)
- self.handlers[id] = self.change_nick_menuitem
+ self.handlers[id_] = self.change_nick_menuitem
self.configure_room_menuitem = xm.get_widget('configure_room_menuitem')
- id = self.configure_room_menuitem.connect('activate',
+ id_ = self.configure_room_menuitem.connect('activate',
self._on_configure_room_menuitem_activate)
- self.handlers[id] = self.configure_room_menuitem
+ self.handlers[id_] = self.configure_room_menuitem
self.destroy_room_menuitem = xm.get_widget('destroy_room_menuitem')
- id = self.destroy_room_menuitem.connect('activate',
+ id_ = self.destroy_room_menuitem.connect('activate',
self._on_destroy_room_menuitem_activate)
- self.handlers[id] = self.destroy_room_menuitem
+ self.handlers[id_] = self.destroy_room_menuitem
self.change_subject_menuitem = xm.get_widget('change_subject_menuitem')
- id = self.change_subject_menuitem.connect('activate',
+ id_ = self.change_subject_menuitem.connect('activate',
self._on_change_subject_menuitem_activate)
- self.handlers[id] = self.change_subject_menuitem
+ self.handlers[id_] = self.change_subject_menuitem
self.history_menuitem = xm.get_widget('history_menuitem')
- id = self.history_menuitem.connect('activate',
+ id_ = self.history_menuitem.connect('activate',
self._on_history_menuitem_activate)
- self.handlers[id] = self.history_menuitem
+ self.handlers[id_] = self.history_menuitem
self.minimize_menuitem = xm.get_widget('minimize_menuitem')
- id = self.minimize_menuitem.connect('toggled',
+ id_ = self.minimize_menuitem.connect('toggled',
self.on_minimize_menuitem_toggled)
- self.handlers[id] = self.minimize_menuitem
+ self.handlers[id_] = self.minimize_menuitem
self.bookmark_separator = xm.get_widget('bookmark_separator')
self.separatormenuitem2 = xm.get_widget('separatormenuitem2')
@@ -326,18 +327,18 @@
self.list_treeview = self.xml.get_widget('list_treeview')
selection = self.list_treeview.get_selection()
- id = selection.connect('changed',
+ id_ = selection.connect('changed',
self.on_list_treeview_selection_changed)
- self.handlers[id] = selection
- id = self.list_treeview.connect('style-set',
+ self.handlers[id_] = selection
+ id_ = self.list_treeview.connect('style-set',
self.on_list_treeview_style_set)
- self.handlers[id] = self.list_treeview
+ self.handlers[id_] = self.list_treeview
# we want to know when the the widget resizes, because that is
# an indication that the hpaned has moved...
# FIXME: Find a better indicator that the hpaned has moved.
- id = self.list_treeview.connect('size-allocate',
+ id_ = self.list_treeview.connect('size-allocate',
self.on_treeview_size_allocate)
- self.handlers[id] = self.list_treeview
+ self.handlers[id_] = self.list_treeview
#status_image, shown_nick, type, nickname, avatar
store = gtk.TreeStore(gtk.Image, str, str, str, gtk.gdk.Pixbuf)
store.set_sort_func(C_NICK, self.tree_compare_iters)
@@ -412,13 +413,13 @@
return -1
return 1
if type1 == 'contact':
- gc_contact1 = gajim.contacts.get_gc_contact(self.account, self.room_jid,
- nick1)
+ gc_contact1 = gajim.contacts.get_gc_contact(self.account,
+ self.room_jid, nick1)
if not gc_contact1:
return 0
if type2 == 'contact':
- gc_contact2 = gajim.contacts.get_gc_contact(self.account, self.room_jid,
- nick2)
+ gc_contact2 = gajim.contacts.get_gc_contact(self.account,
+ self.room_jid, nick2)
if not gc_contact2:
return 0
if type1 == 'contact' and type2 == 'contact' and \
@@ -456,8 +457,8 @@
self.room_jid)):
item = gtk.MenuItem(nick, use_underline = False)
submenu.append(item)
- id = item.connect('activate', self.append_nick_in_msg_textview, nick)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.append_nick_in_msg_textview, nick)
+ self.handlers[id_] = item
menu.show_all()
@@ -728,8 +729,8 @@
autopopup = gajim.config.get('autopopup')
autopopupaway = gajim.config.get('autopopupaway')
- iter = self.get_contact_iter(nick)
- path = self.list_treeview.get_model().get_path(iter)
+ iter_ = self.get_contact_iter(nick)
+ path = self.list_treeview.get_model().get_path(iter_)
if not autopopup or (not autopopupaway and \
gajim.connections[self.account].connected > 2):
if no_queue: # We didn't have a queue: we change icons
@@ -738,7 +739,7 @@
gajim.interface.roster.get_appropriate_state_images(
self.room_jid, icon_name = 'event')
image = state_images['event']
- model[iter][C_IMG] = image
+ model[iter_][C_IMG] = image
if self.parent_win:
self.parent_win.show_title()
self.parent_win.redraw_tab(self)
@@ -1031,8 +1032,8 @@
_on_send_files(gc_contact)
def draw_contact(self, nick, selected=False, focus=False):
- iter = self.get_contact_iter(nick)
- if not iter:
+ iter_ = self.get_contact_iter(nick)
+ if not iter_:
return
model = self.list_treeview.get_model()
gc_contact = gajim.contacts.get_gc_contact(self.account, self.room_jid,
@@ -1057,15 +1058,15 @@
name += '\n' '<span size="small" style="italic" foreground="%s">%s</span>'\
% (colorstring, gobject.markup_escape_text(status))
- model[iter][C_IMG] = image
- model[iter][C_TEXT] = name
+ model[iter_][C_IMG] = image
+ model[iter_][C_TEXT] = name
def draw_avatar(self, nick):
if not gajim.config.get('show_avatars_in_roster'):
return
model = self.list_treeview.get_model()
- iter = self.get_contact_iter(nick)
- if not iter:
+ iter_ = self.get_contact_iter(nick)
+ if not iter_:
return
pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(self.room_jid + \
'/' + nick, True)
@@ -1073,7 +1074,7 @@
scaled_pixbuf = None
else:
scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster')
- model[iter][C_AVATAR] = scaled_pixbuf
+ model[iter_][C_AVATAR] = scaled_pixbuf
def draw_role(self, role):
role_iter = self.get_role_iter(role)
@@ -1229,9 +1230,9 @@
if self.parent_win:
self.parent_win.redraw_tab(self)
else:
- iter = self.get_contact_iter(nick)
- if not iter:
- iter = self.add_contact_to_roster(nick, show, role, affiliation,
+ iter_ = self.get_contact_iter(nick)
+ if not iter_:
+ iter_ = self.add_contact_to_roster(nick, show, role, affiliation,
status, jid)
newly_created = True
self.draw_all_roles()
@@ -1363,7 +1364,7 @@
(gajim.interface.jabber_state_images['16']['closed'], role,
'role', role_name, None))
self.draw_all_roles()
- iter = model.append(role_iter, (None, nick, 'contact', name, None))
+ iter_ = model.append(role_iter, (None, nick, 'contact', name, None))
if not nick in gajim.contacts.get_nick_list(self.account, self.room_jid):
gc_contact = gajim.contacts.create_gc_contact(room_jid = self.room_jid,
name = nick, show = show, status = status, role = role,
@@ -1390,35 +1391,35 @@
self.list_treeview.expand_row((model.get_path(role_iter)), False)
if self.is_continued:
self.draw_banner_text()
- return iter
+ return iter_
def get_role_iter(self, role):
model = self.list_treeview.get_model()
fin = False
- iter = model.get_iter_root()
- if not iter:
+ iter_ = model.get_iter_root()
+ if not iter_:
return None
while not fin:
- role_name = model[iter][C_NICK].decode('utf-8')
+ role_name = model[iter_][C_NICK].decode('utf-8')
if role == role_name:
- return iter
- iter = model.iter_next(iter)
- if not iter:
+ return iter_
+ iter_ = model.iter_next(iter_)
+ if not iter_:
fin = True
return None
def remove_contact(self, nick):
'''Remove a user from the contacts_list'''
model = self.list_treeview.get_model()
- iter = self.get_contact_iter(nick)
- if not iter:
+ iter_ = self.get_contact_iter(nick)
+ if not iter_:
return
gc_contact = gajim.contacts.get_gc_contact(self.account, self.room_jid,
nick)
if gc_contact:
gajim.contacts.remove_gc_contact(self.account, gc_contact)
- parent_iter = model.iter_parent(iter)
- model.remove(iter)
+ parent_iter = model.iter_parent(iter_)
+ model.remove(iter_)
if model.iter_n_children(parent_iter) == 0:
model.remove(parent_iter)
@@ -1808,8 +1809,8 @@
on_minimize(self)
return
if method == self.parent_win.CLOSE_ESC:
- iter = self.list_treeview.get_selection().get_selected()[1]
- if iter:
+ iter_ = self.list_treeview.get_selection().get_selected()[1]
+ if iter_:
self.list_treeview.get_selection().unselect_all()
on_no(self)
return
@@ -1924,9 +1925,9 @@
return
data = selection.data
path = treeview.get_selection().get_selected_rows()[1][0]
- iter = model.get_iter(path)
- type = model[iter][2]
- if type != 'contact': # source is not a contact
+ iter_ = model.get_iter(path)
+ type_ = model[iter_][2]
+ if type_ != 'contact': # source is not a contact
return
contact_jid = data.decode('utf-8')
gajim.connections[self.account].send_invite(self.room_jid, contact_jid)
@@ -2053,8 +2054,8 @@
def on_list_treeview_key_press_event(self, widget, event):
if event.keyval == gtk.keysyms.Escape:
selection = widget.get_selection()
- iter = selection.get_selected()[1]
- if iter:
+ iter_ = selection.get_selected()[1]
+ if iter_:
widget.get_selection().unselect_all()
return True
@@ -2106,8 +2107,8 @@
'owner')) or (user_affiliation == 'none' and target_affiliation != \
'none'):
item.set_sensitive(False)
- id = item.connect('activate', self.kick, nick)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.kick, nick)
+ self.handlers[id_] = item
item = xml.get_widget('voice_checkmenuitem')
item.set_active(target_role != 'visitor')
@@ -2116,69 +2117,69 @@
(user_affiliation=='member' and target_affiliation!='none') or \
target_affiliation in ('admin', 'owner'):
item.set_sensitive(False)
- id = item.connect('activate', self.on_voice_checkmenuitem_activate,
+ id_ = item.connect('activate', self.on_voice_checkmenuitem_activate,
nick)
- self.handlers[id] = item
+ self.handlers[id_] = item
item = xml.get_widget('moderator_checkmenuitem')
item.set_active(target_role == 'moderator')
if not user_affiliation in ('admin', 'owner') or \
target_affiliation in ('admin', 'owner'):
item.set_sensitive(False)
- id = item.connect('activate', self.on_moderator_checkmenuitem_activate,
+ id_ = item.connect('activate', self.on_moderator_checkmenuitem_activate,
nick)
- self.handlers[id] = item
+ self.handlers[id_] = item
item = xml.get_widget('ban_menuitem')
if not user_affiliation in ('admin', 'owner') or \
(target_affiliation in ('admin', 'owner') and\
user_affiliation != 'owner'):
item.set_sensitive(False)
- id = item.connect('activate', self.ban, jid)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.ban, jid)
+ self.handlers[id_] = item
item = xml.get_widget('member_checkmenuitem')
item.set_active(target_affiliation != 'none')
if not user_affiliation in ('admin', 'owner') or \
(user_affiliation != 'owner' and target_affiliation in ('admin','owner')):
item.set_sensitive(False)
- id = item.connect('activate', self.on_member_checkmenuitem_activate,
+ id_ = item.connect('activate', self.on_member_checkmenuitem_activate,
jid)
- self.handlers[id] = item
+ self.handlers[id_] = item
item = xml.get_widget('admin_checkmenuitem')
item.set_active(target_affiliation in ('admin', 'owner'))
if not user_affiliation == 'owner':
item.set_sensitive(False)
- id = item.connect('activate', self.on_admin_checkmenuitem_activate, jid)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.on_admin_checkmenuitem_activate, jid)
+ self.handlers[id_] = item
item = xml.get_widget('owner_checkmenuitem')
item.set_active(target_affiliation == 'owner')
if not user_affiliation == 'owner':
item.set_sensitive(False)
- id = item.connect('activate', self.on_owner_checkmenuitem_activate, jid)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.on_owner_checkmenuitem_activate, jid)
+ self.handlers[id_] = item
item = xml.get_widget('information_menuitem')
- id = item.connect('activate', self.on_info, nick)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.on_info, nick)
+ self.handlers[id_] = item
item = xml.get_widget('history_menuitem')
- id = item.connect('activate', self.on_history, nick)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.on_history, nick)
+ self.handlers[id_] = item
item = xml.get_widget('add_to_roster_menuitem')
our_jid = gajim.get_jid_from_account(self.account)
if not jid or jid == our_jid:
item.set_sensitive(False)
else:
- id = item.connect('activate', self.on_add_to_roster, jid)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.on_add_to_roster, jid)
+ self.handlers[id_] = item
item = xml.get_widget('send_private_message_menuitem')
- id = item.connect('activate', self.on_send_pm, model, iter_)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.on_send_pm, model, iter_)
+ self.handlers[id_] = item
item = xml.get_widget('send_file_menuitem')
# add a special img for send file menuitem
@@ -2190,8 +2191,8 @@
if not c.resource:
item.set_sensitive(False)
else:
- id = item.connect('activate', self.on_send_file, c)
- self.handlers[id] = item
+ id_ = item.connect('activate', self.on_send_file, c)
+ self.handlers[id_] = item
# show the popup now!
menu = xml.get_widget('gc_occupants_menu')
@@ -2242,17 +2243,17 @@
if event.button == 3: # right click
widget.get_selection().select_path(path)
model = widget.get_model()
- iter = model.get_iter(path)
+ iter_ = model.get_iter(path)
if len(path) == 2:
- self.mk_menu(event, iter)
+ self.mk_menu(event, iter_)
return True
elif event.button == 2: # middle click
widget.get_selection().select_path(path)
model = widget.get_model()
- iter = model.get_iter(path)
+ iter_ = model.get_iter(path)
if len(path) == 2:
- nick = model[iter][C_NICK].decode('utf-8')
+ nick = model[iter_][C_NICK].decode('utf-8')
self._start_private_message(nick)
return True
@@ -2262,8 +2263,8 @@
return True
else:
model = widget.get_model()
- iter = model.get_iter(path)
- nick = model[iter][C_NICK].decode('utf-8')
+ iter_ = model.get_iter(path)
+ nick = model[iter_][C_NICK].decode('utf-8')
if not nick in gajim.contacts.get_nick_list(self.account,
self.room_jid):
# it's a group
@@ -2301,19 +2302,19 @@
self.tooltip.hide_tooltip()
if props:
[row, col, x, y] = props
- iter = None
+ iter_ = None
try:
- iter = model.get_iter(row)
+ iter_ = model.get_iter(row)
except Exception:
self.tooltip.hide_tooltip()
return
- typ = model[iter][C_TYPE].decode('utf-8')
+ typ = model[iter_][C_TYPE].decode('utf-8')
if typ == 'contact':
account = self.account
if self.tooltip.timeout == 0 or self.tooltip.id != props[0]:
self.tooltip.id = row
- nick = model[iter][C_NICK].decode('utf-8')
+ nick = model[iter_][C_NICK].decode('utf-8')
self.tooltip.timeout = gobject.timeout_add(500,
self.show_tooltip, gajim.contacts.get_gc_contact(account,
self.room_jid, nick))
Modified: trunk/src/groups.py
===================================================================
--- trunk/src/groups.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/groups.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -56,8 +56,8 @@
item.addChild('title', {}, [self.subject_entry.get_text()])
item.addChild('id', {}, ['0'])
- buffer = self.contents_textview.get_buffer()
- item.addChild('content', {}, [buffer.get_text(buffer.get_start_iter(), buffer.get_end_iter())])
+ buf = self.contents_textview.get_buffer()
+ item.addChild('content', {}, [buf.get_text(buf.get_start_iter(), buf.get_end_iter())])
# publish it to node
gajim.connections[self.account].send_pb_publish(self.servicejid, self.groupid, item, '0')
Modified: trunk/src/gtkgui_helpers.py
===================================================================
--- trunk/src/gtkgui_helpers.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/gtkgui_helpers.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -371,7 +371,7 @@
'''checks if we are svn or normal user and returns abspath to asked script
if want_type is True we return 'svn' or 'install' '''
if os.path.isdir('.svn'): # we are svn user
- type = 'svn'
+ type_ = 'svn'
cwd = os.getcwd() # it's always ending with src
if scriptname == 'gajim-remote':
@@ -397,13 +397,13 @@
print >> sys.stderr, s
else: # normal user (not svn user)
- type = 'install'
+ type_ = 'install'
# always make it like '/usr/local/bin/gajim'
path_to_script = helpers.is_in_path(scriptname, True)
if want_type:
- return path_to_script, type
+ return path_to_script, type_
else:
return path_to_script
@@ -873,16 +873,16 @@
pixbuf2 on top left of each static images'''
path += '/'
if transport:
- list = ('online', 'chat', 'away', 'xa', 'dnd', 'offline',
+ list_ = ('online', 'chat', 'away', 'xa', 'dnd', 'offline',
'not in roster')
else:
- list = ('connecting', 'online', 'chat', 'away', 'xa', 'dnd',
+ list_ = ('connecting', 'online', 'chat', 'away', 'xa', 'dnd',
'invisible', 'offline', 'error', 'requested', 'event', 'opened',
'closed', 'not in roster', 'muc_active', 'muc_inactive')
if pixbuf2:
- list = ('connecting', 'online', 'chat', 'away', 'xa', 'dnd',
+ list_ = ('connecting', 'online', 'chat', 'away', 'xa', 'dnd',
'offline', 'error', 'requested', 'event', 'not in roster')
- return _load_icon_list(list, path, pixbuf2)
+ return _load_icon_list(list_, path, pixbuf2)
def load_icon(icon_name):
'''load an icon from the iconset in 16x16'''
@@ -944,9 +944,9 @@
image = gtk.Image()
image.show()
imgs[icon] = image
- for file in files: # loop seeking for either gif or png
- if os.path.exists(file):
- image.set_from_file(file)
+ for file_ in files: # loop seeking for either gif or png
+ if os.path.exists(file_):
+ image.set_from_file(file_)
if pixbuf2 and image.get_storage_type() == gtk.IMAGE_PIXBUF:
# add pixbuf2 on top-left corner of image
pixbuf1 = image.get_pixbuf()
Modified: trunk/src/htmltextview.py
===================================================================
--- trunk/src/htmltextview.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/htmltextview.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -988,8 +988,8 @@
return False
def display_html(self, html):
- buffer = self.get_buffer()
- eob = buffer.get_end_iter()
+ buffer_ = self.get_buffer()
+ eob = buffer_.get_end_iter()
## this works too if libxml2 is not available
# parser = xml.sax.make_parser(['drv_libxml2'])
# parser.setFeature(xml.sax.handler.feature_validation, True)
@@ -999,7 +999,7 @@
# too much space after :)
#if not eob.starts_line():
- # buffer.insert(eob, '\n')
+ # buffer_.insert(eob, '\n')
Modified: trunk/src/ipython_view.py
===================================================================
--- trunk/src/ipython_view.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/ipython_view.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -248,10 +248,10 @@
if verbose or debug: print header+cmd
# flush stdout so we don't mangle python's buffering
if not debug:
- input, output = os.popen4(cmd)
+ input_, output = os.popen4(cmd)
print output.read()
output.close()
- input.close()
+ input_.close()
class ConsoleView(gtk.TextView):
'''
@@ -359,9 +359,9 @@
@param text: Text to use as replacement.
@type text: string
'''
- iter = self.text_buffer.get_iter_at_mark(self.line_start)
- iter.forward_to_line_end()
- self.text_buffer.delete(self.text_buffer.get_iter_at_mark(self.line_start), iter)
+ iter_ = self.text_buffer.get_iter_at_mark(self.line_start)
+ iter_.forward_to_line_end()
+ self.text_buffer.delete(self.text_buffer.get_iter_at_mark(self.line_start), iter_)
self._write(text, True)
def getCurrentLine(self):
@@ -386,12 +386,12 @@
@param text: Text to show.
@type text: string
'''
- iter = self.text_buffer.get_iter_at_mark(self.line_start)
- iter.forward_to_line_end()
+ iter_ = self.text_buffer.get_iter_at_mark(self.line_start)
+ iter_.forward_to_line_end()
self.text_buffer.apply_tag_by_name(
'notouch',
self.text_buffer.get_iter_at_mark(self.line_start),
- iter)
+ iter_)
self._write('\n'+text)
if text:
self._write('\n')
@@ -515,12 +515,12 @@
return False
completed, possibilities = self.complete(self.getCurrentLine())
if len(possibilities) > 1:
- slice = self.getCurrentLine()
+ slice_ = self.getCurrentLine()
self.write('\n')
for symbol in possibilities:
self.write(symbol+'\n')
self.showPrompt(self.prompt)
- self.changeLine(completed or slice)
+ self.changeLine(completed or slice_)
return True
def _processLine(self):
Modified: trunk/src/message_textview.py
===================================================================
--- trunk/src/message_textview.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/message_textview.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -289,9 +289,9 @@
def clear(self, widget = None):
'''clear text in the textview'''
- buffer = self.get_buffer()
- start, end = buffer.get_bounds()
- buffer.delete(start, end)
+ buffer_ = self.get_buffer()
+ start, end = buffer_.get_bounds()
+ buffer_.delete(start, end)
# We register depending on keysym and modifier some bindings
Modified: trunk/src/message_window.py
===================================================================
--- trunk/src/message_window.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/message_window.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -91,12 +91,12 @@
# MessageWindow._on_window_delete, which manually destroys window
# through win.destroy() - this means no additional handlers for
# 'delete-event' are called.
- id = self.window.connect_after('delete-event', self._on_window_delete)
- self.handlers[id] = self.window
- id = self.window.connect('destroy', self._on_window_destroy)
- self.handlers[id] = self.window
- id = self.window.connect('focus-in-event', self._on_window_focus)
- self.handlers[id] = self.window
+ id_ = self.window.connect_after('delete-event', self._on_window_delete)
+ self.handlers[id_] = self.window
+ id_ = self.window.connect('destroy', self._on_window_destroy)
+ self.handlers[id_] = self.window
+ id_ = self.window.connect('focus-in-event', self._on_window_focus)
+ self.handlers[id_] = self.window
keys=['<Control>f', '<Control>g', '<Control>h', '<Control>i',
'<Control>l', '<Control>L', '<Control>n', '<Control>u', '<Control>v',
@@ -116,12 +116,12 @@
self.window.add_events(gtk.gdk.POINTER_MOTION_MASK)
self.alignment = self.xml.get_widget('alignment')
- id = self.notebook.connect('switch-page',
+ id_ = self.notebook.connect('switch-page',
self._on_notebook_switch_page)
- self.handlers[id] = self.notebook
- id = self.notebook.connect('key-press-event',
+ self.handlers[id_] = self.notebook
+ id_ = self.notebook.connect('key-press-event',
self._on_notebook_key_press)
- self.handlers[id] = self.notebook
+ self.handlers[id_] = self.notebook
# Remove the glade pages
while self.notebook.get_n_pages():
@@ -166,10 +166,7 @@
self.account = new_name
def get_num_controls(self):
- n = 0
- for dict in self._controls.values():
- n += len(dict)
- return n
+ return sum(len(d) for d in self._controls.values())
def resize(self, width, height):
gtkgui_helpers.resize_window(self.window, width, height)
@@ -256,12 +253,12 @@
xml = gtkgui_helpers.get_glade('message_window.glade', 'chat_tab_ebox')
tab_label_box = xml.get_widget('chat_tab_ebox')
widget = xml.get_widget('tab_close_button')
- id = widget.connect('clicked', self._on_close_button_clicked, control)
- control.handlers[id] = widget
+ id_ = widget.connect('clicked', self._on_close_button_clicked, control)
+ control.handlers[id_] = widget
- id = tab_label_box.connect('button-press-event', self.on_tab_eventbox_button_press_event,
+ id_ = tab_label_box.connect('button-press-event', self.on_tab_eventbox_button_press_event,
control.widget)
- control.handlers[id] = tab_label_box
+ control.handlers[id_] = tab_label_box
self.notebook.append_page(control.widget, tab_label_box)
# If GTK+ version >= 2.10, use gtk native way to reorder tabs
Modified: trunk/src/search_window.py
===================================================================
--- trunk/src/search_window.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/search_window.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -96,17 +96,17 @@
self.search_button.hide()
def on_add_contact_button_clicked(self, widget):
- (model, iter) = self.result_treeview.get_selection().get_selected()
- if not iter:
+ (model, iter_) = self.result_treeview.get_selection().get_selected()
+ if not iter_:
return
- jid = model[iter][self.jid_column]
+ jid = model[iter_][self.jid_column]
dialogs.AddNewContactWindow(self.account, jid)
def on_information_button_clicked(self, widget):
- (model, iter) = self.result_treeview.get_selection().get_selected()
- if not iter:
+ (model, iter_) = self.result_treeview.get_selection().get_selected()
+ if not iter_:
return
- jid = model[iter][self.jid_column]
+ jid = model[iter_][self.jid_column]
if jid in gajim.interface.instances[self.account]['infos']:
gajim.interface.instances[self.account]['infos'][jid].window.present()
else:
@@ -146,10 +146,10 @@
def on_result_treeview_cursor_changed(self, treeview):
if self.jid_column == -1:
return
- (model, iter) = treeview.get_selection().get_selected()
- if not iter:
+ (model, iter_) = treeview.get_selection().get_selected()
+ if not iter_:
return
- if model[iter][self.jid_column]:
+ if model[iter_][self.jid_column]:
self.add_contact_button.set_sensitive(True)
self.information_button.set_sensitive(True)
else:
Modified: trunk/src/tooltips.py
===================================================================
--- trunk/src/tooltips.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/tooltips.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -211,9 +211,9 @@
files.append(os.path.join(file_path, state_file + '.gif'))
image = gtk.Image()
image.set_from_pixbuf(None)
- for file in files:
- if os.path.exists(file):
- image.set_from_file(file)
+ for f in files:
+ if os.path.exists(f):
+ image.set_from_file(f)
break
spacer = gtk.Label(self.spacer_label)
image.set_alignment(1, 0.5)
@@ -339,36 +339,36 @@
# Add avatar
puny_name = helpers.sanitize_filename(contact.name)
puny_room = helpers.sanitize_filename(contact.room_jid)
- file = helpers.get_avatar_path(os.path.join(gajim.AVATAR_PATH, puny_room,
+ file_ = helpers.get_avatar_path(os.path.join(gajim.AVATAR_PATH, puny_room,
puny_name))
- if file:
- self.avatar_image.set_from_file(file)
+ if file_:
+ _self.avatar_image.set_from_file(file_)
pix = self.avatar_image.get_pixbuf()
pix = gtkgui_helpers.get_scaled_pixbuf(pix, 'tooltip')
self.avatar_image.set_from_pixbuf(pix)
else:
self.avatar_image.set_from_pixbuf(None)
while properties:
- property = properties.pop(0)
+ property_ = properties.pop(0)
vcard_current_row += 1
vertical_fill = gtk.FILL
if not properties:
vertical_fill |= gtk.EXPAND
label = gtk.Label()
label.set_alignment(0, 0)
- if property[1]:
- label.set_markup(property[0])
+ if property_[1]:
+ label.set_markup(property_[0])
vcard_table.attach(label, 1, 2, vcard_current_row,
vcard_current_row + 1, gtk.FILL, vertical_fill, 0, 0)
label = gtk.Label()
label.set_alignment(0, 0)
- label.set_markup(property[1])
+ label.set_markup(property_[1])
label.set_line_wrap(True)
vcard_table.attach(label, 2, 3, vcard_current_row,
vcard_current_row + 1, gtk.EXPAND | gtk.FILL,
vertical_fill, 0, 0)
else:
- label.set_markup(property[0])
+ label.set_markup(property_[0])
label.set_line_wrap(True)
vcard_table.attach(label, 1, 3, vcard_current_row,
vcard_current_row + 1, gtk.FILL, vertical_fill, 0)
@@ -409,9 +409,9 @@
puny_jid = helpers.sanitize_filename(prim_contact.jid)
table_size = 3
- file = helpers.get_avatar_path(os.path.join(gajim.AVATAR_PATH, puny_jid))
- if file:
- self.avatar_image.set_from_file(file)
+ file_ = helpers.get_avatar_path(os.path.join(gajim.AVATAR_PATH, puny_jid))
+ if file_:
+ self.avatar_image.set_from_file(file_)
pix = self.avatar_image.get_pixbuf()
pix = gtkgui_helpers.get_scaled_pixbuf(pix, 'tooltip')
self.avatar_image.set_from_pixbuf(pix)
@@ -543,30 +543,30 @@
gobject.markup_escape_text(keyID)))
while properties:
- property = properties.pop(0)
+ property_ = properties.pop(0)
vcard_current_row += 1
vertical_fill = gtk.FILL
if not properties and table_size == 4:
vertical_fill |= gtk.EXPAND
label = gtk.Label()
label.set_alignment(0, 0)
- if property[1]:
- label.set_markup(property[0])
+ if property_[1]:
+ label.set_markup(property_[0])
vcard_table.attach(label, 1, 2, vcard_current_row,
vcard_current_row + 1, gtk.FILL, vertical_fill, 0, 0)
label = gtk.Label()
label.set_alignment(0, 0)
- label.set_markup(property[1])
+ label.set_markup(property_[1])
label.set_line_wrap(True)
vcard_table.attach(label, 2, 3, vcard_current_row,
vcard_current_row + 1, gtk.EXPAND | gtk.FILL,
vertical_fill, 0, 0)
else:
- if isinstance(property[0], (unicode, str)): #FIXME: rm unicode?
- label.set_markup(property[0])
+ if isinstance(property_[0], (unicode, str)): #FIXME: rm unicode?
+ label.set_markup(property_[0])
label.set_line_wrap(True)
else:
- label = property[0]
+ label = property_[0]
vcard_table.attach(label, 1, 3, vcard_current_row,
vcard_current_row + 1, gtk.FILL, vertical_fill, 0)
self.avatar_image.set_alignment(0, 0)
@@ -661,20 +661,20 @@
properties.append((_('Name: '),
gobject.markup_escape_text(file_name)))
if file_props['type'] == 'r':
- type = _('Download')
+ type_ = _('Download')
actor = _('Sender: ')
sender = unicode(file_props['sender']).split('/')[0]
name = gajim.contacts.get_first_contact_from_jid(
file_props['tt_account'], sender).get_shown_name()
else:
- type = _('Upload')
+ type_ = _('Upload')
actor = _('Recipient: ')
receiver = file_props['receiver']
if hasattr(receiver, 'name'):
name = receiver.get_shown_name()
else:
name = receiver.split('/')[0]
- properties.append((_('Type: '), type))
+ properties.append((_('Type: '), type_))
properties.append((actor, gobject.markup_escape_text(name)))
transfered_len = file_props.get('received-len', 0)
@@ -709,17 +709,17 @@
properties.append((_('Description: '), gobject.markup_escape_text(
file_desc)))
while properties:
- property = properties.pop(0)
+ property_ = properties.pop(0)
current_row += 1
label = gtk.Label()
label.set_alignment(0, 0)
- label.set_markup(property[0])
+ label.set_markup(property_[0])
ft_table.attach(label, 1, 2, current_row, current_row + 1,
gtk.FILL, gtk.FILL, 0, 0)
label = gtk.Label()
label.set_alignment(0, 0)
label.set_line_wrap(True)
- label.set_markup(property[1])
+ label.set_markup(property_[1])
ft_table.attach(label, 2, 3, current_row, current_row + 1,
gtk.EXPAND | gtk.FILL, gtk.FILL, 0, 0)
Modified: trunk/src/vcard.py
===================================================================
--- trunk/src/vcard.py 2008-12-02 20:55:27 UTC (rev 10756)
+++ trunk/src/vcard.py 2008-12-03 17:16:04 UTC (rev 10757)
@@ -118,8 +118,8 @@
self.fill_jabber_page()
annotations = gajim.connections[self.account].annotations
if self.contact.jid in annotations:
- buffer = self.xml.get_widget('textview_annotation').get_buffer()
- buffer.set_text(annotations[self.contact.jid])
+ buffer_ = self.xml.get_widget('textview_annotation').get_buffer()
+ buffer_.set_text(annotations[self.contact.jid])
self.xml.signal_autoconnect(self)
self.window.show_all()
@@ -133,9 +133,9 @@
if self.update_progressbar_timeout_id is not None:
gobject.source_remove(self.update_progressbar_timeout_id)
del gajim.interface.instances[self.account]['infos'][self.contact.jid]
- buffer = self.xml.get_widget('textview_annotation').get_buffer()
- annotation = buffer.get_text(buffer.get_start_iter(),
- buffer.get_end_iter())
+ buffer_ = self.xml.get_widget('textview_annotation').get_buffer()
+ annotation = buffer_.get_text(buffer_.get_start_iter(),
+ buffer_.get_end_iter())
connection = gajim.connections[self.account]
if annotation != connection.annotations.get(self.contact.jid, ''):
connection.annotations[self.contact.jid] = annotation
1
0
Author: asterix
Date: 2008-12-02 21:55:27 +0100 (Tue, 02 Dec 2008)
New Revision: 10756
Modified:
branches/gajim_0.12/po/bg.po
Log:
[Yavor Doganov] updated bulgarian translation
Modified: branches/gajim_0.12/po/bg.po
===================================================================
--- branches/gajim_0.12/po/bg.po 2008-12-02 20:54:10 UTC (rev 10755)
+++ branches/gajim_0.12/po/bg.po 2008-12-02 20:55:27 UTC (rev 10756)
@@ -1,17 +1,16 @@
# Bulgarian translation of Gajim.
-# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is distributed under the same license as the Gajim package.
-# Yavor Doganov <yavor(a)doganov.org>, 2005, 2006, 2007.
+# Yavor Doganov <yavor(a)gnu.org>, 2005, 2006, 2007, 2008.
#
#
-#
msgid ""
msgstr ""
-"Project-Id-Version: Gajim 0.11.1\n"
+"Project-Id-Version: Gajim 0.12\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
-"PO-Revision-Date: 2007-01-17 18:54+0200\n"
-"Last-Translator: Yavor Doganov <yavor(a)doganov.org>\n"
+"POT-Creation-Date: 2008-12-01 22:29+0100\n"
+"PO-Revision-Date: 2008-12-02 22:33+0200\n"
+"Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n"
"Language-Team: Bulgarian <dict(a)fsa-bg.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +19,7 @@
#: ../data/gajim.desktop.in.in.h:1
msgid "A GTK+ Jabber client"
-msgstr "GTK+ Джабър клиент"
+msgstr "Джабър клиент за GTK+"
#: ../data/gajim.desktop.in.in.h:2
msgid "Gajim Instant Messenger"
@@ -32,13 +31,12 @@
#: ../data/glade/account_context_menu.glade.h:1
#: ../data/glade/roster_window.glade.h:7
-#, fuzzy
msgid "Join _Group Chat..."
-msgstr "_Влизане в стая"
+msgstr "_Влизане в стая…"
#: ../data/glade/account_context_menu.glade.h:2
msgid "_Add Contact..."
-msgstr "_Добавяне на контакт..."
+msgstr "_Добавяне на контакт…"
#: ../data/glade/account_context_menu.glade.h:3
#: ../data/glade/roster_window.glade.h:16
@@ -47,27 +45,24 @@
#: ../data/glade/account_context_menu.glade.h:4
msgid "_Execute Command..."
-msgstr "_Изпълнение на команда..."
+msgstr "_Изпълнение на команда…"
#: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
msgid "_Modify Account"
-msgstr "Промяна на акаунт"
+msgstr "_Промяна на акаунт"
#: ../data/glade/account_context_menu.glade.h:6
msgid "_Open Gmail Inbox"
msgstr "_Отваряне на пощенската кутия на Gmail"
#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
msgid "_Personal Events"
-msgstr "Лични данни"
+msgstr "_Лични събития"
#: ../data/glade/account_context_menu.glade.h:8
#: ../data/glade/roster_window.glade.h:24
-#, fuzzy
msgid "_Start Chat..."
-msgstr "_Започване на разговор"
+msgstr "_Започване на разговор…"
#: ../data/glade/account_context_menu.glade.h:9
#: ../data/glade/zeroconf_context_menu.glade.h:2
@@ -75,34 +70,34 @@
msgstr "_Състояние"
#: ../data/glade/account_creation_wizard_window.glade.h:1
-#, fuzzy
msgid ""
"<b>Connecting to server</b>\n"
"\n"
"Please wait..."
msgstr ""
-"<b>Акаунтът се създава</b>\n"
+"<b>Свързване със сървъра</b>\n"
"\n"
-"Изчакайте..."
+"Изчакайте…"
#: ../data/glade/account_creation_wizard_window.glade.h:4
msgid "<b>Please choose one of the options below:</b>"
msgstr "<b>Изберете една от опциите по-долу:</b>"
#: ../data/glade/account_creation_wizard_window.glade.h:5
-#, fuzzy
msgid "<b>Please fill in the data for your existing account</b>"
-msgstr "<b>Попълнете данните за нов акаунт</b>"
+msgstr "<b>Попълнете данните за съществуващия ви акаунт</b>"
#: ../data/glade/account_creation_wizard_window.glade.h:6
msgid "<b>Please select a server</b>"
-msgstr ""
+msgstr "<b>Изберете сървър</b>"
#: ../data/glade/account_creation_wizard_window.glade.h:7
msgid ""
"Add this certificate to the list of trusted certificates.\n"
"SHA1 fingerprint of the certificate:\n"
msgstr ""
+"Добавяне на този сертификат към списъка с доверени сертификати.\n"
+"Отпечатък тип SHA1 на сертификата:\n"
#: ../data/glade/account_creation_wizard_window.glade.h:10
msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
@@ -119,9 +114,8 @@
msgstr "Gajim: Помощник за създаване на акаунт"
#: ../data/glade/account_creation_wizard_window.glade.h:13
-#, fuzzy
msgid "I already have an account I want to _use"
-msgstr "Вече имам регистриран акаунт, който искам да използвам"
+msgstr "_Вече имам регистриран акаунт, който искам да използвам"
#: ../data/glade/account_creation_wizard_window.glade.h:14
msgid "I want to _register for a new account"
@@ -137,12 +131,11 @@
#: ../data/glade/account_modification_window.glade.h:26
#: ../data/glade/accounts_window.glade.h:34
msgid "Manage..."
-msgstr "Управление на..."
+msgstr "Управление на…"
#: ../data/glade/account_creation_wizard_window.glade.h:17
-#, fuzzy
msgid "Prox_y:"
-msgstr "Сървър-посредник:"
+msgstr "_Сървър-посредник:"
#: ../data/glade/account_creation_wizard_window.glade.h:18
#: ../data/glade/account_modification_window.glade.h:40
@@ -186,9 +179,8 @@
msgstr "_Приключване"
#: ../data/glade/account_creation_wizard_window.glade.h:27
-#, fuzzy
msgid "_Hostname:"
-msgstr "Хост: "
+msgstr "_Хост:"
#: ../data/glade/account_creation_wizard_window.glade.h:28
#: ../data/glade/account_modification_window.glade.h:50
@@ -239,9 +231,8 @@
#: ../data/glade/account_modification_window.glade.h:6
#: ../data/glade/accounts_window.glade.h:7
-#, fuzzy
msgid "Administration operations"
-msgstr "Списък с администратори"
+msgstr "Административни операции"
#: ../data/glade/account_modification_window.glade.h:7
#: ../data/glade/accounts_window.glade.h:8
@@ -268,14 +259,14 @@
msgstr ""
"Изберете тази опция, за да може Gajim да се свързва по порт 5223, където се "
"очаква сървърите да предоставят възможности по SSL. Забележете, че Gajim "
-"използва TLS шифриране по подразбиране и избирайки тази опция, изключвате "
-"TLS."
+"използва шифриране тип TLS по подразбиране и избирайки тази опция, "
+"изключвате TLS."
#: ../data/glade/account_modification_window.glade.h:11
#: ../data/glade/accounts_window.glade.h:12
#: ../data/glade/zeroconf_properties_window.glade.h:4
msgid "Choose _Key..."
-msgstr "Избор на _ключ..."
+msgstr "Избор на _ключ…"
#: ../data/glade/account_modification_window.glade.h:12
#: ../data/glade/accounts_window.glade.h:13
@@ -286,6 +277,7 @@
#: ../data/glade/accounts_window.glade.h:14
msgid "Click to request authorization to all contacts of another account"
msgstr ""
+"Натиснете, за да изискате упълномощаване от всички контакти на друг акаунт"
#: ../data/glade/account_modification_window.glade.h:14
#: ../data/glade/accounts_window.glade.h:15
@@ -295,14 +287,14 @@
#: ../data/glade/account_modification_window.glade.h:15
#: ../data/glade/accounts_window.glade.h:17
msgid "Edit Personal Information..."
-msgstr "Редактиране на личните данни..."
+msgstr "Редактиране на личните данни…"
#. No configured account
#: ../data/glade/account_modification_window.glade.h:16
#: ../data/glade/accounts_window.glade.h:20
#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../src/common/helpers.py:1055 ../src/notify.py:514 ../src/notify.py:545
+#: ../src/notify.py:557
msgid "Gajim"
msgstr "Gajim"
@@ -314,8 +306,8 @@
#: ../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:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../src/dialogs.py:166 ../src/roster_window.py:2672
+#: ../src/roster_window.py:5157
msgid "General"
msgstr "Общи"
@@ -375,7 +367,7 @@
#: ../data/glade/account_modification_window.glade.h:25
#: ../data/glade/accounts_window.glade.h:31
msgid "Information about you, as stored in the server"
-msgstr "Вашите личните данни, както са запазени на сървъра"
+msgstr "Вашите лични данни, както са запазени на сървъра"
#: ../data/glade/account_modification_window.glade.h:27
#: ../data/glade/accounts_window.glade.h:36
@@ -391,8 +383,8 @@
#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2741
+#: ../src/roster_window.py:2747 ../src/roster_window.py:2752
msgid "None"
msgstr "Няма"
@@ -477,11 +469,9 @@
#: ../data/glade/account_modification_window.glade.h:43
#: ../data/glade/accounts_window.glade.h:51
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
msgid "Synchronise contacts"
-msgstr "Показване на изкл_ючените контакти"
+msgstr "Синхронизиране на контакти"
#: ../data/glade/account_modification_window.glade.h:44
msgid "Use _SSL (legacy)"
@@ -507,9 +497,8 @@
msgstr "_Име:"
#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
msgid "<b>Proxy</b>"
-msgstr "<b>Настройки</b>"
+msgstr "<b>Сървър-посредник</b>"
#: ../data/glade/accounts_window.glade.h:6
msgid "Accounts"
@@ -520,6 +509,8 @@
"Check this so Gajim will ask you before sending your password over an "
"insecure connection."
msgstr ""
+"Ако тази опция е избрана, ще се изисква потвърждение преди изпращането на "
+"паролата ви чрез несигурна връзка."
#: ../data/glade/accounts_window.glade.h:16
#: ../data/glade/zeroconf_information_window.glade.h:2
@@ -540,9 +531,9 @@
msgstr "Собствено име:"
#: ../data/glade/accounts_window.glade.h:24
-#, fuzzy
msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Ако тази опция е избрана, ще се запомни паролата за този акаунт."
+msgstr ""
+"Ако тази опция е избрана, паролата ще се взима от агент на GPG като Seahorse."
#: ../data/glade/accounts_window.glade.h:29
#: ../data/glade/zeroconf_properties_window.glade.h:11
@@ -557,7 +548,7 @@
#: ../data/glade/accounts_window.glade.h:32
#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:679
msgid "Jabber ID:"
msgstr "Jabber ID:"
@@ -572,13 +563,13 @@
msgstr "_Смесване на акаунти"
#. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5108
msgid "Re_name"
msgstr "Пре_именуване"
#: ../data/glade/accounts_window.glade.h:52
msgid "Use GPG _Agent"
-msgstr ""
+msgstr "Използване на агент на _GPG"
#: ../data/glade/accounts_window.glade.h:54
#: ../data/glade/zeroconf_properties_window.glade.h:21
@@ -587,24 +578,24 @@
#: ../data/glade/accounts_window.glade.h:59
msgid "_Warn before using an insecure connection"
-msgstr ""
+msgstr "Предупре_ждаване преди използване на несигурна връзка"
#: ../data/glade/accounts_window.glade.h:60
msgid "gtk-add"
-msgstr ""
+msgstr "gtk-add"
#: ../data/glade/accounts_window.glade.h:61
#: ../data/glade/features_window.glade.h:4
msgid "gtk-close"
-msgstr ""
+msgstr "gtk-close"
#: ../data/glade/accounts_window.glade.h:62
msgid "gtk-remove"
-msgstr ""
+msgstr "gtk-remove"
#: ../data/glade/accounts_window.glade.h:63
msgid "use HTTP_PROXY environment variable"
-msgstr ""
+msgstr "Използване на променливата на обкръжението „HTTP_PROXY“"
#: ../data/glade/add_new_contact_window.glade.h:1
msgid "A_ccount:"
@@ -680,19 +671,19 @@
#: ../data/glade/adhoc_commands_window.glade.h:5
msgid "Error description..."
-msgstr "Описание на грешката..."
+msgstr "Описание на грешката…"
#: ../data/glade/adhoc_commands_window.glade.h:6
msgid "Please wait while retrieving command list..."
-msgstr "Изчакайте, докато се извлече списъка с команди..."
+msgstr "Изчакайте, докато се извлече списъка с команди…"
#: ../data/glade/adhoc_commands_window.glade.h:7
msgid "Please wait while the command is sending..."
-msgstr "Изчакайте, докато командата се изпраща..."
+msgstr "Изчакайте, докато командата се изпраща…"
#: ../data/glade/adhoc_commands_window.glade.h:8
msgid "Please wait..."
-msgstr "Изчакайте..."
+msgstr "Изчакайте…"
#: ../data/glade/adhoc_commands_window.glade.h:9
msgid "This jabber entity does not expose any commands."
@@ -726,9 +717,8 @@
msgstr "Изтрива съобщението за деня"
#: ../data/glade/advanced_menuitem_menu.glade.h:3
-#, fuzzy
msgid "Edit _Privacy Lists..."
-msgstr "_Филтри за уединение"
+msgstr "_Филтри за уединение…"
#: ../data/glade/advanced_menuitem_menu.glade.h:4
msgid "Sends a message to users currently connected to this server"
@@ -736,9 +726,8 @@
"Изпраща съобщение на всички потребители, свързани със сървъра в момента"
#: ../data/glade/advanced_menuitem_menu.glade.h:5
-#, fuzzy
msgid "Set MOTD..."
-msgstr "Настройване на MOTD"
+msgstr "Настройване на MOTD…"
#: ../data/glade/advanced_menuitem_menu.glade.h:6
msgid "Sets Message of the Day"
@@ -749,9 +738,8 @@
msgstr "Показване на _XML конзола"
#: ../data/glade/advanced_menuitem_menu.glade.h:8
-#, fuzzy
msgid "Update MOTD..."
-msgstr "Актуализиране на MOTD"
+msgstr "Актуализиране на MOTD…"
#: ../data/glade/advanced_menuitem_menu.glade.h:9
msgid "Updates Message of the Day"
@@ -762,9 +750,8 @@
msgstr "_Администратор"
#: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
msgid "_Send Server Message..."
-msgstr "_Изпращане на съобщение от сървъра"
+msgstr "_Изпращане на съобщение от сървъра…"
#: ../data/glade/advanced_notifications_window.glade.h:1
msgid " a window/tab opened with that contact "
@@ -828,7 +815,7 @@
#: ../data/glade/advanced_notifications_window.glade.h:15
msgid "One or more special statuses..."
-msgstr "Едно или повече определени състояния..."
+msgstr "Едно или повече определени състояния…"
#: ../data/glade/advanced_notifications_window.glade.h:16
msgid "Online / Free For Chat"
@@ -948,32 +935,28 @@
msgstr "Получихте нов запис:"
#: ../data/glade/blocked_contacts_window.glade.h:1
-#, fuzzy
msgid "Blocked Contacts"
-msgstr "Контакти"
+msgstr "Блокирани контакти"
#: ../data/glade/change_activity_dialog.glade.h:1
-#, fuzzy
msgid "<b>Message:</b> "
-msgstr "<b>Настроени съобщения за състояние</b>"
+msgstr "<b>Съобщение:</b>"
#: ../data/glade/change_activity_dialog.glade.h:2
msgid "Set Activity"
-msgstr ""
+msgstr "Задаване на дейност"
#: ../data/glade/change_activity_dialog.glade.h:3
msgid "Set an activity"
-msgstr ""
+msgstr "Задаване на дейност"
#: ../data/glade/change_mood_dialog.glade.h:1
-#, fuzzy
msgid "<b>Message:</b>"
-msgstr "<b>Настроени съобщения за състояние</b>"
+msgstr "<b>Съобщение:</b>"
#: ../data/glade/change_mood_dialog.glade.h:2
-#, fuzzy
msgid "<b>Mood:</b>"
-msgstr "<b>Звуци</b>"
+msgstr "<b>Настроение:</b>"
#: ../data/glade/change_password_dialog.glade.h:1
msgid "Change Password"
@@ -997,7 +980,7 @@
#: ../data/glade/change_status_message_dialog.glade.h:3
msgid "Save as Preset..."
-msgstr "Запазване като настроено..."
+msgstr "Запазване като настроено…"
#: ../data/glade/chat_context_menu.glade.h:1
msgid "Join _Group Chat"
@@ -1005,9 +988,8 @@
#: ../data/glade/chat_context_menu.glade.h:2
#: ../data/glade/roster_contact_context_menu.glade.h:13
-#, fuzzy
msgid "_Add to Roster..."
-msgstr "Добавяне към _списъка..."
+msgstr "Добавяне към _списъка…"
#: ../data/glade/chat_context_menu.glade.h:3
msgid "_Copy JID/Email Address"
@@ -1032,9 +1014,8 @@
msgstr "_Започване на разговор"
#: ../data/glade/chat_control_popup_menu.glade.h:1
-#, fuzzy
msgid "Invite _Contacts"
-msgstr "Контакти"
+msgstr "Покана на _контакти"
#: ../data/glade/chat_control_popup_menu.glade.h:2
#: ../data/glade/gc_occupants_menu.glade.h:3
@@ -1043,18 +1024,17 @@
msgstr "Изпращане на _файл"
#: ../data/glade/chat_control_popup_menu.glade.h:3
-#, fuzzy
msgid "Toggle End to End Encryption"
-msgstr "Превключване на Open_PGP шифриране"
+msgstr "Превключване на шифриране тип „End to End“"
#: ../data/glade/chat_control_popup_menu.glade.h:4
msgid "Toggle Open_PGP Encryption"
-msgstr "Превключване на Open_PGP шифриране"
+msgstr "Превключване на шифриране тип „Open_PGP“"
#: ../data/glade/chat_control_popup_menu.glade.h:5
#: ../data/glade/gc_occupants_menu.glade.h:4
msgid "_Add to Roster"
-msgstr "Добавяне към _списъка..."
+msgstr "Добавяне към _списъка…"
#: ../data/glade/chat_control_popup_menu.glade.h:6
#: ../data/glade/gc_control_popup_menu.glade.h:6
@@ -1062,33 +1042,33 @@
#: ../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:5805
+#: ../src/roster_window.py:5804
msgid "_History"
msgstr "Ист_ория"
#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
msgid "In_vite"
-msgstr "По_кана в"
+msgstr "По_кана"
#: ../data/glade/chat_to_muc_window.glade.h:2
msgid "Invite Friends!"
-msgstr ""
+msgstr "Поканете приятели!"
#: ../data/glade/chat_to_muc_window.glade.h:3
-#, fuzzy
msgid "MUC server"
-msgstr "Наблюдатели"
+msgstr "Сървър за стаи"
#: ../data/glade/chat_to_muc_window.glade.h:4
msgid "Please select a MUC server."
-msgstr ""
+msgstr "Изберете сървър за стаи."
#: ../data/glade/chat_to_muc_window.glade.h:5
msgid ""
"You are going to begin a Multi-User Chat.\n"
"Select the contacts you want to invite"
msgstr ""
+"На път сте да започнете разговор в стая.\n"
+"Изберете контактите, които искате да поканите."
#: ../data/glade/data_form_window.glade.h:1
msgid "Fill in the form."
@@ -1103,22 +1083,20 @@
msgstr "Редактиране на групи"
#: ../data/glade/esession_info_window.glade.h:1
-#, fuzzy
msgid "(<b>ESession</b> info)"
-msgstr "<b>Описание</b>"
+msgstr "(Информация за <b>Е-сесия</b>)"
#: ../data/glade/esession_info_window.glade.h:2
msgid "_Verify"
-msgstr ""
+msgstr "_Проверка"
#: ../data/glade/features_window.glade.h:2
msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
+msgstr "<b>Списък с възможни функционалности на Gajim:</b>"
#: ../data/glade/features_window.glade.h:3
-#, fuzzy
msgid "Features"
-msgstr "Функционалности на сървърите"
+msgstr "Възможности"
#: ../data/glade/filetransfers.glade.h:1
msgid "A list of active, completed and stopped file transfers"
@@ -1270,46 +1248,40 @@
msgstr "_Фон:"
#: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
msgid "Change _Nickname..."
-msgstr "Смяна на псе_вдоним"
+msgstr "Смяна на псе_вдоним…"
#: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
msgid "Change _Subject..."
-msgstr "Промяна на _темата"
+msgstr "Промяна на _темата…"
#: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
msgid "Configure _Room..."
-msgstr "Настройки на _стаята"
+msgstr "Настройки на _стаята…"
#: ../data/glade/gc_control_popup_menu.glade.h:4
-#, fuzzy
msgid "_Bookmark"
-msgstr "_Добавяне на тази стая към отметките"
+msgstr "_Добавяне на стаята към отметките"
#: ../data/glade/gc_control_popup_menu.glade.h:5
msgid "_Destroy Room"
-msgstr ""
+msgstr "_Унищожаване на стаята"
#: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
msgid "_Manage Room"
-msgstr "Управление на отметките"
+msgstr "_Управление на стаята"
#: ../data/glade/gc_control_popup_menu.glade.h:8
msgid "_Minimize on close"
-msgstr ""
+msgstr "_Минимизиране при затваряне"
#: ../data/glade/gc_occupants_menu.glade.h:1
msgid "Mo_derator"
msgstr "_Председател"
#: ../data/glade/gc_occupants_menu.glade.h:2
-#, fuzzy
msgid "Occupant Actions"
-msgstr "_Действия"
+msgstr "_Действия на участника"
#: ../data/glade/gc_occupants_menu.glade.h:5
msgid "_Admin"
@@ -1354,26 +1326,19 @@
msgstr "Тема"
#: ../data/glade/history_manager.glade.h:1
-#, fuzzy
msgid ""
"<b>WARNING:</b>\n"
"If you plan to do massive deletions, please make sure Gajim is not running. "
"Generally avoid deletions with contacts you currently chat with."
msgstr ""
-"<big><b>Добре дошли в мениджъра на историята на разговорите на Gajim</b></"
-"big>\n"
-"\n"
-"Може да избирате дневници отляво и/или да търсите в базата от данни долу.\n"
-"\n"
"<b>ПРЕДУПРЕЖДЕНИЕ:</b>\n"
-"Ако планирате да изтривате масово, уверете се, че Gajim не е стартиран. Като "
-"цяло избягвайте да изтривате история за контакти, с които разговаряте в "
+"Ако планирате да изтривате масово, уверете се, че Gajim не е стартиран. По "
+"принцип избягвайте да изтривате история за контакти, с които разговаряте в "
"момента."
#: ../data/glade/history_manager.glade.h:3
-#, fuzzy
msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
-msgstr "Мениджър на историята на разговорите"
+msgstr "<big><b>Добре дошли в мениджъра на историята на разговорите</b></big>"
#: ../data/glade/history_manager.glade.h:4
msgid "Delete"
@@ -1395,6 +1360,11 @@
"Use this program to delete or export logs. You can select logs from the left "
"and/or search database from below."
msgstr ""
+"Този мениджър не е предназначен за преглед на историята на разговорите. Ако "
+"търсите такава функционалност, използвайте прозореца за история.\n"
+"\n"
+"Използвайте тази програма за изтриване или изнасяне на дневници. Може да ги "
+"избирате от списъка вляво и/или да търсите в базата от данни по-долу."
#: ../data/glade/history_manager.glade.h:10
msgid "_Search Database"
@@ -1410,18 +1380,20 @@
"Groupchat Histories\n"
"All Chat Histories"
msgstr ""
+"Въведете JID или име на контакт\n"
+"История на разговори в стаи\n"
+"История на всички разговори"
#: ../data/glade/history_window.glade.h:5
-#, fuzzy
msgid "Search:"
-msgstr "Търсене"
+msgstr "Търсене:"
#: ../data/glade/history_window.glade.h:6
#: ../data/glade/zeroconf_information_window.glade.h:10
msgid "_Log conversation history"
msgstr "_Запазване на разговорите"
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1698
msgid "Join Group Chat"
msgstr "Влизане в стая"
@@ -1448,8 +1420,8 @@
msgid "Room:"
msgstr "Стая:"
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1199
+#: ../src/disco.py:1620
msgid "_Join"
msgstr "_Влизане"
@@ -1471,7 +1443,7 @@
#: ../data/glade/manage_bookmarks_window.glade.h:4
msgid "Minimize on Auto Join"
-msgstr ""
+msgstr "Минимизиране при автоматично влизане"
#: ../data/glade/manage_bookmarks_window.glade.h:7
msgid "Print status:"
@@ -1486,19 +1458,16 @@
msgstr "Заглавие:"
#: ../data/glade/manage_pep_services_window.glade.h:1
-#, fuzzy
msgid "PEP Service Configuration"
-msgstr "Настройки на стаята"
+msgstr "Настройки на услугата PEP"
#: ../data/glade/manage_pep_services_window.glade.h:2
-#, fuzzy
msgid "_Configure"
-msgstr "П_родължаване"
+msgstr "_Настройване"
#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
msgid "gtk-delete"
-msgstr "Изтриване"
+msgstr "gtk-delete"
#: ../data/glade/manage_proxies_window.glade.h:1
msgid "<b>Properties</b>"
@@ -1509,11 +1478,12 @@
msgstr "<b>Настройки</b>"
#: ../data/glade/manage_proxies_window.glade.h:3
-#, fuzzy
msgid ""
"HTTP Connect\n"
"SOCKS5"
-msgstr "Свързване по HTTP"
+msgstr ""
+"Свързване по HTTP\n"
+"SOCKS5"
#: ../data/glade/manage_proxies_window.glade.h:5
msgid "Manage Proxy Profiles"
@@ -1540,49 +1510,44 @@
msgstr "_Хост:"
#: ../data/glade/message_window.glade.h:1
-#, fuzzy
msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Добавяне на контакт към списъка"
+msgstr "Добавяне на контакт към списъка (Ctrl+D)"
#: ../data/glade/message_window.glade.h:2
-#, fuzzy
msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Добавяне на тази стая към отметките"
+msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
#: ../data/glade/message_window.glade.h:3
msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
+msgstr "Разглеждане на историята на разговорите (Ctrl+H)"
#: ../data/glade/message_window.glade.h:4
msgid "Change the room's subject (Alt+T)"
-msgstr ""
+msgstr "Смяна на темата на стаята (Alt+T)"
#: ../data/glade/message_window.glade.h:5
-#, fuzzy
msgid "Change your nickname (Ctrl+N)"
-msgstr "Смяна на псе_вдоним"
+msgstr "Смяна на псевдоним (Ctrl+N)"
#: ../data/glade/message_window.glade.h:6
-#, fuzzy
msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "обръща внимание на разговора"
+msgstr "Покана на контакти в разговора (Ctrl+G)"
#: ../data/glade/message_window.glade.h:7
msgid "Send a file (Ctrl+F)"
-msgstr ""
+msgstr "Изпращане на файл (Ctrl+F)"
#: ../data/glade/message_window.glade.h:8
-#, fuzzy
msgid "Show a list of emoticons (Alt+M)"
-msgstr "Натиснете за вмъкване на емотикона (Alt+M)"
+msgstr "Списък с емотикони (Alt+M)"
#: ../data/glade/message_window.glade.h:9
msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+msgstr "Меню с функции за напреднали (Ctrl+A)"
#: ../data/glade/message_window.glade.h:10
msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
+msgstr "Показване на профила на контакта (Ctrl+I)"
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
#: ../data/glade/message_window.glade.h:12
@@ -1604,24 +1569,20 @@
msgstr "<b>Програми</b>"
#: ../data/glade/preferences_window.glade.h:3
-#, fuzzy
msgid "<b>Auto Status</b>"
-msgstr "<b>Действия</b>"
+msgstr "<b>Автоматично състояние</b>"
#: ../data/glade/preferences_window.glade.h:4
-#, fuzzy
msgid "<b>Chat Appearance</b>"
-msgstr "<b>Редактиране на правило</b>"
+msgstr "<b>Изглед на разговорите</b>"
#: ../data/glade/preferences_window.glade.h:5
-#, fuzzy
msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Цветове на подпрозорците</b>"
+msgstr "<b>Цветове за разговорите</b>"
#: ../data/glade/preferences_window.glade.h:6
-#, fuzzy
msgid "<b>Chat state notifications</b>"
-msgstr "<b>Зрителни уведомления</b>"
+msgstr "<b>Уведомления за състояния на разговора</b>"
#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
#: ../data/glade/preferences_window.glade.h:8
@@ -1629,36 +1590,32 @@
msgstr "<b>Персонални</b>"
#: ../data/glade/preferences_window.glade.h:9
-#, fuzzy
msgid "<b>Font</b>"
-msgstr "<b>Звуци</b>"
+msgstr "<b>Шрифт</b>"
#: ../data/glade/preferences_window.glade.h:10
msgid "<b>GMail Options</b>"
-msgstr "<b>Настройки за Gmail</b>"
+msgstr "<b>Настройки за GMail</b>"
#: ../data/glade/preferences_window.glade.h:12
msgid "<b>Preset Status Messages</b>"
msgstr "<b>Настроени съобщения за състояние</b>"
#: ../data/glade/preferences_window.glade.h:13
-#, fuzzy
msgid "<b>Privacy</b>"
-msgstr "<i>Филтър за уединение</i>"
+msgstr "<b>Уединение</b>"
#: ../data/glade/preferences_window.glade.h:14
msgid "<b>Roster Appearance</b>"
-msgstr ""
+msgstr "<b>Изглед на списъка</b>"
#: ../data/glade/preferences_window.glade.h:16
-#, fuzzy
msgid "<b>Status Messages</b>"
-msgstr "<b>Настроени съобщения за състояние</b>"
+msgstr "<b>Съобщения за състояние</b>"
#: ../data/glade/preferences_window.glade.h:17
-#, fuzzy
msgid "<b>Themes</b>"
-msgstr "<b>Настройки</b>"
+msgstr "<b>Теми</b>"
#: ../data/glade/preferences_window.glade.h:18
msgid "<b>Visual Notifications</b>"
@@ -1669,9 +1626,8 @@
msgstr "Напреднали"
#: ../data/glade/preferences_window.glade.h:20
-#, fuzzy
msgid "Advanced..."
-msgstr "Напреднали"
+msgstr "Напреднали…"
#: ../data/glade/preferences_window.glade.h:21
msgid ""
@@ -1698,7 +1654,6 @@
msgstr "Питане за съобщение за състояние при преминаване в режим:"
#: ../data/glade/preferences_window.glade.h:27
-#, fuzzy
msgid ""
"Autodetect on every Gajim startup\n"
"Always use GNOME default applications\n"
@@ -1709,19 +1664,16 @@
"Автоматично определяне при всяко стартиране на Gajim\n"
"Винаги да се използват стандартните програми на GNOME\n"
"Винаги да се използват стандартните програми на KDE\n"
-"Винаги да се използват стандартните програми на Xfce4\n"
+"Винаги да се използват стандартните програми на Xfce\n"
"Персонални"
#: ../data/glade/preferences_window.glade.h:32
-#, fuzzy
msgid "Chat message:"
-msgstr "С_ъобщение за състояние:"
+msgstr "Съобщение от разговор:"
#: ../data/glade/preferences_window.glade.h:33
-#, fuzzy
msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr ""
-"_Винаги да се проверява дали Gajim е стандартния Джабър клиент при стартиране"
+msgstr "_Да се проверява дали Gajim е стандартния Джабър клиент при стартиране"
#: ../data/glade/preferences_window.glade.h:34
msgid "Configure color and font of the interface"
@@ -1735,29 +1687,31 @@
"Detached roster with chat grouped by account\n"
"Detached roster with chat grouped by type"
msgstr ""
+"Отделен списък и прозорци за разговори\n"
+"Отделен списък и един прозорец за разговори\n"
+"Един прозорец за всичко\n"
+"Отделен списък и разговори, групирани по акаунт\n"
+"Отделен списък и разговори, групирани по вид"
#: ../data/glade/preferences_window.glade.h:40
-#, fuzzy
msgid "Display _activity of contacts in roster"
-msgstr "Показване на _аватари на контактите в списъка"
+msgstr "Показване на _дейност на контактите в списъка"
#: ../data/glade/preferences_window.glade.h:41
msgid "Display _extra email details"
msgstr "Показване на _допълнителни данни за е-поща"
#: ../data/glade/preferences_window.glade.h:42
-#, fuzzy
msgid "Display _tunes of contacts in roster"
-msgstr "Показване на _аватари на контактите в списъка"
+msgstr "Показване на _слушаната от контактите музика в списъка"
#: ../data/glade/preferences_window.glade.h:43
msgid "Display a_vatars of contacts in roster"
msgstr "Показване на _аватари на контактите в списъка"
#: ../data/glade/preferences_window.glade.h:44
-#, fuzzy
msgid "Display m_ood of contacts in roster"
-msgstr "Показване на _аватари на контактите в списъка"
+msgstr "Показване на _настроенията на контактите в списъка"
#: ../data/glade/preferences_window.glade.h:45
msgid "Display status _messages of contacts in roster"
@@ -1791,16 +1745,16 @@
"изключване на контакти"
#: ../data/glade/preferences_window.glade.h:50
-#, fuzzy
msgid "Hide all buttons in chat windows"
-msgstr "Скрива бутоните в прозореца на стаята."
+msgstr "Скриване на всички бутони в прозорците за разговор."
#: ../data/glade/preferences_window.glade.h:51
-#, fuzzy
msgid ""
"If checked, Gajim will allow others to detect the operation system you are "
"using"
-msgstr "Ако тази опция е избрана, ще влизате в тази стая при стартиране."
+msgstr ""
+"Ако тази опция е избрана, контактите ще могат да откриват операционната "
+"система, която използвате."
#: ../data/glade/preferences_window.glade.h:52
msgid ""
@@ -1814,12 +1768,16 @@
msgid ""
"If checked, Gajim will change status to Away when the computer is unused."
msgstr ""
+"Ако тази опция е избрана, Gajim ще променя състоянието на „Отсъствам“ когато "
+"компютърът не се използва."
#: ../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"
msgstr ""
+"Ако тази опция е избрана, Gajim ще променя състоянието на „Не съм на "
+"разположение“ когато компютърът не се използва по-дълго време."
#: ../data/glade/preferences_window.glade.h:55
msgid ""
@@ -1838,28 +1796,25 @@
"показват под имената им в списъка и в стаите"
#: ../data/glade/preferences_window.glade.h:57
-#, fuzzy
msgid ""
"If checked, Gajim will display the activity of contacts in the roster window"
msgstr ""
-"Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
-"и стаите"
+"Ако тази опция е избрана, Gajim ще изобразява дейността на контактите в "
+"списъка."
#: ../data/glade/preferences_window.glade.h:58
-#, fuzzy
msgid ""
"If checked, Gajim will display the mood of contacts in the roster window"
msgstr ""
-"Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
-"и стаите"
+"Ако тази опция е избрана, Gajim ще изобразява настроението на контактите в "
+"списъка."
#: ../data/glade/preferences_window.glade.h:59
-#, fuzzy
msgid ""
"If checked, Gajim will display the tunes of contacts in the roster window"
msgstr ""
-"Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
-"и стаите"
+"Ако тази опция е избрана, Gajim ще изобразява слушаната от контактите музика "
+"в списъка."
#: ../data/glade/preferences_window.glade.h:60
msgid ""
@@ -1867,17 +1822,20 @@
"windows. If no language is explicitly set via right click on the input "
"field, the default language will be used for this contact or group chat."
msgstr ""
+"Ако тази опция е избрана, ще се осветяват правописни грешки в полетата за "
+"въвеждане на текст в прозорците за разговор. Ако не е избран език чрез "
+"натискане с десния бутон на мишката в полето за въвеждане, ще се използва "
+"езикът по подразбиране."
#: ../data/glade/preferences_window.glade.h:61
-#, fuzzy
msgid ""
"If checked, Gajim will ignore incoming events from unauthorized contacts. "
"Use with caution, because it blocks all messages from any contact that is "
"not in the roster"
msgstr ""
-"Изберете тази опция само ако някой, който не в списъка, ви притеснява или "
-"дразни. Използвайте я внимателно, тъй като блокира всички съобщения от всеки "
-"контакт, който не е в списъка."
+"Ако тази опция е избрана, Gajim ще игнорира входящи събития от "
+"неупълномощени контакти. Използвайте я внимателно, тъй като блокира всички "
+"съобщения от всеки контакт, който не е в списъка."
#: ../data/glade/preferences_window.glade.h:62
msgid ""
@@ -1885,15 +1843,17 @@
"when using E2E encryption the remote party has to agree on logging, else the "
"messages will not be logged."
msgstr ""
+"Ако тази опция е избрана, Gajim ще запазва дневници за шифрираните "
+"съобщение. Забележете, че при шифриране тип „E2E“ другата страна трябва да "
+"се съгласи, иначе съобщенията няма да бъдат запазвани."
#: ../data/glade/preferences_window.glade.h:63
-#, fuzzy
msgid ""
"If checked, Gajim will show a notification when a new e-mail is received via "
"GMail"
msgstr ""
-"Ако тази опция е избрана, Gajim ще включва информация за подателя на новите "
-"писма."
+"Ако тази опция е избрана, Gajim ще показва уведомление при получаването на "
+"ново писмо чрез GMail."
#: ../data/glade/preferences_window.glade.h:64
msgid ""
@@ -1910,6 +1870,8 @@
"If enabled, Gajim will not ask for a status message. The specified default "
"message will be used instead."
msgstr ""
+"Ако тази опция е избрана, няма да се пита за съобщение за състояние — ще се "
+"използва стандартно зададеното."
#: ../data/glade/preferences_window.glade.h:66
msgid ""
@@ -1921,40 +1883,35 @@
#: ../data/glade/preferences_window.glade.h:67
msgid "Log _encrypted chat session"
-msgstr ""
+msgstr "Запазване на дневник на _шифрираната сесия"
#: ../data/glade/preferences_window.glade.h:68
-#, fuzzy
msgid "Ma_ke message windows compact"
-msgstr "_Един прозорец за разговори:"
+msgstr "_Компактни прозорци за разговор"
#: ../data/glade/preferences_window.glade.h:69
msgid "Ma_nage..."
-msgstr "_Управление..."
+msgstr "_Управление…"
#: ../data/glade/preferences_window.glade.h:70
-#, fuzzy
msgid "Notifications"
-msgstr "Промяна на акаунт"
+msgstr "Уведомления"
#: ../data/glade/preferences_window.glade.h:71
-#, fuzzy
msgid "Notify me about contacts that sign _in"
-msgstr "Уведомяване за контакти при: "
+msgstr "Уведомяване за _включващи се контакти"
#: ../data/glade/preferences_window.glade.h:72
-#, fuzzy
msgid "Notify me about contacts that sign _out"
-msgstr "Уведомяване за контакти при: "
+msgstr "Уведомяване за _изключващи се контакти"
#: ../data/glade/preferences_window.glade.h:73
msgid "Notify on new _GMail email"
-msgstr "Уведомяване при нова поща от _Gmail"
+msgstr "Уведомяване при нова поща от _GMail"
#: ../data/glade/preferences_window.glade.h:74
-#, fuzzy
msgid "Personal Events"
-msgstr "Лични данни"
+msgstr "Лични събития"
#: ../data/glade/preferences_window.glade.h:75
msgid "Play _sounds"
@@ -1966,6 +1923,9 @@
"Notify me about it\n"
"Show only in roster"
msgstr ""
+"Показване в изскачащ прозорец\n"
+"Уведомяване\n"
+"Показване само в списъка"
#: ../data/glade/preferences_window.glade.h:79
msgid "Preferences"
@@ -1988,23 +1948,20 @@
"н.). Ако тази опция е избрана, Gajim ще изобразява само обикновения текст."
#: ../data/glade/preferences_window.glade.h:83
-#, fuzzy
msgid "Sort contacts by status"
-msgstr "Подре_ждане на контактите по състояние"
+msgstr "Подреждане на контактите по състояние"
#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
msgid "Status"
msgstr "Състояние"
#: ../data/glade/preferences_window.glade.h:85
-#, fuzzy
msgid "Status _iconset:"
-msgstr "Стандартен _набор икони за състояние:"
+msgstr "_Набор икони за състояние:"
#: ../data/glade/preferences_window.glade.h:86
-#, fuzzy
msgid "Style"
-msgstr "Блокирал"
+msgstr "Стил"
#: ../data/glade/preferences_window.glade.h:87
msgid "T_heme:"
@@ -2015,45 +1972,44 @@
"The auto away status message. If empty, Gajim will not change the current "
"status message"
msgstr ""
+"Съобщение за автоматично състояние „Отсъствам“. Ако е празно, няма да се "
+"сменя текущото съобщение."
#: ../data/glade/preferences_window.glade.h:89
msgid ""
"The auto not available status message. If empty, Gajim will not change the "
"current status message"
msgstr ""
+"Съобщение за автоматично състояние „Не съм на разположение“. Ако е празно, "
+"няма да се сменя текущото съобщение."
#: ../data/glade/preferences_window.glade.h:90
-#, fuzzy
msgid "Use _transports icons"
-msgstr "Използване на набор и_кони на транспортите"
+msgstr "Използване на и_кони за транспортите"
#: ../data/glade/preferences_window.glade.h:91
msgid "Use system _default"
msgstr "Използване на стан_дартните за системата"
#: ../data/glade/preferences_window.glade.h:92
-#, fuzzy
msgid "When new event is received:"
-msgstr "При получаване на ново събитие"
+msgstr "При получаване на ново събитие:"
#: ../data/glade/preferences_window.glade.h:93
-#, fuzzy
msgid "_Away after:"
-msgstr "Автоматично „_Отсъствам“ след:"
+msgstr "„_Отсъствам“ след:"
#: ../data/glade/preferences_window.glade.h:94
msgid "_Browser:"
msgstr "Интернет _браузър:"
#: ../data/glade/preferences_window.glade.h:95
-#, fuzzy
msgid "_Display chat state notifications:"
-msgstr "Показвани уведомления при _разговор:"
+msgstr "Показване на уведомления при _разговор:"
#: ../data/glade/preferences_window.glade.h:96
-#, fuzzy
msgid "_Emoticons:"
-msgstr "Емотикони:"
+msgstr "_Емотикони:"
#: ../data/glade/preferences_window.glade.h:97
msgid "_File manager:"
@@ -2068,11 +2024,8 @@
msgstr "Прене_брегване на събития от контакти, които не са в списъка"
#: ../data/glade/preferences_window.glade.h:100
-#, fuzzy
msgid "_Ignore rich content in incoming messages"
-msgstr ""
-"Пренебрегване на съдържанието на входящите съобщения, което не е обикновен "
-"текст"
+msgstr "_Пренебрегване на излишно форматиране на входящите съобщения"
#: ../data/glade/preferences_window.glade.h:101
msgid "_Incoming message:"
@@ -2087,13 +2040,12 @@
msgstr "_Програма за е-поща:"
#: ../data/glade/preferences_window.glade.h:104
-#, fuzzy
msgid "_Not available after:"
-msgstr "Автоматично „Не съм на _разположение“ след:"
+msgstr "„Не съм на _разположение“ след:"
#: ../data/glade/preferences_window.glade.h:105
msgid "_Open..."
-msgstr "_Отваряне..."
+msgstr "_Отваряне…"
#: ../data/glade/preferences_window.glade.h:106
msgid "_Outgoing message:"
@@ -2104,9 +2056,8 @@
msgstr "Възстановяване на стандартните _цветове"
#: ../data/glade/preferences_window.glade.h:108
-#, fuzzy
msgid "_Send chat state notifications:"
-msgstr "Показвани уведомления при _разговор:"
+msgstr "Изпращане на уведомления при _разговор:"
#: ../data/glade/preferences_window.glade.h:109
msgid "_Status message:"
@@ -2114,21 +2065,19 @@
#: ../data/glade/preferences_window.glade.h:110
msgid "_URL highlight:"
-msgstr ""
+msgstr "_Адреси:"
#: ../data/glade/preferences_window.glade.h:111
msgid "_Window behavior:"
-msgstr ""
+msgstr "_Поведение на прозорците:"
#: ../data/glade/preferences_window.glade.h:112
-#, fuzzy
msgid "in _group chats"
-msgstr "_Влизане в стая"
+msgstr "в _стаи"
#: ../data/glade/preferences_window.glade.h:113
-#, fuzzy
msgid "in _roster"
-msgstr "Не е в списъка"
+msgstr "в с_писъка"
#: ../data/glade/preferences_window.glade.h:114
msgid "minutes"
@@ -2178,7 +2127,7 @@
msgid "Order:"
msgstr "Ред:"
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2566
msgid "Privacy List"
msgstr "Филтър за уединение"
@@ -2220,151 +2169,127 @@
#: ../data/glade/profile_window.glade.h:1
#: ../data/glade/vcard_information_window.glade.h:1
-#, fuzzy
msgid "<b>Address</b>"
-msgstr "<b>Добавяне на правило</b>"
+msgstr "<b>Адрес</b>"
#: ../data/glade/profile_window.glade.h:2
-#, fuzzy
msgid "<b>Avatar:</b>"
-msgstr "Аватар:"
+msgstr "<b>Аватар:</b>"
#: ../data/glade/profile_window.glade.h:3
#: ../data/glade/vcard_information_window.glade.h:4
-#, fuzzy
msgid "<b>Birthday:</b>"
-msgstr "Рожден ден:"
+msgstr "<b>Рожден ден:</b>"
#: ../data/glade/profile_window.glade.h:4
#: ../data/glade/vcard_information_window.glade.h:5
-#, fuzzy
msgid "<b>City:</b>"
-msgstr "<b>Персонални</b>"
+msgstr "<b>Град:</b>"
#: ../data/glade/profile_window.glade.h:5
#: ../data/glade/vcard_information_window.glade.h:7
-#, fuzzy
msgid "<b>Company:</b>"
-msgstr "<b>Персонални</b>"
+msgstr "<b>Фирма:</b>"
#: ../data/glade/profile_window.glade.h:6
#: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
msgid "<b>Country:</b>"
-msgstr "<b>Звуци</b>"
+msgstr "<b>Държава:</b>"
#: ../data/glade/profile_window.glade.h:7
#: ../data/glade/vcard_information_window.glade.h:9
-#, fuzzy
msgid "<b>Department:</b>"
-msgstr "Отдел:"
+msgstr "<b>Отдел:</b>"
#: ../data/glade/profile_window.glade.h:8
#: ../data/glade/vcard_information_window.glade.h:10
-#, fuzzy
msgid "<b>E-Mail:</b>"
-msgstr "Е-поща:"
+msgstr "<b>Е-поща:</b>"
#: ../data/glade/profile_window.glade.h:9
#: ../data/glade/vcard_information_window.glade.h:11
-#, fuzzy
msgid "<b>Extra Address:</b>"
-msgstr "Допълнителен адрес:"
+msgstr "<b>Допълнителен адрес:</b>"
#. Family Name
#: ../data/glade/profile_window.glade.h:11
#: ../data/glade/vcard_information_window.glade.h:13
-#, fuzzy
msgid "<b>Family:</b>"
-msgstr "Фамилия:"
+msgstr "<b>Фамилия:</b>"
#: ../data/glade/profile_window.glade.h:12
#: ../data/glade/vcard_information_window.glade.h:14
-#, fuzzy
msgid "<b>Full Name</b>"
-msgstr "<b>Персонални</b>"
+msgstr "<b>Име</b>"
#. Given Name
#: ../data/glade/profile_window.glade.h:14
#: ../data/glade/vcard_information_window.glade.h:16
-#, fuzzy
msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgstr "<b>Собствено:</b>"
#: ../data/glade/profile_window.glade.h:15
#: ../data/glade/vcard_information_window.glade.h:17
-#, fuzzy
msgid "<b>Homepage:</b>"
-msgstr "Страница в Интернет:"
+msgstr "<b>Страница в Интернет:</b>"
#. Middle Name
#: ../data/glade/profile_window.glade.h:17
#: ../data/glade/vcard_information_window.glade.h:20
-#, fuzzy
msgid "<b>Middle:</b>"
-msgstr "<b>Добавяне на правило</b>"
+msgstr "<b>Презиме:</b>"
#: ../data/glade/profile_window.glade.h:18
#: ../data/glade/vcard_information_window.glade.h:21
-#, fuzzy
msgid "<b>Name:</b>"
-msgstr "<b>Персонални</b>"
+msgstr "<b>Име:</b>"
#: ../data/glade/profile_window.glade.h:19
#: ../data/glade/vcard_information_window.glade.h:22
-#, fuzzy
msgid "<b>Nickname:</b>"
-msgstr "Псевдоним:"
+msgstr "<b>Псевдоним:</b>"
#: ../data/glade/profile_window.glade.h:20
#: ../data/glade/vcard_information_window.glade.h:23
-#, fuzzy
msgid "<b>Phone No.:</b>"
-msgstr "Телефон:"
+msgstr "<b>Телефон:</b>"
#: ../data/glade/profile_window.glade.h:21
#: ../data/glade/vcard_information_window.glade.h:24
-#, fuzzy
msgid "<b>Position:</b>"
-msgstr "<b>Условия</b>"
+msgstr "<b>Дейност:</b>"
#: ../data/glade/profile_window.glade.h:22
#: ../data/glade/vcard_information_window.glade.h:25
-#, fuzzy
msgid "<b>Postal Code:</b>"
-msgstr "Пощенски код:"
+msgstr "<b>Пощенски код:</b>"
#. Prefix in Name
#: ../data/glade/profile_window.glade.h:24
#: ../data/glade/vcard_information_window.glade.h:27
-#, fuzzy
msgid "<b>Prefix:</b>"
-msgstr "<b>Настройки</b>"
+msgstr "<b>Представка:</b>"
#: ../data/glade/profile_window.glade.h:25
#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
-#, fuzzy
msgid "<b>Role:</b>"
-msgstr "<b>Звуци</b>"
+msgstr "<b>Роля:</b>"
#: ../data/glade/profile_window.glade.h:26
#: ../data/glade/vcard_information_window.glade.h:30
-#, fuzzy
msgid "<b>State:</b>"
-msgstr "<b>Настройки</b>"
+msgstr "<b>Област/Щат:</b>"
#: ../data/glade/profile_window.glade.h:27
#: ../data/glade/vcard_information_window.glade.h:32
-#, fuzzy
msgid "<b>Street:</b>"
-msgstr "<b>Настройки</b>"
+msgstr "<b>Улица:</b>"
#. Suffix in Name
#: ../data/glade/profile_window.glade.h:29
#: ../data/glade/vcard_information_window.glade.h:36
-#, fuzzy
msgid "<b>Suffix:</b>"
-msgstr "<b>Звуци</b>"
+msgstr "<b>Наставка:</b>"
#. "About" is the text of a tab of vcard window
#: ../data/glade/profile_window.glade.h:31
@@ -2406,8 +2331,8 @@
#. Remove group
#. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5145
+#: ../src/roster_window.py:5622 ../src/roster_window.py:5751
msgid "_Remove"
msgstr "_Премахване"
@@ -2416,57 +2341,51 @@
msgstr "_Запитване за виждане на състоянието на контакта"
#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
msgid "Add Special _Notification..."
-msgstr "Добавяне на специално _уведомление"
+msgstr "Добавяне на специално _уведомление…"
#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
msgid "Assign Open_PGP Key..."
-msgstr "Задаване на Open_PGP ключ"
+msgstr "Задаване на ключ Open_PGP…"
#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
msgid "Edit _Groups..."
-msgstr "Редактиране на _групи"
+msgstr "Редактиране на _групи…"
#. Execute Command
#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5694
msgid "Execute Command..."
-msgstr "Изпълнение на команда..."
+msgstr "Изпълнение на команда…"
#. Invite to
#. Invite to Groupchat
#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5063 ../src/roster_window.py:5575
msgid "In_vite to"
msgstr "По_кана в"
#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
msgid "Remo_ve"
-msgstr "_Премахване"
+msgstr "П_ремахване"
#. Send Custom Status
#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
-#, fuzzy
+#: ../src/roster_window.py:5073 ../src/roster_window.py:5660
msgid "Send Cus_tom Status"
-msgstr "Изпраща указан XML"
+msgstr "Изпращане на _специфично състояние"
#: ../data/glade/roster_contact_context_menu.glade.h:9
msgid "Send Single _Message..."
-msgstr "Изпращане на _еднократно съобщение..."
+msgstr "Изпращане на _еднократно съобщение…"
#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
msgid "Send _File..."
-msgstr "Изпращане на _файл"
+msgstr "Изпращане на _файл…"
#: ../data/glade/roster_contact_context_menu.glade.h:11
msgid "Set Custom _Avatar..."
-msgstr ""
+msgstr "Задаване на друг _аватар…"
#: ../data/glade/roster_contact_context_menu.glade.h:12
#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
@@ -2478,10 +2397,10 @@
msgstr "_Позволение за виждане на състоянието ми"
#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
+#: ../src/roster_window.py:5136 ../src/roster_window.py:5612
+#: ../src/roster_window.py:5741
msgid "_Block"
-msgstr ""
+msgstr "_Блокиране"
#: ../data/glade/roster_contact_context_menu.glade.h:16
msgid "_Forbid him/her to see my status"
@@ -2489,43 +2408,38 @@
#: ../data/glade/roster_contact_context_menu.glade.h:18
msgid "_Ignore"
-msgstr ""
+msgstr "_Игнориране"
#: ../data/glade/roster_contact_context_menu.glade.h:19
#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
msgid "_Manage Contact"
-msgstr "Преименуване на контакт"
+msgstr "_Управление на контакт"
#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
msgid "_Rename..."
-msgstr "_Преименуване"
+msgstr "_Преименуване…"
#: ../data/glade/roster_contact_context_menu.glade.h:21
msgid "_Subscription"
msgstr "_Записване"
#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
+#: ../src/roster_window.py:5130 ../src/roster_window.py:5606
+#: ../src/roster_window.py:5738
msgid "_Unblock"
-msgstr ""
+msgstr "_Деблокиране"
#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
msgid "_Unignore"
-msgstr "девет"
+msgstr "_Премахване на игнорирането"
#: ../data/glade/roster_window.glade.h:1
-#, fuzzy
msgid "Add _Contact..."
-msgstr "_Добавяне на контакт..."
+msgstr "_Добавяне на контакт…"
#: ../data/glade/roster_window.glade.h:2
-#, fuzzy
msgid "Fea_tures"
-msgstr "Функционалности на сървърите"
+msgstr "_Възможности"
#: ../data/glade/roster_window.glade.h:3
msgid "File _Transfers"
@@ -2533,15 +2447,15 @@
#: ../data/glade/roster_window.glade.h:4
msgid "Frequently Asked Questions (online)"
-msgstr "Често задавани въпроси (уеб страница)"
+msgstr "Често задавани въпроси (в Интернет)"
#: ../data/glade/roster_window.glade.h:6
msgid "Help online"
-msgstr "Помощ в Интернет (уеб страници)"
+msgstr "Помощ в Интернет"
#: ../data/glade/roster_window.glade.h:8
msgid "Profile, A_vatar"
-msgstr "Профил, _аватар"
+msgstr "_Профил, аватар"
#: ../data/glade/roster_window.glade.h:9
msgid "Show Trans_ports"
@@ -2552,14 +2466,12 @@
msgstr "Показване на изкл_ючените контакти"
#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
msgid "Show _roster"
msgstr "П_оказване на списъка"
#: ../data/glade/roster_window.glade.h:12
-#, fuzzy
msgid "_Accounts"
-msgstr "Акаунти"
+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
@@ -2571,7 +2483,7 @@
msgid "_Contents"
msgstr "_Ръководства"
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1353
msgid "_Edit"
msgstr "_Редактиране"
@@ -2581,7 +2493,7 @@
#: ../data/glade/roster_window.glade.h:19
msgid "_Help"
-msgstr "_Помощ"
+msgstr "Помо_щ"
#: ../data/glade/roster_window.glade.h:21
msgid "_Preferences"
@@ -2592,35 +2504,31 @@
msgstr "_Изход"
#: ../data/glade/roster_window.glade.h:23
-#, fuzzy
msgid "_Send Single Message..."
-msgstr "Изпращане на _еднократно съобщение..."
+msgstr "Изпращане на _еднократно съобщение…"
#: ../data/glade/roster_window.glade.h:25
msgid "_View"
msgstr "_Изглед"
#: ../data/glade/search_window.glade.h:1
-#, fuzzy
msgid "Please wait while retrieving search form..."
-msgstr "Изчакайте, докато се извлече списъка с команди..."
+msgstr "Изчакайте, докато се извлече формуляра за търсене…"
#: ../data/glade/search_window.glade.h:2
msgid "Search"
msgstr "Търсене"
#: ../data/glade/search_window.glade.h:3
-#, fuzzy
msgid "_Add contact"
msgstr "Добавяне на _контакт"
#. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
-#, fuzzy
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5763
msgid "_Information"
-msgstr "Информация за контакта"
+msgstr "_Информация"
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1211
msgid "_Search"
msgstr "_Търсене"
@@ -2707,22 +2615,17 @@
msgid "_Deny"
msgstr "_Отказване"
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr ""
-
#: ../data/glade/synchronise_select_account_dialog.glade.h:1
msgid "Select the account with which you want to synchronise"
-msgstr ""
+msgstr "Изберете акаунт, с който искате да синхронизирате"
#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
-#, fuzzy
msgid "Select the contacts you want to synchronise"
-msgstr "JID на контакта, с който искате да разговаряте"
+msgstr "Изберете контактите, които искате да синхронизирате"
#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
msgid "Synchronise : select contacts"
-msgstr ""
+msgstr "Синхронизиране: избор на контакти"
#: ../data/glade/systray_context_menu.glade.h:1
msgid "Mute Sounds"
@@ -2750,49 +2653,41 @@
#. Given Name
#: ../data/glade/vcard_information_window.glade.h:3
-#, fuzzy
msgid "<b>Ask:</b>"
-msgstr "<b>Действия</b>"
+msgstr "<b>Запитване:</b>"
#: ../data/glade/vcard_information_window.glade.h:6
-#, fuzzy
msgid "<b>Client:</b>"
-msgstr "<b>Персонални</b>"
+msgstr "<b>Клиент:</b>"
#: ../data/glade/vcard_information_window.glade.h:18
-#, fuzzy
msgid "<b>Jabber ID:</b>"
-msgstr "Jabber ID:"
+msgstr "<b>Jabber ID:</b>"
#: ../data/glade/vcard_information_window.glade.h:28
-#, fuzzy
msgid "<b>Resource:</b>"
-msgstr "Ресурс:"
+msgstr "<b>Ресурс:</b>"
#: ../data/glade/vcard_information_window.glade.h:31
-#, fuzzy
msgid "<b>Status:</b>"
-msgstr "<b>Настройки</b>"
+msgstr "<b>Състояние:</b>"
#. Family Name
#: ../data/glade/vcard_information_window.glade.h:34
-#, fuzzy
msgid "<b>Subscription:</b>"
-msgstr "<b>Описание</b>"
+msgstr "<b>Записване:</b>"
#: ../data/glade/vcard_information_window.glade.h:37
-#, fuzzy
msgid "<b>System:</b>"
-msgstr "<b>Персонални</b>"
+msgstr "<b>Система:</b>"
#: ../data/glade/vcard_information_window.glade.h:40
msgid "Comments"
msgstr "Коментари"
#: ../data/glade/vcard_information_window.glade.h:41
-#, fuzzy
msgid "Configured avatar:"
-msgstr "Настройки на _стаята"
+msgstr "Настроен аватар:"
#: ../data/glade/vcard_information_window.glade.h:42
#: ../data/glade/zeroconf_information_window.glade.h:1
@@ -2808,7 +2703,6 @@
msgstr "Още"
#: ../data/glade/vcard_information_window.glade.h:48
-#, fuzzy
msgid "User avatar:"
msgstr "Аватар:"
@@ -2844,23 +2738,23 @@
#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
msgid "Assign Open_PGP Key"
-msgstr "Задаване на Open_PGP ключ"
+msgstr "Задаване на ключ на Open_PGP"
#. Edit Groups
#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5595
msgid "Edit _Groups"
msgstr "Редактиране на _групи"
#. Rename
#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5721
msgid "_Rename"
msgstr "_Преименуване"
#: ../data/glade/zeroconf_context_menu.glade.h:1
msgid "_Modify Account..."
-msgstr "_Промяна на акаунт..."
+msgstr "_Промяна на акаунт…"
#: ../data/glade/zeroconf_information_window.glade.h:6
msgid "Local jid:"
@@ -2883,27 +2777,26 @@
msgstr "Промяна на акаунт"
#: ../src/adhoc_commands.py:264
-#, fuzzy
msgid "Cancel confirmation"
-msgstr "Информация за контакта"
+msgstr "Отмяна на потвърждението"
#: ../src/adhoc_commands.py:265
msgid ""
"You are in process of executing command. Do you really want to cancel it?"
-msgstr ""
+msgstr "На път сте да изпълните команда. Наистина ли искате да я отмените?"
#: ../src/adhoc_commands.py:304
msgid "Service changed the session identifier."
-msgstr ""
+msgstr "Услугата промени идентификатора на сесията."
#: ../src/adhoc_commands.py:317
msgid "Service sent malformed data"
-msgstr ""
+msgstr "Услугата изпрати лошо форматирани данни"
#. when stanza doesn't have error description
#: ../src/adhoc_commands.py:398
msgid "Service returned an error."
-msgstr ""
+msgstr "Услугата върна грешка."
#. For i18n
#: ../src/advanced.py:97
@@ -2969,7 +2862,6 @@
msgstr "български"
#: ../src/chat_control.py:68
-#, fuzzy
msgid "Breton"
msgstr "бретонски"
@@ -2998,7 +2890,6 @@
msgstr "испански"
#: ../src/chat_control.py:68
-#, fuzzy
msgid "Basque"
msgstr "баски"
@@ -3043,9 +2934,8 @@
msgstr "руски"
#: ../src/chat_control.py:68
-#, fuzzy
msgid "Serbian"
-msgstr "немски"
+msgstr "сръбски"
#: ../src/chat_control.py:68
msgid "Slovak"
@@ -3073,34 +2963,33 @@
msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
-#, fuzzy
msgid "GPG encryption enabled"
-msgstr "Шифрирането е включено"
+msgstr "Шифрирането чрез GPG е включено"
#. Add to roster
#. add_to_roster_menuitem
#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../src/dialogs.py:904 ../src/gajim.py:979 ../src/gajim.py:1639
+#: ../src/roster_window.py:915 ../src/roster_window.py:1541
+#: ../src/roster_window.py:1543 ../src/roster_window.py:1879
+#: ../src/roster_window.py:3110 ../src/roster_window.py:3134
+#: ../src/roster_window.py:5257 ../src/roster_window.py:5441
msgid "Not in Roster"
msgstr "Не е в списъка"
#: ../src/chat_control.py:1301 ../src/tooltips.py:627
msgid "Unknown Artist"
-msgstr ""
+msgstr "Неизвестен изпълнител"
#: ../src/chat_control.py:1303 ../src/tooltips.py:632
msgid "Unknown Title"
-msgstr ""
+msgstr "Неизвестно заглавие"
#: ../src/chat_control.py:1305 ../src/tooltips.py:637
msgid "Unknown Source"
-msgstr ""
+msgstr "Неизвестен източник"
#: ../src/chat_control.py:1309 ../src/tooltips.py:639
#, python-format
@@ -3108,13 +2997,17 @@
"<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:1314
-#, fuzzy, python-format
+#, python-format
msgid ""
"%(title)s by %(artist)s\n"
"from %(source)s"
-msgstr "„%(title)s“ от %(artist)s"
+msgstr ""
+"%(title)s на %(artist)s\n"
+"от %(source)s"
#: ../src/chat_control.py:1438
#, python-format
@@ -3122,58 +3015,57 @@
msgstr "%(nickname)s от стая %(room_name)s"
#. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3912
msgid "No GPG key assigned"
-msgstr ""
+msgstr "Няма зададен ключ на GPG"
#: ../src/chat_control.py:1524
msgid ""
"No GPG key is assigned to this contact. So you cannot encrypt messages with "
"GPG."
msgstr ""
+"Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
+"съобщенията с GPG."
#: ../src/chat_control.py:1533
-#, fuzzy
msgid "GPG encryption disabled"
-msgstr "Шифрирането е изключено"
+msgstr "Шифрирането чрез GPG е изключено"
#: ../src/chat_control.py:1558
msgid "Session WILL be logged"
-msgstr ""
+msgstr "ЩЕ СЕ запазва дневник за сесията"
#: ../src/chat_control.py:1560
msgid "Session WILL NOT be logged"
-msgstr ""
+msgstr "НЯМА да се запазва дневник за сесията"
#. encryption %s active
#: ../src/chat_control.py:1574
msgid "is"
-msgstr ""
+msgstr "е"
#: ../src/chat_control.py:1574
msgid "is NOT"
-msgstr ""
+msgstr "НЕ е"
#. chat session %s be logged
#: ../src/chat_control.py:1576
msgid "will"
-msgstr ""
+msgstr "Ще"
#: ../src/chat_control.py:1576
msgid "will NOT"
-msgstr ""
+msgstr "НЯМА да"
#. About encrypted chat session
#: ../src/chat_control.py:1580
-#, fuzzy
msgid "and authenticated"
-msgstr "Използване на удостоверяване"
+msgstr "и удостоверяването е успешно"
#. About encrypted chat session
#: ../src/chat_control.py:1584
-#, fuzzy
msgid "and NOT authenticated"
-msgstr "Използване на удостоверяване"
+msgstr "и удостоверяването НЕ Е успешно"
#. status will become 'is' or 'is not', authentificaed will become
#. 'and authentificated' or 'and not authentificated', logged will become
@@ -3184,10 +3076,12 @@
"%(type)s encryption %(status)s active %(authenticated)s.\n"
"Your chat session %(logged)s be logged."
msgstr ""
+"Шифрирането чрез %(type)s %(status)s включено %(authenticated)s.\n"
+"%(logged)s се запазва дневник за сесията."
#: ../src/chat_control.py:1638
msgid "Command not supported for zeroconf account."
-msgstr ""
+msgstr "Командата не се поддържа за акаунт тип „zeroconf“."
#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
#, python-format
@@ -3205,23 +3099,23 @@
msgstr "Употреба: /%s, скрива бутоните за разговор."
#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
-#, fuzzy, python-format
+#, python-format
msgid ""
"Usage: /%(command)s <action>, sends action to the current group chat. Use "
"third person. (e.g. /%(command)s explodes.)"
msgstr ""
-"Употреба: /%s <действие>, изпраща действие до текущата стая. Използва се "
-"трето лице (т.е. „/%s експлодира“)."
+"Употреба: /%(command)s <действие>, изпраща действие до текущата стая. "
+"Използва се трето лице (напр. „/%(command)s експлодира“)."
#: ../src/chat_control.py:1663
#, python-format
msgid "Usage: /%s, sends a ping to the contact"
-msgstr ""
+msgstr "Употреба: /%s, изпраща „ping“ до контакта."
#: ../src/chat_control.py:1666
-#, fuzzy, python-format
+#, python-format
msgid "Usage: /%s, send the message to the contact"
-msgstr "Употреба: /%s, скрива бутоните за разговор."
+msgstr "Употреба: /%s, изпраща съобщение до контакта."
#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
#, python-format
@@ -3230,41 +3124,39 @@
#: ../src/chat_control.py:1800
msgid "Session negotiation cancelled"
-msgstr ""
+msgstr "Договорката за сесията отменена"
#: ../src/chat_control.py:1807
-#, fuzzy
msgid "This session is encrypted"
-msgstr "[Това съобщение е шифрирано]"
+msgstr "Тази сесия е шифрирана"
#: ../src/chat_control.py:1810
msgid " and WILL be logged"
-msgstr ""
+msgstr " и ЩЕ СЕ запазва дневник"
#: ../src/chat_control.py:1812
msgid " and WILL NOT be logged"
-msgstr ""
+msgstr " и НЯМА да се запазва дневник"
#: ../src/chat_control.py:1817
msgid ""
"Remote contact's identity not verified. Click the shield button for more "
"details."
msgstr ""
+"Идентичността на отсрещния контакт не е потвърдена. Натиснете бутона със "
+"щита за повече информация."
#: ../src/chat_control.py:1819
-#, fuzzy
msgid "E2E encryption disabled"
-msgstr "Шифрирането е изключено"
+msgstr "Шифрирането чрез E2E е изключено"
#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
-#, fuzzy
msgid "The following message was NOT encrypted"
-msgstr "[Това съобщение е шифрирано]"
+msgstr "Следното съобщение НЕ БЕШЕ шифрирано"
#: ../src/chat_control.py:1854
-#, fuzzy
msgid "The following message was encrypted"
-msgstr "[Това съобщение е шифрирано]"
+msgstr "Следното съобщение беше шифрирано"
#. %s is being replaced in the code with JID
#: ../src/chat_control.py:2225
@@ -3280,13 +3172,13 @@
"Ако затворите този прозорец и нямате включена опция за запазване на "
"историята, съобщението ще бъде загубено."
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1847
+#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:2081
+#: ../src/common/connection_handlers.py:2213 ../src/common/connection.py:1218
+#: ../src/gajim.py:174
msgid "Database Error"
-msgstr ""
+msgstr "Грешка в базата от данни"
#: ../src/chat_control.py:2377
#, python-format
@@ -3294,11 +3186,13 @@
"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:2608
-#, fuzzy, python-format
+#: ../src/chat_control.py:2613
+#, python-format
msgid "%(name)s is now %(status)s"
-msgstr "%(nick)s вече е %(status)s"
+msgstr "%(name)s вече е %(status)s"
#: ../src/common/check_paths.py:43
msgid "creating logs database"
@@ -3385,24 +3279,22 @@
#. Make special context menu if group is Groupchats
#: ../src/common/commands.py:206 ../src/common/contacts.py:94
#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1547
+#: ../src/roster_window.py:5033
msgid "Groupchats"
msgstr "Стаи"
#: ../src/common/commands.py:247
-#, fuzzy
msgid "You left the following groupchats:"
-msgstr "Излязохте от следните стаи:"
+msgstr "Напуснахте следните стаи:"
#: ../src/common/commands.py:259
-#, fuzzy
msgid "Forward unread messages"
-msgstr " %d непрочетено съобщение"
+msgstr "Препращане на непрочетени съобщения"
#: ../src/common/commands.py:279
msgid "All unread messages have been forwarded."
-msgstr ""
+msgstr "Всички непрочетени съобщения бяха препратени."
#: ../src/common/config.py:82
msgid "Use D-Bus and Notification-Daemon to show notifications"
@@ -3413,13 +3305,14 @@
msgstr "Време в минути, след което състоянието да се променя на „Отсъствам“."
#: ../src/common/config.py:88
-#, fuzzy
msgid "$S (Away as a result of being idle more than $T min)"
-msgstr "Автоматично състояние поради липса на активност"
+msgstr "$S (Отсъствам поради липса на активност над $T мин)"
#: ../src/common/config.py:88
msgid "$S will be replaced by current status message, $T by autoaway time."
msgstr ""
+"$S ще бъде заменено от текущото съобщение за състояние, а $T от времето на "
+"отсъствие."
#: ../src/common/config.py:90
msgid "Time in minutes, after which your status changes to not available."
@@ -3428,13 +3321,14 @@
"разположение“."
#: ../src/common/config.py:91
-#, fuzzy
msgid "$S (Not available as a result of being idle more than $T min)"
-msgstr "Автоматично състояние поради липса на активност"
+msgstr "$S (Не съм на разположение поради липса на активност над $T мин)"
#: ../src/common/config.py:91
msgid "$S will be replaced by current status message, $T by autoxa time."
msgstr ""
+"$S ще бъде заменено от текущото съобщение за състояние, а $T от времето на "
+"отсъствие."
#: ../src/common/config.py:111
msgid ""
@@ -3446,10 +3340,9 @@
#. sorted alphanum
#: ../src/common/config.py:112 ../src/common/config.py:448
#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
-#, fuzzy
+#: ../src/common/optparser.py:467 ../src/gajim.py:3124
msgid "default"
-msgstr "По подразбиране"
+msgstr "по подразбиране"
#: ../src/common/config.py:116
msgid "Enable link-local/zeroconf messaging"
@@ -3490,8 +3383,8 @@
msgid ""
"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
msgstr ""
-"Ако е „True“, не се премахват */_. Така *абв* ще е в получер стил, но със "
-"символите * *."
+"Ако е активирана, не се премахват */_. Така *абв* ще е в получер стил, но "
+"със символите * *."
#: ../src/common/config.py:128
msgid ""
@@ -3587,10 +3480,10 @@
"False and they sync with global status) based upon the status of the network "
"connection."
msgstr ""
-"Ако е „True“, слуша за сигнали по DBus от NetworkManager и променя "
-"състоянието на акаунтите (при положение, че нямат настроена "
-"„listen_to_network_manager“ на „False“ и се синхронизират с общото "
-"състояние) в зависимост от състоянието на мрежовата връзка."
+"Ако е активирана, слуша за сигнали по DBus от NetworkManager и променя "
+"състоянието на акаунтите (при положение, че нямат изключена "
+"„listen_to_network_manager“ и се синхронизират с общото състояние) в "
+"зависимост от състоянието на мрежовата връзка."
#: ../src/common/config.py:181
msgid ""
@@ -3636,12 +3529,12 @@
"списък с адреси на стаи."
#: ../src/common/config.py:190
-#, fuzzy
msgid ""
"Comma separated list of hosts that we send, in addition of local interfaces, "
"for File Transfer in case of address translation/port forwarding."
msgstr ""
-"Превъзмогва хоста при файлов трансфер в случай, че се ползва NAT/"
+"Списък от хостове, разделен със запетаи, които се изпращат като допълнение "
+"към локалните интерфейси за файлов трансфер в случай, че се ползва NAT/"
"пренасочване на портове."
#: ../src/common/config.py:192
@@ -3669,6 +3562,8 @@
"When negotiating an encrypted session, should Gajim assume you want your "
"messages to be logged?"
msgstr ""
+"Когато се договаря шифрирана сесия, да се приема ли, че искате собствените "
+"съобщения да се запазват в дневник?"
#: ../src/common/config.py:204
msgid ""
@@ -3677,10 +3572,14 @@
"numbers are more secure, but take longer to calculate when you start a "
"session."
msgstr ""
+"Списък от групи „modp“ за употреба чрез алгоритъма „Дифи-Хелман“, разделени "
+"чрез запетаи, най-предпочитаните в началото. Валидни групи са 1, 2, 5, 14, "
+"15, 16, 17 и 18. По-големите числа са по-сигурни, но изчисленията отнемат "
+"повече време в началото на сесията."
#: ../src/common/config.py:213
msgid "Preview new messages in notification popup?"
-msgstr ""
+msgstr "Показване на нови съобщения в изскачащ прозорец?"
#: ../src/common/config.py:218
msgid ""
@@ -3694,7 +3593,7 @@
"If True, quits Gajim when X button of Window Manager is clicked. This "
"setting is taken into account only if trayicon is used."
msgstr ""
-"Ако е „True“, се спира програмата при натискане на бутона „X“ на "
+"Ако е активирана, се спира програмата при натискане на бутона „X“ на "
"администратора на прозорци. Тази настройка е валидна само ако се използва "
"иконата в областта за уведомяване."
@@ -3702,15 +3601,15 @@
msgid ""
"If True, Gajim will check if it's the default jabber client on each startup."
msgstr ""
-"Ако е „True“, Gajim ще проверява дали е стандартния Джабър клиент при всяко "
-"стартиране."
+"Ако е активирана, Gajim ще проверява дали е стандартния Джабър клиент при "
+"всяко стартиране."
#: ../src/common/config.py:221
msgid ""
"If True, Gajim will display an icon on each tab containing unread messages. "
"Depending on the theme, this icon may be animated."
msgstr ""
-"Ако е „True“, ще се изобразява икона във всеки подпрозорец, съдържащ "
+"Ако е активирана, ще се изобразява икона във всеки подпрозорец, съдържащ "
"непрочетени съобщения. В зависимост от темата иконата може да бъде анимирана."
#: ../src/common/config.py:222
@@ -3718,27 +3617,28 @@
"If True, Gajim will display the status message, if not empty, for every "
"contact under the contact name in roster window."
msgstr ""
-"Ако е „True“, ще се показва съобщението за състояние, ако има такова, на "
+"Ако е активирана, ще се показва съобщението за състояние, ако има такова, на "
"всеки контакт под името му списъка."
#: ../src/common/config.py:227
msgid "Define the position of the avatar in roster. Can be left or right"
msgstr ""
+"Позиция на аватара в списъка. Може да е ляво (left) или дясно (right)."
#: ../src/common/config.py:228
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."
msgstr ""
-"Ако е „True“, ще се изпраща запитване за аватар до всеки контакт, който е "
-"нямал такъв последния път или пък има остарял кеширан аватар."
+"Ако е активирана, ще се изпраща запитване за аватар до всеки контакт, който "
+"е нямал такъв последния път или пък има остарял кеширан аватар."
#: ../src/common/config.py:229
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."
msgstr ""
-"Ако е „False“, вече няма да виждате реда за състоянието при разговорите, "
+"Ако е изключена, вече няма да виждате реда за състоянието при разговорите, "
"когато контактът променя състоянието си."
#: ../src/common/config.py:230
@@ -3767,8 +3667,8 @@
msgid ""
"If True, restored messages will use a smaller font than the default one."
msgstr ""
-"Ако е „True“, ще се използва по-малък шрифт от стандартния за възстановените "
-"съобщения."
+"Ако е активирана, ще се използва по-малък шрифт от стандартния за "
+"възстановените съобщения."
#: ../src/common/config.py:236
msgid "Don't show avatar for the transport itself."
@@ -3784,9 +3684,9 @@
"window flash (the default behaviour in most Window Managers) when holding "
"pending events."
msgstr ""
-"Ако е „True“ и инсталираните версии на GTK+ и PyGTK са поне 2.8, прозорецът "
-"ще мига (стандартното поведение при повечето мениджъри на прозорци) при "
-"задържане на чакащи събития."
+"Ако е активирана и инсталираните версии на GTK+ и PyGTK са поне 2.8, "
+"прозорецът ще мига (стандартното поведение при повечето мениджъри на "
+"прозорци) при задържане на чакащи събития."
#: ../src/common/config.py:240
msgid ""
@@ -3795,12 +3695,11 @@
"presences."
msgstr ""
"Jabberd1.4 не харесва информация от тип SHA при включване в стая, защитена с "
-"пароли. Настройте тази опция на „False“, за да спрете да изпращате "
+"пароли. Настройте тази опция на „Изключена“, за да спрете да изпращате "
"информация от тип SHA при присъствие в стаи."
#. always, never, peracct, pertype should not be translated
#: ../src/common/config.py:243
-#, fuzzy
msgid ""
"Controls the window where new messages are placed.\n"
"'always' - All messages are sent to a single window.\n"
@@ -3812,26 +3711,28 @@
"specific window."
msgstr ""
"Контролира прозореца, където се отварят нови съобщения.\n"
-"„always“ - Всички съобщения се отварят в един прозорец.\n"
-"„never“ - Всички съобщения се отварят в собствен прозорец.\n"
-"„peracct“ - Съобщенията за всеки акаунт се отварят в специфичен прозорец.\n"
-"„pertype“ - Всеки тип съобщение (т.е. разговор и от стая) се отварят в "
-"специфичен прозорец. Забележете, че промяната на тази опция изисква "
-"рестартирането на Gajim, за да влезе в сила."
+"„always“ — Всички съобщения се отварят в един прозорец.\n"
+"„always_with_roster“ — Като „always“, но съобщенията са в общ прозорец със "
+"списъка.\n"
+"„never“ — Всички съобщения се отварят в собствен прозорец.\n"
+"„peracct“ — Съобщенията за всеки акаунт се отварят в специфичен прозорец.\n"
+"„pertype“ — Всеки тип съобщение (т.е. разговор и от стая) се отварят в "
+"специфичен прозорец."
#: ../src/common/config.py:244
msgid "If False, you will no longer see the avatar in the chat window."
-msgstr "Ако е „False“, повече няма да виждате аватар в прозореца за разговор."
+msgstr ""
+"Ако е изключена, повече няма да виждате аватар в прозореца за разговор."
#: ../src/common/config.py:245
msgid "If True, pressing the escape key closes a tab/window."
msgstr ""
-"Ако е „True“, натискането на клавиша „Escape“ затваря прозореца/подпрозореца."
+"Ако е активирана, натискането на клавиша „Escape“ затваря прозореца/"
+"подпрозореца."
#: ../src/common/config.py:246
-#, fuzzy
msgid "Hides the buttons in chat windows."
-msgstr "Скрива бутоните в прозореца на стаята."
+msgstr "Скрива бутоните в прозорците за разговор."
#: ../src/common/config.py:247
msgid "Hides the banner in a group chat window"
@@ -3858,18 +3759,16 @@
msgstr "Отстъп, когато се използва смесване на последователен псевдоним."
#: ../src/common/config.py:252
-#, fuzzy
msgid "Smooth scroll message in conversation window"
-msgstr "Изпращане на съобщението и затваряне на прозореца"
+msgstr "Плавно прелистване на съобщение в прозореца за разговор"
#: ../src/common/config.py:253
-#, fuzzy
msgid ""
"List of colors, separated by \":\", that will be used to color nicknames in "
"group chats."
msgstr ""
-"Списък с цветове, които да се използват за оцветяване на псевдонимите в "
-"стаите."
+"Списък с цветове, разделени с „:“, които да се използват за оцветяване на "
+"псевдонимите в стаите."
#: ../src/common/config.py:254
msgid "Ctrl-Tab go to next composing tab when none is unread."
@@ -3889,7 +3788,7 @@
"account modification window. BE CAREFUL, when you are logged in with a "
"negative priority, you will NOT receive any message from your server."
msgstr ""
-"Ако е „True“, ще може да настроите отрицателен приоритет за акаунта в "
+"Ако е активирана, ще може да настроите отрицателен приоритет за акаунта в "
"прозореца за промяна на акаунти. ВНИМАВАЙТЕ, понеже когато сте свързани с "
"отрицателен приоритет, НЯМА да получите нито едно съобщение от сървъра."
@@ -3898,16 +3797,16 @@
"If True, Gajim will use Gnome Keyring (if available) to store account "
"passwords."
msgstr ""
-"Ако е „True“, Gajim ще използва набора на ключове на GNOME (gnome-keyring), "
-"ако е достъпен, за да запазва информация за паролите на акаунтите."
+"Ако е активирана, Gajim ще използва набора на ключове на GNOME (gnome-"
+"keyring), ако е достъпен, за да запазва информация за паролите на акаунтите."
#: ../src/common/config.py:258
msgid ""
"If True, Gajim will show number of online and total contacts in account and "
"group rows."
msgstr ""
-"Ако е „True“, Gajim ще показва броя на включените контакти и общия брой в "
-"редовете за акаунти и групи."
+"Ако е активирана, Gajim ще показва броя на включените контакти и общия брой "
+"в редовете за акаунти и групи."
#: ../src/common/config.py:259
msgid ""
@@ -3922,44 +3821,59 @@
"If True, Gajim will scroll and select the contact who sent you the last "
"message, if chat window is not already opened."
msgstr ""
+"Ако е активирана, Gajim ще прелиства списъка избирайки контакта, който ви е "
+"изпратил последното съобщение, в случай, че прозорецът за разговор не е вече "
+"отворен."
#: ../src/common/config.py:261
msgid ""
"If True, Gajim will convert string between $$ and $$ to an image using dvips "
"and convert before insterting it in chat window."
msgstr ""
+"Ако е активирана, Gajim ще преобразува чрез „dvips“ низа между $$ и $$ в "
+"изображение преди да го вмъкне в прозореца за разговор."
#: ../src/common/config.py:262
msgid "Time of inactivity needed before the change status window closes down."
msgstr ""
+"Необходимо време без активност преди прозорецът за промяна на състоянието да "
+"се затвори."
#: ../src/common/config.py:263
msgid ""
"Maximum number of lines that are printed in conversations. Oldest lines are "
"cleared."
msgstr ""
+"Максимален брой редове, които да се показват в разговорите. Най-старите "
+"редове се изчистват."
#: ../src/common/config.py:264
msgid ""
"If True, notification windows from notification-daemon will be attached to "
"systray icon."
msgstr ""
+"Ако активирана, прозорците за уведомления от „notification-daemon“ ще бъдат "
+"прикрепени към иконата в областта за уведомяване."
#: ../src/common/config.py:265
msgid "Choose interval between 2 checks of idleness."
-msgstr ""
+msgstr "Интервал между две проверки за липса на активност."
#: ../src/common/config.py:266
msgid ""
"Change the value to change the size of latex formulas displayed. The higher "
"is larger."
msgstr ""
+"Променете стойността за увеличаване или намаляване размера на изобразените "
+"формули на LaTeX. По-голяма стойност означава по-голям размер."
#: ../src/common/config.py:267
msgid ""
"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
"\" uri."
msgstr ""
+"Валидни схеми на адреси. Само схемите в този списък ще бъдат достъпни като "
+"„истински“ адреси."
#: ../src/common/config.py:278
msgid ""
@@ -3974,48 +3888,61 @@
"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"
msgstr ""
+"Състояние при автоматично включване. Може да е „online“, „chat“, „away“, "
+"„xa“, „dnd“ или „invisible“. ЗАБЕЛЕЖКА: Тази опция се използва само ако "
+"„restore_last_status“ е изключена."
#: ../src/common/config.py:287
msgid "If enabled, restore the last status that was used."
-msgstr ""
+msgstr "Ако е активирана, възстановява се последното използвано състояние."
#: ../src/common/config.py:292
msgid ""
"If disabled, don't sign presences with GPG key, even if GPG is configured."
msgstr ""
+"Ако е изключена, не се се подписват съобщенията за състояние с ключ на GPG, "
+"дори и да е конфигуриран."
#: ../src/common/config.py:294
msgid "Enable ESessions encryption for this account."
-msgstr ""
+msgstr "Активира шифриране тип „ESessions“ за този акаунт."
#: ../src/common/config.py:295
msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr ""
+msgstr "Дали Gajim да започва шифрирана сесия автоматично, ако е възможно?"
#: ../src/common/config.py:296
msgid ""
"Ordered list (space separated) of connection type to try. Can contain tls, "
"ssl or plain"
msgstr ""
+"Списък (разделен с шпации) на видове свързвания. Може да съдържа „tls“, "
+"„ssl“ или „plain“."
#: ../src/common/config.py:297
msgid ""
"Show a warning dialog before sending password on an plaintext connection."
msgstr ""
+"Показване на предупреждение преди изпращане на паролата при нешифрирана "
+"връзка."
#: ../src/common/config.py:298
msgid "Show a warning dialog before using standard SSL library."
msgstr ""
+"Показване на предупреждение преди използване на стандартната библиотека на "
+"SSL."
#: ../src/common/config.py:300
msgid "Space separated list of ssl errors to ignore."
-msgstr ""
+msgstr "Списък (разделен с шпации) от грешки на SSL, които да се пренебрегват."
#: ../src/common/config.py:312
msgid ""
"How many seconds to wait for the answer of keepalive packet before we try to "
"reconnect."
msgstr ""
+"Колко секунди да се чака за отговор на изпратен пакет за поддържане на "
+"връзката, преди да да се опита свързване наново."
#. yes, no, ask
#: ../src/common/config.py:316
@@ -4032,11 +3959,11 @@
#: ../src/common/config.py:334
msgid "Answer to receipt requests"
-msgstr ""
+msgstr "Отговор на заявки"
#: ../src/common/config.py:335
msgid "Sent receipt requests"
-msgstr ""
+msgstr "Изпратени заявки"
#: ../src/common/config.py:389
msgid "Is OpenPGP enabled for this contact?"
@@ -4046,7 +3973,7 @@
msgid ""
"Should Gajim automatically start an encrypted session with this contact when "
"possible?"
-msgstr ""
+msgstr "Да се започва ли шифрирана сесия с този контакт, когато е възможно?"
#: ../src/common/config.py:391 ../src/common/config.py:394
msgid "Language for which we want to check misspelled words"
@@ -4182,7 +4109,7 @@
#: ../src/common/connection_handlers.py:234
msgid "Invalid local address? :-O"
-msgstr ""
+msgstr "Невалиден локален адрес? :-O"
#: ../src/common/connection_handlers.py:639
#, python-format
@@ -4190,36 +4117,38 @@
msgstr "Информацията за регистрация за транспорт %s не пристигна навреме"
#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:1845
+#: ../src/common/connection_handlers.py:1891
+#: ../src/common/connection_handlers.py:2079
+#: ../src/common/connection_handlers.py:2211 ../src/common/connection.py:1216
+#: ../src/gajim.py:396
msgid "Disk Write Error"
-msgstr ""
+msgstr "Грешка при запис"
#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
-#, fuzzy
msgid "Invisibility not supported"
-msgstr "Разширението не се поддържа"
+msgstr "Състоянието „Невидим“ не се поддържа."
#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
#, python-format
msgid "Account %s doesn't support invisibility."
-msgstr ""
+msgstr "Акаунтът „%s“ не поддържа невидимост."
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../src/common/connection_handlers.py:1848
+#: ../src/common/connection_handlers.py:1894
+#: ../src/common/connection_handlers.py:2082
+#: ../src/common/connection_handlers.py:2214 ../src/common/connection.py:1219
+#: ../src/gajim.py:175
#, python-format
msgid ""
"The database file (%s) cannot be read. Try to repair it (see http://trac."
"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
msgstr ""
+"Файлът „%s“ от базата от данни не може да бъде прочетен. Опитайте се да го "
+"поправите (вижте http://trac.gajim.org/wiki/DatabaseBackup) или изтриете "
+"(цялата история ще бъде загубена)."
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:1966
#, python-format
msgid "Nickname not allowed: %s"
msgstr "Псевдонимът не е позволен: %s"
@@ -4227,73 +4156,72 @@
#. we are banned
#. group chat does not exist
#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../src/common/connection_handlers.py:2041
+#: ../src/common/connection_handlers.py:2044
+#: ../src/common/connection_handlers.py:2047
+#: ../src/common/connection_handlers.py:2050
+#: ../src/common/connection_handlers.py:2054 ../src/gajim.py:560
msgid "Unable to join group chat"
msgstr "Неуспех при влизането в стаята"
-#: ../src/common/connection_handlers.py:2054
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2042
+#, python-format
msgid "You are banned from group chat %s."
-msgstr "Вие сте отлъчени от тази стая."
+msgstr "Вие сте отлъчени от стаята %s."
-#: ../src/common/connection_handlers.py:2057
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2045
+#, python-format
msgid "Group chat %s does not exist."
-msgstr "Такава стая не съществува."
+msgstr "Стаята %s не съществува."
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2048
msgid "Group chat creation is restricted."
msgstr "Създаването на стаи е ограничено."
-#: ../src/common/connection_handlers.py:2063
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2051
+#, python-format
msgid "Your registered nickname must be used in group chat %s."
-msgstr "Трябва да се използва регистрирания ви псевдоним."
+msgstr "Трябва да се използва регистрирания ви псевдоним в стаята %s."
-#: ../src/common/connection_handlers.py:2067
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2055
+#, python-format
msgid "You are not in the members list in groupchat %s."
-msgstr "Не сте в списъка с членове."
+msgstr "Не сте в списъка с членове на стаята %s."
#. Room has been destroyed. see
#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
-#, fuzzy
+#: ../src/common/connection_handlers.py:2097
msgid "Room has been destroyed"
-msgstr "Упълномощаването беше прекратено"
+msgstr "Стаята е била унищожена"
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2104
#, python-format
msgid "You can join this room instead: %s"
-msgstr ""
+msgstr "Вместо това може да влезете в тази стая: %s"
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2131
msgid "I would like to add you to my roster."
msgstr ""
"Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
"roster."
#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2152
#, python-format
msgid "we are now subscribed to %s"
msgstr "вече сме записани за %s"
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2154
#, python-format
msgid "unsubscribe request from %s"
msgstr "искане за отписване от %s"
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2156
#, python-format
msgid "we are now unsubscribed from %s"
msgstr "вече сме отписани от %s"
-#: ../src/common/connection_handlers.py:2343
+#: ../src/common/connection_handlers.py:2337
#, python-format
msgid ""
"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4304,149 +4232,150 @@
"org/, за да го премахнете."
#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
+#: ../src/common/connection_handlers.py:2362
#: ../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:2370
+#: ../src/common/connection_handlers.py:2364
#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
#: ../src/common/connection.py:66
msgid "Unable to get issuer certificate"
-msgstr ""
+msgstr "Неуспех при получаването на сертификата на издателя"
#: ../src/common/connection.py:67
msgid "Unable to get certificate CRL"
-msgstr ""
+msgstr "Неуспех при получаването на списъка с отменени сертификати"
#: ../src/common/connection.py:68
msgid "Unable to decrypt certificate's signature"
-msgstr ""
+msgstr "Неуспех при дешифрирането на подписа на сертификата"
#: ../src/common/connection.py:69
msgid "Unable to decrypt CRL's signature"
-msgstr ""
+msgstr "Неуспех при дешифрирането на подписа на списъка с отменени сертификати"
#: ../src/common/connection.py:70
-#, fuzzy
msgid "Unable to decode issuer public key"
-msgstr "Неуспех при зареждането на модула „idle“"
+msgstr "Неуспех при декодирането на публичния ключ на издателя"
#: ../src/common/connection.py:71
msgid "Certificate signature failure"
-msgstr ""
+msgstr "Грешка при проверката на подписа на сертификата"
#: ../src/common/connection.py:72
msgid "CRL signature failure"
-msgstr ""
+msgstr "Грешка при проверката на подписа на списъка с отменени сертификати"
#: ../src/common/connection.py:73
msgid "Certificate is not yet valid"
-msgstr ""
+msgstr "Сертификатът все още не е валиден"
#: ../src/common/connection.py:74
msgid "Certificate has expired"
-msgstr ""
+msgstr "Валидността на сертификата е изтекла"
#: ../src/common/connection.py:75
-#, fuzzy
msgid "CRL is not yet valid"
-msgstr "%s не е валидно ниво за дневник"
+msgstr "Списъкът с отменени сертификати все още не е валиден"
#: ../src/common/connection.py:76
msgid "CRL has expired"
-msgstr ""
+msgstr "Валидността на списъка с отменени сертификати е изтекла"
#: ../src/common/connection.py:77
msgid "Format error in certificate's notBefore field"
-msgstr ""
+msgstr "Грешка при форматирането на полето „notBefore“ на сертификата"
#: ../src/common/connection.py:78
msgid "Format error in certificate's notAfter field"
-msgstr ""
+msgstr "Грешка при форматирането на полето „notAfter“ на сертификата"
#: ../src/common/connection.py:79
msgid "Format error in CRL's lastUpdate field"
msgstr ""
+"Грешка при форматирането на полето „lastUpdate“ на списъка с отменени "
+"сертификати"
#: ../src/common/connection.py:80
msgid "Format error in CRL's nextUpdate field"
msgstr ""
+"Грешка при форматирането на полето „nextUpdate“ на списъка с отменени "
+"сертификати"
#: ../src/common/connection.py:81
msgid "Out of memory"
-msgstr ""
+msgstr "Изчерпана памет"
#: ../src/common/connection.py:82
msgid "Self signed certificate"
-msgstr ""
+msgstr "Само-подписан сертификат"
#: ../src/common/connection.py:83
msgid "Self signed certificate in certificate chain"
-msgstr ""
+msgstr "Само-подписан сертификат в удостоверителската верига"
#: ../src/common/connection.py:84
msgid "Unable to get local issuer certificate"
-msgstr ""
+msgstr "Неуспех при получаването на сертификата на издателя"
#: ../src/common/connection.py:85
msgid "Unable to verify the first certificate"
-msgstr ""
+msgstr "Неуспех при проверката на първия сертификат"
#: ../src/common/connection.py:86
msgid "Certificate chain too long"
-msgstr ""
+msgstr "Удостоверителската верига е твърде дълга"
#: ../src/common/connection.py:87
msgid "Certificate revoked"
-msgstr ""
+msgstr "Сертификатът е отменен"
#: ../src/common/connection.py:88
-#, fuzzy
msgid "Invalid CA certificate"
-msgstr "Невалидно потребителско име"
+msgstr "Невалиден сертификат на удостоверителя"
#: ../src/common/connection.py:89
msgid "Path length constraint exceeded"
-msgstr ""
+msgstr "Максималната дължина на пътя е надвишена"
#: ../src/common/connection.py:90
msgid "Unsupported certificate purpose"
-msgstr ""
+msgstr "Неподдържана цел на сертификата"
#: ../src/common/connection.py:91
msgid "Certificate not trusted"
-msgstr ""
+msgstr "Сертификатът не е доверен"
#: ../src/common/connection.py:92
msgid "Certificate rejected"
-msgstr ""
+msgstr "Сертификатът е отхвърлен"
#: ../src/common/connection.py:93
msgid "Subject issuer mismatch"
-msgstr ""
+msgstr "Несъответствие на издателя на сертификата"
#: ../src/common/connection.py:94
msgid "Authority and subject key identifier mismatch"
-msgstr ""
+msgstr "Несъответствие на идентификатора и сертифициращия орган"
#: ../src/common/connection.py:95
msgid "Authority and issuer serial number mismatch"
-msgstr ""
+msgstr "Несъответствие на серийния номер на издателя и сертифициращия орган"
#: ../src/common/connection.py:96
msgid "Key usage does not include certificate signing"
-msgstr ""
+msgstr "Основната употреба не включва подписване на сертификати"
#: ../src/common/connection.py:97
msgid "Application verification failure"
-msgstr ""
+msgstr "Грешка на приложението за проверка"
#: ../src/common/connection.py:266
#: ../src/common/zeroconf/connection_zeroconf.py:214
@@ -4459,19 +4388,21 @@
msgstr "Свържете се наново."
#: ../src/common/connection.py:278
-#, fuzzy, python-format
+#, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr "Транспортът „%s“ отговори погрешно на запитването за регистрация: %s"
+msgstr ""
+"Сървърът „%(name)s“ отговори погрешно на запитването за регистрация: %(error)"
+"s"
#: ../src/common/connection.py:312
#, python-format
msgid "Server %s provided a different registration form"
-msgstr ""
+msgstr "Сървърът „%s“ предостави различна форма за регистрация"
#: ../src/common/connection.py:325
#, python-format
msgid "Unknown SSL error: %d"
-msgstr ""
+msgstr "Неизвестна грешка на SSL: %d"
#. wrong answer
#: ../src/common/connection.py:340
@@ -4479,40 +4410,41 @@
msgstr "Невалиден отговор"
#: ../src/common/connection.py:341
-#, fuzzy, python-format
+#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
-msgstr "Транспортът „%s“ отговори погрешно на запитването за регистрация: %s"
+msgstr ""
+"Транспортът „%(name)s“ отговори погрешно на запитването за регистрация: %"
+"(error)s"
#: ../src/common/connection.py:522
-#, fuzzy
msgid "Connection to proxy failed"
-msgstr "Неуспех при свързването"
+msgstr "Неуспех при свързването със сървъра-посредник"
#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
+#: ../src/common/connection.py:1351
#: ../src/common/zeroconf/connection_zeroconf.py:248
#, python-format
msgid "Could not connect to \"%s\""
-msgstr "Не може да се осъществи свързване с „%s“"
+msgstr "Неуспех при свързване с „%s“"
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:611 ../src/gajim.py:1056
msgid "Check your connection or try again later."
msgstr "Проверете връзката или опитайте отново по-късно."
#: ../src/common/connection.py:643 ../src/common/connection.py:691
-#, fuzzy, python-format
+#, python-format
msgid "Could not connect to account %s"
-msgstr "Не може да се осъществи свързване с „%s“"
+msgstr "Неуспех при свързване с акаунт „%s“"
#: ../src/common/connection.py:644 ../src/common/connection.py:692
-#, fuzzy, python-format
+#, python-format
msgid "Connection with account %s has been lost. Retry connecting."
-msgstr "Връзката на акаунт „%s“ се разпадна"
+msgstr "Връзката на акаунт „%s“ се разпадна. Опит за повторно свързване."
#: ../src/common/connection.py:666
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
-msgstr ""
+msgstr "Автентичността на сертификата на %s може да е под въпрос."
#: ../src/common/connection.py:669
#, python-format
@@ -4520,6 +4452,8 @@
"\n"
"SSL Error: <b>%s</b>"
msgstr ""
+"\n"
+"Грешка на SSL: <b>%s</b>"
#: ../src/common/connection.py:671
#, python-format
@@ -4527,6 +4461,8 @@
"\n"
"Unknown SSL error: %d"
msgstr ""
+"\n"
+"Неизвестна грешка на SSL: %d"
#: ../src/common/connection.py:712
msgid "Check your connection or try again later"
@@ -4546,7 +4482,7 @@
msgstr "Грешка при премахването на списъка за уединение"
#: ../src/common/connection.py:801
-#, fuzzy, python-format
+#, python-format
msgid ""
"Privacy list %s has not been removed. It is maybe active in one of your "
"connected resources. Deactivate it and try again."
@@ -4554,49 +4490,47 @@
"Списъкът за уединение „%s“ не беше премахнат. Навярно е активен в някой от "
"свързаните ви ресурси. Изключете го и опитайте отново."
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../src/common/connection.py:1095
+#: ../src/common/zeroconf/connection_zeroconf.py:386
msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
+msgstr "Нито отдалеченото присъствие е подписано, нито има зададен ключ."
-#: ../src/common/connection.py:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/connection.py:1097
+#: ../src/common/zeroconf/connection_zeroconf.py:388
#, python-format
msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
+msgstr "Ключът на контакта (%s) не съвпада със зададения в Gajim."
#. we're not english
#. one in locale and one en
-#: ../src/common/connection.py:1105
-#, fuzzy
+#: ../src/common/connection.py:1106
msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr ""
-"[Това съобщение е *шифрирано* (вижте JEP:„27“)]\n"
-"[This message is *encrypted* (See: JEP:`27')]"
+msgstr "[Това съобщение е *шифрирано* (вижте XEP:„27“)]"
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
-#, fuzzy, python-format
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:465
+#, python-format
msgid ""
"Subject: %(subject)s\n"
"%(message)s"
msgstr ""
-"Тема: %s\n"
-"%s"
+"Тема: %(subject)s\n"
+"%(message)s"
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1384
msgid "Not fetched because of invisible status"
msgstr "Не е изтеглен, понеже е в състояние „Невидим“"
#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/gajim.py:979
msgid "Observers"
msgstr "Наблюдатели"
#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../src/disco.py:1350 ../src/gajim.py:806 ../src/roster_window.py:818
+#: ../src/roster_window.py:1470 ../src/roster_window.py:1537
+#: ../src/roster_window.py:1539 ../src/roster_window.py:1676
msgid "Transports"
msgstr "Транспорти"
@@ -4617,17 +4551,17 @@
msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
msgstr ""
"Липсва зависимостта pysqlite2 (също познато и като python-pysqlite2). "
-"Спиране на програмата..."
+"Спиране на програмата…"
#: ../src/common/exceptions.py:47
-#, fuzzy
msgid "Database cannot be read."
-msgstr "Трябва да посочите някакво име на акаунта."
+msgstr "Неуспех при четенето на базата от данни."
#: ../src/common/exceptions.py:55
msgid "Service not available: Gajim is not running, or remote_control is False"
msgstr ""
-"Услугата не е налична: Gajim не е стартиран или „remote_control“ е „False“"
+"Услугата не е налична: Gajim не е стартиран или „remote_control“ е "
+"„Изключена“"
#: ../src/common/exceptions.py:63
msgid "D-Bus is not present on this machine or python module is missing"
@@ -4979,7 +4913,7 @@
#: ../src/common/helpers.py:405
msgid "is composing a message..."
-msgstr "пише съобщение..."
+msgstr "пише съобщение…"
#. paused means he or she was composing but has stopped for a while
#: ../src/common/helpers.py:408
@@ -4991,33 +4925,33 @@
msgstr "затвори прозореца или подпрозореца"
#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
-#, fuzzy, python-format
+#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
-msgstr[0] "Изпращане на съобщение"
-msgstr[1] "Изпращане на съобщение"
+msgstr[0] "%d непрочетено съобщение"
+msgstr[1] "%d непрочетени съобщения"
#: ../src/common/helpers.py:1005
#, python-format
msgid " from room %s"
-msgstr ""
+msgstr " от стая %s"
#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
#, python-format
msgid " from user %s"
-msgstr ""
+msgstr " от потребител %s"
#: ../src/common/helpers.py:1010
#, python-format
msgid " from %s"
-msgstr ""
+msgstr " от %s"
#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d чакащо събитие"
+msgstr[1] "%d чакащи събития"
#: ../src/common/helpers.py:1057
#, python-format
@@ -5045,702 +4979,631 @@
#: ../src/common/pep.py:29
msgid "Afraid"
-msgstr ""
+msgstr "Уплашен"
#: ../src/common/pep.py:30
msgid "Amazed"
-msgstr ""
+msgstr "Изумен"
#: ../src/common/pep.py:31
msgid "Amorous"
-msgstr ""
+msgstr "Страстен"
#: ../src/common/pep.py:32
msgid "Angry"
-msgstr ""
+msgstr "Ядосан"
#: ../src/common/pep.py:33
msgid "Annoyed"
-msgstr ""
+msgstr "Раздразнен"
#: ../src/common/pep.py:34
msgid "Anxious"
-msgstr ""
+msgstr "Обезпокоен"
#: ../src/common/pep.py:35
-#, fuzzy
msgid "Aroused"
-msgstr "Временно преустановен"
+msgstr "Възбуден"
#: ../src/common/pep.py:36
msgid "Ashamed"
-msgstr ""
+msgstr "Засрамен"
#: ../src/common/pep.py:37
-#, fuzzy
msgid "Bored"
-msgstr "Получер"
+msgstr "Отегчен"
#: ../src/common/pep.py:38
-#, fuzzy
msgid "Brave"
-msgstr "имам "
+msgstr "Смел"
#: ../src/common/pep.py:39
msgid "Calm"
-msgstr ""
+msgstr "Спокоен"
#: ../src/common/pep.py:40
-#, fuzzy
msgid "Cautious"
-msgstr "Разговори"
+msgstr "Предпазлив"
#: ../src/common/pep.py:41
-#, fuzzy
msgid "Cold"
-msgstr "Получер"
+msgstr "Бездушен"
#: ../src/common/pep.py:42
-#, fuzzy
msgid "Confident"
-msgstr "_Ръководства"
+msgstr "Уверен"
#: ../src/common/pep.py:43
msgid "Confused"
-msgstr ""
+msgstr "Объркан"
#: ../src/common/pep.py:44
-#, fuzzy
msgid "Contemplative"
-msgstr "Завършил"
+msgstr "Замислен"
#: ../src/common/pep.py:45
-#, fuzzy
msgid "Contented"
-msgstr "_Ръководства"
+msgstr "Спорещ"
#: ../src/common/pep.py:46
msgid "Cranky"
-msgstr ""
+msgstr "Раздразнителен"
#: ../src/common/pep.py:47
msgid "Crazy"
-msgstr ""
+msgstr "Луд"
#: ../src/common/pep.py:48
-#, fuzzy
msgid "Creative"
-msgstr "Изключена"
+msgstr "Съзидателен"
#: ../src/common/pep.py:49
-#, fuzzy
msgid "Curious"
-msgstr "адрес"
+msgstr "Любопитен"
#: ../src/common/pep.py:50
-#, fuzzy
msgid "Dejected"
-msgstr "Изтриване"
+msgstr "Обезсърчен"
#: ../src/common/pep.py:51
msgid "Depressed"
-msgstr ""
+msgstr "Депресиран"
#: ../src/common/pep.py:52
-#, fuzzy
msgid "Disappointed"
-msgstr "Изключени"
+msgstr "Разочарован"
#: ../src/common/pep.py:53
msgid "Disgusted"
-msgstr ""
+msgstr "Отвратен"
#: ../src/common/pep.py:54
-#, fuzzy
msgid "Dismayed"
-msgstr "Изключени"
+msgstr "Уплашен"
#: ../src/common/pep.py:55
-#, fuzzy
msgid "Distracted"
-msgstr "Изключени"
+msgstr "Шашнат"
#: ../src/common/pep.py:56
msgid "Embarrassed"
-msgstr ""
+msgstr "Смутен"
#: ../src/common/pep.py:57
msgid "Envious"
-msgstr ""
+msgstr "Завистлив"
#: ../src/common/pep.py:58
-#, fuzzy
msgid "Excited"
-msgstr "Активирана"
+msgstr "Развълнуван"
#: ../src/common/pep.py:59
msgid "Flirtatious"
-msgstr ""
+msgstr "Склонен към флиртуване"
#: ../src/common/pep.py:60
msgid "Frustrated"
-msgstr ""
+msgstr "Разочарован"
#: ../src/common/pep.py:61
msgid "Grateful"
-msgstr ""
+msgstr "Признателен"
#: ../src/common/pep.py:62
msgid "Grieving"
-msgstr ""
+msgstr "Опечален"
#: ../src/common/pep.py:63
-#, fuzzy
msgid "Grumpy"
-msgstr "Група"
+msgstr "Кисел"
#: ../src/common/pep.py:64
msgid "Guilty"
-msgstr ""
+msgstr "Виновен"
#: ../src/common/pep.py:65
msgid "Happy"
-msgstr ""
+msgstr "Щастлив"
#: ../src/common/pep.py:66
msgid "Hopeful"
-msgstr ""
+msgstr "С надежда"
#: ../src/common/pep.py:67
-#, fuzzy
msgid "Hot"
-msgstr "_Хост:"
+msgstr "Сгорещен"
#: ../src/common/pep.py:68
msgid "Humbled"
-msgstr ""
+msgstr "Скромен"
#: ../src/common/pep.py:69
msgid "Humiliated"
-msgstr ""
+msgstr "Унизен"
#: ../src/common/pep.py:70
msgid "Hungry"
-msgstr ""
+msgstr "Гладен"
#: ../src/common/pep.py:71
msgid "Hurt"
-msgstr ""
+msgstr "Ранен"
#: ../src/common/pep.py:72
-#, fuzzy
msgid "Impressed"
-msgstr "съобщение"
+msgstr "Впечатлен"
#: ../src/common/pep.py:73
msgid "In Awe"
-msgstr ""
+msgstr "Със страхопочитание"
#: ../src/common/pep.py:74
msgid "In Love"
-msgstr ""
+msgstr "Влюбен"
#: ../src/common/pep.py:75
msgid "Indignant"
-msgstr ""
+msgstr "Възмутен"
#: ../src/common/pep.py:76
msgid "Interested"
-msgstr ""
+msgstr "Заинтересуван"
#: ../src/common/pep.py:77
-#, fuzzy
msgid "Intoxicated"
-msgstr "Активирана"
+msgstr "Пиян"
#: ../src/common/pep.py:78
-#, fuzzy
msgid "Invincible"
-msgstr "Невидим"
+msgstr "Непобедим"
#: ../src/common/pep.py:79
msgid "Jealous"
-msgstr ""
+msgstr "Ревнив"
#: ../src/common/pep.py:80
-#, fuzzy
msgid "Lonely"
-msgstr "един"
+msgstr "Самотен"
#: ../src/common/pep.py:81
-#, fuzzy
msgid "Lost"
-msgstr "_Хост:"
+msgstr "Безпомощен"
#: ../src/common/pep.py:82
msgid "Lucky"
-msgstr ""
+msgstr "Късметлия"
#: ../src/common/pep.py:83
-#, fuzzy
msgid "Mean"
-msgstr "немски"
+msgstr "Подъл"
#: ../src/common/pep.py:84
-#, fuzzy
msgid "Moody"
-msgstr "Пром_яна"
+msgstr "Унил"
#: ../src/common/pep.py:85
msgid "Nervous"
-msgstr ""
+msgstr "Нервен"
#: ../src/common/pep.py:86
msgid "Neutral"
-msgstr ""
+msgstr "Безразличен"
#: ../src/common/pep.py:87
-#, fuzzy
msgid "Offended"
-msgstr "Изключен"
+msgstr "Обиден"
#: ../src/common/pep.py:88
msgid "Outraged"
-msgstr ""
+msgstr "Оскърбен"
#: ../src/common/pep.py:89
msgid "Playful"
-msgstr ""
+msgstr "Игрив"
#: ../src/common/pep.py:90
-#, fuzzy
msgid "Proud"
-msgstr "Група"
+msgstr "Горд"
#: ../src/common/pep.py:91
msgid "Relaxed"
-msgstr ""
+msgstr "Отпуснат"
#: ../src/common/pep.py:92
-#, fuzzy
msgid "Relieved"
-msgstr "единадесет"
+msgstr "Облекчен"
#: ../src/common/pep.py:93
msgid "Remorseful"
-msgstr ""
+msgstr "Разкайващ се"
#: ../src/common/pep.py:94
msgid "Restless"
-msgstr ""
+msgstr "Неспокоен"
#: ../src/common/pep.py:95
-#, fuzzy
msgid "Sad"
-msgstr "Блокирал"
+msgstr "Тъжен"
#: ../src/common/pep.py:96
msgid "Sarcastic"
-msgstr ""
+msgstr "Саркастичен"
#: ../src/common/pep.py:97
-#, fuzzy
msgid "Satisfied"
-msgstr "Последно променена:"
+msgstr "Удовлетворен"
#: ../src/common/pep.py:98
msgid "Serious"
-msgstr ""
+msgstr "Сериозен"
#: ../src/common/pep.py:99
msgid "Shocked"
-msgstr ""
+msgstr "Шокиран"
#: ../src/common/pep.py:100
msgid "Shy"
-msgstr ""
+msgstr "Срамежлив"
#: ../src/common/pep.py:101
-#, fuzzy
msgid "Sick"
-msgstr "Псевдоним"
+msgstr "Болен"
#: ../src/common/pep.py:102
-#, fuzzy
msgid "Sleepy"
-msgstr "Спя"
+msgstr "Сънен"
#: ../src/common/pep.py:103
msgid "Spontaneous"
-msgstr ""
+msgstr "Спонтанен"
#: ../src/common/pep.py:104
-#, fuzzy
msgid "Stressed"
-msgstr "Улица:"
+msgstr "Стресиран"
#: ../src/common/pep.py:105
msgid "Strong"
-msgstr ""
+msgstr "Твърд"
#: ../src/common/pep.py:106
-#, fuzzy
msgid "Surprised"
-msgstr "Записан"
+msgstr "Изненадан"
#: ../src/common/pep.py:107
msgid "Thankful"
-msgstr ""
+msgstr "Благодарен"
#: ../src/common/pep.py:108
msgid "Thirsty"
-msgstr ""
+msgstr "Жаден"
#: ../src/common/pep.py:109
-#, fuzzy
msgid "Tired"
-msgstr "Време"
+msgstr "Уморен"
#: ../src/common/pep.py:110
-#, fuzzy
msgid "Undefined"
-msgstr "девет"
+msgstr "Неопределен"
#: ../src/common/pep.py:111
msgid "Weak"
-msgstr ""
+msgstr "Слаб"
#: ../src/common/pep.py:112
msgid "Worried"
-msgstr ""
+msgstr "Обезпокоен"
#: ../src/common/pep.py:115
-#, fuzzy
msgid "Doing Chores"
-msgstr "Грешен хост"
+msgstr "Домакинствам"
#: ../src/common/pep.py:116
msgid "Buying Groceries"
-msgstr ""
+msgstr "Купувам хранителни продукти"
#: ../src/common/pep.py:117
-#, fuzzy
msgid "Cleaning"
-msgstr "Вечер"
+msgstr "Чистя"
#: ../src/common/pep.py:118
-#, fuzzy
msgid "Cooking"
-msgstr "Пише"
+msgstr "Готвя"
#: ../src/common/pep.py:119
msgid "Doing Maintenance"
-msgstr ""
+msgstr "Ремонтирам"
#: ../src/common/pep.py:120
msgid "Doing the Dishes"
-msgstr ""
+msgstr "Мия чиниите"
#: ../src/common/pep.py:121
msgid "Doing the Laundry"
-msgstr ""
+msgstr "Пера"
#: ../src/common/pep.py:122
-#, fuzzy
msgid "Gardening"
-msgstr "Сутрин"
+msgstr "Работя в градината"
#: ../src/common/pep.py:123
msgid "Running an Errand"
-msgstr ""
+msgstr "Изпълнявам поръчка"
#: ../src/common/pep.py:124
-#, fuzzy
msgid "Walking the Dog"
-msgstr "всички в групата"
+msgstr "Разхождам кучето"
#: ../src/common/pep.py:125
-#, fuzzy
msgid "Drinking"
-msgstr "Работя"
+msgstr "Пия"
#: ../src/common/pep.py:126
msgid "Having a Beer"
-msgstr ""
+msgstr "Пия бира"
#: ../src/common/pep.py:127
msgid "Having Coffee"
-msgstr ""
+msgstr "Пия кафе"
#: ../src/common/pep.py:128
msgid "Having Tea"
-msgstr ""
+msgstr "Пия чай"
#: ../src/common/pep.py:130
msgid "Having a Snack"
-msgstr ""
+msgstr "Похапвам"
#: ../src/common/pep.py:131
msgid "Having Breakfast"
-msgstr ""
+msgstr "Закусвам"
#: ../src/common/pep.py:132
msgid "Having Dinner"
-msgstr ""
+msgstr "Вечерям"
#: ../src/common/pep.py:133
msgid "Having Lunch"
-msgstr ""
+msgstr "Обядвам"
#: ../src/common/pep.py:134
msgid "Exercising"
-msgstr ""
+msgstr "Правя упражнения"
#: ../src/common/pep.py:135 ../src/common/pep.py:180
msgid "Cycling"
-msgstr ""
+msgstr "Карам велосипед"
#: ../src/common/pep.py:136
-#, fuzzy
msgid "Dancing"
-msgstr "Вечер"
+msgstr "Танцувам"
#: ../src/common/pep.py:137
-#, fuzzy
msgid "Hiking"
-msgstr "Изритване на %s"
+msgstr "На поход съм"
#: ../src/common/pep.py:138
-#, fuzzy
msgid "Jogging"
-msgstr "_Влизане"
+msgstr "Тичам за здраве"
#: ../src/common/pep.py:139
msgid "Playing Sports"
-msgstr ""
+msgstr "Спортувам"
#: ../src/common/pep.py:140
msgid "Running"
-msgstr ""
+msgstr "Бягам"
#: ../src/common/pep.py:141
-#, fuzzy
msgid "Skiing"
-msgstr "Работя"
+msgstr "Карам ски"
#: ../src/common/pep.py:142
msgid "Swimming"
-msgstr ""
+msgstr "Плувам"
#: ../src/common/pep.py:143
-#, fuzzy
msgid "Working out"
-msgstr "Работя"
+msgstr "Тренирам"
#: ../src/common/pep.py:144
-#, fuzzy
msgid "Grooming"
-msgstr "стая"
+msgstr "Поддържам се"
#: ../src/common/pep.py:145
msgid "At the Spa"
-msgstr ""
+msgstr "В Спа-центъра"
#: ../src/common/pep.py:146
msgid "Brushing Teeth"
-msgstr ""
+msgstr "Мия си зъбите"
#: ../src/common/pep.py:147
msgid "Getting a Haircut"
-msgstr ""
+msgstr "Подстригвам се"
#: ../src/common/pep.py:148
-#, fuzzy
msgid "Shaving"
-msgstr "Хапвам"
+msgstr "Бръсна се"
#: ../src/common/pep.py:149
msgid "Taking a Bath"
-msgstr ""
+msgstr "Във ваната"
#: ../src/common/pep.py:150
msgid "Taking a Shower"
-msgstr ""
+msgstr "Взимам си душ"
#: ../src/common/pep.py:151
msgid "Having an Appointment"
-msgstr ""
+msgstr "На среща"
#: ../src/common/pep.py:153
msgid "Day Off"
-msgstr ""
+msgstr "Почивен ден"
#: ../src/common/pep.py:154
-#, fuzzy
msgid "Hanging out"
-msgstr "Промяна на темата"
+msgstr "Вися си"
#: ../src/common/pep.py:155
-#, fuzzy
msgid "Hiding"
-msgstr "Изритване на %s"
+msgstr "Крия се"
#: ../src/common/pep.py:156
msgid "On Vacation"
-msgstr ""
+msgstr "В отпуск"
#: ../src/common/pep.py:157
-#, fuzzy
msgid "Praying"
-msgstr "Хапвам"
+msgstr "Моля се"
#: ../src/common/pep.py:158
msgid "Scheduled Holiday"
-msgstr ""
+msgstr "Планиран отдих"
#: ../src/common/pep.py:160
-#, fuzzy
msgid "Thinking"
-msgstr "Работя"
+msgstr "Мисля"
#: ../src/common/pep.py:161
msgid "Relaxing"
-msgstr ""
+msgstr "Почивам"
#: ../src/common/pep.py:162
-#, fuzzy
msgid "Fishing"
-msgstr "Изритване на %s"
+msgstr "Ловя риба"
#: ../src/common/pep.py:163
-#, fuzzy
msgid "Gaming"
-msgstr "Хапвам"
+msgstr "Играя"
#: ../src/common/pep.py:164
-#, fuzzy
msgid "Going out"
-msgstr "Изкл_ючване"
+msgstr "Навън съм"
#: ../src/common/pep.py:165
-#, fuzzy
msgid "Partying"
-msgstr "Хапвам"
+msgstr "На купон съм"
#: ../src/common/pep.py:166
-#, fuzzy
msgid "Reading"
-msgstr "Причина"
+msgstr "Чета"
#: ../src/common/pep.py:167
-#, fuzzy
msgid "Rehearsing"
-msgstr "Причина"
+msgstr "Репетирам"
#: ../src/common/pep.py:168
-#, fuzzy
msgid "Shopping"
-msgstr "Спя"
+msgstr "На пазар съм"
#: ../src/common/pep.py:169
-#, fuzzy
msgid "Smoking"
-msgstr "Работя"
+msgstr "Пуша"
#: ../src/common/pep.py:170
msgid "Socializing"
-msgstr ""
+msgstr "Общувам"
#: ../src/common/pep.py:171
-#, fuzzy
msgid "Sunbathing"
-msgstr "Хапвам"
+msgstr "На плаж съм"
#: ../src/common/pep.py:172
msgid "Watching TV"
-msgstr ""
+msgstr "Гледам телевизия"
#: ../src/common/pep.py:173
-#, fuzzy
msgid "Watching a Movie"
-msgstr "Гледам филм."
+msgstr "Гледам филм"
#: ../src/common/pep.py:174
-#, fuzzy
msgid "Talking"
-msgstr "Хапвам"
+msgstr "Разговарям"
#: ../src/common/pep.py:175
msgid "In Real Life"
-msgstr ""
+msgstr "На четири очи"
#: ../src/common/pep.py:176
-#, fuzzy
msgid "On the Phone"
-msgstr "Говоря по телефона."
+msgstr "Говоря по телефона"
#: ../src/common/pep.py:177
msgid "On Video Phone"
-msgstr ""
+msgstr "Говоря по видеотелефона"
#: ../src/common/pep.py:178
-#, fuzzy
msgid "Traveling"
-msgstr "Прехвърляне"
+msgstr "Пътувам"
#: ../src/common/pep.py:179
-#, fuzzy
msgid "Commuting"
-msgstr "Пише"
+msgstr "Пътувам от/до работа"
#: ../src/common/pep.py:181
msgid "Driving"
-msgstr ""
+msgstr "Карам велосипед"
#: ../src/common/pep.py:182
msgid "In a Car"
-msgstr ""
+msgstr "В колата"
#: ../src/common/pep.py:183
msgid "On a Bus"
-msgstr ""
+msgstr "В автобуса"
#: ../src/common/pep.py:184
-#, fuzzy
msgid "On a Plane"
-msgstr "На линия"
+msgstr "В самолета"
#: ../src/common/pep.py:185
-#, fuzzy
msgid "On a Train"
-msgstr "Отваряне като _връзка"
+msgstr "Във влака"
#: ../src/common/pep.py:186
msgid "On a Trip"
-msgstr ""
+msgstr "На екскурзия"
#: ../src/common/pep.py:187
-#, fuzzy
msgid "Walking"
-msgstr "Работя"
+msgstr "Разхождам се"
#: ../src/common/pep.py:189
-#, fuzzy
msgid "Coding"
-msgstr "Пише"
+msgstr "Програмирам"
#: ../src/common/pep.py:190
msgid "In a Meeting"
-msgstr ""
+msgstr "На съвещание"
#: ../src/common/pep.py:191
msgid "Studying"
-msgstr ""
+msgstr "Уча"
#: ../src/common/pep.py:192
-#, fuzzy
msgid "Writing"
-msgstr "Работя"
+msgstr "Пиша"
#. We cannot bind port, call error callback and fail
#: ../src/common/socks5.py:84
@@ -5762,6 +5625,8 @@
"[This is part of an encrypted session. If you see this message, something "
"went wrong.]"
msgstr ""
+"[Това е част от шифрирана сесия. Ако виждате това съобщение, нещо не е както "
+"трябва.]"
#: ../src/common/zeroconf/client_zeroconf.py:408
msgid ""
@@ -5771,12 +5636,12 @@
"при изпращането на данните."
#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
-#, fuzzy, python-format
+#, python-format
msgid ""
"The host %s you configured as the ft_add_hosts_to_send advanced option is "
"not valid, so ignored."
msgstr ""
-"Хостът, който сте конфигурирали в опцията „ft_override_host_to_send“ не е "
+"Хостът „%s“, който сте конфигурирали в опцията „ft_add_hosts_to_send“, не е "
"валиден, така че се пренебрегва."
#: ../src/common/zeroconf/connection_zeroconf.py:215
@@ -5787,7 +5652,7 @@
#: ../src/common/zeroconf/connection_zeroconf.py:238
msgid "Avahi error"
-msgstr "Грешка в Avahi"
+msgstr "Грешка на Avahi"
#: ../src/common/zeroconf/connection_zeroconf.py:238
#, python-format
@@ -5800,9 +5665,8 @@
"функционира правилно."
#: ../src/common/zeroconf/connection_zeroconf.py:249
-#, fuzzy
msgid "Please check if Avahi or Bonjour is installed."
-msgstr "Проверете дали Avahi е инсталиран."
+msgstr "Проверете дали Avahi или Bonjour е инсталиран."
#: ../src/common/zeroconf/connection_zeroconf.py:258
#: ../src/common/zeroconf/connection_zeroconf.py:262
@@ -5824,7 +5688,7 @@
msgid "Could not change status of account \"%s\""
msgstr "Неуспех при промяната на състоянието на акаунт „%s“"
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:379
msgid ""
"You are not connected or not visible to others. Your message could not be "
"sent."
@@ -5833,17 +5697,16 @@
"изпратено."
#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:396
msgid "[This message is encrypted]"
msgstr "[Това съобщение е шифрирано]"
-#: ../src/common/zeroconf/connection_zeroconf.py:457
-#, fuzzy
+#: ../src/common/zeroconf/connection_zeroconf.py:477
msgid "Your message could not be sent."
-msgstr "Контактът е изключен. Съобщението ви не можа да бъде изпратено."
+msgstr "Съобщението ви не можа да бъде изпратено."
#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:484
msgid "Contact is offline. Your message could not be sent."
msgstr "Контактът е изключен. Съобщението ви не можа да бъде изпратено."
@@ -5866,25 +5729,22 @@
msgstr "Събитие"
#: ../src/config.py:405
-#, fuzzy
msgid "Default Message"
-msgstr "Стандартни съобщения за състояние"
+msgstr "Стандартно съобщение"
#: ../src/config.py:412
-#, fuzzy
msgid "Enabled"
-msgstr "Активиране"
+msgstr "Включено"
#: ../src/config.py:454
msgid "Always use OS/X default applications"
msgstr ""
#: ../src/config.py:455
-#, fuzzy
msgid "Custom"
-msgstr "<b>Персонални</b>"
+msgstr "Персонални"
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:650 ../src/dialogs.py:1200
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "Няма наличен речник за %s език"
@@ -5911,14 +5771,12 @@
msgstr "Първо получено съобщение"
#: ../src/config.py:1054
-#, fuzzy
msgid "Next Message Received Focused"
-msgstr "Следващо получено съобщение"
+msgstr "Следващо получено съобщение в прозорец на фокус"
#: ../src/config.py:1056
-#, fuzzy
msgid "Next Message Received Unfocused"
-msgstr "Следващо получено съобщение"
+msgstr "Следващо получено съобщение в прозорец без фокус"
#: ../src/config.py:1057
msgid "Contact Connected"
@@ -5945,8 +5803,8 @@
msgstr "Получена поща от Gmail"
#. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/config.py:1319 ../src/dialogs.py:1824 ../src/dialogs.py:1888
+#: ../src/disco.py:770 ../src/disco.py:1564 ../src/disco.py:1811
#: ../src/history_window.py:87
msgid "Name"
msgstr "Име"
@@ -6020,14 +5878,13 @@
msgstr "Името на акаунта не може да съдържа интервали."
#: ../src/config.py:1800
-#, fuzzy
msgid "Rename Account"
-msgstr "Управление на акаунти"
+msgstr "Преименуване на акаунт"
#: ../src/config.py:1801
-#, fuzzy, python-format
+#, python-format
msgid "Enter a new name for account %s"
-msgstr "Въведете ново име за група „%s“"
+msgstr "Въведете ново име за акаунт „%s“"
#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
#: ../src/config.py:3089 ../src/dataforms_widget.py:536
@@ -6056,11 +5913,11 @@
#: ../src/config.py:2076
msgid "OpenPGP Key Selection"
-msgstr "Избор на OpenPGP ключ"
+msgstr "Избор на ключ на OpenPGP"
#: ../src/config.py:2077
msgid "Choose your OpenPGP key"
-msgstr "Изберете вашия OpenPGP ключ"
+msgstr "Изберете вашия ключ на OpenPGP"
#: ../src/config.py:2088
msgid "No such account available"
@@ -6071,8 +5928,8 @@
msgstr ""
"Трябва първо да създадете акаунт и след това да редактирате личните данни."
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../src/config.py:2096 ../src/dialogs.py:1676 ../src/dialogs.py:1812
+#: ../src/dialogs.py:1991 ../src/disco.py:439 ../src/profile_window.py:320
msgid "You are not connected to the server"
msgstr "Не сте свързани към сървъра."
@@ -6127,7 +5984,7 @@
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2407 ../src/disco.py:777 ../src/history_manager.py:184
msgid "JID"
msgstr "JID"
@@ -6145,7 +6002,7 @@
#: ../src/config.py:2449
msgid "Banning..."
-msgstr "Отлъчване..."
+msgstr "Отлъчване…"
#. You can move '\n' before user@domain if that line is TOO BIG
#: ../src/config.py:2451
@@ -6158,7 +6015,7 @@
#: ../src/config.py:2453
msgid "Adding Member..."
-msgstr "Добавяне на член..."
+msgstr "Добавяне на член…"
#: ../src/config.py:2454
msgid ""
@@ -6170,7 +6027,7 @@
#: ../src/config.py:2456
msgid "Adding Owner..."
-msgstr "Добавяне на собственик..."
+msgstr "Добавяне на собственик…"
#: ../src/config.py:2457
msgid ""
@@ -6182,7 +6039,7 @@
#: ../src/config.py:2459
msgid "Adding Administrator..."
-msgstr "Добавяне на администратор..."
+msgstr "Добавяне на администратор…"
#: ../src/config.py:2460
msgid ""
@@ -6213,16 +6070,16 @@
msgid "Removing %s account"
msgstr "Премахване на акаунт „%s“"
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2580 ../src/gajim.py:1428 ../src/roster_window.py:1942
msgid "Password Required"
msgstr "Необходима е парола"
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2581 ../src/roster_window.py:1916
#, python-format
msgid "Enter your password for account %s"
msgstr "Въведете парола за акаунт „%s“"
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2582 ../src/roster_window.py:1943
msgid "Save password"
msgstr "Запазване на паролата"
@@ -6294,24 +6151,22 @@
"или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
#: ../src/config.py:3137
-#, fuzzy
msgid "Invalid server"
-msgstr "Невалидно потребителско име"
+msgstr "Невалиден сървър"
#: ../src/config.py:3138
-#, fuzzy
msgid "Please provide a server on which you want to register."
-msgstr "Въведете новия псевдоним, който искате да използвате:"
+msgstr "Задайте сървър, където искате да се регистрирате."
-#: ../src/config.py:3189 ../src/gajim.py:1996
-#, fuzzy
+#: ../src/config.py:3189 ../src/gajim.py:2006
msgid "Certificate Already in File"
-msgstr "Контактът вече е в списъка"
+msgstr "Сертификатът вече е във файла"
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../src/config.py:3190 ../src/gajim.py:2007
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr ""
+"Този сертификат вече е във файла „%s“, така че няма да бъде добавен наново."
#: ../src/config.py:3258
#, python-format
@@ -6322,14 +6177,22 @@
"SSL Error: %(error)s\n"
"Do you still want to connect to this server?"
msgstr ""
+"<b>Предупреждение за сигурността</b>\n"
+"\n"
+"Автентичността на сертификата на %(hostname)s е под въпрос.\n"
+"Грешка на SSL: %(error)s\n"
+"Все още ли искате да се свържете с този сървър?"
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3264 ../src/gajim.py:2030
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
"SHA1 fingerprint of the certificate:\n"
"%s"
msgstr ""
+"Добавяне на този сертификат към списъка с доверени сертификати.\n"
+"Отпечатък тип SHA1 на сертификата:\n"
+"%s"
#: ../src/config.py:3287 ../src/config.py:3326
msgid "An error occurred during account creation"
@@ -6353,15 +6216,17 @@
"been received by the remote end. If this icon stays\n"
"for a long time, it's likely the message got lost."
msgstr ""
+"Тази икона показва, че съобщението все още не е\n"
+"получено от отсрещния контакт. Ако иконата остане\n"
+"дълго време, най-вероятно съобщението е било изгубено."
#: ../src/conversation_textview.py:568
-#, fuzzy
msgid ""
"Text below this line is what has been said since the\n"
"last time you paid attention to this group chat"
msgstr ""
-"Текстът под този ред е последното, което е казано откакто за последен път "
-"сте обърнали внимание на тази стая"
+"Текстът под този ред е последното, което е казано откакто\n"
+"за последен път сте обърнали внимание на тази стая"
#: ../src/conversation_textview.py:678
#, python-format
@@ -6395,46 +6260,45 @@
msgid "Open as _Link"
msgstr "Отваряне като _връзка"
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#: ../src/conversation_textview.py:978 ../src/conversation_textview.py:996
#, python-format
msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
+msgstr "Грешка при изпълнение на „%(command)s“: %(error)s"
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1248
msgid "Yesterday"
msgstr "Вчера"
#. the number is >= 2
#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1252
#, python-format
msgid "%i days ago"
msgstr "Преди %i дни"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1286
#, python-format
msgid "Subject: %s\n"
msgstr "Тема: %s\n"
#: ../src/dataforms_widget.py:540
-#, fuzzy
msgid "Jabber ID already in list"
-msgstr "Джабър клиент за бързи съобщения"
+msgstr "В списъка вече има такъв Jabber ID"
#: ../src/dataforms_widget.py:541
msgid "The Jabber ID you entered is already in the list. Choose another one."
-msgstr ""
+msgstr "Въведеният Jabber ID вече съществува в списъка. Изберете друг."
#. Default jid
#: ../src/dataforms_widget.py:552
msgid "new(a)jabber.id"
-msgstr ""
+msgstr "new(a)jabber.id"
#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
#, python-format
msgid "new%d(a)jabber.id"
-msgstr ""
+msgstr "new%d(a)jabber.id"
#: ../src/dialogs.py:75
#, python-format
@@ -6463,235 +6327,228 @@
msgstr "Име на контакта"
#: ../src/dialogs.py:461
-#, fuzzy
msgid "Set Mood"
-msgstr "Настройване на MOTD"
+msgstr "Задаване на настроение"
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:549
#, python-format
msgid "%s Status Message"
msgstr "Съобщение за състояние „%s“"
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:551
msgid "Status Message"
msgstr "Съобщение за състояние"
-#: ../src/dialogs.py:672
-#, fuzzy
+#: ../src/dialogs.py:663
msgid "Overwrite Status Message?"
-msgstr "Съобщение за състояние"
+msgstr "Презаписване на съобщението за състояние?"
-#: ../src/dialogs.py:673
-#, fuzzy
+#: ../src/dialogs.py:664
msgid ""
"This name is already used. Do you want to overwrite this status message?"
-msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
+msgstr ""
+"Това име вече се използва. Искате ли да презапишете това съобщение за "
+"състояние?"
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:673
msgid "Save as Preset Status Message"
msgstr "Запазване като настроено съобщение за състояние"
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:674
msgid "Please type a name for this status message"
msgstr "Напишете име за това съобщение за състояние"
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:680
msgid "AIM Address:"
msgstr "Адрес на AIM:"
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:681
msgid "GG Number:"
msgstr "Номер на GG:"
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:682
msgid "ICQ Number:"
msgstr "Номер на ICQ:"
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:683
msgid "MSN Address:"
msgstr "Адрес на MSN:"
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:684
msgid "Yahoo! Address:"
msgstr "Адрес на Yahoo!:"
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:720
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr ""
"Попълнете данните за контакта, който искате да добавите към акаунт „%s“"
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:722
msgid "Please fill in the data of the contact you want to add"
msgstr "Попълнете данните за контакта, който искате да добавите"
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:879 ../src/dialogs.py:885 ../src/dialogs.py:890
msgid "Invalid User ID"
msgstr "Невалиден идентификатор"
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:886
msgid "The user ID must not contain a resource."
msgstr "Потребителският идентификатор не трябва да съдържа ресурс."
-#: ../src/dialogs.py:900
-#, fuzzy
+#: ../src/dialogs.py:891
msgid "You cannot add yourself to your roster."
-msgstr ""
-"Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
-"roster."
+msgstr "Не може да добавите себе си към списъка."
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:905
msgid "Contact already in roster"
msgstr "Контактът вече е в списъка"
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:906
msgid "This contact is already listed in your roster."
msgstr "Контактът вече съществува в списъка."
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:942
msgid "User ID:"
msgstr "Идентификатор на потребител:"
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:1000
msgid "A GTK+ jabber client"
-msgstr "GTK+ Джабър клиент"
+msgstr "Джабър клиент за GTK+"
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1001
msgid "GTK+ Version:"
msgstr "Версия на GTK+:"
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1002
msgid "PyGTK Version:"
msgstr "Версия на PyGTK:"
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1012
msgid "Current Developers:"
msgstr "Текущи разработчици:"
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1014
msgid "Past Developers:"
msgstr "Бивши разработчици:"
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1020
msgid "THANKS:"
msgstr "БЛАГОДАРНОСТИ:"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1026
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:1048
+#: ../src/dialogs.py:1039
msgid "translator-credits"
msgstr ""
-"Явор Доганов <yavor(a)doganov.org>\n"
+"Явор Доганов <yavor(a)gnu.org>\n"
"\n"
"Проектът за превод на GNOME има нужда от подкрепа.\n"
"Научете повече за нас на http://gnome.cult.bg\n"
"Докладвайте за грешки на http://gnome.cult.bg/bugs"
-#: ../src/dialogs.py:1210
-#, fuzzy, python-format
+#: ../src/dialogs.py:1201
+#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
"language by setting the speller_language option.\n"
"\n"
"Highlighting misspelled words feature will not be used"
msgstr ""
-"За да използвате проверката за правопис, трябва да инсталирате %s речник или "
-"да изберете друг език чрез настройването на опцията „speller_language“."
+"За да използвате проверката за правопис, трябва да инсталирате речник за %s "
+"или да изберете друг език чрез настройването на опцията „speller_language“.\n"
+"\n"
+"Функционалността за осветяване на сгрешени думи ще е изключена"
-#: ../src/dialogs.py:1614
-#, fuzzy, python-format
+#: ../src/dialogs.py:1605
+#, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
-msgstr "Искане за записване за акаунт „%s“ от %s"
+msgstr "Искане за записване за акаунт „%(account)s“ от %(jid)s"
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1608
#, python-format
msgid "Subscription request from %s"
msgstr "Искане за записване от %s"
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1669 ../src/gajim.py:2627
#, python-format
msgid "You are already in group chat %s"
msgstr "Вече сте в стая „%s“"
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1677
msgid "You can not join a group chat unless you are connected."
msgstr "Трябва да сте свързани, за да влезете в стая."
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1696
#, python-format
msgid "Join Group Chat with account %s"
msgstr "Влизане в стая с акаунт „%s“"
-#: ../src/dialogs.py:1776
-#, fuzzy
+#: ../src/dialogs.py:1767
msgid "Invalid Nickname"
-msgstr "Невалидно потребителско име"
+msgstr "Невалиден псевдоним"
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/dialogs.py:1768 ../src/groupchat_control.py:1453
#: ../src/groupchat_control.py:1734
-#, fuzzy
msgid "The nickname has not allowed characters."
-msgstr "Jabber ID на стаята съдържа непозволени знаци."
+msgstr "Псевдонимът съдържа непозволени знаци."
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
#: ../src/groupchat_control.py:1901
msgid "Invalid group chat Jabber ID"
msgstr "Невалиден Jabber ID на стая"
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/dialogs.py:1773 ../src/dialogs.py:1779
#: ../src/groupchat_control.py:1902
msgid "The group chat Jabber ID has not allowed characters."
msgstr "Jabber ID на стаята съдържа непозволени знаци."
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:1785
msgid "This is not a group chat"
msgstr "Това не е стая"
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:1786
#, python-format
msgid "%s is not the name of a group chat."
msgstr "%s не е име на стая."
-#: ../src/dialogs.py:1822
-#, fuzzy
+#: ../src/dialogs.py:1813
msgid "Without a connection, you can not synchronise your contacts."
-msgstr "Трябва да сте свързани, за да променяте паролата."
+msgstr "Трябва да сте свързани, за да синхронизирате контактите си."
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:1827
msgid "Server"
msgstr "Сървър"
-#: ../src/dialogs.py:1869
-#, fuzzy
+#: ../src/dialogs.py:1860
msgid "This account is not connected to the server"
-msgstr "Акаунт „%s“ е свързан към сървъра"
+msgstr "Този акаунт не е свързан към сървъра"
-#: ../src/dialogs.py:1870
-#, fuzzy
+#: ../src/dialogs.py:1861
msgid "You cannot synchronize with an account unless it is connected."
-msgstr "Трябва да сте свързани, за да влезете в стая."
+msgstr "Не може да се синхронизирате с акаунт, ако не е свързан."
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:1885
msgid "Synchronise"
-msgstr ""
+msgstr "Синхронизиране"
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:1943
#, python-format
msgid "Start Chat with account %s"
msgstr "Започване на разговор с акаунт „%s“"
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:1945
msgid "Start Chat"
msgstr "Започване на разговор"
-#: ../src/dialogs.py:1955
+#: ../src/dialogs.py:1946
msgid ""
"Fill in the nickname or the Jabber ID of the contact you would like\n"
"to send a chat message to:"
@@ -6700,315 +6557,318 @@
"искате да изпратите съобщение:"
#. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
msgid "Connection not available"
msgstr "В момента няма връзка"
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
-#: ../src/normal_control.py:641
+#: ../src/dialogs.py:1971 ../src/dialogs.py:2346 ../src/dialogs.py:2489
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "Уверете се, че сте свързани към „%s“."
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:1980 ../src/dialogs.py:1983
msgid "Invalid JID"
msgstr "Невалиден JID"
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:1983
#, python-format
msgid "Unable to parse \"%s\"."
msgstr "Неуспех при анализирането на „%s“."
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:1992
msgid "Without a connection, you can not change your password."
msgstr "Трябва да сте свързани, за да променяте паролата."
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2011
msgid "Invalid password"
msgstr "Невалидна парола"
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2011
msgid "You must enter a password."
msgstr "Трябва да въведете парола."
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2015
msgid "Passwords do not match"
msgstr "Паролите не съвпадат"
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2016
msgid "The passwords typed in both fields must be identical."
msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
#. img to display
#. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/dialogs.py:2056 ../src/notify.py:245 ../src/notify.py:472
#: ../src/osx/growler.py:12
msgid "Contact Signed In"
msgstr "Включи се контакт"
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/dialogs.py:2058 ../src/notify.py:253 ../src/notify.py:474
#: ../src/osx/growler.py:12
msgid "Contact Signed Out"
msgstr "Изключи се контакт"
#. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/dialogs.py:2060 ../src/notify.py:276 ../src/notify.py:476
#: ../src/osx/growler.py:12
msgid "New Message"
msgstr "Ново съобщение"
#. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/dialogs.py:2060 ../src/notify.py:257 ../src/notify.py:476
#: ../src/osx/growler.py:13
msgid "New Single Message"
msgstr "Ново еднократно съобщение"
#. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/dialogs.py:2061 ../src/notify.py:264 ../src/notify.py:477
#: ../src/osx/growler.py:13
msgid "New Private Message"
msgstr "Ново лично съобщение"
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
+#: ../src/dialogs.py:2061 ../src/gajim.py:1593 ../src/notify.py:485
#: ../src/osx/growler.py:13
msgid "New E-mail"
msgstr "Нова е-поща"
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
+#: ../src/dialogs.py:2063 ../src/gajim.py:1659 ../src/notify.py:479
#: ../src/osx/growler.py:14
msgid "File Transfer Request"
msgstr "Запитване за файлов трансфер"
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2065 ../src/gajim.py:1559 ../src/gajim.py:1626
+#: ../src/notify.py:481 ../src/osx/growler.py:14
msgid "File Transfer Error"
msgstr "Грешка при файловия трансфер"
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2067 ../src/gajim.py:1701 ../src/gajim.py:1723
+#: ../src/gajim.py:1740 ../src/notify.py:483 ../src/osx/growler.py:15
msgid "File Transfer Completed"
msgstr "Файловият трансфер е приключен"
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
+#: ../src/dialogs.py:2068 ../src/gajim.py:1704 ../src/notify.py:483
#: ../src/osx/growler.py:15
msgid "File Transfer Stopped"
msgstr "Файловият трансфер е преустановен"
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
+#: ../src/dialogs.py:2070 ../src/gajim.py:1449 ../src/notify.py:487
#: ../src/osx/growler.py:16
msgid "Groupchat Invitation"
msgstr "Покана за разговор в стая"
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/dialogs.py:2072 ../src/notify.py:237 ../src/notify.py:489
#: ../src/osx/growler.py:16
msgid "Contact Changed Status"
msgstr "Контактът промени състоянието си"
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2264
#, python-format
msgid "Single Message using account %s"
msgstr "Еднократно съобщение с акаунт „%s“"
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2266
#, python-format
msgid "Single Message in account %s"
msgstr "Еднократно съобщение за акаунт „%s“"
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2268
msgid "Single Message"
msgstr "Еднократно съобщение"
#. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2271
#, python-format
msgid "Send %s"
msgstr "Изпращане на %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2294
#, python-format
msgid "Received %s"
msgstr "Получено %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
-#, fuzzy, python-format
+#: ../src/dialogs.py:2317
+#, python-format
msgid "Form %s"
-msgstr "%s"
+msgstr "От %s"
#. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2389
#, python-format
msgid "RE: %s"
msgstr "Относно: %s"
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2390
#, python-format
msgid "%s wrote:\n"
msgstr "%s написа:\n"
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2434
#, python-format
msgid "XML Console for %s"
msgstr "XML конзола за %s"
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2436
msgid "XML Console"
msgstr "XML конзола"
-#: ../src/dialogs.py:2568
+#: ../src/dialogs.py:2560
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "Филтър за уединение <b><i>%s</i></b>"
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2564
#, python-format
msgid "Privacy List for %s"
msgstr "Филтър за уединение за %s"
-#: ../src/dialogs.py:2628
-#, fuzzy, python-format
+#: ../src/dialogs.py:2620
+#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
-msgstr "Ред: %s, действие: %s, вид: %s, стойност: %s"
+msgstr ""
+"Ред: %(order)s, действие: %(action)s, вид: %(type)s, стойност: %(value)s"
-#: ../src/dialogs.py:2633
-#, fuzzy, python-format
+#: ../src/dialogs.py:2625
+#, python-format
msgid "Order: %(order)s, action: %(action)s"
-msgstr "Ред: %s, действие: %s"
+msgstr "Ред: %(order)s, действие: %(action)s"
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:2667
msgid "<b>Edit a rule</b>"
msgstr "<b>Редактиране на правило</b>"
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:2754
msgid "<b>Add a rule</b>"
msgstr "<b>Добавяне на правило</b>"
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:2850
#, python-format
msgid "Privacy Lists for %s"
msgstr "Филтри за уединение за %s"
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:2852
msgid "Privacy Lists"
msgstr "Филтри за уединение"
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:2922
msgid "Invalid List Name"
msgstr "Невалидно име на филтър"
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:2923
msgid "You must enter a name to create a privacy list."
msgstr "Трябва да въведете име, за да се създаде филтър за уединение."
-#: ../src/dialogs.py:2963
-#, fuzzy
+#: ../src/dialogs.py:2955
msgid "You are invited to a groupchat"
-msgstr "Не сте влезли в стая."
+msgstr "Поканени сте в стая."
-#: ../src/dialogs.py:2966
-#, fuzzy
+#: ../src/dialogs.py:2958
msgid "$Contact has invited you to join a discussion"
-msgstr "$Contact ви покани в стая %(room_jid)s."
+msgstr "$Contact ви покани да се присъедините към дискусия"
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:2960
#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr "$Contact ви покани в стая %(room_jid)s."
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:2968
#, python-format
msgid "Comment: %s"
msgstr "Коментар: %s"
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:2970
msgid "Do you want to accept the invitation?"
-msgstr ""
+msgstr "Искате ли да приемете поканата?"
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3025
msgid "Choose Sound"
msgstr "Избор на звук"
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3035 ../src/dialogs.py:3086
msgid "All files"
msgstr "Всички файлове"
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3040
msgid "Wav Sounds"
msgstr "Формат WAV"
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3073
msgid "Choose Image"
msgstr "Избор на изображение"
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3091
msgid "Images"
msgstr "Изображения"
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3156
#, python-format
msgid "When %s becomes:"
msgstr "Когато %s стане:"
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3158
#, python-format
msgid "Adding Special Notification for %s"
msgstr "Добавяне на специално уведомление за %s"
#. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3229
msgid "#"
msgstr "№"
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3235
msgid "Condition"
msgstr "Условие"
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3353
msgid "when I am "
msgstr "когато съм "
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:3828
#, python-format
msgid ""
"Your chat session with <b>%(jid)s</b> is encrypted.\n"
"\n"
"This session's Short Authentication String is <b>%(sas)s</b>."
msgstr ""
+"Сесията ви с <b>%(jid)s</b> е шифрирана.\n"
+"\n"
+"Краткият удостоверителен низ (SAS) на сесията е <b>%(sas)s</b>."
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:3832
msgid "You have already verified this contact's identity."
-msgstr ""
+msgstr "Вече се проверили идентичността на този контакт."
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:3838 ../src/dialogs.py:3925
msgid "Contact's identity verified"
-msgstr ""
+msgstr "Идентичността на контакта проверена"
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:3846
msgid "Verify again..."
-msgstr ""
+msgstr "Проверка наново…"
-#: ../src/dialogs.py:3859
+#: ../src/dialogs.py:3851
msgid ""
"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 ""
+"За да се сигурни, че <b>само</b> очакваният човек може да чете ваши "
+"съобщения или да ви изпраща такива, е необходимо да проверите идентичността "
+"му като натиснете бутона по-долу."
-#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:3854 ../src/dialogs.py:3906 ../src/dialogs.py:3919
msgid "Contact's identity NOT verified"
-msgstr ""
+msgstr "Идентичността на контакта НЕ Е проверена"
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:3861
msgid "Verify..."
-msgstr ""
+msgstr "Проверка…"
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:3873
msgid "Have you verified the contact's identity?"
-msgstr ""
+msgstr "Проверихте ли идентичността на контакта?"
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:3874
#, python-format
msgid ""
"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7017,31 +6877,43 @@
"\n"
"This session's Short Authentication String is <b>%(sas)s</b>."
msgstr ""
+"За да избегнете разговор с непознат човек, трябва да говорите с <b>%(jid)s</"
+"b> директно (лично или по телефона) и да проверите дали вижда същия Кратък "
+"удостоверителен низ (SAS) като вас.\n"
+"\n"
+"Краткият удостоверителен низ на тази сесия е <b>%(sas)s</b>."
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:3875
msgid "Did you talk to the remote contact and verify the SAS?"
-msgstr ""
+msgstr "Говорихте ли с отдалечение контакт за проверка на SAS?"
-#: ../src/dialogs.py:3915
+#: ../src/dialogs.py:3907
#, python-format
msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
-msgstr ""
+msgstr "Ключът на контакта (%s) <b>не съвпада</b> с този, зададен в Gajim."
-#: ../src/dialogs.py:3921
+#: ../src/dialogs.py:3913
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
msgstr ""
+"Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
+"съобщения."
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:3920
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 ""
+"Има зададен ключ на GPG за този контакт, но <b>вие не му се доверявате</b>, "
+"така че съобщенията <b>не могат</b> да се шифрират. За да се доверите на "
+"този ключ, използвайте клиент на GPG."
-#: ../src/dialogs.py:3934
+#: ../src/dialogs.py:3926
msgid ""
"GPG Key is assigned to this contact, and you trust his key, so messages will "
"be encrypted."
msgstr ""
+"Има зададен ключ на GPG за този контакт и вие му се доверявате, така че "
+"съобщенията ще бъдат шифрирани."
#: ../src/disco.py:116
msgid "Others"
@@ -7077,7 +6949,7 @@
"Няма услуга на въведения адрес или не отговаря. Проверете адреса и опитайте "
"отново."
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:661 ../src/disco.py:957
msgid "The service is not browsable"
msgstr "Услугата не е достъпна"
@@ -7086,97 +6958,97 @@
msgstr "Този вид услуга не съдържа обекти за показване."
#: ../src/disco.py:699 ../src/disco.py:709
-#, fuzzy
msgid "Invalid Server Name"
-msgstr "Невалидно потребителско име"
+msgstr "Невалидно име на сървър"
-#: ../src/disco.py:754
-#, fuzzy, python-format
+#: ../src/disco.py:756
+#, python-format
msgid "Browsing %(address)s using account %(account)s"
-msgstr "Търсене в %s от акаунт „%s“"
+msgstr "Търсене в %(address)s от акаунт „%(account)s“"
-#: ../src/disco.py:794
+#: ../src/disco.py:796
msgid "_Browse"
msgstr "_Търсене"
-#: ../src/disco.py:956
+#: ../src/disco.py:958
msgid "This service does not contain any items to browse."
msgstr "Тази услуга не съдържа обекти за показване."
-#: ../src/disco.py:1179
-#, fuzzy
+#: ../src/disco.py:1181
msgid "_Execute Command"
-msgstr "_Изпълнение на команда..."
+msgstr "_Изпълнение на команда"
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1191 ../src/disco.py:1355
msgid "Re_gister"
msgstr "_Регистриране"
-#: ../src/disco.py:1390
-#, fuzzy, python-format
+#: ../src/disco.py:1392
+#, python-format
msgid "Scanning %(current)d / %(total)d.."
-msgstr "Сканиране на %d / %d.."
+msgstr "Сканиране на %(current)d / %(total)d…"
#. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1574
msgid "Users"
msgstr "Потребители"
#. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1582
msgid "Description"
msgstr "Описание"
#. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1590
msgid "Id"
msgstr "Идентификатор"
-#: ../src/disco.py:1818
+#: ../src/disco.py:1820
msgid "Subscribed"
msgstr "Записан"
-#: ../src/disco.py:1826
-#, fuzzy
+#: ../src/disco.py:1828
msgid "Node"
-msgstr "Няма"
+msgstr "Възел"
-#: ../src/disco.py:1883
+#: ../src/disco.py:1885
msgid "New post"
msgstr "Ново съобщение"
-#: ../src/disco.py:1889
+#: ../src/disco.py:1891
msgid "_Subscribe"
msgstr "_Записване"
-#: ../src/disco.py:1895
+#: ../src/disco.py:1897
msgid "_Unsubscribe"
msgstr "_Отписване"
#: ../src/features_window.py:51
msgid "PyOpenSSL"
-msgstr ""
+msgstr "PyOpenSSL"
#: ../src/features_window.py:52
msgid ""
"A library used to validate server certificates to ensure a secure connection."
msgstr ""
+"Библиотека за проверка на валидността на сертификатите на сървърите. "
+"Използва се за установяване на сигурна връзка."
#: ../src/features_window.py:53 ../src/features_window.py:54
msgid "Requires python-pyopenssl."
-msgstr ""
+msgstr "Изисква python-pyopenssl."
#: ../src/features_window.py:55
msgid "Bonjour / Zeroconf"
-msgstr ""
+msgstr "Bonjour / Zeroconf"
#: ../src/features_window.py:56
msgid "Serverless chatting with autodetected clients in a local network."
msgstr ""
+"Разговори с автоматично открити контакти в локалната мрежа (без сървър)."
#: ../src/features_window.py:57
msgid "Requires python-avahi."
-msgstr ""
+msgstr "Изисква python-avahi."
#: ../src/features_window.py:58
msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
@@ -7184,15 +7056,15 @@
#: ../src/features_window.py:59
msgid "gajim-remote"
-msgstr ""
+msgstr "gajim-remote"
#: ../src/features_window.py:60
msgid "A script to control Gajim via commandline."
-msgstr ""
+msgstr "Скрипт за управление на Gajim от командния ред."
#: ../src/features_window.py:61
msgid "Requires python-dbus."
-msgstr ""
+msgstr "Изисква python-dbus."
#: ../src/features_window.py:62 ../src/features_window.py:66
#: ../src/features_window.py:70 ../src/features_window.py:74
@@ -7202,67 +7074,65 @@
msgstr ""
#: ../src/features_window.py:63
-#, fuzzy
msgid "OpenGPG"
-msgstr "OpenPGP: "
+msgstr "OpenGPG"
#: ../src/features_window.py:64
msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+msgstr "Шифриране на съобщения с ключове на GPG."
#: ../src/features_window.py:65
msgid "Requires gpg and python-GnuPGInterface."
-msgstr ""
+msgstr "Изисква gpg и python-GnuPGInterface."
#: ../src/features_window.py:67
-#, fuzzy
msgid "network-manager"
-msgstr "Мениджър на историята"
+msgstr "network-manager"
#: ../src/features_window.py:68
msgid "Autodetection of network status."
-msgstr ""
+msgstr "Автоматично засичане на състоянието на мрежата."
#: ../src/features_window.py:69
msgid "Requires gnome-network-manager and python-dbus."
-msgstr ""
+msgstr "Изисква gnome-network-manager и python-dbus."
#: ../src/features_window.py:71
-#, fuzzy
msgid "Session Management"
-msgstr "Изпратено съобщение"
+msgstr "Управление на сесии"
#: ../src/features_window.py:72
msgid "Gajim session is stored on logout and restored on login."
-msgstr ""
+msgstr "Запазва сесията на Gajim при излизане и я възстановява при влизане."
#: ../src/features_window.py:73
msgid "Requires python-gnome2."
-msgstr ""
+msgstr "Изисква python-gnome2."
#: ../src/features_window.py:75
msgid "gnome-keyring"
-msgstr ""
+msgstr "gnome-keyring"
#: ../src/features_window.py:76
msgid "Passwords can be stored securely and not just in plaintext."
msgstr ""
+"Паролите могат да се съхраняват по сигурен начин, вместо в обикновен текст."
#: ../src/features_window.py:77
msgid "Requires gnome-keyring and python-gnome2-desktop."
-msgstr ""
+msgstr "Изисква gnome-keyring и python-gnome2-desktop."
#: ../src/features_window.py:79
msgid "SRV"
-msgstr ""
+msgstr "SRV"
#: ../src/features_window.py:80
msgid "Ability to connect to servers which are using SRV records."
-msgstr ""
+msgstr "Възможност за свързване към сървъри, които използват записи SRV."
#: ../src/features_window.py:81
msgid "Requires dnsutils."
-msgstr ""
+msgstr "Изисква dnsutils."
#: ../src/features_window.py:82
msgid "Requires nslookup to use SRV records."
@@ -7270,75 +7140,82 @@
#: ../src/features_window.py:83
msgid "Spell Checker"
-msgstr ""
+msgstr "Проверка на правописа"
#: ../src/features_window.py:84
msgid "Spellchecking of composed messages."
-msgstr ""
+msgstr "Проверка на изходящите съобщения за правописни грешки."
#: ../src/features_window.py:85
msgid ""
"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
"sources."
msgstr ""
+"Изисква python-gnome2-extras и компилация на модула „gtkspell“ от изходния "
+"код на Gajim."
#: ../src/features_window.py:87
msgid "Notification-daemon"
-msgstr ""
+msgstr "Демон за уведомления"
#: ../src/features_window.py:88
msgid "Passive popups notifying for new events."
-msgstr ""
+msgstr "Изскачащи прозорци с уведомления за нови събития."
#: ../src/features_window.py:89
msgid ""
"Requires python-notify or instead python-dbus in conjunction with "
"notification-daemon."
-msgstr ""
+msgstr "Изисква python-notify или python-dbus заедно с notification-daemon."
#: ../src/features_window.py:91
msgid "Trayicon"
-msgstr ""
+msgstr "Икона в областта за уведомяване"
#: ../src/features_window.py:92
msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
+msgstr "Икона в областта за уведомяване, отразяваща текущото състояние."
#: ../src/features_window.py:93
msgid ""
"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
msgstr ""
+"Изисква python-gnome2-extras или компилиран модул „trayicon“ от изходния код "
+"на Gajim."
#: ../src/features_window.py:94
msgid "Requires PyGTK >= 2.10."
msgstr ""
#: ../src/features_window.py:95
-#, fuzzy
msgid "Idle"
-msgstr "Идентификатор"
+msgstr "Време на бездействие"
#: ../src/features_window.py:96
msgid "Ability to measure idle time, in order to set auto status."
msgstr ""
+"Възможност за измерване на времето на бездействие, с цел да се установи "
+"автоматично съобщение за състояние."
#: ../src/features_window.py:97 ../src/features_window.py:98
msgid "Requires compilation of the idle module from Gajim sources."
-msgstr ""
+msgstr "Изисква компилация на модула „idle“ от изходния код на Gajim."
#: ../src/features_window.py:99
msgid "LaTeX"
-msgstr ""
+msgstr "LaTeX"
#: ../src/features_window.py:100
msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
+msgstr "Трансформира изрази на LaTex, разграничени с $$ $$."
#: ../src/features_window.py:101
msgid ""
"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
"in the Advanced Configuration Editor."
msgstr ""
+"Изисква texlive-latex-base и dvipng. Трябва да активирате опцията "
+"„use_latex“ в редактора на настройки за напреднали."
#: ../src/features_window.py:102
msgid ""
@@ -7347,50 +7224,50 @@
msgstr ""
#: ../src/features_window.py:103
-#, fuzzy
msgid "End to End Encryption"
-msgstr "OpenPGP шифриране"
+msgstr "Шифриране тип „End to End“"
#: ../src/features_window.py:104
-#, fuzzy
msgid "Encrypting chatmessages."
-msgstr "В_ходящо съобщение:"
+msgstr "Шифриране на разговорите."
#: ../src/features_window.py:105 ../src/features_window.py:106
msgid "Requires python-crypto."
-msgstr ""
+msgstr "Изисква python-crypto."
#: ../src/features_window.py:107
-#, fuzzy
msgid "RST Generator"
-msgstr "Общи"
+msgstr "Генератор на RST"
#: ../src/features_window.py:108
msgid ""
"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
"docs/ref/rst/restructuredtext.html)."
msgstr ""
+"Генериране на изход в XHTML от RST (вижте http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
#: ../src/features_window.py:109 ../src/features_window.py:110
msgid "Requires python-docutils."
-msgstr ""
+msgstr "Изисква python-docutils."
#: ../src/features_window.py:111
msgid "libsexy"
-msgstr ""
+msgstr "libsexy"
#: ../src/features_window.py:112
msgid "Ability to have clickable URLs in chat and groupchat window banners."
msgstr ""
+"Възможност за натискане с мишката върху адреси в заглавните части на "
+"прозорците."
#: ../src/features_window.py:113 ../src/features_window.py:114
msgid "Requires python-sexy."
-msgstr ""
+msgstr "Изисква python-sexy."
#: ../src/features_window.py:128
-#, fuzzy
msgid "Feature"
-msgstr "Функционалности на сървърите"
+msgstr "Функционалност"
#: ../src/filetransfers_window.py:76
msgid "File"
@@ -7464,12 +7341,11 @@
#: ../src/filetransfers_window.py:252
msgid "Choose File to Send..."
-msgstr "Избор на файл за изпращане..."
+msgstr "Избор на файл за изпращане…"
#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
-#, fuzzy
msgid "Description: "
-msgstr "Описание: %s"
+msgstr "Описание: "
#: ../src/filetransfers_window.py:279
msgid "Gajim cannot access this file"
@@ -7531,7 +7407,7 @@
#: ../src/filetransfers_window.py:369
msgid "Save File as..."
-msgstr "Запазване на файла като..."
+msgstr "Запазване на файла като…"
#. Print remaining time in format 00:00:00
#. You can change the places of (hours), (minutes), (seconds) -
@@ -7573,36 +7449,36 @@
msgid "Pause"
msgstr "Пауза"
-#: ../src/gajim.py:83
+#: ../src/gajim.py:87
#, python-format
msgid "%s is not a valid loglevel"
msgstr "%s не е валидно ниво за дневник"
-#: ../src/gajim.py:156
+#: ../src/gajim.py:160
msgid "Gajim needs X server to run. Quiting..."
-msgstr "Необходим е X сървър. Спиране на програмата..."
+msgstr "Необходим е X сървър. Спиране на програмата…"
-#: ../src/gajim.py:186
+#: ../src/gajim.py:190
msgid "Gajim needs PyGTK 2.8 or above"
msgstr "Gajim изисква PyGTK 2.8 или по-нова версия"
-#: ../src/gajim.py:187
+#: ../src/gajim.py:191
msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
-msgstr "Gajim изисква PyGTK 2.8 или по-нова версия. Спиране на програмата..."
+msgstr "Gajim изисква PyGTK 2.8 или по-нова версия. Спиране на програмата…"
-#: ../src/gajim.py:189
+#: ../src/gajim.py:193
msgid "Gajim needs GTK 2.8 or above"
msgstr "Gajim изисква GTK 2.8 или по-нова версия"
-#: ../src/gajim.py:190
+#: ../src/gajim.py:194
msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
-msgstr "Gajim изисква GTK 2.8 или по-нова версия. Спиране на програмата..."
+msgstr "Gajim изисква GTK 2.8 или по-нова версия. Спиране на програмата…"
-#: ../src/gajim.py:195
+#: ../src/gajim.py:199
msgid "GTK+ runtime is missing libglade support"
msgstr "Липсва поддръжка на libglade за библиотеката GTK+"
-#: ../src/gajim.py:197
+#: ../src/gajim.py:201
#, python-format
msgid ""
"Please remove your current GTK+ runtime and install the latest stable "
@@ -7611,22 +7487,22 @@
"Премахнете текущата версия на библиотеката GTK+ и инсталирайте последната "
"стабилна от %s"
-#: ../src/gajim.py:199
+#: ../src/gajim.py:203
msgid ""
"Please make sure that GTK+ and PyGTK have libglade support in your system."
msgstr ""
"Уверете се, че версиите на GTK+ и PyGTK на системата ви имат поддръжка за "
"libglade."
-#: ../src/gajim.py:204
+#: ../src/gajim.py:208
msgid "Gajim needs PySQLite2 to run"
msgstr "Gajim изисква PySQLite2"
-#: ../src/gajim.py:212
+#: ../src/gajim.py:216
msgid "Gajim needs pywin32 to run"
msgstr "Gajim изисква pywin32"
-#: ../src/gajim.py:213
+#: ../src/gajim.py:217
#, python-format
msgid ""
"Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7635,11 +7511,11 @@
"Уверете се, че Pywin32 е инсталиран на системата. Може да го изтеглите от %s"
#. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:370
msgid "Gajim is already running"
msgstr "Gajim вече е стартиран"
-#: ../src/gajim.py:367
+#: ../src/gajim.py:371
msgid ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
@@ -7647,175 +7523,182 @@
"Изглежда вече е стартирана друга инстанция на Gajim\n"
"Продължаване въпреки това?"
-#: ../src/gajim.py:493
+#: ../src/gajim.py:497
msgid "Passphrase Required"
msgstr "Необходима е парола"
-#: ../src/gajim.py:494
-#, fuzzy, python-format
+#: ../src/gajim.py:498
+#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Въведете парола за GPG ключ за акаунт „%s“."
+msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
#. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:513
msgid "Wrong Passphrase"
msgstr "Грешна парола"
-#: ../src/gajim.py:510
+#: ../src/gajim.py:514
msgid "Please retype your GPG passphrase or press Cancel."
msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
-#: ../src/gajim.py:557
-#, fuzzy, python-format
+#: ../src/gajim.py:561
+#, 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 ""
-"Желаният от вас псевдоним се използва или е регистриран от друг участник.\n"
+"Желаният от вас псевдоним за стая %s се използва или е регистриран от друг "
+"участник.\n"
"Укажете друг псевдоним по-долу:"
-#: ../src/gajim.py:571
+#: ../src/gajim.py:575
msgid "Do you accept this request?"
msgstr "Приемате ли това запитване?"
-#: ../src/gajim.py:573
-#, fuzzy, python-format
+#: ../src/gajim.py:577
+#, python-format
msgid "Do you accept this request on account %s?"
-msgstr "Приемате ли това запитване?"
+msgstr "Приемате ли това запитване за акаунт %s?"
-#: ../src/gajim.py:576
-#, fuzzy, python-format
+#: ../src/gajim.py:580
+#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%s) упълномощаване за „%s“ (id: %s)"
+msgstr "Упълномощаване по HTTP (%(method)s) за „%(url)s“ (id: %(id)s)"
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:628 ../src/notify.py:491 ../src/osx/growler.py:17
msgid "Connection Failed"
msgstr "Неуспех при свързването"
-#: ../src/gajim.py:930 ../src/gajim.py:934
-#, fuzzy, python-format
+#: ../src/gajim.py:934 ../src/gajim.py:938
+#, python-format
msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s: %(message)s"
+msgstr "Грешка %(code)s: %(msg)s"
#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
-#, fuzzy, python-format
+#: ../src/gajim.py:948 ../src/gajim.py:961
+#, python-format
msgid "error while sending %(message)s ( %(error)s )"
-msgstr "грешка при изпращане на %s ( %s )"
+msgstr "грешка при изпращане на %(message)s ( %(error)s )"
-#: ../src/gajim.py:989
+#: ../src/gajim.py:993
msgid "Authorization accepted"
msgstr "Упълномощаването е прието"
-#: ../src/gajim.py:990
+#: ../src/gajim.py:994
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1013
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "Контактът „%s“ премахна записването за вас"
-#: ../src/gajim.py:1010
+#: ../src/gajim.py:1014
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
msgstr ""
+"Винаги ще го виждате като изключен.\n"
+"Искате ли да го премахнете от списъка с контакти?"
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1055
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "Неуспех при установяването на контакт с „%s“"
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
-#, fuzzy, python-format
+#: ../src/gajim.py:1231 ../src/groupchat_control.py:1164
+#, python-format
msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s вече е познат като %s"
+msgstr "%(nick)s вече е познат като %(new_nick)s"
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
+#: ../src/gajim.py:1249 ../src/groupchat_control.py:1339
#: ../src/history_window.py:417 ../src/notify.py:232
#, python-format
msgid "%(nick)s is now %(status)s"
msgstr "%(nick)s вече е %(status)s"
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1312
#, python-format
msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
+msgstr "%(jid)s зададе темата на %(subject)s"
#. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1376 ../src/groupchat_control.py:1124
msgid "Any occupant is allowed to see your full JID"
-msgstr ""
+msgstr "На всеки участник е позволено да вижда вашия JID"
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1379
msgid "Room now shows unavailable member"
-msgstr ""
+msgstr "Стаята показва отсъстващ член"
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1381
msgid "room now does not show unavailable members"
-msgstr ""
+msgstr "Стаята не показва отсъстващи членове"
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1384
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:1383
+#: ../src/gajim.py:1387
msgid "Room logging is now enabled"
-msgstr ""
+msgstr "Воденето на дневник на стаята е включено"
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1389
msgid "Room logging is now disabled"
-msgstr ""
+msgstr "Воденето на дневник на стаята е изключено"
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1391
msgid "Room is now non-anonymous"
-msgstr ""
+msgstr "Стаята не е анонимна"
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1394
msgid "Room is now semi-anonymous"
-msgstr ""
+msgstr "Стаята е полу-анонимна"
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1397
msgid "Room is now fully-anonymous"
-msgstr ""
+msgstr "Стаята е напълно анонимна"
-#: ../src/gajim.py:1425
-#, fuzzy, python-format
+#: ../src/gajim.py:1429
+#, python-format
msgid "A Password is required to join the room %s. Please type it."
-msgstr "Необходима е парола за влизане в тази стая."
+msgstr "Необходима е парола за влизане в стаята „%s“. Въведете я."
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1463
msgid ""
"You configured Gajim to use GPG agent, but there is no GPG agent running or "
"it returned a wrong passphrase.\n"
msgstr ""
+"Конфигурирали сте Gajim да използва агент на GPG, но такъв не е стартиран "
+"или е предоставил грешна парола.\n"
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1465
msgid "You are currently connected without your OpenPGP key."
msgstr "В момента сте свързани без OpenPGP ключ."
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1468
msgid "Your passphrase is incorrect"
msgstr "Паролата е грешна"
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1570
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "Ново писмо за %(gmail_mail_address)s"
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1572
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
msgstr[0] "Имате %d ново писмо"
msgstr[1] "Имате %d нови писма"
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1585
#, python-format
msgid ""
"\n"
@@ -7824,99 +7707,107 @@
"Subject: %(subject)s\n"
"%(snippet)s"
msgstr ""
+"\n"
+"\n"
+"От: %(from_address)s\n"
+"Тема: %(subject)s\n"
+"%(snippet)s"
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1656
#, python-format
msgid "%s wants to send you a file."
msgstr "%s иска да ви изпрати файл."
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1724
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "Успешно получихте %(filename)s от %(name)s."
#. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1728
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1741
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "Успешно изпратихте %(filename)s на %(name)s."
#. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1745
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1833
#, python-format
msgid ""
"Unable to decrypt message from %s\n"
"It may have been tampered with."
msgstr ""
+"Неуспех при дешифрирането на съобщение от %s\n"
+"Възможно е да е било фалшифицирано."
-#: ../src/gajim.py:1830
-#, fuzzy
+#: ../src/gajim.py:1840
msgid "Unable to decrypt message"
-msgstr "На _всяко съобщение"
+msgstr "Неуспех при дешифриране на съобщението"
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:1911
msgid "Username Conflict"
msgstr "Конфликт с имената на потребители"
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:1912
msgid "Please type a new username for your local account"
msgstr "Укажете ново потребителско име за локалния ви акаунт"
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:1924
msgid "Ping?"
-msgstr ""
+msgstr "Пинг?"
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:1937
#, python-format
msgid "Pong! (%s s.)"
-msgstr ""
+msgstr "Понг! (%s сек)"
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:1948
msgid "Error."
-msgstr ""
+msgstr "Грешка."
-#: ../src/gajim.py:1963
-#, fuzzy
+#: ../src/gajim.py:1973
msgid "Resource Conflict"
-msgstr "Конфликт с имената на потребители"
+msgstr "Конфликт на ресурсите"
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:1974
msgid ""
"You are already connected to this account with the same resource. Please "
"type a new one"
-msgstr ""
+msgstr "Вече сте свързани към този акаунт със същия ресурс. Въведете нов."
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2027
msgid "Error verifying SSL certificate"
-msgstr ""
+msgstr "Грешка при проверка на сертификата на SSL"
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2028
#, python-format
msgid ""
"There was an error verifying the SSL certificate of your jabber server: %"
"(error)s\n"
"Do you still want to connect to this server?"
msgstr ""
+"Възникна грешка при проверката на сертификата за вашия сървър на Джабър: %"
+"(error)s\n"
+"Все още ли искате да се свържете със сървъра?"
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2033
msgid "Ignore this error for this certificate."
-msgstr ""
+msgstr "Пренебрегване на грешката за този сертификат."
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2048
msgid "SSL certificate error"
-msgstr ""
+msgstr "Грешка в сертификата на SSL"
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2049
#, python-format
msgid ""
"It seems the SSL certificate has changed or your connection is being "
@@ -7926,88 +7817,96 @@
"\n"
"Do you still want to connect and update the fingerprint of the certificate?"
msgstr ""
+"Изглежда сертификатът на SSL е бил променен или връзката е взломена.\n"
+"Стар отпечатък: %(old)s\n"
+"Нов отпечатък: %(new)s\n"
+"\n"
+"Все още ли искате да се свържете и да обновите отпечатъка на сертификата?"
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
-#, fuzzy
+#: ../src/gajim.py:2071 ../src/gajim.py:2101
msgid "Insecure connection"
-msgstr "Свързване"
+msgstr "Несигурна връзка"
-#: ../src/gajim.py:2062
-#, fuzzy
+#: ../src/gajim.py:2072
msgid ""
"You are about to send your password on an unencrypted connection. Are you "
"sure you want to do that?"
msgstr ""
-"На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
-"продължите?"
+"На път сте да изпратите паролата си чрез нешифрирана връзка. Сигурни ли сте, "
+"че искате да го направите?"
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2074 ../src/gajim.py:2104
msgid "Yes, I really want to connect insecurely"
-msgstr ""
+msgstr "Да, наистина искам да се свържа по несигурен начин"
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
+#: ../src/gajim.py:2075 ../src/gajim.py:2105 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3789
msgid "Do _not ask me again"
msgstr "Да _не се задава този въпрос отново"
-#: ../src/gajim.py:2092
+#: ../src/gajim.py:2102
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?"
msgstr ""
+"На път сте да изпратите паролата си чрез несигурна връзка. Трябва да "
+"инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
+"да го направите?"
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2119
msgid "PEP node was not removed"
-msgstr ""
+msgstr "Възелът на PEP не беше премахнат"
-#: ../src/gajim.py:2110
+#: ../src/gajim.py:2120
#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
+msgstr "Възелът на PEP %(node)s не беше премахнат: %(message)s"
#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2575 ../src/gajim.py:2596
-#, fuzzy
+#: ../src/gajim.py:2585 ../src/gajim.py:2606
msgid "Emoticons disabled"
-msgstr "Шифрирането е изключено"
+msgstr "Емотиконите са изключени"
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2586
msgid ""
"Your configured emoticons theme has not been found, so emoticons have been "
"disabled."
-msgstr ""
+msgstr "Темата с емотикони не беше намерена, така че са изключени."
-#: ../src/gajim.py:2597
+#: ../src/gajim.py:2607
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 "
"for more details."
msgstr ""
+"Темата с емотикони не можа да бъде заредена. Навярно трябва да обновите "
+"формата на файла emoticons.py. Вижте http://trac.gajim.org/wiki/Emoticons за "
+"повече подробности."
-#: ../src/gajim.py:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2633 ../src/roster_window.py:3323
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:2903
+#: ../src/gajim.py:2913
msgid "Could not save your settings and preferences"
msgstr "Неуспех при запазването на настройките"
-#: ../src/gajim.py:3000
+#: ../src/gajim.py:3010
msgid "Bookmark already set"
msgstr "Отметката вече е установена"
-#: ../src/gajim.py:3001
+#: ../src/gajim.py:3011
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "Стаята „%s“ вече присъства в отметките."
-#: ../src/gajim.py:3014
+#: ../src/gajim.py:3024
msgid "Bookmark has been added successfully"
msgstr "Отметката беше добавена успешно"
-#: ../src/gajim.py:3015
+#: ../src/gajim.py:3025
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr "Може да организирате отметките чрез менюто „Действия“."
@@ -8127,7 +8026,7 @@
#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
msgid "pgp key"
-msgstr "OpenPGP ключ"
+msgstr "ключ на OpenPGP"
#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
msgid "if specified, the message will be encrypted using this public key"
@@ -8159,12 +8058,11 @@
#: ../src/gajim-remote.py:155
msgid "Sends new message to a groupchat you've joined."
-msgstr ""
+msgstr "Изпраща ново съобщение до стаята, в която сте влезли."
#: ../src/gajim-remote.py:157
-#, fuzzy
msgid "JID of the room that will receive the message"
-msgstr "JID на контакта, който ще получи съобщението"
+msgstr "JID на стаята, която ще получи съобщението"
#: ../src/gajim-remote.py:164
msgid "Gets detailed info on a contact"
@@ -8297,11 +8195,11 @@
#: ../src/gajim-remote.py:259
msgid "URI to handle"
-msgstr ""
+msgstr "Адрес за обработка"
#: ../src/gajim-remote.py:260
msgid "Account in which you want to handle it"
-msgstr ""
+msgstr "Акаунт, за който искате да го обработите"
#: ../src/gajim-remote.py:265
msgid "Join a MUC room"
@@ -8312,41 +8210,36 @@
msgstr "стая"
#: ../src/gajim-remote.py:267
-#, fuzzy
msgid "Room JID"
-msgstr "Стая:"
+msgstr "JID на стая"
#: ../src/gajim-remote.py:268
msgid "nick"
msgstr "псевдоним"
#: ../src/gajim-remote.py:268
-#, fuzzy
msgid "Nickname to use"
-msgstr "Псевдонимът не е намерен: %s"
+msgstr "Псевдоним"
#: ../src/gajim-remote.py:269
msgid "password"
msgstr "парола"
#: ../src/gajim-remote.py:269
-#, fuzzy
msgid "Password to enter the room"
-msgstr "Паролите не съвпадат"
+msgstr "Парола за влизане в стаята"
#: ../src/gajim-remote.py:270
msgid "Account from which you want to enter the room"
-msgstr ""
+msgstr "Акаунт, от който искате да влезете в стаята"
#: ../src/gajim-remote.py:275
-#, fuzzy
msgid "Check if Gajim is running"
-msgstr "Проверете дали е стартиран avahi-daemon."
+msgstr "Проверка дали Gajim е стартиран"
#: ../src/gajim-remote.py:279
-#, fuzzy
msgid "Shows or hides the ipython window"
-msgstr "Показва или скрива списъка"
+msgstr "Показва или скрива прозореца на IPython"
#: ../src/gajim-remote.py:306
msgid "Missing argument \"contact_jid\""
@@ -8368,6 +8261,7 @@
#: ../src/gajim-remote.py:380
msgid "It seems Gajim is not running. So you can't use gajim-remote."
msgstr ""
+"Изглежда Gajim не е стартиран, така че не може да ползвате gajim-remote."
#: ../src/gajim-remote.py:409
#, python-format
@@ -8375,6 +8269,8 @@
"Usage: %(basename)s %(command)s %(arguments)s \n"
"\t %(help)s"
msgstr ""
+"Употреба: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
#: ../src/gajim-remote.py:413
msgid "Arguments:"
@@ -8395,22 +8291,22 @@
"Командата е една от:\n"
#: ../src/gajim-remote.py:493
-#, fuzzy, python-format
+#, python-format
msgid ""
"Too many arguments. \n"
"Type \"%(basename)s help %(command)s\" for more info"
msgstr ""
"Твърде много аргументи. \n"
-"Напишете „%s help %s“ за повече информация"
+"Напишете „%(basename)s help %(command)s“ за повече информация"
#: ../src/gajim-remote.py:498
-#, fuzzy, python-format
+#, python-format
msgid ""
"Argument \"%(arg)s\" is not specified. \n"
"Type \"%(basename)s help %(command)s\" for more info"
msgstr ""
-"Не е указан аргумент „%s“.\n"
-"Напишете „%s help %s“ за повече информация"
+"Не е указан аргумент „%(arg)s“.\n"
+"Напишете „%(basename)s help %(command)s“ за повече информация"
#: ../src/gajim-remote.py:517
msgid "Wrong uri"
@@ -8421,13 +8317,12 @@
msgstr "Тема"
#: ../src/gajim_themes_window.py:97
-#, fuzzy
msgid "You cannot make changes to the default theme"
-msgstr "Не може да изтриете текущата тема"
+msgstr "Не може да правите промени по стандартната тема"
#: ../src/gajim_themes_window.py:98
msgid "Please create a clean new theme with your desired name."
-msgstr ""
+msgstr "Създайте нова тема с желаното име."
#. don't confuse translators
#: ../src/gajim_themes_window.py:172
@@ -8448,46 +8343,43 @@
#. in second %s code replaces with nickname
#: ../src/groupchat_control.py:152
-#, fuzzy, python-format
+#, python-format
msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
-msgstr "Вече не сте в стая „%s“ или „%s“ е напуснал(а)."
+msgstr "Вече не сте в стая „%(room)s“ или „%(nick)s“ е напуснал(а)."
#: ../src/groupchat_control.py:451
msgid "Insert Nickname"
msgstr "Въведете псевдоним"
#: ../src/groupchat_control.py:603
-#, fuzzy
msgid "Conversation with "
-msgstr "История на разговорите"
+msgstr "Разговор с "
#: ../src/groupchat_control.py:605
-#, fuzzy
msgid "Continued conversation"
-msgstr "Свързване"
+msgstr "Продължен разговор"
#: ../src/groupchat_control.py:1027
msgid "Really send file?"
-msgstr ""
+msgstr "Наистина ли да се изпрати файла?"
#: ../src/groupchat_control.py:1028
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
+msgstr "Ако изпратите файл на %s, той/тя ще разбере истинския ви Jabber ID."
#. Can be a message (see handle_event_gc_config_change in gajim.py)
#: ../src/groupchat_control.py:1127
msgid "Room logging is enabled"
-msgstr ""
+msgstr "Воденето на дневник на стаята е включено"
#: ../src/groupchat_control.py:1129
-#, fuzzy
msgid "A new room has been created"
-msgstr "Новият акаунт беше създаден успешно"
+msgstr "Беше създадена нова стая"
#: ../src/groupchat_control.py:1132
msgid "The server has assigned or modified your roomnick"
-msgstr ""
+msgstr "Сървърът назначи или промени псевдонима ви в стаята"
#. do not print 'kicked by None'
#: ../src/groupchat_control.py:1138
@@ -8518,42 +8410,41 @@
#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
#: ../src/groupchat_control.py:1209
-#, fuzzy, python-format
+#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
-msgstr "%(nick)s беше изритан от %(who)s: %(reason)s"
+msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
#: ../src/groupchat_control.py:1201
-#, fuzzy
msgid "affiliation changed"
-msgstr "Връзка:"
+msgstr "рангът е променен"
#: ../src/groupchat_control.py:1206
msgid "room configuration changed to members-only"
-msgstr ""
+msgstr "Конфигурацията на стаята бе променена на „само за членове“"
#: ../src/groupchat_control.py:1211
msgid "system shutdown"
-msgstr ""
+msgstr "Изключване на системата"
#: ../src/groupchat_control.py:1280
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
-msgstr ""
+msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s от %(actor)s"
#: ../src/groupchat_control.py:1284
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
-msgstr ""
+msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s"
#: ../src/groupchat_control.py:1299
-#, fuzzy, python-format
+#, python-format
msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
-msgstr "%(nick)s беше изритан от %(who)s: %(reason)s"
+msgstr "** Ролята на %(nick)s бе зададена на %(role)s от %(actor)s"
#: ../src/groupchat_control.py:1303
-#, fuzzy, python-format
+#, python-format
msgid "** Role of %(nick)s has been set to %(role)s"
-msgstr "%(nick)s беше изритан: %(reason)s"
+msgstr "** Ролята на %(nick)s бе зададена на %(role)s"
#: ../src/groupchat_control.py:1332
#, python-format
@@ -8568,9 +8459,8 @@
#. Invalid Nickname
#. invalid char
#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
msgid "Invalid nickname"
-msgstr "Невалидно потребителско име"
+msgstr "Невалиден псевдоним"
#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
@@ -8706,19 +8596,21 @@
#. Ask for a reason
#: ../src/groupchat_control.py:1908
-#, fuzzy, python-format
+#, python-format
msgid "Destroying %s"
-msgstr "Описание: %s"
+msgstr "Унищожаване на %s"
#: ../src/groupchat_control.py:1909
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
msgstr ""
+"Определено сте на път да унищожите тази стая.\n"
+"Може да укажете причина по-долу:"
#: ../src/groupchat_control.py:1911
msgid "You may also enter an alternate venue:"
-msgstr ""
+msgstr "Може да въведете и друго място за срещи:"
#. ask for reason
#: ../src/groupchat_control.py:2083
@@ -8726,12 +8618,12 @@
msgid "Kicking %s"
msgstr "Изритване на %s"
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2390
msgid "You may specify a reason below:"
msgstr "Може да уточните причина по-долу:"
#. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2389
#, python-format
msgid "Banning %s"
msgstr "Отлъчване на %s"
@@ -8805,7 +8697,7 @@
#: ../src/gtkgui_helpers.py:844
msgid "Save Image as..."
-msgstr "Запазване на изображението като..."
+msgstr "Запазване на изображението като…"
#: ../src/history_manager.py:97
msgid "Cannot find history logs database"
@@ -8853,11 +8745,11 @@
"стане наново използваемо. Ако наистина искате да намалите файловия размер на "
"базата от данни, изберете „Да“; в противен случай изберете „Не“.\n"
"\n"
-"В случай, че изберете „Да“, изчакайте..."
+"В случай, че изберете „Да“, изчакайте…"
#: ../src/history_manager.py:437
msgid "Exporting History Logs..."
-msgstr "Изнасяне на записите на разговорите..."
+msgstr "Изнасяне на записите на разговорите…"
#: ../src/history_manager.py:512
#, python-format
@@ -8887,7 +8779,7 @@
#: ../src/history_window.py:332
msgid "Disk Error"
-msgstr ""
+msgstr "Грешка при запис/четене от диска"
#: ../src/history_window.py:413
#, python-format
@@ -8905,13 +8797,12 @@
msgstr "Сегашното състояние е: %(status)s"
#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
-#, fuzzy
msgid "Timeout loading image"
-msgstr "Неуспех при зареждането на изображението"
+msgstr "Изтече времето за зареждане на изображението"
#: ../src/htmltextview.py:612
msgid "Image is too big"
-msgstr ""
+msgstr "Изображението е твърде голямо"
#: ../src/message_window.py:446
msgid "Chats"
@@ -8931,11 +8822,11 @@
#: ../src/negotiation.py:34
msgid "- messages will be logged"
-msgstr ""
+msgstr "— ще бъде воден дневник за съобщенията"
#: ../src/negotiation.py:36
msgid "- messages will not be logged"
-msgstr ""
+msgstr "— няма да бъде воден дневник за съобщенията"
#: ../src/notify.py:230
#, python-format
@@ -8968,9 +8859,9 @@
msgstr "%(nickname)s: %(message)s"
#: ../src/notify.py:273
-#, fuzzy, python-format
+#, python-format
msgid "Messaged by %(nickname)s"
-msgstr "Ново съобщение от %(nickname)s"
+msgstr "Съобщение от %(nickname)s"
#: ../src/notify.py:279
#, python-format
@@ -8978,28 +8869,25 @@
msgstr "Ново съобщение от %(nickname)s"
#: ../src/osx/growler.py:10
-#, fuzzy
msgid "Generic"
-msgstr "Общи"
+msgstr ""
#: ../src/profile_window.py:56
msgid "Retrieving profile..."
-msgstr "Извличане на профила..."
+msgstr "Извличане на профила…"
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
-#, fuzzy
+#: ../src/profile_window.py:109 ../src/roster_window.py:2786
msgid "File is empty"
-msgstr "Път до файл"
+msgstr "Файлът не съдържа нищо"
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
-#, fuzzy
+#: ../src/profile_window.py:112 ../src/roster_window.py:2789
msgid "File does not exist"
-msgstr "Такава стая не съществува."
+msgstr "Файлът не съществува"
#. keep identation
#. unknown format
#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/roster_window.py:2791 ../src/roster_window.py:2802
msgid "Could not load image"
msgstr "Неуспех при зареждането на изображението"
@@ -9013,7 +8901,7 @@
#: ../src/profile_window.py:335
msgid "Sending profile..."
-msgstr "Изпращане на профила..."
+msgstr "Изпращане на профила…"
#: ../src/profile_window.py:350
msgid "Information NOT published"
@@ -9030,39 +8918,38 @@
msgstr ""
"Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:288 ../src/roster_window.py:944
msgid "Merged accounts"
msgstr "Смесени акаунти"
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1859
msgid "Authorization has been sent"
msgstr "Упълномощаването беше изпратено"
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1860
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "„%s“ вече ще знае състоянието ви."
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1880
msgid "Subscription request has been sent"
msgstr "Искането за записване беше изпратено"
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1881
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1893
msgid "Authorization has been removed"
msgstr "Упълномощаването беше прекратено"
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1894
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "„%s“ винаги ще ви вижда като изключен."
-#: ../src/roster_window.py:1920
-#, fuzzy
+#: ../src/roster_window.py:1919
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)"
@@ -9070,15 +8957,15 @@
"Наборът с ключове на GNOME е инсталиран, но не е стартиран правилно (навярно "
"променливата на обкръжението не е настроена)"
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1929 ../src/roster_window.py:1949
msgid "GPG is not usable"
-msgstr ""
+msgstr "GPG не е използваем"
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2118 ../src/roster_window.py:3266
msgid "You are participating in one or more group chats"
msgstr "Участвате в една или повече стаи"
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
msgid ""
"Changing your status to invisible will result in disconnection from those "
"group chats. Are you sure you want to go invisible?"
@@ -9086,33 +8973,32 @@
"Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
"сте, че искате да станете „Невидим“?"
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2145
msgid "desync'ed"
-msgstr ""
+msgstr "без синхронизация"
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../src/roster_window.py:2283 ../src/roster_window.py:2520
msgid "You have unread messages"
msgstr "Имате непрочетени съобщения"
-#: ../src/roster_window.py:2285
-#, fuzzy
+#: ../src/roster_window.py:2284
msgid ""
"Messages will only be available for reading them later if you have history "
"enabled and contact is in your roster."
msgstr ""
"Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
-"историята."
+"историята и контактът е в списъка."
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2521
msgid "You must read them before removing this transport."
msgstr "Трябва да ги прочетете преди да премахнете този транспорт."
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2524
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "Транспортът „%s“ ще бъде премахнат"
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2525
msgid ""
"You will no longer be able to send and receive messages from contacts using "
"this transport."
@@ -9120,12 +9006,12 @@
"Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
"този транспорт."
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2528
msgid "Transports will be removed"
msgstr "Ще бъдат премахнати транспорти"
-#: ../src/roster_window.py:2534
-#, fuzzy, python-format
+#: ../src/roster_window.py:2533
+#, python-format
msgid ""
"You will no longer be able to send and receive messages to contacts from "
"these transports: %s"
@@ -9134,52 +9020,51 @@
"тези транспорти: %s"
#. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2667
msgid "Rename Contact"
msgstr "Преименуване на контакт"
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2668
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "Въведете нов псевдоним за контакт „%s“"
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2675
msgid "Rename Group"
msgstr "Преименуване на група"
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2676
#, python-format
msgid "Enter a new name for group %s"
msgstr "Въведете ново име за група „%s“"
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2732
msgid "Remove Group"
msgstr "Премахване на група"
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2733
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "Искате ли да премахнете групата „%s“ от списъка?"
-#: ../src/roster_window.py:2735
-#, fuzzy
+#: ../src/roster_window.py:2734
msgid "Also remove all contacts in this group from your roster"
msgstr "Премахване от списъка и на всички контакти в тази група"
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2773
msgid "Assign OpenPGP Key"
msgstr "Задаване на OpenPGP ключ"
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2774
msgid "Select a key to apply to the contact"
msgstr "Изберете ключ за този контакт"
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3127
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3131
msgid ""
"By removing this contact you also remove authorization resulting in him or "
"her always seeing you as offline."
@@ -9188,12 +9073,11 @@
"ще ви вижда изключен."
#. Contact is not in roster
-#: ../src/roster_window.py:3137
-#, fuzzy
+#: ../src/roster_window.py:3136
msgid "Do you want to continue?"
-msgstr "Какво искате да направите?"
+msgstr "Искате ли да продължите?"
-#: ../src/roster_window.py:3141
+#: ../src/roster_window.py:3140
msgid ""
"By removing this contact you also by default remove authorization resulting "
"in him or her always seeing you as offline."
@@ -9201,16 +9085,16 @@
"Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
"ще ви вижда изключен."
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3143
msgid "I want this contact to know my status after removal"
msgstr "Искам този контакт да вижда състоянието ми след премахването"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3147
msgid "Contacts will be removed from your roster"
msgstr "Ще бъдат премахнати контакти от списъка"
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3151
#, python-format
msgid ""
"By removing these contacts:%s\n"
@@ -9219,21 +9103,20 @@
"Премахвайки тези контакти: %s\n"
"прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3190
msgid "No account available"
msgstr "Няма наличен акаунт"
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3191
msgid "You must create an account before you can chat with other contacts."
msgstr ""
"За да разговаряте с други контакти, първо трябва да създадете Джабър акаунт."
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3707
msgid "Metacontacts storage not supported by your server"
msgstr "Сървърът ви няма поддръжка за мета-контакти"
-#: ../src/roster_window.py:3710
-#, fuzzy
+#: ../src/roster_window.py:3709
msgid ""
"Your server does not support storing metacontacts information. So those "
"information will not be saved on next reconnection."
@@ -9241,14 +9124,14 @@
"Вашият сървър не поддържа съхраняването на информация за мета-контакти, така "
"че тази информация няма да се запази при следващото свързване."
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3783
msgid ""
"You are about to create a metacontact. Are you sure you want to continue?"
msgstr ""
"На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
"продължите?"
-#: ../src/roster_window.py:3786
+#: ../src/roster_window.py:3785
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 "
@@ -9258,169 +9141,160 @@
"Основно се използва, когато един и същ потребител има няколко акаунта за "
"Джабър или акаунти за транспорти."
-#: ../src/roster_window.py:3899
-#, fuzzy
+#: ../src/roster_window.py:3898
msgid "Invalid file URI:"
-msgstr "Невалиден файл"
+msgstr "Невалиден адрес на файл:"
-#: ../src/roster_window.py:3910
-#, fuzzy, python-format
+#: ../src/roster_window.py:3909
+#, python-format
msgid "Do you want to send this file to %s:"
msgid_plural "Do you want to send these files to %s:"
-msgstr[0] "%s иска да ви изпрати файл:"
-msgstr[1] "%s иска да ви изпрати файл:"
+msgstr[0] "Искате ли да изпратите този файл на %s:"
+msgstr[1] "Искате ли да изпратите тези файлове на %s:"
#. new chat
#. single message
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../src/roster_window.py:4586 ../src/roster_window.py:4657
+#: ../src/roster_window.py:4666 ../src/systray.py:219 ../src/systray.py:224
+#: ../src/systray.py:230
#, python-format
msgid "using account %s"
msgstr "от акаунт „%s“"
#. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4673
#, python-format
msgid "to %s account"
msgstr "към акаунт „%s“"
#. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4678
#, python-format
msgid "using %s account"
msgstr "за акаунт „%s“"
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4715 ../src/systray.py:257
msgid "_Manage Bookmarks..."
-msgstr "_Управление на отметките..."
+msgstr "_Управление на отметките…"
#. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4735
#, python-format
msgid "of account %s"
msgstr "за акаунт „%s“"
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4775
#, python-format
msgid "for account %s"
msgstr "за акаунт „%s“"
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4837 ../src/roster_window.py:4946
msgid "_Change Status Message"
msgstr "Пром_яна на съобщението за състояние"
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4864
msgid "Publish Tune"
-msgstr ""
+msgstr "Публикуване на мелодия"
-#: ../src/roster_window.py:4873
+#: ../src/roster_window.py:4871
msgid "Mood"
-msgstr ""
+msgstr "Настроение"
-#: ../src/roster_window.py:4879
-#, fuzzy
+#: ../src/roster_window.py:4875
msgid "Activity"
-msgstr "Активен"
+msgstr "Дейност"
-#: ../src/roster_window.py:4884
-#, fuzzy
+#: ../src/roster_window.py:4880
msgid "Configure Services..."
-msgstr "_Откриване на услуги..."
+msgstr "Настройване на услуги…"
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5034
msgid "_Maximize All"
-msgstr ""
+msgstr "_Максимизиране на всички"
#. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5042 ../src/roster_window.py:5567
msgid "Send Group M_essage"
msgstr "_Изпращане на групово съобщение"
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5050
msgid "To all users"
msgstr "До всички потребители"
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5054
msgid "To all online users"
msgstr "До всички включени потребители"
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5464
msgid "I would like to add you to my roster"
msgstr ""
"Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
"roster."
#. Manage Transport submenu
-#: ../src/roster_window.py:5588
-#, fuzzy
+#: ../src/roster_window.py:5587
msgid "_Manage Contacts"
-msgstr "Преименуване на контакт"
+msgstr "_Управление на контакти"
#. Send single message
-#: ../src/roster_window.py:5649
-#, fuzzy
+#: ../src/roster_window.py:5648
msgid "Send Single Message"
-msgstr "_Изпращане на еднократно съобщение"
+msgstr "Изпращане на еднократно съобщение"
#. Manage Transport submenu
-#: ../src/roster_window.py:5705
-#, fuzzy
+#: ../src/roster_window.py:5704
msgid "_Manage Transport"
-msgstr "Транспорти"
+msgstr "Управление на _транспорт"
#. Modify Transport
-#: ../src/roster_window.py:5713
-#, fuzzy
+#: ../src/roster_window.py:5712
msgid "_Modify Transport"
-msgstr "Показване на т_ранспорти"
+msgstr "Промяна на т_ранспорт"
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5787
msgid "_Maximize"
-msgstr ""
+msgstr "_Максимизиране"
-#: ../src/roster_window.py:5795
-#, fuzzy
+#: ../src/roster_window.py:5794
msgid "_Disconnect"
-msgstr "Изключване на контакт"
+msgstr "_Изключване"
-#: ../src/roster_window.py:5875
-#, fuzzy
+#: ../src/roster_window.py:5874
msgid "_New Group Chat"
-msgstr "Нова стая"
+msgstr "_Нова стая"
#. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:5987
msgid "History Manager"
msgstr "Мениджър на историята"
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:5996
msgid "_Join New Group Chat"
msgstr "_Влизане в нова стая"
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6206
msgid "Change Status Message..."
-msgstr "Промяна на съобщението за състояние..."
+msgstr "Промяна на съобщението за състояние…"
#: ../src/search_window.py:93
msgid "Waiting for results"
-msgstr ""
+msgstr "Изчакване на резултатите"
#: ../src/search_window.py:133 ../src/search_window.py:211
msgid "Error in received dataform"
-msgstr ""
+msgstr "Грешка в получените данни"
#. No result
#: ../src/search_window.py:167 ../src/search_window.py:203
msgid "No result"
-msgstr ""
+msgstr "Няма резултати"
#: ../src/session.py:124
msgid "Disk WriteError"
-msgstr ""
+msgstr "Грешка при запис на диска"
#: ../src/session.py:238
#, python-format
@@ -9429,7 +9303,7 @@
#: ../src/session.py:398 ../src/session.py:433
msgid "Confirm these session options"
-msgstr ""
+msgstr "Потвърждение на тези настройки на сесията"
#: ../src/session.py:400
#, python-format
@@ -9440,6 +9314,11 @@
"\n"
"\tAre these options acceptable?"
msgstr ""
+"Отдалеченият клиент иска да договори сесия с тези параметри:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tДопустими ли са тези настройки?"
#: ../src/session.py:434
#, python-format
@@ -9450,12 +9329,17 @@
"\n"
"Continue with the session?"
msgstr ""
+"Отдалеченият клиент избра тези настройки:\n"
+"\n"
+"%s\n"
+"\n"
+"Продължаване с тази сесия?"
-#: ../src/systray.py:188
+#: ../src/systray.py:176
msgid "_Change Status Message..."
-msgstr "_Промяна на съобщението за състояние..."
+msgstr "_Промяна на съобщението за състояние…"
-#: ../src/systray.py:322
+#: ../src/systray.py:270
msgid "Hide this menu"
msgstr "Скриване на това меню"
@@ -9474,11 +9358,11 @@
#: ../src/tooltips.py:432
msgid " [blocked]"
-msgstr ""
+msgstr " [блокиран]"
#: ../src/tooltips.py:436
msgid " [minimized]"
-msgstr ""
+msgstr " [минимизиран]"
#: ../src/tooltips.py:451 ../src/tooltips.py:706
msgid "Status: "
@@ -9495,14 +9379,12 @@
msgstr " от %s"
#: ../src/tooltips.py:501
-#, fuzzy
msgid "Connected"
-msgstr "Свързване"
+msgstr "Свързан"
#: ../src/tooltips.py:503
-#, fuzzy
msgid "Disconnected"
-msgstr "Изключване на контакт"
+msgstr "Изключен"
#. ('both' is the normal sub so we don't show it)
#: ../src/tooltips.py:532
@@ -9514,19 +9396,16 @@
msgstr "OpenPGP: "
#: ../src/tooltips.py:587
-#, fuzzy
msgid "Mood:"
-msgstr "Стая:"
+msgstr "Настроение:"
#: ../src/tooltips.py:602
-#, fuzzy
msgid "Activity:"
-msgstr "Активирана"
+msgstr "Дейност:"
#: ../src/tooltips.py:638
-#, fuzzy
msgid "Tune:"
-msgstr "Тип:"
+msgstr "Песен:"
#: ../src/tooltips.py:664
msgid "Download"
@@ -9595,9 +9474,8 @@
msgstr "от %s"
#: ../src/vcard.py:311
-#, fuzzy
msgid "<b>Affiliation:</b>"
-msgstr "<b>Програми</b>"
+msgstr "<b>Ранг:</b>"
#: ../src/vcard.py:319
msgid ""
@@ -9635,437 +9513,8 @@
#: ../src/vcard.py:334
msgid "There is no pending subscription request."
-msgstr ""
+msgstr "Няма чакащо запитване за записване."
#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
msgid " resource with priority "
msgstr " ресурс с приоритет "
-
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "OpenPGP шифриране"
-
-#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-#~ msgstr "%s не предлага OpenPGP ключ и не сте задавали такъв"
-
-#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-#~ msgstr ""
-#~ "Няма такава команда: /%s (ако искате да изпратите това, сложете "
-#~ "представка /say)"
-
-#~ msgid ""
-#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
-#~ "person. (e.g. /%s explodes.)"
-#~ msgstr ""
-#~ "Употреба: /%s <действие>, изпраща действие до текущата стая. Използва се "
-#~ "трето лице (т.е. „/%s експлодира“)."
-
-#~ msgid "Encryption enabled"
-#~ msgstr "Шифрирането е включено"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Шифрирането е изключено"
-
-#~ msgid "_Retype Password:"
-#~ msgstr "_Въведете паролата отново:"
-
-#~ msgid "_Use proxy"
-#~ msgstr "_Използване на сървър-посредник"
-
-#~ msgid ""
-#~ "If checked, all local contacts that use a Bonjour compatible chat client "
-#~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
-#~ "be connected to a jabber server for it to work.\n"
-#~ "This is only available if python-avahi is installed and avahi-daemon is "
-#~ "running."
-#~ msgstr ""
-#~ "Ако тази опция е избрана, всички локални контакти, които използват "
-#~ "клиент, съвместим с Bonjour (като iChat, Trillian или Gaim), ще бъдат "
-#~ "показани в списъка. Не е необходимо да сте свързани към Джабър сървър.\n"
-#~ "Това е достъпно само при инсталиран „python-avahi“ и работещ „avahi-"
-#~ "daemon“."
-
-#~ msgid ""
-#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
-#~ "contacts as if you had one account"
-#~ msgstr ""
-#~ "Ако имате два или повече акаунта и тази опция е избрана, Gajim ще "
-#~ "изобразява всички контакти като от един акаунт."
-
-#~ msgid "_Enable link-local messaging"
-#~ msgstr ""
-#~ "_Активиране на съобщения от/за локални контакти (link-local messaging)"
-
-#~ msgid "2003-12-13T18:30:02Z"
-#~ msgstr "13-12-2003T18:30:02Z"
-
-#~ msgid "<small>Romeo and Juliet</small>"
-#~ msgstr "<small>Ромео и Жулиета</small>"
-
-#~ msgid "Old stories"
-#~ msgstr "Стари записи"
-
-#~ msgid "Soliloquy"
-#~ msgstr "Монолог"
-
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Натиснете, за да видите стари разговори с този контакт"
-
-#~ msgid "_Compact View Alt+C"
-#~ msgstr "_Компактен изглед (Alt+C)"
-
-#~ msgid "Click to see past conversation in this room"
-#~ msgstr "Натиснете, за да видите стари разговори в тази стая"
-
-#~ msgid "Build custom query"
-#~ msgstr "Потребителска заявка"
-
-#~ msgid "Query Builder..."
-#~ msgstr "Изготвяне на заявки..."
-
-#~ msgid "Accept"
-#~ msgstr "Приемане"
-
-#~ msgid "Invitation Received"
-#~ msgstr "Получена покана"
-
-#~ msgid "<b>Format of a line</b>"
-#~ msgstr "<b>Формат на реда</b>"
-
-#~ msgid "<b>Interface Customization</b>"
-#~ msgstr "<b>Персонализиране на интерфейса</b>"
-
-#~ msgid "Also known as iChat style"
-#~ msgstr "Познато и като стил „iChat“"
-
-#~ msgid ""
-#~ "An example: If you have enabled status message for away, Gajim won't ask "
-#~ "you anymore for a status message when you change your status to away; it "
-#~ "will use the default one set here"
-#~ msgstr ""
-#~ "Например, ако сте активирали съобщението за състояние за „Отсъствам“, "
-#~ "Gajim няма да ви пита повече за съобщението за състояние, когато го "
-#~ "променяте; ще използва стандартното съобщение, настроено тук."
-
-#~ msgid "Chat"
-#~ msgstr "Разговор"
-
-#~ msgid ""
-#~ "Determined by sender\n"
-#~ "Chat message\n"
-#~ "Single message"
-#~ msgstr ""
-#~ "определени от изпращача\n"
-#~ "разговор\n"
-#~ "лично съобщение"
-
-#~ msgid "E_very 5 minutes"
-#~ msgstr "Всеки 5 _минути"
-
-#~ msgid "Events"
-#~ msgstr "Събития"
-
-#~ msgid ""
-#~ "Gajim will automatically show new events by popping up the relevant window"
-#~ msgstr ""
-#~ "Автоматично ще се показват нови събития с изскачане на съответния прозорец"
-
-#~ msgid ""
-#~ "Gajim will notify you for new events via a popup in the bottom right of "
-#~ "the screen"
-#~ msgstr ""
-#~ "Ще се появяват съобщения за уведомяване чрез изскачащ прозорец в долния "
-#~ "десен ъгъл на екрана"
-
-#~ msgid ""
-#~ "Gajim will notify you via a popup window in the bottom right of the "
-#~ "screen about contacts that just signed in"
-#~ msgstr ""
-#~ "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
-#~ "включване на контакти"
-
-#~ msgid ""
-#~ "Gajim will only change the icon of the contact that triggered the new "
-#~ "event"
-#~ msgstr ""
-#~ "Само ще се променя иконата на контакта, от който идва новото събитие"
-
-#~ msgid ""
-#~ "If checked, Gajim will remember the roster and chat window positions in "
-#~ "the screen and the sizes of them next time you run it"
-#~ msgstr ""
-#~ "Ако тази опция е избрана, ще се запомнят размерите и позициите на списъка "
-#~ "и прозореца за разговор на екрана за следващото стартиране на програмата."
-
-#~ msgid ""
-#~ "Never\n"
-#~ "Always\n"
-#~ "Per account\n"
-#~ "Per type"
-#~ msgstr ""
-#~ "Никога\n"
-#~ "Винаги\n"
-#~ "Според акаунта\n"
-#~ "Според типа"
-
-#~ msgid "Outgoing Chat state noti_fications:"
-#~ msgstr "_Изпращани уведомления при разговор:"
-
-#~ msgid "Print time:"
-#~ msgstr "Изписване на часа:"
-
-#~ msgid "Save _position and size for roster and chat windows"
-#~ msgstr ""
-#~ "Запазване на _положението и размера на списъка с контакти и прозорците за "
-#~ "разговор"
-
-#~ msgid "Set status message to reflect currently playing _music track"
-#~ msgstr ""
-#~ "Настройване на съобщението за състояние да отразява _песента, която се "
-#~ "изпълнява в момента"
-
-#~ msgid "Show only in _roster"
-#~ msgstr "Показване само в спис_ъка"
-
-#~ msgid "The auto away status message"
-#~ msgstr "Автоматично съобщение за състояние при „Отсъствам“"
-
-#~ msgid "The auto not available status message"
-#~ msgstr "Автоматично съобщение за състояние при „Не съм на разположение“"
-
-#~ msgid "Treat all incoming messages as:"
-#~ msgstr "Третиране на всички входящи съобщения като:"
-
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "_Икона в областта за уведомяване"
-
-#~ msgid ""
-#~ "When a new event (message, file transfer request etc..) is received, the "
-#~ "following methods may be used to inform you about it. Please note that "
-#~ "events about new messages only occur if it is a new message from a "
-#~ "contact you are not already chatting with"
-#~ msgstr ""
-#~ "Когато се получи ново събитие (съобщение, запитване за файлов трансфер и "
-#~ "т.н.), могат да се използват следните методи за уведомяване. Забележете, "
-#~ "че събития за нови съобщения възникват само ако са нови съобщения от "
-#~ "контакт, с който не говорите в момента."
-
-#~ msgid ""
-#~ "Works for Rhythmbox and Muine players. For more players, please visit "
-#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
-#~ msgstr ""
-#~ "Работи с Rhythmbox и Muine. За повече програми, посетете http://trac."
-#~ "gajim.org/wiki/GajimAndMusicPlayer."
-
-#~ msgid "_Advanced Notifications Control..."
-#~ msgstr "_Контрол на уведомления за напреднали..."
-
-#~ msgid "_Font:"
-#~ msgstr "_Шрифт:"
-
-#~ msgid "_Never"
-#~ msgstr "_Никога"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Уведомяване"
-
-#~ msgid "_Player:"
-#~ msgstr "Пле_йър:"
-
-#~ msgid "_Pop it up"
-#~ msgstr "_Показване"
-
-#~ msgid "_URL:"
-#~ msgstr "_Адрес:"
-
-#~ msgid "Address"
-#~ msgstr "Адрес"
-
-#~ msgid "City:"
-#~ msgstr "Град:"
-
-#~ msgid "Company:"
-#~ msgstr "Фирма:"
-
-#~ msgid "Country:"
-#~ msgstr "Държава:"
-
-#~ msgid "Given:"
-#~ msgstr "Собствено:"
-
-#~ msgid "Middle:"
-#~ msgstr "Бащино:"
-
-#~ msgid "Position:"
-#~ msgstr "Длъжност:"
-
-#~ msgid "Prefix:"
-#~ msgstr "Обръщение:"
-
-#~ msgid "Role:"
-#~ msgstr "Роля:"
-
-#~ msgid "State:"
-#~ msgstr "Щат:"
-
-#~ msgid "Suffix:"
-#~ msgstr "Наставка:"
-
-#~ msgid "_Remove from Roster"
-#~ msgstr "П_ремахване от списъка"
-
-#~ msgid "A_ccounts"
-#~ msgstr "А_каунти"
-
-#~ msgid "_Filter:"
-#~ msgstr "_Филтър:"
-
-#~ msgid "Ask:"
-#~ msgstr "Питане за:"
-
-#~ msgid "Client:"
-#~ msgstr "Клиент:"
-
-#~ msgid "OS:"
-#~ msgstr "ОС:"
-
-#~ msgid "Subscription:"
-#~ msgstr "Записване:"
-
-#~ msgid ""
-#~ "If that is not your language for which you want to highlight misspelled "
-#~ "words, then please set your $LANG as appropriate. Eg. for French do "
-#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
-#~ "make it global in /etc/profile.\n"
-#~ "\n"
-#~ "Highlighting misspelled words feature will not be used"
-#~ msgstr ""
-#~ "Ако това не е езикът, за който искате осветяване на неправилно изписаните "
-#~ "думи, настройте променливата $LANG. За български език напишете „export "
-#~ "LANG=bg_BG“ или „export LANG=bg_BG.UTF-8“ в ~/.bash_profile или за "
-#~ "системна настройка в /etc/profile.\n"
-#~ "\n"
-#~ "Осветяването на неправилно изписаните думи няма да се използва"
-
-#~ msgid "Every %s _minutes"
-#~ msgstr "Всеки %s _минути"
-
-#~ msgid "You must enter a password for the new account."
-#~ msgstr "Трябва да въведете парола за новия акаунт."
-
-#~ msgid "You will always see him or her as offline."
-#~ msgstr "Винаги ще го виждате като изключен."
-
-#~ msgid "%s is now %s (%s)"
-#~ msgstr "%s вече е %s (%s)"
-
-#~ msgid "%s is now %s"
-#~ msgstr "%s сега е %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "From: %(from_address)s"
-#~ msgstr ""
-#~ "\n"
-#~ "От: %(from_address)s"
-
-#~ msgid "Network Manager support not available"
-#~ msgstr "Няма поддръжка за NetworkManager"
-
-#~ msgid "Session Management support not available (missing gnome.ui module)"
-#~ msgstr "Липсва поддръжка за управление на сесиите (модул gnome.ui)"
-
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Употреба: %s %s %s \n"
-#~ "\t %s"
-
-#~ msgid "Private Chat"
-#~ msgstr "Личен разговор"
-
-#~ msgid "Group Chat"
-#~ msgstr "Стая"
-
-#~ msgid "%s does not appear to be a valid JID"
-#~ msgstr "„%s“ изглежда не е валиден JID"
-
-#~ msgid "%s - Gajim"
-#~ msgstr "%s - Gajim"
-
-#~ msgid "_New group chat"
-#~ msgstr "_Нова стая"
-
-#~ msgid "_Log on"
-#~ msgstr "_Включване"
-
-#~ msgid "Log _off"
-#~ msgstr "Изкл_ючване"
-
-#~ msgid "Save passphrase"
-#~ msgstr "Запазване на паролата"
-
-#~ msgid "Drop %s in group %s"
-#~ msgstr "Преместване на %s в група %s"
-
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Създаване на %s и %s като мета-контакти"
-
-#~ msgid "Hides the buttons in two persons chat window."
-#~ msgstr "Скрива бутоните в прозорец за разговор с два контакта."
-
-#~ msgid "Connected to server %s:%s with %s"
-#~ msgstr "Свързан към сървър %s:%s с %s"
-
-#~ msgid "Security error connecting to \"%s\""
-#~ msgstr "Грешка в сигурността при свързването с „%s“"
-
-#~ msgid ""
-#~ "The server's key has changed, or someone is trying to hack your "
-#~ "connection."
-#~ msgstr ""
-#~ "Ключът на сървъра е променен, или някой се опитва да взломи връзката ви."
-
-#~ msgid "Unable to check fingerprint for %s. Connection could be insecure."
-#~ msgstr ""
-#~ "Неуспех при проверката на отпечатъка на %s. Свързването може да е "
-#~ "несигурно."
-
-#~ msgid "Missing fingerprint in SSL connection to %s"
-#~ msgstr "Липсва отпечатък при свързването чрез SSL с %s"
-
-#~ msgid "Fingerprint mismatch for %s: Got %s, expected %s"
-#~ msgstr "Отпечатъкът на %s не съвпада; получи се %s, а се очакваше %s"
-
-#~ msgid "invisible"
-#~ msgstr "невидим"
-
-#~ msgid "offline"
-#~ msgstr "изключен"
-
-#~ msgid " %d unread single message"
-#~ msgid_plural " %d unread single messages"
-#~ msgstr[0] " %d непрочетено еднократно съобщение"
-#~ msgstr[1] " %d непрочетени еднократни съобщения"
-
-#~ msgid " %d unread group chat message"
-#~ msgid_plural " %d unread group chat messages"
-#~ msgstr[0] " %d непрочетено съобщение в стая"
-#~ msgstr[1] " %d непрочетени съобщения в стаи"
-
-#~ msgid " %d unread private message"
-#~ msgid_plural " %d unread private messages"
-#~ msgstr[0] " %d непрочетено лично съобщение"
-#~ msgstr[1] " %d непрочетени лични съобщения"
-
-#~ msgid "gtk+"
-#~ msgstr "GTK+"
-
-#~ msgid ""
-#~ "Connection to host could not be established: Incorrect answer from server."
-#~ msgstr ""
-#~ "Неуспех при установяването на връзка с хоста: Неправилен отговор от "
-#~ "сървъра."
-
-#~ msgid "Connection to host could not be established"
-#~ msgstr "Неуспех при установяването на връзка с хоста"
1
0
Author: asterix
Date: 2008-12-02 21:54:10 +0100 (Tue, 02 Dec 2008)
New Revision: 10755
Modified:
trunk/po/bg.po
Log:
[Yavor Doganov] updated bulgarian translation
Modified: trunk/po/bg.po
===================================================================
--- trunk/po/bg.po 2008-12-02 19:49:49 UTC (rev 10754)
+++ trunk/po/bg.po 2008-12-02 20:54:10 UTC (rev 10755)
@@ -1,17 +1,16 @@
# Bulgarian translation of Gajim.
-# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is distributed under the same license as the Gajim package.
-# Yavor Doganov <yavor(a)doganov.org>, 2005, 2006, 2007.
+# Yavor Doganov <yavor(a)gnu.org>, 2005, 2006, 2007, 2008.
#
#
-#
msgid ""
msgstr ""
-"Project-Id-Version: Gajim 0.11.1\n"
+"Project-Id-Version: Gajim 0.12\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
-"PO-Revision-Date: 2007-01-17 18:54+0200\n"
-"Last-Translator: Yavor Doganov <yavor(a)doganov.org>\n"
+"POT-Creation-Date: 2008-12-02 21:52+0100\n"
+"PO-Revision-Date: 2008-12-02 22:33+0200\n"
+"Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n"
"Language-Team: Bulgarian <dict(a)fsa-bg.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +19,7 @@
#: ../data/gajim.desktop.in.in.h:1
msgid "A GTK+ Jabber client"
-msgstr "GTK+ Джабър клиент"
+msgstr "Джабър клиент за GTK+"
#: ../data/gajim.desktop.in.in.h:2
msgid "Gajim Instant Messenger"
@@ -32,13 +31,12 @@
#: ../data/glade/account_context_menu.glade.h:1
#: ../data/glade/roster_window.glade.h:7
-#, fuzzy
msgid "Join _Group Chat..."
-msgstr "_Влизане в стая"
+msgstr "_Влизане в стая…"
#: ../data/glade/account_context_menu.glade.h:2
msgid "_Add Contact..."
-msgstr "_Добавяне на контакт..."
+msgstr "_Добавяне на контакт…"
#: ../data/glade/account_context_menu.glade.h:3
#: ../data/glade/roster_window.glade.h:16
@@ -47,27 +45,24 @@
#: ../data/glade/account_context_menu.glade.h:4
msgid "_Execute Command..."
-msgstr "_Изпълнение на команда..."
+msgstr "_Изпълнение на команда…"
#: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
msgid "_Modify Account"
-msgstr "Промяна на акаунт"
+msgstr "_Промяна на акаунт"
#: ../data/glade/account_context_menu.glade.h:6
msgid "_Open Gmail Inbox"
msgstr "_Отваряне на пощенската кутия на Gmail"
#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
msgid "_Personal Events"
-msgstr "Лични данни"
+msgstr "_Лични събития"
#: ../data/glade/account_context_menu.glade.h:8
#: ../data/glade/roster_window.glade.h:24
-#, fuzzy
msgid "_Start Chat..."
-msgstr "_Започване на разговор"
+msgstr "_Започване на разговор…"
#: ../data/glade/account_context_menu.glade.h:9
#: ../data/glade/zeroconf_context_menu.glade.h:2
@@ -75,34 +70,34 @@
msgstr "_Състояние"
#: ../data/glade/account_creation_wizard_window.glade.h:1
-#, fuzzy
msgid ""
"<b>Connecting to server</b>\n"
"\n"
"Please wait..."
msgstr ""
-"<b>Акаунтът се създава</b>\n"
+"<b>Свързване със сървъра</b>\n"
"\n"
-"Изчакайте..."
+"Изчакайте…"
#: ../data/glade/account_creation_wizard_window.glade.h:4
msgid "<b>Please choose one of the options below:</b>"
msgstr "<b>Изберете една от опциите по-долу:</b>"
#: ../data/glade/account_creation_wizard_window.glade.h:5
-#, fuzzy
msgid "<b>Please fill in the data for your existing account</b>"
-msgstr "<b>Попълнете данните за нов акаунт</b>"
+msgstr "<b>Попълнете данните за съществуващия ви акаунт</b>"
#: ../data/glade/account_creation_wizard_window.glade.h:6
msgid "<b>Please select a server</b>"
-msgstr ""
+msgstr "<b>Изберете сървър</b>"
#: ../data/glade/account_creation_wizard_window.glade.h:7
msgid ""
"Add this certificate to the list of trusted certificates.\n"
"SHA1 fingerprint of the certificate:\n"
msgstr ""
+"Добавяне на този сертификат към списъка с доверени сертификати.\n"
+"Отпечатък тип SHA1 на сертификата:\n"
#: ../data/glade/account_creation_wizard_window.glade.h:10
msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
@@ -119,9 +114,8 @@
msgstr "Gajim: Помощник за създаване на акаунт"
#: ../data/glade/account_creation_wizard_window.glade.h:13
-#, fuzzy
msgid "I already have an account I want to _use"
-msgstr "Вече имам регистриран акаунт, който искам да използвам"
+msgstr "_Вече имам регистриран акаунт, който искам да използвам"
#: ../data/glade/account_creation_wizard_window.glade.h:14
msgid "I want to _register for a new account"
@@ -137,12 +131,11 @@
#: ../data/glade/account_modification_window.glade.h:26
#: ../data/glade/accounts_window.glade.h:34
msgid "Manage..."
-msgstr "Управление на..."
+msgstr "Управление на…"
#: ../data/glade/account_creation_wizard_window.glade.h:17
-#, fuzzy
msgid "Prox_y:"
-msgstr "Сървър-посредник:"
+msgstr "_Сървър-посредник:"
#: ../data/glade/account_creation_wizard_window.glade.h:18
#: ../data/glade/account_modification_window.glade.h:40
@@ -186,9 +179,8 @@
msgstr "_Приключване"
#: ../data/glade/account_creation_wizard_window.glade.h:27
-#, fuzzy
msgid "_Hostname:"
-msgstr "Хост: "
+msgstr "_Хост:"
#: ../data/glade/account_creation_wizard_window.glade.h:28
#: ../data/glade/account_modification_window.glade.h:50
@@ -239,9 +231,8 @@
#: ../data/glade/account_modification_window.glade.h:6
#: ../data/glade/accounts_window.glade.h:7
-#, fuzzy
msgid "Administration operations"
-msgstr "Списък с администратори"
+msgstr "Административни операции"
#: ../data/glade/account_modification_window.glade.h:7
#: ../data/glade/accounts_window.glade.h:8
@@ -268,14 +259,14 @@
msgstr ""
"Изберете тази опция, за да може Gajim да се свързва по порт 5223, където се "
"очаква сървърите да предоставят възможности по SSL. Забележете, че Gajim "
-"използва TLS шифриране по подразбиране и избирайки тази опция, изключвате "
-"TLS."
+"използва шифриране тип TLS по подразбиране и избирайки тази опция, "
+"изключвате TLS."
#: ../data/glade/account_modification_window.glade.h:11
#: ../data/glade/accounts_window.glade.h:12
#: ../data/glade/zeroconf_properties_window.glade.h:4
msgid "Choose _Key..."
-msgstr "Избор на _ключ..."
+msgstr "Избор на _ключ…"
#: ../data/glade/account_modification_window.glade.h:12
#: ../data/glade/accounts_window.glade.h:13
@@ -286,6 +277,7 @@
#: ../data/glade/accounts_window.glade.h:14
msgid "Click to request authorization to all contacts of another account"
msgstr ""
+"Натиснете, за да изискате упълномощаване от всички контакти на друг акаунт"
#: ../data/glade/account_modification_window.glade.h:14
#: ../data/glade/accounts_window.glade.h:15
@@ -295,14 +287,14 @@
#: ../data/glade/account_modification_window.glade.h:15
#: ../data/glade/accounts_window.glade.h:17
msgid "Edit Personal Information..."
-msgstr "Редактиране на личните данни..."
+msgstr "Редактиране на личните данни…"
#. No configured account
#: ../data/glade/account_modification_window.glade.h:16
#: ../data/glade/accounts_window.glade.h:20
#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../src/common/helpers.py:1055 ../src/notify.py:516 ../src/notify.py:547
+#: ../src/notify.py:559
msgid "Gajim"
msgstr "Gajim"
@@ -314,8 +306,8 @@
#: ../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:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../src/dialogs.py:166 ../src/roster_window.py:2660
+#: ../src/roster_window.py:5144
msgid "General"
msgstr "Общи"
@@ -375,24 +367,24 @@
#: ../data/glade/account_modification_window.glade.h:25
#: ../data/glade/accounts_window.glade.h:31
msgid "Information about you, as stored in the server"
-msgstr "Вашите личните данни, както са запазени на сървъра"
+msgstr "Вашите лични данни, както са запазени на сървъра"
#: ../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:1557
-#: ../src/config.py:2057
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1551
+#: ../src/config.py:2051
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:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1141
+#: ../src/config.py:1212 ../src/config.py:1459 ../src/config.py:1464
+#: ../src/config.py:1959 ../src/config.py:2037 ../src/config.py:2050
+#: ../src/config.py:3141 ../src/config.py:3209 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:522 ../src/roster_window.py:2729
+#: ../src/roster_window.py:2735 ../src/roster_window.py:2740
msgid "None"
msgstr "Няма"
@@ -479,9 +471,8 @@
#: ../data/glade/accounts_window.glade.h:51
#: ../data/glade/synchronise_contacts_dialog.glade.h:2
#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
msgid "Synchronise contacts"
-msgstr "Показване на изкл_ючените контакти"
+msgstr "Синхронизиране на контакти"
#: ../data/glade/account_modification_window.glade.h:44
msgid "Use _SSL (legacy)"
@@ -507,9 +498,8 @@
msgstr "_Име:"
#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
msgid "<b>Proxy</b>"
-msgstr "<b>Настройки</b>"
+msgstr "<b>Сървър-посредник</b>"
#: ../data/glade/accounts_window.glade.h:6
msgid "Accounts"
@@ -520,6 +510,8 @@
"Check this so Gajim will ask you before sending your password over an "
"insecure connection."
msgstr ""
+"Ако тази опция е избрана, ще се изисква потвърждение преди изпращането на "
+"паролата ви чрез несигурна връзка."
#: ../data/glade/accounts_window.glade.h:16
#: ../data/glade/zeroconf_information_window.glade.h:2
@@ -540,9 +532,9 @@
msgstr "Собствено име:"
#: ../data/glade/accounts_window.glade.h:24
-#, fuzzy
msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Ако тази опция е избрана, ще се запомни паролата за този акаунт."
+msgstr ""
+"Ако тази опция е избрана, паролата ще се взима от агент на GPG като Seahorse."
#: ../data/glade/accounts_window.glade.h:29
#: ../data/glade/zeroconf_properties_window.glade.h:11
@@ -557,7 +549,7 @@
#: ../data/glade/accounts_window.glade.h:32
#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:678
msgid "Jabber ID:"
msgstr "Jabber ID:"
@@ -572,13 +564,13 @@
msgstr "_Смесване на акаунти"
#. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5095
msgid "Re_name"
msgstr "Пре_именуване"
#: ../data/glade/accounts_window.glade.h:52
msgid "Use GPG _Agent"
-msgstr ""
+msgstr "Използване на агент на _GPG"
#: ../data/glade/accounts_window.glade.h:54
#: ../data/glade/zeroconf_properties_window.glade.h:21
@@ -587,24 +579,24 @@
#: ../data/glade/accounts_window.glade.h:59
msgid "_Warn before using an insecure connection"
-msgstr ""
+msgstr "Предупре_ждаване преди използване на несигурна връзка"
#: ../data/glade/accounts_window.glade.h:60
msgid "gtk-add"
-msgstr ""
+msgstr "gtk-add"
#: ../data/glade/accounts_window.glade.h:61
#: ../data/glade/features_window.glade.h:4
msgid "gtk-close"
-msgstr ""
+msgstr "gtk-close"
#: ../data/glade/accounts_window.glade.h:62
msgid "gtk-remove"
-msgstr ""
+msgstr "gtk-remove"
#: ../data/glade/accounts_window.glade.h:63
msgid "use HTTP_PROXY environment variable"
-msgstr ""
+msgstr "Използване на променливата на обкръжението „HTTP_PROXY“"
#: ../data/glade/add_new_contact_window.glade.h:1
msgid "A_ccount:"
@@ -680,19 +672,19 @@
#: ../data/glade/adhoc_commands_window.glade.h:5
msgid "Error description..."
-msgstr "Описание на грешката..."
+msgstr "Описание на грешката…"
#: ../data/glade/adhoc_commands_window.glade.h:6
msgid "Please wait while retrieving command list..."
-msgstr "Изчакайте, докато се извлече списъка с команди..."
+msgstr "Изчакайте, докато се извлече списъка с команди…"
#: ../data/glade/adhoc_commands_window.glade.h:7
msgid "Please wait while the command is sending..."
-msgstr "Изчакайте, докато командата се изпраща..."
+msgstr "Изчакайте, докато командата се изпраща…"
#: ../data/glade/adhoc_commands_window.glade.h:8
msgid "Please wait..."
-msgstr "Изчакайте..."
+msgstr "Изчакайте…"
#: ../data/glade/adhoc_commands_window.glade.h:9
msgid "This jabber entity does not expose any commands."
@@ -726,9 +718,8 @@
msgstr "Изтрива съобщението за деня"
#: ../data/glade/advanced_menuitem_menu.glade.h:3
-#, fuzzy
msgid "Edit _Privacy Lists..."
-msgstr "_Филтри за уединение"
+msgstr "_Филтри за уединение…"
#: ../data/glade/advanced_menuitem_menu.glade.h:4
msgid "Sends a message to users currently connected to this server"
@@ -736,9 +727,8 @@
"Изпраща съобщение на всички потребители, свързани със сървъра в момента"
#: ../data/glade/advanced_menuitem_menu.glade.h:5
-#, fuzzy
msgid "Set MOTD..."
-msgstr "Настройване на MOTD"
+msgstr "Настройване на MOTD…"
#: ../data/glade/advanced_menuitem_menu.glade.h:6
msgid "Sets Message of the Day"
@@ -749,9 +739,8 @@
msgstr "Показване на _XML конзола"
#: ../data/glade/advanced_menuitem_menu.glade.h:8
-#, fuzzy
msgid "Update MOTD..."
-msgstr "Актуализиране на MOTD"
+msgstr "Актуализиране на MOTD…"
#: ../data/glade/advanced_menuitem_menu.glade.h:9
msgid "Updates Message of the Day"
@@ -762,9 +751,8 @@
msgstr "_Администратор"
#: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
msgid "_Send Server Message..."
-msgstr "_Изпращане на съобщение от сървъра"
+msgstr "_Изпращане на съобщение от сървъра…"
#: ../data/glade/advanced_notifications_window.glade.h:1
msgid " a window/tab opened with that contact "
@@ -828,7 +816,7 @@
#: ../data/glade/advanced_notifications_window.glade.h:15
msgid "One or more special statuses..."
-msgstr "Едно или повече определени състояния..."
+msgstr "Едно или повече определени състояния…"
#: ../data/glade/advanced_notifications_window.glade.h:16
msgid "Online / Free For Chat"
@@ -948,32 +936,28 @@
msgstr "Получихте нов запис:"
#: ../data/glade/blocked_contacts_window.glade.h:1
-#, fuzzy
msgid "Blocked Contacts"
-msgstr "Контакти"
+msgstr "Блокирани контакти"
#: ../data/glade/change_activity_dialog.glade.h:1
-#, fuzzy
msgid "<b>Message:</b> "
-msgstr "<b>Настроени съобщения за състояние</b>"
+msgstr "<b>Съобщение:</b>"
#: ../data/glade/change_activity_dialog.glade.h:2
msgid "Set Activity"
-msgstr ""
+msgstr "Задаване на дейност"
#: ../data/glade/change_activity_dialog.glade.h:3
msgid "Set an activity"
-msgstr ""
+msgstr "Задаване на дейност"
#: ../data/glade/change_mood_dialog.glade.h:1
-#, fuzzy
msgid "<b>Message:</b>"
-msgstr "<b>Настроени съобщения за състояние</b>"
+msgstr "<b>Съобщение:</b>"
#: ../data/glade/change_mood_dialog.glade.h:2
-#, fuzzy
msgid "<b>Mood:</b>"
-msgstr "<b>Звуци</b>"
+msgstr "<b>Настроение:</b>"
#: ../data/glade/change_password_dialog.glade.h:1
msgid "Change Password"
@@ -997,7 +981,7 @@
#: ../data/glade/change_status_message_dialog.glade.h:3
msgid "Save as Preset..."
-msgstr "Запазване като настроено..."
+msgstr "Запазване като настроено…"
#: ../data/glade/chat_context_menu.glade.h:1
msgid "Join _Group Chat"
@@ -1005,9 +989,8 @@
#: ../data/glade/chat_context_menu.glade.h:2
#: ../data/glade/roster_contact_context_menu.glade.h:13
-#, fuzzy
msgid "_Add to Roster..."
-msgstr "Добавяне към _списъка..."
+msgstr "Добавяне към _списъка…"
#: ../data/glade/chat_context_menu.glade.h:3
msgid "_Copy JID/Email Address"
@@ -1031,64 +1014,76 @@
msgid "_Start Chat"
msgstr "_Започване на разговор"
+#. Execute Command
#: ../data/glade/chat_control_popup_menu.glade.h:1
-#, fuzzy
-msgid "Invite _Contacts"
-msgstr "Контакти"
+#: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:5682
+msgid "Execute Command..."
+msgstr "Изпълнение на команда…"
#: ../data/glade/chat_control_popup_menu.glade.h:2
+msgid "Invite _Contacts"
+msgstr "Покана на _контакти"
+
+#. Send Custom Status
+#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5060 ../src/roster_window.py:5648
+msgid "Send Cus_tom Status"
+msgstr "Изпращане на _специфично състояние"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
#: ../data/glade/gc_occupants_menu.glade.h:3
#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
msgid "Send _File"
msgstr "Изпращане на _файл"
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-#, fuzzy
+#: ../data/glade/chat_control_popup_menu.glade.h:5
msgid "Toggle End to End Encryption"
-msgstr "Превключване на Open_PGP шифриране"
+msgstr "Превключване на шифриране тип „End to End“"
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/chat_control_popup_menu.glade.h:6
msgid "Toggle Open_PGP Encryption"
-msgstr "Превключване на Open_PGP шифриране"
+msgstr "Превключване на шифриране тип „Open_PGP“"
-#: ../data/glade/chat_control_popup_menu.glade.h:5
+#: ../data/glade/chat_control_popup_menu.glade.h:7
#: ../data/glade/gc_occupants_menu.glade.h:4
msgid "_Add to Roster"
-msgstr "Добавяне към _списъка..."
+msgstr "Добавяне към _списъка…"
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/chat_control_popup_menu.glade.h:8
#: ../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:17
#: ../data/glade/roster_window.glade.h:20
#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5791
msgid "_History"
msgstr "Ист_ория"
#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
msgid "In_vite"
-msgstr "По_кана в"
+msgstr "По_кана"
#: ../data/glade/chat_to_muc_window.glade.h:2
msgid "Invite Friends!"
-msgstr ""
+msgstr "Поканете приятели!"
#: ../data/glade/chat_to_muc_window.glade.h:3
-#, fuzzy
msgid "MUC server"
-msgstr "Наблюдатели"
+msgstr "Сървър за стаи"
#: ../data/glade/chat_to_muc_window.glade.h:4
msgid "Please select a MUC server."
-msgstr ""
+msgstr "Изберете сървър за стаи."
#: ../data/glade/chat_to_muc_window.glade.h:5
msgid ""
"You are going to begin a Multi-User Chat.\n"
"Select the contacts you want to invite"
msgstr ""
+"На път сте да започнете разговор в стая.\n"
+"Изберете контактите, които искате да поканите."
#: ../data/glade/data_form_window.glade.h:1
msgid "Fill in the form."
@@ -1103,22 +1098,20 @@
msgstr "Редактиране на групи"
#: ../data/glade/esession_info_window.glade.h:1
-#, fuzzy
msgid "(<b>ESession</b> info)"
-msgstr "<b>Описание</b>"
+msgstr "(Информация за <b>Е-сесия</b>)"
#: ../data/glade/esession_info_window.glade.h:2
msgid "_Verify"
-msgstr ""
+msgstr "_Проверка"
#: ../data/glade/features_window.glade.h:2
msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
+msgstr "<b>Списък с възможни функционалности на Gajim:</b>"
#: ../data/glade/features_window.glade.h:3
-#, fuzzy
msgid "Features"
-msgstr "Функционалности на сървърите"
+msgstr "Възможности"
#: ../data/glade/filetransfers.glade.h:1
msgid "A list of active, completed and stopped file transfers"
@@ -1173,7 +1166,7 @@
msgid "When a file transfer is complete show a popup notification"
msgstr "Уведомяване чрез изскачащ прозорец при завършване на файловия трансфер"
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
msgid "_Continue"
msgstr "П_родължаване"
@@ -1209,7 +1202,7 @@
"Ред за контакт\n"
"Лента за разговор"
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:750
msgid "Bold"
msgstr "Получер"
@@ -1233,7 +1226,7 @@
msgid "Inactive"
msgstr "Бездеен"
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:751
msgid "Italic"
msgstr "Курсив"
@@ -1270,46 +1263,40 @@
msgstr "_Фон:"
#: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
msgid "Change _Nickname..."
-msgstr "Смяна на псе_вдоним"
+msgstr "Смяна на псе_вдоним…"
#: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
msgid "Change _Subject..."
-msgstr "Промяна на _темата"
+msgstr "Промяна на _темата…"
#: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
msgid "Configure _Room..."
-msgstr "Настройки на _стаята"
+msgstr "Настройки на _стаята…"
#: ../data/glade/gc_control_popup_menu.glade.h:4
-#, fuzzy
msgid "_Bookmark"
-msgstr "_Добавяне на тази стая към отметките"
+msgstr "_Добавяне на стаята към отметките"
#: ../data/glade/gc_control_popup_menu.glade.h:5
msgid "_Destroy Room"
-msgstr ""
+msgstr "_Унищожаване на стаята"
#: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
msgid "_Manage Room"
-msgstr "Управление на отметките"
+msgstr "_Управление на стаята"
#: ../data/glade/gc_control_popup_menu.glade.h:8
msgid "_Minimize on close"
-msgstr ""
+msgstr "_Минимизиране при затваряне"
#: ../data/glade/gc_occupants_menu.glade.h:1
msgid "Mo_derator"
msgstr "_Председател"
#: ../data/glade/gc_occupants_menu.glade.h:2
-#, fuzzy
msgid "Occupant Actions"
-msgstr "_Действия"
+msgstr "_Действия на участника"
#: ../data/glade/gc_occupants_menu.glade.h:5
msgid "_Admin"
@@ -1354,26 +1341,19 @@
msgstr "Тема"
#: ../data/glade/history_manager.glade.h:1
-#, fuzzy
msgid ""
"<b>WARNING:</b>\n"
"If you plan to do massive deletions, please make sure Gajim is not running. "
"Generally avoid deletions with contacts you currently chat with."
msgstr ""
-"<big><b>Добре дошли в мениджъра на историята на разговорите на Gajim</b></"
-"big>\n"
-"\n"
-"Може да избирате дневници отляво и/или да търсите в базата от данни долу.\n"
-"\n"
"<b>ПРЕДУПРЕЖДЕНИЕ:</b>\n"
-"Ако планирате да изтривате масово, уверете се, че Gajim не е стартиран. Като "
-"цяло избягвайте да изтривате история за контакти, с които разговаряте в "
+"Ако планирате да изтривате масово, уверете се, че Gajim не е стартиран. По "
+"принцип избягвайте да изтривате история за контакти, с които разговаряте в "
"момента."
#: ../data/glade/history_manager.glade.h:3
-#, fuzzy
msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
-msgstr "Мениджър на историята на разговорите"
+msgstr "<big><b>Добре дошли в мениджъра на историята на разговорите</b></big>"
#: ../data/glade/history_manager.glade.h:4
msgid "Delete"
@@ -1395,12 +1375,17 @@
"Use this program to delete or export logs. You can select logs from the left "
"and/or search database from below."
msgstr ""
+"Този мениджър не е предназначен за преглед на историята на разговорите. Ако "
+"търсите такава функционалност, използвайте прозореца за история.\n"
+"\n"
+"Използвайте тази програма за изтриване или изнасяне на дневници. Може да ги "
+"избирате от списъка вляво и/или да търсите в базата от данни по-долу."
#: ../data/glade/history_manager.glade.h:10
msgid "_Search Database"
msgstr "_Търсене в базата от данни"
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:314
msgid "Conversation History"
msgstr "История на разговорите"
@@ -1410,18 +1395,20 @@
"Groupchat Histories\n"
"All Chat Histories"
msgstr ""
+"Въведете JID или име на контакт\n"
+"История на разговори в стаи\n"
+"История на всички разговори"
#: ../data/glade/history_window.glade.h:5
-#, fuzzy
msgid "Search:"
-msgstr "Търсене"
+msgstr "Търсене:"
#: ../data/glade/history_window.glade.h:6
#: ../data/glade/zeroconf_information_window.glade.h:10
msgid "_Log conversation history"
msgstr "_Запазване на разговорите"
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1697
msgid "Join Group Chat"
msgstr "Влизане в стая"
@@ -1448,7 +1435,7 @@
msgid "Room:"
msgstr "Стая:"
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1198
#: ../src/disco.py:1618
msgid "_Join"
msgstr "_Влизане"
@@ -1471,7 +1458,7 @@
#: ../data/glade/manage_bookmarks_window.glade.h:4
msgid "Minimize on Auto Join"
-msgstr ""
+msgstr "Минимизиране при автоматично влизане"
#: ../data/glade/manage_bookmarks_window.glade.h:7
msgid "Print status:"
@@ -1486,19 +1473,16 @@
msgstr "Заглавие:"
#: ../data/glade/manage_pep_services_window.glade.h:1
-#, fuzzy
msgid "PEP Service Configuration"
-msgstr "Настройки на стаята"
+msgstr "Настройки на услугата PEP"
#: ../data/glade/manage_pep_services_window.glade.h:2
-#, fuzzy
msgid "_Configure"
-msgstr "П_родължаване"
+msgstr "_Настройване"
#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
msgid "gtk-delete"
-msgstr "Изтриване"
+msgstr "gtk-delete"
#: ../data/glade/manage_proxies_window.glade.h:1
msgid "<b>Properties</b>"
@@ -1509,11 +1493,12 @@
msgstr "<b>Настройки</b>"
#: ../data/glade/manage_proxies_window.glade.h:3
-#, fuzzy
msgid ""
"HTTP Connect\n"
"SOCKS5"
-msgstr "Свързване по HTTP"
+msgstr ""
+"Свързване по HTTP\n"
+"SOCKS5"
#: ../data/glade/manage_proxies_window.glade.h:5
msgid "Manage Proxy Profiles"
@@ -1540,52 +1525,52 @@
msgstr "_Хост:"
#: ../data/glade/message_window.glade.h:1
-#, fuzzy
msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Добавяне на контакт към списъка"
+msgstr "Добавяне на контакт към списъка (Ctrl+D)"
#: ../data/glade/message_window.glade.h:2
-#, fuzzy
msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Добавяне на тази стая към отметките"
+msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
#: ../data/glade/message_window.glade.h:3
msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
+msgstr "Разглеждане на историята на разговорите (Ctrl+H)"
#: ../data/glade/message_window.glade.h:4
msgid "Change the room's subject (Alt+T)"
-msgstr ""
+msgstr "Смяна на темата на стаята (Alt+T)"
#: ../data/glade/message_window.glade.h:5
-#, fuzzy
msgid "Change your nickname (Ctrl+N)"
-msgstr "Смяна на псе_вдоним"
+msgstr "Смяна на псевдоним (Ctrl+N)"
#: ../data/glade/message_window.glade.h:6
-#, fuzzy
msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "обръща внимание на разговора"
+msgstr "Покана на контакти в разговора (Ctrl+G)"
#: ../data/glade/message_window.glade.h:7
msgid "Send a file (Ctrl+F)"
-msgstr ""
+msgstr "Изпращане на файл (Ctrl+F)"
#: ../data/glade/message_window.glade.h:8
-#, fuzzy
msgid "Show a list of emoticons (Alt+M)"
-msgstr "Натиснете за вмъкване на емотикона (Alt+M)"
+msgstr "Списък с емотикони (Alt+M)"
#: ../data/glade/message_window.glade.h:9
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Списък с емотикони (Alt+M)"
#: ../data/glade/message_window.glade.h:10
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr "Меню с функции за напреднали (Ctrl+A)"
+
+#: ../data/glade/message_window.glade.h:11
msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
+msgstr "Показване на профила на контакта (Ctrl+I)"
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/message_window.glade.h:12
+#: ../data/glade/message_window.glade.h:13
#: ../data/glade/xml_console_window.glade.h:11
#: ../src/filetransfers_window.py:261
msgid "_Send"
@@ -1604,24 +1589,20 @@
msgstr "<b>Програми</b>"
#: ../data/glade/preferences_window.glade.h:3
-#, fuzzy
msgid "<b>Auto Status</b>"
-msgstr "<b>Действия</b>"
+msgstr "<b>Автоматично състояние</b>"
#: ../data/glade/preferences_window.glade.h:4
-#, fuzzy
msgid "<b>Chat Appearance</b>"
-msgstr "<b>Редактиране на правило</b>"
+msgstr "<b>Изглед на разговорите</b>"
#: ../data/glade/preferences_window.glade.h:5
-#, fuzzy
msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Цветове на подпрозорците</b>"
+msgstr "<b>Цветове за разговорите</b>"
#: ../data/glade/preferences_window.glade.h:6
-#, fuzzy
msgid "<b>Chat state notifications</b>"
-msgstr "<b>Зрителни уведомления</b>"
+msgstr "<b>Уведомления за състояния на разговора</b>"
#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
#: ../data/glade/preferences_window.glade.h:8
@@ -1629,36 +1610,32 @@
msgstr "<b>Персонални</b>"
#: ../data/glade/preferences_window.glade.h:9
-#, fuzzy
msgid "<b>Font</b>"
-msgstr "<b>Звуци</b>"
+msgstr "<b>Шрифт</b>"
#: ../data/glade/preferences_window.glade.h:10
msgid "<b>GMail Options</b>"
-msgstr "<b>Настройки за Gmail</b>"
+msgstr "<b>Настройки за GMail</b>"
#: ../data/glade/preferences_window.glade.h:12
msgid "<b>Preset Status Messages</b>"
msgstr "<b>Настроени съобщения за състояние</b>"
#: ../data/glade/preferences_window.glade.h:13
-#, fuzzy
msgid "<b>Privacy</b>"
-msgstr "<i>Филтър за уединение</i>"
+msgstr "<b>Уединение</b>"
#: ../data/glade/preferences_window.glade.h:14
msgid "<b>Roster Appearance</b>"
-msgstr ""
+msgstr "<b>Изглед на списъка</b>"
#: ../data/glade/preferences_window.glade.h:16
-#, fuzzy
msgid "<b>Status Messages</b>"
-msgstr "<b>Настроени съобщения за състояние</b>"
+msgstr "<b>Съобщения за състояние</b>"
#: ../data/glade/preferences_window.glade.h:17
-#, fuzzy
msgid "<b>Themes</b>"
-msgstr "<b>Настройки</b>"
+msgstr "<b>Теми</b>"
#: ../data/glade/preferences_window.glade.h:18
msgid "<b>Visual Notifications</b>"
@@ -1669,9 +1646,8 @@
msgstr "Напреднали"
#: ../data/glade/preferences_window.glade.h:20
-#, fuzzy
msgid "Advanced..."
-msgstr "Напреднали"
+msgstr "Напреднали…"
#: ../data/glade/preferences_window.glade.h:21
msgid ""
@@ -1698,7 +1674,6 @@
msgstr "Питане за съобщение за състояние при преминаване в режим:"
#: ../data/glade/preferences_window.glade.h:27
-#, fuzzy
msgid ""
"Autodetect on every Gajim startup\n"
"Always use GNOME default applications\n"
@@ -1709,19 +1684,16 @@
"Автоматично определяне при всяко стартиране на Gajim\n"
"Винаги да се използват стандартните програми на GNOME\n"
"Винаги да се използват стандартните програми на KDE\n"
-"Винаги да се използват стандартните програми на Xfce4\n"
+"Винаги да се използват стандартните програми на Xfce\n"
"Персонални"
#: ../data/glade/preferences_window.glade.h:32
-#, fuzzy
msgid "Chat message:"
-msgstr "С_ъобщение за състояние:"
+msgstr "Съобщение от разговор:"
#: ../data/glade/preferences_window.glade.h:33
-#, fuzzy
msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr ""
-"_Винаги да се проверява дали Gajim е стандартния Джабър клиент при стартиране"
+msgstr "_Да се проверява дали Gajim е стандартния Джабър клиент при стартиране"
#: ../data/glade/preferences_window.glade.h:34
msgid "Configure color and font of the interface"
@@ -1735,29 +1707,31 @@
"Detached roster with chat grouped by account\n"
"Detached roster with chat grouped by type"
msgstr ""
+"Отделен списък и прозорци за разговори\n"
+"Отделен списък и един прозорец за разговори\n"
+"Един прозорец за всичко\n"
+"Отделен списък и разговори, групирани по акаунт\n"
+"Отделен списък и разговори, групирани по вид"
#: ../data/glade/preferences_window.glade.h:40
-#, fuzzy
msgid "Display _activity of contacts in roster"
-msgstr "Показване на _аватари на контактите в списъка"
+msgstr "Показване на _дейност на контактите в списъка"
#: ../data/glade/preferences_window.glade.h:41
msgid "Display _extra email details"
msgstr "Показване на _допълнителни данни за е-поща"
#: ../data/glade/preferences_window.glade.h:42
-#, fuzzy
msgid "Display _tunes of contacts in roster"
-msgstr "Показване на _аватари на контактите в списъка"
+msgstr "Показване на _слушаната от контактите музика в списъка"
#: ../data/glade/preferences_window.glade.h:43
msgid "Display a_vatars of contacts in roster"
msgstr "Показване на _аватари на контактите в списъка"
#: ../data/glade/preferences_window.glade.h:44
-#, fuzzy
msgid "Display m_ood of contacts in roster"
-msgstr "Показване на _аватари на контактите в списъка"
+msgstr "Показване на _настроенията на контактите в списъка"
#: ../data/glade/preferences_window.glade.h:45
msgid "Display status _messages of contacts in roster"
@@ -1791,16 +1765,16 @@
"изключване на контакти"
#: ../data/glade/preferences_window.glade.h:50
-#, fuzzy
msgid "Hide all buttons in chat windows"
-msgstr "Скрива бутоните в прозореца на стаята."
+msgstr "Скриване на всички бутони в прозорците за разговор."
#: ../data/glade/preferences_window.glade.h:51
-#, fuzzy
msgid ""
"If checked, Gajim will allow others to detect the operation system you are "
"using"
-msgstr "Ако тази опция е избрана, ще влизате в тази стая при стартиране."
+msgstr ""
+"Ако тази опция е избрана, контактите ще могат да откриват операционната "
+"система, която използвате."
#: ../data/glade/preferences_window.glade.h:52
msgid ""
@@ -1814,12 +1788,16 @@
msgid ""
"If checked, Gajim will change status to Away when the computer is unused."
msgstr ""
+"Ако тази опция е избрана, Gajim ще променя състоянието на „Отсъствам“ когато "
+"компютърът не се използва."
#: ../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"
msgstr ""
+"Ако тази опция е избрана, Gajim ще променя състоянието на „Не съм на "
+"разположение“ когато компютърът не се използва по-дълго време."
#: ../data/glade/preferences_window.glade.h:55
msgid ""
@@ -1838,28 +1816,25 @@
"показват под имената им в списъка и в стаите"
#: ../data/glade/preferences_window.glade.h:57
-#, fuzzy
msgid ""
"If checked, Gajim will display the activity of contacts in the roster window"
msgstr ""
-"Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
-"и стаите"
+"Ако тази опция е избрана, Gajim ще изобразява дейността на контактите в "
+"списъка."
#: ../data/glade/preferences_window.glade.h:58
-#, fuzzy
msgid ""
"If checked, Gajim will display the mood of contacts in the roster window"
msgstr ""
-"Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
-"и стаите"
+"Ако тази опция е избрана, Gajim ще изобразява настроението на контактите в "
+"списъка."
#: ../data/glade/preferences_window.glade.h:59
-#, fuzzy
msgid ""
"If checked, Gajim will display the tunes of contacts in the roster window"
msgstr ""
-"Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
-"и стаите"
+"Ако тази опция е избрана, Gajim ще изобразява слушаната от контактите музика "
+"в списъка."
#: ../data/glade/preferences_window.glade.h:60
msgid ""
@@ -1867,17 +1842,20 @@
"windows. If no language is explicitly set via right click on the input "
"field, the default language will be used for this contact or group chat."
msgstr ""
+"Ако тази опция е избрана, ще се осветяват правописни грешки в полетата за "
+"въвеждане на текст в прозорците за разговор. Ако не е избран език чрез "
+"натискане с десния бутон на мишката в полето за въвеждане, ще се използва "
+"езикът по подразбиране."
#: ../data/glade/preferences_window.glade.h:61
-#, fuzzy
msgid ""
"If checked, Gajim will ignore incoming events from unauthorized contacts. "
"Use with caution, because it blocks all messages from any contact that is "
"not in the roster"
msgstr ""
-"Изберете тази опция само ако някой, който не в списъка, ви притеснява или "
-"дразни. Използвайте я внимателно, тъй като блокира всички съобщения от всеки "
-"контакт, който не е в списъка."
+"Ако тази опция е избрана, Gajim ще игнорира входящи събития от "
+"неупълномощени контакти. Използвайте я внимателно, тъй като блокира всички "
+"съобщения от всеки контакт, който не е в списъка."
#: ../data/glade/preferences_window.glade.h:62
msgid ""
@@ -1885,15 +1863,17 @@
"when using E2E encryption the remote party has to agree on logging, else the "
"messages will not be logged."
msgstr ""
+"Ако тази опция е избрана, Gajim ще запазва дневници за шифрираните "
+"съобщение. Забележете, че при шифриране тип „E2E“ другата страна трябва да "
+"се съгласи, иначе съобщенията няма да бъдат запазвани."
#: ../data/glade/preferences_window.glade.h:63
-#, fuzzy
msgid ""
"If checked, Gajim will show a notification when a new e-mail is received via "
"GMail"
msgstr ""
-"Ако тази опция е избрана, Gajim ще включва информация за подателя на новите "
-"писма."
+"Ако тази опция е избрана, Gajim ще показва уведомление при получаването на "
+"ново писмо чрез GMail."
#: ../data/glade/preferences_window.glade.h:64
msgid ""
@@ -1910,6 +1890,8 @@
"If enabled, Gajim will not ask for a status message. The specified default "
"message will be used instead."
msgstr ""
+"Ако тази опция е избрана, няма да се пита за съобщение за състояние — ще се "
+"използва стандартно зададеното."
#: ../data/glade/preferences_window.glade.h:66
msgid ""
@@ -1921,40 +1903,35 @@
#: ../data/glade/preferences_window.glade.h:67
msgid "Log _encrypted chat session"
-msgstr ""
+msgstr "Запазване на дневник на _шифрираната сесия"
#: ../data/glade/preferences_window.glade.h:68
-#, fuzzy
msgid "Ma_ke message windows compact"
-msgstr "_Един прозорец за разговори:"
+msgstr "_Компактни прозорци за разговор"
#: ../data/glade/preferences_window.glade.h:69
msgid "Ma_nage..."
-msgstr "_Управление..."
+msgstr "_Управление…"
#: ../data/glade/preferences_window.glade.h:70
-#, fuzzy
msgid "Notifications"
-msgstr "Промяна на акаунт"
+msgstr "Уведомления"
#: ../data/glade/preferences_window.glade.h:71
-#, fuzzy
msgid "Notify me about contacts that sign _in"
-msgstr "Уведомяване за контакти при: "
+msgstr "Уведомяване за _включващи се контакти"
#: ../data/glade/preferences_window.glade.h:72
-#, fuzzy
msgid "Notify me about contacts that sign _out"
-msgstr "Уведомяване за контакти при: "
+msgstr "Уведомяване за _изключващи се контакти"
#: ../data/glade/preferences_window.glade.h:73
msgid "Notify on new _GMail email"
-msgstr "Уведомяване при нова поща от _Gmail"
+msgstr "Уведомяване при нова поща от _GMail"
#: ../data/glade/preferences_window.glade.h:74
-#, fuzzy
msgid "Personal Events"
-msgstr "Лични данни"
+msgstr "Лични събития"
#: ../data/glade/preferences_window.glade.h:75
msgid "Play _sounds"
@@ -1966,6 +1943,9 @@
"Notify me about it\n"
"Show only in roster"
msgstr ""
+"Показване в изскачащ прозорец\n"
+"Уведомяване\n"
+"Показване само в списъка"
#: ../data/glade/preferences_window.glade.h:79
msgid "Preferences"
@@ -1988,23 +1968,20 @@
"н.). Ако тази опция е избрана, Gajim ще изобразява само обикновения текст."
#: ../data/glade/preferences_window.glade.h:83
-#, fuzzy
msgid "Sort contacts by status"
-msgstr "Подре_ждане на контактите по състояние"
+msgstr "Подреждане на контактите по състояние"
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:397
msgid "Status"
msgstr "Състояние"
#: ../data/glade/preferences_window.glade.h:85
-#, fuzzy
msgid "Status _iconset:"
-msgstr "Стандартен _набор икони за състояние:"
+msgstr "_Набор икони за състояние:"
#: ../data/glade/preferences_window.glade.h:86
-#, fuzzy
msgid "Style"
-msgstr "Блокирал"
+msgstr "Стил"
#: ../data/glade/preferences_window.glade.h:87
msgid "T_heme:"
@@ -2015,45 +1992,44 @@
"The auto away status message. If empty, Gajim will not change the current "
"status message"
msgstr ""
+"Съобщение за автоматично състояние „Отсъствам“. Ако е празно, няма да се "
+"сменя текущото съобщение."
#: ../data/glade/preferences_window.glade.h:89
msgid ""
"The auto not available status message. If empty, Gajim will not change the "
"current status message"
msgstr ""
+"Съобщение за автоматично състояние „Не съм на разположение“. Ако е празно, "
+"няма да се сменя текущото съобщение."
#: ../data/glade/preferences_window.glade.h:90
-#, fuzzy
msgid "Use _transports icons"
-msgstr "Използване на набор и_кони на транспортите"
+msgstr "Използване на и_кони за транспортите"
#: ../data/glade/preferences_window.glade.h:91
msgid "Use system _default"
msgstr "Използване на стан_дартните за системата"
#: ../data/glade/preferences_window.glade.h:92
-#, fuzzy
msgid "When new event is received:"
-msgstr "При получаване на ново събитие"
+msgstr "При получаване на ново събитие:"
#: ../data/glade/preferences_window.glade.h:93
-#, fuzzy
msgid "_Away after:"
-msgstr "Автоматично „_Отсъствам“ след:"
+msgstr "„_Отсъствам“ след:"
#: ../data/glade/preferences_window.glade.h:94
msgid "_Browser:"
msgstr "Интернет _браузър:"
#: ../data/glade/preferences_window.glade.h:95
-#, fuzzy
msgid "_Display chat state notifications:"
-msgstr "Показвани уведомления при _разговор:"
+msgstr "Показване на уведомления при _разговор:"
#: ../data/glade/preferences_window.glade.h:96
-#, fuzzy
msgid "_Emoticons:"
-msgstr "Емотикони:"
+msgstr "_Емотикони:"
#: ../data/glade/preferences_window.glade.h:97
msgid "_File manager:"
@@ -2068,11 +2044,8 @@
msgstr "Прене_брегване на събития от контакти, които не са в списъка"
#: ../data/glade/preferences_window.glade.h:100
-#, fuzzy
msgid "_Ignore rich content in incoming messages"
-msgstr ""
-"Пренебрегване на съдържанието на входящите съобщения, което не е обикновен "
-"текст"
+msgstr "_Пренебрегване на излишно форматиране на входящите съобщения"
#: ../data/glade/preferences_window.glade.h:101
msgid "_Incoming message:"
@@ -2087,13 +2060,12 @@
msgstr "_Програма за е-поща:"
#: ../data/glade/preferences_window.glade.h:104
-#, fuzzy
msgid "_Not available after:"
-msgstr "Автоматично „Не съм на _разположение“ след:"
+msgstr "„Не съм на _разположение“ след:"
#: ../data/glade/preferences_window.glade.h:105
msgid "_Open..."
-msgstr "_Отваряне..."
+msgstr "_Отваряне…"
#: ../data/glade/preferences_window.glade.h:106
msgid "_Outgoing message:"
@@ -2104,9 +2076,8 @@
msgstr "Възстановяване на стандартните _цветове"
#: ../data/glade/preferences_window.glade.h:108
-#, fuzzy
msgid "_Send chat state notifications:"
-msgstr "Показвани уведомления при _разговор:"
+msgstr "Изпращане на уведомления при _разговор:"
#: ../data/glade/preferences_window.glade.h:109
msgid "_Status message:"
@@ -2114,21 +2085,19 @@
#: ../data/glade/preferences_window.glade.h:110
msgid "_URL highlight:"
-msgstr ""
+msgstr "_Адреси:"
#: ../data/glade/preferences_window.glade.h:111
msgid "_Window behavior:"
-msgstr ""
+msgstr "_Поведение на прозорците:"
#: ../data/glade/preferences_window.glade.h:112
-#, fuzzy
msgid "in _group chats"
-msgstr "_Влизане в стая"
+msgstr "в _стаи"
#: ../data/glade/preferences_window.glade.h:113
-#, fuzzy
msgid "in _roster"
-msgstr "Не е в списъка"
+msgstr "в с_писъка"
#: ../data/glade/preferences_window.glade.h:114
msgid "minutes"
@@ -2178,7 +2147,7 @@
msgid "Order:"
msgstr "Ред:"
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
msgid "Privacy List"
msgstr "Филтър за уединение"
@@ -2220,151 +2189,127 @@
#: ../data/glade/profile_window.glade.h:1
#: ../data/glade/vcard_information_window.glade.h:1
-#, fuzzy
msgid "<b>Address</b>"
-msgstr "<b>Добавяне на правило</b>"
+msgstr "<b>Адрес</b>"
#: ../data/glade/profile_window.glade.h:2
-#, fuzzy
msgid "<b>Avatar:</b>"
-msgstr "Аватар:"
+msgstr "<b>Аватар:</b>"
#: ../data/glade/profile_window.glade.h:3
#: ../data/glade/vcard_information_window.glade.h:4
-#, fuzzy
msgid "<b>Birthday:</b>"
-msgstr "Рожден ден:"
+msgstr "<b>Рожден ден:</b>"
#: ../data/glade/profile_window.glade.h:4
#: ../data/glade/vcard_information_window.glade.h:5
-#, fuzzy
msgid "<b>City:</b>"
-msgstr "<b>Персонални</b>"
+msgstr "<b>Град:</b>"
#: ../data/glade/profile_window.glade.h:5
#: ../data/glade/vcard_information_window.glade.h:7
-#, fuzzy
msgid "<b>Company:</b>"
-msgstr "<b>Персонални</b>"
+msgstr "<b>Фирма:</b>"
#: ../data/glade/profile_window.glade.h:6
#: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
msgid "<b>Country:</b>"
-msgstr "<b>Звуци</b>"
+msgstr "<b>Държава:</b>"
#: ../data/glade/profile_window.glade.h:7
#: ../data/glade/vcard_information_window.glade.h:9
-#, fuzzy
msgid "<b>Department:</b>"
-msgstr "Отдел:"
+msgstr "<b>Отдел:</b>"
#: ../data/glade/profile_window.glade.h:8
#: ../data/glade/vcard_information_window.glade.h:10
-#, fuzzy
msgid "<b>E-Mail:</b>"
-msgstr "Е-поща:"
+msgstr "<b>Е-поща:</b>"
#: ../data/glade/profile_window.glade.h:9
#: ../data/glade/vcard_information_window.glade.h:11
-#, fuzzy
msgid "<b>Extra Address:</b>"
-msgstr "Допълнителен адрес:"
+msgstr "<b>Допълнителен адрес:</b>"
#. Family Name
#: ../data/glade/profile_window.glade.h:11
#: ../data/glade/vcard_information_window.glade.h:13
-#, fuzzy
msgid "<b>Family:</b>"
-msgstr "Фамилия:"
+msgstr "<b>Фамилия:</b>"
#: ../data/glade/profile_window.glade.h:12
#: ../data/glade/vcard_information_window.glade.h:14
-#, fuzzy
msgid "<b>Full Name</b>"
-msgstr "<b>Персонални</b>"
+msgstr "<b>Име</b>"
#. Given Name
#: ../data/glade/profile_window.glade.h:14
#: ../data/glade/vcard_information_window.glade.h:16
-#, fuzzy
msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgstr "<b>Собствено:</b>"
#: ../data/glade/profile_window.glade.h:15
#: ../data/glade/vcard_information_window.glade.h:17
-#, fuzzy
msgid "<b>Homepage:</b>"
-msgstr "Страница в Интернет:"
+msgstr "<b>Страница в Интернет:</b>"
#. Middle Name
#: ../data/glade/profile_window.glade.h:17
#: ../data/glade/vcard_information_window.glade.h:20
-#, fuzzy
msgid "<b>Middle:</b>"
-msgstr "<b>Добавяне на правило</b>"
+msgstr "<b>Презиме:</b>"
#: ../data/glade/profile_window.glade.h:18
#: ../data/glade/vcard_information_window.glade.h:21
-#, fuzzy
msgid "<b>Name:</b>"
-msgstr "<b>Персонални</b>"
+msgstr "<b>Име:</b>"
#: ../data/glade/profile_window.glade.h:19
#: ../data/glade/vcard_information_window.glade.h:22
-#, fuzzy
msgid "<b>Nickname:</b>"
-msgstr "Псевдоним:"
+msgstr "<b>Псевдоним:</b>"
#: ../data/glade/profile_window.glade.h:20
#: ../data/glade/vcard_information_window.glade.h:23
-#, fuzzy
msgid "<b>Phone No.:</b>"
-msgstr "Телефон:"
+msgstr "<b>Телефон:</b>"
#: ../data/glade/profile_window.glade.h:21
#: ../data/glade/vcard_information_window.glade.h:24
-#, fuzzy
msgid "<b>Position:</b>"
-msgstr "<b>Условия</b>"
+msgstr "<b>Дейност:</b>"
#: ../data/glade/profile_window.glade.h:22
#: ../data/glade/vcard_information_window.glade.h:25
-#, fuzzy
msgid "<b>Postal Code:</b>"
-msgstr "Пощенски код:"
+msgstr "<b>Пощенски код:</b>"
#. Prefix in Name
#: ../data/glade/profile_window.glade.h:24
#: ../data/glade/vcard_information_window.glade.h:27
-#, fuzzy
msgid "<b>Prefix:</b>"
-msgstr "<b>Настройки</b>"
+msgstr "<b>Представка:</b>"
#: ../data/glade/profile_window.glade.h:25
#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
-#, fuzzy
msgid "<b>Role:</b>"
-msgstr "<b>Звуци</b>"
+msgstr "<b>Роля:</b>"
#: ../data/glade/profile_window.glade.h:26
#: ../data/glade/vcard_information_window.glade.h:30
-#, fuzzy
msgid "<b>State:</b>"
-msgstr "<b>Настройки</b>"
+msgstr "<b>Област/Щат:</b>"
#: ../data/glade/profile_window.glade.h:27
#: ../data/glade/vcard_information_window.glade.h:32
-#, fuzzy
msgid "<b>Street:</b>"
-msgstr "<b>Настройки</b>"
+msgstr "<b>Улица:</b>"
#. Suffix in Name
#: ../data/glade/profile_window.glade.h:29
#: ../data/glade/vcard_information_window.glade.h:36
-#, fuzzy
msgid "<b>Suffix:</b>"
-msgstr "<b>Звуци</b>"
+msgstr "<b>Наставка:</b>"
#. "About" is the text of a tab of vcard window
#: ../data/glade/profile_window.glade.h:31
@@ -2406,8 +2351,8 @@
#. Remove group
#. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5132
+#: ../src/roster_window.py:5610 ../src/roster_window.py:5739
msgid "_Remove"
msgstr "_Премахване"
@@ -2416,57 +2361,39 @@
msgstr "_Запитване за виждане на състоянието на контакта"
#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
msgid "Add Special _Notification..."
-msgstr "Добавяне на специално _уведомление"
+msgstr "Добавяне на специално _уведомление…"
#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
msgid "Assign Open_PGP Key..."
-msgstr "Задаване на Open_PGP ключ"
+msgstr "Задаване на ключ Open_PGP…"
#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
msgid "Edit _Groups..."
-msgstr "Редактиране на _групи"
+msgstr "Редактиране на _групи…"
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
-msgid "Execute Command..."
-msgstr "Изпълнение на команда..."
-
#. Invite to
#. Invite to Groupchat
#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5050 ../src/roster_window.py:5563
msgid "In_vite to"
msgstr "По_кана в"
#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
msgid "Remo_ve"
-msgstr "_Премахване"
+msgstr "П_ремахване"
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
-#, fuzzy
-msgid "Send Cus_tom Status"
-msgstr "Изпраща указан XML"
-
#: ../data/glade/roster_contact_context_menu.glade.h:9
msgid "Send Single _Message..."
-msgstr "Изпращане на _еднократно съобщение..."
+msgstr "Изпращане на _еднократно съобщение…"
#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
msgid "Send _File..."
-msgstr "Изпращане на _файл"
+msgstr "Изпращане на _файл…"
#: ../data/glade/roster_contact_context_menu.glade.h:11
msgid "Set Custom _Avatar..."
-msgstr ""
+msgstr "Задаване на друг _аватар…"
#: ../data/glade/roster_contact_context_menu.glade.h:12
#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
@@ -2478,10 +2405,10 @@
msgstr "_Позволение за виждане на състоянието ми"
#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
+#: ../src/roster_window.py:5123 ../src/roster_window.py:5600
+#: ../src/roster_window.py:5729
msgid "_Block"
-msgstr ""
+msgstr "_Блокиране"
#: ../data/glade/roster_contact_context_menu.glade.h:16
msgid "_Forbid him/her to see my status"
@@ -2489,43 +2416,38 @@
#: ../data/glade/roster_contact_context_menu.glade.h:18
msgid "_Ignore"
-msgstr ""
+msgstr "_Игнориране"
#: ../data/glade/roster_contact_context_menu.glade.h:19
#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
msgid "_Manage Contact"
-msgstr "Преименуване на контакт"
+msgstr "_Управление на контакт"
#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
msgid "_Rename..."
-msgstr "_Преименуване"
+msgstr "_Преименуване…"
#: ../data/glade/roster_contact_context_menu.glade.h:21
msgid "_Subscription"
msgstr "_Записване"
#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
+#: ../src/roster_window.py:5117 ../src/roster_window.py:5594
+#: ../src/roster_window.py:5726
msgid "_Unblock"
-msgstr ""
+msgstr "_Деблокиране"
#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
msgid "_Unignore"
-msgstr "девет"
+msgstr "_Премахване на игнорирането"
#: ../data/glade/roster_window.glade.h:1
-#, fuzzy
msgid "Add _Contact..."
-msgstr "_Добавяне на контакт..."
+msgstr "_Добавяне на контакт…"
#: ../data/glade/roster_window.glade.h:2
-#, fuzzy
msgid "Fea_tures"
-msgstr "Функционалности на сървърите"
+msgstr "_Възможности"
#: ../data/glade/roster_window.glade.h:3
msgid "File _Transfers"
@@ -2533,15 +2455,15 @@
#: ../data/glade/roster_window.glade.h:4
msgid "Frequently Asked Questions (online)"
-msgstr "Често задавани въпроси (уеб страница)"
+msgstr "Често задавани въпроси (в Интернет)"
#: ../data/glade/roster_window.glade.h:6
msgid "Help online"
-msgstr "Помощ в Интернет (уеб страници)"
+msgstr "Помощ в Интернет"
#: ../data/glade/roster_window.glade.h:8
msgid "Profile, A_vatar"
-msgstr "Профил, _аватар"
+msgstr "_Профил, аватар"
#: ../data/glade/roster_window.glade.h:9
msgid "Show Trans_ports"
@@ -2552,14 +2474,12 @@
msgstr "Показване на изкл_ючените контакти"
#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
msgid "Show _roster"
msgstr "П_оказване на списъка"
#: ../data/glade/roster_window.glade.h:12
-#, fuzzy
msgid "_Accounts"
-msgstr "Акаунти"
+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
@@ -2571,7 +2491,7 @@
msgid "_Contents"
msgstr "_Ръководства"
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1352
msgid "_Edit"
msgstr "_Редактиране"
@@ -2581,7 +2501,7 @@
#: ../data/glade/roster_window.glade.h:19
msgid "_Help"
-msgstr "_Помощ"
+msgstr "Помо_щ"
#: ../data/glade/roster_window.glade.h:21
msgid "_Preferences"
@@ -2592,35 +2512,31 @@
msgstr "_Изход"
#: ../data/glade/roster_window.glade.h:23
-#, fuzzy
msgid "_Send Single Message..."
-msgstr "Изпращане на _еднократно съобщение..."
+msgstr "Изпращане на _еднократно съобщение…"
#: ../data/glade/roster_window.glade.h:25
msgid "_View"
msgstr "_Изглед"
#: ../data/glade/search_window.glade.h:1
-#, fuzzy
msgid "Please wait while retrieving search form..."
-msgstr "Изчакайте, докато се извлече списъка с команди..."
+msgstr "Изчакайте, докато се извлече формуляра за търсене…"
#: ../data/glade/search_window.glade.h:2
msgid "Search"
msgstr "Търсене"
#: ../data/glade/search_window.glade.h:3
-#, fuzzy
msgid "_Add contact"
msgstr "Добавяне на _контакт"
#. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
-#, fuzzy
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5751
msgid "_Information"
-msgstr "Информация за контакта"
+msgstr "_Информация"
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1210
msgid "_Search"
msgstr "_Търсене"
@@ -2708,21 +2624,21 @@
msgstr "_Отказване"
#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+#, fuzzy
msgid "Select the account with which to synchronise"
-msgstr ""
+msgstr "Изберете акаунт, с който искате да синхронизирате"
#: ../data/glade/synchronise_select_account_dialog.glade.h:1
msgid "Select the account with which you want to synchronise"
-msgstr ""
+msgstr "Изберете акаунт, с който искате да синхронизирате"
#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
-#, fuzzy
msgid "Select the contacts you want to synchronise"
-msgstr "JID на контакта, с който искате да разговаряте"
+msgstr "Изберете контактите, които искате да синхронизирате"
#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
msgid "Synchronise : select contacts"
-msgstr ""
+msgstr "Синхронизиране: избор на контакти"
#: ../data/glade/systray_context_menu.glade.h:1
msgid "Mute Sounds"
@@ -2750,49 +2666,41 @@
#. Given Name
#: ../data/glade/vcard_information_window.glade.h:3
-#, fuzzy
msgid "<b>Ask:</b>"
-msgstr "<b>Действия</b>"
+msgstr "<b>Запитване:</b>"
#: ../data/glade/vcard_information_window.glade.h:6
-#, fuzzy
msgid "<b>Client:</b>"
-msgstr "<b>Персонални</b>"
+msgstr "<b>Клиент:</b>"
#: ../data/glade/vcard_information_window.glade.h:18
-#, fuzzy
msgid "<b>Jabber ID:</b>"
-msgstr "Jabber ID:"
+msgstr "<b>Jabber ID:</b>"
#: ../data/glade/vcard_information_window.glade.h:28
-#, fuzzy
msgid "<b>Resource:</b>"
-msgstr "Ресурс:"
+msgstr "<b>Ресурс:</b>"
#: ../data/glade/vcard_information_window.glade.h:31
-#, fuzzy
msgid "<b>Status:</b>"
-msgstr "<b>Настройки</b>"
+msgstr "<b>Състояние:</b>"
#. Family Name
#: ../data/glade/vcard_information_window.glade.h:34
-#, fuzzy
msgid "<b>Subscription:</b>"
-msgstr "<b>Описание</b>"
+msgstr "<b>Записване:</b>"
#: ../data/glade/vcard_information_window.glade.h:37
-#, fuzzy
msgid "<b>System:</b>"
-msgstr "<b>Персонални</b>"
+msgstr "<b>Система:</b>"
#: ../data/glade/vcard_information_window.glade.h:40
msgid "Comments"
msgstr "Коментари"
#: ../data/glade/vcard_information_window.glade.h:41
-#, fuzzy
msgid "Configured avatar:"
-msgstr "Настройки на _стаята"
+msgstr "Настроен аватар:"
#: ../data/glade/vcard_information_window.glade.h:42
#: ../data/glade/zeroconf_information_window.glade.h:1
@@ -2808,7 +2716,6 @@
msgstr "Още"
#: ../data/glade/vcard_information_window.glade.h:48
-#, fuzzy
msgid "User avatar:"
msgstr "Аватар:"
@@ -2844,23 +2751,23 @@
#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
msgid "Assign Open_PGP Key"
-msgstr "Задаване на Open_PGP ключ"
+msgstr "Задаване на ключ на Open_PGP"
#. Edit Groups
#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5583
msgid "Edit _Groups"
msgstr "Редактиране на _групи"
#. Rename
#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5709
msgid "_Rename"
msgstr "_Преименуване"
#: ../data/glade/zeroconf_context_menu.glade.h:1
msgid "_Modify Account..."
-msgstr "_Промяна на акаунт..."
+msgstr "_Промяна на акаунт…"
#: ../data/glade/zeroconf_information_window.glade.h:6
msgid "Local jid:"
@@ -2883,27 +2790,26 @@
msgstr "Промяна на акаунт"
#: ../src/adhoc_commands.py:264
-#, fuzzy
msgid "Cancel confirmation"
-msgstr "Информация за контакта"
+msgstr "Отмяна на потвърждението"
#: ../src/adhoc_commands.py:265
msgid ""
"You are in process of executing command. Do you really want to cancel it?"
-msgstr ""
+msgstr "На път сте да изпълните команда. Наистина ли искате да я отмените?"
#: ../src/adhoc_commands.py:304
msgid "Service changed the session identifier."
-msgstr ""
+msgstr "Услугата промени идентификатора на сесията."
#: ../src/adhoc_commands.py:317
msgid "Service sent malformed data"
-msgstr ""
+msgstr "Услугата изпрати лошо форматирани данни"
#. when stanza doesn't have error description
#: ../src/adhoc_commands.py:398
msgid "Service returned an error."
-msgstr ""
+msgstr "Услугата върна грешка."
#. For i18n
#: ../src/advanced.py:97
@@ -2926,7 +2832,7 @@
msgid "Text"
msgstr "Текст"
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:770
msgid "Color"
msgstr "Цвят"
@@ -2956,323 +2862,342 @@
#. #!/bin/sh
#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "English"
msgstr "английски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Belarusian"
msgstr "белоруски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Bulgarian"
msgstr "български"
-#: ../src/chat_control.py:68
-#, fuzzy
+#: ../src/chat_control.py:67
msgid "Breton"
msgstr "бретонски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Czech"
msgstr "чешки"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "German"
msgstr "немски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Greek"
msgstr "гръцки"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "British"
msgstr "британски английски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Esperanto"
msgstr "есперанто"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Spanish"
msgstr "испански"
-#: ../src/chat_control.py:68
-#, fuzzy
+#: ../src/chat_control.py:67
msgid "Basque"
msgstr "баски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "French"
msgstr "френски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Croatian"
msgstr "хърватски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Italian"
msgstr "италиански"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Norwegian (b)"
msgstr "норвежки (Bokmål)"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Dutch"
msgstr "холандски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Norwegian"
msgstr "норвежки (Nynorsk)"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Polish"
msgstr "полски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Portuguese"
msgstr "португалски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Brazilian Portuguese"
msgstr "бразилски португалски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Russian"
msgstr "руски"
-#: ../src/chat_control.py:68
-#, fuzzy
+#: ../src/chat_control.py:67
msgid "Serbian"
-msgstr "немски"
+msgstr "сръбски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Slovak"
msgstr "словашки"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Swedish"
msgstr "шведски"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Chinese (Ch)"
msgstr "китайски"
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:335
msgid "Spelling language"
msgstr "Език за проверка на правописа"
#. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:358 ../src/chat_control.py:553
msgid "A connection is not available"
msgstr "В момента няма връзка"
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:359 ../src/chat_control.py:554
msgid "Your message can not be sent until you are connected."
msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#: ../src/chat_control.py:752
#, fuzzy
+msgid "Underline"
+msgstr "Неопределен"
+
+#: ../src/chat_control.py:753
+#, fuzzy
+msgid "Strike"
+msgstr "Болен"
+
+#: ../src/chat_control.py:776
+msgid "Font"
+msgstr ""
+
+#: ../src/chat_control.py:785
+#, fuzzy
+msgid "Clear formating"
+msgstr "Информация за контакта"
+
+#: ../src/chat_control.py:1215 ../src/chat_control.py:1617
msgid "GPG encryption enabled"
-msgstr "Шифрирането е включено"
+msgstr "Шифрирането чрез GPG е включено"
#. Add to roster
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/chat_control.py:1244 ../src/chat_control.py:2111
#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:861
+#: ../src/dialogs.py:903 ../src/gajim.py:980 ../src/gajim.py:1640
+#: ../src/normal_control.py:483 ../src/roster_window.py:911
+#: ../src/roster_window.py:1537 ../src/roster_window.py:1539
+#: ../src/roster_window.py:1871 ../src/roster_window.py:3098
+#: ../src/roster_window.py:3121 ../src/roster_window.py:5244
+#: ../src/roster_window.py:5429
msgid "Not in Roster"
msgstr "Не е в списъка"
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1376 ../src/tooltips.py:627
msgid "Unknown Artist"
-msgstr ""
+msgstr "Неизвестен изпълнител"
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1378 ../src/tooltips.py:632
msgid "Unknown Title"
-msgstr ""
+msgstr "Неизвестно заглавие"
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1380 ../src/tooltips.py:637
msgid "Unknown Source"
-msgstr ""
+msgstr "Неизвестен източник"
-#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#: ../src/chat_control.py:1384 ../src/tooltips.py:639
#, 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/chat_control.py:1314
-#, fuzzy, python-format
+#: ../src/chat_control.py:1389
+#, python-format
msgid ""
"%(title)s by %(artist)s\n"
"from %(source)s"
-msgstr "„%(title)s“ от %(artist)s"
+msgstr ""
+"%(title)s на %(artist)s\n"
+"от %(source)s"
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1512
#, 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:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1597 ../src/dialogs.py:3907
msgid "No GPG key assigned"
-msgstr ""
+msgstr "Няма зададен ключ на GPG"
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1598
msgid ""
"No GPG key is assigned to this contact. So you cannot encrypt messages with "
"GPG."
msgstr ""
+"Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
+"съобщенията с GPG."
-#: ../src/chat_control.py:1533
-#, fuzzy
+#: ../src/chat_control.py:1607
msgid "GPG encryption disabled"
-msgstr "Шифрирането е изключено"
+msgstr "Шифрирането чрез GPG е изключено"
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1632
msgid "Session WILL be logged"
-msgstr ""
+msgstr "ЩЕ СЕ запазва дневник за сесията"
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1634
msgid "Session WILL NOT be logged"
-msgstr ""
+msgstr "НЯМА да се запазва дневник за сесията"
#. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1648
msgid "is"
-msgstr ""
+msgstr "е"
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1648
msgid "is NOT"
-msgstr ""
+msgstr "НЕ е"
#. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1650
msgid "will"
-msgstr ""
+msgstr "Ще"
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1650
msgid "will NOT"
-msgstr ""
+msgstr "НЯМА да"
#. About encrypted chat session
-#: ../src/chat_control.py:1580
-#, fuzzy
+#: ../src/chat_control.py:1654
msgid "and authenticated"
-msgstr "Използване на удостоверяване"
+msgstr "и удостоверяването е успешно"
#. About encrypted chat session
-#: ../src/chat_control.py:1584
-#, fuzzy
+#: ../src/chat_control.py:1658
msgid "and NOT authenticated"
-msgstr "Използване на удостоверяване"
+msgstr "и удостоверяването НЕ Е успешно"
#. 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:1590
+#: ../src/chat_control.py:1664
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
"Your chat session %(logged)s be logged."
msgstr ""
+"Шифрирането чрез %(type)s %(status)s включено %(authenticated)s.\n"
+"%(logged)s се запазва дневник за сесията."
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1712
msgid "Command not supported for zeroconf account."
-msgstr ""
+msgstr "Командата не се поддържа за акаунт тип „zeroconf“."
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1723 ../src/groupchat_control.py:1651
#, python-format
msgid "Commands: %s"
msgstr "Команди: %s"
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1726 ../src/groupchat_control.py:1665
#, python-format
msgid "Usage: /%s, clears the text window."
msgstr "Употреба: /%s, изчиства текстовия прозорец."
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1729 ../src/groupchat_control.py:1670
#, python-format
msgid "Usage: /%s, hide the chat buttons."
msgstr "Употреба: /%s, скрива бутоните за разговор."
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
-#, fuzzy, python-format
+#: ../src/chat_control.py:1732 ../src/groupchat_control.py:1686
+#, python-format
msgid ""
"Usage: /%(command)s <action>, sends action to the current group chat. Use "
"third person. (e.g. /%(command)s explodes.)"
msgstr ""
-"Употреба: /%s <действие>, изпраща действие до текущата стая. Използва се "
-"трето лице (т.е. „/%s експлодира“)."
+"Употреба: /%(command)s <действие>, изпраща действие до текущата стая. "
+"Използва се трето лице (напр. „/%(command)s експлодира“)."
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1737
#, python-format
msgid "Usage: /%s, sends a ping to the contact"
-msgstr ""
+msgstr "Употреба: /%s, изпраща „ping“ до контакта."
-#: ../src/chat_control.py:1666
-#, fuzzy, python-format
+#: ../src/chat_control.py:1740
+#, python-format
msgid "Usage: /%s, send the message to the contact"
-msgstr "Употреба: /%s, скрива бутоните за разговор."
+msgstr "Употреба: /%s, изпраща съобщение до контакта."
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1743 ../src/groupchat_control.py:1709
#, python-format
msgid "No help info for /%s"
msgstr "Няма помощна информация за /%s"
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1875
msgid "Session negotiation cancelled"
-msgstr ""
+msgstr "Договорката за сесията отменена"
-#: ../src/chat_control.py:1807
-#, fuzzy
+#: ../src/chat_control.py:1882
msgid "This session is encrypted"
-msgstr "[Това съобщение е шифрирано]"
+msgstr "Тази сесия е шифрирана"
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1885
msgid " and WILL be logged"
-msgstr ""
+msgstr " и ЩЕ СЕ запазва дневник"
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1887
msgid " and WILL NOT be logged"
-msgstr ""
+msgstr " и НЯМА да се запазва дневник"
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1892
msgid ""
"Remote contact's identity not verified. Click the shield button for more "
"details."
msgstr ""
+"Идентичността на отсрещния контакт не е потвърдена. Натиснете бутона със "
+"щита за повече информация."
-#: ../src/chat_control.py:1819
-#, fuzzy
+#: ../src/chat_control.py:1894
msgid "E2E encryption disabled"
-msgstr "Шифрирането е изключено"
+msgstr "Шифрирането чрез E2E е изключено"
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
-#, fuzzy
+#: ../src/chat_control.py:1922 ../src/chat_control.py:1935
msgid "The following message was NOT encrypted"
-msgstr "[Това съобщение е шифрирано]"
+msgstr "Следното съобщение НЕ БЕШЕ шифрирано"
-#: ../src/chat_control.py:1854
-#, fuzzy
+#: ../src/chat_control.py:1928
msgid "The following message was encrypted"
-msgstr "[Това съобщение е шифрирано]"
+msgstr "Следното съобщение беше шифрирано"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2299
#, python-format
msgid "You just received a new message from \"%s\""
msgstr "Току-що получихте ново съобщение от „%s“"
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2300
msgid ""
"If you close this tab and you have history disabled, this message will be "
"lost."
@@ -3280,47 +3205,49 @@
"Ако затворите този прозорец и нямате включена опция за запазване на "
"историята, съобщението ще бъде загубено."
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../src/chat_control.py:2448 ../src/common/connection_handlers.py:1845
+#: ../src/common/connection_handlers.py:1891
+#: ../src/common/connection_handlers.py:2079
+#: ../src/common/connection_handlers.py:2212 ../src/common/connection.py:1215
+#: ../src/gajim.py:174
msgid "Database Error"
-msgstr ""
+msgstr "Грешка в базата от данни"
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2449
#, python-format
msgid ""
"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:2608
-#, fuzzy, python-format
+#: ../src/chat_control.py:2685
+#, python-format
msgid "%(name)s is now %(status)s"
-msgstr "%(nick)s вече е %(status)s"
+msgstr "%(name)s вече е %(status)s"
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
msgid "creating logs database"
msgstr "създаване на база от данни за разговорите"
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129
#, python-format
msgid "%s is a file but it should be a directory"
msgstr "%s e файл, а би трябвало да е папка"
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../src/common/check_paths.py:112 ../src/common/check_paths.py:123
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:138
msgid "Gajim will now exit"
msgstr "Спиране на програмата"
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:137
#, python-format
msgid "%s is a directory but should be a file"
msgstr "%s e папка, а би трябвало да е файл"
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:153
#, python-format
msgid "creating %s directory"
msgstr "създаване на папка %s"
@@ -3384,25 +3311,23 @@
#. Make special context menu if group is Groupchats
#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/helpers.py:73 ../src/roster_window.py:785
+#: ../src/roster_window.py:1541 ../src/roster_window.py:1543
+#: ../src/roster_window.py:5020
msgid "Groupchats"
msgstr "Стаи"
#: ../src/common/commands.py:247
-#, fuzzy
msgid "You left the following groupchats:"
-msgstr "Излязохте от следните стаи:"
+msgstr "Напуснахте следните стаи:"
#: ../src/common/commands.py:259
-#, fuzzy
msgid "Forward unread messages"
-msgstr " %d непрочетено съобщение"
+msgstr "Препращане на непрочетени съобщения"
#: ../src/common/commands.py:279
msgid "All unread messages have been forwarded."
-msgstr ""
+msgstr "Всички непрочетени съобщения бяха препратени."
#: ../src/common/config.py:82
msgid "Use D-Bus and Notification-Daemon to show notifications"
@@ -3413,13 +3338,14 @@
msgstr "Време в минути, след което състоянието да се променя на „Отсъствам“."
#: ../src/common/config.py:88
-#, fuzzy
msgid "$S (Away as a result of being idle more than $T min)"
-msgstr "Автоматично състояние поради липса на активност"
+msgstr "$S (Отсъствам поради липса на активност над $T мин)"
#: ../src/common/config.py:88
msgid "$S will be replaced by current status message, $T by autoaway time."
msgstr ""
+"$S ще бъде заменено от текущото съобщение за състояние, а $T от времето на "
+"отсъствие."
#: ../src/common/config.py:90
msgid "Time in minutes, after which your status changes to not available."
@@ -3428,13 +3354,14 @@
"разположение“."
#: ../src/common/config.py:91
-#, fuzzy
msgid "$S (Not available as a result of being idle more than $T min)"
-msgstr "Автоматично състояние поради липса на активност"
+msgstr "$S (Не съм на разположение поради липса на активност над $T мин)"
#: ../src/common/config.py:91
msgid "$S will be replaced by current status message, $T by autoxa time."
msgstr ""
+"$S ще бъде заменено от текущото съобщение за състояние, а $T от времето на "
+"отсъствие."
#: ../src/common/config.py:111
msgid ""
@@ -3444,12 +3371,11 @@
"свиват автоматично."
#. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
-#, fuzzy
+#: ../src/common/config.py:112 ../src/common/config.py:452
+#: ../src/common/optparser.py:217 ../src/common/optparser.py:435
+#: ../src/common/optparser.py:469 ../src/gajim.py:3128
msgid "default"
-msgstr "По подразбиране"
+msgstr "по подразбиране"
#: ../src/common/config.py:116
msgid "Enable link-local/zeroconf messaging"
@@ -3490,8 +3416,8 @@
msgid ""
"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
msgstr ""
-"Ако е „True“, не се премахват */_. Така *абв* ще е в получер стил, но със "
-"символите * *."
+"Ако е активирана, не се премахват */_. Така *абв* ще е в получер стил, но "
+"със символите * *."
#: ../src/common/config.py:128
msgid ""
@@ -3520,7 +3446,7 @@
"Знак, който да се предложи да бъде добавен след желания псевдоним, когато "
"той вече е използван от някой в стаята."
-#: ../src/common/config.py:161
+#: ../src/common/config.py:165
msgid ""
"This option let you customize timestamp that is printed in conversation. For "
"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3531,19 +3457,19 @@
"документацията на Питон относно „strftime“ за повече информация: http://docs."
"python.org/lib/module-time.html"
-#: ../src/common/config.py:162
+#: ../src/common/config.py:166
msgid "Characters that are printed before the nickname in conversations"
msgstr "Знаци, които се изобразяват в разговори преди псевдонима"
-#: ../src/common/config.py:163
+#: ../src/common/config.py:167
msgid "Characters that are printed after the nickname in conversations"
msgstr "Знаци, които се изобразяват в разговори след псевдонима"
-#: ../src/common/config.py:168
+#: ../src/common/config.py:172
msgid "Add * and [n] in roster title?"
msgstr "Добавяне на * и [n] към заглавието на списъка?"
-#: ../src/common/config.py:169
+#: ../src/common/config.py:173
msgid ""
"How many lines to remember from previous conversation when a chat tab/window "
"is reopened."
@@ -3551,21 +3477,21 @@
"Колко реда от предишния разговор да за запомнят при повторното отваряне на "
"подпрозорец/прозорец."
-#: ../src/common/config.py:170
+#: ../src/common/config.py:174
msgid "How many minutes should last lines from previous conversation last."
msgstr "Колко минути да отделят последните редове от предишния разговор."
-#: ../src/common/config.py:171
+#: ../src/common/config.py:175
msgid ""
"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
"Client default behaviour)."
msgstr "Изпращане на съобщение при Ctrl+Enter и нов ред с „Enter“."
-#: ../src/common/config.py:173
+#: ../src/common/config.py:177
msgid "How many lines to store for Ctrl+KeyUP."
msgstr "Колко реда да се запазват за Ctrl+горна стрелка."
-#: ../src/common/config.py:176
+#: ../src/common/config.py:180
#, python-format
msgid ""
"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3574,32 +3500,32 @@
"Или определен адрес, съдържащ %s, където %s е думата/фразата, или "
"„WIKTIONARY“, което означава използване на wiktionary."
-#: ../src/common/config.py:179
+#: ../src/common/config.py:183
msgid "If checked, Gajim can be controlled remotely using gajim-remote."
msgstr ""
"Ако тази опция е избрана, Gajim може да се контролира отдалечено чрез gajim-"
"remote."
-#: ../src/common/config.py:180
+#: ../src/common/config.py:184
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 "
"False and they sync with global status) based upon the status of the network "
"connection."
msgstr ""
-"Ако е „True“, слуша за сигнали по DBus от NetworkManager и променя "
-"състоянието на акаунтите (при положение, че нямат настроена "
-"„listen_to_network_manager“ на „False“ и се синхронизират с общото "
-"състояние) в зависимост от състоянието на мрежовата връзка."
+"Ако е активирана, слуша за сигнали по DBus от NetworkManager и променя "
+"състоянието на акаунтите (при положение, че нямат изключена "
+"„listen_to_network_manager“ и се синхронизират с общото състояние) в "
+"зависимост от състоянието на мрежовата връзка."
-#: ../src/common/config.py:181
+#: ../src/common/config.py:185
msgid ""
"Sent chat state notifications. Can be one of all, composing_only, disabled."
msgstr ""
"Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
"„composing_only“, „disabled“."
-#: ../src/common/config.py:182
+#: ../src/common/config.py:186
msgid ""
"Displayed chat state notifications in chat windows. Can be one of all, "
"composing_only, disabled."
@@ -3607,7 +3533,7 @@
"Показвани уведомления за състоянието на разговора в прозорците за разговор. "
"Може да бъде „all“, „composing_only“, „disabled“."
-#: ../src/common/config.py:184
+#: ../src/common/config.py:188
msgid ""
"When not printing time for every message (print_time==sometimes), print it "
"every x minutes."
@@ -3615,11 +3541,11 @@
"Когато не се изписва часа на всяко съобщение („print_time“ е настроено на "
"„sometimes“), да се показва на всеки x минути."
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
msgid "Ask before closing a group chat tab/window."
msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
-#: ../src/common/config.py:186
+#: ../src/common/config.py:190
msgid ""
"Always ask before closing group chat tab/window in this space separated list "
"of group chat jids."
@@ -3627,7 +3553,7 @@
"Винаги да се пита преди затваряне на подпрозорец/прозорец на стая от този "
"списък с адреси на стаи."
-#: ../src/common/config.py:187
+#: ../src/common/config.py:191
msgid ""
"Never ask before closing group chat tab/window in this space separated list "
"of group chat jids."
@@ -3635,113 +3561,120 @@
"Никога да не се пита преди затваряне на подпрозорец/прозорец на стая от този "
"списък с адреси на стаи."
-#: ../src/common/config.py:190
-#, fuzzy
+#: ../src/common/config.py:194
msgid ""
"Comma separated list of hosts that we send, in addition of local interfaces, "
"for File Transfer in case of address translation/port forwarding."
msgstr ""
-"Превъзмогва хоста при файлов трансфер в случай, че се ползва NAT/"
+"Списък от хостове, разделен със запетаи, които се изпращат като допълнение "
+"към локалните интерфейси за файлов трансфер в случай, че се ползва NAT/"
"пренасочване на портове."
-#: ../src/common/config.py:192
+#: ../src/common/config.py:196
msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
msgstr "Според стандарта на IEC KiB = 1024 байта, KB = 1000 байта."
-#: ../src/common/config.py:194
+#: ../src/common/config.py:198
msgid "Notify of events in the system trayicon."
msgstr "Уведомяване за събития в областта за уведомяване."
-#: ../src/common/config.py:200
+#: ../src/common/config.py:204
msgid "Show tab when only one conversation?"
msgstr "Показване на подпрозорец при един разговор?"
-#: ../src/common/config.py:201
+#: ../src/common/config.py:205
msgid "Show tabbed notebook border in chat windows?"
msgstr "Показване на границата на подпрозореца в прозорците за разговор?"
-#: ../src/common/config.py:202
+#: ../src/common/config.py:206
msgid "Show close button in tab?"
msgstr "Показване на бутона за затваряне на подпрозореца?"
-#: ../src/common/config.py:203
+#: ../src/common/config.py:207
msgid ""
"When negotiating an encrypted session, should Gajim assume you want your "
"messages to be logged?"
msgstr ""
+"Когато се договаря шифрирана сесия, да се приема ли, че искате собствените "
+"съобщения да се запазват в дневник?"
-#: ../src/common/config.py:204
+#: ../src/common/config.py:208
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 "
"numbers are more secure, but take longer to calculate when you start a "
"session."
msgstr ""
+"Списък от групи „modp“ за употреба чрез алгоритъма „Дифи-Хелман“, разделени "
+"чрез запетаи, най-предпочитаните в началото. Валидни групи са 1, 2, 5, 14, "
+"15, 16, 17 и 18. По-големите числа са по-сигурни, но изчисленията отнемат "
+"повече време в началото на сесията."
-#: ../src/common/config.py:213
+#: ../src/common/config.py:217
msgid "Preview new messages in notification popup?"
-msgstr ""
+msgstr "Показване на нови съобщения в изскачащ прозорец?"
-#: ../src/common/config.py:218
+#: ../src/common/config.py:222
msgid ""
"A semicolon-separated list of words that will be highlighted in group chats."
msgstr ""
"Списък с думи, отделени с точка и запетая, които ще се осветяват при "
"разговор в стая."
-#: ../src/common/config.py:219
+#: ../src/common/config.py:223
msgid ""
"If True, quits Gajim when X button of Window Manager is clicked. This "
"setting is taken into account only if trayicon is used."
msgstr ""
-"Ако е „True“, се спира програмата при натискане на бутона „X“ на "
+"Ако е активирана, се спира програмата при натискане на бутона „X“ на "
"администратора на прозорци. Тази настройка е валидна само ако се използва "
"иконата в областта за уведомяване."
-#: ../src/common/config.py:220
+#: ../src/common/config.py:224
msgid ""
"If True, Gajim will check if it's the default jabber client on each startup."
msgstr ""
-"Ако е „True“, Gajim ще проверява дали е стандартния Джабър клиент при всяко "
-"стартиране."
+"Ако е активирана, Gajim ще проверява дали е стандартния Джабър клиент при "
+"всяко стартиране."
-#: ../src/common/config.py:221
+#: ../src/common/config.py:225
msgid ""
"If True, Gajim will display an icon on each tab containing unread messages. "
"Depending on the theme, this icon may be animated."
msgstr ""
-"Ако е „True“, ще се изобразява икона във всеки подпрозорец, съдържащ "
+"Ако е активирана, ще се изобразява икона във всеки подпрозорец, съдържащ "
"непрочетени съобщения. В зависимост от темата иконата може да бъде анимирана."
-#: ../src/common/config.py:222
+#: ../src/common/config.py:226
msgid ""
"If True, Gajim will display the status message, if not empty, for every "
"contact under the contact name in roster window."
msgstr ""
-"Ако е „True“, ще се показва съобщението за състояние, ако има такова, на "
+"Ако е активирана, ще се показва съобщението за състояние, ако има такова, на "
"всеки контакт под името му списъка."
-#: ../src/common/config.py:227
+#: ../src/common/config.py:231
msgid "Define the position of the avatar in roster. Can be left or right"
msgstr ""
+"Позиция на аватара в списъка. Може да е ляво (left) или дясно (right)."
-#: ../src/common/config.py:228
+#: ../src/common/config.py:232
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."
msgstr ""
-"Ако е „True“, ще се изпраща запитване за аватар до всеки контакт, който е "
-"нямал такъв последния път или пък има остарял кеширан аватар."
+"Ако е активирана, ще се изпраща запитване за аватар до всеки контакт, който "
+"е нямал такъв последния път или пък има остарял кеширан аватар."
-#: ../src/common/config.py:229
+#: ../src/common/config.py:233
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."
msgstr ""
-"Ако е „False“, вече няма да виждате реда за състоянието при разговорите, "
+"Ако е изключена, вече няма да виждате реда за състоянието при разговорите, "
"когато контактът променя състоянието си."
-#: ../src/common/config.py:230
+#: ../src/common/config.py:234
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 "
@@ -3755,52 +3688,51 @@
"съобщения за състояние. Ако е „in_and_out“, ще се изписва само „Сульо влезе "
"в стаята“ или „Сульо напусна“."
-#: ../src/common/config.py:232
+#: ../src/common/config.py:236
msgid "Background color of contacts when they just signed in."
msgstr "Цвят на фона на контактите, които се включват."
-#: ../src/common/config.py:233
+#: ../src/common/config.py:237
msgid "Background color of contacts when they just signed out."
msgstr "Цвят на фона на контактите, които се изключват."
-#: ../src/common/config.py:235
+#: ../src/common/config.py:239
msgid ""
"If True, restored messages will use a smaller font than the default one."
msgstr ""
-"Ако е „True“, ще се използва по-малък шрифт от стандартния за възстановените "
-"съобщения."
+"Ако е активирана, ще се използва по-малък шрифт от стандартния за "
+"възстановените съобщения."
-#: ../src/common/config.py:236
+#: ../src/common/config.py:240
msgid "Don't show avatar for the transport itself."
msgstr "Да не се показва аватара на транспорта."
-#: ../src/common/config.py:237
+#: ../src/common/config.py:241
msgid "Don't show roster in the system taskbar."
msgstr "Да не се показва списъка в панела."
-#: ../src/common/config.py:238
+#: ../src/common/config.py:242
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 "
"pending events."
msgstr ""
-"Ако е „True“ и инсталираните версии на GTK+ и PyGTK са поне 2.8, прозорецът "
-"ще мига (стандартното поведение при повечето мениджъри на прозорци) при "
-"задържане на чакащи събития."
+"Ако е активирана и инсталираните версии на GTK+ и PyGTK са поне 2.8, "
+"прозорецът ще мига (стандартното поведение при повечето мениджъри на "
+"прозорци) при задържане на чакащи събития."
-#: ../src/common/config.py:240
+#: ../src/common/config.py:244
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 "
"presences."
msgstr ""
"Jabberd1.4 не харесва информация от тип SHA при включване в стая, защитена с "
-"пароли. Настройте тази опция на „False“, за да спрете да изпращате "
+"пароли. Настройте тази опция на „Изключена“, за да спрете да изпращате "
"информация от тип SHA при присъствие в стаи."
#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
-#, fuzzy
+#: ../src/common/config.py:247
msgid ""
"Controls the window where new messages are placed.\n"
"'always' - All messages are sent to a single window.\n"
@@ -3812,40 +3744,42 @@
"specific window."
msgstr ""
"Контролира прозореца, където се отварят нови съобщения.\n"
-"„always“ - Всички съобщения се отварят в един прозорец.\n"
-"„never“ - Всички съобщения се отварят в собствен прозорец.\n"
-"„peracct“ - Съобщенията за всеки акаунт се отварят в специфичен прозорец.\n"
-"„pertype“ - Всеки тип съобщение (т.е. разговор и от стая) се отварят в "
-"специфичен прозорец. Забележете, че промяната на тази опция изисква "
-"рестартирането на Gajim, за да влезе в сила."
+"„always“ — Всички съобщения се отварят в един прозорец.\n"
+"„always_with_roster“ — Като „always“, но съобщенията са в общ прозорец със "
+"списъка.\n"
+"„never“ — Всички съобщения се отварят в собствен прозорец.\n"
+"„peracct“ — Съобщенията за всеки акаунт се отварят в специфичен прозорец.\n"
+"„pertype“ — Всеки тип съобщение (т.е. разговор и от стая) се отварят в "
+"специфичен прозорец."
-#: ../src/common/config.py:244
+#: ../src/common/config.py:248
msgid "If False, you will no longer see the avatar in the chat window."
-msgstr "Ако е „False“, повече няма да виждате аватар в прозореца за разговор."
+msgstr ""
+"Ако е изключена, повече няма да виждате аватар в прозореца за разговор."
-#: ../src/common/config.py:245
+#: ../src/common/config.py:249
msgid "If True, pressing the escape key closes a tab/window."
msgstr ""
-"Ако е „True“, натискането на клавиша „Escape“ затваря прозореца/подпрозореца."
+"Ако е активирана, натискането на клавиша „Escape“ затваря прозореца/"
+"подпрозореца."
-#: ../src/common/config.py:246
-#, fuzzy
+#: ../src/common/config.py:250
msgid "Hides the buttons in chat windows."
-msgstr "Скрива бутоните в прозореца на стаята."
+msgstr "Скрива бутоните в прозорците за разговор."
-#: ../src/common/config.py:247
+#: ../src/common/config.py:251
msgid "Hides the banner in a group chat window"
msgstr "Скрива лентата в прозореца на стаята"
-#: ../src/common/config.py:248
+#: ../src/common/config.py:252
msgid "Hides the banner in two persons chat window"
msgstr "Скрива лентата в прозорец за разговор с два контакта"
-#: ../src/common/config.py:249
+#: ../src/common/config.py:253
msgid "Hides the group chat occupants list in group chat window."
msgstr "Скрива списъка на участниците в прозореца на стаята."
-#: ../src/common/config.py:250
+#: ../src/common/config.py:254
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."
@@ -3853,29 +3787,27 @@
"В разговор, показва псевдонима в началото на реда само ако не е същия човек, "
"който е написал предното съобщение."
-#: ../src/common/config.py:251
+#: ../src/common/config.py:255
msgid "Indentation when using merge consecutive nickname."
msgstr "Отстъп, когато се използва смесване на последователен псевдоним."
-#: ../src/common/config.py:252
-#, fuzzy
+#: ../src/common/config.py:256
msgid "Smooth scroll message in conversation window"
-msgstr "Изпращане на съобщението и затваряне на прозореца"
+msgstr "Плавно прелистване на съобщение в прозореца за разговор"
-#: ../src/common/config.py:253
-#, fuzzy
+#: ../src/common/config.py:257
msgid ""
"List of colors, separated by \":\", that will be used to color nicknames in "
"group chats."
msgstr ""
-"Списък с цветове, които да се използват за оцветяване на псевдонимите в "
-"стаите."
+"Списък с цветове, разделени с „:“, които да се използват за оцветяване на "
+"псевдонимите в стаите."
-#: ../src/common/config.py:254
+#: ../src/common/config.py:258
msgid "Ctrl-Tab go to next composing tab when none is unread."
msgstr "Ctrl-TAB отива на следващия подпрозорец, когато всички са прочетени."
-#: ../src/common/config.py:255
+#: ../src/common/config.py:259
msgid ""
"Should we show the confirm metacontacts creation dialog or not? Empty string "
"means we never show the dialog."
@@ -3883,33 +3815,33 @@
"Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
"контакти? Празен низ означава никога да не се показва диалогов прозорец."
-#: ../src/common/config.py:256
+#: ../src/common/config.py:260
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 "
"negative priority, you will NOT receive any message from your server."
msgstr ""
-"Ако е „True“, ще може да настроите отрицателен приоритет за акаунта в "
+"Ако е активирана, ще може да настроите отрицателен приоритет за акаунта в "
"прозореца за промяна на акаунти. ВНИМАВАЙТЕ, понеже когато сте свързани с "
"отрицателен приоритет, НЯМА да получите нито едно съобщение от сървъра."
-#: ../src/common/config.py:257
+#: ../src/common/config.py:261
msgid ""
"If True, Gajim will use Gnome Keyring (if available) to store account "
"passwords."
msgstr ""
-"Ако е „True“, Gajim ще използва набора на ключове на GNOME (gnome-keyring), "
-"ако е достъпен, за да запазва информация за паролите на акаунтите."
+"Ако е активирана, Gajim ще използва набора на ключове на GNOME (gnome-"
+"keyring), ако е достъпен, за да запазва информация за паролите на акаунтите."
-#: ../src/common/config.py:258
+#: ../src/common/config.py:262
msgid ""
"If True, Gajim will show number of online and total contacts in account and "
"group rows."
msgstr ""
-"Ако е „True“, Gajim ще показва броя на включените контакти и общия брой в "
-"редовете за акаунти и групи."
+"Ако е активирана, Gajim ще показва броя на включените контакти и общия брой "
+"в редовете за акаунти и групи."
-#: ../src/common/config.py:259
+#: ../src/common/config.py:263
msgid ""
"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
"as if they were of this type"
@@ -3917,51 +3849,67 @@
"Може да е празно, „chat“ или „normal“. Ако не е празно, всички входящи "
"съобщения се третират като от указания тип."
-#: ../src/common/config.py:260
+#: ../src/common/config.py:264
msgid ""
"If True, Gajim will scroll and select the contact who sent you the last "
"message, if chat window is not already opened."
msgstr ""
+"Ако е активирана, Gajim ще прелиства списъка избирайки контакта, който ви е "
+"изпратил последното съобщение, в случай, че прозорецът за разговор не е вече "
+"отворен."
-#: ../src/common/config.py:261
+#: ../src/common/config.py:265
msgid ""
"If True, Gajim will convert string between $$ and $$ to an image using dvips "
"and convert before insterting it in chat window."
msgstr ""
+"Ако е активирана, Gajim ще преобразува чрез „dvips“ низа между $$ и $$ в "
+"изображение преди да го вмъкне в прозореца за разговор."
-#: ../src/common/config.py:262
+#: ../src/common/config.py:266
msgid "Time of inactivity needed before the change status window closes down."
msgstr ""
+"Необходимо време без активност преди прозорецът за промяна на състоянието да "
+"се затвори."
-#: ../src/common/config.py:263
+#: ../src/common/config.py:267
msgid ""
"Maximum number of lines that are printed in conversations. Oldest lines are "
"cleared."
msgstr ""
+"Максимален брой редове, които да се показват в разговорите. Най-старите "
+"редове се изчистват."
-#: ../src/common/config.py:264
+#: ../src/common/config.py:268
msgid ""
"If True, notification windows from notification-daemon will be attached to "
"systray icon."
msgstr ""
+"Ако активирана, прозорците за уведомления от „notification-daemon“ ще бъдат "
+"прикрепени към иконата в областта за уведомяване."
-#: ../src/common/config.py:265
+#: ../src/common/config.py:269
msgid "Choose interval between 2 checks of idleness."
-msgstr ""
+msgstr "Интервал между две проверки за липса на активност."
-#: ../src/common/config.py:266
+#: ../src/common/config.py:270
msgid ""
"Change the value to change the size of latex formulas displayed. The higher "
"is larger."
msgstr ""
+"Променете стойността за увеличаване или намаляване размера на изобразените "
+"формули на LaTeX. По-голяма стойност означава по-голям размер."
-#: ../src/common/config.py:267
+#: ../src/common/config.py:271
+#, fuzzy
msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled seperately)"
msgstr ""
+"Валидни схеми на адреси. Само схемите в този списък ще бъдат достъпни като "
+"„истински“ адреси."
-#: ../src/common/config.py:278
+#: ../src/common/config.py:282
msgid ""
"Priority will change automatically according to your status. Priorities are "
"defined in autopriority_* options."
@@ -3969,60 +3917,73 @@
"Приоритетът ще се променя автоматично в съответствие със състоянието ви. "
"Приоритетите се настройват в опциите „autopriority_*“."
-#: ../src/common/config.py:286
+#: ../src/common/config.py:290
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"
msgstr ""
+"Състояние при автоматично включване. Може да е „online“, „chat“, „away“, "
+"„xa“, „dnd“ или „invisible“. ЗАБЕЛЕЖКА: Тази опция се използва само ако "
+"„restore_last_status“ е изключена."
-#: ../src/common/config.py:287
+#: ../src/common/config.py:291
msgid "If enabled, restore the last status that was used."
-msgstr ""
+msgstr "Ако е активирана, възстановява се последното използвано състояние."
-#: ../src/common/config.py:292
+#: ../src/common/config.py:296
msgid ""
"If disabled, don't sign presences with GPG key, even if GPG is configured."
msgstr ""
+"Ако е изключена, не се се подписват съобщенията за състояние с ключ на GPG, "
+"дори и да е конфигуриран."
-#: ../src/common/config.py:294
+#: ../src/common/config.py:298
msgid "Enable ESessions encryption for this account."
-msgstr ""
+msgstr "Активира шифриране тип „ESessions“ за този акаунт."
-#: ../src/common/config.py:295
+#: ../src/common/config.py:299
msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr ""
+msgstr "Дали Gajim да започва шифрирана сесия автоматично, ако е възможно?"
-#: ../src/common/config.py:296
+#: ../src/common/config.py:300
msgid ""
"Ordered list (space separated) of connection type to try. Can contain tls, "
"ssl or plain"
msgstr ""
+"Списък (разделен с шпации) на видове свързвания. Може да съдържа „tls“, "
+"„ssl“ или „plain“."
-#: ../src/common/config.py:297
+#: ../src/common/config.py:301
msgid ""
"Show a warning dialog before sending password on an plaintext connection."
msgstr ""
+"Показване на предупреждение преди изпращане на паролата при нешифрирана "
+"връзка."
-#: ../src/common/config.py:298
+#: ../src/common/config.py:302
msgid "Show a warning dialog before using standard SSL library."
msgstr ""
+"Показване на предупреждение преди използване на стандартната библиотека на "
+"SSL."
-#: ../src/common/config.py:300
+#: ../src/common/config.py:304
msgid "Space separated list of ssl errors to ignore."
-msgstr ""
+msgstr "Списък (разделен с шпации) от грешки на SSL, които да се пренебрегват."
-#: ../src/common/config.py:312
+#: ../src/common/config.py:316
msgid ""
"How many seconds to wait for the answer of keepalive packet before we try to "
"reconnect."
msgstr ""
+"Колко секунди да се чака за отговор на изпратен пакет за поддържане на "
+"връзката, преди да да се опита свързване наново."
#. yes, no, ask
-#: ../src/common/config.py:316
+#: ../src/common/config.py:320
msgid "Jabberd2 workaround"
msgstr "Заобикалка заради Jabberd2"
-#: ../src/common/config.py:320
+#: ../src/common/config.py:324
msgid ""
"If checked, Gajim will use your IP and proxies defined in "
"file_transfer_proxies option for file transfer."
@@ -4030,119 +3991,119 @@
"Ако тази опция е избрана, ще се използва вашия IP адрес и сървърите-"
"посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
-#: ../src/common/config.py:334
+#: ../src/common/config.py:338
msgid "Answer to receipt requests"
-msgstr ""
+msgstr "Отговор на заявки"
-#: ../src/common/config.py:335
+#: ../src/common/config.py:339
msgid "Sent receipt requests"
-msgstr ""
+msgstr "Изпратени заявки"
-#: ../src/common/config.py:389
+#: ../src/common/config.py:393
msgid "Is OpenPGP enabled for this contact?"
msgstr "Активиран ли е OpenPGP за този контакт?"
-#: ../src/common/config.py:390
+#: ../src/common/config.py:394
msgid ""
"Should Gajim automatically start an encrypted session with this contact when "
"possible?"
-msgstr ""
+msgstr "Да се започва ли шифрирана сесия с този контакт, когато е възможно?"
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:395 ../src/common/config.py:398
msgid "Language for which we want to check misspelled words"
msgstr "Език, за който желаете да се проверяват сгрешените думи."
-#: ../src/common/config.py:400
+#: ../src/common/config.py:404
msgid "all or space separated status"
msgstr "„all“ или състояния, разделени с интервал"
-#: ../src/common/config.py:401
+#: ../src/common/config.py:405
msgid "'yes', 'no', or 'both'"
msgstr "„yes“, „no“ или „both“"
-#: ../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:406 ../src/common/config.py:408
+#: ../src/common/config.py:409 ../src/common/config.py:412
+#: ../src/common/config.py:413
msgid "'yes', 'no' or ''"
msgstr "„yes“, „no“ или „“"
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:419 ../src/common/pep.py:159
msgid "Sleeping"
msgstr "Спя"
-#: ../src/common/config.py:416
+#: ../src/common/config.py:420
msgid "Back soon"
msgstr "Връщам се скоро"
-#: ../src/common/config.py:416
+#: ../src/common/config.py:420
msgid "Back in some minutes."
msgstr "Ще се върна след малко."
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:421 ../src/common/pep.py:129
msgid "Eating"
msgstr "Хапвам"
-#: ../src/common/config.py:417
+#: ../src/common/config.py:421
msgid "I'm eating, so leave me a message."
msgstr "Хапвам, така че ми оставете съобщение."
-#: ../src/common/config.py:418
+#: ../src/common/config.py:422
msgid "Movie"
msgstr "Филм"
-#: ../src/common/config.py:418
+#: ../src/common/config.py:422
msgid "I'm watching a movie."
msgstr "Гледам филм."
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:423 ../src/common/pep.py:188
msgid "Working"
msgstr "Работя"
-#: ../src/common/config.py:419
+#: ../src/common/config.py:423
msgid "I'm working."
msgstr "Работя."
-#: ../src/common/config.py:420
+#: ../src/common/config.py:424
msgid "Phone"
msgstr "Телефон"
-#: ../src/common/config.py:420
+#: ../src/common/config.py:424
msgid "I'm on the phone."
msgstr "Говоря по телефона."
-#: ../src/common/config.py:421
+#: ../src/common/config.py:425
msgid "Out"
msgstr "Навън"
-#: ../src/common/config.py:421
+#: ../src/common/config.py:425
msgid "I'm out enjoying life."
msgstr "Наслаждавам се на живота навън."
-#: ../src/common/config.py:425
+#: ../src/common/config.py:429
msgid "I'm available."
msgstr "На линия съм."
-#: ../src/common/config.py:426
+#: ../src/common/config.py:430
msgid "I'm free for chat."
msgstr "Свободен за разговор."
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:431 ../src/config.py:1391
msgid "Be right back."
msgstr "Сега се връщам."
-#: ../src/common/config.py:428
+#: ../src/common/config.py:432
msgid "I'm not available."
msgstr "Не съм на разположение."
-#: ../src/common/config.py:429
+#: ../src/common/config.py:433
msgid "Do not disturb."
msgstr "Не ме притеснявайте."
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:434 ../src/common/config.py:435
msgid "Bye!"
msgstr "Довиждане!"
-#: ../src/common/config.py:441
+#: ../src/common/config.py:445
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."
@@ -4150,76 +4111,78 @@
"Звукът, който да се възпроизвежда, когато в стаята се изпише дума от "
"„muc_higlighted_words“ или когато съобщение съдържа псевдонима ви."
-#: ../src/common/config.py:442
+#: ../src/common/config.py:446
msgid "Sound to play when any MUC message arrives."
msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:455 ../src/common/optparser.py:231
msgid "green"
msgstr "зелена"
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:459 ../src/common/optparser.py:217
msgid "grocery"
msgstr "колониална"
-#: ../src/common/config.py:459
+#: ../src/common/config.py:463
msgid "human"
msgstr "хуманна"
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
msgid "marine"
msgstr "морска"
#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
msgid "Unable to load idle module"
msgstr "Неуспех при зареждането на модула „idle“"
#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:91
msgid "Wrong host"
msgstr "Грешен хост"
#: ../src/common/connection_handlers.py:234
msgid "Invalid local address? :-O"
-msgstr ""
+msgstr "Невалиден локален адрес? :-O"
#: ../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:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:927
+#: ../src/common/connection_handlers.py:1843
+#: ../src/common/connection_handlers.py:1889
+#: ../src/common/connection_handlers.py:2077
+#: ../src/common/connection_handlers.py:2210 ../src/common/connection.py:1213
+#: ../src/gajim.py:396
msgid "Disk Write Error"
-msgstr ""
+msgstr "Грешка при запис"
-#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
-#, fuzzy
+#: ../src/common/connection_handlers.py:1134 ../src/common/connection.py:847
msgid "Invisibility not supported"
-msgstr "Разширението не се поддържа"
+msgstr "Състоянието „Невидим“ не се поддържа."
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1135 ../src/common/connection.py:848
#, python-format
msgid "Account %s doesn't support invisibility."
-msgstr ""
+msgstr "Акаунтът „%s“ не поддържа невидимост."
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:2080
+#: ../src/common/connection_handlers.py:2213 ../src/common/connection.py:1216
+#: ../src/gajim.py:175
#, python-format
msgid ""
"The database file (%s) cannot be read. Try to repair it (see http://trac."
"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
msgstr ""
+"Файлът „%s“ от базата от данни не може да бъде прочетен. Опитайте се да го "
+"поправите (вижте http://trac.gajim.org/wiki/DatabaseBackup) или изтриете "
+"(цялата история ще бъде загубена)."
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:1964
#, python-format
msgid "Nickname not allowed: %s"
msgstr "Псевдонимът не е позволен: %s"
@@ -4227,73 +4190,72 @@
#. we are banned
#. group chat does not exist
#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../src/common/connection_handlers.py:2039
+#: ../src/common/connection_handlers.py:2042
+#: ../src/common/connection_handlers.py:2045
+#: ../src/common/connection_handlers.py:2048
+#: ../src/common/connection_handlers.py:2052 ../src/gajim.py:560
msgid "Unable to join group chat"
msgstr "Неуспех при влизането в стаята"
-#: ../src/common/connection_handlers.py:2054
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2040
+#, python-format
msgid "You are banned from group chat %s."
-msgstr "Вие сте отлъчени от тази стая."
+msgstr "Вие сте отлъчени от стаята %s."
-#: ../src/common/connection_handlers.py:2057
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2043
+#, python-format
msgid "Group chat %s does not exist."
-msgstr "Такава стая не съществува."
+msgstr "Стаята %s не съществува."
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2046
msgid "Group chat creation is restricted."
msgstr "Създаването на стаи е ограничено."
-#: ../src/common/connection_handlers.py:2063
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2049
+#, python-format
msgid "Your registered nickname must be used in group chat %s."
-msgstr "Трябва да се използва регистрирания ви псевдоним."
+msgstr "Трябва да се използва регистрирания ви псевдоним в стаята %s."
-#: ../src/common/connection_handlers.py:2067
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2053
+#, python-format
msgid "You are not in the members list in groupchat %s."
-msgstr "Не сте в списъка с членове."
+msgstr "Не сте в списъка с членове на стаята %s."
#. Room has been destroyed. see
#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
-#, fuzzy
+#: ../src/common/connection_handlers.py:2095
msgid "Room has been destroyed"
-msgstr "Упълномощаването беше прекратено"
+msgstr "Стаята е била унищожена"
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2102
#, python-format
msgid "You can join this room instead: %s"
-msgstr ""
+msgstr "Вместо това може да влезете в тази стая: %s"
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2129
msgid "I would like to add you to my roster."
msgstr ""
"Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
"roster."
#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2150
#, python-format
msgid "we are now subscribed to %s"
msgstr "вече сме записани за %s"
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2152
#, python-format
msgid "unsubscribe request from %s"
msgstr "искане за отписване от %s"
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2154
#, python-format
msgid "we are now unsubscribed from %s"
msgstr "вече сме отписани от %s"
-#: ../src/common/connection_handlers.py:2343
+#: ../src/common/connection_handlers.py:2336
#, python-format
msgid ""
"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4304,149 +4266,150 @@
"org/, за да го премахнете."
#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
+#: ../src/common/connection_handlers.py:2361
#: ../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:2370
+#: ../src/common/connection_handlers.py:2363
#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../src/roster_window.py:1921 ../src/roster_window.py:1941
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
#: ../src/common/connection.py:66
msgid "Unable to get issuer certificate"
-msgstr ""
+msgstr "Неуспех при получаването на сертификата на издателя"
#: ../src/common/connection.py:67
msgid "Unable to get certificate CRL"
-msgstr ""
+msgstr "Неуспех при получаването на списъка с отменени сертификати"
#: ../src/common/connection.py:68
msgid "Unable to decrypt certificate's signature"
-msgstr ""
+msgstr "Неуспех при дешифрирането на подписа на сертификата"
#: ../src/common/connection.py:69
msgid "Unable to decrypt CRL's signature"
-msgstr ""
+msgstr "Неуспех при дешифрирането на подписа на списъка с отменени сертификати"
#: ../src/common/connection.py:70
-#, fuzzy
msgid "Unable to decode issuer public key"
-msgstr "Неуспех при зареждането на модула „idle“"
+msgstr "Неуспех при декодирането на публичния ключ на издателя"
#: ../src/common/connection.py:71
msgid "Certificate signature failure"
-msgstr ""
+msgstr "Грешка при проверката на подписа на сертификата"
#: ../src/common/connection.py:72
msgid "CRL signature failure"
-msgstr ""
+msgstr "Грешка при проверката на подписа на списъка с отменени сертификати"
#: ../src/common/connection.py:73
msgid "Certificate is not yet valid"
-msgstr ""
+msgstr "Сертификатът все още не е валиден"
#: ../src/common/connection.py:74
msgid "Certificate has expired"
-msgstr ""
+msgstr "Валидността на сертификата е изтекла"
#: ../src/common/connection.py:75
-#, fuzzy
msgid "CRL is not yet valid"
-msgstr "%s не е валидно ниво за дневник"
+msgstr "Списъкът с отменени сертификати все още не е валиден"
#: ../src/common/connection.py:76
msgid "CRL has expired"
-msgstr ""
+msgstr "Валидността на списъка с отменени сертификати е изтекла"
#: ../src/common/connection.py:77
msgid "Format error in certificate's notBefore field"
-msgstr ""
+msgstr "Грешка при форматирането на полето „notBefore“ на сертификата"
#: ../src/common/connection.py:78
msgid "Format error in certificate's notAfter field"
-msgstr ""
+msgstr "Грешка при форматирането на полето „notAfter“ на сертификата"
#: ../src/common/connection.py:79
msgid "Format error in CRL's lastUpdate field"
msgstr ""
+"Грешка при форматирането на полето „lastUpdate“ на списъка с отменени "
+"сертификати"
#: ../src/common/connection.py:80
msgid "Format error in CRL's nextUpdate field"
msgstr ""
+"Грешка при форматирането на полето „nextUpdate“ на списъка с отменени "
+"сертификати"
#: ../src/common/connection.py:81
msgid "Out of memory"
-msgstr ""
+msgstr "Изчерпана памет"
#: ../src/common/connection.py:82
msgid "Self signed certificate"
-msgstr ""
+msgstr "Само-подписан сертификат"
#: ../src/common/connection.py:83
msgid "Self signed certificate in certificate chain"
-msgstr ""
+msgstr "Само-подписан сертификат в удостоверителската верига"
#: ../src/common/connection.py:84
msgid "Unable to get local issuer certificate"
-msgstr ""
+msgstr "Неуспех при получаването на сертификата на издателя"
#: ../src/common/connection.py:85
msgid "Unable to verify the first certificate"
-msgstr ""
+msgstr "Неуспех при проверката на първия сертификат"
#: ../src/common/connection.py:86
msgid "Certificate chain too long"
-msgstr ""
+msgstr "Удостоверителската верига е твърде дълга"
#: ../src/common/connection.py:87
msgid "Certificate revoked"
-msgstr ""
+msgstr "Сертификатът е отменен"
#: ../src/common/connection.py:88
-#, fuzzy
msgid "Invalid CA certificate"
-msgstr "Невалидно потребителско име"
+msgstr "Невалиден сертификат на удостоверителя"
#: ../src/common/connection.py:89
msgid "Path length constraint exceeded"
-msgstr ""
+msgstr "Максималната дължина на пътя е надвишена"
#: ../src/common/connection.py:90
msgid "Unsupported certificate purpose"
-msgstr ""
+msgstr "Неподдържана цел на сертификата"
#: ../src/common/connection.py:91
msgid "Certificate not trusted"
-msgstr ""
+msgstr "Сертификатът не е доверен"
#: ../src/common/connection.py:92
msgid "Certificate rejected"
-msgstr ""
+msgstr "Сертификатът е отхвърлен"
#: ../src/common/connection.py:93
msgid "Subject issuer mismatch"
-msgstr ""
+msgstr "Несъответствие на издателя на сертификата"
#: ../src/common/connection.py:94
msgid "Authority and subject key identifier mismatch"
-msgstr ""
+msgstr "Несъответствие на идентификатора и сертифициращия орган"
#: ../src/common/connection.py:95
msgid "Authority and issuer serial number mismatch"
-msgstr ""
+msgstr "Несъответствие на серийния номер на издателя и сертифициращия орган"
#: ../src/common/connection.py:96
msgid "Key usage does not include certificate signing"
-msgstr ""
+msgstr "Основната употреба не включва подписване на сертификати"
#: ../src/common/connection.py:97
msgid "Application verification failure"
-msgstr ""
+msgstr "Грешка на приложението за проверка"
#: ../src/common/connection.py:266
#: ../src/common/zeroconf/connection_zeroconf.py:214
@@ -4459,19 +4422,21 @@
msgstr "Свържете се наново."
#: ../src/common/connection.py:278
-#, fuzzy, python-format
+#, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr "Транспортът „%s“ отговори погрешно на запитването за регистрация: %s"
+msgstr ""
+"Сървърът „%(name)s“ отговори погрешно на запитването за регистрация: %(error)"
+"s"
#: ../src/common/connection.py:312
#, python-format
msgid "Server %s provided a different registration form"
-msgstr ""
+msgstr "Сървърът „%s“ предостави различна форма за регистрация"
#: ../src/common/connection.py:325
#, python-format
msgid "Unknown SSL error: %d"
-msgstr ""
+msgstr "Неизвестна грешка на SSL: %d"
#. wrong answer
#: ../src/common/connection.py:340
@@ -4479,74 +4444,79 @@
msgstr "Невалиден отговор"
#: ../src/common/connection.py:341
-#, fuzzy, python-format
+#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
-msgstr "Транспортът „%s“ отговори погрешно на запитването за регистрация: %s"
+msgstr ""
+"Транспортът „%(name)s“ отговори погрешно на запитването за регистрация: %"
+"(error)s"
-#: ../src/common/connection.py:522
-#, fuzzy
+#: ../src/common/connection.py:521
msgid "Connection to proxy failed"
-msgstr "Неуспех при свързването"
+msgstr "Неуспех при свързването със сървъра-посредник"
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
+#: ../src/common/connection.py:609 ../src/common/connection.py:710
+#: ../src/common/connection.py:1348
#: ../src/common/zeroconf/connection_zeroconf.py:248
#, python-format
msgid "Could not connect to \"%s\""
-msgstr "Не може да се осъществи свързване с „%s“"
+msgstr "Неуспех при свързване с „%s“"
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:610 ../src/gajim.py:1057
msgid "Check your connection or try again later."
msgstr "Проверете връзката или опитайте отново по-късно."
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
-#, fuzzy, python-format
+#: ../src/common/connection.py:642 ../src/common/connection.py:690
+#, python-format
msgid "Could not connect to account %s"
-msgstr "Не може да се осъществи свързване с „%s“"
+msgstr "Неуспех при свързване с акаунт „%s“"
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
-#, fuzzy, python-format
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, python-format
msgid "Connection with account %s has been lost. Retry connecting."
-msgstr "Връзката на акаунт „%s“ се разпадна"
+msgstr "Връзката на акаунт „%s“ се разпадна. Опит за повторно свързване."
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:665
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
-msgstr ""
+msgstr "Автентичността на сертификата на %s може да е под въпрос."
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:668
#, python-format
msgid ""
"\n"
"SSL Error: <b>%s</b>"
msgstr ""
+"\n"
+"Грешка на SSL: <b>%s</b>"
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:670
#, python-format
msgid ""
"\n"
"Unknown SSL error: %d"
msgstr ""
+"\n"
+"Неизвестна грешка на SSL: %d"
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:711
msgid "Check your connection or try again later"
msgstr "Проверете връзката или опитайте отново по-късно"
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:736
#, python-format
msgid "Authentication failed with \"%s\""
msgstr "Неуспех при удостоверяването с „%s“"
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:738
msgid "Please check your login and password for correctness."
msgstr "Проверете дали името и паролата са правилни."
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:799
msgid "Error while removing privacy list"
msgstr "Грешка при премахването на списъка за уединение"
-#: ../src/common/connection.py:801
-#, fuzzy, python-format
+#: ../src/common/connection.py:800
+#, python-format
msgid ""
"Privacy list %s has not been removed. It is maybe active in one of your "
"connected resources. Deactivate it and try again."
@@ -4554,49 +4524,47 @@
"Списъкът за уединение „%s“ не беше премахнат. Навярно е активен в някой от "
"свързаните ви ресурси. Изключете го и опитайте отново."
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../src/common/connection.py:1092
+#: ../src/common/zeroconf/connection_zeroconf.py:388
msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
+msgstr "Нито отдалеченото присъствие е подписано, нито има зададен ключ."
-#: ../src/common/connection.py:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:390
#, python-format
msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
+msgstr "Ключът на контакта (%s) не съвпада със зададения в Gajim."
#. we're not english
#. one in locale and one en
-#: ../src/common/connection.py:1105
-#, fuzzy
+#: ../src/common/connection.py:1103
msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr ""
-"[Това съобщение е *шифрирано* (вижте JEP:„27“)]\n"
-"[This message is *encrypted* (See: JEP:`27')]"
+msgstr "[Това съобщение е *шифрирано* (вижте XEP:„27“)]"
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
-#, fuzzy, python-format
+#: ../src/common/connection.py:1203
+#: ../src/common/zeroconf/connection_zeroconf.py:467
+#, python-format
msgid ""
"Subject: %(subject)s\n"
"%(message)s"
msgstr ""
-"Тема: %s\n"
-"%s"
+"Тема: %(subject)s\n"
+"%(message)s"
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1381
msgid "Not fetched because of invisible status"
msgstr "Не е изтеглен, понеже е в състояние „Невидим“"
#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/gajim.py:980
msgid "Observers"
msgstr "Наблюдатели"
#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../src/disco.py:1349 ../src/gajim.py:806 ../src/roster_window.py:815
+#: ../src/roster_window.py:1466 ../src/roster_window.py:1533
+#: ../src/roster_window.py:1535 ../src/roster_window.py:1672
msgid "Transports"
msgstr "Транспорти"
@@ -4617,17 +4585,17 @@
msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
msgstr ""
"Липсва зависимостта pysqlite2 (също познато и като python-pysqlite2). "
-"Спиране на програмата..."
+"Спиране на програмата…"
#: ../src/common/exceptions.py:47
-#, fuzzy
msgid "Database cannot be read."
-msgstr "Трябва да посочите някакво име на акаунта."
+msgstr "Неуспех при четенето на базата от данни."
#: ../src/common/exceptions.py:55
msgid "Service not available: Gajim is not running, or remote_control is False"
msgstr ""
-"Услугата не е налична: Gajim не е стартиран или „remote_control“ е „False“"
+"Услугата не е налична: Gajim не е стартиран или „remote_control“ е "
+"„Изключена“"
#: ../src/common/exceptions.py:63
msgid "D-Bus is not present on this machine or python module is missing"
@@ -4873,7 +4841,7 @@
msgid "_Available"
msgstr "На _линия"
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:284 ../src/features_window.py:119
msgid "Available"
msgstr "На линия"
@@ -4979,7 +4947,7 @@
#: ../src/common/helpers.py:405
msgid "is composing a message..."
-msgstr "пише съобщение..."
+msgstr "пише съобщение…"
#. paused means he or she was composing but has stopped for a while
#: ../src/common/helpers.py:408
@@ -4991,33 +4959,33 @@
msgstr "затвори прозореца или подпрозореца"
#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
-#, fuzzy, python-format
+#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
-msgstr[0] "Изпращане на съобщение"
-msgstr[1] "Изпращане на съобщение"
+msgstr[0] "%d непрочетено съобщение"
+msgstr[1] "%d непрочетени съобщения"
#: ../src/common/helpers.py:1005
#, python-format
msgid " from room %s"
-msgstr ""
+msgstr " от стая %s"
#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
#, python-format
msgid " from user %s"
-msgstr ""
+msgstr " от потребител %s"
#: ../src/common/helpers.py:1010
#, python-format
msgid " from %s"
-msgstr ""
+msgstr " от %s"
#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d чакащо събитие"
+msgstr[1] "%d чакащи събития"
#: ../src/common/helpers.py:1057
#, python-format
@@ -5030,11 +4998,11 @@
msgid "error: cannot open %s for reading"
msgstr "грешка: %s не може да бъде отворен за четене"
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:226 ../src/common/optparser.py:227
msgid "cyan"
msgstr "синьозелена"
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:343
msgid "migrating logs database to indices"
msgstr "мигриране на базата от данни с дневници към индекси"
@@ -5045,710 +5013,639 @@
#: ../src/common/pep.py:29
msgid "Afraid"
-msgstr ""
+msgstr "Уплашен"
#: ../src/common/pep.py:30
msgid "Amazed"
-msgstr ""
+msgstr "Изумен"
#: ../src/common/pep.py:31
msgid "Amorous"
-msgstr ""
+msgstr "Страстен"
#: ../src/common/pep.py:32
msgid "Angry"
-msgstr ""
+msgstr "Ядосан"
#: ../src/common/pep.py:33
msgid "Annoyed"
-msgstr ""
+msgstr "Раздразнен"
#: ../src/common/pep.py:34
msgid "Anxious"
-msgstr ""
+msgstr "Обезпокоен"
#: ../src/common/pep.py:35
-#, fuzzy
msgid "Aroused"
-msgstr "Временно преустановен"
+msgstr "Възбуден"
#: ../src/common/pep.py:36
msgid "Ashamed"
-msgstr ""
+msgstr "Засрамен"
#: ../src/common/pep.py:37
-#, fuzzy
msgid "Bored"
-msgstr "Получер"
+msgstr "Отегчен"
#: ../src/common/pep.py:38
-#, fuzzy
msgid "Brave"
-msgstr "имам "
+msgstr "Смел"
#: ../src/common/pep.py:39
msgid "Calm"
-msgstr ""
+msgstr "Спокоен"
#: ../src/common/pep.py:40
-#, fuzzy
msgid "Cautious"
-msgstr "Разговори"
+msgstr "Предпазлив"
#: ../src/common/pep.py:41
-#, fuzzy
msgid "Cold"
-msgstr "Получер"
+msgstr "Бездушен"
#: ../src/common/pep.py:42
-#, fuzzy
msgid "Confident"
-msgstr "_Ръководства"
+msgstr "Уверен"
#: ../src/common/pep.py:43
msgid "Confused"
-msgstr ""
+msgstr "Объркан"
#: ../src/common/pep.py:44
-#, fuzzy
msgid "Contemplative"
-msgstr "Завършил"
+msgstr "Замислен"
#: ../src/common/pep.py:45
-#, fuzzy
msgid "Contented"
-msgstr "_Ръководства"
+msgstr "Спорещ"
#: ../src/common/pep.py:46
msgid "Cranky"
-msgstr ""
+msgstr "Раздразнителен"
#: ../src/common/pep.py:47
msgid "Crazy"
-msgstr ""
+msgstr "Луд"
#: ../src/common/pep.py:48
-#, fuzzy
msgid "Creative"
-msgstr "Изключена"
+msgstr "Съзидателен"
#: ../src/common/pep.py:49
-#, fuzzy
msgid "Curious"
-msgstr "адрес"
+msgstr "Любопитен"
#: ../src/common/pep.py:50
-#, fuzzy
msgid "Dejected"
-msgstr "Изтриване"
+msgstr "Обезсърчен"
#: ../src/common/pep.py:51
msgid "Depressed"
-msgstr ""
+msgstr "Депресиран"
#: ../src/common/pep.py:52
-#, fuzzy
msgid "Disappointed"
-msgstr "Изключени"
+msgstr "Разочарован"
#: ../src/common/pep.py:53
msgid "Disgusted"
-msgstr ""
+msgstr "Отвратен"
#: ../src/common/pep.py:54
-#, fuzzy
msgid "Dismayed"
-msgstr "Изключени"
+msgstr "Уплашен"
#: ../src/common/pep.py:55
-#, fuzzy
msgid "Distracted"
-msgstr "Изключени"
+msgstr "Шашнат"
#: ../src/common/pep.py:56
msgid "Embarrassed"
-msgstr ""
+msgstr "Смутен"
#: ../src/common/pep.py:57
msgid "Envious"
-msgstr ""
+msgstr "Завистлив"
#: ../src/common/pep.py:58
-#, fuzzy
msgid "Excited"
-msgstr "Активирана"
+msgstr "Развълнуван"
#: ../src/common/pep.py:59
msgid "Flirtatious"
-msgstr ""
+msgstr "Склонен към флиртуване"
#: ../src/common/pep.py:60
msgid "Frustrated"
-msgstr ""
+msgstr "Разочарован"
#: ../src/common/pep.py:61
msgid "Grateful"
-msgstr ""
+msgstr "Признателен"
#: ../src/common/pep.py:62
msgid "Grieving"
-msgstr ""
+msgstr "Опечален"
#: ../src/common/pep.py:63
-#, fuzzy
msgid "Grumpy"
-msgstr "Група"
+msgstr "Кисел"
#: ../src/common/pep.py:64
msgid "Guilty"
-msgstr ""
+msgstr "Виновен"
#: ../src/common/pep.py:65
msgid "Happy"
-msgstr ""
+msgstr "Щастлив"
#: ../src/common/pep.py:66
msgid "Hopeful"
-msgstr ""
+msgstr "С надежда"
#: ../src/common/pep.py:67
-#, fuzzy
msgid "Hot"
-msgstr "_Хост:"
+msgstr "Сгорещен"
#: ../src/common/pep.py:68
msgid "Humbled"
-msgstr ""
+msgstr "Скромен"
#: ../src/common/pep.py:69
msgid "Humiliated"
-msgstr ""
+msgstr "Унизен"
#: ../src/common/pep.py:70
msgid "Hungry"
-msgstr ""
+msgstr "Гладен"
#: ../src/common/pep.py:71
msgid "Hurt"
-msgstr ""
+msgstr "Ранен"
#: ../src/common/pep.py:72
-#, fuzzy
msgid "Impressed"
-msgstr "съобщение"
+msgstr "Впечатлен"
#: ../src/common/pep.py:73
msgid "In Awe"
-msgstr ""
+msgstr "Със страхопочитание"
#: ../src/common/pep.py:74
msgid "In Love"
-msgstr ""
+msgstr "Влюбен"
#: ../src/common/pep.py:75
msgid "Indignant"
-msgstr ""
+msgstr "Възмутен"
#: ../src/common/pep.py:76
msgid "Interested"
-msgstr ""
+msgstr "Заинтересуван"
#: ../src/common/pep.py:77
-#, fuzzy
msgid "Intoxicated"
-msgstr "Активирана"
+msgstr "Пиян"
#: ../src/common/pep.py:78
-#, fuzzy
msgid "Invincible"
-msgstr "Невидим"
+msgstr "Непобедим"
#: ../src/common/pep.py:79
msgid "Jealous"
-msgstr ""
+msgstr "Ревнив"
#: ../src/common/pep.py:80
-#, fuzzy
msgid "Lonely"
-msgstr "един"
+msgstr "Самотен"
#: ../src/common/pep.py:81
-#, fuzzy
msgid "Lost"
-msgstr "_Хост:"
+msgstr "Безпомощен"
#: ../src/common/pep.py:82
msgid "Lucky"
-msgstr ""
+msgstr "Късметлия"
#: ../src/common/pep.py:83
-#, fuzzy
msgid "Mean"
-msgstr "немски"
+msgstr "Подъл"
#: ../src/common/pep.py:84
-#, fuzzy
msgid "Moody"
-msgstr "Пром_яна"
+msgstr "Унил"
#: ../src/common/pep.py:85
msgid "Nervous"
-msgstr ""
+msgstr "Нервен"
#: ../src/common/pep.py:86
msgid "Neutral"
-msgstr ""
+msgstr "Безразличен"
#: ../src/common/pep.py:87
-#, fuzzy
msgid "Offended"
-msgstr "Изключен"
+msgstr "Обиден"
#: ../src/common/pep.py:88
msgid "Outraged"
-msgstr ""
+msgstr "Оскърбен"
#: ../src/common/pep.py:89
msgid "Playful"
-msgstr ""
+msgstr "Игрив"
#: ../src/common/pep.py:90
-#, fuzzy
msgid "Proud"
-msgstr "Група"
+msgstr "Горд"
#: ../src/common/pep.py:91
msgid "Relaxed"
-msgstr ""
+msgstr "Отпуснат"
#: ../src/common/pep.py:92
-#, fuzzy
msgid "Relieved"
-msgstr "единадесет"
+msgstr "Облекчен"
#: ../src/common/pep.py:93
msgid "Remorseful"
-msgstr ""
+msgstr "Разкайващ се"
#: ../src/common/pep.py:94
msgid "Restless"
-msgstr ""
+msgstr "Неспокоен"
#: ../src/common/pep.py:95
-#, fuzzy
msgid "Sad"
-msgstr "Блокирал"
+msgstr "Тъжен"
#: ../src/common/pep.py:96
msgid "Sarcastic"
-msgstr ""
+msgstr "Саркастичен"
#: ../src/common/pep.py:97
-#, fuzzy
msgid "Satisfied"
-msgstr "Последно променена:"
+msgstr "Удовлетворен"
#: ../src/common/pep.py:98
msgid "Serious"
-msgstr ""
+msgstr "Сериозен"
#: ../src/common/pep.py:99
msgid "Shocked"
-msgstr ""
+msgstr "Шокиран"
#: ../src/common/pep.py:100
msgid "Shy"
-msgstr ""
+msgstr "Срамежлив"
#: ../src/common/pep.py:101
-#, fuzzy
msgid "Sick"
-msgstr "Псевдоним"
+msgstr "Болен"
#: ../src/common/pep.py:102
-#, fuzzy
msgid "Sleepy"
-msgstr "Спя"
+msgstr "Сънен"
#: ../src/common/pep.py:103
msgid "Spontaneous"
-msgstr ""
+msgstr "Спонтанен"
#: ../src/common/pep.py:104
-#, fuzzy
msgid "Stressed"
-msgstr "Улица:"
+msgstr "Стресиран"
#: ../src/common/pep.py:105
msgid "Strong"
-msgstr ""
+msgstr "Твърд"
#: ../src/common/pep.py:106
-#, fuzzy
msgid "Surprised"
-msgstr "Записан"
+msgstr "Изненадан"
#: ../src/common/pep.py:107
msgid "Thankful"
-msgstr ""
+msgstr "Благодарен"
#: ../src/common/pep.py:108
msgid "Thirsty"
-msgstr ""
+msgstr "Жаден"
#: ../src/common/pep.py:109
-#, fuzzy
msgid "Tired"
-msgstr "Време"
+msgstr "Уморен"
#: ../src/common/pep.py:110
-#, fuzzy
msgid "Undefined"
-msgstr "девет"
+msgstr "Неопределен"
#: ../src/common/pep.py:111
msgid "Weak"
-msgstr ""
+msgstr "Слаб"
#: ../src/common/pep.py:112
msgid "Worried"
-msgstr ""
+msgstr "Обезпокоен"
#: ../src/common/pep.py:115
-#, fuzzy
msgid "Doing Chores"
-msgstr "Грешен хост"
+msgstr "Домакинствам"
#: ../src/common/pep.py:116
msgid "Buying Groceries"
-msgstr ""
+msgstr "Купувам хранителни продукти"
#: ../src/common/pep.py:117
-#, fuzzy
msgid "Cleaning"
-msgstr "Вечер"
+msgstr "Чистя"
#: ../src/common/pep.py:118
-#, fuzzy
msgid "Cooking"
-msgstr "Пише"
+msgstr "Готвя"
#: ../src/common/pep.py:119
msgid "Doing Maintenance"
-msgstr ""
+msgstr "Ремонтирам"
#: ../src/common/pep.py:120
msgid "Doing the Dishes"
-msgstr ""
+msgstr "Мия чиниите"
#: ../src/common/pep.py:121
msgid "Doing the Laundry"
-msgstr ""
+msgstr "Пера"
#: ../src/common/pep.py:122
-#, fuzzy
msgid "Gardening"
-msgstr "Сутрин"
+msgstr "Работя в градината"
#: ../src/common/pep.py:123
msgid "Running an Errand"
-msgstr ""
+msgstr "Изпълнявам поръчка"
#: ../src/common/pep.py:124
-#, fuzzy
msgid "Walking the Dog"
-msgstr "всички в групата"
+msgstr "Разхождам кучето"
#: ../src/common/pep.py:125
-#, fuzzy
msgid "Drinking"
-msgstr "Работя"
+msgstr "Пия"
#: ../src/common/pep.py:126
msgid "Having a Beer"
-msgstr ""
+msgstr "Пия бира"
#: ../src/common/pep.py:127
msgid "Having Coffee"
-msgstr ""
+msgstr "Пия кафе"
#: ../src/common/pep.py:128
msgid "Having Tea"
-msgstr ""
+msgstr "Пия чай"
#: ../src/common/pep.py:130
msgid "Having a Snack"
-msgstr ""
+msgstr "Похапвам"
#: ../src/common/pep.py:131
msgid "Having Breakfast"
-msgstr ""
+msgstr "Закусвам"
#: ../src/common/pep.py:132
msgid "Having Dinner"
-msgstr ""
+msgstr "Вечерям"
#: ../src/common/pep.py:133
msgid "Having Lunch"
-msgstr ""
+msgstr "Обядвам"
#: ../src/common/pep.py:134
msgid "Exercising"
-msgstr ""
+msgstr "Правя упражнения"
#: ../src/common/pep.py:135 ../src/common/pep.py:180
msgid "Cycling"
-msgstr ""
+msgstr "Карам велосипед"
#: ../src/common/pep.py:136
-#, fuzzy
msgid "Dancing"
-msgstr "Вечер"
+msgstr "Танцувам"
#: ../src/common/pep.py:137
-#, fuzzy
msgid "Hiking"
-msgstr "Изритване на %s"
+msgstr "На поход съм"
#: ../src/common/pep.py:138
-#, fuzzy
msgid "Jogging"
-msgstr "_Влизане"
+msgstr "Тичам за здраве"
#: ../src/common/pep.py:139
msgid "Playing Sports"
-msgstr ""
+msgstr "Спортувам"
#: ../src/common/pep.py:140
msgid "Running"
-msgstr ""
+msgstr "Бягам"
#: ../src/common/pep.py:141
-#, fuzzy
msgid "Skiing"
-msgstr "Работя"
+msgstr "Карам ски"
#: ../src/common/pep.py:142
msgid "Swimming"
-msgstr ""
+msgstr "Плувам"
#: ../src/common/pep.py:143
-#, fuzzy
msgid "Working out"
-msgstr "Работя"
+msgstr "Тренирам"
#: ../src/common/pep.py:144
-#, fuzzy
msgid "Grooming"
-msgstr "стая"
+msgstr "Поддържам се"
#: ../src/common/pep.py:145
msgid "At the Spa"
-msgstr ""
+msgstr "В Спа-центъра"
#: ../src/common/pep.py:146
msgid "Brushing Teeth"
-msgstr ""
+msgstr "Мия си зъбите"
#: ../src/common/pep.py:147
msgid "Getting a Haircut"
-msgstr ""
+msgstr "Подстригвам се"
#: ../src/common/pep.py:148
-#, fuzzy
msgid "Shaving"
-msgstr "Хапвам"
+msgstr "Бръсна се"
#: ../src/common/pep.py:149
msgid "Taking a Bath"
-msgstr ""
+msgstr "Във ваната"
#: ../src/common/pep.py:150
msgid "Taking a Shower"
-msgstr ""
+msgstr "Взимам си душ"
#: ../src/common/pep.py:151
msgid "Having an Appointment"
-msgstr ""
+msgstr "На среща"
#: ../src/common/pep.py:153
msgid "Day Off"
-msgstr ""
+msgstr "Почивен ден"
#: ../src/common/pep.py:154
-#, fuzzy
msgid "Hanging out"
-msgstr "Промяна на темата"
+msgstr "Вися си"
#: ../src/common/pep.py:155
-#, fuzzy
msgid "Hiding"
-msgstr "Изритване на %s"
+msgstr "Крия се"
#: ../src/common/pep.py:156
msgid "On Vacation"
-msgstr ""
+msgstr "В отпуск"
#: ../src/common/pep.py:157
-#, fuzzy
msgid "Praying"
-msgstr "Хапвам"
+msgstr "Моля се"
#: ../src/common/pep.py:158
msgid "Scheduled Holiday"
-msgstr ""
+msgstr "Планиран отдих"
#: ../src/common/pep.py:160
-#, fuzzy
msgid "Thinking"
-msgstr "Работя"
+msgstr "Мисля"
#: ../src/common/pep.py:161
msgid "Relaxing"
-msgstr ""
+msgstr "Почивам"
#: ../src/common/pep.py:162
-#, fuzzy
msgid "Fishing"
-msgstr "Изритване на %s"
+msgstr "Ловя риба"
#: ../src/common/pep.py:163
-#, fuzzy
msgid "Gaming"
-msgstr "Хапвам"
+msgstr "Играя"
#: ../src/common/pep.py:164
-#, fuzzy
msgid "Going out"
-msgstr "Изкл_ючване"
+msgstr "Навън съм"
#: ../src/common/pep.py:165
-#, fuzzy
msgid "Partying"
-msgstr "Хапвам"
+msgstr "На купон съм"
#: ../src/common/pep.py:166
-#, fuzzy
msgid "Reading"
-msgstr "Причина"
+msgstr "Чета"
#: ../src/common/pep.py:167
-#, fuzzy
msgid "Rehearsing"
-msgstr "Причина"
+msgstr "Репетирам"
#: ../src/common/pep.py:168
-#, fuzzy
msgid "Shopping"
-msgstr "Спя"
+msgstr "На пазар съм"
#: ../src/common/pep.py:169
-#, fuzzy
msgid "Smoking"
-msgstr "Работя"
+msgstr "Пуша"
#: ../src/common/pep.py:170
msgid "Socializing"
-msgstr ""
+msgstr "Общувам"
#: ../src/common/pep.py:171
-#, fuzzy
msgid "Sunbathing"
-msgstr "Хапвам"
+msgstr "На плаж съм"
#: ../src/common/pep.py:172
msgid "Watching TV"
-msgstr ""
+msgstr "Гледам телевизия"
#: ../src/common/pep.py:173
-#, fuzzy
msgid "Watching a Movie"
-msgstr "Гледам филм."
+msgstr "Гледам филм"
#: ../src/common/pep.py:174
-#, fuzzy
msgid "Talking"
-msgstr "Хапвам"
+msgstr "Разговарям"
#: ../src/common/pep.py:175
msgid "In Real Life"
-msgstr ""
+msgstr "На четири очи"
#: ../src/common/pep.py:176
-#, fuzzy
msgid "On the Phone"
-msgstr "Говоря по телефона."
+msgstr "Говоря по телефона"
#: ../src/common/pep.py:177
msgid "On Video Phone"
-msgstr ""
+msgstr "Говоря по видеотелефона"
#: ../src/common/pep.py:178
-#, fuzzy
msgid "Traveling"
-msgstr "Прехвърляне"
+msgstr "Пътувам"
#: ../src/common/pep.py:179
-#, fuzzy
msgid "Commuting"
-msgstr "Пише"
+msgstr "Пътувам от/до работа"
#: ../src/common/pep.py:181
msgid "Driving"
-msgstr ""
+msgstr "Карам велосипед"
#: ../src/common/pep.py:182
msgid "In a Car"
-msgstr ""
+msgstr "В колата"
#: ../src/common/pep.py:183
msgid "On a Bus"
-msgstr ""
+msgstr "В автобуса"
#: ../src/common/pep.py:184
-#, fuzzy
msgid "On a Plane"
-msgstr "На линия"
+msgstr "В самолета"
#: ../src/common/pep.py:185
-#, fuzzy
msgid "On a Train"
-msgstr "Отваряне като _връзка"
+msgstr "Във влака"
#: ../src/common/pep.py:186
msgid "On a Trip"
-msgstr ""
+msgstr "На екскурзия"
#: ../src/common/pep.py:187
-#, fuzzy
msgid "Walking"
-msgstr "Работя"
+msgstr "Разхождам се"
#: ../src/common/pep.py:189
-#, fuzzy
msgid "Coding"
-msgstr "Пише"
+msgstr "Програмирам"
#: ../src/common/pep.py:190
msgid "In a Meeting"
-msgstr ""
+msgstr "На съвещание"
#: ../src/common/pep.py:191
msgid "Studying"
-msgstr ""
+msgstr "Уча"
#: ../src/common/pep.py:192
-#, fuzzy
msgid "Writing"
-msgstr "Работя"
+msgstr "Пиша"
#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:85
#, python-format
msgid "Unable to bind to port %s."
msgstr "Неуспех при свързването с порт %s."
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:86
msgid ""
"Maybe you have another running instance of Gajim. File Transfer will be "
"cancelled."
@@ -5757,26 +5654,21 @@
"бъде отменен."
#. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:279
msgid ""
"[This is part of an encrypted session. If you see this message, something "
"went wrong.]"
msgstr ""
+"[Това е част от шифрирана сесия. Ако виждате това съобщение, нещо не е както "
+"трябва.]"
-#: ../src/common/zeroconf/client_zeroconf.py:408
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:91
+#, python-format
msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Неуспех при установяването на връзка с хоста: Изтичане на допустимото време "
-"при изпращането на данните."
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
-#, fuzzy, python-format
-msgid ""
"The host %s you configured as the ft_add_hosts_to_send advanced option is "
"not valid, so ignored."
msgstr ""
-"Хостът, който сте конфигурирали в опцията „ft_override_host_to_send“ не е "
+"Хостът „%s“, който сте конфигурирали в опцията „ft_add_hosts_to_send“, не е "
"валиден, така че се пренебрегва."
#: ../src/common/zeroconf/connection_zeroconf.py:215
@@ -5787,7 +5679,7 @@
#: ../src/common/zeroconf/connection_zeroconf.py:238
msgid "Avahi error"
-msgstr "Грешка в Avahi"
+msgstr "Грешка на Avahi"
#: ../src/common/zeroconf/connection_zeroconf.py:238
#, python-format
@@ -5800,9 +5692,8 @@
"функционира правилно."
#: ../src/common/zeroconf/connection_zeroconf.py:249
-#, fuzzy
msgid "Please check if Avahi or Bonjour is installed."
-msgstr "Проверете дали Avahi е инсталиран."
+msgstr "Проверете дали Avahi или Bonjour е инсталиран."
#: ../src/common/zeroconf/connection_zeroconf.py:258
#: ../src/common/zeroconf/connection_zeroconf.py:262
@@ -5824,7 +5715,7 @@
msgid "Could not change status of account \"%s\""
msgstr "Неуспех при промяната на състоянието на акаунт „%s“"
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:380
msgid ""
"You are not connected or not visible to others. Your message could not be "
"sent."
@@ -5833,63 +5724,66 @@
"изпратено."
#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:398
msgid "[This message is encrypted]"
msgstr "[Това съобщение е шифрирано]"
-#: ../src/common/zeroconf/connection_zeroconf.py:457
-#, fuzzy
+#: ../src/common/zeroconf/connection_zeroconf.py:479
msgid "Your message could not be sent."
-msgstr "Контактът е изключен. Съобщението ви не можа да бъде изпратено."
+msgstr "Съобщението ви не можа да бъде изпратено."
#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:486
msgid "Contact is offline. Your message could not be sent."
msgstr "Контактът е изключен. Съобщението ви не можа да бъде изпратено."
+#: ../src/common/zeroconf/connection_zeroconf.py:583
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Неуспех при установяването на връзка с хоста: Изтичане на допустимото време "
+"при изпращането на данните."
+
#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/zeroconf_bonjour.py:195
#, python-format
msgid "Error while adding service. %s"
msgstr "Грешка при добавянето на услугата. %s"
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:150 ../src/config.py:579
msgid "Disabled"
msgstr "Изключени"
-#: ../src/config.py:321
+#: ../src/config.py:318
msgid "Active"
msgstr "Активен"
-#: ../src/config.py:329
+#: ../src/config.py:326
msgid "Event"
msgstr "Събитие"
-#: ../src/config.py:405
-#, fuzzy
+#: ../src/config.py:402
msgid "Default Message"
-msgstr "Стандартни съобщения за състояние"
+msgstr "Стандартно съобщение"
-#: ../src/config.py:412
-#, fuzzy
+#: ../src/config.py:409
msgid "Enabled"
-msgstr "Активиране"
+msgstr "Включено"
-#: ../src/config.py:454
+#: ../src/config.py:451
msgid "Always use OS/X default applications"
msgstr ""
-#: ../src/config.py:455
-#, fuzzy
+#: ../src/config.py:452
msgid "Custom"
-msgstr "<b>Персонални</b>"
+msgstr "Персонални"
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:645 ../src/dialogs.py:1199
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "Няма наличен речник за %s език"
-#: ../src/config.py:651
+#: ../src/config.py:646
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -5898,257 +5792,255 @@
"За да използвате проверката за правопис, трябва да инсталирате %s речник или "
"да изберете друг език чрез настройването на опцията „speller_language“."
-#: ../src/config.py:1016
+#: ../src/config.py:1011
msgid "status message title"
msgstr "заглавие на съобщението за състояние"
-#: ../src/config.py:1016
+#: ../src/config.py:1011
msgid "status message text"
msgstr "текст на съобщението за състояние"
-#: ../src/config.py:1053
+#: ../src/config.py:1047
msgid "First Message Received"
msgstr "Първо получено съобщение"
-#: ../src/config.py:1054
-#, fuzzy
+#: ../src/config.py:1048
msgid "Next Message Received Focused"
-msgstr "Следващо получено съобщение"
+msgstr "Следващо получено съобщение в прозорец на фокус"
-#: ../src/config.py:1056
-#, fuzzy
+#: ../src/config.py:1050
msgid "Next Message Received Unfocused"
-msgstr "Следващо получено съобщение"
+msgstr "Следващо получено съобщение в прозорец без фокус"
-#: ../src/config.py:1057
+#: ../src/config.py:1051
msgid "Contact Connected"
msgstr "Включване на контакт"
-#: ../src/config.py:1058
+#: ../src/config.py:1052
msgid "Contact Disconnected"
msgstr "Изключване на контакт"
-#: ../src/config.py:1059
+#: ../src/config.py:1053
msgid "Message Sent"
msgstr "Изпратено съобщение"
-#: ../src/config.py:1060
+#: ../src/config.py:1054
msgid "Group Chat Message Highlight"
msgstr "Осветено съобщение в стая"
-#: ../src/config.py:1061
+#: ../src/config.py:1055
msgid "Group Chat Message Received"
msgstr "Получено съобщение в стая"
-#: ../src/config.py:1062
+#: ../src/config.py:1056
msgid "GMail Email Received"
msgstr "Получена поща от Gmail"
#. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/config.py:1313 ../src/dialogs.py:1823 ../src/dialogs.py:1887
+#: ../src/disco.py:770 ../src/disco.py:1562 ../src/disco.py:1808
#: ../src/history_window.py:87
msgid "Name"
msgstr "Име"
-#: ../src/config.py:1405
+#: ../src/config.py:1399
msgid "Relogin now?"
msgstr "Свързване наново?"
-#: ../src/config.py:1406
+#: ../src/config.py:1400
msgid "If you want all the changes to apply instantly, you must relogin."
msgstr ""
"Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
"наново."
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1525 ../src/config.py:1624
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
msgstr "OpenPGP не може да бъде използван на този компютър"
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1660 ../src/config.py:1703
msgid "Unread events"
msgstr "Непрочетени събития"
-#: ../src/config.py:1667
+#: ../src/config.py:1661
msgid "Read all pending events before removing this account."
msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
-#: ../src/config.py:1693
+#: ../src/config.py:1687
#, python-format
msgid "You have opened chat in account %s"
msgstr "Имате активни разговори за акаунт „%s“"
-#: ../src/config.py:1694
+#: ../src/config.py:1688
msgid "All chat and groupchat windows will be closed. Do you want to continue?"
msgstr ""
"Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
"продължите?"
-#: ../src/config.py:1705
+#: ../src/config.py:1699
msgid "You are currently connected to the server"
msgstr "В момента сте свързани със сървъра"
-#: ../src/config.py:1706
+#: ../src/config.py:1700
msgid "To change the account name, you must be disconnected."
msgstr "Трябва да сте изключени, за да смените името на акаунта."
-#: ../src/config.py:1710
+#: ../src/config.py:1704
msgid "To change the account name, you must read all pending events."
msgstr ""
"За да смените името на акаунта, трябва да прочетете всички чакащи събития."
-#: ../src/config.py:1716
+#: ../src/config.py:1710
msgid "Account Name Already Used"
msgstr "Името на акаунта вече се използва"
-#: ../src/config.py:1717
+#: ../src/config.py:1711
msgid ""
"This name is already used by another of your accounts. Please choose another "
"name."
msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1715 ../src/config.py:1719
msgid "Invalid account name"
msgstr "Невалидно име на акаунт"
-#: ../src/config.py:1722
+#: ../src/config.py:1716
msgid "Account name cannot be empty."
msgstr "Трябва да посочите някакво име на акаунта."
-#: ../src/config.py:1726
+#: ../src/config.py:1720
msgid "Account name cannot contain spaces."
msgstr "Името на акаунта не може да съдържа интервали."
-#: ../src/config.py:1800
-#, fuzzy
+#: ../src/config.py:1794
msgid "Rename Account"
-msgstr "Управление на акаунти"
+msgstr "Преименуване на акаунт"
-#: ../src/config.py:1801
-#, fuzzy, python-format
+#: ../src/config.py:1795
+#, python-format
msgid "Enter a new name for account %s"
-msgstr "Въведете ново име за група „%s“"
+msgstr "Въведете ново име за акаунт „%s“"
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
+#: ../src/config.py:1813 ../src/config.py:1821 ../src/config.py:1864
+#: ../src/config.py:3079 ../src/dataforms_widget.py:536
msgid "Invalid Jabber ID"
msgstr "Невалиден Jabber ID"
-#: ../src/config.py:1828
+#: ../src/config.py:1822
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "Jabber ID трябва да бъде във формат „user@server“."
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2012 ../src/config.py:3151
msgid "Invalid entry"
msgstr "Невалиден формат"
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2013 ../src/config.py:3152
msgid "Custom port must be a port number."
msgstr "Портът по избор трябва все пак да е номер на порт."
-#: ../src/config.py:2040
+#: ../src/config.py:2034
msgid "Failed to get secret keys"
msgstr "Неуспех при извличането на частните ключове"
-#: ../src/config.py:2041
+#: ../src/config.py:2035
msgid "There was a problem retrieving your OpenPGP secret keys."
msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
-#: ../src/config.py:2076
+#: ../src/config.py:2070
msgid "OpenPGP Key Selection"
-msgstr "Избор на OpenPGP ключ"
+msgstr "Избор на ключ на OpenPGP"
-#: ../src/config.py:2077
+#: ../src/config.py:2071
msgid "Choose your OpenPGP key"
-msgstr "Изберете вашия OpenPGP ключ"
+msgstr "Изберете вашия ключ на OpenPGP"
-#: ../src/config.py:2088
+#: ../src/config.py:2078
msgid "No such account available"
msgstr "Няма такъв наличен акаунт"
-#: ../src/config.py:2089
+#: ../src/config.py:2079
msgid "You must create your account before editing your personal information."
msgstr ""
"Трябва първо да създадете акаунт и след това да редактирате личните данни."
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../src/config.py:2086 ../src/dialogs.py:1675 ../src/dialogs.py:1811
+#: ../src/dialogs.py:1990 ../src/disco.py:439 ../src/profile_window.py:319
msgid "You are not connected to the server"
msgstr "Не сте свързани към сървъра."
-#: ../src/config.py:2097
+#: ../src/config.py:2087
msgid "Without a connection, you can not edit your personal information."
msgstr "Трябва да сте свързани, за да редактирате личните данни."
-#: ../src/config.py:2101
+#: ../src/config.py:2091
msgid "Your server doesn't support Vcard"
msgstr "Сървърът ви не поддържа визитки"
-#: ../src/config.py:2102
+#: ../src/config.py:2092
msgid "Your server can't save your personal information."
msgstr "Сървърът ви не може да запази личната ви информация."
-#: ../src/config.py:2133
+#: ../src/config.py:2123
msgid "Account Local already exists."
msgstr "Името на акаунта вече се използва."
-#: ../src/config.py:2134
+#: ../src/config.py:2124
msgid "Please rename or remove it before enabling link-local messaging."
msgstr ""
"Преименувайте го или го премахнете преди да активирате съобщения от/за "
"локални контакти."
-#: ../src/config.py:2317
+#: ../src/config.py:2307
#, python-format
msgid "Edit %s"
msgstr "Редактиране на %s"
-#: ../src/config.py:2319
+#: ../src/config.py:2309
#, python-format
msgid "Register to %s"
msgstr "Регистриране в %s"
#. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2345
msgid "Ban List"
msgstr "Списък с отлъчени"
-#: ../src/config.py:2356
+#: ../src/config.py:2346
msgid "Member List"
msgstr "Списък с членове"
-#: ../src/config.py:2357
+#: ../src/config.py:2347
msgid "Owner List"
msgstr "Списък със собственици"
-#: ../src/config.py:2358
+#: ../src/config.py:2348
msgid "Administrator List"
msgstr "Списък с администратори"
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2397 ../src/disco.py:777 ../src/history_manager.py:184
msgid "JID"
msgstr "JID"
-#: ../src/config.py:2415
+#: ../src/config.py:2405
msgid "Reason"
msgstr "Причина"
-#: ../src/config.py:2420
+#: ../src/config.py:2410
msgid "Nick"
msgstr "Псевдоним"
-#: ../src/config.py:2424
+#: ../src/config.py:2414
msgid "Role"
msgstr "Роля"
-#: ../src/config.py:2449
+#: ../src/config.py:2439
msgid "Banning..."
-msgstr "Отлъчване..."
+msgstr "Отлъчване…"
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2441
msgid ""
"<b>Whom do you want to ban?</b>\n"
"\n"
@@ -6156,11 +6048,11 @@
"<b>Кого искате да отлъчите?</b>\n"
"\n"
-#: ../src/config.py:2453
+#: ../src/config.py:2443
msgid "Adding Member..."
-msgstr "Добавяне на член..."
+msgstr "Добавяне на член…"
-#: ../src/config.py:2454
+#: ../src/config.py:2444
msgid ""
"<b>Whom do you want to make a member?</b>\n"
"\n"
@@ -6168,11 +6060,11 @@
"<b>Кого искате да направите член?</b>\n"
"\n"
-#: ../src/config.py:2456
+#: ../src/config.py:2446
msgid "Adding Owner..."
-msgstr "Добавяне на собственик..."
+msgstr "Добавяне на собственик…"
-#: ../src/config.py:2457
+#: ../src/config.py:2447
msgid ""
"<b>Whom do you want to make an owner?</b>\n"
"\n"
@@ -6180,11 +6072,11 @@
"<b>Кого искате да направите собственик?</b>\n"
"\n"
-#: ../src/config.py:2459
+#: ../src/config.py:2449
msgid "Adding Administrator..."
-msgstr "Добавяне на администратор..."
+msgstr "Добавяне на администратор…"
-#: ../src/config.py:2460
+#: ../src/config.py:2450
msgid ""
"<b>Whom do you want to make an administrator?</b>\n"
"\n"
@@ -6192,7 +6084,7 @@
"<b>Кого искате да направите администратор?</b>\n"
"\n"
-#: ../src/config.py:2461
+#: ../src/config.py:2451
msgid ""
"Can be one of the following:\n"
"1. user@domain/resource (only that resource matches).\n"
@@ -6208,83 +6100,83 @@
"4. домейн (домейна съвпада, както и всеки потребител@домейн,\n"
"домейн/ресурс или адрес, съдържащ под-домейн."
-#: ../src/config.py:2558
+#: ../src/config.py:2548
#, python-format
msgid "Removing %s account"
msgstr "Премахване на акаунт „%s“"
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2570 ../src/gajim.py:1429 ../src/roster_window.py:1933
msgid "Password Required"
msgstr "Необходима е парола"
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2571 ../src/roster_window.py:1907
#, python-format
msgid "Enter your password for account %s"
msgstr "Въведете парола за акаунт „%s“"
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2572 ../src/roster_window.py:1934
msgid "Save password"
msgstr "Запазване на паролата"
-#: ../src/config.py:2591
+#: ../src/config.py:2581
#, python-format
msgid "Account \"%s\" is connected to the server"
msgstr "Акаунт „%s“ е свързан към сървъра"
-#: ../src/config.py:2592
+#: ../src/config.py:2582
msgid "If you remove it, the connection will be lost."
msgstr "Ако го премахнете, връзката ще се разпадне."
-#: ../src/config.py:2688
+#: ../src/config.py:2678
msgid "Default"
msgstr "По подразбиране"
-#: ../src/config.py:2688
+#: ../src/config.py:2678
msgid "?print_status:All"
msgstr "Всички"
-#: ../src/config.py:2689
+#: ../src/config.py:2679
msgid "Enter and leave only"
msgstr "Само влизащи и излизащи"
-#: ../src/config.py:2690
+#: ../src/config.py:2680
msgid "?print_status:None"
msgstr "Без"
-#: ../src/config.py:2758
+#: ../src/config.py:2748
msgid "New Group Chat"
msgstr "Нова стая"
-#: ../src/config.py:2791
+#: ../src/config.py:2781
msgid "This bookmark has invalid data"
msgstr "Тази отметка съдържа невалидни данни"
-#: ../src/config.py:2792
+#: ../src/config.py:2782
msgid ""
"Please be sure to fill out server and room fields or remove this bookmark."
msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
-#: ../src/config.py:3072
+#: ../src/config.py:3062
msgid "Invalid username"
msgstr "Невалидно потребителско име"
-#: ../src/config.py:3074
+#: ../src/config.py:3064
msgid "You must provide a username to configure this account."
msgstr "Трябва да въведете име на потребител за новия акаунт."
-#: ../src/config.py:3100
+#: ../src/config.py:3090
msgid "Duplicate Jabber ID"
msgstr "Дублиран Jabber ID"
-#: ../src/config.py:3101
+#: ../src/config.py:3091
msgid "This account is already configured in Gajim."
msgstr "Този акаунт вече е конфигуриран в Gajim."
-#: ../src/config.py:3118
+#: ../src/config.py:3108
msgid "Account has been added successfully"
msgstr "Акаунтът беше добавен успешно"
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3109 ../src/config.py:3298
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 "
@@ -6293,27 +6185,25 @@
"Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
"или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
-#: ../src/config.py:3137
-#, fuzzy
+#: ../src/config.py:3127
msgid "Invalid server"
-msgstr "Невалидно потребителско име"
+msgstr "Невалиден сървър"
-#: ../src/config.py:3138
-#, fuzzy
+#: ../src/config.py:3128
msgid "Please provide a server on which you want to register."
-msgstr "Въведете новия псевдоним, който искате да използвате:"
+msgstr "Задайте сървър, където искате да се регистрирате."
-#: ../src/config.py:3189 ../src/gajim.py:1996
-#, fuzzy
+#: ../src/config.py:3179 ../src/gajim.py:2007
msgid "Certificate Already in File"
-msgstr "Контактът вече е в списъка"
+msgstr "Сертификатът вече е във файла"
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../src/config.py:3180 ../src/gajim.py:2008
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr ""
+"Този сертификат вече е във файла „%s“, така че няма да бъде добавен наново."
-#: ../src/config.py:3258
+#: ../src/config.py:3248
#, python-format
msgid ""
"<b>Security Warning</b>\n"
@@ -6322,119 +6212,128 @@
"SSL Error: %(error)s\n"
"Do you still want to connect to this server?"
msgstr ""
+"<b>Предупреждение за сигурността</b>\n"
+"\n"
+"Автентичността на сертификата на %(hostname)s е под въпрос.\n"
+"Грешка на SSL: %(error)s\n"
+"Все още ли искате да се свържете с този сървър?"
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3254 ../src/gajim.py:2031
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
"SHA1 fingerprint of the certificate:\n"
"%s"
msgstr ""
+"Добавяне на този сертификат към списъка с доверени сертификати.\n"
+"Отпечатък тип SHA1 на сертификата:\n"
+"%s"
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3277 ../src/config.py:3316
msgid "An error occurred during account creation"
msgstr "Възникна грешка при създаването на акаунта"
-#: ../src/config.py:3307
+#: ../src/config.py:3297
msgid "Your new account has been created successfully"
msgstr "Новият акаунт беше създаден успешно"
-#: ../src/config.py:3410
+#: ../src/config.py:3400
msgid "Account name is in use"
msgstr "Името на акаунта се използва"
-#: ../src/config.py:3411
+#: ../src/config.py:3401
msgid "You already have an account using this name."
msgstr "Вече има регистриран акаунт с това име."
-#: ../src/conversation_textview.py:549
+#: ../src/conversation_textview.py:562
msgid ""
"This icon indicates that this message has not yet\n"
"been received by the remote end. If this icon stays\n"
"for a long time, it's likely the message got lost."
msgstr ""
+"Тази икона показва, че съобщението все още не е\n"
+"получено от отсрещния контакт. Ако иконата остане\n"
+"дълго време, най-вероятно съобщението е било изгубено."
-#: ../src/conversation_textview.py:568
-#, fuzzy
+#: ../src/conversation_textview.py:581
msgid ""
"Text below this line is what has been said since the\n"
"last time you paid attention to this group chat"
msgstr ""
-"Текстът под този ред е последното, което е казано откакто за последен път "
-"сте обърнали внимание на тази стая"
+"Текстът под този ред е последното, което е казано откакто\n"
+"за последен път сте обърнали внимание на тази стая"
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:692
#, python-format
msgid "_Actions for \"%s\""
msgstr "_Действия за „%s“"
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:704
msgid "Read _Wikipedia Article"
msgstr "Четене на статия от _Уикипедия"
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:709
msgid "Look it up in _Dictionary"
msgstr "Проверка в _речника"
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:726
#, python-format
msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
msgstr "Липсва „%s“ в адреса на речника и не е WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:739
#, python-format
msgid "Web Search URL is missing an \"%s\""
msgstr "Липсва „%s“ в адреса за търсене"
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:742
msgid "Web _Search for it"
msgstr "_Търсене в уеб"
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:748
msgid "Open as _Link"
msgstr "Отваряне като _връзка"
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#: ../src/conversation_textview.py:1015 ../src/conversation_textview.py:1033
#, python-format
msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
+msgstr "Грешка при изпълнение на „%(command)s“: %(error)s"
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1290
msgid "Yesterday"
msgstr "Вчера"
#. the number is >= 2
#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1294
#, python-format
msgid "%i days ago"
msgstr "Преди %i дни"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1328
#, python-format
msgid "Subject: %s\n"
msgstr "Тема: %s\n"
#: ../src/dataforms_widget.py:540
-#, fuzzy
msgid "Jabber ID already in list"
-msgstr "Джабър клиент за бързи съобщения"
+msgstr "В списъка вече има такъв Jabber ID"
#: ../src/dataforms_widget.py:541
msgid "The Jabber ID you entered is already in the list. Choose another one."
-msgstr ""
+msgstr "Въведеният Jabber ID вече съществува в списъка. Изберете друг."
#. Default jid
#: ../src/dataforms_widget.py:552
msgid "new(a)jabber.id"
-msgstr ""
+msgstr "new(a)jabber.id"
#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
#, python-format
msgid "new%d(a)jabber.id"
-msgstr ""
+msgstr "new%d(a)jabber.id"
#: ../src/dialogs.py:75
#, python-format
@@ -6462,236 +6361,229 @@
msgid "Contact name"
msgstr "Име на контакта"
-#: ../src/dialogs.py:461
-#, fuzzy
+#: ../src/dialogs.py:460
msgid "Set Mood"
-msgstr "Настройване на MOTD"
+msgstr "Задаване на настроение"
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:548
#, python-format
msgid "%s Status Message"
msgstr "Съобщение за състояние „%s“"
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:550
msgid "Status Message"
msgstr "Съобщение за състояние"
-#: ../src/dialogs.py:672
-#, fuzzy
+#: ../src/dialogs.py:662
msgid "Overwrite Status Message?"
-msgstr "Съобщение за състояние"
+msgstr "Презаписване на съобщението за състояние?"
-#: ../src/dialogs.py:673
-#, fuzzy
+#: ../src/dialogs.py:663
msgid ""
"This name is already used. Do you want to overwrite this status message?"
-msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
+msgstr ""
+"Това име вече се използва. Искате ли да презапишете това съобщение за "
+"състояние?"
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:672
msgid "Save as Preset Status Message"
msgstr "Запазване като настроено съобщение за състояние"
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:673
msgid "Please type a name for this status message"
msgstr "Напишете име за това съобщение за състояние"
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:679
msgid "AIM Address:"
msgstr "Адрес на AIM:"
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:680
msgid "GG Number:"
msgstr "Номер на GG:"
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:681
msgid "ICQ Number:"
msgstr "Номер на ICQ:"
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:682
msgid "MSN Address:"
msgstr "Адрес на MSN:"
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:683
msgid "Yahoo! Address:"
msgstr "Адрес на Yahoo!:"
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:719
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr ""
"Попълнете данните за контакта, който искате да добавите към акаунт „%s“"
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:721
msgid "Please fill in the data of the contact you want to add"
msgstr "Попълнете данните за контакта, който искате да добавите"
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:878 ../src/dialogs.py:884 ../src/dialogs.py:889
msgid "Invalid User ID"
msgstr "Невалиден идентификатор"
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:885
msgid "The user ID must not contain a resource."
msgstr "Потребителският идентификатор не трябва да съдържа ресурс."
-#: ../src/dialogs.py:900
-#, fuzzy
+#: ../src/dialogs.py:890
msgid "You cannot add yourself to your roster."
-msgstr ""
-"Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
-"roster."
+msgstr "Не може да добавите себе си към списъка."
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:904
msgid "Contact already in roster"
msgstr "Контактът вече е в списъка"
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:905
msgid "This contact is already listed in your roster."
msgstr "Контактът вече съществува в списъка."
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:941
msgid "User ID:"
msgstr "Идентификатор на потребител:"
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:999
msgid "A GTK+ jabber client"
-msgstr "GTK+ Джабър клиент"
+msgstr "Джабър клиент за GTK+"
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1000
msgid "GTK+ Version:"
msgstr "Версия на GTK+:"
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1001
msgid "PyGTK Version:"
msgstr "Версия на PyGTK:"
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1011
msgid "Current Developers:"
msgstr "Текущи разработчици:"
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1013
msgid "Past Developers:"
msgstr "Бивши разработчици:"
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1019
msgid "THANKS:"
msgstr "БЛАГОДАРНОСТИ:"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1025
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:1048
+#: ../src/dialogs.py:1038
msgid "translator-credits"
msgstr ""
-"Явор Доганов <yavor(a)doganov.org>\n"
+"Явор Доганов <yavor(a)gnu.org>\n"
"\n"
"Проектът за превод на GNOME има нужда от подкрепа.\n"
"Научете повече за нас на http://gnome.cult.bg\n"
"Докладвайте за грешки на http://gnome.cult.bg/bugs"
-#: ../src/dialogs.py:1210
-#, fuzzy, python-format
+#: ../src/dialogs.py:1200
+#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
"language by setting the speller_language option.\n"
"\n"
"Highlighting misspelled words feature will not be used"
msgstr ""
-"За да използвате проверката за правопис, трябва да инсталирате %s речник или "
-"да изберете друг език чрез настройването на опцията „speller_language“."
+"За да използвате проверката за правопис, трябва да инсталирате речник за %s "
+"или да изберете друг език чрез настройването на опцията „speller_language“.\n"
+"\n"
+"Функционалността за осветяване на сгрешени думи ще е изключена"
-#: ../src/dialogs.py:1614
-#, fuzzy, python-format
+#: ../src/dialogs.py:1604
+#, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
-msgstr "Искане за записване за акаунт „%s“ от %s"
+msgstr "Искане за записване за акаунт „%(account)s“ от %(jid)s"
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1607
#, python-format
msgid "Subscription request from %s"
msgstr "Искане за записване от %s"
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1668 ../src/gajim.py:2631
#, python-format
msgid "You are already in group chat %s"
msgstr "Вече сте в стая „%s“"
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1676
msgid "You can not join a group chat unless you are connected."
msgstr "Трябва да сте свързани, за да влезете в стая."
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1695
#, python-format
msgid "Join Group Chat with account %s"
msgstr "Влизане в стая с акаунт „%s“"
-#: ../src/dialogs.py:1776
-#, fuzzy
+#: ../src/dialogs.py:1766
msgid "Invalid Nickname"
-msgstr "Невалидно потребителско име"
+msgstr "Невалиден псевдоним"
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-#, fuzzy
+#: ../src/dialogs.py:1767 ../src/groupchat_control.py:1451
+#: ../src/groupchat_control.py:1732
msgid "The nickname has not allowed characters."
-msgstr "Jabber ID на стаята съдържа непозволени знаци."
+msgstr "Псевдонимът съдържа непозволени знаци."
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
+#: ../src/groupchat_control.py:1899
msgid "Invalid group chat Jabber ID"
msgstr "Невалиден Jabber ID на стая"
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
+#: ../src/groupchat_control.py:1900
msgid "The group chat Jabber ID has not allowed characters."
msgstr "Jabber ID на стаята съдържа непозволени знаци."
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:1784
msgid "This is not a group chat"
msgstr "Това не е стая"
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:1785
#, python-format
msgid "%s is not the name of a group chat."
msgstr "%s не е име на стая."
-#: ../src/dialogs.py:1822
-#, fuzzy
+#: ../src/dialogs.py:1812
msgid "Without a connection, you can not synchronise your contacts."
-msgstr "Трябва да сте свързани, за да променяте паролата."
+msgstr "Трябва да сте свързани, за да синхронизирате контактите си."
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:1826
msgid "Server"
msgstr "Сървър"
-#: ../src/dialogs.py:1869
-#, fuzzy
+#: ../src/dialogs.py:1859
msgid "This account is not connected to the server"
-msgstr "Акаунт „%s“ е свързан към сървъра"
+msgstr "Този акаунт не е свързан към сървъра"
-#: ../src/dialogs.py:1870
-#, fuzzy
+#: ../src/dialogs.py:1860
msgid "You cannot synchronize with an account unless it is connected."
-msgstr "Трябва да сте свързани, за да влезете в стая."
+msgstr "Не може да се синхронизирате с акаунт, ако не е свързан."
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:1884
msgid "Synchronise"
-msgstr ""
+msgstr "Синхронизиране"
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:1942
#, python-format
msgid "Start Chat with account %s"
msgstr "Започване на разговор с акаунт „%s“"
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:1944
msgid "Start Chat"
msgstr "Започване на разговор"
-#: ../src/dialogs.py:1955
+#: ../src/dialogs.py:1945
msgid ""
"Fill in the nickname or the Jabber ID of the contact you would like\n"
"to send a chat message to:"
@@ -6700,315 +6592,320 @@
"искате да изпратите съобщение:"
#. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/dialogs.py:1969 ../src/dialogs.py:2344 ../src/dialogs.py:2487
#: ../src/normal_control.py:640
msgid "Connection not available"
msgstr "В момента няма връзка"
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
#: ../src/normal_control.py:641
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "Уверете се, че сте свързани към „%s“."
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
msgid "Invalid JID"
msgstr "Невалиден JID"
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:1982
#, python-format
msgid "Unable to parse \"%s\"."
msgstr "Неуспех при анализирането на „%s“."
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:1991
msgid "Without a connection, you can not change your password."
msgstr "Трябва да сте свързани, за да променяте паролата."
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2010
msgid "Invalid password"
msgstr "Невалидна парола"
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2010
msgid "You must enter a password."
msgstr "Трябва да въведете парола."
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2014
msgid "Passwords do not match"
msgstr "Паролите не съвпадат"
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2015
msgid "The passwords typed in both fields must be identical."
msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
#. img to display
#. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/dialogs.py:2055 ../src/notify.py:245 ../src/notify.py:474
#: ../src/osx/growler.py:12
msgid "Contact Signed In"
msgstr "Включи се контакт"
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/dialogs.py:2057 ../src/notify.py:253 ../src/notify.py:476
#: ../src/osx/growler.py:12
msgid "Contact Signed Out"
msgstr "Изключи се контакт"
#. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/dialogs.py:2059 ../src/notify.py:276 ../src/notify.py:478
#: ../src/osx/growler.py:12
msgid "New Message"
msgstr "Ново съобщение"
#. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/dialogs.py:2059 ../src/notify.py:257 ../src/notify.py:478
#: ../src/osx/growler.py:13
msgid "New Single Message"
msgstr "Ново еднократно съобщение"
#. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/dialogs.py:2060 ../src/notify.py:264 ../src/notify.py:479
#: ../src/osx/growler.py:13
msgid "New Private Message"
msgstr "Ново лично съобщение"
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
+#: ../src/dialogs.py:2060 ../src/gajim.py:1594 ../src/notify.py:487
#: ../src/osx/growler.py:13
msgid "New E-mail"
msgstr "Нова е-поща"
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
+#: ../src/dialogs.py:2062 ../src/gajim.py:1660 ../src/notify.py:481
#: ../src/osx/growler.py:14
msgid "File Transfer Request"
msgstr "Запитване за файлов трансфер"
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2064 ../src/gajim.py:1560 ../src/gajim.py:1627
+#: ../src/notify.py:483 ../src/osx/growler.py:14
msgid "File Transfer Error"
msgstr "Грешка при файловия трансфер"
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2066 ../src/gajim.py:1702 ../src/gajim.py:1724
+#: ../src/gajim.py:1741 ../src/notify.py:485 ../src/osx/growler.py:15
msgid "File Transfer Completed"
msgstr "Файловият трансфер е приключен"
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
+#: ../src/dialogs.py:2067 ../src/gajim.py:1705 ../src/notify.py:485
#: ../src/osx/growler.py:15
msgid "File Transfer Stopped"
msgstr "Файловият трансфер е преустановен"
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
+#: ../src/dialogs.py:2069 ../src/gajim.py:1450 ../src/notify.py:489
#: ../src/osx/growler.py:16
msgid "Groupchat Invitation"
msgstr "Покана за разговор в стая"
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/dialogs.py:2071 ../src/notify.py:237 ../src/notify.py:491
#: ../src/osx/growler.py:16
msgid "Contact Changed Status"
msgstr "Контактът промени състоянието си"
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2263 ../src/normal_control.py:241
#, python-format
msgid "Single Message using account %s"
msgstr "Еднократно съобщение с акаунт „%s“"
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2265 ../src/normal_control.py:243
#, python-format
msgid "Single Message in account %s"
msgstr "Еднократно съобщение за акаунт „%s“"
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2267 ../src/normal_control.py:245
msgid "Single Message"
msgstr "Еднократно съобщение"
#. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2270 ../src/normal_control.py:248
#, python-format
msgid "Send %s"
msgstr "Изпращане на %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2293 ../src/normal_control.py:290
#, python-format
msgid "Received %s"
msgstr "Получено %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
-#, fuzzy, python-format
+#: ../src/dialogs.py:2316 ../src/normal_control.py:324
+#, python-format
msgid "Form %s"
-msgstr "%s"
+msgstr "От %s"
#. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2388 ../src/normal_control.py:692
#, python-format
msgid "RE: %s"
msgstr "Относно: %s"
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2389 ../src/normal_control.py:696
#, python-format
msgid "%s wrote:\n"
msgstr "%s написа:\n"
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2433
#, python-format
msgid "XML Console for %s"
msgstr "XML конзола за %s"
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2435
msgid "XML Console"
msgstr "XML конзола"
-#: ../src/dialogs.py:2568
+#: ../src/dialogs.py:2559
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "Филтър за уединение <b><i>%s</i></b>"
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2563
#, python-format
msgid "Privacy List for %s"
msgstr "Филтър за уединение за %s"
-#: ../src/dialogs.py:2628
-#, fuzzy, python-format
+#: ../src/dialogs.py:2619
+#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
-msgstr "Ред: %s, действие: %s, вид: %s, стойност: %s"
+msgstr ""
+"Ред: %(order)s, действие: %(action)s, вид: %(type)s, стойност: %(value)s"
-#: ../src/dialogs.py:2633
-#, fuzzy, python-format
+#: ../src/dialogs.py:2624
+#, python-format
msgid "Order: %(order)s, action: %(action)s"
-msgstr "Ред: %s, действие: %s"
+msgstr "Ред: %(order)s, действие: %(action)s"
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:2666
msgid "<b>Edit a rule</b>"
msgstr "<b>Редактиране на правило</b>"
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:2753
msgid "<b>Add a rule</b>"
msgstr "<b>Добавяне на правило</b>"
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:2849
#, python-format
msgid "Privacy Lists for %s"
msgstr "Филтри за уединение за %s"
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:2851
msgid "Privacy Lists"
msgstr "Филтри за уединение"
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:2921
msgid "Invalid List Name"
msgstr "Невалидно име на филтър"
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:2922
msgid "You must enter a name to create a privacy list."
msgstr "Трябва да въведете име, за да се създаде филтър за уединение."
-#: ../src/dialogs.py:2963
-#, fuzzy
+#: ../src/dialogs.py:2954
msgid "You are invited to a groupchat"
-msgstr "Не сте влезли в стая."
+msgstr "Поканени сте в стая."
-#: ../src/dialogs.py:2966
-#, fuzzy
+#: ../src/dialogs.py:2957
msgid "$Contact has invited you to join a discussion"
-msgstr "$Contact ви покани в стая %(room_jid)s."
+msgstr "$Contact ви покани да се присъедините към дискусия"
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:2959
#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr "$Contact ви покани в стая %(room_jid)s."
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:2967
#, python-format
msgid "Comment: %s"
msgstr "Коментар: %s"
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:2969
msgid "Do you want to accept the invitation?"
-msgstr ""
+msgstr "Искате ли да приемете поканата?"
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3024
msgid "Choose Sound"
msgstr "Избор на звук"
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3034 ../src/dialogs.py:3085
msgid "All files"
msgstr "Всички файлове"
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3039
msgid "Wav Sounds"
msgstr "Формат WAV"
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3072
msgid "Choose Image"
msgstr "Избор на изображение"
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3090
msgid "Images"
msgstr "Изображения"
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3155
#, python-format
msgid "When %s becomes:"
msgstr "Когато %s стане:"
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3157
#, python-format
msgid "Adding Special Notification for %s"
msgstr "Добавяне на специално уведомление за %s"
#. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3227
msgid "#"
msgstr "№"
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3233
msgid "Condition"
msgstr "Условие"
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3351
msgid "when I am "
msgstr "когато съм "
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:3823
#, python-format
msgid ""
"Your chat session with <b>%(jid)s</b> is encrypted.\n"
"\n"
"This session's Short Authentication String is <b>%(sas)s</b>."
msgstr ""
+"Сесията ви с <b>%(jid)s</b> е шифрирана.\n"
+"\n"
+"Краткият удостоверителен низ (SAS) на сесията е <b>%(sas)s</b>."
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:3827
msgid "You have already verified this contact's identity."
-msgstr ""
+msgstr "Вече се проверили идентичността на този контакт."
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:3833 ../src/dialogs.py:3920
msgid "Contact's identity verified"
-msgstr ""
+msgstr "Идентичността на контакта проверена"
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:3841
msgid "Verify again..."
-msgstr ""
+msgstr "Проверка наново…"
-#: ../src/dialogs.py:3859
+#: ../src/dialogs.py:3846
msgid ""
"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 ""
+"За да се сигурни, че <b>само</b> очакваният човек може да чете ваши "
+"съобщения или да ви изпраща такива, е необходимо да проверите идентичността "
+"му като натиснете бутона по-долу."
-#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:3849 ../src/dialogs.py:3901 ../src/dialogs.py:3914
msgid "Contact's identity NOT verified"
-msgstr ""
+msgstr "Идентичността на контакта НЕ Е проверена"
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:3856
msgid "Verify..."
-msgstr ""
+msgstr "Проверка…"
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:3868
msgid "Have you verified the contact's identity?"
-msgstr ""
+msgstr "Проверихте ли идентичността на контакта?"
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:3869
#, python-format
msgid ""
"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7017,31 +6914,43 @@
"\n"
"This session's Short Authentication String is <b>%(sas)s</b>."
msgstr ""
+"За да избегнете разговор с непознат човек, трябва да говорите с <b>%(jid)s</"
+"b> директно (лично или по телефона) и да проверите дали вижда същия Кратък "
+"удостоверителен низ (SAS) като вас.\n"
+"\n"
+"Краткият удостоверителен низ на тази сесия е <b>%(sas)s</b>."
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:3870
msgid "Did you talk to the remote contact and verify the SAS?"
-msgstr ""
+msgstr "Говорихте ли с отдалечение контакт за проверка на SAS?"
-#: ../src/dialogs.py:3915
+#: ../src/dialogs.py:3902
#, python-format
msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
-msgstr ""
+msgstr "Ключът на контакта (%s) <b>не съвпада</b> с този, зададен в Gajim."
-#: ../src/dialogs.py:3921
+#: ../src/dialogs.py:3908
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
msgstr ""
+"Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
+"съобщения."
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:3915
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 ""
+"Има зададен ключ на GPG за този контакт, но <b>вие не му се доверявате</b>, "
+"така че съобщенията <b>не могат</b> да се шифрират. За да се доверите на "
+"този ключ, използвайте клиент на GPG."
-#: ../src/dialogs.py:3934
+#: ../src/dialogs.py:3921
msgid ""
"GPG Key is assigned to this contact, and you trust his key, so messages will "
"be encrypted."
msgstr ""
+"Има зададен ключ на GPG за този контакт и вие му се доверявате, така че "
+"съобщенията ще бъдат шифрирани."
#: ../src/disco.py:116
msgid "Others"
@@ -7077,7 +6986,7 @@
"Няма услуга на въведения адрес или не отговаря. Проверете адреса и опитайте "
"отново."
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:661 ../src/disco.py:957
msgid "The service is not browsable"
msgstr "Услугата не е достъпна"
@@ -7086,36 +6995,34 @@
msgstr "Този вид услуга не съдържа обекти за показване."
#: ../src/disco.py:699 ../src/disco.py:709
-#, fuzzy
msgid "Invalid Server Name"
-msgstr "Невалидно потребителско име"
+msgstr "Невалидно име на сървър"
-#: ../src/disco.py:754
-#, fuzzy, python-format
+#: ../src/disco.py:756
+#, python-format
msgid "Browsing %(address)s using account %(account)s"
-msgstr "Търсене в %s от акаунт „%s“"
+msgstr "Търсене в %(address)s от акаунт „%(account)s“"
-#: ../src/disco.py:794
+#: ../src/disco.py:796
msgid "_Browse"
msgstr "_Търсене"
-#: ../src/disco.py:956
+#: ../src/disco.py:958
msgid "This service does not contain any items to browse."
msgstr "Тази услуга не съдържа обекти за показване."
-#: ../src/disco.py:1179
-#, fuzzy
+#: ../src/disco.py:1180
msgid "_Execute Command"
-msgstr "_Изпълнение на команда..."
+msgstr "_Изпълнение на команда"
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1190 ../src/disco.py:1354
msgid "Re_gister"
msgstr "_Регистриране"
-#: ../src/disco.py:1390
-#, fuzzy, python-format
+#: ../src/disco.py:1391
+#, python-format
msgid "Scanning %(current)d / %(total)d.."
-msgstr "Сканиране на %d / %d.."
+msgstr "Сканиране на %(current)d / %(total)d…"
#. Users column
#: ../src/disco.py:1572
@@ -7132,265 +7039,272 @@
msgid "Id"
msgstr "Идентификатор"
-#: ../src/disco.py:1818
+#: ../src/disco.py:1817
msgid "Subscribed"
msgstr "Записан"
-#: ../src/disco.py:1826
-#, fuzzy
+#: ../src/disco.py:1825
msgid "Node"
-msgstr "Няма"
+msgstr "Възел"
-#: ../src/disco.py:1883
+#: ../src/disco.py:1882
msgid "New post"
msgstr "Ново съобщение"
-#: ../src/disco.py:1889
+#: ../src/disco.py:1888
msgid "_Subscribe"
msgstr "_Записване"
-#: ../src/disco.py:1895
+#: ../src/disco.py:1894
msgid "_Unsubscribe"
msgstr "_Отписване"
-#: ../src/features_window.py:51
+#: ../src/features_window.py:49
msgid "PyOpenSSL"
-msgstr ""
+msgstr "PyOpenSSL"
-#: ../src/features_window.py:52
+#: ../src/features_window.py:50
msgid ""
"A library used to validate server certificates to ensure a secure connection."
msgstr ""
+"Библиотека за проверка на валидността на сертификатите на сървърите. "
+"Използва се за установяване на сигурна връзка."
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:51 ../src/features_window.py:52
msgid "Requires python-pyopenssl."
-msgstr ""
+msgstr "Изисква python-pyopenssl."
-#: ../src/features_window.py:55
+#: ../src/features_window.py:53
msgid "Bonjour / Zeroconf"
-msgstr ""
+msgstr "Bonjour / Zeroconf"
-#: ../src/features_window.py:56
+#: ../src/features_window.py:54
msgid "Serverless chatting with autodetected clients in a local network."
msgstr ""
+"Разговори с автоматично открити контакти в локалната мрежа (без сървър)."
-#: ../src/features_window.py:57
+#: ../src/features_window.py:55
msgid "Requires python-avahi."
-msgstr ""
+msgstr "Изисква python-avahi."
-#: ../src/features_window.py:58
+#: ../src/features_window.py:56
msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
msgstr ""
-#: ../src/features_window.py:59
+#: ../src/features_window.py:57
msgid "gajim-remote"
-msgstr ""
+msgstr "gajim-remote"
-#: ../src/features_window.py:60
+#: ../src/features_window.py:58
msgid "A script to control Gajim via commandline."
-msgstr ""
+msgstr "Скрипт за управление на Gajim от командния ред."
-#: ../src/features_window.py:61
+#: ../src/features_window.py:59
msgid "Requires python-dbus."
-msgstr ""
+msgstr "Изисква python-dbus."
-#: ../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:60 ../src/features_window.py:64
+#: ../src/features_window.py:68 ../src/features_window.py:72
+#: ../src/features_window.py:76 ../src/features_window.py:84
+#: ../src/features_window.py:88
msgid "Feature not available under Windows."
msgstr ""
-#: ../src/features_window.py:63
-#, fuzzy
+#: ../src/features_window.py:61
msgid "OpenGPG"
-msgstr "OpenPGP: "
+msgstr "OpenGPG"
-#: ../src/features_window.py:64
+#: ../src/features_window.py:62
msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+msgstr "Шифриране на съобщения с ключове на GPG."
-#: ../src/features_window.py:65
+#: ../src/features_window.py:63
msgid "Requires gpg and python-GnuPGInterface."
-msgstr ""
+msgstr "Изисква gpg и python-GnuPGInterface."
-#: ../src/features_window.py:67
-#, fuzzy
+#: ../src/features_window.py:65
msgid "network-manager"
-msgstr "Мениджър на историята"
+msgstr "network-manager"
-#: ../src/features_window.py:68
+#: ../src/features_window.py:66
msgid "Autodetection of network status."
-msgstr ""
+msgstr "Автоматично засичане на състоянието на мрежата."
-#: ../src/features_window.py:69
+#: ../src/features_window.py:67
msgid "Requires gnome-network-manager and python-dbus."
-msgstr ""
+msgstr "Изисква gnome-network-manager и python-dbus."
-#: ../src/features_window.py:71
-#, fuzzy
+#: ../src/features_window.py:69
msgid "Session Management"
-msgstr "Изпратено съобщение"
+msgstr "Управление на сесии"
-#: ../src/features_window.py:72
+#: ../src/features_window.py:70
msgid "Gajim session is stored on logout and restored on login."
-msgstr ""
+msgstr "Запазва сесията на Gajim при излизане и я възстановява при влизане."
-#: ../src/features_window.py:73
+#: ../src/features_window.py:71
msgid "Requires python-gnome2."
-msgstr ""
+msgstr "Изисква python-gnome2."
-#: ../src/features_window.py:75
+#: ../src/features_window.py:73
msgid "gnome-keyring"
-msgstr ""
+msgstr "gnome-keyring"
-#: ../src/features_window.py:76
+#: ../src/features_window.py:74
msgid "Passwords can be stored securely and not just in plaintext."
msgstr ""
+"Паролите могат да се съхраняват по сигурен начин, вместо в обикновен текст."
-#: ../src/features_window.py:77
+#: ../src/features_window.py:75
msgid "Requires gnome-keyring and python-gnome2-desktop."
-msgstr ""
+msgstr "Изисква gnome-keyring и python-gnome2-desktop."
-#: ../src/features_window.py:79
+#: ../src/features_window.py:77
msgid "SRV"
-msgstr ""
+msgstr "SRV"
-#: ../src/features_window.py:80
+#: ../src/features_window.py:78
msgid "Ability to connect to servers which are using SRV records."
-msgstr ""
+msgstr "Възможност за свързване към сървъри, които използват записи SRV."
-#: ../src/features_window.py:81
+#: ../src/features_window.py:79
msgid "Requires dnsutils."
-msgstr ""
+msgstr "Изисква dnsutils."
-#: ../src/features_window.py:82
+#: ../src/features_window.py:80
msgid "Requires nslookup to use SRV records."
msgstr ""
-#: ../src/features_window.py:83
+#: ../src/features_window.py:81
msgid "Spell Checker"
-msgstr ""
+msgstr "Проверка на правописа"
-#: ../src/features_window.py:84
+#: ../src/features_window.py:82
msgid "Spellchecking of composed messages."
-msgstr ""
+msgstr "Проверка на изходящите съобщения за правописни грешки."
-#: ../src/features_window.py:85
+#: ../src/features_window.py:83
msgid ""
"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
"sources."
msgstr ""
+"Изисква python-gnome2-extras и компилация на модула „gtkspell“ от изходния "
+"код на Gajim."
-#: ../src/features_window.py:87
+#: ../src/features_window.py:85
msgid "Notification-daemon"
-msgstr ""
+msgstr "Демон за уведомления"
-#: ../src/features_window.py:88
+#: ../src/features_window.py:86
msgid "Passive popups notifying for new events."
-msgstr ""
+msgstr "Изскачащи прозорци с уведомления за нови събития."
-#: ../src/features_window.py:89
+#: ../src/features_window.py:87
msgid ""
"Requires python-notify or instead python-dbus in conjunction with "
"notification-daemon."
-msgstr ""
+msgstr "Изисква python-notify или python-dbus заедно с notification-daemon."
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
msgid "Trayicon"
-msgstr ""
+msgstr "Икона в областта за уведомяване"
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
+msgstr "Икона в областта за уведомяване, отразяваща текущото състояние."
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
msgid ""
"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
msgstr ""
+"Изисква python-gnome2-extras или компилиран модул „trayicon“ от изходния код "
+"на Gajim."
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
msgid "Requires PyGTK >= 2.10."
msgstr ""
-#: ../src/features_window.py:95
-#, fuzzy
+#: ../src/features_window.py:93
msgid "Idle"
-msgstr "Идентификатор"
+msgstr "Време на бездействие"
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
msgid "Ability to measure idle time, in order to set auto status."
msgstr ""
+"Възможност за измерване на времето на бездействие, с цел да се установи "
+"автоматично съобщение за състояние."
-#: ../src/features_window.py:97 ../src/features_window.py:98
+#: ../src/features_window.py:95 ../src/features_window.py:96
msgid "Requires compilation of the idle module from Gajim sources."
-msgstr ""
+msgstr "Изисква компилация на модула „idle“ от изходния код на Gajim."
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
msgid "LaTeX"
-msgstr ""
+msgstr "LaTeX"
-#: ../src/features_window.py:100
+#: ../src/features_window.py:98
msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
+msgstr "Трансформира изрази на LaTex, разграничени с $$ $$."
-#: ../src/features_window.py:101
+#: ../src/features_window.py:99
msgid ""
"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
"in the Advanced Configuration Editor."
msgstr ""
+"Изисква texlive-latex-base и dvipng. Трябва да активирате опцията "
+"„use_latex“ в редактора на настройки за напреднали."
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
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 ""
-#: ../src/features_window.py:103
-#, fuzzy
+#: ../src/features_window.py:101
msgid "End to End Encryption"
-msgstr "OpenPGP шифриране"
+msgstr "Шифриране тип „End to End“"
-#: ../src/features_window.py:104
-#, fuzzy
+#: ../src/features_window.py:102
msgid "Encrypting chatmessages."
-msgstr "В_ходящо съобщение:"
+msgstr "Шифриране на разговорите."
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:103 ../src/features_window.py:104
msgid "Requires python-crypto."
-msgstr ""
+msgstr "Изисква python-crypto."
-#: ../src/features_window.py:107
-#, fuzzy
+#: ../src/features_window.py:105
msgid "RST Generator"
-msgstr "Общи"
+msgstr "Генератор на RST"
-#: ../src/features_window.py:108
+#: ../src/features_window.py:106
msgid ""
"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
"docs/ref/rst/restructuredtext.html)."
msgstr ""
+"Генериране на изход в XHTML от RST (вижте http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
-#: ../src/features_window.py:109 ../src/features_window.py:110
+#: ../src/features_window.py:107 ../src/features_window.py:108
msgid "Requires python-docutils."
-msgstr ""
+msgstr "Изисква python-docutils."
-#: ../src/features_window.py:111
+#: ../src/features_window.py:109
msgid "libsexy"
-msgstr ""
+msgstr "libsexy"
-#: ../src/features_window.py:112
+#: ../src/features_window.py:110
msgid "Ability to have clickable URLs in chat and groupchat window banners."
msgstr ""
+"Възможност за натискане с мишката върху адреси в заглавните части на "
+"прозорците."
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:111 ../src/features_window.py:112
msgid "Requires python-sexy."
-msgstr ""
+msgstr "Изисква python-sexy."
-#: ../src/features_window.py:128
-#, fuzzy
+#: ../src/features_window.py:126
msgid "Feature"
-msgstr "Функционалности на сървърите"
+msgstr "Функционалност"
#: ../src/filetransfers_window.py:76
msgid "File"
@@ -7417,7 +7331,7 @@
#. You is a reply of who sent a file
#. You is a reply of who received a file
#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
-#: ../src/history_manager.py:499
+#: ../src/history_manager.py:496
msgid "You"
msgstr "Вие"
@@ -7464,12 +7378,11 @@
#: ../src/filetransfers_window.py:252
msgid "Choose File to Send..."
-msgstr "Избор на файл за изпращане..."
+msgstr "Избор на файл за изпращане…"
#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
-#, fuzzy
msgid "Description: "
-msgstr "Описание: %s"
+msgstr "Описание: "
#: ../src/filetransfers_window.py:279
msgid "Gajim cannot access this file"
@@ -7499,39 +7412,39 @@
msgid "%s wants to send you a file:"
msgstr "%s иска да ви изпрати файл:"
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:817
#, python-format
msgid "Cannot overwrite existing file \"%s\""
msgstr "Неуспех при презаписването на съществуващия файл „%s“"
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:819
msgid ""
"A file with this name already exists and you do not have permission to "
"overwrite it."
msgstr "Вече съществува файл с това име и нямате права да го презапишете."
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:823
msgid "This file already exists"
msgstr "Този файл вече съществува"
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:823
msgid "What do you want to do?"
msgstr "Какво искате да направите?"
#. read-only bit is used to mark special folder under windows,
#. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:830
#, python-format
msgid "Directory \"%s\" is not writable"
msgstr "Папката „%s“ не е разрешена за запис"
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:831
msgid "You do not have permission to create files in this directory."
msgstr "Нямата права да създавате файлове в тази папка."
#: ../src/filetransfers_window.py:369
msgid "Save File as..."
-msgstr "Запазване на файла като..."
+msgstr "Запазване на файла като…"
#. Print remaining time in format 00:00:00
#. You can change the places of (hours), (minutes), (seconds) -
@@ -7569,40 +7482,40 @@
msgid "Sender: "
msgstr "Изпращач: "
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
msgid "Pause"
msgstr "Пауза"
-#: ../src/gajim.py:83
+#: ../src/gajim.py:87
#, python-format
msgid "%s is not a valid loglevel"
msgstr "%s не е валидно ниво за дневник"
-#: ../src/gajim.py:156
+#: ../src/gajim.py:160
msgid "Gajim needs X server to run. Quiting..."
-msgstr "Необходим е X сървър. Спиране на програмата..."
+msgstr "Необходим е X сървър. Спиране на програмата…"
-#: ../src/gajim.py:186
+#: ../src/gajim.py:190
msgid "Gajim needs PyGTK 2.8 or above"
msgstr "Gajim изисква PyGTK 2.8 или по-нова версия"
-#: ../src/gajim.py:187
+#: ../src/gajim.py:191
msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
-msgstr "Gajim изисква PyGTK 2.8 или по-нова версия. Спиране на програмата..."
+msgstr "Gajim изисква PyGTK 2.8 или по-нова версия. Спиране на програмата…"
-#: ../src/gajim.py:189
+#: ../src/gajim.py:193
msgid "Gajim needs GTK 2.8 or above"
msgstr "Gajim изисква GTK 2.8 или по-нова версия"
-#: ../src/gajim.py:190
+#: ../src/gajim.py:194
msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
-msgstr "Gajim изисква GTK 2.8 или по-нова версия. Спиране на програмата..."
+msgstr "Gajim изисква GTK 2.8 или по-нова версия. Спиране на програмата…"
-#: ../src/gajim.py:195
+#: ../src/gajim.py:199
msgid "GTK+ runtime is missing libglade support"
msgstr "Липсва поддръжка на libglade за библиотеката GTK+"
-#: ../src/gajim.py:197
+#: ../src/gajim.py:201
#, python-format
msgid ""
"Please remove your current GTK+ runtime and install the latest stable "
@@ -7611,22 +7524,22 @@
"Премахнете текущата версия на библиотеката GTK+ и инсталирайте последната "
"стабилна от %s"
-#: ../src/gajim.py:199
+#: ../src/gajim.py:203
msgid ""
"Please make sure that GTK+ and PyGTK have libglade support in your system."
msgstr ""
"Уверете се, че версиите на GTK+ и PyGTK на системата ви имат поддръжка за "
"libglade."
-#: ../src/gajim.py:204
+#: ../src/gajim.py:208
msgid "Gajim needs PySQLite2 to run"
msgstr "Gajim изисква PySQLite2"
-#: ../src/gajim.py:212
+#: ../src/gajim.py:216
msgid "Gajim needs pywin32 to run"
msgstr "Gajim изисква pywin32"
-#: ../src/gajim.py:213
+#: ../src/gajim.py:217
#, python-format
msgid ""
"Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7635,11 +7548,11 @@
"Уверете се, че Pywin32 е инсталиран на системата. Може да го изтеглите от %s"
#. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:370
msgid "Gajim is already running"
msgstr "Gajim вече е стартиран"
-#: ../src/gajim.py:367
+#: ../src/gajim.py:371
msgid ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
@@ -7647,175 +7560,182 @@
"Изглежда вече е стартирана друга инстанция на Gajim\n"
"Продължаване въпреки това?"
-#: ../src/gajim.py:493
+#: ../src/gajim.py:497
msgid "Passphrase Required"
msgstr "Необходима е парола"
-#: ../src/gajim.py:494
-#, fuzzy, python-format
+#: ../src/gajim.py:498
+#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Въведете парола за GPG ключ за акаунт „%s“."
+msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
#. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:513
msgid "Wrong Passphrase"
msgstr "Грешна парола"
-#: ../src/gajim.py:510
+#: ../src/gajim.py:514
msgid "Please retype your GPG passphrase or press Cancel."
msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
-#: ../src/gajim.py:557
-#, fuzzy, python-format
+#: ../src/gajim.py:561
+#, 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 ""
-"Желаният от вас псевдоним се използва или е регистриран от друг участник.\n"
+"Желаният от вас псевдоним за стая %s се използва или е регистриран от друг "
+"участник.\n"
"Укажете друг псевдоним по-долу:"
-#: ../src/gajim.py:571
+#: ../src/gajim.py:575
msgid "Do you accept this request?"
msgstr "Приемате ли това запитване?"
-#: ../src/gajim.py:573
-#, fuzzy, python-format
+#: ../src/gajim.py:577
+#, python-format
msgid "Do you accept this request on account %s?"
-msgstr "Приемате ли това запитване?"
+msgstr "Приемате ли това запитване за акаунт %s?"
-#: ../src/gajim.py:576
-#, fuzzy, python-format
+#: ../src/gajim.py:580
+#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%s) упълномощаване за „%s“ (id: %s)"
+msgstr "Упълномощаване по HTTP (%(method)s) за „%(url)s“ (id: %(id)s)"
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:628 ../src/notify.py:493 ../src/osx/growler.py:17
msgid "Connection Failed"
msgstr "Неуспех при свързването"
-#: ../src/gajim.py:930 ../src/gajim.py:934
-#, fuzzy, python-format
+#: ../src/gajim.py:934 ../src/gajim.py:938
+#, python-format
msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s: %(message)s"
+msgstr "Грешка %(code)s: %(msg)s"
#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
-#, fuzzy, python-format
+#: ../src/gajim.py:948 ../src/gajim.py:962
+#, python-format
msgid "error while sending %(message)s ( %(error)s )"
-msgstr "грешка при изпращане на %s ( %s )"
+msgstr "грешка при изпращане на %(message)s ( %(error)s )"
-#: ../src/gajim.py:989
+#: ../src/gajim.py:994
msgid "Authorization accepted"
msgstr "Упълномощаването е прието"
-#: ../src/gajim.py:990
+#: ../src/gajim.py:995
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1014
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "Контактът „%s“ премахна записването за вас"
-#: ../src/gajim.py:1010
+#: ../src/gajim.py:1015
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
msgstr ""
+"Винаги ще го виждате като изключен.\n"
+"Искате ли да го премахнете от списъка с контакти?"
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1056
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "Неуспех при установяването на контакт с „%s“"
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
-#, fuzzy, python-format
+#: ../src/gajim.py:1232 ../src/groupchat_control.py:1162
+#, python-format
msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s вече е познат като %s"
+msgstr "%(nick)s вече е познат като %(new_nick)s"
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../src/notify.py:232
+#: ../src/gajim.py:1250 ../src/groupchat_control.py:1337
+#: ../src/history_window.py:426 ../src/notify.py:232
#, python-format
msgid "%(nick)s is now %(status)s"
msgstr "%(nick)s вече е %(status)s"
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1313
#, python-format
msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
+msgstr "%(jid)s зададе темата на %(subject)s"
#. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1377 ../src/groupchat_control.py:1122
msgid "Any occupant is allowed to see your full JID"
-msgstr ""
+msgstr "На всеки участник е позволено да вижда вашия JID"
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1380
msgid "Room now shows unavailable member"
-msgstr ""
+msgstr "Стаята показва отсъстващ член"
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1382
msgid "room now does not show unavailable members"
-msgstr ""
+msgstr "Стаята не показва отсъстващи членове"
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1385
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:1383
+#: ../src/gajim.py:1388
msgid "Room logging is now enabled"
-msgstr ""
+msgstr "Воденето на дневник на стаята е включено"
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1390
msgid "Room logging is now disabled"
-msgstr ""
+msgstr "Воденето на дневник на стаята е изключено"
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1392
msgid "Room is now non-anonymous"
-msgstr ""
+msgstr "Стаята не е анонимна"
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1395
msgid "Room is now semi-anonymous"
-msgstr ""
+msgstr "Стаята е полу-анонимна"
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1398
msgid "Room is now fully-anonymous"
-msgstr ""
+msgstr "Стаята е напълно анонимна"
-#: ../src/gajim.py:1425
-#, fuzzy, python-format
+#: ../src/gajim.py:1430
+#, python-format
msgid "A Password is required to join the room %s. Please type it."
-msgstr "Необходима е парола за влизане в тази стая."
+msgstr "Необходима е парола за влизане в стаята „%s“. Въведете я."
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1464
msgid ""
"You configured Gajim to use GPG agent, but there is no GPG agent running or "
"it returned a wrong passphrase.\n"
msgstr ""
+"Конфигурирали сте Gajim да използва агент на GPG, но такъв не е стартиран "
+"или е предоставил грешна парола.\n"
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1466
msgid "You are currently connected without your OpenPGP key."
msgstr "В момента сте свързани без OpenPGP ключ."
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1469
msgid "Your passphrase is incorrect"
msgstr "Паролата е грешна"
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1571
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "Ново писмо за %(gmail_mail_address)s"
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1573
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
msgstr[0] "Имате %d ново писмо"
msgstr[1] "Имате %d нови писма"
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1586
#, python-format
msgid ""
"\n"
@@ -7824,99 +7744,107 @@
"Subject: %(subject)s\n"
"%(snippet)s"
msgstr ""
+"\n"
+"\n"
+"От: %(from_address)s\n"
+"Тема: %(subject)s\n"
+"%(snippet)s"
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1657
#, python-format
msgid "%s wants to send you a file."
msgstr "%s иска да ви изпрати файл."
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1725
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "Успешно получихте %(filename)s от %(name)s."
#. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1729
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1742
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "Успешно изпратихте %(filename)s на %(name)s."
#. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1746
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1834
#, python-format
msgid ""
"Unable to decrypt message from %s\n"
"It may have been tampered with."
msgstr ""
+"Неуспех при дешифрирането на съобщение от %s\n"
+"Възможно е да е било фалшифицирано."
-#: ../src/gajim.py:1830
-#, fuzzy
+#: ../src/gajim.py:1841
msgid "Unable to decrypt message"
-msgstr "На _всяко съобщение"
+msgstr "Неуспех при дешифриране на съобщението"
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:1912
msgid "Username Conflict"
msgstr "Конфликт с имената на потребители"
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:1913
msgid "Please type a new username for your local account"
msgstr "Укажете ново потребителско име за локалния ви акаунт"
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:1925
msgid "Ping?"
-msgstr ""
+msgstr "Пинг?"
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:1938
#, python-format
msgid "Pong! (%s s.)"
-msgstr ""
+msgstr "Понг! (%s сек)"
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:1949
msgid "Error."
-msgstr ""
+msgstr "Грешка."
-#: ../src/gajim.py:1963
-#, fuzzy
+#: ../src/gajim.py:1974
msgid "Resource Conflict"
-msgstr "Конфликт с имената на потребители"
+msgstr "Конфликт на ресурсите"
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:1975
msgid ""
"You are already connected to this account with the same resource. Please "
"type a new one"
-msgstr ""
+msgstr "Вече сте свързани към този акаунт със същия ресурс. Въведете нов."
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2028
msgid "Error verifying SSL certificate"
-msgstr ""
+msgstr "Грешка при проверка на сертификата на SSL"
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2029
#, python-format
msgid ""
"There was an error verifying the SSL certificate of your jabber server: %"
"(error)s\n"
"Do you still want to connect to this server?"
msgstr ""
+"Възникна грешка при проверката на сертификата за вашия сървър на Джабър: %"
+"(error)s\n"
+"Все още ли искате да се свържете със сървъра?"
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2034
msgid "Ignore this error for this certificate."
-msgstr ""
+msgstr "Пренебрегване на грешката за този сертификат."
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2049
msgid "SSL certificate error"
-msgstr ""
+msgstr "Грешка в сертификата на SSL"
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2050
#, python-format
msgid ""
"It seems the SSL certificate has changed or your connection is being "
@@ -7926,88 +7854,96 @@
"\n"
"Do you still want to connect and update the fingerprint of the certificate?"
msgstr ""
+"Изглежда сертификатът на SSL е бил променен или връзката е взломена.\n"
+"Стар отпечатък: %(old)s\n"
+"Нов отпечатък: %(new)s\n"
+"\n"
+"Все още ли искате да се свържете и да обновите отпечатъка на сертификата?"
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
-#, fuzzy
+#: ../src/gajim.py:2072 ../src/gajim.py:2102
msgid "Insecure connection"
-msgstr "Свързване"
+msgstr "Несигурна връзка"
-#: ../src/gajim.py:2062
-#, fuzzy
+#: ../src/gajim.py:2073
msgid ""
"You are about to send your password on an unencrypted connection. Are you "
"sure you want to do that?"
msgstr ""
-"На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
-"продължите?"
+"На път сте да изпратите паролата си чрез нешифрирана връзка. Сигурни ли сте, "
+"че искате да го направите?"
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2075 ../src/gajim.py:2105
msgid "Yes, I really want to connect insecurely"
-msgstr ""
+msgstr "Да, наистина искам да се свържа по несигурен начин"
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
+#: ../src/gajim.py:2076 ../src/gajim.py:2106 ../src/groupchat_control.py:1841
+#: ../src/roster_window.py:3776
msgid "Do _not ask me again"
msgstr "Да _не се задава този въпрос отново"
-#: ../src/gajim.py:2092
+#: ../src/gajim.py:2103
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?"
msgstr ""
+"На път сте да изпратите паролата си чрез несигурна връзка. Трябва да "
+"инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
+"да го направите?"
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2120
msgid "PEP node was not removed"
-msgstr ""
+msgstr "Възелът на PEP не беше премахнат"
-#: ../src/gajim.py:2110
+#: ../src/gajim.py:2121
#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
+msgstr "Възелът на PEP %(node)s не беше премахнат: %(message)s"
#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2575 ../src/gajim.py:2596
-#, fuzzy
+#: ../src/gajim.py:2589 ../src/gajim.py:2610
msgid "Emoticons disabled"
-msgstr "Шифрирането е изключено"
+msgstr "Емотиконите са изключени"
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2590
msgid ""
"Your configured emoticons theme has not been found, so emoticons have been "
"disabled."
-msgstr ""
+msgstr "Темата с емотикони не беше намерена, така че са изключени."
-#: ../src/gajim.py:2597
+#: ../src/gajim.py:2611
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 "
"for more details."
msgstr ""
+"Темата с емотикони не можа да бъде заредена. Навярно трябва да обновите "
+"формата на файла emoticons.py. Вижте http://trac.gajim.org/wiki/Emoticons за "
+"повече подробности."
-#: ../src/gajim.py:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2637 ../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:2903
+#: ../src/gajim.py:2917
msgid "Could not save your settings and preferences"
msgstr "Неуспех при запазването на настройките"
-#: ../src/gajim.py:3000
+#: ../src/gajim.py:3014
msgid "Bookmark already set"
msgstr "Отметката вече е установена"
-#: ../src/gajim.py:3001
+#: ../src/gajim.py:3015
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "Стаята „%s“ вече присъства в отметките."
-#: ../src/gajim.py:3014
+#: ../src/gajim.py:3028
msgid "Bookmark has been added successfully"
msgstr "Отметката беше добавена успешно"
-#: ../src/gajim.py:3015
+#: ../src/gajim.py:3029
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr "Може да организирате отметките чрез менюто „Действия“."
@@ -8127,7 +8063,7 @@
#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
msgid "pgp key"
-msgstr "OpenPGP ключ"
+msgstr "ключ на OpenPGP"
#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
msgid "if specified, the message will be encrypted using this public key"
@@ -8159,12 +8095,11 @@
#: ../src/gajim-remote.py:155
msgid "Sends new message to a groupchat you've joined."
-msgstr ""
+msgstr "Изпраща ново съобщение до стаята, в която сте влезли."
#: ../src/gajim-remote.py:157
-#, fuzzy
msgid "JID of the room that will receive the message"
-msgstr "JID на контакта, който ще получи съобщението"
+msgstr "JID на стаята, която ще получи съобщението"
#: ../src/gajim-remote.py:164
msgid "Gets detailed info on a contact"
@@ -8297,11 +8232,11 @@
#: ../src/gajim-remote.py:259
msgid "URI to handle"
-msgstr ""
+msgstr "Адрес за обработка"
#: ../src/gajim-remote.py:260
msgid "Account in which you want to handle it"
-msgstr ""
+msgstr "Акаунт, за който искате да го обработите"
#: ../src/gajim-remote.py:265
msgid "Join a MUC room"
@@ -8312,41 +8247,36 @@
msgstr "стая"
#: ../src/gajim-remote.py:267
-#, fuzzy
msgid "Room JID"
-msgstr "Стая:"
+msgstr "JID на стая"
#: ../src/gajim-remote.py:268
msgid "nick"
msgstr "псевдоним"
#: ../src/gajim-remote.py:268
-#, fuzzy
msgid "Nickname to use"
-msgstr "Псевдонимът не е намерен: %s"
+msgstr "Псевдоним"
#: ../src/gajim-remote.py:269
msgid "password"
msgstr "парола"
#: ../src/gajim-remote.py:269
-#, fuzzy
msgid "Password to enter the room"
-msgstr "Паролите не съвпадат"
+msgstr "Парола за влизане в стаята"
#: ../src/gajim-remote.py:270
msgid "Account from which you want to enter the room"
-msgstr ""
+msgstr "Акаунт, от който искате да влезете в стаята"
#: ../src/gajim-remote.py:275
-#, fuzzy
msgid "Check if Gajim is running"
-msgstr "Проверете дали е стартиран avahi-daemon."
+msgstr "Проверка дали Gajim е стартиран"
#: ../src/gajim-remote.py:279
-#, fuzzy
msgid "Shows or hides the ipython window"
-msgstr "Показва или скрива списъка"
+msgstr "Показва или скрива прозореца на IPython"
#: ../src/gajim-remote.py:306
msgid "Missing argument \"contact_jid\""
@@ -8368,6 +8298,7 @@
#: ../src/gajim-remote.py:380
msgid "It seems Gajim is not running. So you can't use gajim-remote."
msgstr ""
+"Изглежда Gajim не е стартиран, така че не може да ползвате gajim-remote."
#: ../src/gajim-remote.py:409
#, python-format
@@ -8375,6 +8306,8 @@
"Usage: %(basename)s %(command)s %(arguments)s \n"
"\t %(help)s"
msgstr ""
+"Употреба: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
#: ../src/gajim-remote.py:413
msgid "Arguments:"
@@ -8395,22 +8328,22 @@
"Командата е една от:\n"
#: ../src/gajim-remote.py:493
-#, fuzzy, python-format
+#, python-format
msgid ""
"Too many arguments. \n"
"Type \"%(basename)s help %(command)s\" for more info"
msgstr ""
"Твърде много аргументи. \n"
-"Напишете „%s help %s“ за повече информация"
+"Напишете „%(basename)s help %(command)s“ за повече информация"
#: ../src/gajim-remote.py:498
-#, fuzzy, python-format
+#, python-format
msgid ""
"Argument \"%(arg)s\" is not specified. \n"
"Type \"%(basename)s help %(command)s\" for more info"
msgstr ""
-"Не е указан аргумент „%s“.\n"
-"Напишете „%s help %s“ за повече информация"
+"Не е указан аргумент „%(arg)s“.\n"
+"Напишете „%(basename)s help %(command)s“ за повече информация"
#: ../src/gajim-remote.py:517
msgid "Wrong uri"
@@ -8421,13 +8354,12 @@
msgstr "Тема"
#: ../src/gajim_themes_window.py:97
-#, fuzzy
msgid "You cannot make changes to the default theme"
-msgstr "Не може да изтриете текущата тема"
+msgstr "Не може да правите промени по стандартната тема"
#: ../src/gajim_themes_window.py:98
msgid "Please create a clean new theme with your desired name."
-msgstr ""
+msgstr "Създайте нова тема с желаното име."
#. don't confuse translators
#: ../src/gajim_themes_window.py:172
@@ -8442,152 +8374,147 @@
msgid "Please first choose another for your current theme."
msgstr "Първо изберете друга като текуща тема."
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:149
msgid "Sending private message failed"
msgstr "Неуспех при изпращането на лично съобщение"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:151
+#, python-format
msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
-msgstr "Вече не сте в стая „%s“ или „%s“ е напуснал(а)."
+msgstr "Вече не сте в стая „%(room)s“ или „%(nick)s“ е напуснал(а)."
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:450
msgid "Insert Nickname"
msgstr "Въведете псевдоним"
-#: ../src/groupchat_control.py:603
-#, fuzzy
+#: ../src/groupchat_control.py:602
msgid "Conversation with "
-msgstr "История на разговорите"
+msgstr "Разговор с "
-#: ../src/groupchat_control.py:605
-#, fuzzy
+#: ../src/groupchat_control.py:604
msgid "Continued conversation"
-msgstr "Свързване"
+msgstr "Продължен разговор"
-#: ../src/groupchat_control.py:1027
+#: ../src/groupchat_control.py:1025
msgid "Really send file?"
-msgstr ""
+msgstr "Наистина ли да се изпрати файла?"
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1026
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
+msgstr "Ако изпратите файл на %s, той/тя ще разбере истинския ви Jabber ID."
#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1125
msgid "Room logging is enabled"
-msgstr ""
+msgstr "Воденето на дневник на стаята е включено"
-#: ../src/groupchat_control.py:1129
-#, fuzzy
+#: ../src/groupchat_control.py:1127
msgid "A new room has been created"
-msgstr "Новият акаунт беше създаден успешно"
+msgstr "Беше създадена нова стая"
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1130
msgid "The server has assigned or modified your roomnick"
-msgstr ""
+msgstr "Сървърът назначи или промени псевдонима ви в стаята"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1136
#, python-format
msgid "%(nick)s has been kicked: %(reason)s"
msgstr "%(nick)s беше изритан: %(reason)s"
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1140
#, 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:1149
+#: ../src/groupchat_control.py:1147
#, python-format
msgid "%(nick)s has been banned: %(reason)s"
msgstr "%(nick)s беше отлъчен: %(reason)s"
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1151
#, python-format
msgid "%(nick)s has been banned by %(who)s: %(reason)s"
msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1160
#, python-format
msgid "You are now known as %s"
msgstr "Вече сте познати като %s"
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1198 ../src/groupchat_control.py:1202
+#: ../src/groupchat_control.py:1207
+#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
-msgstr "%(nick)s беше изритан от %(who)s: %(reason)s"
+msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
-#: ../src/groupchat_control.py:1201
-#, fuzzy
+#: ../src/groupchat_control.py:1199
msgid "affiliation changed"
-msgstr "Връзка:"
+msgstr "рангът е променен"
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1204
msgid "room configuration changed to members-only"
-msgstr ""
+msgstr "Конфигурацията на стаята бе променена на „само за членове“"
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1209
msgid "system shutdown"
-msgstr ""
+msgstr "Изключване на системата"
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1278
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
-msgstr ""
+msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s от %(actor)s"
-#: ../src/groupchat_control.py:1284
+#: ../src/groupchat_control.py:1282
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
-msgstr ""
+msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s"
-#: ../src/groupchat_control.py:1299
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1297
+#, python-format
msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
-msgstr "%(nick)s беше изритан от %(who)s: %(reason)s"
+msgstr "** Ролята на %(nick)s бе зададена на %(role)s от %(actor)s"
-#: ../src/groupchat_control.py:1303
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1301
+#, python-format
msgid "** Role of %(nick)s has been set to %(role)s"
-msgstr "%(nick)s беше изритан: %(reason)s"
+msgstr "** Ролята на %(nick)s бе зададена на %(role)s"
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1330
#, python-format
msgid "%s has left"
msgstr "%s напусна"
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1335
#, python-format
msgid "%s has joined the group chat"
msgstr "%s влезе в стаята"
#. Invalid Nickname
#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
+#: ../src/groupchat_control.py:1450 ../src/groupchat_control.py:1731
msgid "Invalid nickname"
-msgstr "Невалидно потребителско име"
+msgstr "Невалиден псевдоним"
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1474 ../src/groupchat_control.py:1492
+#: ../src/groupchat_control.py:1576 ../src/groupchat_control.py:1593
#, python-format
msgid "Nickname not found: %s"
msgstr "Псевдонимът не е намерен: %s"
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1508
msgid "This group chat has no subject"
msgstr "Тази стая няма тема"
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1519
#, python-format
msgid "Invited %(contact_jid)s to %(room_jid)s."
msgstr "%(contact_jid)s е поканен в %(room_jid)s."
-#: ../src/groupchat_control.py:1656
+#: ../src/groupchat_control.py:1654
#, python-format
msgid ""
"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8599,7 +8526,7 @@
"Псевдонимът може да се замества, но не и ако съдържа „@“. Ако контактът е в "
"стаята, той също ще бъде изритан. Не се поддържат интервали в псевдонима."
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1661
#, python-format
msgid ""
"Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8608,7 +8535,7 @@
"Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със съответния "
"участник."
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1667
#, python-format
msgid ""
"Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8617,7 +8544,7 @@
"Употреба: /%s [причина], затваря текущия прозорец или подпрозорец и показва "
"причина, ако е указана."
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1673
#, python-format
msgid ""
"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8626,7 +8553,7 @@
"Употреба: /%s <JID> [причина], кани JID в текущата стая, причината е по "
"избор."
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1677
#, python-format
msgid ""
"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8635,7 +8562,7 @@
"Употреба: /%s <стая>@<сървър>[/псевдоним], предлага влизане в стая@сървър, "
"използването на указания псевдоним е по избор."
-#: ../src/groupchat_control.py:1683
+#: ../src/groupchat_control.py:1681
#, python-format
msgid ""
"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8646,7 +8573,7 @@
"от стаята и евентуално показва причина. Не се поддържат интервали в "
"псевдонима."
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1690
#, python-format
msgid ""
"Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8655,22 +8582,22 @@
"Употреба: /%s <псевдоним> [съобщение], отваря прозорец за лично съобщение и "
"изпраща съобщение до участника, указан с псевдонима."
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1695
#, python-format
msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
msgstr "Употреба: /%s <псевдоним>, сменя псевдонима ви в текущата стая."
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1699
#, python-format
msgid "Usage: /%s , display the names of group chat occupants."
msgstr "Употреба: /%s, показва имената на участниците в стаята."
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1703
#, python-format
msgid "Usage: /%s [topic], displays or updates the current group chat topic."
msgstr "Употреба: /%s [тема], показва или актуализира текущата тема на стаята."
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1706
#, python-format
msgid ""
"Usage: /%s <message>, sends a message without looking for other commands."
@@ -8678,60 +8605,62 @@
"Употреба: /%s <съобщение>, изпраща съобщение без да се имат предвид други "
"команди."
-#: ../src/groupchat_control.py:1837
+#: ../src/groupchat_control.py:1835
#, python-format
msgid "Are you sure you want to leave group chat \"%s\"?"
msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1837
msgid ""
"If you close this window, you will be disconnected from this group chat."
msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1874
msgid "Changing Subject"
msgstr "Промяна на темата"
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1875
msgid "Please specify the new subject:"
msgstr "Въведете новата тема:"
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1879
msgid "Changing Nickname"
msgstr "Промяна на псевдонима"
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1880
msgid "Please specify the new nickname you want to use:"
msgstr "Въведете новия псевдоним, който искате да използвате:"
#. Ask for a reason
-#: ../src/groupchat_control.py:1908
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1906
+#, python-format
msgid "Destroying %s"
-msgstr "Описание: %s"
+msgstr "Унищожаване на %s"
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1907
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
msgstr ""
+"Определено сте на път да унищожите тази стая.\n"
+"Може да укажете причина по-долу:"
-#: ../src/groupchat_control.py:1911
+#: ../src/groupchat_control.py:1909
msgid "You may also enter an alternate venue:"
-msgstr ""
+msgstr "Може да въведете и друго място за срещи:"
#. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2080
#, python-format
msgid "Kicking %s"
msgstr "Изритване на %s"
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2081 ../src/groupchat_control.py:2374
msgid "You may specify a reason below:"
msgstr "Може да уточните причина по-долу:"
#. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2373
#, python-format
msgid "Banning %s"
msgstr "Отлъчване на %s"
@@ -8803,9 +8732,9 @@
"Изображението не може да бъде запазено във формат %(type)s. Запазване като %"
"(new_filename)s?"
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:840
msgid "Save Image as..."
-msgstr "Запазване на изображението като..."
+msgstr "Запазване на изображението като…"
#: ../src/history_manager.py:97
msgid "Cannot find history logs database"
@@ -8853,89 +8782,88 @@
"стане наново използваемо. Ако наистина искате да намалите файловия размер на "
"базата от данни, изберете „Да“; в противен случай изберете „Не“.\n"
"\n"
-"В случай, че изберете „Да“, изчакайте..."
+"В случай, че изберете „Да“, изчакайте…"
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:434
msgid "Exporting History Logs..."
-msgstr "Изнасяне на записите на разговорите..."
+msgstr "Изнасяне на записите на разговорите…"
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:509
#, python-format
msgid "%(who)s on %(time)s said: %(message)s\n"
msgstr "%(who)s каза в %(time)s: %(message)s\n"
-#: ../src/history_manager.py:549
+#: ../src/history_manager.py:546
msgid "Do you really want to delete logs of the selected contact?"
msgid_plural "Do you really want to delete logs of the selected contacts?"
msgstr[0] "Наистина ли искате да изтриете дневниците на избрания контакт?"
msgstr[1] "Наистина ли искате да изтриете дневниците на избраните контакти?"
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:550 ../src/history_manager.py:585
msgid "This is an irreversible operation."
msgstr "Това е необратима операция."
-#: ../src/history_manager.py:585
+#: ../src/history_manager.py:582
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the selected messages?"
msgstr[0] "Наистина ли искате да изтриете избраното съобщение?"
msgstr[1] "Наистина ли искате да изтриете избраните съобщения?"
-#: ../src/history_window.py:287
+#: ../src/history_window.py:296
#, python-format
msgid "Conversation History with %s"
msgstr "История на разговорите с %s"
-#: ../src/history_window.py:332
+#: ../src/history_window.py:341
msgid "Disk Error"
-msgstr ""
+msgstr "Грешка при запис/четене от диска"
-#: ../src/history_window.py:413
+#: ../src/history_window.py:422
#, python-format
msgid "%(nick)s is now %(status)s: %(status_msg)s"
msgstr "%(nick)s вече е %(status)s: %(status_msg)s"
-#: ../src/history_window.py:423
+#: ../src/history_window.py:432
#, python-format
msgid "Status is now: %(status)s: %(status_msg)s"
msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
-#: ../src/history_window.py:426
+#: ../src/history_window.py:435
#, python-format
msgid "Status is now: %(status)s"
msgstr "Сегашното състояние е: %(status)s"
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
-#, fuzzy
+#: ../src/htmltextview.py:590 ../src/htmltextview.py:601
msgid "Timeout loading image"
-msgstr "Неуспех при зареждането на изображението"
+msgstr "Изтече времето за зареждане на изображението"
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:611
msgid "Image is too big"
-msgstr ""
+msgstr "Изображението е твърде голямо"
-#: ../src/message_window.py:446
+#: ../src/message_window.py:445
msgid "Chats"
msgstr "Разговори"
-#: ../src/message_window.py:448
+#: ../src/message_window.py:447
msgid "Group Chats"
msgstr "Стаи"
-#: ../src/message_window.py:450
+#: ../src/message_window.py:449
msgid "Private Chats"
msgstr "Лични разговори"
-#: ../src/message_window.py:456
+#: ../src/message_window.py:455
msgid "Messages"
msgstr "Съобщения"
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
msgid "- messages will be logged"
-msgstr ""
+msgstr "— ще бъде воден дневник за съобщенията"
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
msgid "- messages will not be logged"
-msgstr ""
+msgstr "— няма да бъде воден дневник за съобщенията"
#: ../src/notify.py:230
#, python-format
@@ -8968,9 +8896,9 @@
msgstr "%(nickname)s: %(message)s"
#: ../src/notify.py:273
-#, fuzzy, python-format
+#, python-format
msgid "Messaged by %(nickname)s"
-msgstr "Ново съобщение от %(nickname)s"
+msgstr "Съобщение от %(nickname)s"
#: ../src/notify.py:279
#, python-format
@@ -8978,91 +8906,87 @@
msgstr "Ново съобщение от %(nickname)s"
#: ../src/osx/growler.py:10
-#, fuzzy
msgid "Generic"
-msgstr "Общи"
+msgstr ""
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
msgid "Retrieving profile..."
-msgstr "Извличане на профила..."
+msgstr "Извличане на профила…"
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
-#, fuzzy
+#: ../src/profile_window.py:108 ../src/roster_window.py:2774
msgid "File is empty"
-msgstr "Път до файл"
+msgstr "Файлът не съдържа нищо"
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
-#, fuzzy
+#: ../src/profile_window.py:111 ../src/roster_window.py:2777
msgid "File does not exist"
-msgstr "Такава стая не съществува."
+msgstr "Файлът не съществува"
#. keep identation
#. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2779 ../src/roster_window.py:2790
msgid "Could not load image"
msgstr "Неуспех при зареждането на изображението"
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
msgid "Information received"
msgstr "Получена информация"
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:320
msgid "Without a connection you can not publish your contact information."
msgstr "Трябва да сте свързани, за да публикувате визитката."
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:334
msgid "Sending profile..."
-msgstr "Изпращане на профила..."
+msgstr "Изпращане на профила…"
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:349
msgid "Information NOT published"
msgstr "Информацията НЕ Е публикувана"
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:356
msgid "vCard publication failed"
msgstr "Неуспех при публикуването на визитката"
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:357
msgid ""
"There was an error while publishing your personal information, try again "
"later."
msgstr ""
"Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:286 ../src/roster_window.py:940
msgid "Merged accounts"
msgstr "Смесени акаунти"
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1851
msgid "Authorization has been sent"
msgstr "Упълномощаването беше изпратено"
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1852
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "„%s“ вече ще знае състоянието ви."
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1872
msgid "Subscription request has been sent"
msgstr "Искането за записване беше изпратено"
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1873
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1885
msgid "Authorization has been removed"
msgstr "Упълномощаването беше прекратено"
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1886
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "„%s“ винаги ще ви вижда като изключен."
-#: ../src/roster_window.py:1920
-#, fuzzy
+#: ../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)"
@@ -9070,15 +8994,15 @@
"Наборът с ключове на GNOME е инсталиран, но не е стартиран правилно (навярно "
"променливата на обкръжението не е настроена)"
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
msgid "GPG is not usable"
-msgstr ""
+msgstr "GPG не е използваем"
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../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:2120 ../src/roster_window.py:3268
+#: ../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?"
@@ -9086,33 +9010,32 @@
"Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
"сте, че искате да станете „Невидим“?"
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2136
msgid "desync'ed"
-msgstr ""
+msgstr "без синхронизация"
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../src/roster_window.py:2274 ../src/roster_window.py:2511
msgid "You have unread messages"
msgstr "Имате непрочетени съобщения"
-#: ../src/roster_window.py:2285
-#, fuzzy
+#: ../src/roster_window.py:2275
msgid ""
"Messages will only be available for reading them later if you have history "
"enabled and contact is in your roster."
msgstr ""
"Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
-"историята."
+"историята и контактът е в списъка."
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2512
msgid "You must read them before removing this transport."
msgstr "Трябва да ги прочетете преди да премахнете този транспорт."
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2515
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "Транспортът „%s“ ще бъде премахнат"
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2516
msgid ""
"You will no longer be able to send and receive messages from contacts using "
"this transport."
@@ -9120,12 +9043,12 @@
"Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
"този транспорт."
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2519
msgid "Transports will be removed"
msgstr "Ще бъдат премахнати транспорти"
-#: ../src/roster_window.py:2534
-#, fuzzy, python-format
+#: ../src/roster_window.py:2524
+#, python-format
msgid ""
"You will no longer be able to send and receive messages to contacts from "
"these transports: %s"
@@ -9134,52 +9057,51 @@
"тези транспорти: %s"
#. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2655
msgid "Rename Contact"
msgstr "Преименуване на контакт"
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2656
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "Въведете нов псевдоним за контакт „%s“"
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2663
msgid "Rename Group"
msgstr "Преименуване на група"
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2664
#, python-format
msgid "Enter a new name for group %s"
msgstr "Въведете ново име за група „%s“"
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2720
msgid "Remove Group"
msgstr "Премахване на група"
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2721
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "Искате ли да премахнете групата „%s“ от списъка?"
-#: ../src/roster_window.py:2735
-#, fuzzy
+#: ../src/roster_window.py:2722
msgid "Also remove all contacts in this group from your roster"
msgstr "Премахване от списъка и на всички контакти в тази група"
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2761
msgid "Assign OpenPGP Key"
msgstr "Задаване на OpenPGP ключ"
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2762
msgid "Select a key to apply to the contact"
msgstr "Изберете ключ за този контакт"
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3114
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3118
msgid ""
"By removing this contact you also remove authorization resulting in him or "
"her always seeing you as offline."
@@ -9188,12 +9110,11 @@
"ще ви вижда изключен."
#. Contact is not in roster
-#: ../src/roster_window.py:3137
-#, fuzzy
+#: ../src/roster_window.py:3123
msgid "Do you want to continue?"
-msgstr "Какво искате да направите?"
+msgstr "Искате ли да продължите?"
-#: ../src/roster_window.py:3141
+#: ../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."
@@ -9201,16 +9122,16 @@
"Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
"ще ви вижда изключен."
-#: ../src/roster_window.py:3144
+#: ../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:3148
+#: ../src/roster_window.py:3134
msgid "Contacts will be removed from your roster"
msgstr "Ще бъдат премахнати контакти от списъка"
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3138
#, python-format
msgid ""
"By removing these contacts:%s\n"
@@ -9219,21 +9140,20 @@
"Премахвайки тези контакти: %s\n"
"прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3177
msgid "No account available"
msgstr "Няма наличен акаунт"
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3178
msgid "You must create an account before you can chat with other contacts."
msgstr ""
"За да разговаряте с други контакти, първо трябва да създадете Джабър акаунт."
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3694
msgid "Metacontacts storage not supported by your server"
msgstr "Сървърът ви няма поддръжка за мета-контакти"
-#: ../src/roster_window.py:3710
-#, fuzzy
+#: ../src/roster_window.py:3696
msgid ""
"Your server does not support storing metacontacts information. So those "
"information will not be saved on next reconnection."
@@ -9241,14 +9161,14 @@
"Вашият сървър не поддържа съхраняването на информация за мета-контакти, така "
"че тази информация няма да се запази при следващото свързване."
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3770
msgid ""
"You are about to create a metacontact. Are you sure you want to continue?"
msgstr ""
"На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
"продължите?"
-#: ../src/roster_window.py:3786
+#: ../src/roster_window.py:3772
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 "
@@ -9258,169 +9178,160 @@
"Основно се използва, когато един и същ потребител има няколко акаунта за "
"Джабър или акаунти за транспорти."
-#: ../src/roster_window.py:3899
-#, fuzzy
+#: ../src/roster_window.py:3885
msgid "Invalid file URI:"
-msgstr "Невалиден файл"
+msgstr "Невалиден адрес на файл:"
-#: ../src/roster_window.py:3910
-#, fuzzy, python-format
+#: ../src/roster_window.py:3896
+#, python-format
msgid "Do you want to send this file to %s:"
msgid_plural "Do you want to send these files to %s:"
-msgstr[0] "%s иска да ви изпрати файл:"
-msgstr[1] "%s иска да ви изпрати файл:"
+msgstr[0] "Искате ли да изпратите този файл на %s:"
+msgstr[1] "Искате ли да изпратите тези файлове на %s:"
#. new chat
#. single message
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../src/roster_window.py:4573 ../src/roster_window.py:4644
+#: ../src/roster_window.py:4653 ../src/systray.py:219 ../src/systray.py:224
+#: ../src/systray.py:230
#, python-format
msgid "using account %s"
msgstr "от акаунт „%s“"
#. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4660
#, python-format
msgid "to %s account"
msgstr "към акаунт „%s“"
#. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4665
#, python-format
msgid "using %s account"
msgstr "за акаунт „%s“"
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4702 ../src/systray.py:257
msgid "_Manage Bookmarks..."
-msgstr "_Управление на отметките..."
+msgstr "_Управление на отметките…"
#. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4722
#, python-format
msgid "of account %s"
msgstr "за акаунт „%s“"
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4762
#, python-format
msgid "for account %s"
msgstr "за акаунт „%s“"
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4824 ../src/roster_window.py:4933
msgid "_Change Status Message"
msgstr "Пром_яна на съобщението за състояние"
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4851
msgid "Publish Tune"
-msgstr ""
+msgstr "Публикуване на мелодия"
-#: ../src/roster_window.py:4873
+#: ../src/roster_window.py:4858
msgid "Mood"
-msgstr ""
+msgstr "Настроение"
-#: ../src/roster_window.py:4879
-#, fuzzy
+#: ../src/roster_window.py:4862
msgid "Activity"
-msgstr "Активен"
+msgstr "Дейност"
-#: ../src/roster_window.py:4884
-#, fuzzy
+#: ../src/roster_window.py:4867
msgid "Configure Services..."
-msgstr "_Откриване на услуги..."
+msgstr "Настройване на услуги…"
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5021
msgid "_Maximize All"
-msgstr ""
+msgstr "_Максимизиране на всички"
#. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5029 ../src/roster_window.py:5555
msgid "Send Group M_essage"
msgstr "_Изпращане на групово съобщение"
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5037
msgid "To all users"
msgstr "До всички потребители"
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5041
msgid "To all online users"
msgstr "До всички включени потребители"
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5452
msgid "I would like to add you to my roster"
msgstr ""
"Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
"roster."
#. Manage Transport submenu
-#: ../src/roster_window.py:5588
-#, fuzzy
+#: ../src/roster_window.py:5575
msgid "_Manage Contacts"
-msgstr "Преименуване на контакт"
+msgstr "_Управление на контакти"
#. Send single message
-#: ../src/roster_window.py:5649
-#, fuzzy
+#: ../src/roster_window.py:5636
msgid "Send Single Message"
-msgstr "_Изпращане на еднократно съобщение"
+msgstr "Изпращане на еднократно съобщение"
#. Manage Transport submenu
-#: ../src/roster_window.py:5705
-#, fuzzy
+#: ../src/roster_window.py:5692
msgid "_Manage Transport"
-msgstr "Транспорти"
+msgstr "Управление на _транспорт"
#. Modify Transport
-#: ../src/roster_window.py:5713
-#, fuzzy
+#: ../src/roster_window.py:5700
msgid "_Modify Transport"
-msgstr "Показване на т_ранспорти"
+msgstr "Промяна на т_ранспорт"
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5774
msgid "_Maximize"
-msgstr ""
+msgstr "_Максимизиране"
-#: ../src/roster_window.py:5795
-#, fuzzy
+#: ../src/roster_window.py:5781
msgid "_Disconnect"
-msgstr "Изключване на контакт"
+msgstr "_Изключване"
-#: ../src/roster_window.py:5875
-#, fuzzy
+#: ../src/roster_window.py:5861
msgid "_New Group Chat"
-msgstr "Нова стая"
+msgstr "_Нова стая"
#. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:5974
msgid "History Manager"
msgstr "Мениджър на историята"
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:5983
msgid "_Join New Group Chat"
msgstr "_Влизане в нова стая"
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6193
msgid "Change Status Message..."
-msgstr "Промяна на съобщението за състояние..."
+msgstr "Промяна на съобщението за състояние…"
#: ../src/search_window.py:93
msgid "Waiting for results"
-msgstr ""
+msgstr "Изчакване на резултатите"
#: ../src/search_window.py:133 ../src/search_window.py:211
msgid "Error in received dataform"
-msgstr ""
+msgstr "Грешка в получените данни"
#. No result
#: ../src/search_window.py:167 ../src/search_window.py:203
msgid "No result"
-msgstr ""
+msgstr "Няма резултати"
#: ../src/session.py:124
msgid "Disk WriteError"
-msgstr ""
+msgstr "Грешка при запис на диска"
#: ../src/session.py:238
#, python-format
@@ -9429,7 +9340,7 @@
#: ../src/session.py:398 ../src/session.py:433
msgid "Confirm these session options"
-msgstr ""
+msgstr "Потвърждение на тези настройки на сесията"
#: ../src/session.py:400
#, python-format
@@ -9440,6 +9351,11 @@
"\n"
"\tAre these options acceptable?"
msgstr ""
+"Отдалеченият клиент иска да договори сесия с тези параметри:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tДопустими ли са тези настройки?"
#: ../src/session.py:434
#, python-format
@@ -9450,12 +9366,17 @@
"\n"
"Continue with the session?"
msgstr ""
+"Отдалеченият клиент избра тези настройки:\n"
+"\n"
+"%s\n"
+"\n"
+"Продължаване с тази сесия?"
-#: ../src/systray.py:188
+#: ../src/systray.py:176
msgid "_Change Status Message..."
-msgstr "_Промяна на съобщението за състояние..."
+msgstr "_Промяна на съобщението за състояние…"
-#: ../src/systray.py:322
+#: ../src/systray.py:270
msgid "Hide this menu"
msgstr "Скриване на това меню"
@@ -9474,11 +9395,11 @@
#: ../src/tooltips.py:432
msgid " [blocked]"
-msgstr ""
+msgstr " [блокиран]"
#: ../src/tooltips.py:436
msgid " [minimized]"
-msgstr ""
+msgstr " [минимизиран]"
#: ../src/tooltips.py:451 ../src/tooltips.py:706
msgid "Status: "
@@ -9495,14 +9416,12 @@
msgstr " от %s"
#: ../src/tooltips.py:501
-#, fuzzy
msgid "Connected"
-msgstr "Свързване"
+msgstr "Свързан"
#: ../src/tooltips.py:503
-#, fuzzy
msgid "Disconnected"
-msgstr "Изключване на контакт"
+msgstr "Изключен"
#. ('both' is the normal sub so we don't show it)
#: ../src/tooltips.py:532
@@ -9514,19 +9433,16 @@
msgstr "OpenPGP: "
#: ../src/tooltips.py:587
-#, fuzzy
msgid "Mood:"
-msgstr "Стая:"
+msgstr "Настроение:"
#: ../src/tooltips.py:602
-#, fuzzy
msgid "Activity:"
-msgstr "Активирана"
+msgstr "Дейност:"
#: ../src/tooltips.py:638
-#, fuzzy
msgid "Tune:"
-msgstr "Тип:"
+msgstr "Песен:"
#: ../src/tooltips.py:664
msgid "Download"
@@ -9595,9 +9511,8 @@
msgstr "от %s"
#: ../src/vcard.py:311
-#, fuzzy
msgid "<b>Affiliation:</b>"
-msgstr "<b>Програми</b>"
+msgstr "<b>Ранг:</b>"
#: ../src/vcard.py:319
msgid ""
@@ -9635,437 +9550,8 @@
#: ../src/vcard.py:334
msgid "There is no pending subscription request."
-msgstr ""
+msgstr "Няма чакащо запитване за записване."
#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
msgid " resource with priority "
msgstr " ресурс с приоритет "
-
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "OpenPGP шифриране"
-
-#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-#~ msgstr "%s не предлага OpenPGP ключ и не сте задавали такъв"
-
-#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-#~ msgstr ""
-#~ "Няма такава команда: /%s (ако искате да изпратите това, сложете "
-#~ "представка /say)"
-
-#~ msgid ""
-#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
-#~ "person. (e.g. /%s explodes.)"
-#~ msgstr ""
-#~ "Употреба: /%s <действие>, изпраща действие до текущата стая. Използва се "
-#~ "трето лице (т.е. „/%s експлодира“)."
-
-#~ msgid "Encryption enabled"
-#~ msgstr "Шифрирането е включено"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Шифрирането е изключено"
-
-#~ msgid "_Retype Password:"
-#~ msgstr "_Въведете паролата отново:"
-
-#~ msgid "_Use proxy"
-#~ msgstr "_Използване на сървър-посредник"
-
-#~ msgid ""
-#~ "If checked, all local contacts that use a Bonjour compatible chat client "
-#~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
-#~ "be connected to a jabber server for it to work.\n"
-#~ "This is only available if python-avahi is installed and avahi-daemon is "
-#~ "running."
-#~ msgstr ""
-#~ "Ако тази опция е избрана, всички локални контакти, които използват "
-#~ "клиент, съвместим с Bonjour (като iChat, Trillian или Gaim), ще бъдат "
-#~ "показани в списъка. Не е необходимо да сте свързани към Джабър сървър.\n"
-#~ "Това е достъпно само при инсталиран „python-avahi“ и работещ „avahi-"
-#~ "daemon“."
-
-#~ msgid ""
-#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
-#~ "contacts as if you had one account"
-#~ msgstr ""
-#~ "Ако имате два или повече акаунта и тази опция е избрана, Gajim ще "
-#~ "изобразява всички контакти като от един акаунт."
-
-#~ msgid "_Enable link-local messaging"
-#~ msgstr ""
-#~ "_Активиране на съобщения от/за локални контакти (link-local messaging)"
-
-#~ msgid "2003-12-13T18:30:02Z"
-#~ msgstr "13-12-2003T18:30:02Z"
-
-#~ msgid "<small>Romeo and Juliet</small>"
-#~ msgstr "<small>Ромео и Жулиета</small>"
-
-#~ msgid "Old stories"
-#~ msgstr "Стари записи"
-
-#~ msgid "Soliloquy"
-#~ msgstr "Монолог"
-
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Натиснете, за да видите стари разговори с този контакт"
-
-#~ msgid "_Compact View Alt+C"
-#~ msgstr "_Компактен изглед (Alt+C)"
-
-#~ msgid "Click to see past conversation in this room"
-#~ msgstr "Натиснете, за да видите стари разговори в тази стая"
-
-#~ msgid "Build custom query"
-#~ msgstr "Потребителска заявка"
-
-#~ msgid "Query Builder..."
-#~ msgstr "Изготвяне на заявки..."
-
-#~ msgid "Accept"
-#~ msgstr "Приемане"
-
-#~ msgid "Invitation Received"
-#~ msgstr "Получена покана"
-
-#~ msgid "<b>Format of a line</b>"
-#~ msgstr "<b>Формат на реда</b>"
-
-#~ msgid "<b>Interface Customization</b>"
-#~ msgstr "<b>Персонализиране на интерфейса</b>"
-
-#~ msgid "Also known as iChat style"
-#~ msgstr "Познато и като стил „iChat“"
-
-#~ msgid ""
-#~ "An example: If you have enabled status message for away, Gajim won't ask "
-#~ "you anymore for a status message when you change your status to away; it "
-#~ "will use the default one set here"
-#~ msgstr ""
-#~ "Например, ако сте активирали съобщението за състояние за „Отсъствам“, "
-#~ "Gajim няма да ви пита повече за съобщението за състояние, когато го "
-#~ "променяте; ще използва стандартното съобщение, настроено тук."
-
-#~ msgid "Chat"
-#~ msgstr "Разговор"
-
-#~ msgid ""
-#~ "Determined by sender\n"
-#~ "Chat message\n"
-#~ "Single message"
-#~ msgstr ""
-#~ "определени от изпращача\n"
-#~ "разговор\n"
-#~ "лично съобщение"
-
-#~ msgid "E_very 5 minutes"
-#~ msgstr "Всеки 5 _минути"
-
-#~ msgid "Events"
-#~ msgstr "Събития"
-
-#~ msgid ""
-#~ "Gajim will automatically show new events by popping up the relevant window"
-#~ msgstr ""
-#~ "Автоматично ще се показват нови събития с изскачане на съответния прозорец"
-
-#~ msgid ""
-#~ "Gajim will notify you for new events via a popup in the bottom right of "
-#~ "the screen"
-#~ msgstr ""
-#~ "Ще се появяват съобщения за уведомяване чрез изскачащ прозорец в долния "
-#~ "десен ъгъл на екрана"
-
-#~ msgid ""
-#~ "Gajim will notify you via a popup window in the bottom right of the "
-#~ "screen about contacts that just signed in"
-#~ msgstr ""
-#~ "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
-#~ "включване на контакти"
-
-#~ msgid ""
-#~ "Gajim will only change the icon of the contact that triggered the new "
-#~ "event"
-#~ msgstr ""
-#~ "Само ще се променя иконата на контакта, от който идва новото събитие"
-
-#~ msgid ""
-#~ "If checked, Gajim will remember the roster and chat window positions in "
-#~ "the screen and the sizes of them next time you run it"
-#~ msgstr ""
-#~ "Ако тази опция е избрана, ще се запомнят размерите и позициите на списъка "
-#~ "и прозореца за разговор на екрана за следващото стартиране на програмата."
-
-#~ msgid ""
-#~ "Never\n"
-#~ "Always\n"
-#~ "Per account\n"
-#~ "Per type"
-#~ msgstr ""
-#~ "Никога\n"
-#~ "Винаги\n"
-#~ "Според акаунта\n"
-#~ "Според типа"
-
-#~ msgid "Outgoing Chat state noti_fications:"
-#~ msgstr "_Изпращани уведомления при разговор:"
-
-#~ msgid "Print time:"
-#~ msgstr "Изписване на часа:"
-
-#~ msgid "Save _position and size for roster and chat windows"
-#~ msgstr ""
-#~ "Запазване на _положението и размера на списъка с контакти и прозорците за "
-#~ "разговор"
-
-#~ msgid "Set status message to reflect currently playing _music track"
-#~ msgstr ""
-#~ "Настройване на съобщението за състояние да отразява _песента, която се "
-#~ "изпълнява в момента"
-
-#~ msgid "Show only in _roster"
-#~ msgstr "Показване само в спис_ъка"
-
-#~ msgid "The auto away status message"
-#~ msgstr "Автоматично съобщение за състояние при „Отсъствам“"
-
-#~ msgid "The auto not available status message"
-#~ msgstr "Автоматично съобщение за състояние при „Не съм на разположение“"
-
-#~ msgid "Treat all incoming messages as:"
-#~ msgstr "Третиране на всички входящи съобщения като:"
-
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "_Икона в областта за уведомяване"
-
-#~ msgid ""
-#~ "When a new event (message, file transfer request etc..) is received, the "
-#~ "following methods may be used to inform you about it. Please note that "
-#~ "events about new messages only occur if it is a new message from a "
-#~ "contact you are not already chatting with"
-#~ msgstr ""
-#~ "Когато се получи ново събитие (съобщение, запитване за файлов трансфер и "
-#~ "т.н.), могат да се използват следните методи за уведомяване. Забележете, "
-#~ "че събития за нови съобщения възникват само ако са нови съобщения от "
-#~ "контакт, с който не говорите в момента."
-
-#~ msgid ""
-#~ "Works for Rhythmbox and Muine players. For more players, please visit "
-#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
-#~ msgstr ""
-#~ "Работи с Rhythmbox и Muine. За повече програми, посетете http://trac."
-#~ "gajim.org/wiki/GajimAndMusicPlayer."
-
-#~ msgid "_Advanced Notifications Control..."
-#~ msgstr "_Контрол на уведомления за напреднали..."
-
-#~ msgid "_Font:"
-#~ msgstr "_Шрифт:"
-
-#~ msgid "_Never"
-#~ msgstr "_Никога"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Уведомяване"
-
-#~ msgid "_Player:"
-#~ msgstr "Пле_йър:"
-
-#~ msgid "_Pop it up"
-#~ msgstr "_Показване"
-
-#~ msgid "_URL:"
-#~ msgstr "_Адрес:"
-
-#~ msgid "Address"
-#~ msgstr "Адрес"
-
-#~ msgid "City:"
-#~ msgstr "Град:"
-
-#~ msgid "Company:"
-#~ msgstr "Фирма:"
-
-#~ msgid "Country:"
-#~ msgstr "Държава:"
-
-#~ msgid "Given:"
-#~ msgstr "Собствено:"
-
-#~ msgid "Middle:"
-#~ msgstr "Бащино:"
-
-#~ msgid "Position:"
-#~ msgstr "Длъжност:"
-
-#~ msgid "Prefix:"
-#~ msgstr "Обръщение:"
-
-#~ msgid "Role:"
-#~ msgstr "Роля:"
-
-#~ msgid "State:"
-#~ msgstr "Щат:"
-
-#~ msgid "Suffix:"
-#~ msgstr "Наставка:"
-
-#~ msgid "_Remove from Roster"
-#~ msgstr "П_ремахване от списъка"
-
-#~ msgid "A_ccounts"
-#~ msgstr "А_каунти"
-
-#~ msgid "_Filter:"
-#~ msgstr "_Филтър:"
-
-#~ msgid "Ask:"
-#~ msgstr "Питане за:"
-
-#~ msgid "Client:"
-#~ msgstr "Клиент:"
-
-#~ msgid "OS:"
-#~ msgstr "ОС:"
-
-#~ msgid "Subscription:"
-#~ msgstr "Записване:"
-
-#~ msgid ""
-#~ "If that is not your language for which you want to highlight misspelled "
-#~ "words, then please set your $LANG as appropriate. Eg. for French do "
-#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
-#~ "make it global in /etc/profile.\n"
-#~ "\n"
-#~ "Highlighting misspelled words feature will not be used"
-#~ msgstr ""
-#~ "Ако това не е езикът, за който искате осветяване на неправилно изписаните "
-#~ "думи, настройте променливата $LANG. За български език напишете „export "
-#~ "LANG=bg_BG“ или „export LANG=bg_BG.UTF-8“ в ~/.bash_profile или за "
-#~ "системна настройка в /etc/profile.\n"
-#~ "\n"
-#~ "Осветяването на неправилно изписаните думи няма да се използва"
-
-#~ msgid "Every %s _minutes"
-#~ msgstr "Всеки %s _минути"
-
-#~ msgid "You must enter a password for the new account."
-#~ msgstr "Трябва да въведете парола за новия акаунт."
-
-#~ msgid "You will always see him or her as offline."
-#~ msgstr "Винаги ще го виждате като изключен."
-
-#~ msgid "%s is now %s (%s)"
-#~ msgstr "%s вече е %s (%s)"
-
-#~ msgid "%s is now %s"
-#~ msgstr "%s сега е %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "From: %(from_address)s"
-#~ msgstr ""
-#~ "\n"
-#~ "От: %(from_address)s"
-
-#~ msgid "Network Manager support not available"
-#~ msgstr "Няма поддръжка за NetworkManager"
-
-#~ msgid "Session Management support not available (missing gnome.ui module)"
-#~ msgstr "Липсва поддръжка за управление на сесиите (модул gnome.ui)"
-
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Употреба: %s %s %s \n"
-#~ "\t %s"
-
-#~ msgid "Private Chat"
-#~ msgstr "Личен разговор"
-
-#~ msgid "Group Chat"
-#~ msgstr "Стая"
-
-#~ msgid "%s does not appear to be a valid JID"
-#~ msgstr "„%s“ изглежда не е валиден JID"
-
-#~ msgid "%s - Gajim"
-#~ msgstr "%s - Gajim"
-
-#~ msgid "_New group chat"
-#~ msgstr "_Нова стая"
-
-#~ msgid "_Log on"
-#~ msgstr "_Включване"
-
-#~ msgid "Log _off"
-#~ msgstr "Изкл_ючване"
-
-#~ msgid "Save passphrase"
-#~ msgstr "Запазване на паролата"
-
-#~ msgid "Drop %s in group %s"
-#~ msgstr "Преместване на %s в група %s"
-
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Създаване на %s и %s като мета-контакти"
-
-#~ msgid "Hides the buttons in two persons chat window."
-#~ msgstr "Скрива бутоните в прозорец за разговор с два контакта."
-
-#~ msgid "Connected to server %s:%s with %s"
-#~ msgstr "Свързан към сървър %s:%s с %s"
-
-#~ msgid "Security error connecting to \"%s\""
-#~ msgstr "Грешка в сигурността при свързването с „%s“"
-
-#~ msgid ""
-#~ "The server's key has changed, or someone is trying to hack your "
-#~ "connection."
-#~ msgstr ""
-#~ "Ключът на сървъра е променен, или някой се опитва да взломи връзката ви."
-
-#~ msgid "Unable to check fingerprint for %s. Connection could be insecure."
-#~ msgstr ""
-#~ "Неуспех при проверката на отпечатъка на %s. Свързването може да е "
-#~ "несигурно."
-
-#~ msgid "Missing fingerprint in SSL connection to %s"
-#~ msgstr "Липсва отпечатък при свързването чрез SSL с %s"
-
-#~ msgid "Fingerprint mismatch for %s: Got %s, expected %s"
-#~ msgstr "Отпечатъкът на %s не съвпада; получи се %s, а се очакваше %s"
-
-#~ msgid "invisible"
-#~ msgstr "невидим"
-
-#~ msgid "offline"
-#~ msgstr "изключен"
-
-#~ msgid " %d unread single message"
-#~ msgid_plural " %d unread single messages"
-#~ msgstr[0] " %d непрочетено еднократно съобщение"
-#~ msgstr[1] " %d непрочетени еднократни съобщения"
-
-#~ msgid " %d unread group chat message"
-#~ msgid_plural " %d unread group chat messages"
-#~ msgstr[0] " %d непрочетено съобщение в стая"
-#~ msgstr[1] " %d непрочетени съобщения в стаи"
-
-#~ msgid " %d unread private message"
-#~ msgid_plural " %d unread private messages"
-#~ msgstr[0] " %d непрочетено лично съобщение"
-#~ msgstr[1] " %d непрочетени лични съобщения"
-
-#~ msgid "gtk+"
-#~ msgstr "GTK+"
-
-#~ msgid ""
-#~ "Connection to host could not be established: Incorrect answer from server."
-#~ msgstr ""
-#~ "Неуспех при установяването на връзка с хоста: Неправилен отговор от "
-#~ "сървъра."
-
-#~ msgid "Connection to host could not be established"
-#~ msgstr "Неуспех при установяването на връзка с хоста"
1
0
Author: asterix
Date: 2008-12-02 20:49:49 +0100 (Tue, 02 Dec 2008)
New Revision: 10754
Modified:
trunk/po/ru.po
Log:
[Fomin Denis] updated russian translation
Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po 2008-12-02 19:49:17 UTC (rev 10753)
+++ trunk/po/ru.po 2008-12-02 19:49:49 UTC (rev 10754)
@@ -13,15 +13,14 @@
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-23 17:55+0100\n"
-"PO-Revision-Date: 2008-11-23 16:54+0300\n"
+"POT-Creation-Date: 2008-11-17 23:01+0100\n"
+"PO-Revision-Date: 2008-12-02 18:30+0300\n"
"Last-Translator: Fomin Denis <fominde(a)mail.ru>\n"
"Language-Team: Русский <ru(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: KBabel 1.11.4\n"
"X-Poedit-Basepath: /home/test/gajim\n"
@@ -109,9 +108,7 @@
#: ../data/glade/account_creation_wizard_window.glade.h:10
msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Щелкните, чтобы просмотреть сервисы предоставляемые jabber сервером "
-"(например, MSN, ICQ транспорты)"
+msgstr "Щелкните, чтобы просмотреть сервисы предоставляемые jabber сервером (например, MSN, ICQ транспорты)"
#: ../data/glade/account_creation_wizard_window.glade.h:11
msgid "Connect when I press Finish"
@@ -259,16 +256,8 @@
msgstr "И_зменить пароль"
#: ../data/glade/account_modification_window.glade.h:10
-msgid ""
-"Check this so Gajim will connect in port 5223 where legacy servers are "
-"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
-"default if broadcasted by the server, and with this option enabled TLS will "
-"be disabled"
-msgstr ""
-"Если отмечено, то Gajim будет соединяться с портом 5223, на котором старые "
-"сервера обычно ожидают подключения по SSL. Заметьте, что Gajim использует "
-"TLS шифрование по умолчанию, если сервер предоставляет такую возможность, с "
-"этой же опцией TLS отключается"
+msgid "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled"
+msgstr "Если отмечено, то Gajim будет соединяться с портом 5223, на котором старые сервера обычно ожидают подключения по SSL. Заметьте, что Gajim использует TLS шифрование по умолчанию, если сервер предоставляет такую возможность, с этой же опцией TLS отключается"
#: ../data/glade/account_modification_window.glade.h:11
#: ../data/glade/accounts_window.glade.h:12
@@ -284,8 +273,7 @@
#: ../data/glade/account_modification_window.glade.h:13
#: ../data/glade/accounts_window.glade.h:14
msgid "Click to request authorization to all contacts of another account"
-msgstr ""
-"Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи"
+msgstr "Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи"
#: ../data/glade/account_modification_window.glade.h:14
#: ../data/glade/accounts_window.glade.h:15
@@ -300,8 +288,11 @@
#. No configured account
#: ../data/glade/account_modification_window.glade.h:16
#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../data/glade/roster_window.glade.h:5
+#: ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055
+#: ../src/notify.py:501
+#: ../src/notify.py:532
#: ../src/notify.py:544
msgid "Gajim"
msgstr "Gajim"
@@ -313,8 +304,11 @@
#: ../data/glade/accounts_window.glade.h:21
#: ../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:166 ../src/roster_window.py:2673
+#: ../src/common/contacts.py:98
+#: ../src/dialogs.py:103
+#: ../src/dialogs.py:111
+#: ../src/dialogs.py:166
+#: ../src/roster_window.py:2673
#: ../src/roster_window.py:5158
msgid "General"
msgstr "Общие"
@@ -326,52 +320,30 @@
#: ../data/glade/account_modification_window.glade.h:19
#: ../data/glade/accounts_window.glade.h:23
-msgid ""
-"If checked, Gajim will also broadcast some more IPs except from just your "
-"IP, so file transfer has higher chances of working."
-msgstr ""
-"Если отмечено, Gajim будет передавать еще несколько IP адресов в дополнение "
-"к вашему, так что передача файла имеет больше шансов на успех."
+msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
+msgstr "Если отмечено, Gajim будет передавать еще несколько IP адресов в дополнение к вашему, так что передача файла имеет больше шансов на успех."
#: ../data/glade/account_modification_window.glade.h:21
#: ../data/glade/accounts_window.glade.h:26
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва "
-"соединения по таймауту"
+msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
+msgstr "Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва соединения по таймауту"
#: ../data/glade/account_modification_window.glade.h:22
#: ../data/glade/zeroconf_properties_window.glade.h:8
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Если отмечено, то Gajim сохранит пароль в ~/.gajim/config с доступом на "
-"чтение только для вас"
+msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
+msgstr "Если отмечено, то Gajim сохранит пароль в ~/.gajim/config с доступом на чтение только для вас"
#: ../data/glade/account_modification_window.glade.h:23
#: ../data/glade/accounts_window.glade.h:27
#: ../data/glade/zeroconf_properties_window.glade.h:9
-msgid ""
-"If checked, Gajim, when launched, will automatically connect to jabber using "
-"this account"
-msgstr ""
-"Если отмечено, Gajim после запуска будет автоматически подсоединяться к "
-"jabber серверу с использованием этой учетной записи"
+msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
+msgstr "Если отмечено, Gajim после запуска будет автоматически подсоединяться к jabber серверу с использованием этой учетной записи"
#: ../data/glade/account_modification_window.glade.h:24
#: ../data/glade/accounts_window.glade.h:28
#: ../data/glade/zeroconf_properties_window.glade.h:10
-msgid ""
-"If checked, any change to the global status (handled by the combobox at the "
-"bottom of the roster window) will change the status of this account "
-"accordingly"
-msgstr ""
-"Если отмечено, то любые изменения глобального статуса (управляемого из "
-"выпадающего списка внизу окна ростера) повлекут за собой изменение статуса "
-"этой учетной записи"
+msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
+msgstr "Если отмечено, то любые изменения глобального статуса (управляемого из выпадающего списка внизу окна ростера) повлекут за собой изменение статуса этой учетной записи"
#: ../data/glade/account_modification_window.glade.h:25
#: ../data/glade/accounts_window.glade.h:31
@@ -380,7 +352,8 @@
#: ../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:1557
+#: ../data/glade/zeroconf_properties_window.glade.h:16
+#: ../src/config.py:1557
#: ../src/config.py:2057
msgid "No key selected"
msgstr "Не выбран ключ"
@@ -388,12 +361,22 @@
#. 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:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../data/glade/change_mood_dialog.glade.h:3
+#: ../src/config.py:1147
+#: ../src/config.py:1218
+#: ../src/config.py:1465
+#: ../src/config.py:1470
+#: ../src/config.py:1965
+#: ../src/config.py:2043
+#: ../src/config.py:2056
+#: ../src/config.py:3151
+#: ../src/config.py:3219
+#: ../src/dialogs.py:294
+#: ../src/dialogs.py:296
+#: ../src/dialogs.py:523
+#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2753
msgid "None"
msgstr "Нет"
@@ -416,15 +399,8 @@
#: ../data/glade/account_modification_window.glade.h:33
#: ../data/glade/accounts_window.glade.h:42
-msgid ""
-"Priority is used in Jabber to determine who gets the events from the jabber "
-"server when two or more clients are connected using the same account; The "
-"client with the highest priority gets the events"
-msgstr ""
-"Приоритет используется в Jabber для определения того, кто будет получать "
-"события от jabber сервера когда подсоединены два и более клиента с одной и "
-"той же учетной записью. Клиент с наибольшим приоритетом будет получать "
-"события"
+msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events"
+msgstr "Приоритет используется в Jabber для определения того, кто будет получать события от jabber сервера когда подсоединены два и более клиента с одной и той же учетной записью. Клиент с наибольшим приоритетом будет получать события"
#: ../data/glade/account_modification_window.glade.h:34
#: ../data/glade/accounts_window.glade.h:43
@@ -442,18 +418,8 @@
#: ../data/glade/account_modification_window.glade.h:37
#: ../data/glade/accounts_window.glade.h:46
-msgid ""
-"Resource is sent to the Jabber server in order to separate the same JID in "
-"two or more parts depending on the number of the clients connected in the "
-"same server with the same account. So you might be connected in the same "
-"account with resource 'Home' and 'Work' at the same time. The resource which "
-"has the highest priority will get the events. (see below)"
-msgstr ""
-"Ресурс отправляется Jabber серверу для того, чтобы различать два и более "
-"клиентов с одинаковой учетной записью, подключенных к одному и тому же "
-"серверу. Таким образом, вы можете одновременно подключиться к одному серверу "
-"с ресурсов 'Дом' или 'Работа'. Ресурс, обладающий большим приоритетом, будет "
-"получать все события. (См. ниже)"
+msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
+msgstr "Ресурс отправляется Jabber серверу для того, чтобы различать два и более клиентов с одинаковой учетной записью, подключенных к одному и тому же серверу. Таким образом, вы можете одновременно подключиться к одному серверу с ресурсов 'Дом' или 'Работа'. Ресурс, обладающий большим приоритетом, будет получать все события. (См. ниже)"
#: ../data/glade/account_modification_window.glade.h:38
#: ../data/glade/zeroconf_properties_window.glade.h:18
@@ -479,7 +445,6 @@
#: ../data/glade/account_modification_window.glade.h:43
#: ../data/glade/accounts_window.glade.h:51
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
#: ../data/glade/synchronise_select_account_dialog.glade.h:2
msgid "Synchronise contacts"
msgstr "Объединить контакты"
@@ -516,12 +481,8 @@
msgstr "Учётные записи"
#: ../data/glade/accounts_window.glade.h:11
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
-"через незащищенное соединение."
+msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
+msgstr "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля через незащищенное соединение."
#: ../data/glade/accounts_window.glade.h:16
#: ../data/glade/zeroconf_information_window.glade.h:2
@@ -548,17 +509,16 @@
#: ../data/glade/accounts_window.glade.h:29
#: ../data/glade/zeroconf_properties_window.glade.h:11
msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
+"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
"You might consider to change possible firewall settings."
msgstr ""
-"Если порт по умолчанию, который используется для входящих сообщения вас не "
-"устраивает, вы можете выбрать другой.\n"
+"Если порт по умолчанию, который используется для входящих сообщения вас не устраивает, вы можете выбрать другой.\n"
"Также, возможно, придется изменить некоторые настройки брандмауэра."
#: ../data/glade/accounts_window.glade.h:32
#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:679
+#: ../data/glade/zeroconf_properties_window.glade.h:13
+#: ../src/dialogs.py:679
msgid "Jabber ID:"
msgstr "Jabber ID:"
@@ -573,7 +533,8 @@
msgstr "_Объединить учетные записи"
#. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:44
+#: ../src/roster_window.py:5109
msgid "Re_name"
msgstr "П_ереименовать"
@@ -707,9 +668,7 @@
#: ../data/glade/advanced_configuration_window.glade.h:2
msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr ""
-"<b>ПРИМЕЧАНИЕ:</b> Необходимо перезапустить Gajim, чтобы некоторые настройки "
-"вступили в силу"
+msgstr "<b>ПРИМЕЧАНИЕ:</b> Необходимо перезапустить Gajim, чтобы некоторые настройки вступили в силу"
#: ../data/glade/advanced_configuration_window.glade.h:3
msgid "Advanced Configuration Editor"
@@ -733,8 +692,7 @@
#: ../data/glade/advanced_menuitem_menu.glade.h:4
msgid "Sends a message to users currently connected to this server"
-msgstr ""
-"Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
+msgstr "Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
#: ../data/glade/advanced_menuitem_menu.glade.h:5
msgid "Set MOTD..."
@@ -794,7 +752,8 @@
msgstr "Все статусы"
#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:102
+#: ../src/common/helpers.py:291
msgid "Away"
msgstr "Ушел"
@@ -861,11 +820,8 @@
msgstr "Когда "
#: ../data/glade/advanced_notifications_window.glade.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Активировать функцию оконного менеджера «UrgencyHint», чтобы окно чата "
-"мигало на панели"
+msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr "_Активировать функцию оконного менеджера «UrgencyHint», чтобы окно чата мигало на панели"
#: ../data/glade/advanced_notifications_window.glade.h:28
msgid "_Disable auto opening chat window"
@@ -1024,44 +980,30 @@
msgid "_Start Chat"
msgstr "_Начать беседу"
-#. Execute Command
#: ../data/glade/chat_control_popup_menu.glade.h:1
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
-msgid "Execute Command..."
-msgstr "Выполнить команду..."
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
msgid "Invite _Contacts"
msgstr "Пригласить _участников"
-#. Send Custom Status
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
-msgid "Send Cus_tom Status"
-msgstr "Установи_ть статус"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/chat_control_popup_menu.glade.h:2
#: ../data/glade/gc_occupants_menu.glade.h:3
#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
msgid "Send _File"
msgstr "Отправить _файл"
-#: ../data/glade/chat_control_popup_menu.glade.h:5
+#: ../data/glade/chat_control_popup_menu.glade.h:3
msgid "Toggle End to End Encryption"
msgstr "Включить End to End шифрование"
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/chat_control_popup_menu.glade.h:4
msgid "Toggle Open_PGP Encryption"
msgstr "Включить Open_PGP шифрование"
-#: ../data/glade/chat_control_popup_menu.glade.h:7
+#: ../data/glade/chat_control_popup_menu.glade.h:5
#: ../data/glade/gc_occupants_menu.glade.h:4
msgid "_Add to Roster"
msgstr "_Добавить в ростер"
-#: ../data/glade/chat_control_popup_menu.glade.h:8
+#: ../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:17
@@ -1164,18 +1106,15 @@
msgstr "Показывает список передач между вами и остальными"
#: ../data/glade/filetransfers.glade.h:11
-msgid ""
-"This action removes single file transfer from the list. If the transfer is "
-"active, it is first stopped and then removed"
-msgstr ""
-"Это действие удаляет единичную передачу из списка. Если передача еще "
-"активна, она сначала останавливается, а затем удаляется"
+msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
+msgstr "Это действие удаляет единичную передачу из списка. Если передача еще активна, она сначала останавливается, а затем удаляется"
#: ../data/glade/filetransfers.glade.h:12
msgid "When a file transfer is complete show a popup notification"
msgstr "Показать уведомление по окончании загрузки"
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13
+#: ../src/filetransfers_window.py:793
msgid "_Continue"
msgstr "_Продолжить"
@@ -1183,7 +1122,8 @@
msgid "_Notify me when a file transfer is complete"
msgstr "_Уведомить меня, когда передача файлов закончится"
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15
+#: ../src/filetransfers_window.py:200
msgid "_Open Containing Folder"
msgstr "_Открыть папку с принятым файлом"
@@ -1211,7 +1151,7 @@
"Контакт\n"
"Баннер в окне чата"
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:753
+#: ../data/glade/gajim_themes_window.glade.h:6
msgid "Bold"
msgstr "Полужирный"
@@ -1231,11 +1171,12 @@
msgid "Gone"
msgstr "Ушел"
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
+#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../src/common/pep.py:152
msgid "Inactive"
msgstr "Неактивен"
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:754
+#: ../data/glade/gajim_themes_window.glade.h:12
msgid "Italic"
msgstr "Курсив"
@@ -1337,12 +1278,14 @@
msgid "Create new post"
msgstr "Создать новое сообщение"
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2
+#: ../src/common/helpers.py:316
msgid "From"
msgstr "От"
#. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../data/glade/groups_post_window.glade.h:3
+#: ../src/history_manager.py:171
#: ../src/history_manager.py:202
msgid "Subject"
msgstr "Тема"
@@ -1350,13 +1293,10 @@
#: ../data/glade/history_manager.glade.h:1
msgid ""
"<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. "
-"Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
msgstr ""
"<b>ВНИМАНИЕ:</b>\n"
-"Если вы собираетесь устроить массовую чистку, удостоверьтесь, что Gajim не "
-"запущен. Избегайте удалений из логов контактов, с которыми вы разговариваете "
-"в этот момент."
+"Если вы собираетесь устроить массовую чистку, удостоверьтесь, что Gajim не запущен. Избегайте удалений из логов контактов, с которыми вы разговариваете в этот момент."
#: ../data/glade/history_manager.glade.h:3
msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
@@ -1376,24 +1316,20 @@
#: ../data/glade/history_manager.glade.h:7
msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This log manager is not intended for log viewing. If you are looking for such functionality, use the history window instead.\n"
"\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"Use this program to delete or export logs. You can select logs from the left and/or search database from below."
msgstr ""
-"Этот менеджер истории не предназначен для просмотра. Если вы хотите "
-"просматривать историю с большим количеством функций, используйте окно "
-"истории.\n"
+"Этот менеджер истории не предназначен для просмотра. Если вы хотите просматривать историю с большим количеством функций, используйте окно истории.\n"
"\n"
-"Используйте эту программу для удаления или экспорта истории. Вы можете "
-"выбрать лог слева или воспользоваться поиском в базе."
+"Используйте эту программу для удаления или экспорта истории. Вы можете выбрать лог слева или воспользоваться поиском в базе."
#: ../data/glade/history_manager.glade.h:10
msgid "_Search Database"
msgstr "_Поиск в базе данных"
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1
+#: ../src/history_window.py:305
msgid "Conversation History"
msgstr "История"
@@ -1416,7 +1352,8 @@
msgid "_Log conversation history"
msgstr "_История сообщения"
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1698
+#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../src/dialogs.py:1698
msgid "Join Group Chat"
msgstr "Войти в комнату"
@@ -1443,8 +1380,9 @@
msgid "Room:"
msgstr "Комната:"
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1199
-#: ../src/disco.py:1620
+#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../src/disco.py:1197
+#: ../src/disco.py:1618
msgid "_Join"
msgstr "_Присоединиться"
@@ -1565,19 +1503,15 @@
msgstr "Показать набор смайлов (Alt+M)"
#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Показать список форматирования"
-
-#: ../data/glade/message_window.glade.h:10
msgid "Show a menu of advanced functions (Alt+A)"
msgstr "Показать меню дополнительных функций (Alt+A)"
-#: ../data/glade/message_window.glade.h:11
+#: ../data/glade/message_window.glade.h:10
msgid "Show the contact's profile (Ctrl+I)"
msgstr "Показать информацию о контакте (Ctrl+I)"
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/message_window.glade.h:13
+#: ../data/glade/message_window.glade.h:12
#: ../data/glade/xml_console_window.glade.h:11
#: ../src/filetransfers_window.py:261
msgid "_Send"
@@ -1698,8 +1632,7 @@
#: ../data/glade/preferences_window.glade.h:33
msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr ""
-"_Всегда проверять при запуске, является ли Gajim jabber-клиентом по умолчанию"
+msgstr "_Всегда проверять при запуске, является ли Gajim jabber-клиентом по умолчанию"
#: ../data/glade/preferences_window.glade.h:34
msgid "Configure color and font of the interface"
@@ -1744,163 +1677,84 @@
msgstr "Показывать _сообщения о статусе контакта в ростере"
#: ../data/glade/preferences_window.glade.h:46
-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 "
-"display in chat windows."
-msgstr ""
-"Gajim может отсылать и получать метаданные относящиеся к беседе с контактом. "
-"Здесь вы можете указать, какие состояние чата вы хотели бы видеть в окне "
-"чата."
+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 display in chat windows."
+msgstr "Gajim может отсылать и получать метаданные относящиеся к беседе с контактом. Здесь вы можете указать, какие состояние чата вы хотели бы видеть в окне чата."
#: ../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 "
-"send to the other party."
-msgstr ""
-"Gajim может отсылать и получать метаданные, относящиеся к беседе с "
-"контактом. Здесь вы можете указать, какие состояния чата Gajim будет "
-"отсылать вашему респонденту."
+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 send to the other party."
+msgstr "Gajim может отсылать и получать метаданные, относящиеся к беседе с контактом. Здесь вы можете указать, какие состояния чата Gajim будет отсылать вашему респонденту."
#: ../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"
-msgstr ""
-"Gajim будет уведомлять вас об отсоединившемся контакте с помощью сообщения в "
-"правом нижнем углу экрана"
+msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
+msgstr "Gajim будет уведомлять вас об отсоединившемся контакте с помощью сообщения в правом нижнем углу экрана"
#: ../data/glade/preferences_window.glade.h:50
msgid "Hide all buttons in chat windows"
msgstr "Не показывать кнопки в окнах чата"
#: ../data/glade/preferences_window.glade.h:51
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"Если отмечено, то Gajim будет разрешать определять операционную систему "
-"которую вы используете"
+msgid "If checked, Gajim will allow others to detect the operation system you are using"
+msgstr "Если отмечено, то Gajim будет разрешать определять операционную систему которую вы используете"
#: ../data/glade/preferences_window.glade.h:52
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Если отмечено, то Gajim будет включать информацию об отправителе новых писем."
+msgid "If checked, Gajim will also include information about the sender of the new emails"
+msgstr "Если отмечено, то Gajim будет включать информацию об отправителе новых писем."
#: ../data/glade/preferences_window.glade.h:53
-msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
-msgstr ""
-"Если отмечено, то Gajim изменит статус на Away, если компьютер не "
-"используется."
+msgid "If checked, Gajim will change status to Away when the computer is unused."
+msgstr "Если отмечено, то Gajim изменит статус на Away, если компьютер не используется."
#: ../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"
-msgstr ""
-"Если отмечено, Gajim будет менять статус на Недоступен, если компьютер долго "
-"не используется"
+msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
+msgstr "Если отмечено, Gajim будет менять статус на Недоступен, если компьютер долго не используется"
#: ../data/glade/preferences_window.glade.h:55
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и "
-"в окнах комнат"
+msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
+msgstr "Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и в окнах комнат"
#: ../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"
-msgstr ""
-"Если отмечено, то Gajim будет отображать сообщение о статусе контакта под "
-"его именем в окне ростера и в окнах комнат"
+msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
+msgstr "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под его именем в окне ростера и в окнах комнат"
#: ../data/glade/preferences_window.glade.h:57
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Если отмечено, то Gajim будет показывать занятия контактов в окне ростера"
+msgid "If checked, Gajim will display the activity of contacts in the roster window"
+msgstr "Если отмечено, то Gajim будет показывать занятия контактов в окне ростера"
#: ../data/glade/preferences_window.glade.h:58
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Если отмечено, то Gajim будет показывать настроения контактов в окне ростера"
+msgid "If checked, Gajim will display the mood of contacts in the roster window"
+msgstr "Если отмечено, то Gajim будет показывать настроения контактов в окне ростера"
#: ../data/glade/preferences_window.glade.h:59
-msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr ""
-"Если отмечено, то Gajim будет показывать tunes контактов в окне ростера"
+msgid "If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr "Если отмечено, то Gajim будет показывать tunes контактов в окне ростера"
#: ../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 "
-"field, the default language will be used for this contact or group chat."
-msgstr ""
-"Если отмечено, Gajim будет выделять орфографические ошибки в полях ввода "
-"окон чата. Если язык проверки явно не задан, будет использован язык по "
-"умолчанию для данного контакта или комнаты."
+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 field, the default language will be used for this contact or group chat."
+msgstr "Если отмечено, Gajim будет выделять орфографические ошибки в полях ввода окон чата. Если язык проверки явно не задан, будет использован язык по умолчанию для данного контакта или комнаты."
#: ../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 "
-"not in the roster"
-msgstr ""
-"Отметьте эту опцию, только если кто-то не из вашего ростера спамит/достает "
-"вас. Используйте с осторожностью, потому что это заблокирует все сообщения "
-"от контактов не из вашего роcтера."
+msgid "If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster"
+msgstr "Отметьте эту опцию, только если кто-то не из вашего ростера спамит/достает вас. Используйте с осторожностью, потому что это заблокирует все сообщения от контактов не из вашего роcтера."
#: ../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 "
-"messages will not be logged."
-msgstr ""
-"Если отмечено, Gajim будет сохранять историю зашифрованных сообщений. "
-"Помните, что при использовании E2E шифрования удаленная сторона должна дать "
-"согласие на ведение истории, иначе сообщения не будут сохраняться."
+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 messages will not be logged."
+msgstr "Если отмечено, Gajim будет сохранять историю зашифрованных сообщений. Помните, что при использовании E2E шифрования удаленная сторона должна дать согласие на ведение истории, иначе сообщения не будут сохраняться."
#: ../data/glade/preferences_window.glade.h:63
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
-msgstr ""
-"Если отмечено, то Gajim будет сообщать о новых письмах, полученных в GMail"
+msgid "If checked, Gajim will show a notification when a new e-mail is received via GMail"
+msgstr "Если отмечено, то Gajim будет сообщать о новых письмах, полученных в GMail"
#: ../data/glade/preferences_window.glade.h:64
-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...)"
-msgstr ""
-"Если отмечено, то Gajim будет использовать для каждого протокола свои иконки "
-"(например, контакты из MSN будут иметь соответствующие иконки msn для "
-"статусов «в сети», «ушёл», «занят» и т.д.)"
+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...)"
+msgstr "Если отмечено, то Gajim будет использовать для каждого протокола свои иконки (например, контакты из MSN будут иметь соответствующие иконки msn для статусов «в сети», «ушёл», «занят» и т.д.)"
#: ../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."
-msgstr ""
-"Если включено, Gajim не будет запрашивать статус-сообщение. Вместо него "
-"будет использовано соответствующее сообщение по умолчанию."
+msgid "If enabled, Gajim will not ask for a status message. The specified default message will be used instead."
+msgstr "Если включено, Gajim не будет запрашивать статус-сообщение. Вместо него будет использовано соответствующее сообщение по умолчанию."
#: ../data/glade/preferences_window.glade.h:66
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
-msgstr ""
-"Gajim заменяет текстовые смайлики, например ':)', их графическим или "
-"анимированным эквивалентом. Выберите «Отключены», чтобы этого не происходило."
+msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
+msgstr "Gajim заменяет текстовые смайлики, например ':)', их графическим или анимированным эквивалентом. Выберите «Отключены», чтобы этого не происходило."
#: ../data/glade/preferences_window.glade.h:67
msgid "Log _encrypted chat session"
@@ -1961,18 +1815,15 @@
msgstr "В_ышел"
#: ../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."
-msgstr ""
-"Некоторые сообщения могут содержать форматирование (цвет, шрифт и т.д.). "
-"Если отмечено, Gajim будет отображать только их текст, без форматирования."
+msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
+msgstr "Некоторые сообщения могут содержать форматирование (цвет, шрифт и т.д.). Если отмечено, Gajim будет отображать только их текст, без форматирования."
#: ../data/glade/preferences_window.glade.h:83
msgid "Sort contacts by status"
msgstr "Сортировать контакты по статусу"
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:84
+#: ../src/config.py:400
msgid "Status"
msgstr "Статус"
@@ -1989,20 +1840,12 @@
msgstr "_Тема:"
#: ../data/glade/preferences_window.glade.h:88
-msgid ""
-"The auto away status message. If empty, Gajim will not change the current "
-"status message"
-msgstr ""
-"Автоматическое статусное сообщение (Ушел). Если не указано, Gajim не будет "
-"изменять статусное сообщение"
+msgid "The auto away status message. If empty, Gajim will not change the current status message"
+msgstr "Автоматическое статусное сообщение (Ушел). Если не указано, Gajim не будет изменять статусное сообщение"
#: ../data/glade/preferences_window.glade.h:89
-msgid ""
-"The auto not available status message. If empty, Gajim will not change the "
-"current status message"
-msgstr ""
-"Автоматическое статусное сообщение (Недоступен). Если не указано, Gajim не "
-"будет изменять статусное сообщение"
+msgid "The auto not available status message. If empty, Gajim will not change the current status message"
+msgstr "Автоматическое статусное сообщение (Недоступен). Если не указано, Gajim не будет изменять статусное сообщение"
#: ../data/glade/preferences_window.glade.h:90
msgid "Use _transports icons"
@@ -2148,7 +1991,8 @@
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:2565
msgid "Privacy List"
msgstr "Список доступа"
@@ -2292,7 +2136,8 @@
msgstr "<b>Префикс:</b>"
#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:29
+#: ../src/vcard.py:307
msgid "<b>Role:</b>"
msgstr "<b>Обязанности:</b>"
@@ -2352,8 +2197,10 @@
#. Remove group
#. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../data/glade/remove_account_window.glade.h:4
+#: ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5752
msgid "_Remove"
msgstr "_Удалить"
@@ -2373,10 +2220,17 @@
msgid "Edit _Groups..."
msgstr "Редактировать _группы"
+#. Execute Command
+#: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:5695
+msgid "Execute Command..."
+msgstr "Выполнить команду..."
+
#. Invite to
#. Invite to Groupchat
#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5064
+#: ../src/roster_window.py:5576
msgid "In_vite to"
msgstr "_Пригласить в"
@@ -2384,6 +2238,13 @@
msgid "Remo_ve"
msgstr "_Удалить"
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:5661
+msgid "Send Cus_tom Status"
+msgstr "Установи_ть статус"
+
#: ../data/glade/roster_contact_context_menu.glade.h:9
msgid "Send Single _Message..."
msgstr "Отправить одиночное _сообщение..."
@@ -2406,7 +2267,8 @@
msgstr "_Позволить ему или ей видеть мой статус"
#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5137
+#: ../src/roster_window.py:5613
#: ../src/roster_window.py:5742
msgid "_Block"
msgstr "_Блокировать"
@@ -2433,7 +2295,8 @@
msgstr "_Подписка"
#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5131
+#: ../src/roster_window.py:5607
#: ../src/roster_window.py:5739
msgid "_Unblock"
msgstr "_Разблокировать"
@@ -2492,7 +2355,8 @@
msgid "_Contents"
msgstr "_Содержание"
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1353
+#: ../data/glade/roster_window.glade.h:17
+#: ../src/disco.py:1351
msgid "_Edit"
msgstr "_Правка"
@@ -2533,11 +2397,13 @@
msgstr "Добавить _контакт"
#. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4
+#: ../src/roster_window.py:5764
msgid "_Information"
msgstr "_Информация о контакте"
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1211
+#: ../data/glade/search_window.glade.h:5
+#: ../src/disco.py:1209
msgid "_Search"
msgstr "_Поиск"
@@ -2610,9 +2476,7 @@
msgstr "Авторизовать контакт (он будет видеть ваш статус)"
#: ../data/glade/subscription_request_window.glade.h:3
-msgid ""
-"Deny authorization from contact so he or she cannot know when you're "
-"connected"
+msgid "Deny authorization from contact so he or she cannot know when you're connected"
msgstr "Отклонить авторизацию от контакта (Он не сможет видеть ваш статус)"
#: ../data/glade/subscription_request_window.glade.h:4
@@ -2623,10 +2487,6 @@
msgid "_Deny"
msgstr "_Отклонить"
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr "Выберите учетную запись для объединения"
-
#: ../data/glade/synchronise_select_account_dialog.glade.h:1
msgid "Select the account with which you want to synchronise"
msgstr "Выберите учетную запись для объединения"
@@ -2793,10 +2653,8 @@
msgstr "Отменить подтверждение"
#: ../src/adhoc_commands.py:265
-msgid ""
-"You are in process of executing command. Do you really want to cancel it?"
-msgstr ""
-"Команда находится в процессе выполнения. Вы уверены, что хотите её отменить?"
+msgid "You are in process of executing command. Do you really want to cancel it?"
+msgstr "Команда находится в процессе выполнения. Вы уверены, что хотите её отменить?"
#: ../src/adhoc_commands.py:304
msgid "Service changed the session identifier."
@@ -2832,7 +2690,7 @@
msgid "Text"
msgstr "Текст"
-#: ../src/advanced.py:102 ../src/chat_control.py:773
+#: ../src/advanced.py:102
msgid "Color"
msgstr "Цвет"
@@ -2862,165 +2720,164 @@
#. #!/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_control.py:68
msgid "English"
msgstr "Английский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Belarusian"
msgstr "Белорусский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Bulgarian"
msgstr "Болгарский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Breton"
msgstr "Бретонский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Czech"
msgstr "Чешский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "German"
msgstr "Немецкий"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Greek"
msgstr "Греческий"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "British"
msgstr "Британский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Esperanto"
msgstr "Эсперанто"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Spanish"
msgstr "Испанский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Basque"
msgstr "Баскский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "French"
msgstr "Французский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Croatian"
msgstr "Хорватский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Italian"
msgstr "Итальянский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Norwegian (b)"
msgstr "Норвежский (букмол)"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Dutch"
msgstr "Голландский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Norwegian"
msgstr "Норвежский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Polish"
msgstr "Польский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Portuguese"
msgstr "Португальский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Brazilian Portuguese"
msgstr "Португальский (Бразилия)"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Russian"
msgstr "Русский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Serbian"
msgstr "Сербский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Slovak"
msgstr "Словацкий"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Swedish"
msgstr "Шведский"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Chinese (Ch)"
msgstr "Китайский"
-#: ../src/chat_control.py:337
+#: ../src/chat_control.py:332
msgid "Spelling language"
msgstr "Язык проверки орфографии"
#. we are not connected
-#: ../src/chat_control.py:360 ../src/chat_control.py:556
+#: ../src/chat_control.py:355
+#: ../src/chat_control.py:549
msgid "A connection is not available"
msgstr "Подключение недоступно"
-#: ../src/chat_control.py:361 ../src/chat_control.py:557
+#: ../src/chat_control.py:356
+#: ../src/chat_control.py:550
msgid "Your message can not be sent until you are connected."
msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
-#: ../src/chat_control.py:755
-msgid "Underline"
-msgstr "Подчеркнутый"
-
-#: ../src/chat_control.py:756
-msgid "Strike"
-msgstr "Зачеркнутый"
-
-#: ../src/chat_control.py:779
-msgid "Font"
-msgstr "Шрифт"
-
-#: ../src/chat_control.py:788
-msgid "Clear formating"
-msgstr "Удалить форматирование"
-
-#: ../src/chat_control.py:1218 ../src/chat_control.py:1620
+#: ../src/chat_control.py:1147
+#: ../src/chat_control.py:1543
msgid "GPG encryption enabled"
msgstr "GPG шифрование включено"
#. Add to roster
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1246 ../src/chat_control.py:2122
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:904 ../src/gajim.py:1637 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../src/chat_control.py:1169
+#: ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113
+#: ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303
+#: ../src/conversation_textview.py:845
+#: ../src/dialogs.py:904
+#: ../src/gajim.py:1633
+#: ../src/roster_window.py:916
+#: ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544
+#: ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111
+#: ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258
+#: ../src/roster_window.py:5442
msgid "Not in Roster"
msgstr "Не в ростере"
-#: ../src/chat_control.py:1378 ../src/tooltips.py:627
+#: ../src/chat_control.py:1301
+#: ../src/tooltips.py:627
msgid "Unknown Artist"
msgstr "Неизвестный исполнитель"
-#: ../src/chat_control.py:1380 ../src/tooltips.py:632
+#: ../src/chat_control.py:1303
+#: ../src/tooltips.py:632
msgid "Unknown Title"
msgstr "Неизвестная песня"
-#: ../src/chat_control.py:1382 ../src/tooltips.py:637
+#: ../src/chat_control.py:1305
+#: ../src/tooltips.py:637
msgid "Unknown Source"
msgstr "Неизвестный альбом"
-#: ../src/chat_control.py:1386 ../src/tooltips.py:639
+#: ../src/chat_control.py:1309
+#: ../src/tooltips.py:639
#, python-format
msgid ""
"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3029,7 +2886,7 @@
"<b>«%(title)s»</b> <i>%(artist)s</i>\n"
"из <i>%(source)s</i>"
-#: ../src/chat_control.py:1391
+#: ../src/chat_control.py:1314
#, python-format
msgid ""
"%(title)s by %(artist)s\n"
@@ -3038,68 +2895,65 @@
"%(title)s by %(artist)s\n"
"из %(source)s"
-#: ../src/chat_control.py:1515
+#: ../src/chat_control.py:1438
#, 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:1600 ../src/dialogs.py:3911
+#: ../src/chat_control.py:1523
+#: ../src/dialogs.py:3911
msgid "No GPG key assigned"
msgstr "Ключ GPG не присвоен"
-#: ../src/chat_control.py:1601
-msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
-msgstr ""
-"Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
-"сообщения с помощью GPG."
+#: ../src/chat_control.py:1524
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
+msgstr "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать сообщения с помощью GPG."
-#: ../src/chat_control.py:1610
+#: ../src/chat_control.py:1533
msgid "GPG encryption disabled"
msgstr "GPG шифрование выключено"
-#: ../src/chat_control.py:1635
+#: ../src/chat_control.py:1558
msgid "Session WILL be logged"
msgstr "Для сеанса БУДЕТ сохранена история сообщений"
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1560
msgid "Session WILL NOT be logged"
msgstr "Для сеанса НЕ БУДЕТ сохранена история сообщений"
#. encryption %s active
-#: ../src/chat_control.py:1651
+#: ../src/chat_control.py:1574
msgid "is"
msgstr "было"
-#: ../src/chat_control.py:1651
+#: ../src/chat_control.py:1574
msgid "is NOT"
msgstr "НЕ"
#. chat session %s be logged
-#: ../src/chat_control.py:1653
+#: ../src/chat_control.py:1576
msgid "will"
msgstr "будет"
-#: ../src/chat_control.py:1653
+#: ../src/chat_control.py:1576
msgid "will NOT"
msgstr "НЕ будет"
#. About encrypted chat session
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1580
msgid "and authenticated"
msgstr "и заверено"
#. About encrypted chat session
-#: ../src/chat_control.py:1661
+#: ../src/chat_control.py:1584
msgid "and NOT authenticated"
msgstr "и НЕ заверено"
#. 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:1667
+#: ../src/chat_control.py:1590
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3108,117 +2962,109 @@
"%(type)s шифрование %(status)s включено %(authenticated)s.\n"
"Для сеанса %(logged)s сохранена история сообщений."
-#: ../src/chat_control.py:1715
+#: ../src/chat_control.py:1638
msgid "Command not supported for zeroconf account."
msgstr "Команда не поддерживается учетной записью zeroconf."
-#: ../src/chat_control.py:1726 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1649
+#: ../src/groupchat_control.py:1653
#, python-format
msgid "Commands: %s"
msgstr "Команды: %s"
-#: ../src/chat_control.py:1729 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1652
+#: ../src/groupchat_control.py:1667
#, python-format
msgid "Usage: /%s, clears the text window."
msgstr "Использование: /%s, очищает текстовое окно."
-#: ../src/chat_control.py:1732 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1655
+#: ../src/groupchat_control.py:1672
#, python-format
msgid "Usage: /%s, hide the chat buttons."
msgstr "Использование: /%s, скрывает кнопки беседы."
-#: ../src/chat_control.py:1735 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1658
+#: ../src/groupchat_control.py:1688
#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Использование: /%(command)s <действие>, совершает действие в текущей "
-"комнате. Используйте третье лицо (например, «/%(command)s взрывается».)"
+msgid "Usage: /%(command)s <action>, sends action to the current group chat. Use third person. (e.g. /%(command)s explodes.)"
+msgstr "Использование: /%(command)s <действие>, совершает действие в текущей комнате. Используйте третье лицо (например, «/%(command)s взрывается».)"
-#: ../src/chat_control.py:1740
+#: ../src/chat_control.py:1663
#, python-format
msgid "Usage: /%s, sends a ping to the contact"
msgstr "Использование: /%s, посылает пинг контакту"
-#: ../src/chat_control.py:1743
+#: ../src/chat_control.py:1666
#, python-format
msgid "Usage: /%s, send the message to the contact"
msgstr "Использование: /%s, посылает сообщение контакту"
-#: ../src/chat_control.py:1746 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1669
+#: ../src/groupchat_control.py:1711
#, python-format
msgid "No help info for /%s"
msgstr "Нет подсказки для /%s"
-#: ../src/chat_control.py:1878
+#: ../src/chat_control.py:1800
msgid "Session negotiation cancelled"
msgstr "Установление сеанса отменено"
-#: ../src/chat_control.py:1885
+#: ../src/chat_control.py:1807
msgid "This session is encrypted"
msgstr "Сеанс зашифрован"
-#: ../src/chat_control.py:1888
+#: ../src/chat_control.py:1810
msgid " and WILL be logged"
msgstr " и БУДЕТ сохранена история сообщений"
-#: ../src/chat_control.py:1890
+#: ../src/chat_control.py:1812
msgid " and WILL NOT be logged"
msgstr " и НЕ БУДЕТ сохранена история сообщений"
-#: ../src/chat_control.py:1895
-msgid ""
-"Remote contact's identity not verified. Click the shield button for more "
-"details."
-msgstr ""
-"Личность удаленного контакта не подтверждена. Нажмите на кнопке со щитом для "
-"подробностей."
+#: ../src/chat_control.py:1817
+msgid "Remote contact's identity not verified. Click the shield button for more details."
+msgstr "Личность удаленного контакта не подтверждена. Нажмите на кнопке со щитом для подробностей."
-#: ../src/chat_control.py:1897
+#: ../src/chat_control.py:1819
msgid "E2E encryption disabled"
msgstr "E2E шифрование выключено"
-#: ../src/chat_control.py:1926 ../src/chat_control.py:1939
+#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1861
msgid "The following message was NOT encrypted"
msgstr "Последнее сообщение НЕ БЫЛО зашифровано"
-#: ../src/chat_control.py:1932
+#: ../src/chat_control.py:1854
msgid "The following message was encrypted"
msgstr "Последнее сообщение зашифровано"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2365
+#: ../src/chat_control.py:2225
#, python-format
msgid "You just received a new message from \"%s\""
msgstr "Получено новое сообщение от «%s»"
-#: ../src/chat_control.py:2366
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Если вы закроете эту вкладку и у вас отключена функция ведения истории "
-"сообщений, то это сообщение будет утеряно."
+#: ../src/chat_control.py:2226
+msgid "If you close this tab and you have history disabled, this message will be lost."
+msgstr "Если вы закроете эту вкладку и у вас отключена функция ведения истории сообщений, то это сообщение будет утеряно."
-#: ../src/chat_control.py:2515 ../src/common/connection_handlers.py:1847
+#: ../src/chat_control.py:2376
+#: ../src/common/connection_handlers.py:1847
#: ../src/common/connection_handlers.py:1893
#: ../src/common/connection_handlers.py:2081
-#: ../src/common/connection_handlers.py:2207 ../src/common/connection.py:1222
-#: ../src/gajim.py:174
+#: ../src/common/connection_handlers.py:2207
+#: ../src/common/connection.py:1222
+#: ../src/gajim.py:170
msgid "Database Error"
msgstr "Ошибка базы данных"
-#: ../src/chat_control.py:2516
+#: ../src/chat_control.py:2377
#, python-format
-msgid ""
-"The database file (%s) cannot be read. Try to repair it or remove it (all "
-"history will be lost)."
-msgstr ""
-"Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его "
-"или удалить (вся история будет утеряна)."
+msgid "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:2763
+#: ../src/chat_control.py:2608
#, python-format
msgid "%(name)s is now %(status)s"
msgstr "%(name)s теперь %(status)s"
@@ -3227,14 +3073,17 @@
msgid "creating logs database"
msgstr "создается БД истории"
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:110
+#: ../src/common/check_paths.py:121
#: ../src/common/check_paths.py:128
#, python-format
msgid "%s is a file but it should be a directory"
msgstr "%s должен быть директорией, а не файлом"
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../src/common/check_paths.py:111
+#: ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129
+#: ../src/common/check_paths.py:137
msgid "Gajim will now exit"
msgstr "Закончить работу"
@@ -3288,7 +3137,8 @@
msgid "The status has been changed."
msgstr "Статус изменён."
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:177
+#: ../src/common/commands.py:201
msgid "Leave Groupchats"
msgstr "Покинуть конференции"
@@ -3306,9 +3156,12 @@
msgstr "Выберите конференции, которые вы хотите покинуть"
#. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/common/commands.py:206
+#: ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73
+#: ../src/roster_window.py:788
+#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1548
#: ../src/roster_window.py:5034
msgid "Groupchats"
msgstr "Комнаты"
@@ -3354,23 +3207,22 @@
msgstr "$S будет замещён текущим статус-сообщением, $T — временем простоя."
#: ../src/common/config.py:111
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr ""
-"Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
+msgid "List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr "Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
#. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3125
+#: ../src/common/config.py:112
+#: ../src/common/config.py:448
+#: ../src/common/optparser.py:215
+#: ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467
+#: ../src/gajim.py:3114
msgid "default"
msgstr "По_умолчанию"
#: ../src/common/config.py:116
msgid "Enable link-local/zeroconf messaging"
-msgstr ""
-"Приём и отправка локальных (link-local) сообщений и сообщений в сетях "
-"zeroconf"
+msgstr "Приём и отправка локальных (link-local) сообщений и сообщений в сетях zeroconf"
#: ../src/common/config.py:119
msgid "Language used by speller"
@@ -3387,63 +3239,32 @@
"«never» — не печатать время."
#: ../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. "
-"This is used only if print_time is 'sometimes'."
-msgstr ""
-"Печатать время в беседе как в неточных часах. Степень неточности может быть "
-"от 1 до 4, 0 отключает эту функцию. 1 самые точные часы, 4 самые неточные. "
-"Используется только если режим печати времени установлен на "
-"«sometimes» (иногда)."
+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. This is used only if print_time is 'sometimes'."
+msgstr "Печатать время в беседе как в неточных часах. Степень неточности может быть от 1 до 4, 0 отключает эту функцию. 1 самые точные часы, 4 самые неточные. Используется только если режим печати времени установлен на «sometimes» (иногда)."
#: ../src/common/config.py:124
msgid "Treat * / _ pairs as possible formatting characters."
msgstr "Обрабатывать пары * / _ как возможные форматирующие символы."
#: ../src/common/config.py:125
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Если True, то не будут удаляться */_. Так что *фыва* будет написано "
-"полужирным шрифтом, но * * удалены не будут"
+msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr "Если True, то не будут удаляться */_. Так что *фыва* будет написано полужирным шрифтом, но * * удалены не будут"
#: ../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/"
-"restructuredtext.html (If you want to use this, install docutils)"
-msgstr ""
-"Использовать разметку ReStructuredText для отправки HTML, плюс ascii "
-"форматирование, если оно выбрано. Синтаксис описан на http://docutils."
-"sourceforge.net/docs/ref/rst/restructuredtext.htm (Если вы хотите "
-"воспользоваться этой опцией, установите docutils)"
+msgid "Uses ReStructured text markup to send HTML, plus ascii formatting if selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (If you want to use this, install docutils)"
+msgstr "Использовать разметку ReStructuredText для отправки HTML, плюс ascii форматирование, если оно выбрано. Синтаксис описан на http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.htm (Если вы хотите воспользоваться этой опцией, установите docutils)"
#: ../src/common/config.py:137
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Символ, который нужно добавлять к нику, когда используется дополнение (tab) "
-"в комнате."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Символ, который нужно добавлять к нику, когда используется дополнение (tab) в комнате."
#: ../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."
-msgstr ""
-"Символ, который будет добавляться после ника, когда желаемый ник уже занят "
-"кем-нибудь в комнате."
+msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
+msgstr "Символ, который будет добавляться после ника, когда желаемый ник уже занят кем-нибудь в комнате."
#: ../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 "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
-msgstr ""
-"Эта опция позволяет настроить отпечаток времени, который печатается в чатах. "
-"К примеру «[%H:%M]» будет показано как «[чч:мм]». Смотрите дополнительно "
-"документацию python к strftime (http://docs.python.org/lib/module-time.html)"
+msgid "This option let you customize timestamp that is printed in conversation. For exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr "Эта опция позволяет настроить отпечаток времени, который печатается в чатах. К примеру «[%H:%M]» будет показано как «[чч:мм]». Смотрите дополнительно документацию python к strftime (http://docs.python.org/lib/module-time.html)"
#: ../src/common/config.py:162
msgid "Characters that are printed before the nickname in conversations"
@@ -3458,24 +3279,16 @@
msgstr "Добавлять * и [n] в окно ростера?"
#: ../src/common/config.py:169
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются "
-"вновь."
+msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
+msgstr "Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются вновь."
#: ../src/common/config.py:170
msgid "How many minutes should last lines from previous conversation last."
msgstr "Сколько минут должны оставаться последние строки из предыдущей беседы."
#: ../src/common/config.py:171
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в "
-"Mirabilis ICQ)"
+msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
+msgstr "Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в Mirabilis ICQ)"
#: ../src/common/config.py:173
msgid "How many lines to store for Ctrl+KeyUP."
@@ -3483,83 +3296,44 @@
#: ../src/common/config.py:176
#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"Введите свою ссылку с %s, в которой %s подменяет слово/фразу, или "
-"«WIKTIONARY», чтобы использовать Викисловарь."
+msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
+msgstr "Введите свою ссылку с %s, в которой %s подменяет слово/фразу, или «WIKTIONARY», чтобы использовать Викисловарь."
#: ../src/common/config.py:179
msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr ""
-"Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием "
-"gajim-remote."
+msgstr "Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием gajim-remote."
#: ../src/common/config.py:180
-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 "
-"False and they sync with global status) based upon the status of the network "
-"connection."
-msgstr ""
-"Если True, тогда «слушать» сообщения от NetworkManager по D-Bus и изменять "
-"статус учетных записей в зависимости от состояния сетевого соединения "
-"(необходимо, чтобы учетные записи не имели установленной в False опции "
-"listen_to_network_manager и они должны синхронизировать свой статус с "
-"глобальным)"
+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 False and they sync with global status) based upon the status of the network connection."
+msgstr "Если True, тогда «слушать» сообщения от NetworkManager по D-Bus и изменять статус учетных записей в зависимости от состояния сетевого соединения (необходимо, чтобы учетные записи не имели установленной в False опции listen_to_network_manager и они должны синхронизировать свой статус с глобальным)"
#: ../src/common/config.py:181
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-"Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only "
-"(только печать), disabled (никаких уведомлений)."
+msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr "Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only (только печать), disabled (никаких уведомлений)."
#: ../src/common/config.py:182
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-"Отображать состояния беседы в окне беседы. Варианты: all (все), "
-"composing_only (только печать), disabled (никаких уведомлений)."
+msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
+msgstr "Отображать состояния беседы в окне беседы. Варианты: all (все), composing_only (только печать), disabled (никаких уведомлений)."
#: ../src/common/config.py:184
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-"Если отключена печать времени для каждого сообщения, то печатать его каждые "
-"X минут."
+msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
+msgstr "Если отключена печать времени для каждого сообщения, то печатать его каждые X минут."
#: ../src/common/config.py:185
msgid "Ask before closing a group chat tab/window."
msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
#: ../src/common/config.py:186
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Всегда спрашивать перед закрытием окна/вкладки комнаты из этого списка. "
-"Комнаты в списке разделяются пробелом."
+msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
+msgstr "Всегда спрашивать перед закрытием окна/вкладки комнаты из этого списка. Комнаты в списке разделяются пробелом."
#: ../src/common/config.py:187
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Никогда не спрашивать перед закрытием окна/вкладки комнаты из этого списка. "
-"Комнаты в списке разделяются пробелом."
+msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
+msgstr "Никогда не спрашивать перед закрытием окна/вкладки комнаты из этого списка. Комнаты в списке разделяются пробелом."
#: ../src/common/config.py:190
-msgid ""
-"Comma separated list of hosts that we send, in addition of local interfaces, "
-"for File Transfer in case of address translation/port forwarding."
-msgstr ""
-"Разделенный запятыми список хостов, который мы отсылаем в дополнение к "
-"локальным интерфейсам при передаче файлов в случае, если мы за NAT или "
-"используется перенаправление портов."
+msgid "Comma separated list of hosts that we send, in addition of local interfaces, for File Transfer in case of address translation/port forwarding."
+msgstr "Разделенный запятыми список хостов, который мы отсылаем в дополнение к локальным интерфейсам при передаче файлов в случае, если мы за NAT или используется перенаправление портов."
#: ../src/common/config.py:192
msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
@@ -3582,100 +3356,52 @@
msgstr "Показывать кнопку закрытия на вкладке?"
#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Когда устанавливается зашифрованный сеанс, должен ли Gajim предположить, что "
-"вы хотите сохранить историю сообщений?"
+msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
+msgstr "Когда устанавливается зашифрованный сеанс, должен ли Gajim предположить, что вы хотите сохранить историю сообщений?"
#: ../src/common/config.py:204
-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 "
-"numbers are more secure, but take longer to calculate when you start a "
-"session."
-msgstr ""
-"Список modp групп (через запятую) для использования в алгоритме Диффи-"
-"Хеллмана, начиная с наиболее предпочтительной. Допустимые группы: 1, 2, 5, "
-"14, 15, 16, 17 и 18. Более высокие числа безопаснее, но требуют более "
-"длительных вычислений при начале сеанса."
+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 numbers are more secure, but take longer to calculate when you start a session."
+msgstr "Список modp групп (через запятую) для использования в алгоритме Диффи-Хеллмана, начиная с наиболее предпочтительной. Допустимые группы: 1, 2, 5, 14, 15, 16, 17 и 18. Более высокие числа безопаснее, но требуют более длительных вычислений при начале сеанса."
#: ../src/common/config.py:213
msgid "Preview new messages in notification popup?"
msgstr "Предпросмотр новых сообщений во всплывающем окне?"
#: ../src/common/config.py:218
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"Список слов (через точку с запятой), которые будут подсвечиваться в комнатах."
+msgid "A semicolon-separated list of words that will be highlighted in group chats."
+msgstr "Список слов (через точку с запятой), которые будут подсвечиваться в комнатах."
#: ../src/common/config.py:219
-msgid ""
-"If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
-msgstr ""
-"Если True, то Gajim будет завершаться при нажатии на кнопку закрытия окна. "
-"Эта опция учитывается, только если используется иконка для трея."
+msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used."
+msgstr "Если True, то Gajim будет завершаться при нажатии на кнопку закрытия окна. Эта опция учитывается, только если используется иконка для трея."
#: ../src/common/config.py:220
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr ""
-"Если True, то Gajim будет проверять при запуске, является ли он jabber-"
-"клиентом по умолчанию."
+msgid "If True, Gajim will check if it's the default jabber client on each startup."
+msgstr "Если True, то Gajim будет проверять при запуске, является ли он jabber-клиентом по умолчанию."
#: ../src/common/config.py:221
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Если True, то Gajim иконку на каждой вкладке, которая содержит непрочитанные "
-"сообщения. В зависимости от темы, она может быть анимированной."
+msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
+msgstr "Если True, то Gajim иконку на каждой вкладке, которая содержит непрочитанные сообщения. В зависимости от темы, она может быть анимированной."
#: ../src/common/config.py:222
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-msgstr ""
-"Если True, то Gajim будет отображать сообщение о статусе, если оно не "
-"пустое, для каждого контакта под именем контакта в окне ростера"
+msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
+msgstr "Если True, то Gajim будет отображать сообщение о статусе, если оно не пустое, для каждого контакта под именем контакта в окне ростера"
#: ../src/common/config.py:227
msgid "Define the position of the avatar in roster. Can be left or right"
msgstr "Определяет позицию аватар в ростере. Может быть left или right"
#: ../src/common/config.py:228
-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."
-msgstr ""
-"Если True, то Gajim будет запрашивать аватару для каждого контакта, у "
-"которого её не было в последний раз или она уже слишком старая."
+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."
+msgstr "Если True, то Gajim будет запрашивать аватару для каждого контакта, у которого её не было в последний раз или она уже слишком старая."
#: ../src/common/config.py:229
-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."
-msgstr ""
-"Если отключено, то Gajim больше не будет показывать статусную строку в окне "
-"беседы, когда контакт меняет его или её статус и/или сообщение о статусе."
+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."
+msgstr "Если отключено, то Gajim больше не будет показывать статусную строку в окне беседы, когда контакт меняет его или её статус и/или сообщение о статусе."
#: ../src/common/config.py:230
-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 "
-"status and/or his or her status message. If \"all\" Gajim will print all "
-"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
-"group chat."
-msgstr ""
-"может быть «none», «all» или «in_and_out». Если установлено «none», то Gajim "
-"больше не будет выводить сообщения о статусе в комнатах, когда участник "
-"меняет свой статус или сообщение о статусе. Если установлено в «all», то "
-"Gajim будет выводить все сообщения о статусе. Если установлено в "
-"«in_and_out», то Gajim будет выводить сообщение только когда кто-то входит "
-"или выходит из комнаты."
+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 status and/or his or her status message. If \"all\" Gajim will print all status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves group chat."
+msgstr "может быть «none», «all» или «in_and_out». Если установлено «none», то Gajim больше не будет выводить сообщения о статусе в комнатах, когда участник меняет свой статус или сообщение о статусе. Если установлено в «all», то Gajim будет выводить все сообщения о статусе. Если установлено в «in_and_out», то Gajim будет выводить сообщение только когда кто-то входит или выходит из комнаты."
#: ../src/common/config.py:232
msgid "Background color of contacts when they just signed in."
@@ -3686,10 +3412,8 @@
msgstr "Фоновый цвет контакта, который только что вышел."
#: ../src/common/config.py:235
-msgid ""
-"If True, restored messages will use a smaller font than the default one."
-msgstr ""
-"Если установлено, то восстановленные сообщения будут иметь меньший шрифт."
+msgid "If True, restored messages will use a smaller font than the default one."
+msgstr "Если установлено, то восстановленные сообщения будут иметь меньший шрифт."
#: ../src/common/config.py:236
msgid "Don't show avatar for the transport itself."
@@ -3700,45 +3424,29 @@
msgstr "Не показывать ростер в панели задач."
#: ../src/common/config.py:238
-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 "
-"pending events."
-msgstr ""
-"Если True и установлены GTK+ и PyGTK версий 2.8 и выше, то окно будет мигать "
-"(поведение по умолчанию для большинства менеджеров окон) когда присутствуют "
-"не просмотренные события."
+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 pending events."
+msgstr "Если True и установлены GTK+ и PyGTK версий 2.8 и выше, то окно будет мигать (поведение по умолчанию для большинства менеджеров окон) когда присутствуют не просмотренные события."
#: ../src/common/config.py:240
-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 "
-"presences."
-msgstr ""
-"Jabberd1.4 не понимает sha данные при входе в комнату, защищенную паролем. "
-"Установите эту опцию в False для того, чтобы запретить отсылку sha данных в "
-"информации для комнат"
+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 presences."
+msgstr "Jabberd1.4 не понимает sha данные при входе в комнату, защищенную паролем. Установите эту опцию в False для того, чтобы запретить отсылку sha данных в информации для комнат"
#. always, never, peracct, pertype should not be translated
#: ../src/common/config.py:243
msgid ""
"Controls the window where new messages are placed.\n"
"'always' - All messages are sent to a single window.\n"
-"'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window along with the roster.\n"
"'never' - All messages get their own window.\n"
"'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
-"specific window."
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window."
msgstr ""
"Управляет окном, где помещаются новые сообщения.\n"
"«always» — Все сообщения отправляются в одно окно.\n"
"«always_with_roster» — Как «always» но сообщения в одном окне с ростером.\n"
"«never» — Все сообщения приходят в свои отдельные окна.\n"
"«peracct» — Сообщения для каждой учетной записи отсылаются в свои окна.\n"
-"«pertype» — Каждый тип сообщения (например, беседа или комната) отсылается в "
-"свое окно. Заметьте, что при изменении этого параметра требуется перезапуск "
-"Gajim, чтобы изменения вступили в силу."
+"«pertype» — Каждый тип сообщения (например, беседа или комната) отсылается в свое окно. Заметьте, что при изменении этого параметра требуется перезапуск Gajim, чтобы изменения вступили в силу."
#: ../src/common/config.py:244
msgid "If False, you will no longer see the avatar in the chat window."
@@ -3765,159 +3473,92 @@
msgstr "Скрывает список посетителей в окне комнаты."
#: ../src/common/config.py:250
-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."
-msgstr ""
-"Показывать ник в начале строки в чате только если предыдущее сообщение было "
-"написано другим участником."
+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."
+msgstr "Показывать ник в начале строки в чате только если предыдущее сообщение было написано другим участником."
#: ../src/common/config.py:251
msgid "Indentation when using merge consecutive nickname."
-msgstr ""
-"Разделитель, используемый при активированной настройке "
-"chat_merge_consecutive_nickname."
+msgstr "Разделитель, используемый при активированной настройке chat_merge_consecutive_nickname."
#: ../src/common/config.py:252
msgid "Smooth scroll message in conversation window"
msgstr "Плавно прокручивать сообщения в окне чата"
#: ../src/common/config.py:253
-msgid ""
-"List of colors, separated by \":\", that will be used to color nicknames in "
-"group chats."
-msgstr ""
-"Список цветов, разделенных «:» которые будут использоваться для раскраски "
-"ников в комнатах."
+msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
+msgstr "Список цветов, разделенных «:» которые будут использоваться для раскраски ников в комнатах."
#: ../src/common/config.py:254
msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr ""
-"Использовать Ctrl-Tab, чтобы перейти к следующей вкладке с составляемым "
-"сообщением, когда нет непрочитанных сообщений."
+msgstr "Использовать Ctrl-Tab, чтобы перейти к следующей вкладке с составляемым сообщением, когда нет непрочитанных сообщений."
#: ../src/common/config.py:255
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr ""
-"Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая "
-"строка означает, что сообщение не будет показываться вообще."
+msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
+msgstr "Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая строка означает, что сообщение не будет показываться вообще."
#: ../src/common/config.py:256
-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 "
-"negative priority, you will NOT receive any message from your server."
-msgstr ""
-"Если установлено, то у вас появится возможность назначить для учетной записи "
-"приоритет меньше нуля в окне настройки учетной записи. БУДЬТЕ ОСТОРОЖНЫ, "
-"если вы подключитесь с отрицательным приоритетом, то вы НЕ получите никаких "
-"сообщений от сервера."
+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 negative priority, you will NOT receive any message from your server."
+msgstr "Если установлено, то у вас появится возможность назначить для учетной записи приоритет меньше нуля в окне настройки учетной записи. БУДЬТЕ ОСТОРОЖНЫ, если вы подключитесь с отрицательным приоритетом, то вы НЕ получите никаких сообщений от сервера."
#: ../src/common/config.py:257
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr ""
-"Если активно, Gajim будет использовать (если возможно) Gnome Keyring для "
-"хранения паролей учетных записей."
+msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
+msgstr "Если активно, Gajim будет использовать (если возможно) Gnome Keyring для хранения паролей учетных записей."
#: ../src/common/config.py:258
-msgid ""
-"If True, Gajim will show number of online and total contacts in account and "
-"group rows."
-msgstr ""
-"Если активно, Gajim будет показывать количество контактов онлайн/всего в "
-"строках с названием учетной записи и групп."
+msgid "If True, Gajim will show number of online and total contacts in account and group rows."
+msgstr "Если активно, Gajim будет показывать количество контактов онлайн/всего в строках с названием учетной записи и групп."
#: ../src/common/config.py:259
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
-msgstr ""
-"Может быть пусто, 'chat' или 'normal'. Если не пусто — обрабатывать все "
-"входящие сообщения так, как будто бы они были этого типа."
+msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
+msgstr "Может быть пусто, 'chat' или 'normal'. Если не пусто — обрабатывать все входящие сообщения так, как будто бы они были этого типа."
#: ../src/common/config.py:260
-msgid ""
-"If True, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
-msgstr ""
-"Если активно, Gajim прокрутит ростер и выделит контакт, который написал вам "
-"сообщение последним, если окно чата еще небыло открыто."
+msgid "If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened."
+msgstr "Если активно, Gajim прокрутит ростер и выделит контакт, который написал вам сообщение последним, если окно чата еще небыло открыто."
#: ../src/common/config.py:261
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"Если активно, Gajim будет конвертировать строку между $$ и $$ в изображение, "
-"используя dvips и конвертировать до вставки его в окно чата."
+msgid "If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window."
+msgstr "Если активно, Gajim будет конвертировать строку между $$ и $$ в изображение, используя dvips и конвертировать до вставки его в окно чата."
#: ../src/common/config.py:262
msgid "Time of inactivity needed before the change status window closes down."
msgstr "Время не активности прежде чем окно изменения статуса закроется."
#: ../src/common/config.py:263
-msgid ""
-"Maximum number of lines that are printed in conversations. Oldest lines are "
-"cleared."
+msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
msgstr "Максимальное количество строк в окне. Старые строки будут удалены."
#: ../src/common/config.py:264
-msgid ""
-"If True, notification windows from notification-daemon will be attached to "
-"systray icon."
-msgstr ""
-"Если активно, окно уведомления от notification-daemon будет прикреплено к "
-"системному трею."
+msgid "If True, notification windows from notification-daemon will be attached to systray icon."
+msgstr "Если активно, окно уведомления от notification-daemon будет прикреплено к системному трею."
#: ../src/common/config.py:265
msgid "Choose interval between 2 checks of idleness."
msgstr "Выберите интервал между 2 проверками на бездействие."
#: ../src/common/config.py:266
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
+msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
msgstr "Измените значение для изменения размера отображаемых формул LaTeX."
#: ../src/common/config.py:267
-#, fuzzy
-msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
-msgstr ""
-"Допустимые uri схемы. Только схемы из этого списка будут приняты как «real» "
-"uri.(mailto и xmpp обрабатываются отдельно)"
+msgid "Valid uri schemes. Only schemes in this list will be made accepted as \"real\" uri."
+msgstr "Допустимые uri схемы. Только схемы из этого списка будут приняты как «real» uri."
#: ../src/common/config.py:278
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
-"Приоритет будет изменяться автоматически согласно вашему статусу. Приоритеты "
-"для статусов задаются в пункте autopriority_* ."
+msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
+msgstr "Приоритет будет изменяться автоматически согласно вашему статусу. Приоритеты для статусов задаются в пункте autopriority_* ."
#: ../src/common/config.py:286
-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"
-msgstr ""
-"Статус, используемый при автоподключении. Варианты: отключен, в сети, готов "
-"поболтать, отошел, недоступен, не беспокоить, невидимка"
+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"
+msgstr "Статус, используемый при автоподключении. Варианты: отключен, в сети, готов поболтать, отошел, недоступен, не беспокоить, невидимка"
#: ../src/common/config.py:287
msgid "If enabled, restore the last status that was used."
msgstr "Если включено, восстанавливать последний использованный статус."
#: ../src/common/config.py:292
-msgid ""
-"If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr ""
-"Если отключено, не подписывать присутствие GPG ключом, даже если GPG "
-"настроен."
+msgid "If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr "Если отключено, не подписывать присутствие GPG ключом, даже если GPG настроен."
#: ../src/common/config.py:294
msgid "Enable ESessions encryption for this account."
@@ -3925,23 +3566,15 @@
#: ../src/common/config.py:295
msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr ""
-"Должен ли Gajim по возможности автоматически начинать зашифрованный сеанс?"
+msgstr "Должен ли Gajim по возможности автоматически начинать зашифрованный сеанс?"
#: ../src/common/config.py:296
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
-msgstr ""
-"Упорядоченный список (разделённый пробелами) типов подключения, которые "
-"будут перепробованы. Может включать tls, ssl или plain"
+msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
+msgstr "Упорядоченный список (разделённый пробелами) типов подключения, которые будут перепробованы. Может включать tls, ssl или plain"
#: ../src/common/config.py:297
-msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
-msgstr ""
-"Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
-"через незащищенное соединение."
+msgid "Show a warning dialog before sending password on an plaintext connection."
+msgstr "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля через незащищенное соединение."
#: ../src/common/config.py:298
msgid "Show a warning dialog before using standard SSL library."
@@ -3952,12 +3585,8 @@
msgstr "Разделенный пробелами список игнорирования ошибок ssl"
#: ../src/common/config.py:312
-msgid ""
-"How many seconds to wait for the answer of keepalive packet before we try to "
-"reconnect."
-msgstr ""
-"Время ожидания (в секундах) ответа на «keepalive packet» перед повторной "
-"попыткой соединения."
+msgid "How many seconds to wait for the answer of keepalive packet before we try to reconnect."
+msgstr "Время ожидания (в секундах) ответа на «keepalive packet» перед повторной попыткой соединения."
#. yes, no, ask
#: ../src/common/config.py:316
@@ -3965,12 +3594,8 @@
msgstr "Костыль для jabberd2"
#: ../src/common/config.py:320
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-msgstr ""
-"Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
-"параметре file_transfer_proxies для передачи файлов"
+msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
+msgstr "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в параметре file_transfer_proxies для передачи файлов"
#: ../src/common/config.py:334
msgid "Answer to receipt requests"
@@ -3985,14 +3610,11 @@
msgstr "Используется ли для этого контакта OpenPGP"
#: ../src/common/config.py:390
-msgid ""
-"Should Gajim automatically start an encrypted session with this contact when "
-"possible?"
-msgstr ""
-"Должен ли Gajim по возможности автоматически начинать для данного контакта "
-"зашифрованный сеанс?"
+msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
+msgstr "Должен ли Gajim по возможности автоматически начинать для данного контакта зашифрованный сеанс?"
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:391
+#: ../src/common/config.py:394
msgid "Language for which we want to check misspelled words"
msgstr "Язык, который используется при проверке правописания"
@@ -4004,13 +3626,16 @@
msgid "'yes', 'no', or 'both'"
msgstr "«yes» (да), «no» (нет) или «both» (оба)"
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../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
msgid "'yes', 'no' or ''"
msgstr "«yes» (да), «no» (нет) или «» (пусто)"
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:415
+#: ../src/common/pep.py:159
msgid "Sleeping"
msgstr "Сплю"
@@ -4022,7 +3647,8 @@
msgid "Back in some minutes."
msgstr "Вернусь через несколько минут"
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:417
+#: ../src/common/pep.py:129
msgid "Eating"
msgstr "Ем"
@@ -4038,7 +3664,8 @@
msgid "I'm watching a movie."
msgstr "Смотрю кино"
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:419
+#: ../src/common/pep.py:188
msgid "Working"
msgstr "Работаю"
@@ -4070,7 +3697,8 @@
msgid "I'm free for chat."
msgstr "Я готов поболтать."
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:427
+#: ../src/config.py:1397
msgid "Be right back."
msgstr "Скоро буду."
@@ -4082,28 +3710,26 @@
msgid "Do not disturb."
msgstr "Не беспокоить."
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:430
+#: ../src/common/config.py:431
msgid "Bye!"
msgstr "Пока!"
#: ../src/common/config.py:441
-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."
-msgstr ""
-"Звук, который нужно воспроизвести, когда в MUC появляется сообщение, которое "
-"содержит слово из списка muc_highlight_words, или когда сообщение содержит "
-"ваш ник."
+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."
+msgstr "Звук, который нужно воспроизвести, когда в MUC появляется сообщение, которое содержит слово из списка muc_highlight_words, или когда сообщение содержит ваш ник."
#: ../src/common/config.py:442
msgid "Sound to play when any MUC message arrives."
msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC."
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:451
+#: ../src/common/optparser.py:229
msgid "green"
msgstr "зеленый"
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:455
+#: ../src/common/optparser.py:215
msgid "grocery"
msgstr "овощной"
@@ -4138,16 +3764,19 @@
#: ../src/common/connection_handlers.py:1845
#: ../src/common/connection_handlers.py:1891
#: ../src/common/connection_handlers.py:2079
-#: ../src/common/connection_handlers.py:2205 ../src/common/connection.py:1220
-#: ../src/gajim.py:396
+#: ../src/common/connection_handlers.py:2205
+#: ../src/common/connection.py:1220
+#: ../src/gajim.py:392
msgid "Disk Write Error"
msgstr "Ошибка записи на диск"
-#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1137
+#: ../src/common/connection.py:848
msgid "Invisibility not supported"
msgstr "Невидимость не поддерживается"
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1138
+#: ../src/common/connection.py:849
#, python-format
msgid "Account %s doesn't support invisibility."
msgstr "Учетная запись %s не поддерживает невидимость."
@@ -4155,16 +3784,12 @@
#: ../src/common/connection_handlers.py:1848
#: ../src/common/connection_handlers.py:1894
#: ../src/common/connection_handlers.py:2082
-#: ../src/common/connection_handlers.py:2208 ../src/common/connection.py:1223
-#: ../src/gajim.py:175
+#: ../src/common/connection_handlers.py:2208
+#: ../src/common/connection.py:1223
+#: ../src/gajim.py:171
#, python-format
-msgid ""
-"The database file (%s) cannot be read. Try to repair it (see http://trac."
-"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
-msgstr ""
-"Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его"
-"(см. http://trac.gajim.org/wiki/DatabaseBackup) или удалить (вся история "
-"будет утеряна)."
+msgid "The database file (%s) cannot be read. Try to repair it (see http://trac.gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr "Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его(см. http://trac.gajim.org/wiki/DatabaseBackup) или удалить (вся история будет утеряна)."
#: ../src/common/connection_handlers.py:1966
#, python-format
@@ -4178,7 +3803,8 @@
#: ../src/common/connection_handlers.py:2044
#: ../src/common/connection_handlers.py:2047
#: ../src/common/connection_handlers.py:2050
-#: ../src/common/connection_handlers.py:2054 ../src/gajim.py:560
+#: ../src/common/connection_handlers.py:2054
+#: ../src/gajim.py:556
msgid "Unable to join group chat"
msgstr "Не получается войти в комнату"
@@ -4239,13 +3865,8 @@
#: ../src/common/connection_handlers.py:2331
#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s не соответствует RFC. Он не будет добавлен в ваш ростер. Используйте "
-"средство управления ростера, например http://jru.jabberstudio.org/, чтобы "
-"удалить его"
+msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr "JID %s не соответствует RFC. Он не будет добавлен в ваш ростер. Используйте средство управления ростера, например http://jru.jabberstudio.org/, чтобы удалить его"
#. We didn't set a passphrase
#: ../src/common/connection_handlers.py:2356
@@ -4256,7 +3877,8 @@
#. %s is the account name here
#: ../src/common/connection_handlers.py:2358
#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../src/roster_window.py:1931
+#: ../src/roster_window.py:1951
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "Вы будете подключены к %s без использования OpenPGP."
@@ -4428,23 +4050,27 @@
msgid "Connection to proxy failed"
msgstr "Соединение с прокси разорвалось"
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:610
+#: ../src/common/connection.py:711
#: ../src/common/connection.py:1355
#: ../src/common/zeroconf/connection_zeroconf.py:248
#, python-format
msgid "Could not connect to \"%s\""
msgstr "Не могу соединиться с «%s»"
-#: ../src/common/connection.py:611 ../src/gajim.py:1056
+#: ../src/common/connection.py:611
+#: ../src/gajim.py:1052
msgid "Check your connection or try again later."
msgstr "Проверьте настройки сети или попробуйте еще раз позже."
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:643
+#: ../src/common/connection.py:691
#, python-format
msgid "Could not connect to account %s"
msgstr "Не могу соединиться с %s"
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:644
+#: ../src/common/connection.py:692
#, python-format
msgid "Connection with account %s has been lost. Retry connecting."
msgstr "Связь с учетной записью %s была потеряна.Попытка подключения."
@@ -4491,12 +4117,8 @@
#: ../src/common/connection.py:801
#, python-format
-msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
-msgstr ""
-"Список доступа %s не может быть удален. Возможно, он используется одним из "
-"ваших активных ресурсов. Отключите ресурс и попробуйте снова."
+msgid "Privacy list %s has not been removed. It is maybe active in one of your connected resources. Deactivate it and try again."
+msgstr "Список доступа %s не может быть удален. Возможно, он используется одним из ваших активных ресурсов. Отключите ресурс и попробуйте снова."
#: ../src/common/connection.py:1094
#: ../src/common/zeroconf/connection_zeroconf.py:381
@@ -4529,15 +4151,23 @@
msgid "Not fetched because of invisible status"
msgstr "Нельзя получить из-за невидимости"
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92
+#: ../src/common/helpers.py:73
msgid "Observers"
msgstr "Наблюдатели"
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1350 ../src/gajim.py:806 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../src/common/contacts.py:96
+#: ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73
+#: ../src/disco.py:117
+#: ../src/disco.py:118
+#: ../src/disco.py:1348
+#: ../src/gajim.py:802
+#: ../src/roster_window.py:818
+#: ../src/roster_window.py:1471
+#: ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540
+#: ../src/roster_window.py:1677
msgid "Transports"
msgstr "Транспорты"
@@ -4564,9 +4194,7 @@
#: ../src/common/exceptions.py:55
msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Сервис недоступен: Gajim не запущен или отключена функция удаленного "
-"управления"
+msgstr "Сервис недоступен: Gajim не запущен или отключена функция удаленного управления"
#: ../src/common/exceptions.py:63
msgid "D-Bus is not present on this machine or python module is missing"
@@ -4630,55 +4258,68 @@
#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:55
msgid "$0 o'clock"
msgstr "%0"
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:55
msgid "five past $0"
msgstr "пять минут %1"
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:48
+#: ../src/common/fuzzyclock.py:56
msgid "ten past $0"
msgstr "десять минут %1"
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:48
+#: ../src/common/fuzzyclock.py:56
msgid "quarter past $0"
msgstr "четверть %1"
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:57
msgid "twenty past $0"
msgstr "двадцать минут %1"
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:57
msgid "twenty five past $0"
msgstr "двадцать пять минут %1"
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:58
msgid "half past $0"
msgstr "половина %1"
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:58
msgid "twenty five to $1"
msgstr "без двадцати пяти %1"
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:59
msgid "twenty to $1"
msgstr "без двадцати %1"
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:59
msgid "quarter to $1"
msgstr "без четверти %1"
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:52
+#: ../src/common/fuzzyclock.py:60
msgid "ten to $1"
msgstr "без десяти %1"
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:52
+#: ../src/common/fuzzyclock.py:60
msgid "five to $1"
msgstr "без пяти %1"
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+#: ../src/common/fuzzyclock.py:52
+#: ../src/common/fuzzyclock.py:61
msgid "$1 o'clock"
msgstr "%1"
@@ -4812,7 +4453,8 @@
msgid "_Available"
msgstr "_Доступен"
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:284
+#: ../src/features_window.py:121
msgid "Available"
msgstr "Доступен"
@@ -4929,7 +4571,8 @@
msgid "has closed the chat window or tab"
msgstr "закрыл окно чата или вкладку"
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#: ../src/common/helpers.py:992
+#: ../src/common/helpers.py:999
#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
@@ -4942,7 +4585,8 @@
msgid " from room %s"
msgstr " в комнате %s"
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1008
+#: ../src/common/helpers.py:1027
#, python-format
msgid " from user %s"
msgstr " от пользователя %s"
@@ -4952,7 +4596,8 @@
msgid " from %s"
msgstr " от %s"
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1017
+#: ../src/common/helpers.py:1024
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
@@ -4971,7 +4616,8 @@
msgid "error: cannot open %s for reading"
msgstr "ошибка: не могу открыть %s для чтения"
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:224
+#: ../src/common/optparser.py:225
msgid "cyan"
msgstr "синий"
@@ -5396,7 +5042,8 @@
msgid "Exercising"
msgstr "Занимаюсь спортом"
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:135
+#: ../src/common/pep.py:180
msgid "Cycling"
msgstr "На велосипеде"
@@ -5619,34 +5266,22 @@
msgstr "Не могу привязаться к порту %s."
#: ../src/common/socks5.py:85
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Возможно, запущен ещё один экземпляр Gajim. Передача файлов будет отменена."
+msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
+msgstr "Возможно, запущен ещё один экземпляр Gajim. Передача файлов будет отменена."
#. we're not english
#: ../src/common/stanza_session.py:278
-msgid ""
-"[This is part of an encrypted session. If you see this message, something "
-"went wrong.]"
-msgstr ""
-"[Это часть зашифрованного сообщения. Если вы видите это сообщение, возможно, "
-"произошла ошибка.]"
+msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
+msgstr "[Это часть зашифрованного сообщения. Если вы видите это сообщение, возможно, произошла ошибка.]"
#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
+msgid "Connection to host could not be established: Timeout while sending data."
msgstr "Не удалось соединиться с хостом: истекло время ожидания."
#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Хост %s, который настроен как ft_add_hosts_to_send, не действителен, поэтому "
-"игнорируется."
+msgid "The host %s you configured as the ft_add_hosts_to_send advanced option is not valid, so ignored."
+msgstr "Хост %s, который настроен как ft_add_hosts_to_send, не действителен, поэтому игнорируется."
#: ../src/common/zeroconf/connection_zeroconf.py:215
msgid "To continue sending and receiving messages, you will need to reconnect."
@@ -5691,11 +5326,8 @@
msgstr "Не могу изменить статус учётной записи «%s»"
#: ../src/common/zeroconf/connection_zeroconf.py:374
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Вы не подключены или невидимы для других. Ваше сообщение нельзя отправить."
+msgid "You are not connected or not visible to others. Your message could not be sent."
+msgstr "Вы не подключены или невидимы для других. Ваше сообщение нельзя отправить."
#. we're not english
#: ../src/common/zeroconf/connection_zeroconf.py:391
@@ -5717,7 +5349,8 @@
msgid "Error while adding service. %s"
msgstr "Ошибка при добавлении службы. %s"
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:150
+#: ../src/config.py:582
msgid "Disabled"
msgstr "Отключены"
@@ -5745,19 +5378,16 @@
msgid "Custom"
msgstr "Другое"
-#: ../src/config.py:650 ../src/dialogs.py:1200
+#: ../src/config.py:650
+#: ../src/dialogs.py:1200
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "Нет словаря для языка %s"
#: ../src/config.py:651
#, python-format
-msgid ""
-"You have to install %s dictionary to use spellchecking, or choose another "
-"language by setting the speller_language option."
-msgstr ""
-"Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
-"s или выберите другой язык, исправив настройку speller_language."
+msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
+msgstr "Чтобы воспользоваться проверкой правописания, установите словарь для языка %s или выберите другой язык, исправив настройку speller_language."
#: ../src/config.py:1016
msgid "status message title"
@@ -5804,8 +5434,12 @@
msgstr "Получено письмо на Gmail"
#. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1824 ../src/dialogs.py:1888
-#: ../src/disco.py:770 ../src/disco.py:1564 ../src/disco.py:1811
+#: ../src/config.py:1319
+#: ../src/dialogs.py:1824
+#: ../src/dialogs.py:1888
+#: ../src/disco.py:768
+#: ../src/disco.py:1562
+#: ../src/disco.py:1809
#: ../src/history_window.py:87
msgid "Name"
msgstr "Имя"
@@ -5816,16 +5450,15 @@
#: ../src/config.py:1406
msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-"Если вы хотите, чтобы изменения были применены немедленно, вы должны "
-"переподключиться."
+msgstr "Если вы хотите, чтобы изменения были применены немедленно, вы должны переподключиться."
-#: ../src/config.py:1531 ../src/config.py:1630
-#, fuzzy
+#: ../src/config.py:1531
+#: ../src/config.py:1630
msgid "OpenPGP is not usable in this computer"
msgstr "Невозможно использовать OpenPGP на этом компьютере"
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1666
+#: ../src/config.py:1709
msgid "Unread events"
msgstr "Непросмотренные события"
@@ -5852,21 +5485,18 @@
#: ../src/config.py:1710
msgid "To change the account name, you must read all pending events."
-msgstr ""
-"Для смены имени учетной записи необходимо просмотреть ожидающие события."
+msgstr "Для смены имени учетной записи необходимо просмотреть ожидающие события."
#: ../src/config.py:1716
msgid "Account Name Already Used"
msgstr "Такое имя учетной записи уже используется"
#: ../src/config.py:1717
-msgid ""
-"This name is already used by another of your accounts. Please choose another "
-"name."
-msgstr ""
-"Это имя уже используется в другой вашей учетной записи. Выберите другое."
+msgid "This name is already used by another of your accounts. Please choose another name."
+msgstr "Это имя уже используется в другой вашей учетной записи. Выберите другое."
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1721
+#: ../src/config.py:1725
msgid "Invalid account name"
msgstr "Неверное имя учетной записи"
@@ -5887,8 +5517,11 @@
msgid "Enter a new name for account %s"
msgstr "Введите новое название для учетной записи %s"
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
+#: ../src/config.py:1819
+#: ../src/config.py:1827
+#: ../src/config.py:1870
+#: ../src/config.py:3089
+#: ../src/dataforms_widget.py:536
msgid "Invalid Jabber ID"
msgstr "Неверный Jabber ID"
@@ -5896,11 +5529,13 @@
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "Jabber ID должен иметь формат «имя_пользователя@сервер»."
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2018
+#: ../src/config.py:3161
msgid "Invalid entry"
msgstr "Неверная запись"
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2019
+#: ../src/config.py:3162
msgid "Custom port must be a port number."
msgstr "В качестве номера порта должно выступать число"
@@ -5926,12 +5561,14 @@
#: ../src/config.py:2089
msgid "You must create your account before editing your personal information."
-msgstr ""
-"Перед редактированием личных данных необходимо сначала создать учетную "
-"запись."
+msgstr "Перед редактированием личных данных необходимо сначала создать учетную запись."
-#: ../src/config.py:2096 ../src/dialogs.py:1676 ../src/dialogs.py:1812
-#: ../src/dialogs.py:1991 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../src/config.py:2096
+#: ../src/dialogs.py:1676
+#: ../src/dialogs.py:1812
+#: ../src/dialogs.py:1991
+#: ../src/disco.py:439
+#: ../src/profile_window.py:320
msgid "You are not connected to the server"
msgstr "Вы не подключены к серверу"
@@ -5984,7 +5621,9 @@
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:777 ../src/history_manager.py:184
+#: ../src/config.py:2407
+#: ../src/disco.py:775
+#: ../src/history_manager.py:184
msgid "JID"
msgstr "JID"
@@ -6070,16 +5709,20 @@
msgid "Removing %s account"
msgstr "Удаление учетной записи %s"
-#: ../src/config.py:2580 ../src/gajim.py:1428 ../src/roster_window.py:1943
+#: ../src/config.py:2580
+#: ../src/gajim.py:1424
+#: ../src/roster_window.py:1943
msgid "Password Required"
msgstr "Требуется пароль"
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2581
+#: ../src/roster_window.py:1917
#, python-format
msgid "Enter your password for account %s"
msgstr "Введите пароль для учетной записи %s"
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2582
+#: ../src/roster_window.py:1944
msgid "Save password"
msgstr "Сохранить пароль"
@@ -6117,11 +5760,8 @@
msgstr "Эта закладка содержит неверные данные"
#: ../src/config.py:2792
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Удостоверьтесь, что заполнены поля с именем сервера и комнаты, либо удалите "
-"эту закладку."
+msgid "Please be sure to fill out server and room fields or remove this bookmark."
+msgstr "Удостоверьтесь, что заполнены поля с именем сервера и комнаты, либо удалите эту закладку."
#: ../src/config.py:3072
msgid "Invalid username"
@@ -6143,15 +5783,10 @@
msgid "Account has been added successfully"
msgstr "Учетная запись успешно добавлена"
-#: ../src/config.py:3119 ../src/config.py:3308
-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 "
-"window."
-msgstr ""
-"Вы можете установить расширенные настройки учетной записи нажатием кнопки "
-"«Дополнительно», или сделать это позже посредством пункта «Учетные записи» "
-"меню «Правка» в главном окне программы."
+#: ../src/config.py:3119
+#: ../src/config.py:3308
+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 window."
+msgstr "Вы можете установить расширенные настройки учетной записи нажатием кнопки «Дополнительно», или сделать это позже посредством пункта «Учетные записи» меню «Правка» в главном окне программы."
#: ../src/config.py:3137
msgid "Invalid server"
@@ -6161,11 +5796,13 @@
msgid "Please provide a server on which you want to register."
msgstr "Укажите сервер, на котором вы хотите зарегистрироваться."
-#: ../src/config.py:3189 ../src/gajim.py:2004
+#: ../src/config.py:3189
+#: ../src/gajim.py:1996
msgid "Certificate Already in File"
msgstr "Сертификат уже находится в файле"
-#: ../src/config.py:3190 ../src/gajim.py:2005
+#: ../src/config.py:3190
+#: ../src/gajim.py:1997
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr "Этот сертификат уже есть в файле %s, поэтому он не был добавлен."
@@ -6185,7 +5822,8 @@
"Ошибка SSL: %(error)s\n"
"Соединиться с этим сервером?"
-#: ../src/config.py:3264 ../src/gajim.py:2028
+#: ../src/config.py:3264
+#: ../src/gajim.py:2020
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -6196,7 +5834,8 @@
"Отпечаток SHA1 сертификата:\n"
"%s"
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3287
+#: ../src/config.py:3326
msgid "An error occurred during account creation"
msgstr "Произошла ошибка при создании учетной записи"
@@ -6262,7 +5901,8 @@
msgid "Open as _Link"
msgstr "Открыть как _ссылку"
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#: ../src/conversation_textview.py:973
+#: ../src/conversation_textview.py:985
#, python-format
msgid "Error executing \"%(command)s\": %(error)s"
msgstr "Ошибка выполнения «%(command)s»: %(error)s"
@@ -6297,7 +5937,8 @@
msgid "new(a)jabber.id"
msgstr "new(a)jabber.id"
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:555
+#: ../src/dataforms_widget.py:557
#, python-format
msgid "new%d(a)jabber.id"
msgstr "new%d(a)jabber.id"
@@ -6346,8 +5987,7 @@
msgstr "Изменить сообщение о статусе?"
#: ../src/dialogs.py:664
-msgid ""
-"This name is already used. Do you want to overwrite this status message?"
+msgid "This name is already used. Do you want to overwrite this status message?"
msgstr "Это имя уже используется. Перезаписать это статусное сообщение?"
#: ../src/dialogs.py:673
@@ -6389,7 +6029,9 @@
msgid "Please fill in the data of the contact you want to add"
msgstr "Заполните данные о контакте, который вы хотите добавить"
-#: ../src/dialogs.py:879 ../src/dialogs.py:885 ../src/dialogs.py:890
+#: ../src/dialogs.py:879
+#: ../src/dialogs.py:885
+#: ../src/dialogs.py:890
msgid "Invalid User ID"
msgstr "Неверный ID пользователя"
@@ -6456,13 +6098,10 @@
#: ../src/dialogs.py:1201
#, python-format
msgid ""
-"You have to install %s dictionary to use spellchecking, or choose another "
-"language by setting the speller_language option.\n"
+"You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option.\n"
"\n"
"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
-"s или выберите другой язык, исправив настройку speller_language."
+msgstr "Чтобы воспользоваться проверкой правописания, установите словарь для языка %s или выберите другой язык, исправив настройку speller_language."
#: ../src/dialogs.py:1605
#, python-format
@@ -6474,7 +6113,8 @@
msgid "Subscription request from %s"
msgstr "Запрос на подписку от %s"
-#: ../src/dialogs.py:1669 ../src/gajim.py:2628
+#: ../src/dialogs.py:1669
+#: ../src/gajim.py:2617
#, python-format
msgid "You are already in group chat %s"
msgstr "Вы уже в комнате %s"
@@ -6492,17 +6132,20 @@
msgid "Invalid Nickname"
msgstr "Неверное имя пользователя"
-#: ../src/dialogs.py:1768 ../src/groupchat_control.py:1453
+#: ../src/dialogs.py:1768
+#: ../src/groupchat_control.py:1453
#: ../src/groupchat_control.py:1734
msgid "The nickname has not allowed characters."
msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
+#: ../src/dialogs.py:1772
+#: ../src/dialogs.py:1778
#: ../src/groupchat_control.py:1901
msgid "Invalid group chat Jabber ID"
msgstr "Неверное имя комнаты"
-#: ../src/dialogs.py:1773 ../src/dialogs.py:1779
+#: ../src/dialogs.py:1773
+#: ../src/dialogs.py:1779
#: ../src/groupchat_control.py:1902
msgid "The group chat Jabber ID has not allowed characters."
msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
@@ -6549,22 +6192,24 @@
msgid ""
"Fill in the nickname or the Jabber ID of the contact you would like\n"
"to send a chat message to:"
-msgstr ""
-"Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
+msgstr "Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
#. if offline or connecting
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2344 ../src/dialogs.py:2487
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2344
+#: ../src/dialogs.py:2487
msgid "Connection not available"
msgstr "Соединение недоступно"
-#: ../src/dialogs.py:1971 ../src/dialogs.py:2345 ../src/dialogs.py:2488
-#: ../src/normal_control.py:641
+#: ../src/dialogs.py:1971
+#: ../src/dialogs.py:2345
+#: ../src/dialogs.py:2488
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "Удостоверьтесь, что вы подключены к «%s»."
-#: ../src/dialogs.py:1980 ../src/dialogs.py:1983
+#: ../src/dialogs.py:1980
+#: ../src/dialogs.py:1983
msgid "Invalid JID"
msgstr "Неверный JID"
@@ -6595,108 +6240,135 @@
#. img to display
#. default value
-#: ../src/dialogs.py:2055 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/dialogs.py:2055
+#: ../src/notify.py:245
+#: ../src/notify.py:459
#: ../src/osx/growler.py:12
msgid "Contact Signed In"
msgstr "Контакт подключился"
-#: ../src/dialogs.py:2057 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/dialogs.py:2057
+#: ../src/notify.py:253
+#: ../src/notify.py:461
#: ../src/osx/growler.py:12
msgid "Contact Signed Out"
msgstr "Контакт отключился"
#. chat message
-#: ../src/dialogs.py:2059 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/dialogs.py:2059
+#: ../src/notify.py:276
+#: ../src/notify.py:463
#: ../src/osx/growler.py:12
msgid "New Message"
msgstr "Новое сообщение"
#. single message
-#: ../src/dialogs.py:2059 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/dialogs.py:2059
+#: ../src/notify.py:257
+#: ../src/notify.py:463
#: ../src/osx/growler.py:13
msgid "New Single Message"
msgstr "Новое одиночное сообщение"
#. private message
-#: ../src/dialogs.py:2060 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/dialogs.py:2060
+#: ../src/notify.py:264
+#: ../src/notify.py:464
#: ../src/osx/growler.py:13
msgid "New Private Message"
msgstr "Новое личное сообщение"
-#: ../src/dialogs.py:2060 ../src/gajim.py:1591 ../src/notify.py:472
+#: ../src/dialogs.py:2060
+#: ../src/gajim.py:1587
+#: ../src/notify.py:472
#: ../src/osx/growler.py:13
msgid "New E-mail"
msgstr "Новое письмо"
-#: ../src/dialogs.py:2062 ../src/gajim.py:1657 ../src/notify.py:466
+#: ../src/dialogs.py:2062
+#: ../src/gajim.py:1653
+#: ../src/notify.py:466
#: ../src/osx/growler.py:14
msgid "File Transfer Request"
msgstr "Запрос передачи"
-#: ../src/dialogs.py:2064 ../src/gajim.py:1557 ../src/gajim.py:1624
-#: ../src/notify.py:468 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2064
+#: ../src/gajim.py:1553
+#: ../src/gajim.py:1620
+#: ../src/notify.py:468
+#: ../src/osx/growler.py:14
msgid "File Transfer Error"
msgstr "Ошибка передачи"
-#: ../src/dialogs.py:2066 ../src/gajim.py:1699 ../src/gajim.py:1721
-#: ../src/gajim.py:1738 ../src/notify.py:470 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2066
+#: ../src/gajim.py:1695
+#: ../src/gajim.py:1717
+#: ../src/gajim.py:1734
+#: ../src/notify.py:470
+#: ../src/osx/growler.py:15
msgid "File Transfer Completed"
msgstr "Передача файла завершена"
-#: ../src/dialogs.py:2067 ../src/gajim.py:1702 ../src/notify.py:470
+#: ../src/dialogs.py:2067
+#: ../src/gajim.py:1698
+#: ../src/notify.py:470
#: ../src/osx/growler.py:15
msgid "File Transfer Stopped"
msgstr "Передача остановлена"
-#: ../src/dialogs.py:2069 ../src/gajim.py:1449 ../src/notify.py:474
+#: ../src/dialogs.py:2069
+#: ../src/gajim.py:1445
+#: ../src/notify.py:474
#: ../src/osx/growler.py:16
msgid "Groupchat Invitation"
msgstr "Приглашение в комнату"
-#: ../src/dialogs.py:2071 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/dialogs.py:2071
+#: ../src/notify.py:237
+#: ../src/notify.py:476
#: ../src/osx/growler.py:16
msgid "Contact Changed Status"
msgstr "Контакт изменит статус"
-#: ../src/dialogs.py:2263 ../src/normal_control.py:241
+#: ../src/dialogs.py:2263
#, python-format
msgid "Single Message using account %s"
msgstr "Новое сообщение с учетной записи %s"
-#: ../src/dialogs.py:2265 ../src/normal_control.py:243
+#: ../src/dialogs.py:2265
#, python-format
msgid "Single Message in account %s"
msgstr "Новое сообщение для учетной записи %s"
-#: ../src/dialogs.py:2267 ../src/normal_control.py:245
+#: ../src/dialogs.py:2267
msgid "Single Message"
msgstr "Сообщение"
#. prepare UI for Sending
-#: ../src/dialogs.py:2270 ../src/normal_control.py:248
+#: ../src/dialogs.py:2270
#, python-format
msgid "Send %s"
msgstr "Отправить %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2293 ../src/normal_control.py:290
+#: ../src/dialogs.py:2293
#, python-format
msgid "Received %s"
msgstr "Получено %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2316 ../src/normal_control.py:324
+#: ../src/dialogs.py:2316
#, 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/normal_control.py:692
+#: ../src/dialogs.py:2388
#, python-format
msgid "RE: %s"
msgstr "RE: %s"
-#: ../src/dialogs.py:2389 ../src/normal_control.py:696
+#: ../src/dialogs.py:2389
#, python-format
msgid "%s wrote:\n"
msgstr "%s написал:\n"
@@ -6723,8 +6395,7 @@
#: ../src/dialogs.py:2619
#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
-msgstr ""
-"Номер: %(order)s,действие: %(action)s, тип: %(type)s, значение: %(value)s"
+msgstr "Номер: %(order)s,действие: %(action)s, тип: %(type)s, значение: %(value)s"
#: ../src/dialogs.py:2624
#, python-format
@@ -6782,7 +6453,8 @@
msgid "Choose Sound"
msgstr "Выберите звуковой файл"
-#: ../src/dialogs.py:3034 ../src/dialogs.py:3085
+#: ../src/dialogs.py:3034
+#: ../src/dialogs.py:3085
msgid "All files"
msgstr "Все файлы"
@@ -6836,7 +6508,8 @@
msgid "You have already verified this contact's identity."
msgstr "Вы уже удостоверили личность этого контакта."
-#: ../src/dialogs.py:3837 ../src/dialogs.py:3924
+#: ../src/dialogs.py:3837
+#: ../src/dialogs.py:3924
msgid "Contact's identity verified"
msgstr "Личность контакта удостоверена"
@@ -6845,16 +6518,12 @@
msgstr "Удостоверить снова..."
#: ../src/dialogs.py:3850
-msgid ""
-"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 ""
-"Чтобы быть уверенным, что <b>только</b> нужный человек может прочитать ваши "
-"сообщения или послать сообщения вам, вы должны удостоверить личность "
-"собеседника, нажав кнопку, расположенную ниже."
+msgid "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 "Чтобы быть уверенным, что <b>только</b> нужный человек может прочитать ваши сообщения или послать сообщения вам, вы должны удостоверить личность собеседника, нажав кнопку, расположенную ниже."
-#: ../src/dialogs.py:3853 ../src/dialogs.py:3905 ../src/dialogs.py:3918
+#: ../src/dialogs.py:3853
+#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:3918
msgid "Contact's identity NOT verified"
msgstr "Личность контакта НЕ удостоверена"
@@ -6869,15 +6538,11 @@
#: ../src/dialogs.py:3873
#, python-format
msgid ""
-"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"
+"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>."
msgstr ""
-"Для предотвращения атаки типа «человек посередине» вы должны переговорить с "
-"<b>%(jid)s</b> напрямую (лично или по телефону) и убедиться, что он видит ту "
-"же Short Authentication String (SAS), что и вы.\n"
+"Для предотвращения атаки типа «человек посередине» вы должны переговорить с <b>%(jid)s</b> напрямую (лично или по телефону) и убедиться, что он видит ту же Short Authentication String (SAS), что и вы.\n"
"\n"
"Short Authentication String этого сеанса <b>%(sas)s</b>"
@@ -6888,31 +6553,19 @@
#: ../src/dialogs.py:3906
#, python-format
msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
-msgstr ""
-"Ключ (%s) контакта <b>не соответствует</b> ключу, присвоенному в Gajim."
+msgstr "Ключ (%s) контакта <b>не соответствует</b> ключу, присвоенному в Gajim."
#: ../src/dialogs.py:3912
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
-msgstr ""
-"Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
-"сообщения."
+msgstr "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать сообщения."
#: ../src/dialogs.py:3919
-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 ""
-"Этому контакту присвоен ключ GPG, но <b>вы не доверяете этому ключу</b>. "
-"Таким образом, сообщения <b>не могут быть</b> зашифрованы. Воспользуйтесь "
-"вашим GPG клиентом для того, чтобы выставить доверие данному ключу"
+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 "Этому контакту присвоен ключ GPG, но <b>вы не доверяете этому ключу</b>. Таким образом, сообщения <b>не могут быть</b> зашифрованы. Воспользуйтесь вашим GPG клиентом для того, чтобы выставить доверие данному ключу"
#: ../src/dialogs.py:3925
-msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
-msgstr ""
-"Этому контакту присвоен ключ GPG, и вы доверяете этому ключу. Таким образом, "
-"сообщения будут зашифрованы."
+msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
+msgstr "Этому контакту присвоен ключ GPG, и вы доверяете этому ключу. Таким образом, сообщения будут зашифрованы."
#: ../src/disco.py:116
msgid "Others"
@@ -6941,14 +6594,11 @@
msgstr "Сервис не обнаружен"
#: ../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."
-msgstr ""
-"По этому адресу сервисы отсутствуют или не отвечают. Проверьте адрес и "
-"попробуйте еще раз."
+msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
+msgstr "По этому адресу сервисы отсутствуют или не отвечают. Проверьте адрес и попробуйте еще раз."
-#: ../src/disco.py:661 ../src/disco.py:957
+#: ../src/disco.py:661
+#: ../src/disco.py:955
msgid "The service is not browsable"
msgstr "Сервис недоступен для просмотра"
@@ -6956,68 +6606,70 @@
msgid "This type of service does not contain any items to browse."
msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:699
+#: ../src/disco.py:709
msgid "Invalid Server Name"
msgstr "Неверное имя сервера"
-#: ../src/disco.py:756
+#: ../src/disco.py:754
#, python-format
msgid "Browsing %(address)s using account %(account)s"
msgstr "Просмотр %(address)s с учетной записью %(account)s"
-#: ../src/disco.py:796
+#: ../src/disco.py:794
msgid "_Browse"
msgstr "_Браузер"
-#: ../src/disco.py:958
+#: ../src/disco.py:956
msgid "This service does not contain any items to browse."
msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
-#: ../src/disco.py:1181
+#: ../src/disco.py:1179
msgid "_Execute Command"
msgstr "В_ыполнить команду..."
-#: ../src/disco.py:1191 ../src/disco.py:1355
+#: ../src/disco.py:1189
+#: ../src/disco.py:1353
msgid "Re_gister"
msgstr "За_регистрироваться"
-#: ../src/disco.py:1392
+#: ../src/disco.py:1390
#, python-format
msgid "Scanning %(current)d / %(total)d.."
msgstr "Сканирую %(current)d / %(total)d.."
#. Users column
-#: ../src/disco.py:1574
+#: ../src/disco.py:1572
msgid "Users"
msgstr "Пользователи"
#. Description column
-#: ../src/disco.py:1582
+#: ../src/disco.py:1580
msgid "Description"
msgstr "Описание"
#. Id column
-#: ../src/disco.py:1590
+#: ../src/disco.py:1588
msgid "Id"
msgstr "ID"
-#: ../src/disco.py:1820
+#: ../src/disco.py:1818
msgid "Subscribed"
msgstr "Подписка"
-#: ../src/disco.py:1828
+#: ../src/disco.py:1826
msgid "Node"
msgstr "Узел"
-#: ../src/disco.py:1885
+#: ../src/disco.py:1883
msgid "New post"
msgstr "Новое сообщение"
-#: ../src/disco.py:1891
+#: ../src/disco.py:1889
msgid "_Subscribe"
msgstr "_Подписаться"
-#: ../src/disco.py:1897
+#: ../src/disco.py:1895
msgid "_Unsubscribe"
msgstr "_Отписаться"
@@ -7026,13 +6678,11 @@
msgstr "PyOpenSSL"
#: ../src/features_window.py:52
-msgid ""
-"A library used to validate server certificates to ensure a secure connection."
-msgstr ""
-"Библиотека используется для подтверждения действительности сертификатов "
-"сервера для того, чтобы удостовериться в защищенности соединения."
+msgid "A library used to validate server certificates to ensure a secure connection."
+msgstr "Библиотека используется для подтверждения действительности сертификатов сервера для того, чтобы удостовериться в защищенности соединения."
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:53
+#: ../src/features_window.py:54
msgid "Requires python-pyopenssl."
msgstr "Требует python-pyopenssl."
@@ -7042,9 +6692,7 @@
#: ../src/features_window.py:56
msgid "Serverless chatting with autodetected clients in a local network."
-msgstr ""
-"Не требующее сервера общение между автоматически обнаруживаемыми клиентами в "
-"локальной сети."
+msgstr "Не требующее сервера общение между автоматически обнаруживаемыми клиентами в локальной сети."
#: ../src/features_window.py:57
msgid "Requires python-avahi."
@@ -7066,9 +6714,12 @@
msgid "Requires python-dbus."
msgstr "Требует python-dbus."
-#: ../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: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
msgid "Feature not available under Windows."
msgstr "Эта возможность отсутствует в Windows."
@@ -7103,9 +6754,7 @@
#: ../src/features_window.py:72
msgid "Gajim session is stored on logout and restored on login."
-msgstr ""
-"Сеанс Gajim сохраняется при выходе (logout) и восстанавливается при входе "
-"(login)."
+msgstr "Сеанс Gajim сохраняется при выходе (logout) и восстанавливается при входе (login)."
#: ../src/features_window.py:73
msgid "Requires python-gnome2."
@@ -7148,12 +6797,8 @@
msgstr "Проверка орфографии набираемых сообщений"
#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
-"Требует python-gnome2-extras или скомпилированного модуля gtkspell из "
-"исходных кодов Gajim."
+msgid "Requires python-gnome2-extras or compilation of gtkspell module from Gajim sources."
+msgstr "Требует python-gnome2-extras или скомпилированного модуля gtkspell из исходных кодов Gajim."
#: ../src/features_window.py:87
msgid "Notification-daemon"
@@ -7164,9 +6809,7 @@
msgstr "Пассивные всплывающие окна для уведомления о новых событиях."
#: ../src/features_window.py:89
-msgid ""
-"Requires python-notify or instead python-dbus in conjunction with "
-"notification-daemon."
+msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
msgstr "Требует python-notify или python-dbus совместно с notification-daemon."
#: ../src/features_window.py:91
@@ -7178,11 +6821,8 @@
msgstr "Иконка в системном лотке отображающая текущий статус."
#: ../src/features_window.py:93
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-"Требует python-gnome2-extras или скомпилированного модуля trayicon из "
-"исходных кодов Gajim."
+msgid "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr "Требует python-gnome2-extras или скомпилированного модуля trayicon из исходных кодов Gajim."
#: ../src/features_window.py:94
msgid "Requires PyGTK >= 2.10."
@@ -7194,11 +6834,10 @@
#: ../src/features_window.py:96
msgid "Ability to measure idle time, in order to set auto status."
-msgstr ""
-"Возможность определения времени бездействия для того, чтобы установить "
-"автостатус."
+msgstr "Возможность определения времени бездействия для того, чтобы установить автостатус."
-#: ../src/features_window.py:97 ../src/features_window.py:98
+#: ../src/features_window.py:97
+#: ../src/features_window.py:98
msgid "Requires compilation of the idle module from Gajim sources."
msgstr "Требует скомпилированного модуля idle из исходных кодов Gajim."
@@ -7211,20 +6850,12 @@
msgstr "Преобразовывать LaTeX выражения, заключенные в $$ $$"
#: ../src/features_window.py:101
-msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
-msgstr ""
-"Требует texlive-latex-base и dvipng. Необходимо присвоить пункту 'use_latex' "
-"значение True в Расширенном редакторе настроек."
+msgid "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True in the Advanced Configuration Editor."
+msgstr "Требует texlive-latex-base и dvipng. Необходимо присвоить пункту 'use_latex' значение True в Расширенном редакторе настроек."
#: ../src/features_window.py:102
-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 и dvipng (оба есть в MikTeX). Необходимо "
-"присвоить пункту 'use_latex' значение True в Расширенном редакторе настроек."
+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 и dvipng (оба есть в MikTeX). Необходимо присвоить пункту 'use_latex' значение True в Расширенном редакторе настроек."
#: ../src/features_window.py:103
msgid "End to End Encryption"
@@ -7234,7 +6865,8 @@
msgid "Encrypting chatmessages."
msgstr "Шифрование сообщений чата."
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:105
+#: ../src/features_window.py:106
msgid "Requires python-crypto."
msgstr "Требует python-crypto."
@@ -7243,14 +6875,11 @@
msgstr "Генератор RST"
#: ../src/features_window.py:108
-msgid ""
-"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
-"docs/ref/rst/restructuredtext.html)."
-msgstr ""
-"Генерировать XHTML вывод из кода RST (см. http://docutils.sourceforge.net/"
-"docs/ref/rst/restructuredtext.html)."
+msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
+msgstr "Генерировать XHTML вывод из кода RST (см. http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
-#: ../src/features_window.py:109 ../src/features_window.py:110
+#: ../src/features_window.py:109
+#: ../src/features_window.py:110
msgid "Requires python-docutils."
msgstr "Требует python-docutils."
@@ -7262,7 +6891,8 @@
msgid "Ability to have clickable URLs in chat and groupchat window banners."
msgstr "Кликабельные ссылки в баннере."
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:113
+#: ../src/features_window.py:114
msgid "Requires python-sexy."
msgstr "Требует python-sexy."
@@ -7282,19 +6912,22 @@
msgid "Progress"
msgstr "Прогресс"
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:173
+#: ../src/filetransfers_window.py:227
#, python-format
msgid "Filename: %s"
msgstr "Имя файла: %s"
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:313
#, python-format
msgid "Size: %s"
msgstr "Размер: %s"
#. You is a reply of who sent a file
#. You is a reply of who received a file
-#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:193
#: ../src/history_manager.py:499
msgid "You"
msgstr "Вы"
@@ -7304,7 +6937,8 @@
msgid "Sender: %s"
msgstr "Отправитель: %s"
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/filetransfers_window.py:185
+#: ../src/filetransfers_window.py:596
#: ../src/tooltips.py:671
msgid "Recipient: "
msgstr "Получатель:"
@@ -7318,11 +6952,13 @@
msgid "File transfer completed"
msgstr "Передача завершена"
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:212
+#: ../src/filetransfers_window.py:218
msgid "File transfer cancelled"
msgstr "Передача отменена"
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:212
+#: ../src/filetransfers_window.py:219
msgid "Connection with peer cannot be established."
msgstr "Соединение не может быть установлено."
@@ -7344,7 +6980,8 @@
msgid "Choose File to Send..."
msgstr "Выбрать файл для отправки..."
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:268
+#: ../src/tooltips.py:709
msgid "Description: "
msgstr "Описание: "
@@ -7376,33 +7013,37 @@
msgid "%s wants to send you a file:"
msgstr "%s хочет отправить вам файл:"
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332
+#: ../src/gtkgui_helpers.py:821
#, python-format
msgid "Cannot overwrite existing file \"%s\""
msgstr "Не могу заместить существующий файл «%s»"
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
-msgid ""
-"A file with this name already exists and you do not have permission to "
-"overwrite it."
+#: ../src/filetransfers_window.py:333
+#: ../src/gtkgui_helpers.py:823
+msgid "A file with this name already exists and you do not have permission to overwrite it."
msgstr "Этот файл уже существует, и у вас нет права его перезаписать."
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349
+#: ../src/gtkgui_helpers.py:827
msgid "This file already exists"
msgstr "Файл уже существует"
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349
+#: ../src/gtkgui_helpers.py:827
msgid "What do you want to do?"
msgstr "Что вы хотите сделать?"
#. read-only bit is used to mark special folder under windows,
#. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
+#: ../src/filetransfers_window.py:359
+#: ../src/gtkgui_helpers.py:834
#, python-format
msgid "Directory \"%s\" is not writable"
msgstr "Папка «%s» не доступна для записи"
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359
+#: ../src/gtkgui_helpers.py:835
msgid "You do not have permission to create files in this directory."
msgstr "У вас нет права создавать файлы в этой директории."
@@ -7426,7 +7067,8 @@
msgid "(%(filesize_unit)s/s)"
msgstr "(%(filesize_unit)s/s)"
-#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
+#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:569
msgid "Invalid File"
msgstr "Неверный файл"
@@ -7438,11 +7080,13 @@
msgid "It is not possible to send empty files"
msgstr "Нельзя отсылать пустые файлы"
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592
+#: ../src/tooltips.py:661
msgid "Name: "
msgstr "Имя: "
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594
+#: ../src/tooltips.py:665
msgid "Sender: "
msgstr "Отправитель:"
@@ -7450,71 +7094,63 @@
msgid "Pause"
msgstr "Пауза"
-#: ../src/gajim.py:87
+#: ../src/gajim.py:83
#, python-format
msgid "%s is not a valid loglevel"
msgstr "%s не является допустимым loglevel"
-#: ../src/gajim.py:160
+#: ../src/gajim.py:156
msgid "Gajim needs X server to run. Quiting..."
msgstr "Gajim для запуска требуется X-сервер. Выход..."
-#: ../src/gajim.py:190
+#: ../src/gajim.py:186
msgid "Gajim needs PyGTK 2.8 or above"
msgstr "Gajim требуется PyGTK 2.8 или выше"
-#: ../src/gajim.py:191
+#: ../src/gajim.py:187
msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
msgstr "Gajim для запуска требуется PyGTK 2.8 или выше. Выход..."
-#: ../src/gajim.py:193
+#: ../src/gajim.py:189
msgid "Gajim needs GTK 2.8 or above"
msgstr "Gajim требуется GTK 2.8 или выше"
-#: ../src/gajim.py:194
+#: ../src/gajim.py:190
msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
msgstr "Gajim для запуска требуется GTK 2.8 или выше. Выход..."
-#: ../src/gajim.py:199
+#: ../src/gajim.py:195
msgid "GTK+ runtime is missing libglade support"
msgstr "У GTK отсутствует поддержка libglade."
-#: ../src/gajim.py:201
+#: ../src/gajim.py:197
#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Удалите вашу текущую версию GTK и установите последнюю стабильную версию с %s"
+msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
+msgstr "Удалите вашу текущую версию GTK и установите последнюю стабильную версию с %s"
-#: ../src/gajim.py:203
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
+#: ../src/gajim.py:199
+msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
msgstr "Удостоверьтесь, что GTK+ и PyGTK поддерживают libglade."
-#: ../src/gajim.py:208
+#: ../src/gajim.py:204
msgid "Gajim needs PySQLite2 to run"
msgstr "Gajim для запуска требуется PySQLite2"
-#: ../src/gajim.py:216
+#: ../src/gajim.py:212
msgid "Gajim needs pywin32 to run"
msgstr "Gajim для запуска требуется pywin32"
-#: ../src/gajim.py:217
+#: ../src/gajim.py:213
#, python-format
-msgid ""
-"Please make sure that Pywin32 is installed on your system. You can get it at "
-"%s"
-msgstr ""
-"Удостоверьтесь, что в вашей системе установлен Pywin32. Вы можете получить "
-"его на сайте: %s"
+msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
+msgstr "Удостоверьтесь, что в вашей системе установлен Pywin32. Вы можете получить его на сайте: %s"
#. set the icon to all newly opened wind
-#: ../src/gajim.py:370
+#: ../src/gajim.py:366
msgid "Gajim is already running"
msgstr "Gajim уже запущен"
-#: ../src/gajim.py:371
+#: ../src/gajim.py:367
msgid ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
@@ -7522,79 +7158,81 @@
"По-видимому, уже запущен другой экземпляр Gajim\n"
"Запустить ещё один?"
-#: ../src/gajim.py:497
+#: ../src/gajim.py:493
msgid "Passphrase Required"
msgstr "Требуется парольная фраза"
-#: ../src/gajim.py:498
+#: ../src/gajim.py:494
#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
msgstr "Введите пароль для ключа %(keyid)s (аккаунт %(account)s)."
#. ask again
-#: ../src/gajim.py:513
+#: ../src/gajim.py:509
msgid "Wrong Passphrase"
msgstr "Неверная парольная фраза"
-#: ../src/gajim.py:514
+#: ../src/gajim.py:510
msgid "Please retype your GPG passphrase or press Cancel."
msgstr "Введите парольную фразу для GPG еще раз или нажмите «Отмена»."
-#: ../src/gajim.py:561
+#: ../src/gajim.py:557
#, python-format
msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
+"Your desired nickname in group chat %s is in use or registered by another occupant.\n"
"Please specify another nickname below:"
msgstr ""
-"Тот ник, что вы ввели в комнате %s уже используется или зарегистрирован "
-"другим пользователем.\n"
+"Тот ник, что вы ввели в комнате %s уже используется или зарегистрирован другим пользователем.\n"
"Укажите другой ник:"
-#: ../src/gajim.py:575
+#: ../src/gajim.py:571
msgid "Do you accept this request?"
msgstr "Вы принимаете этот запрос?"
-#: ../src/gajim.py:577
+#: ../src/gajim.py:573
#, python-format
msgid "Do you accept this request on account %s?"
msgstr "Вы принимаете запрос %s?"
-#: ../src/gajim.py:580
+#: ../src/gajim.py:576
#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
msgstr "HTTP (%(method)s) Авторизация для %(url)s (id: %(id)s)"
-#: ../src/gajim.py:628 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:624
+#: ../src/notify.py:478
+#: ../src/osx/growler.py:17
msgid "Connection Failed"
msgstr "Соединение разорвалось"
-#: ../src/gajim.py:934 ../src/gajim.py:938
+#: ../src/gajim.py:930
+#: ../src/gajim.py:934
#, python-format
msgid "Error %(code)s: %(msg)s"
msgstr "Ошибка %(code)s: %(msg)s"
#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:948 ../src/gajim.py:961
+#: ../src/gajim.py:944
+#: ../src/gajim.py:957
#, python-format
msgid "error while sending %(message)s ( %(error)s )"
msgstr "ошибка при отправке %(message)s ( %(error)s )"
-#: ../src/gajim.py:993
+#: ../src/gajim.py:989
msgid "Authorization accepted"
msgstr "Авторизация принята"
-#: ../src/gajim.py:994
+#: ../src/gajim.py:990
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "Контакт «%s» авторизовал вас, теперь вы можете видеть его статус."
-#: ../src/gajim.py:1013
+#: ../src/gajim.py:1009
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "Контакт «%s» отозвал подписку с вами"
-#: ../src/gajim.py:1014
+#: ../src/gajim.py:1010
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
@@ -7602,94 +7240,93 @@
"Вы всегда будете видеть его или её как отключенными.\n"
"Удалить его или её из контакт-листа?"
-#: ../src/gajim.py:1055
+#: ../src/gajim.py:1051
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "Связь с «%s» не может быть установлена"
-#: ../src/gajim.py:1231 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1227
+#: ../src/groupchat_control.py:1164
#, python-format
msgid "%(nick)s is now known as %(new_nick)s"
msgstr "%(nick)s теперь известен как %(new_nick)s"
-#: ../src/gajim.py:1249 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../src/notify.py:232
+#: ../src/gajim.py:1245
+#: ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417
+#: ../src/notify.py:232
#, python-format
msgid "%(nick)s is now %(status)s"
msgstr "%(nick)s теперь %(status)s"
-#: ../src/gajim.py:1312
+#: ../src/gajim.py:1308
#, python-format
msgid "%(jid)s has set the subject to %(subject)s"
msgstr "%(jid)s установил(а) тему: %(subject)s"
#. 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:1376 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1372
+#: ../src/groupchat_control.py:1124
msgid "Any occupant is allowed to see your full JID"
msgstr "Любой участник может увидеть ваш настоящий JID"
-#: ../src/gajim.py:1379
+#: ../src/gajim.py:1375
msgid "Room now shows unavailable member"
msgstr "Теперь в комнате отображается недоступный участник"
-#: ../src/gajim.py:1381
+#: ../src/gajim.py:1377
msgid "room now does not show unavailable members"
msgstr "теперь в комнате не отображаются недоступные участники"
-#: ../src/gajim.py:1384
+#: ../src/gajim.py:1380
msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-"Произошло изменение настроек комнаты, не относящееся к настройкам приватности"
+msgstr "Произошло изменение настроек комнаты, не относящееся к настройкам приватности"
#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1383
msgid "Room logging is now enabled"
msgstr "Запись логов конференции включена"
-#: ../src/gajim.py:1389
+#: ../src/gajim.py:1385
msgid "Room logging is now disabled"
msgstr "Запись логов конференции выключена"
-#: ../src/gajim.py:1391
+#: ../src/gajim.py:1387
msgid "Room is now non-anonymous"
msgstr "Конференция не анонимна"
-#: ../src/gajim.py:1394
+#: ../src/gajim.py:1390
msgid "Room is now semi-anonymous"
msgstr "Конференция частично анонимна"
-#: ../src/gajim.py:1397
+#: ../src/gajim.py:1393
msgid "Room is now fully-anonymous"
msgstr "Конференция полностью анонимна"
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1425
#, python-format
msgid "A Password is required to join the room %s. Please type it."
msgstr "Чтобы войти в комнату %s, нужен пароль."
-#: ../src/gajim.py:1463
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-"Gajim настроен на использование GPG агента, но GPG агент не запущен или он "
-"возвратил неверный пароль.\n"
+#: ../src/gajim.py:1459
+msgid "You configured Gajim to use GPG agent, but there is no GPG agent running or it returned a wrong passphrase.\n"
+msgstr "Gajim настроен на использование GPG агента, но GPG агент не запущен или он возвратил неверный пароль.\n"
-#: ../src/gajim.py:1465
+#: ../src/gajim.py:1461
msgid "You are currently connected without your OpenPGP key."
msgstr "Вы сейчас соединены без OpenPGP ключа."
-#: ../src/gajim.py:1468
+#: ../src/gajim.py:1464
msgid "Your passphrase is incorrect"
msgstr "Ваша парольная фраза неверна"
-#: ../src/gajim.py:1568
+#: ../src/gajim.py:1564
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "Новое письмо на %(gmail_mail_address)s"
-#: ../src/gajim.py:1570
+#: ../src/gajim.py:1566
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
@@ -7697,7 +7334,7 @@
msgstr[1] "У вас есть %d непрочитанных письма"
msgstr[2] "У вас есть %d непрочитанных писем"
-#: ../src/gajim.py:1583
+#: ../src/gajim.py:1579
#, python-format
msgid ""
"\n"
@@ -7712,34 +7349,34 @@
"Тема: %(subject)s\n"
"%(snippet)s"
-#: ../src/gajim.py:1654
+#: ../src/gajim.py:1650
#, python-format
msgid "%s wants to send you a file."
msgstr "%s хочет отправить вам файл."
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1718
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "Успешно получен файл %(filename)s от %(name)s."
#. ft stopped
-#: ../src/gajim.py:1726
+#: ../src/gajim.py:1722
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "Передача файла %(filename)s от %(name)s приостановлена."
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1735
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "%(name)s успешно получил(а) отправленный вами файл %(filename)s."
#. ft stopped
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1739
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "Передача файла %(filename)s к %(name)s приостановлена."
-#: ../src/gajim.py:1831
+#: ../src/gajim.py:1823
#, python-format
msgid ""
"Unable to decrypt message from %s\n"
@@ -7748,71 +7385,64 @@
"Не удалось расшифровать сообщение от %s\n"
"Возможно, оно было испорчено."
-#: ../src/gajim.py:1838
+#: ../src/gajim.py:1830
msgid "Unable to decrypt message"
msgstr "Сообщение не удалось расшифровать"
-#: ../src/gajim.py:1909
+#: ../src/gajim.py:1901
msgid "Username Conflict"
msgstr "Такое имя уже есть"
-#: ../src/gajim.py:1910
+#: ../src/gajim.py:1902
msgid "Please type a new username for your local account"
msgstr "Введите новое имя пользователя для локальной учетной записи"
-#: ../src/gajim.py:1922
+#: ../src/gajim.py:1914
msgid "Ping?"
msgstr "Ping?"
-#: ../src/gajim.py:1935
+#: ../src/gajim.py:1927
#, python-format
msgid "Pong! (%s s.)"
msgstr "Pong! (%s сек.)"
-#: ../src/gajim.py:1946
+#: ../src/gajim.py:1938
msgid "Error."
msgstr "Ошибка."
-#: ../src/gajim.py:1971
+#: ../src/gajim.py:1963
msgid "Resource Conflict"
msgstr "Такое имя уже есть"
-#: ../src/gajim.py:1972
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-"Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите "
-"другой ресурс"
+#: ../src/gajim.py:1964
+msgid "You are already connected to this account with the same resource. Please type a new one"
+msgstr "Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите другой ресурс"
-#: ../src/gajim.py:2025
+#: ../src/gajim.py:2017
msgid "Error verifying SSL certificate"
msgstr "Ошибка при проверке SSL сертификата"
-#: ../src/gajim.py:2026
+#: ../src/gajim.py:2018
#, python-format
msgid ""
-"There was an error verifying the SSL certificate of your jabber server: %"
-"(error)s\n"
+"There was an error verifying the SSL certificate of your jabber server: %(error)s\n"
"Do you still want to connect to this server?"
msgstr ""
-"Произошла ошибка при проверке сертификата SSL вашего jabber сервера: %(error)"
-"s\n"
+"Произошла ошибка при проверке сертификата SSL вашего jabber сервера: %(error)s\n"
"Вы всё ещё хотите подключиться к этому серверу?"
-#: ../src/gajim.py:2031
+#: ../src/gajim.py:2023
msgid "Ignore this error for this certificate."
msgstr "Игнорировать эту ошибку для данного сертификата."
-#: ../src/gajim.py:2046
+#: ../src/gajim.py:2038
msgid "SSL certificate error"
msgstr "Ошибка SSL сертификата"
-#: ../src/gajim.py:2047
+#: ../src/gajim.py:2039
#, python-format
msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate has changed or your connection is being hacked.\n"
"Old fingerprint: %(old)s\n"
"New fingerprint: %(new)s\n"
"\n"
@@ -7823,86 +7453,79 @@
"Новый отпечаток: %(new)s\n"
"Вы всё ещё хотите соединиться и обновить отпечаток сертификата?"
-#: ../src/gajim.py:2069 ../src/gajim.py:2099
+#: ../src/gajim.py:2061
+#: ../src/gajim.py:2091
msgid "Insecure connection"
msgstr "Небезопасное соединение"
-#: ../src/gajim.py:2070
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+#: ../src/gajim.py:2062
+msgid "You are about to send your password on an unencrypted connection. Are you sure you want to do that?"
msgstr "Вы хотите отправить пароль через небезопасное соединение. Вы уверены?"
-#: ../src/gajim.py:2072 ../src/gajim.py:2102
+#: ../src/gajim.py:2064
+#: ../src/gajim.py:2094
msgid "Yes, I really want to connect insecurely"
msgstr "Да, я действительно хочу соединиться небезопасно"
-#: ../src/gajim.py:2073 ../src/gajim.py:2103 ../src/groupchat_control.py:1843
+#: ../src/gajim.py:2065
+#: ../src/gajim.py:2095
+#: ../src/groupchat_control.py:1843
#: ../src/roster_window.py:3790
msgid "Do _not ask me again"
msgstr "Не _переспрашивать"
-#: ../src/gajim.py:2100
-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?"
-msgstr ""
-"Вы хотите отправить пароль через небезопасное соединение. Вы уверены? "
-"(Установите PyOpenSSL, чтобы этого не происходило.)"
+#: ../src/gajim.py:2092
+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?"
+msgstr "Вы хотите отправить пароль через небезопасное соединение. Вы уверены? (Установите PyOpenSSL, чтобы этого не происходило.)"
-#: ../src/gajim.py:2117
+#: ../src/gajim.py:2109
msgid "PEP node was not removed"
msgstr "PEP узел не был удален"
-#: ../src/gajim.py:2118
+#: ../src/gajim.py:2110
#, 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:2586 ../src/gajim.py:2607
+#: ../src/gajim.py:2575
+#: ../src/gajim.py:2596
msgid "Emoticons disabled"
msgstr "Смайлики выключены"
-#: ../src/gajim.py:2587
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
+#: ../src/gajim.py:2576
+msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
msgstr "Тема смайликов не найдена, они будут отключены."
-#: ../src/gajim.py:2608
-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 "
-"for more details."
-msgstr ""
-"Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла "
-"emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
+#: ../src/gajim.py:2597
+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 for more details."
+msgstr "Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
-#: ../src/gajim.py:2634 ../src/roster_window.py:3324
+#: ../src/gajim.py:2623
+#: ../src/roster_window.py:3324
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:2914
+#: ../src/gajim.py:2903
msgid "Could not save your settings and preferences"
msgstr "Не могу сохранить ваши установки и настройки"
-#: ../src/gajim.py:3011
+#: ../src/gajim.py:3000
msgid "Bookmark already set"
msgstr "Закладка уже установлена"
-#: ../src/gajim.py:3012
+#: ../src/gajim.py:3001
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "Комната «%s» уже есть в ваших закладках."
-#: ../src/gajim.py:3025
+#: ../src/gajim.py:3014
msgid "Bookmark has been added successfully"
msgstr "Закладка успешно добавлена"
-#: ../src/gajim.py:3026
+#: ../src/gajim.py:3015
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr "Вы можете управлять закладками через меню «Действия» в ростере."
@@ -7928,20 +7551,23 @@
msgstr "Показывать окно со следующим непрочитанным сообщением"
#: ../src/gajim-remote.py:95
-msgid ""
-"Prints a list of all contacts in the roster. Each contact appears on a "
-"separate line"
-msgstr ""
-"Выводит список всех контактов в ростере. Каждый контакт будет в отдельной "
-"строке"
+msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
+msgstr "Выводит список всех контактов в ростере. Каждый контакт будет в отдельной строке"
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:270
msgid "account"
msgstr "Учетные записи"
@@ -7964,11 +7590,12 @@
#: ../src/gajim-remote.py:111
msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr ""
-"один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
+msgstr "один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
msgid "message"
msgstr "сообщение"
@@ -7977,13 +7604,8 @@
msgstr "сообщение сервера"
#: ../src/gajim-remote.py:113
-msgid ""
-"change status of account \"account\". If not specified, try to change status "
-"of all accounts that have \"sync with global status\" option set"
-msgstr ""
-"изменяет статус учетной записи «учетная запись». Если не указано, пытается "
-"изменить статус всех учетных записей, у которых установлена опция "
-"«синхронизировать с глобальным статусом»"
+msgid "change status of account \"account\". If not specified, try to change status of all accounts that have \"sync with global status\" option set"
+msgstr "изменяет статус учетной записи «учетная запись». Если не указано, пытается изменить статус всех учетных записей, у которых установлена опция «синхронизировать с глобальным статусом»"
#: ../src/gajim-remote.py:119
msgid "Shows the chat dialog so that you can send messages to a contact"
@@ -7993,53 +7615,45 @@
msgid "JID of the contact that you want to chat with"
msgstr "JID контакта, с которым вы хотели бы побеседовать"
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:210
msgid "if specified, contact is taken from the contact list of this account"
msgstr "если указано, контакт будет взят из контакт-листа этой учетной записи"
#: ../src/gajim-remote.py:128
-msgid ""
-"Sends new chat message to a contact in the roster. Both OpenPGP key and "
-"account are optional. If you want to set only 'account', without 'OpenPGP "
-"key', just set 'OpenPGP key' to ''."
-msgstr ""
-"Отправить новое сообщение контакту в ростере. Как OpenPGP ключ, так и "
-"учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
-"без 'OpenPGP ключа', просто установите 'OpenPGP ключ' в ''."
+msgid "Sends new chat message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
+msgstr "Отправить новое сообщение контакту в ростере. Как OpenPGP ключ, так и учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', без 'OpenPGP ключа', просто установите 'OpenPGP ключ' в ''."
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:145
msgid "JID of the contact that will receive the message"
msgstr "JID контакта, который получит сообщение"
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147
#: ../src/gajim-remote.py:158
msgid "message contents"
msgstr "содержимое сообщения"
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:148
msgid "pgp key"
msgstr "PGP ключ"
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:148
msgid "if specified, the message will be encrypted using this public key"
-msgstr ""
-"если указано, сообщение будет зашифровано с использованием открытого ключа"
+msgstr "если указано, сообщение будет зашифровано с использованием открытого ключа"
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150
#: ../src/gajim-remote.py:159
msgid "if specified, the message will be sent using this account"
-msgstr ""
-"если указано, сообщение будет отправлено с использованием этой учетной записи"
+msgstr "если указано, сообщение будет отправлено с использованием этой учетной записи"
#: ../src/gajim-remote.py:141
-msgid ""
-"Sends new single message to a contact in the roster. Both OpenPGP key and "
-"account are optional. If you want to set only 'account', without 'OpenPGP "
-"key', just set 'OpenPGP key' to ''."
-msgstr ""
-"Отправить новое сообщение контакту в ростере. Как OpenPGP ключ, так и "
-"учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
-"без 'OpenPGP ключа', просто установите 'OpenPGP ключ' в ''."
+msgid "Sends new single message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
+msgstr "Отправить новое сообщение контакту в ростере. Как OpenPGP ключ, так и учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', без 'OpenPGP ключа', просто установите 'OpenPGP ключ' в ''."
#: ../src/gajim-remote.py:146
msgid "subject"
@@ -8061,8 +7675,10 @@
msgid "Gets detailed info on a contact"
msgstr "Получает детальную информацию о контакте"
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:218
msgid "JID of the contact"
msgstr "JID контакта"
@@ -8088,8 +7704,7 @@
#: ../src/gajim-remote.py:180
msgid "if specified, file will be sent using this account"
-msgstr ""
-"если указано, файл будет отправлен с использованием этой учетной записи"
+msgstr "если указано, файл будет отправлен с использованием этой учетной записи"
#: ../src/gajim-remote.py:185
msgid "Lists all preferences and their values"
@@ -8105,8 +7720,7 @@
#: ../src/gajim-remote.py:191
msgid "'key' is the name of the preference, 'value' is the value to set it to"
-msgstr ""
-"'ключ' это название параметра, а 'значение' это то, что ему присваивают"
+msgstr "'ключ' это название параметра, а 'значение' это то, что ему присваивают"
#: ../src/gajim-remote.py:196
msgid "Deletes a preference item"
@@ -8142,16 +7756,11 @@
#: ../src/gajim-remote.py:224
msgid "Returns current status (the global one unless account is specified)"
-msgstr ""
-"Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
-"запись)"
+msgstr "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная запись)"
#: ../src/gajim-remote.py:231
-msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr ""
-"Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
-"запись)"
+msgid "Returns current status message (the global one unless account is specified)"
+msgstr "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная запись)"
#: ../src/gajim-remote.py:238
msgid "Returns number of unread messages"
@@ -8174,9 +7783,7 @@
msgstr "Отправляемый XML"
#: ../src/gajim-remote.py:251
-msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
msgstr "Учётная запись, из которой будет отправлен XML."
#: ../src/gajim-remote.py:257
@@ -8401,7 +8008,8 @@
msgid "You are now known as %s"
msgstr "Вы теперь известны как %s"
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1204
#: ../src/groupchat_control.py:1209
#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
@@ -8451,12 +8059,15 @@
#. Invalid Nickname
#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#: ../src/groupchat_control.py:1452
+#: ../src/groupchat_control.py:1733
msgid "Invalid nickname"
msgstr "Неверное имя пользователя"
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1476
+#: ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578
+#: ../src/groupchat_control.py:1595
#, python-format
msgid "Nickname not found: %s"
msgstr "Ник не обнаружен: %s"
@@ -8472,70 +8083,38 @@
#: ../src/groupchat_control.py:1656
#, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked. Does "
-"NOT support spaces in nickname."
-msgstr ""
-"Использование: /%s <ник|JID> [причина], запрещает JID заходить в комнату. "
-"Ник посетителя можно подставить, если он не содержит «@». Если JID в данный "
-"момент находится в комнате, то он/она/оно также будет выгнан. НЕ "
-"поддерживает пробелы в никах."
+msgid "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The nickname of an occupant may be substituted, but not if it contains \"@\". If the JID is currently in the group chat, he/she/it will also be kicked. Does NOT support spaces in nickname."
+msgstr "Использование: /%s <ник|JID> [причина], запрещает JID заходить в комнату. Ник посетителя можно подставить, если он не содержит «@». Если JID в данный момент находится в комнате, то он/она/оно также будет выгнан. НЕ поддерживает пробелы в никах."
#: ../src/groupchat_control.py:1663
#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Использование: /%s <ник>, открывает окно привата с указанным посетителем."
+msgid "Usage: /%s <nickname>, opens a private chat window with the specified occupant."
+msgstr "Использование: /%s <ник>, открывает окно привата с указанным посетителем."
#: ../src/groupchat_control.py:1669
#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Использование: /%s [причина], закрывает текущее окно или вкладку, приводя "
-"причину, если она указана."
+msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
+msgstr "Использование: /%s [причина], закрывает текущее окно или вкладку, приводя причину, если она указана."
#: ../src/groupchat_control.py:1675
#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с "
-"возможным указанием причины."
+msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
+msgstr "Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с возможным указанием причины."
#: ../src/groupchat_control.py:1679
#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Использование: /%s <комната>@<сервер>[/ник], предлагает подключиться к "
-"комната@сервер, с возможным указанием ника."
+msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
+msgstr "Использование: /%s <комната>@<сервер>[/ник], предлагает подключиться к комната@сервер, с возможным указанием ника."
#: ../src/groupchat_control.py:1683
#, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason. Does NOT support "
-"spaces in nickname."
-msgstr ""
-"Использование: /%s <ник> [причина], удаляет посетителя с указанным ником из "
-"комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
+msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the group chat and optionally displays a reason. Does NOT support spaces in nickname."
+msgstr "Использование: /%s <ник> [причина], удаляет посетителя с указанным ником из комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
#: ../src/groupchat_control.py:1692
#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Использование: /%s <ник> [сообщение], открывает окно личной беседы и "
-"отсылает сообщение посетителю с указанным ником."
+msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
+msgstr "Использование: /%s <ник> [сообщение], открывает окно личной беседы и отсылает сообщение посетителю с указанным ником."
#: ../src/groupchat_control.py:1697
#, python-format
@@ -8550,16 +8129,12 @@
#: ../src/groupchat_control.py:1705
#, python-format
msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
+msgstr "Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
#: ../src/groupchat_control.py:1708
#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Использование: /%s <сообщение>, отсылает сообщение без поиска других команд "
-"в нем."
+msgid "Usage: /%s <message>, sends a message without looking for other commands."
+msgstr "Использование: /%s <сообщение>, отсылает сообщение без поиска других команд в нем."
#: ../src/groupchat_control.py:1837
#, python-format
@@ -8567,8 +8142,7 @@
msgstr "Вы точно хотите выйти из комнаты «%s»?"
#: ../src/groupchat_control.py:1839
-msgid ""
-"If you close this window, you will be disconnected from this group chat."
+msgid "If you close this window, you will be disconnected from this group chat."
msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
#: ../src/groupchat_control.py:1876
@@ -8612,12 +8186,13 @@
msgid "Kicking %s"
msgstr "Выгоняем %s"
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2390
+#: ../src/groupchat_control.py:2084
+#: ../src/groupchat_control.py:2388
msgid "You may specify a reason below:"
msgstr "Вы можете указать причину ниже:"
#. ask for reason
-#: ../src/groupchat_control.py:2389
+#: ../src/groupchat_control.py:2387
#, python-format
msgid "Banning %s"
msgstr "Забанить %s"
@@ -8627,12 +8202,8 @@
msgstr "Обнаружена ошибка в программе"
#: ../src/gtkexcepthook.py:47
-msgid ""
-"It probably is not fatal, but should be reported to the developers "
-"nonetheless."
-msgstr ""
-"Возможно это не так страшно, но все равно стоит сообщить об этом "
-"разработчикам."
+msgid "It probably is not fatal, but should be reported to the developers nonetheless."
+msgstr "Возможно это не так страшно, но все равно стоит сообщить об этом разработчикам."
#: ../src/gtkexcepthook.py:54
msgid "_Report Bug"
@@ -8643,7 +8214,8 @@
msgstr "Детали"
#. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:166
+#: ../src/gtkgui_helpers.py:181
#, python-format
msgid "Error: cannot open %s for reading"
msgstr "Ошибка: не могу открыть %s для чтения"
@@ -8674,8 +8246,7 @@
#: ../src/gtkgui_helpers.py:735
msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr ""
-"Всегда проверять при запуске является ли Gajim основным jabber-клиентом"
+msgstr "Всегда проверять при запуске является ли Gajim основным jabber-клиентом"
#: ../src/gtkgui_helpers.py:804
msgid "Extension not supported"
@@ -8684,9 +8255,7 @@
#: ../src/gtkgui_helpers.py:805
#, python-format
msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr ""
-"Изображение нельзя сохранить в формате %(type)s. Сохранить как %"
-"(new_filename)s?"
+msgstr "Изображение нельзя сохранить в формате %(type)s. Сохранить как %(new_filename)s?"
#: ../src/gtkgui_helpers.py:844
msgid "Save Image as..."
@@ -8702,40 +8271,36 @@
msgstr "Контакты"
#. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:150
+#: ../src/history_manager.py:190
#: ../src/history_window.py:95
msgid "Date"
msgstr "Дата"
#. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:156
+#: ../src/history_manager.py:208
msgid "Nickname"
msgstr "Ник"
#. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:164
+#: ../src/history_manager.py:196
#: ../src/history_window.py:103
msgid "Message"
msgstr "Сообщение"
#: ../src/history_manager.py:224
-msgid ""
-"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
-"RUNNING)"
-msgstr ""
-"Вы хотите очистить базу данных? (КРАЙНЕ НЕ РЕКОМЕНДУЕТСЯ, ЕСЛИ GAJIM ЗАПУЩЕН)"
+msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
+msgstr "Вы хотите очистить базу данных? (КРАЙНЕ НЕ РЕКОМЕНДУЕТСЯ, ЕСЛИ GAJIM ЗАПУЩЕН)"
#: ../src/history_manager.py:226
msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
+"Normally allocated database size will not be freed, it will just become reusable. If you really want to reduce database filesize, click YES, else click NO.\n"
"\n"
"In case you click YES, please wait..."
msgstr ""
-"Обычно размер файла базы данных не уменьшается при очистке, а используется "
-"заново. Если вы хотите действительно уменьшить размер файла, нажмите ДА, в "
-"противном случае нажмите НЕТ.\n"
+"Обычно размер файла базы данных не уменьшается при очистке, а используется заново. Если вы хотите действительно уменьшить размер файла, нажмите ДА, в противном случае нажмите НЕТ.\n"
"\n"
"Если вы нажали ДА, пожалуйста подождите..."
@@ -8755,7 +8320,8 @@
msgstr[1] "Вы точно хотите удалить логи выделенных контактов?"
msgstr[2] "Вы точно хотите удалить логи выделенных контактов?"
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:553
+#: ../src/history_manager.py:588
msgid "This is an irreversible operation."
msgstr "Это необратимая операция"
@@ -8790,7 +8356,8 @@
msgid "Status is now: %(status)s"
msgstr "Статус установлен в: %(status)s"
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:591
+#: ../src/htmltextview.py:602
msgid "Timeout loading image"
msgstr "Не могу загрузить изображение"
@@ -8870,18 +8437,22 @@
msgid "Retrieving profile..."
msgstr "Получаю данные..."
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:109
+#: ../src/roster_window.py:2787
msgid "File is empty"
msgstr "Пустой файл"
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:112
+#: ../src/roster_window.py:2790
msgid "File does not exist"
msgstr "Файл не существует"
#. keep identation
#. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:126
+#: ../src/profile_window.py:142
+#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2803
msgid "Could not load image"
msgstr "Не могу загрузить изображение"
@@ -8906,13 +8477,11 @@
msgstr "Публикация vCard не удалась"
#: ../src/profile_window.py:358
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"При публикации вашей личной информации произошла ошибка, попробуйте позже."
+msgid "There was an error while publishing your personal information, try again later."
+msgstr "При публикации вашей личной информации произошла ошибка, попробуйте позже."
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:288
+#: ../src/roster_window.py:945
msgid "Merged accounts"
msgstr "Объединенные учетные записи"
@@ -8944,44 +8513,36 @@
msgstr "Теперь «%s» всегда будет видеть вас в оффлайне."
#: ../src/roster_window.py:1920
-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)"
-msgstr ""
-"Gnome Keyring установлен, но некорректно запущен\t\t\t\t\t\t\t\t(возможно "
-"неверно установлена переменная среды)"
+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)"
+msgstr "Gnome Keyring установлен, но некорректно запущен\t\t\t\t\t\t\t\t(возможно неверно установлена переменная среды)"
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1930
+#: ../src/roster_window.py:1950
msgid "GPG is not usable"
msgstr "GPG использовать невозможно"
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2119
+#: ../src/roster_window.py:3267
msgid "You are participating in one or more group chats"
msgstr "Вы находитесь в одной или более комнатах"
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-msgstr ""
-"Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
-"хотите стать невидимым?"
+#: ../src/roster_window.py:2120
+#: ../src/roster_window.py:3268
+msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
+msgstr "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно хотите стать невидимым?"
#: ../src/roster_window.py:2146
msgid "desync'ed"
msgstr "не синхронизировано"
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../src/roster_window.py:2284
+#: ../src/roster_window.py:2521
msgid "You have unread messages"
msgstr "У вас есть непрочитанные сообщения"
#: ../src/roster_window.py:2285
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled and contact is in your roster."
-msgstr ""
-"Сообщения будут доступны для чтения позже, если у вас активирована опция "
-"истории."
+msgid "Messages will only be available for reading them later if you have history enabled and contact is in your roster."
+msgstr "Сообщения будут доступны для чтения позже, если у вас активирована опция истории."
#: ../src/roster_window.py:2522
msgid "You must read them before removing this transport."
@@ -8993,12 +8554,8 @@
msgstr "Транспорт «%s» будет удален"
#: ../src/roster_window.py:2526
-msgid ""
-"You will no longer be able to send and receive messages from contacts using "
-"this transport."
-msgstr ""
-"У вас теперь не будет возможности приема и отправки сообщения контактам "
-"через этот транспорт."
+msgid "You will no longer be able to send and receive messages from contacts using this transport."
+msgstr "У вас теперь не будет возможности приема и отправки сообщения контактам через этот транспорт."
#: ../src/roster_window.py:2529
msgid "Transports will be removed"
@@ -9006,12 +8563,8 @@
#: ../src/roster_window.py:2534
#, python-format
-msgid ""
-"You will no longer be able to send and receive messages to contacts from "
-"these transports: %s"
-msgstr ""
-"У вас больше не будет возможности приема и отправки сообщений через эти "
-"транспорты:%s."
+msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
+msgstr "У вас больше не будет возможности приема и отправки сообщений через эти транспорты:%s."
#. it's jid
#: ../src/roster_window.py:2668
@@ -9059,12 +8612,8 @@
msgstr "Контакт «%s» будет удален из вашего ростера"
#: ../src/roster_window.py:3132
-msgid ""
-"By removing this contact you also remove authorization resulting in him or "
-"her always seeing you as offline."
-msgstr ""
-"Удаляя контакт, вы одновременно удалите авторизацию, и этот человек больше "
-"не сможет видеть ваш статус."
+msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
+msgstr "Удаляя контакт, вы одновременно удалите авторизацию, и этот человек больше не сможет видеть ваш статус."
#. Contact is not in roster
#: ../src/roster_window.py:3137
@@ -9072,12 +8621,8 @@
msgstr "Продолжить?"
#: ../src/roster_window.py:3141
-msgid ""
-"By removing this contact you also by default remove authorization resulting "
-"in him or her always seeing you as offline."
-msgstr ""
-"Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
-"его или её всегда в оффлайне."
+msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
+msgstr "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть его или её всегда в оффлайне."
#: ../src/roster_window.py:3144
msgid "I want this contact to know my status after removal"
@@ -9095,8 +8640,7 @@
"you also remove authorization resulting in them always seeing you as offline."
msgstr ""
"Вы удаляете эти контакты:%s.\n"
-"Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
-"оффлайне."
+"Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в оффлайне."
#: ../src/roster_window.py:3191
msgid "No account available"
@@ -9104,35 +8648,23 @@
#: ../src/roster_window.py:3192
msgid "You must create an account before you can chat with other contacts."
-msgstr ""
-"Для начала беседы с другими людьми прежде необходимо создать учетную запись."
+msgstr "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
#: ../src/roster_window.py:3708
msgid "Metacontacts storage not supported by your server"
msgstr "Сервер не умеет хранить метаконтакты"
#: ../src/roster_window.py:3710
-msgid ""
-"Your server does not support storing metacontacts information. So those "
-"information will not be saved on next reconnection."
-msgstr ""
-"Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при "
-"следующем подключении."
+msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
+msgstr "Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при следующем подключении."
#: ../src/roster_window.py:3784
-msgid ""
-"You are about to create a metacontact. Are you sure you want to continue?"
+msgid "You are about to create a metacontact. Are you sure you want to continue?"
msgstr "Вы точно хотите создать метаконтакт?"
#: ../src/roster_window.py:3786
-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 "
-"accounts."
-msgstr ""
-"Метаконтакты — это метод группировки нескольких контактов в одну запись. "
-"Обычно используется, когда один и тот же человек имеет несколько учетных "
-"записей в Jabber или на транспортах."
+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 accounts."
+msgstr "Метаконтакты — это метод группировки нескольких контактов в одну запись. Обычно используется, когда один и тот же человек имеет несколько учетных записей в Jabber или на транспортах."
#: ../src/roster_window.py:3899
msgid "Invalid file URI:"
@@ -9151,9 +8683,12 @@
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../src/roster_window.py:4587
+#: ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667
+#: ../src/systray.py:243
+#: ../src/systray.py:254
+#: ../src/systray.py:266
#, python-format
msgid "using account %s"
msgstr "используя учетную запись %s"
@@ -9170,7 +8705,8 @@
msgid "using %s account"
msgstr "учетной записи %s"
-#: ../src/roster_window.py:4716 ../src/systray.py:257
+#: ../src/roster_window.py:4716
+#: ../src/systray.py:303
msgid "_Manage Bookmarks..."
msgstr "Управление _закладками..."
@@ -9185,7 +8721,8 @@
msgid "for account %s"
msgstr "для учетной записи %s"
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4838
+#: ../src/roster_window.py:4947
msgid "_Change Status Message"
msgstr "_Изменить сообщение о статусе"
@@ -9210,7 +8747,8 @@
msgstr "_Развернуть все"
#. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5043
+#: ../src/roster_window.py:5568
msgid "Send Group M_essage"
msgstr "_Отправить сообщение группе"
@@ -9264,6 +8802,7 @@
msgstr "Менеджер истории"
#: ../src/roster_window.py:5997
+#: ../src/systray.py:341
msgid "_Join New Group Chat"
msgstr "_Войти в новую комнату"
@@ -9275,12 +8814,14 @@
msgid "Waiting for results"
msgstr "Ожидание результатов"
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:133
+#: ../src/search_window.py:211
msgid "Error in received dataform"
msgstr "Ошибка в принятой форме данных"
#. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:167
+#: ../src/search_window.py:203
msgid "No result"
msgstr "Нет результата"
@@ -9293,7 +8834,8 @@
msgid "Subject: %s"
msgstr "Тема: %s"
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:398
+#: ../src/session.py:433
msgid "Confirm these session options"
msgstr "Подтвердить данные настройки сеанса"
@@ -9327,19 +8869,21 @@
"\n"
"Продолжить этот сеанс?"
-#: ../src/systray.py:176
+#: ../src/systray.py:188
msgid "_Change Status Message..."
msgstr "_Изменить сообщение о статусе..."
-#: ../src/systray.py:270
+#: ../src/systray.py:322
msgid "Hide this menu"
msgstr "Скрыть это меню"
-#: ../src/tooltips.py:327 ../src/tooltips.py:521
+#: ../src/tooltips.py:327
+#: ../src/tooltips.py:521
msgid "Jabber ID: "
msgstr "Jabber ID: "
-#: ../src/tooltips.py:330 ../src/tooltips.py:525
+#: ../src/tooltips.py:330
+#: ../src/tooltips.py:525
msgid "Resource: "
msgstr "Ресурс: "
@@ -9356,7 +8900,8 @@
msgid " [minimized]"
msgstr "[свернуто]"
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:451
+#: ../src/tooltips.py:706
msgid "Status: "
msgstr "Статус: "
@@ -9415,7 +8960,8 @@
msgid "Transferred: "
msgstr "Передано: "
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:684
+#: ../src/tooltips.py:705
msgid "Not started"
msgstr "Не начато"
@@ -9423,7 +8969,8 @@
msgid "Stopped"
msgstr "Остановлено"
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:690
+#: ../src/tooltips.py:693
msgid "Completed"
msgstr "Завершено"
@@ -9460,7 +9007,9 @@
msgid "?OS:Unknown"
msgstr "Неизвестна"
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:272
+#: ../src/vcard.py:282
+#: ../src/vcard.py:482
#, python-format
msgid "since %s"
msgstr "с %s"
@@ -9470,20 +9019,12 @@
msgstr "<b>Ранг:</b>"
#: ../src/vcard.py:319
-msgid ""
-"This contact is interested in your presence information, but you are not "
-"interested in his/her presence"
-msgstr ""
-"Этот контакт хочет знать о вашем присутствии, но вам информация о его или её "
-"присутствии не интересна"
+msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
+msgstr "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её присутствии не интересна"
#: ../src/vcard.py:321
-msgid ""
-"You are interested in the contact's presence information, but he/she is not "
-"interested in yours"
-msgstr ""
-"Вам хочется получать информацию о присутствии контакта, но он или она не "
-"заинтересована в вашей."
+msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
+msgstr "Вам хочется получать информацию о присутствии контакта, но он или она не заинтересована в вашей."
#: ../src/vcard.py:323
msgid "You and the contact are interested in each other's presence information"
@@ -9491,9 +9032,7 @@
#. None
#: ../src/vcard.py:325
-msgid ""
-"You are not interested in the contact's presence, and neither he/she is "
-"interested in yours"
+msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
msgstr "Ни вы, ни ваш контакт не желаете знать о присутствии друг друга"
#: ../src/vcard.py:332
@@ -9504,45 +9043,49 @@
msgid "There is no pending subscription request."
msgstr "Нет ожидающего запроса на подписку."
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:339
+#: ../src/vcard.py:377
+#: ../src/vcard.py:507
msgid " resource with priority "
msgstr " ресурс с приоритетом "
+#~ msgid "Show a list of formattings"
+#~ msgstr "Показать список форматирования"
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Выберите учетную запись для объединения"
+#~ msgid "Underline"
+#~ msgstr "Подчеркнутый"
+#~ msgid "Strike"
+#~ msgstr "Зачеркнутый"
+#~ msgid "Font"
+#~ msgstr "Шрифт"
+#~ msgid "Clear formating"
+#~ msgstr "Удалить форматирование"
#~ msgid "The username used to identify the Last.fm account."
#~ msgstr "Имя пользователя на Last.fm."
-
#~ msgid "Network Manager support not available"
#~ msgstr "Network Manager не используется"
-
#~ msgid "Session Management support not available (missing gnome.ui module)"
#~ msgstr ""
#~ "Отсутствует поддержка управления сеансами (отсутствует модуль gnome.ui)"
-
#~ msgid "Thoughtful"
#~ msgstr "В раздумье"
-
#~ msgid ""
#~ "If checked, Gajim will sort contacts in roster window and groupchats by "
#~ "their status and not by the shown name"
#~ msgstr ""
#~ "Если отмечено, то Gajim будет сортировать контакты в окне ростера и в "
#~ "окнах комнат по статусу, а не по имени"
-
#~ msgid "E2E encryption enabled"
#~ msgstr "E2E шифрование включено"
-
#~ 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 "The following message was "
#~ msgstr "Следующее сообщение было "
-
#~ msgid "Close"
#~ msgstr "Закрыть"
@@ -9553,16 +9096,12 @@
#, fuzzy
#~ msgid "This message was not delivered"
#~ msgstr "[Это сообщение зашифровано]"
-
#~ msgid "Other"
#~ msgstr "Другое"
-
#~ msgid "<b>Doing Chores</b>"
#~ msgstr "<b>Работа по хозяйству</b>"
-
#~ msgid "<b>Drinking</b>"
#~ msgstr "<b>Пью</b>"
-
#~ msgid "<b>Eating</b>"
#~ msgstr "<b>Ем</b>"
@@ -9570,28 +9109,20 @@
#, fuzzy
#~ msgid "<b>Exercising</b>"
#~ msgstr "<b>Упражняюсь</b>"
-
#~ msgid "<b>Grooming</b>"
#~ msgstr "<b>Уход за собой</b>"
-
#~ msgid "<b>Having an Appointment</b>"
#~ msgstr "<b>Встреча</b>"
-
#~ msgid "<b>Inactive</b>"
#~ msgstr "<b>Неактивен</b>"
-
#~ msgid "<b>Relaxing</b>"
#~ msgstr "<b>Отдыхаю</b>"
-
#~ msgid "<b>Talking</b>"
#~ msgstr "<b>Разговариваю</b>"
-
#~ msgid "<b>Traveling</b>"
#~ msgstr "<b>Путешествую</b>"
-
#~ msgid "<b>Working</b>"
#~ msgstr "<b>Работаю</b>"
-
#~ msgid ""
#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
#~ "third person. (e.g. /%s explodes.)"
@@ -9602,118 +9133,86 @@
#, fuzzy
#~ msgid "%s is now %s"
#~ msgstr "%s %s"
-
#~ msgid ""
#~ "Usage: %s %s %s \n"
#~ "\t %s"
#~ msgstr ""
#~ "Использование: %s %s %s \n"
#~ "\t %s"
-
#~ msgid "%s - %s"
#~ msgstr "%s - %s"
-
#~ msgid "mood"
#~ msgstr "настроение"
-
#~ msgid "cold"
#~ msgstr "неприветливый"
-
#~ msgid "hot"
#~ msgstr "страстный"
-
#~ msgid "moody"
#~ msgstr "капризный"
-
#~ msgid "sick"
#~ msgstr "больной"
-
#~ msgid "working"
#~ msgstr "работаю"
-
#~ msgid "eating"
#~ msgstr "кушаю"
-
#~ msgid "inactive"
#~ msgstr "неактивен"
-
#~ msgid "walking"
#~ msgstr "гуляю"
-
#~ msgid "sleeping"
#~ msgstr "Сплю"
-
#~ msgid "other"
#~ msgstr "другое"
-
#~ msgid "Accept"
#~ msgstr "Принять"
-
#~ msgid "Invitation Received"
#~ msgstr "Получено приглашение"
-
#~ msgid "Confirm Passphrase"
#~ msgstr "Подтверждение парольной фразы"
-
#~ msgid "Enter your new passphrase again for confirmation"
#~ msgstr "Введите снова для подтверждения"
-
#~ msgid "Create Passphrase"
#~ msgstr "Создать парольную фразу"
-
#~ msgid "Passphrases did not match.\n"
#~ msgstr "Пароли не совпадают.\n"
-
#~ msgid ""
#~ "When negotiating an encrypted session, should Gajim prefer to use public "
#~ "keys for identification?"
#~ msgstr ""
#~ "Когда устанавливается зашифрованная сессия, дожен ли Gajim предпочитать "
#~ "использовать открытый ключ для идентификации?"
-
#~ msgid "Click to see past conversations with this contact"
#~ msgstr "Щелкните для просмотра последних бесед с этим человеком"
-
#~ msgid "Click to see past conversation in this room"
#~ msgstr "Щелкните для просмотра бесед в этой комнате"
-
#~ msgid "<b>Publish and Subscribe</b>"
#~ msgstr "<b>Отправка и получение</b>"
-
#~ msgid "Allow others to see your:"
#~ msgstr "_Позволить ему или ей видеть мой статус"
-
#~ msgid "Receive your contact's:"
#~ msgstr "Получать от ваших контактов:"
-
#~ msgid "Tune"
#~ msgstr "Слушаю"
-
#~ msgid ""
#~ "\n"
#~ "From: %(from_address)s"
#~ msgstr ""
#~ "\n"
#~ "От: %(from_address)s"
-
#~ msgid ""
#~ "If checked, Gajim can regularly poll a Last.fm account and sends recently "
#~ "played songs through PEP."
#~ msgstr ""
#~ "Если включено, Gajim будет проверять аккаунт на Last.fm и менять ваш PEP "
#~ "статус на имя проигрываемого трека. "
-
#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
#~ msgstr ""
#~ "Нет такой команды: /%s (если вы хотите её просто передать, то добавьте к "
#~ "ней префикс /say)"
-
#~ msgid "<b>History Viewer</b>"
#~ msgstr "<b>Менеджер истории</b>"
-
#~ msgid "<b>JID Selection</b>"
#~ msgstr "<b>Выбор JID</b>"
-
#~ msgid ""
#~ "Choose the chatlog you want to view. \n"
#~ "Enter the jid of a groupchat or a contact here. For online accounts you "
@@ -9721,68 +9220,49 @@
#~ msgstr ""
#~ "Выберите лог чата, который хотите посмотреть. \n"
#~ "Введите jid чата или контакта. Для онлайн контактов можете ввести ники."
-
#~ msgid "in"
#~ msgstr "в"
-
#~ msgid "Role:"
#~ msgstr "Обязанности:"
-
#~ msgid "Affiliation:"
#~ msgstr "Ранг:"
-
#~ msgid "Connection to host could not be established"
#~ msgstr "Не удалось соединиться с хостом"
-
#~ msgid ""
#~ "Connection to host could not be established: Incorrect answer from server."
#~ msgstr "Нельзя подключиться к хосту: Неверный ответ от сервера."
-
#~ msgid "_Services"
#~ msgstr "_Сервисы"
-
#~ msgid "Address"
#~ msgstr "Адрес"
-
#~ msgid "City:"
#~ msgstr "Город:"
-
#~ msgid "Company:"
#~ msgstr "Компания:"
-
#~ msgid "Country:"
#~ msgstr "Страна:"
-
#~ msgid "Given:"
#~ msgstr "Имя:"
-
#~ msgid "Middle:"
#~ msgstr "Отчество:"
-
#~ msgid "Position:"
#~ msgstr "Должность:"
-
#~ msgid "Prefix:"
#~ msgstr "Префикс:"
-
#~ msgid "State:"
#~ msgstr "Штат:"
-
#~ msgid "Suffix:"
#~ msgstr "Суффикс:"
-
#~ msgid "Ask:"
#~ msgstr "Спрашивать:"
-
#~ msgid "Client:"
#~ msgstr "Клиент:"
-
#~ msgid "OS:"
#~ msgstr "ОС:"
-
#~ msgid "Subscription:"
#~ msgstr "Подписка:"
#, fuzzy
#~ msgid "%s is now %s (%s)"
#~ msgstr "%s %s (%s)"
+
1
0
Author: asterix
Date: 2008-12-02 20:49:17 +0100 (Tue, 02 Dec 2008)
New Revision: 10753
Modified:
branches/gajim_0.12/po/ru.po
Log:
[Fomin Denis] updated russian translation
Modified: branches/gajim_0.12/po/ru.po
===================================================================
--- branches/gajim_0.12/po/ru.po 2008-12-02 15:53:23 UTC (rev 10752)
+++ branches/gajim_0.12/po/ru.po 2008-12-02 19:49:17 UTC (rev 10753)
@@ -13,8 +13,8 @@
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-17 23:01+0100\n"
-"PO-Revision-Date: 2008-11-18 00:30+0300\n"
+"POT-Creation-Date: 2008-12-01 22:29+0100\n"
+"PO-Revision-Date: 2008-12-02 18:30+0300\n"
"Last-Translator: Fomin Denis <fominde(a)mail.ru>\n"
"Language-Team: Русский <ru(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -301,8 +301,8 @@
#: ../data/glade/account_modification_window.glade.h:16
#: ../data/glade/accounts_window.glade.h:20
#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../src/common/helpers.py:1055 ../src/notify.py:514 ../src/notify.py:545
+#: ../src/notify.py:557
msgid "Gajim"
msgstr "Gajim"
@@ -314,8 +314,8 @@
#: ../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:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../src/dialogs.py:166 ../src/roster_window.py:2672
+#: ../src/roster_window.py:5157
msgid "General"
msgstr "Общие"
@@ -392,8 +392,8 @@
#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2741
+#: ../src/roster_window.py:2747 ../src/roster_window.py:2752
msgid "None"
msgstr "Нет"
@@ -572,7 +572,7 @@
msgstr "_Объединить учетные записи"
#. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5108
msgid "Re_name"
msgstr "П_ереименовать"
@@ -1052,7 +1052,7 @@
#: ../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:5805
+#: ../src/roster_window.py:5804
msgid "_History"
msgstr "_История"
@@ -1428,8 +1428,8 @@
msgid "Room:"
msgstr "Комната:"
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1199
+#: ../src/disco.py:1620
msgid "_Join"
msgstr "_Присоединиться"
@@ -2129,7 +2129,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:2566
msgid "Privacy List"
msgstr "Список доступа"
@@ -2333,8 +2333,8 @@
#. Remove group
#. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5145
+#: ../src/roster_window.py:5622 ../src/roster_window.py:5751
msgid "_Remove"
msgstr "_Удалить"
@@ -2356,14 +2356,14 @@
#. Execute Command
#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5694
msgid "Execute Command..."
msgstr "Выполнить команду..."
#. Invite to
#. Invite to Groupchat
#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5063 ../src/roster_window.py:5575
msgid "In_vite to"
msgstr "_Пригласить в"
@@ -2373,7 +2373,7 @@
#. Send Custom Status
#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5073 ../src/roster_window.py:5660
msgid "Send Cus_tom Status"
msgstr "Установи_ть статус"
@@ -2399,8 +2399,8 @@
msgstr "_Позволить ему или ей видеть мой статус"
#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
+#: ../src/roster_window.py:5136 ../src/roster_window.py:5612
+#: ../src/roster_window.py:5741
msgid "_Block"
msgstr "_Блокировать"
@@ -2426,8 +2426,8 @@
msgstr "_Подписка"
#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
+#: ../src/roster_window.py:5130 ../src/roster_window.py:5606
+#: ../src/roster_window.py:5738
msgid "_Unblock"
msgstr "_Разблокировать"
@@ -2485,7 +2485,7 @@
msgid "_Contents"
msgstr "_Содержание"
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1353
msgid "_Edit"
msgstr "_Правка"
@@ -2526,11 +2526,11 @@
msgstr "Добавить _контакт"
#. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5763
msgid "_Information"
msgstr "_Информация о контакте"
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1211
msgid "_Search"
msgstr "_Поиск"
@@ -2743,13 +2743,13 @@
#. Edit Groups
#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5595
msgid "Edit _Groups"
msgstr "Редактировать _группы"
#. Rename
#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5721
msgid "_Rename"
msgstr "П_ереименовать"
@@ -2973,11 +2973,11 @@
#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:904 ../src/gajim.py:1633 ../src/roster_window.py:916
-#: ../src/roster_window.py:1542 ../src/roster_window.py:1544
-#: ../src/roster_window.py:1880 ../src/roster_window.py:3111
-#: ../src/roster_window.py:3135 ../src/roster_window.py:5258
-#: ../src/roster_window.py:5442
+#: ../src/dialogs.py:904 ../src/gajim.py:979 ../src/gajim.py:1639
+#: ../src/roster_window.py:915 ../src/roster_window.py:1541
+#: ../src/roster_window.py:1543 ../src/roster_window.py:1879
+#: ../src/roster_window.py:3110 ../src/roster_window.py:3134
+#: ../src/roster_window.py:5257 ../src/roster_window.py:5441
msgid "Not in Roster"
msgstr "Не в ростере"
@@ -3017,7 +3017,7 @@
msgstr "%(nickname)s из комнаты %(room_name)s"
#. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3911
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3912
msgid "No GPG key assigned"
msgstr "Ключ GPG не присвоен"
@@ -3177,8 +3177,8 @@
#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1847
#: ../src/common/connection_handlers.py:1893
#: ../src/common/connection_handlers.py:2081
-#: ../src/common/connection_handlers.py:2207 ../src/common/connection.py:1222
-#: ../src/gajim.py:170
+#: ../src/common/connection_handlers.py:2213 ../src/common/connection.py:1218
+#: ../src/gajim.py:174
msgid "Database Error"
msgstr "Ошибка базы данных"
@@ -3191,7 +3191,7 @@
"Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его "
"или удалить (вся история будет утеряна)."
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2613
#, python-format
msgid "%(name)s is now %(status)s"
msgstr "%(name)s теперь %(status)s"
@@ -3281,8 +3281,8 @@
#. Make special context menu if group is Groupchats
#: ../src/common/commands.py:206 ../src/common/contacts.py:94
#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1547
+#: ../src/roster_window.py:5033
msgid "Groupchats"
msgstr "Комнаты"
@@ -3335,7 +3335,7 @@
#. sorted alphanum
#: ../src/common/config.py:112 ../src/common/config.py:448
#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
+#: ../src/common/optparser.py:467 ../src/gajim.py:3124
msgid "default"
msgstr "По_умолчанию"
@@ -4110,8 +4110,8 @@
#: ../src/common/connection_handlers.py:1845
#: ../src/common/connection_handlers.py:1891
#: ../src/common/connection_handlers.py:2079
-#: ../src/common/connection_handlers.py:2205 ../src/common/connection.py:1220
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:2211 ../src/common/connection.py:1216
+#: ../src/gajim.py:396
msgid "Disk Write Error"
msgstr "Ошибка записи на диск"
@@ -4127,8 +4127,8 @@
#: ../src/common/connection_handlers.py:1848
#: ../src/common/connection_handlers.py:1894
#: ../src/common/connection_handlers.py:2082
-#: ../src/common/connection_handlers.py:2208 ../src/common/connection.py:1223
-#: ../src/gajim.py:171
+#: ../src/common/connection_handlers.py:2214 ../src/common/connection.py:1219
+#: ../src/gajim.py:175
#, python-format
msgid ""
"The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4150,7 +4150,7 @@
#: ../src/common/connection_handlers.py:2044
#: ../src/common/connection_handlers.py:2047
#: ../src/common/connection_handlers.py:2050
-#: ../src/common/connection_handlers.py:2054 ../src/gajim.py:556
+#: ../src/common/connection_handlers.py:2054 ../src/gajim.py:560
msgid "Unable to join group chat"
msgstr "Не получается войти в комнату"
@@ -4209,7 +4209,7 @@
msgid "we are now unsubscribed from %s"
msgstr "теперь мы отписались от %s"
-#: ../src/common/connection_handlers.py:2331
+#: ../src/common/connection_handlers.py:2337
#, python-format
msgid ""
"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4220,15 +4220,15 @@
"удалить его"
#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2356
+#: ../src/common/connection_handlers.py:2362
#: ../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:2358
+#: ../src/common/connection_handlers.py:2364
#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "Вы будете подключены к %s без использования OpenPGP."
@@ -4401,13 +4401,13 @@
msgstr "Соединение с прокси разорвалось"
#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1355
+#: ../src/common/connection.py:1351
#: ../src/common/zeroconf/connection_zeroconf.py:248
#, python-format
msgid "Could not connect to \"%s\""
msgstr "Не могу соединиться с «%s»"
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:611 ../src/gajim.py:1056
msgid "Check your connection or try again later."
msgstr "Проверьте настройки сети или попробуйте еще раз позже."
@@ -4470,25 +4470,25 @@
"Список доступа %s не может быть удален. Возможно, он используется одним из "
"ваших активных ресурсов. Отключите ресурс и попробуйте снова."
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../src/common/connection.py:1095
+#: ../src/common/zeroconf/connection_zeroconf.py:386
msgid "Neither the remote presence is signed, nor a key was assigned."
msgstr "Ни удаленное присутствие не подписано, ни ключ не присвоен."
-#: ../src/common/connection.py:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/connection.py:1097
+#: ../src/common/zeroconf/connection_zeroconf.py:388
#, python-format
msgid "The contact's key (%s) does not match the key assigned in Gajim."
msgstr "Ключ (%s) контакта не соответствует ключу, присвоенному в Gajim."
#. we're not english
#. one in locale and one en
-#: ../src/common/connection.py:1105
+#: ../src/common/connection.py:1106
msgid "[This message is *encrypted* (See :XEP:`27`]"
msgstr "[Это сообщение *зашифровано* (см. :XEP:`27`]"
-#: ../src/common/connection.py:1210
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:465
#, python-format
msgid ""
"Subject: %(subject)s\n"
@@ -4497,19 +4497,20 @@
"Тема: %(subject)s\n"
"%(message)s"
-#: ../src/common/connection.py:1388
+#: ../src/common/connection.py:1384
msgid "Not fetched because of invisible status"
msgstr "Нельзя получить из-за невидимости"
#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/gajim.py:979
msgid "Observers"
msgstr "Наблюдатели"
#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../src/disco.py:1350 ../src/gajim.py:806 ../src/roster_window.py:818
+#: ../src/roster_window.py:1470 ../src/roster_window.py:1537
+#: ../src/roster_window.py:1539 ../src/roster_window.py:1676
msgid "Transports"
msgstr "Транспорты"
@@ -5662,7 +5663,7 @@
msgid "Could not change status of account \"%s\""
msgstr "Не могу изменить статус учётной записи «%s»"
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:379
msgid ""
"You are not connected or not visible to others. Your message could not be "
"sent."
@@ -5670,16 +5671,16 @@
"Вы не подключены или невидимы для других. Ваше сообщение нельзя отправить."
#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:396
msgid "[This message is encrypted]"
msgstr "[Это сообщение зашифровано]"
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:477
msgid "Your message could not be sent."
msgstr "Ваше сообщение не может быть отправлено."
#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:484
msgid "Contact is offline. Your message could not be sent."
msgstr "Контакт не в сети. Отправить сообщение не удалось."
@@ -5777,7 +5778,7 @@
#. Name column
#: ../src/config.py:1319 ../src/dialogs.py:1824 ../src/dialogs.py:1888
-#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/disco.py:770 ../src/disco.py:1564 ../src/disco.py:1811
#: ../src/history_window.py:87
msgid "Name"
msgstr "Имя"
@@ -5955,7 +5956,7 @@
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2407 ../src/disco.py:777 ../src/history_manager.py:184
msgid "JID"
msgstr "JID"
@@ -6041,16 +6042,16 @@
msgid "Removing %s account"
msgstr "Удаление учетной записи %s"
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2580 ../src/gajim.py:1428 ../src/roster_window.py:1942
msgid "Password Required"
msgstr "Требуется пароль"
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2581 ../src/roster_window.py:1916
#, python-format
msgid "Enter your password for account %s"
msgstr "Введите пароль для учетной записи %s"
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2582 ../src/roster_window.py:1943
msgid "Save password"
msgstr "Сохранить пароль"
@@ -6132,11 +6133,11 @@
msgid "Please provide a server on which you want to register."
msgstr "Укажите сервер, на котором вы хотите зарегистрироваться."
-#: ../src/config.py:3189 ../src/gajim.py:1996
+#: ../src/config.py:3189 ../src/gajim.py:2006
msgid "Certificate Already in File"
msgstr "Сертификат уже находится в файле"
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../src/config.py:3190 ../src/gajim.py:2007
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr "Этот сертификат уже есть в файле %s, поэтому он не был добавлен."
@@ -6156,7 +6157,7 @@
"Ошибка SSL: %(error)s\n"
"Соединиться с этим сервером?"
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3264 ../src/gajim.py:2030
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -6215,15 +6216,15 @@
msgstr "Искать в _словаре"
#: ../src/conversation_textview.py:712
-#, fuzzy, python-format
+#, python-format
msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
-msgstr "URL словаря пропущен в «%s» и это не WIKTIONARY"
+msgstr "В URL словаря отсутствует «%s» и это не WIKTIONARY"
#. we must have %s in the url
#: ../src/conversation_textview.py:725
-#, fuzzy, python-format
+#, python-format
msgid "Web Search URL is missing an \"%s\""
-msgstr "URL Web-поиска отсутствует в «%s»"
+msgstr "В URL Web-поиска отсутствует «%s»"
#: ../src/conversation_textview.py:728
msgid "Web _Search for it"
@@ -6233,24 +6234,24 @@
msgid "Open as _Link"
msgstr "Открыть как _ссылку"
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#: ../src/conversation_textview.py:978 ../src/conversation_textview.py:996
#, python-format
msgid "Error executing \"%(command)s\": %(error)s"
msgstr "Ошибка выполнения «%(command)s»: %(error)s"
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1248
msgid "Yesterday"
msgstr "Вчера"
#. the number is >= 2
#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1252
#, python-format
msgid "%i days ago"
msgstr "%i дней назад"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1286
#, python-format
msgid "Subject: %s\n"
msgstr "Тема: %s\n"
@@ -6445,7 +6446,7 @@
msgid "Subscription request from %s"
msgstr "Запрос на подписку от %s"
-#: ../src/dialogs.py:1669 ../src/gajim.py:2617
+#: ../src/dialogs.py:1669 ../src/gajim.py:2627
#, python-format
msgid "You are already in group chat %s"
msgstr "Вы уже в комнате %s"
@@ -6524,11 +6525,11 @@
"Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
#. if offline or connecting
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2344 ../src/dialogs.py:2487
+#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
msgid "Connection not available"
msgstr "Соединение недоступно"
-#: ../src/dialogs.py:1971 ../src/dialogs.py:2345 ../src/dialogs.py:2488
+#: ../src/dialogs.py:1971 ../src/dialogs.py:2346 ../src/dialogs.py:2489
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "Удостоверьтесь, что вы подключены к «%s»."
@@ -6564,233 +6565,233 @@
#. img to display
#. default value
-#: ../src/dialogs.py:2055 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/dialogs.py:2056 ../src/notify.py:245 ../src/notify.py:472
#: ../src/osx/growler.py:12
msgid "Contact Signed In"
msgstr "Контакт подключился"
-#: ../src/dialogs.py:2057 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/dialogs.py:2058 ../src/notify.py:253 ../src/notify.py:474
#: ../src/osx/growler.py:12
msgid "Contact Signed Out"
msgstr "Контакт отключился"
#. chat message
-#: ../src/dialogs.py:2059 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/dialogs.py:2060 ../src/notify.py:276 ../src/notify.py:476
#: ../src/osx/growler.py:12
msgid "New Message"
msgstr "Новое сообщение"
#. single message
-#: ../src/dialogs.py:2059 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/dialogs.py:2060 ../src/notify.py:257 ../src/notify.py:476
#: ../src/osx/growler.py:13
msgid "New Single Message"
msgstr "Новое одиночное сообщение"
#. private message
-#: ../src/dialogs.py:2060 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/dialogs.py:2061 ../src/notify.py:264 ../src/notify.py:477
#: ../src/osx/growler.py:13
msgid "New Private Message"
msgstr "Новое личное сообщение"
-#: ../src/dialogs.py:2060 ../src/gajim.py:1587 ../src/notify.py:472
+#: ../src/dialogs.py:2061 ../src/gajim.py:1593 ../src/notify.py:485
#: ../src/osx/growler.py:13
msgid "New E-mail"
msgstr "Новое письмо"
-#: ../src/dialogs.py:2062 ../src/gajim.py:1653 ../src/notify.py:466
+#: ../src/dialogs.py:2063 ../src/gajim.py:1659 ../src/notify.py:479
#: ../src/osx/growler.py:14
msgid "File Transfer Request"
msgstr "Запрос передачи"
-#: ../src/dialogs.py:2064 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2065 ../src/gajim.py:1559 ../src/gajim.py:1626
+#: ../src/notify.py:481 ../src/osx/growler.py:14
msgid "File Transfer Error"
msgstr "Ошибка передачи"
-#: ../src/dialogs.py:2066 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2067 ../src/gajim.py:1701 ../src/gajim.py:1723
+#: ../src/gajim.py:1740 ../src/notify.py:483 ../src/osx/growler.py:15
msgid "File Transfer Completed"
msgstr "Передача файла завершена"
-#: ../src/dialogs.py:2067 ../src/gajim.py:1698 ../src/notify.py:470
+#: ../src/dialogs.py:2068 ../src/gajim.py:1704 ../src/notify.py:483
#: ../src/osx/growler.py:15
msgid "File Transfer Stopped"
msgstr "Передача остановлена"
-#: ../src/dialogs.py:2069 ../src/gajim.py:1445 ../src/notify.py:474
+#: ../src/dialogs.py:2070 ../src/gajim.py:1449 ../src/notify.py:487
#: ../src/osx/growler.py:16
msgid "Groupchat Invitation"
msgstr "Приглашение в комнату"
-#: ../src/dialogs.py:2071 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/dialogs.py:2072 ../src/notify.py:237 ../src/notify.py:489
#: ../src/osx/growler.py:16
msgid "Contact Changed Status"
msgstr "Контакт изменит статус"
-#: ../src/dialogs.py:2263
+#: ../src/dialogs.py:2264
#, python-format
msgid "Single Message using account %s"
msgstr "Новое сообщение с учетной записи %s"
-#: ../src/dialogs.py:2265
+#: ../src/dialogs.py:2266
#, python-format
msgid "Single Message in account %s"
msgstr "Новое сообщение для учетной записи %s"
-#: ../src/dialogs.py:2267
+#: ../src/dialogs.py:2268
msgid "Single Message"
msgstr "Сообщение"
#. prepare UI for Sending
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2271
#, python-format
msgid "Send %s"
msgstr "Отправить %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2293
+#: ../src/dialogs.py:2294
#, python-format
msgid "Received %s"
msgstr "Получено %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2316
+#: ../src/dialogs.py:2317
#, 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:2389
#, python-format
msgid "RE: %s"
msgstr "RE: %s"
-#: ../src/dialogs.py:2389
+#: ../src/dialogs.py:2390
#, python-format
msgid "%s wrote:\n"
msgstr "%s написал:\n"
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2434
#, python-format
msgid "XML Console for %s"
msgstr "Консоль XML для %s"
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2436
msgid "XML Console"
msgstr "Консоль XML"
-#: ../src/dialogs.py:2559
+#: ../src/dialogs.py:2560
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "Список доступа <b><i>%s</i></b>"
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:2564
#, python-format
msgid "Privacy List for %s"
msgstr "Список доступа для %s"
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:2620
#, 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:2625
#, python-format
msgid "Order: %(order)s, action: %(action)s"
msgstr "Номер: %(order)s, действие: %(action)s"
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:2667
msgid "<b>Edit a rule</b>"
msgstr "<b>Изменить правило</b>"
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:2754
msgid "<b>Add a rule</b>"
msgstr "<b>Добавить правило</b>"
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:2850
#, python-format
msgid "Privacy Lists for %s"
msgstr "Списки доступа для %s"
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:2852
msgid "Privacy Lists"
msgstr "Списки доступа"
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:2922
msgid "Invalid List Name"
msgstr "Недопустимое имя списка"
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:2923
msgid "You must enter a name to create a privacy list."
msgstr "Необходимо ввести имя для нового списка доступа."
-#: ../src/dialogs.py:2954
+#: ../src/dialogs.py:2955
msgid "You are invited to a groupchat"
msgstr "Вы приглашены в конференцию"
-#: ../src/dialogs.py:2957
+#: ../src/dialogs.py:2958
msgid "$Contact has invited you to join a discussion"
msgstr "$Contact приглашает вас присоединиться к обсуждению."
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:2960
#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr "$Contact приглашает вас в комнату %(room_jid)s."
-#: ../src/dialogs.py:2967
+#: ../src/dialogs.py:2968
#, python-format
msgid "Comment: %s"
msgstr "Комментарий: %s"
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2970
msgid "Do you want to accept the invitation?"
msgstr "Вы принимаете приглашение?"
-#: ../src/dialogs.py:3024
+#: ../src/dialogs.py:3025
msgid "Choose Sound"
msgstr "Выберите звуковой файл"
-#: ../src/dialogs.py:3034 ../src/dialogs.py:3085
+#: ../src/dialogs.py:3035 ../src/dialogs.py:3086
msgid "All files"
msgstr "Все файлы"
-#: ../src/dialogs.py:3039
+#: ../src/dialogs.py:3040
msgid "Wav Sounds"
msgstr "В формате Wav"
-#: ../src/dialogs.py:3072
+#: ../src/dialogs.py:3073
msgid "Choose Image"
msgstr "Выбрать картинку"
-#: ../src/dialogs.py:3090
+#: ../src/dialogs.py:3091
msgid "Images"
msgstr "Картинки"
-#: ../src/dialogs.py:3155
+#: ../src/dialogs.py:3156
#, python-format
msgid "When %s becomes:"
msgstr "Когда %s происходит:"
-#: ../src/dialogs.py:3157
+#: ../src/dialogs.py:3158
#, python-format
msgid "Adding Special Notification for %s"
msgstr "Добавление специального уведомления для %s"
#. # means number
-#: ../src/dialogs.py:3228
+#: ../src/dialogs.py:3229
msgid "#"
msgstr "№"
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3235
msgid "Condition"
msgstr "Условие"
-#: ../src/dialogs.py:3352
+#: ../src/dialogs.py:3353
msgid "when I am "
msgstr "когда я "
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:3828
#, python-format
msgid ""
"Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6801,19 +6802,19 @@
"\n"
"Short Authentication String данного сеанса <b>%(sas)s</b>."
-#: ../src/dialogs.py:3831
+#: ../src/dialogs.py:3832
msgid "You have already verified this contact's identity."
msgstr "Вы уже удостоверили личность этого контакта."
-#: ../src/dialogs.py:3837 ../src/dialogs.py:3924
+#: ../src/dialogs.py:3838 ../src/dialogs.py:3925
msgid "Contact's identity verified"
msgstr "Личность контакта удостоверена"
-#: ../src/dialogs.py:3845
+#: ../src/dialogs.py:3846
msgid "Verify again..."
msgstr "Удостоверить снова..."
-#: ../src/dialogs.py:3850
+#: ../src/dialogs.py:3851
msgid ""
"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 "
@@ -6823,19 +6824,19 @@
"сообщения или послать сообщения вам, вы должны удостоверить личность "
"собеседника, нажав кнопку, расположенную ниже."
-#: ../src/dialogs.py:3853 ../src/dialogs.py:3905 ../src/dialogs.py:3918
+#: ../src/dialogs.py:3854 ../src/dialogs.py:3906 ../src/dialogs.py:3919
msgid "Contact's identity NOT verified"
msgstr "Личность контакта НЕ удостоверена"
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:3861
msgid "Verify..."
msgstr "Удостоверить..."
-#: ../src/dialogs.py:3872
+#: ../src/dialogs.py:3873
msgid "Have you verified the contact's identity?"
msgstr "Вы удостоверили личность удаленного контакта?"
-#: ../src/dialogs.py:3873
+#: ../src/dialogs.py:3874
#, python-format
msgid ""
"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6850,23 +6851,23 @@
"\n"
"Short Authentication String этого сеанса <b>%(sas)s</b>"
-#: ../src/dialogs.py:3874
+#: ../src/dialogs.py:3875
msgid "Did you talk to the remote contact and verify the SAS?"
msgstr "Вы переговорили с удаленным контактом и удостоверили SAS?"
-#: ../src/dialogs.py:3906
+#: ../src/dialogs.py:3907
#, python-format
msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
msgstr ""
"Ключ (%s) контакта <b>не соответствует</b> ключу, присвоенному в Gajim."
-#: ../src/dialogs.py:3912
+#: ../src/dialogs.py:3913
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
msgstr ""
"Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
"сообщения."
-#: ../src/dialogs.py:3919
+#: ../src/dialogs.py:3920
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."
@@ -6875,7 +6876,7 @@
"Таким образом, сообщения <b>не могут быть</b> зашифрованы. Воспользуйтесь "
"вашим GPG клиентом для того, чтобы выставить доверие данному ключу"
-#: ../src/dialogs.py:3925
+#: ../src/dialogs.py:3926
msgid ""
"GPG Key is assigned to this contact, and you trust his key, so messages will "
"be encrypted."
@@ -6917,7 +6918,7 @@
"По этому адресу сервисы отсутствуют или не отвечают. Проверьте адрес и "
"попробуйте еще раз."
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:661 ../src/disco.py:957
msgid "The service is not browsable"
msgstr "Сервис недоступен для просмотра"
@@ -6929,64 +6930,64 @@
msgid "Invalid Server Name"
msgstr "Неверное имя сервера"
-#: ../src/disco.py:754
+#: ../src/disco.py:756
#, python-format
msgid "Browsing %(address)s using account %(account)s"
msgstr "Просмотр %(address)s с учетной записью %(account)s"
-#: ../src/disco.py:794
+#: ../src/disco.py:796
msgid "_Browse"
msgstr "_Браузер"
-#: ../src/disco.py:956
+#: ../src/disco.py:958
msgid "This service does not contain any items to browse."
msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
-#: ../src/disco.py:1179
+#: ../src/disco.py:1181
msgid "_Execute Command"
msgstr "В_ыполнить команду..."
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1191 ../src/disco.py:1355
msgid "Re_gister"
msgstr "За_регистрироваться"
-#: ../src/disco.py:1390
+#: ../src/disco.py:1392
#, python-format
msgid "Scanning %(current)d / %(total)d.."
msgstr "Сканирую %(current)d / %(total)d.."
#. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1574
msgid "Users"
msgstr "Пользователи"
#. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1582
msgid "Description"
msgstr "Описание"
#. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1590
msgid "Id"
msgstr "ID"
-#: ../src/disco.py:1818
+#: ../src/disco.py:1820
msgid "Subscribed"
msgstr "Подписка"
-#: ../src/disco.py:1826
+#: ../src/disco.py:1828
msgid "Node"
msgstr "Узел"
-#: ../src/disco.py:1883
+#: ../src/disco.py:1885
msgid "New post"
msgstr "Новое сообщение"
-#: ../src/disco.py:1889
+#: ../src/disco.py:1891
msgid "_Subscribe"
msgstr "_Подписаться"
-#: ../src/disco.py:1895
+#: ../src/disco.py:1897
msgid "_Unsubscribe"
msgstr "_Отписаться"
@@ -7419,36 +7420,36 @@
msgid "Pause"
msgstr "Пауза"
-#: ../src/gajim.py:83
+#: ../src/gajim.py:87
#, python-format
msgid "%s is not a valid loglevel"
msgstr "%s не является допустимым loglevel"
-#: ../src/gajim.py:156
+#: ../src/gajim.py:160
msgid "Gajim needs X server to run. Quiting..."
msgstr "Gajim для запуска требуется X-сервер. Выход..."
-#: ../src/gajim.py:186
+#: ../src/gajim.py:190
msgid "Gajim needs PyGTK 2.8 or above"
msgstr "Gajim требуется PyGTK 2.8 или выше"
-#: ../src/gajim.py:187
+#: ../src/gajim.py:191
msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
msgstr "Gajim для запуска требуется PyGTK 2.8 или выше. Выход..."
-#: ../src/gajim.py:189
+#: ../src/gajim.py:193
msgid "Gajim needs GTK 2.8 or above"
msgstr "Gajim требуется GTK 2.8 или выше"
-#: ../src/gajim.py:190
+#: ../src/gajim.py:194
msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
msgstr "Gajim для запуска требуется GTK 2.8 или выше. Выход..."
-#: ../src/gajim.py:195
+#: ../src/gajim.py:199
msgid "GTK+ runtime is missing libglade support"
msgstr "У GTK отсутствует поддержка libglade."
-#: ../src/gajim.py:197
+#: ../src/gajim.py:201
#, python-format
msgid ""
"Please remove your current GTK+ runtime and install the latest stable "
@@ -7456,20 +7457,20 @@
msgstr ""
"Удалите вашу текущую версию GTK и установите последнюю стабильную версию с %s"
-#: ../src/gajim.py:199
+#: ../src/gajim.py:203
msgid ""
"Please make sure that GTK+ and PyGTK have libglade support in your system."
msgstr "Удостоверьтесь, что GTK+ и PyGTK поддерживают libglade."
-#: ../src/gajim.py:204
+#: ../src/gajim.py:208
msgid "Gajim needs PySQLite2 to run"
msgstr "Gajim для запуска требуется PySQLite2"
-#: ../src/gajim.py:212
+#: ../src/gajim.py:216
msgid "Gajim needs pywin32 to run"
msgstr "Gajim для запуска требуется pywin32"
-#: ../src/gajim.py:213
+#: ../src/gajim.py:217
#, python-format
msgid ""
"Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7479,11 +7480,11 @@
"его на сайте: %s"
#. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:370
msgid "Gajim is already running"
msgstr "Gajim уже запущен"
-#: ../src/gajim.py:367
+#: ../src/gajim.py:371
msgid ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
@@ -7491,25 +7492,25 @@
"По-видимому, уже запущен другой экземпляр Gajim\n"
"Запустить ещё один?"
-#: ../src/gajim.py:493
+#: ../src/gajim.py:497
msgid "Passphrase Required"
msgstr "Требуется парольная фраза"
-#: ../src/gajim.py:494
+#: ../src/gajim.py:498
#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
msgstr "Введите пароль для ключа %(keyid)s (аккаунт %(account)s)."
#. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:513
msgid "Wrong Passphrase"
msgstr "Неверная парольная фраза"
-#: ../src/gajim.py:510
+#: ../src/gajim.py:514
msgid "Please retype your GPG passphrase or press Cancel."
msgstr "Введите парольную фразу для GPG еще раз или нажмите «Отмена»."
-#: ../src/gajim.py:557
+#: ../src/gajim.py:561
#, python-format
msgid ""
"Your desired nickname in group chat %s is in use or registered by another "
@@ -7520,50 +7521,50 @@
"другим пользователем.\n"
"Укажите другой ник:"
-#: ../src/gajim.py:571
+#: ../src/gajim.py:575
msgid "Do you accept this request?"
msgstr "Вы принимаете этот запрос?"
-#: ../src/gajim.py:573
+#: ../src/gajim.py:577
#, python-format
msgid "Do you accept this request on account %s?"
msgstr "Вы принимаете запрос %s?"
-#: ../src/gajim.py:576
+#: ../src/gajim.py:580
#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
msgstr "HTTP (%(method)s) Авторизация для %(url)s (id: %(id)s)"
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:628 ../src/notify.py:491 ../src/osx/growler.py:17
msgid "Connection Failed"
msgstr "Соединение разорвалось"
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:934 ../src/gajim.py:938
#, python-format
msgid "Error %(code)s: %(msg)s"
msgstr "Ошибка %(code)s: %(msg)s"
#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:948 ../src/gajim.py:961
#, python-format
msgid "error while sending %(message)s ( %(error)s )"
msgstr "ошибка при отправке %(message)s ( %(error)s )"
-#: ../src/gajim.py:989
+#: ../src/gajim.py:993
msgid "Authorization accepted"
msgstr "Авторизация принята"
-#: ../src/gajim.py:990
+#: ../src/gajim.py:994
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "Контакт «%s» авторизовал вас, теперь вы можете видеть его статус."
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1013
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "Контакт «%s» отозвал подписку с вами"
-#: ../src/gajim.py:1010
+#: ../src/gajim.py:1014
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
@@ -7571,73 +7572,73 @@
"Вы всегда будете видеть его или её как отключенными.\n"
"Удалить его или её из контакт-листа?"
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1055
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "Связь с «%s» не может быть установлена"
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1231 ../src/groupchat_control.py:1164
#, python-format
msgid "%(nick)s is now known as %(new_nick)s"
msgstr "%(nick)s теперь известен как %(new_nick)s"
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
+#: ../src/gajim.py:1249 ../src/groupchat_control.py:1339
#: ../src/history_window.py:417 ../src/notify.py:232
#, python-format
msgid "%(nick)s is now %(status)s"
msgstr "%(nick)s теперь %(status)s"
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1312
#, python-format
msgid "%(jid)s has set the subject to %(subject)s"
msgstr "%(jid)s установил(а) тему: %(subject)s"
#. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1376 ../src/groupchat_control.py:1124
msgid "Any occupant is allowed to see your full JID"
msgstr "Любой участник может увидеть ваш настоящий JID"
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1379
msgid "Room now shows unavailable member"
msgstr "Теперь в комнате отображается недоступный участник"
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1381
msgid "room now does not show unavailable members"
msgstr "теперь в комнате не отображаются недоступные участники"
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1384
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:1383
+#: ../src/gajim.py:1387
msgid "Room logging is now enabled"
msgstr "Запись логов конференции включена"
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1389
msgid "Room logging is now disabled"
msgstr "Запись логов конференции выключена"
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1391
msgid "Room is now non-anonymous"
msgstr "Конференция не анонимна"
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1394
msgid "Room is now semi-anonymous"
msgstr "Конференция частично анонимна"
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1397
msgid "Room is now fully-anonymous"
msgstr "Конференция полностью анонимна"
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1429
#, python-format
msgid "A Password is required to join the room %s. Please type it."
msgstr "Чтобы войти в комнату %s, нужен пароль."
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1463
msgid ""
"You configured Gajim to use GPG agent, but there is no GPG agent running or "
"it returned a wrong passphrase.\n"
@@ -7645,20 +7646,20 @@
"Gajim настроен на использование GPG агента, но GPG агент не запущен или он "
"возвратил неверный пароль.\n"
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1465
msgid "You are currently connected without your OpenPGP key."
msgstr "Вы сейчас соединены без OpenPGP ключа."
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1468
msgid "Your passphrase is incorrect"
msgstr "Ваша парольная фраза неверна"
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1570
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "Новое письмо на %(gmail_mail_address)s"
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1572
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
@@ -7666,7 +7667,7 @@
msgstr[1] "У вас есть %d непрочитанных письма"
msgstr[2] "У вас есть %d непрочитанных писем"
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1585
#, python-format
msgid ""
"\n"
@@ -7681,34 +7682,34 @@
"Тема: %(subject)s\n"
"%(snippet)s"
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1656
#, python-format
msgid "%s wants to send you a file."
msgstr "%s хочет отправить вам файл."
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1724
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "Успешно получен файл %(filename)s от %(name)s."
#. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1728
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "Передача файла %(filename)s от %(name)s приостановлена."
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1741
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "%(name)s успешно получил(а) отправленный вами файл %(filename)s."
#. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1745
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "Передача файла %(filename)s к %(name)s приостановлена."
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1833
#, python-format
msgid ""
"Unable to decrypt message from %s\n"
@@ -7717,36 +7718,36 @@
"Не удалось расшифровать сообщение от %s\n"
"Возможно, оно было испорчено."
-#: ../src/gajim.py:1830
+#: ../src/gajim.py:1840
msgid "Unable to decrypt message"
msgstr "Сообщение не удалось расшифровать"
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:1911
msgid "Username Conflict"
msgstr "Такое имя уже есть"
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:1912
msgid "Please type a new username for your local account"
msgstr "Введите новое имя пользователя для локальной учетной записи"
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:1924
msgid "Ping?"
msgstr "Ping?"
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:1937
#, python-format
msgid "Pong! (%s s.)"
msgstr "Pong! (%s сек.)"
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:1948
msgid "Error."
msgstr "Ошибка."
-#: ../src/gajim.py:1963
+#: ../src/gajim.py:1973
msgid "Resource Conflict"
msgstr "Такое имя уже есть"
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:1974
msgid ""
"You are already connected to this account with the same resource. Please "
"type a new one"
@@ -7754,11 +7755,11 @@
"Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите "
"другой ресурс"
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2027
msgid "Error verifying SSL certificate"
msgstr "Ошибка при проверке SSL сертификата"
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2028
#, python-format
msgid ""
"There was an error verifying the SSL certificate of your jabber server: %"
@@ -7769,15 +7770,15 @@
"s\n"
"Вы всё ещё хотите подключиться к этому серверу?"
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2033
msgid "Ignore this error for this certificate."
msgstr "Игнорировать эту ошибку для данного сертификата."
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2048
msgid "SSL certificate error"
msgstr "Ошибка SSL сертификата"
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2049
#, python-format
msgid ""
"It seems the SSL certificate has changed or your connection is being "
@@ -7792,26 +7793,26 @@
"Новый отпечаток: %(new)s\n"
"Вы всё ещё хотите соединиться и обновить отпечаток сертификата?"
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
+#: ../src/gajim.py:2071 ../src/gajim.py:2101
msgid "Insecure connection"
msgstr "Небезопасное соединение"
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2072
msgid ""
"You are about to send your password on an unencrypted connection. Are you "
"sure you want to do that?"
msgstr "Вы хотите отправить пароль через небезопасное соединение. Вы уверены?"
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2074 ../src/gajim.py:2104
msgid "Yes, I really want to connect insecurely"
msgstr "Да, я действительно хочу соединиться небезопасно"
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
+#: ../src/gajim.py:2075 ../src/gajim.py:2105 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3789
msgid "Do _not ask me again"
msgstr "Не _переспрашивать"
-#: ../src/gajim.py:2092
+#: ../src/gajim.py:2102
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?"
@@ -7819,27 +7820,27 @@
"Вы хотите отправить пароль через небезопасное соединение. Вы уверены? "
"(Установите PyOpenSSL, чтобы этого не происходило.)"
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2119
msgid "PEP node was not removed"
msgstr "PEP узел не был удален"
-#: ../src/gajim.py:2110
+#: ../src/gajim.py:2120
#, 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:2575 ../src/gajim.py:2596
+#: ../src/gajim.py:2585 ../src/gajim.py:2606
msgid "Emoticons disabled"
msgstr "Смайлики выключены"
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2586
msgid ""
"Your configured emoticons theme has not been found, so emoticons have been "
"disabled."
msgstr "Тема смайликов не найдена, они будут отключены."
-#: ../src/gajim.py:2597
+#: ../src/gajim.py:2607
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 "
@@ -7848,30 +7849,30 @@
"Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла "
"emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
-#: ../src/gajim.py:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2633 ../src/roster_window.py:3323
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:2903
+#: ../src/gajim.py:2913
msgid "Could not save your settings and preferences"
msgstr "Не могу сохранить ваши установки и настройки"
-#: ../src/gajim.py:3000
+#: ../src/gajim.py:3010
msgid "Bookmark already set"
msgstr "Закладка уже установлена"
-#: ../src/gajim.py:3001
+#: ../src/gajim.py:3011
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "Комната «%s» уже есть в ваших закладках."
-#: ../src/gajim.py:3014
+#: ../src/gajim.py:3024
msgid "Bookmark has been added successfully"
msgstr "Закладка успешно добавлена"
-#: ../src/gajim.py:3015
+#: ../src/gajim.py:3025
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr "Вы можете управлять закладками через меню «Действия» в ростере."
@@ -8581,12 +8582,12 @@
msgid "Kicking %s"
msgstr "Выгоняем %s"
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2390
msgid "You may specify a reason below:"
msgstr "Вы можете указать причину ниже:"
#. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2389
#, python-format
msgid "Banning %s"
msgstr "Забанить %s"
@@ -8839,18 +8840,18 @@
msgid "Retrieving profile..."
msgstr "Получаю данные..."
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:109 ../src/roster_window.py:2786
msgid "File is empty"
msgstr "Пустой файл"
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:112 ../src/roster_window.py:2789
msgid "File does not exist"
msgstr "Файл не существует"
#. keep identation
#. unknown format
#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/roster_window.py:2791 ../src/roster_window.py:2802
msgid "Could not load image"
msgstr "Не могу загрузить изображение"
@@ -8881,38 +8882,38 @@
msgstr ""
"При публикации вашей личной информации произошла ошибка, попробуйте позже."
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:288 ../src/roster_window.py:944
msgid "Merged accounts"
msgstr "Объединенные учетные записи"
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1859
msgid "Authorization has been sent"
msgstr "Была отправлена авторизация"
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1860
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "Теперь «%s» будет знать о вашем статусе."
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1880
msgid "Subscription request has been sent"
msgstr "Был отправлен запрос на подписку "
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1881
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr "Если «%s» примет ваш запрос, вы будете знать его или её статус"
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1893
msgid "Authorization has been removed"
msgstr "Авторизация была удалена"
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1894
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "Теперь «%s» всегда будет видеть вас в оффлайне."
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1919
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)"
@@ -8920,15 +8921,15 @@
"Gnome Keyring установлен, но некорректно запущен\t\t\t\t\t\t\t\t(возможно "
"неверно установлена переменная среды)"
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1929 ../src/roster_window.py:1949
msgid "GPG is not usable"
msgstr "GPG использовать невозможно"
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2118 ../src/roster_window.py:3266
msgid "You are participating in one or more group chats"
msgstr "Вы находитесь в одной или более комнатах"
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
msgid ""
"Changing your status to invisible will result in disconnection from those "
"group chats. Are you sure you want to go invisible?"
@@ -8936,15 +8937,15 @@
"Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
"хотите стать невидимым?"
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2145
msgid "desync'ed"
msgstr "не синхронизировано"
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../src/roster_window.py:2283 ../src/roster_window.py:2520
msgid "You have unread messages"
msgstr "У вас есть непрочитанные сообщения"
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2284
msgid ""
"Messages will only be available for reading them later if you have history "
"enabled and contact is in your roster."
@@ -8952,16 +8953,16 @@
"Сообщения будут доступны для чтения позже, если у вас активирована опция "
"истории."
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2521
msgid "You must read them before removing this transport."
msgstr "Просмотрите все ожидающие события перед удалением транспорта."
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2524
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "Транспорт «%s» будет удален"
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2525
msgid ""
"You will no longer be able to send and receive messages from contacts using "
"this transport."
@@ -8969,11 +8970,11 @@
"У вас теперь не будет возможности приема и отправки сообщения контактам "
"через этот транспорт."
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2528
msgid "Transports will be removed"
msgstr "Транспорты будут удалены"
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2533
#, python-format
msgid ""
"You will no longer be able to send and receive messages to contacts from "
@@ -8983,51 +8984,51 @@
"транспорты:%s."
#. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2667
msgid "Rename Contact"
msgstr "Переименовать контакт"
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2668
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "Введите новый ник для контакта %s"
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2675
msgid "Rename Group"
msgstr "Переименовать группу"
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2676
#, python-format
msgid "Enter a new name for group %s"
msgstr "Введите новое название для группы %s"
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2732
msgid "Remove Group"
msgstr "Удалить группу"
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2733
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "Вы точно хотите удалить группу %s из ростера?"
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2734
msgid "Also remove all contacts in this group from your roster"
msgstr "Удалить из ростера все контакты в этой группе"
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2773
msgid "Assign OpenPGP Key"
msgstr "Назначить OpenPGP ключ"
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2774
msgid "Select a key to apply to the contact"
msgstr "Выберите ключ, который будет применен к контакту"
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3127
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "Контакт «%s» будет удален из вашего ростера"
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3131
msgid ""
"By removing this contact you also remove authorization resulting in him or "
"her always seeing you as offline."
@@ -9036,11 +9037,11 @@
"не сможет видеть ваш статус."
#. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3136
msgid "Do you want to continue?"
msgstr "Продолжить?"
-#: ../src/roster_window.py:3141
+#: ../src/roster_window.py:3140
msgid ""
"By removing this contact you also by default remove authorization resulting "
"in him or her always seeing you as offline."
@@ -9048,16 +9049,16 @@
"Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
"его или её всегда в оффлайне."
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3143
msgid "I want this contact to know my status after removal"
msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3147
msgid "Contacts will be removed from your roster"
msgstr "Контакты будут удалены из вашего ростера"
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3151
#, python-format
msgid ""
"By removing these contacts:%s\n"
@@ -9067,20 +9068,20 @@
"Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
"оффлайне."
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3190
msgid "No account available"
msgstr "Нет доступной учетной записи"
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3191
msgid "You must create an account before you can chat with other contacts."
msgstr ""
"Для начала беседы с другими людьми прежде необходимо создать учетную запись."
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3707
msgid "Metacontacts storage not supported by your server"
msgstr "Сервер не умеет хранить метаконтакты"
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3709
msgid ""
"Your server does not support storing metacontacts information. So those "
"information will not be saved on next reconnection."
@@ -9088,12 +9089,12 @@
"Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при "
"следующем подключении."
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3783
msgid ""
"You are about to create a metacontact. Are you sure you want to continue?"
msgstr "Вы точно хотите создать метаконтакт?"
-#: ../src/roster_window.py:3786
+#: ../src/roster_window.py:3785
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 "
@@ -9103,11 +9104,11 @@
"Обычно используется, когда один и тот же человек имеет несколько учетных "
"записей в Jabber или на транспортах."
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:3898
msgid "Invalid file URI:"
msgstr "Неверный файл:"
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:3909
#, python-format
msgid "Do you want to send this file to %s:"
msgid_plural "Do you want to send these files to %s:"
@@ -9120,123 +9121,123 @@
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../src/roster_window.py:4586 ../src/roster_window.py:4657
+#: ../src/roster_window.py:4666 ../src/systray.py:219 ../src/systray.py:224
+#: ../src/systray.py:230
#, python-format
msgid "using account %s"
msgstr "используя учетную запись %s"
#. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4673
#, python-format
msgid "to %s account"
msgstr "для учетной записи %s"
#. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4678
#, python-format
msgid "using %s account"
msgstr "учетной записи %s"
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4715 ../src/systray.py:257
msgid "_Manage Bookmarks..."
msgstr "Управление _закладками..."
#. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4735
#, python-format
msgid "of account %s"
msgstr "для учетной записи %s"
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4775
#, python-format
msgid "for account %s"
msgstr "для учетной записи %s"
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4837 ../src/roster_window.py:4946
msgid "_Change Status Message"
msgstr "_Изменить сообщение о статусе"
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4864
msgid "Publish Tune"
msgstr "Музыка"
-#: ../src/roster_window.py:4872
+#: ../src/roster_window.py:4871
msgid "Mood"
msgstr "Настроение"
-#: ../src/roster_window.py:4876
+#: ../src/roster_window.py:4875
msgid "Activity"
msgstr "Занятие"
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4880
msgid "Configure Services..."
msgstr "Настроить Сервисы..."
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5034
msgid "_Maximize All"
msgstr "_Развернуть все"
#. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5042 ../src/roster_window.py:5567
msgid "Send Group M_essage"
msgstr "_Отправить сообщение группе"
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5050
msgid "To all users"
msgstr "Всем пользователям"
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5054
msgid "To all online users"
msgstr "Всем, кто подключён"
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5464
msgid "I would like to add you to my roster"
msgstr "Вы не против, если я добавлю Вас к себе в ростер?"
#. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5587
msgid "_Manage Contacts"
msgstr "_Управление контактами"
#. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5648
msgid "Send Single Message"
msgstr "Отправить одиночное сообщение"
#. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5704
msgid "_Manage Transport"
msgstr "_Управление транспортом"
#. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5712
msgid "_Modify Transport"
msgstr "_Изменить транспорт"
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5787
msgid "_Maximize"
msgstr "Развернут_ь"
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5794
msgid "_Disconnect"
msgstr "_Выйти"
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5874
msgid "_New Group Chat"
msgstr "В _новую комнату"
#. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:5987
msgid "History Manager"
msgstr "Менеджер истории"
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:5996
msgid "_Join New Group Chat"
msgstr "_Войти в новую комнату"
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6206
msgid "Change Status Message..."
msgstr "Изменить сообщение о статусе..."
@@ -9296,11 +9297,11 @@
"\n"
"Продолжить этот сеанс?"
-#: ../src/systray.py:188
+#: ../src/systray.py:176
msgid "_Change Status Message..."
msgstr "_Изменить сообщение о статусе..."
-#: ../src/systray.py:322
+#: ../src/systray.py:270
msgid "Hide this menu"
msgstr "Скрыть это меню"
1
0
[commit-gajim] r10752 - in trunk/src: . common common/xmpp common/zeroconf
by asterix＠gajim.org 02 Dec '08
by asterix＠gajim.org 02 Dec '08
02 Dec '08
Author: asterix
Date: 2008-12-02 16:53:23 +0100 (Tue, 02 Dec 2008)
New Revision: 10752
Modified:
trunk/src/chat_control.py
trunk/src/common/commands.py
trunk/src/common/connection.py
trunk/src/common/connection_handlers.py
trunk/src/common/helpers.py
trunk/src/common/logger.py
trunk/src/common/nslookup.py
trunk/src/common/optparser.py
trunk/src/common/passwords.py
trunk/src/common/pep.py
trunk/src/common/proxy65_manager.py
trunk/src/common/sleepy.py
trunk/src/common/socks5.py
trunk/src/common/stanza_session.py
trunk/src/common/xmpp/auth.py
trunk/src/common/xmpp/auth_nb.py
trunk/src/common/xmpp/browser.py
trunk/src/common/xmpp/commands.py
trunk/src/common/xmpp/dispatcher.py
trunk/src/common/xmpp/dispatcher_nb.py
trunk/src/common/xmpp/features_nb.py
trunk/src/common/xmpp/filetransfer.py
trunk/src/common/xmpp/transports.py
trunk/src/common/xmpp/transports_nb.py
trunk/src/common/zeroconf/client_zeroconf.py
trunk/src/common/zeroconf/connection_handlers_zeroconf.py
trunk/src/common/zeroconf/roster_zeroconf.py
trunk/src/common/zeroconf/zeroconf_avahi.py
trunk/src/common/zeroconf/zeroconf_bonjour.py
trunk/src/config.py
trunk/src/conversation_textview.py
trunk/src/dataforms_widget.py
trunk/src/dialogs.py
trunk/src/disco.py
trunk/src/features_window.py
trunk/src/filetransfers_window.py
trunk/src/gajim.py
trunk/src/gajim_themes_window.py
trunk/src/groupchat_control.py
trunk/src/gtkexcepthook.py
trunk/src/gtkgui_helpers.py
trunk/src/history_manager.py
trunk/src/history_window.py
trunk/src/htmltextview.py
trunk/src/ipython_view.py
trunk/src/message_control.py
trunk/src/message_window.py
trunk/src/notify.py
trunk/src/roster_window.py
trunk/src/tooltips.py
Log:
[thorstenp] fix unused variables
Modified: trunk/src/chat_control.py
===================================================================
--- trunk/src/chat_control.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/chat_control.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -297,7 +297,7 @@
if lang:
self.msg_textview.lang = lang
spell.set_language(lang)
- except (gobject.GError, RuntimeError), msg:
+ except (gobject.GError, RuntimeError):
dialogs.AspellDictError(lang)
self.conv_textview.tv.show()
self._paint_banner()
@@ -438,7 +438,6 @@
def show_emoticons_menu(self):
if not gajim.config.get('emoticons_theme'):
return
- msg_tv = self.msg_textview
def set_emoticons_menu_position(w, msg_tv = self.msg_textview):
window = msg_tv.get_window(gtk.TEXT_WINDOW_WIDGET)
# get the window position
@@ -452,7 +451,7 @@
cursor.x, cursor.y)
x = origin[0] + cursor[0]
y = origin[1] + size[1]
- menu_width, menu_height = gajim.interface.emoticons_menu.size_request()
+ menu_height = gajim.interface.emoticons_menu.size_request()[1]
#FIXME: get_line_count is not so good
#get the iter of cursor, then tv.get_line_yrange
# so we know in which y we are typing (not how many lines we have
@@ -1189,7 +1188,7 @@
if session:
# Don't use previous session if we want to a specific resource
# and it's not the same
- j, r = gajim.get_room_and_nick_from_fjid(str(session.jid))
+ r = gajim.get_room_and_nick_from_fjid(str(session.jid))[1]
if resource and resource != r:
session = None
@@ -1505,7 +1504,6 @@
banner_name_label = self.xml.get_widget('banner_name_label')
banner_name_tooltip = gtk.Tooltips()
- banner_eventbox = self.xml.get_widget('banner_eventbox')
name = contact.get_shown_name()
if self.resource:
@@ -1908,7 +1906,6 @@
if contact is set to print_queue: it is incomming from queue
if contact is not set: it's an incomming message'''
contact = self.contact
- jid = contact.jid
if frm == 'status':
if not gajim.config.get('print_status_in_chats'):
@@ -2297,7 +2294,7 @@
def on_cancel():
on_no(self)
- dialog = dialogs.ConfirmationDialog(
+ dialogs.ConfirmationDialog(
# %s is being replaced in the code with JID
_('You just received a new message from "%s"') % self.contact.jid,
_('If you close this tab and you have history disabled, '\
@@ -2388,7 +2385,6 @@
path = treeview.get_selection().get_selected_rows()[1][0]
iter = model.get_iter(path)
type = model[iter][2]
- account = model[iter][4].decode('utf-8')
if type != 'contact': # source is not a contact
return
dropped_jid = data.decode('utf-8')
Modified: trunk/src/common/commands.py
===================================================================
--- trunk/src/common/commands.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/commands.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -71,7 +71,7 @@
' bad-request'))
def cancel(self, request):
- response, cmd = self.buildResponse(request, status = 'canceled')
+ response = self.buildResponse(request, status = 'canceled')[0]
self.connection.connection.send(response)
return False # finish the session
Modified: trunk/src/common/connection.py
===================================================================
--- trunk/src/common/connection.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/connection.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -413,7 +413,6 @@
if data:
hostname = data['hostname']
- usessl = data['usessl']
self.try_connecting_for_foo_secs = 45
p = data['proxy']
use_srv = True
@@ -959,7 +958,6 @@
sshow = helpers.get_xmpp_show(show)
if not msg:
msg = ''
- keyID = gajim.config.get_per('accounts', self.name, 'keyid')
if show == 'offline':
p = common.xmpp.Presence(typ = 'unavailable', to = jid)
p = self.add_sha(p, False)
@@ -983,7 +981,6 @@
sshow = helpers.get_xmpp_show(show)
if not msg:
msg = ''
- keyID = gajim.config.get_per('accounts', self.name, 'keyid')
sign_msg = False
if not auto and not show == 'offline':
sign_msg = True
@@ -1401,7 +1398,7 @@
return
iq = common.xmpp.Iq(typ='get')
iq2 = iq.addChild(name='query', namespace=common.xmpp.NS_PRIVATE)
- iq3 = iq2.addChild(name='gajim', namespace='gajim:prefs')
+ iq2.addChild(name='gajim', namespace='gajim:prefs')
self.connection.send(iq)
def get_bookmarks(self):
@@ -1431,11 +1428,11 @@
# Note: need to handle both None and '' as empty
# thus shouldn't use "is not None"
if bm.get('nick', None):
- iq5 = iq4.setTagData('nick', bm['nick'])
+ iq4.setTagData('nick', bm['nick'])
if bm.get('password', None):
- iq5 = iq4.setTagData('password', bm['password'])
+ iq4.setTagData('password', bm['password'])
if bm.get('print_status', None):
- iq5 = iq4.setTagData('print_status', bm['print_status'])
+ iq4.setTagData('print_status', bm['print_status'])
self.connection.send(iq)
def get_annotations(self):
@@ -1707,7 +1704,7 @@
if gajim.account_is_connected(self.name):
hostname = gajim.config.get_per('accounts', self.name, 'hostname')
iq = common.xmpp.Iq(typ = 'set', to = hostname)
- q = iq.setTag(common.xmpp.NS_REGISTER + ' query').setTag('remove')
+ iq.setTag(common.xmpp.NS_REGISTER + ' query').setTag('remove')
con.send(iq)
on_remove_success(True)
return
Modified: trunk/src/common/connection_handlers.py
===================================================================
--- trunk/src/common/connection_handlers.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/connection_handlers.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -768,9 +768,6 @@
if node:
q.setAttr('node', node)
q.addChild('identity', attrs = gajim.gajim_identity)
- extension = None
- if node and node.find('#') != -1:
- extension = node[node.index('#') + 1:]
client_version = 'http://gajim.org#' + gajim.caps_hash[self.name]
if node in (None, client_version):
@@ -984,7 +981,7 @@
j = gajim.get_jid_from_account(self.name)
self.awaiting_answers[id] = (VCARD_ARRIVED, j, groupchat_jid)
if groupchat_jid:
- room_jid, nick = gajim.get_room_and_nick_from_fjid(groupchat_jid)
+ room_jid = gajim.get_room_and_nick_from_fjid(groupchat_jid)[0]
if not room_jid in self.room_jids:
self.room_jids.append(room_jid)
self.groupchat_jids[id] = groupchat_jid
@@ -1395,6 +1392,7 @@
try:
idle.init()
except Exception:
+ global HAS_IDLE
HAS_IDLE = False
self.gmail_last_tid = None
Modified: trunk/src/common/helpers.py
===================================================================
--- trunk/src/common/helpers.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/helpers.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -1032,7 +1032,7 @@
def get_notification_icon_tooltip_text():
text = None
# How many events must there be before they're shown summarized, not per-user
- max_ungrouped_events = 10
+ # max_ungrouped_events = 10
# Character which should be used to indent in the tooltip.
indent_with = ' '
Modified: trunk/src/common/logger.py
===================================================================
--- trunk/src/common/logger.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/logger.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -178,7 +178,7 @@
and after that all okay'''
if jid.find('/') > -1:
- possible_room_jid, possible_nick = jid.split('/', 1)
+ possible_room_jid = jid.split('/', 1)[1]
return self.jid_is_room_jid(possible_room_jid)
else:
# it's not a full jid, so it's not a pm one
@@ -480,7 +480,7 @@
returns a list of tupples containg time, kind, message,
list with empty tupple if nothing found to meet our demands'''
try:
- jid_id = self.get_jid_id(jid)
+ self.get_jid_id(jid)
except exceptions.PysqliteOperationalError, e:
# Error trying to create a new jid_id. This means there is no log
return []
@@ -522,7 +522,7 @@
for each row in a list of tupples,
returns list with empty tupple if we found nothing to meet our demands'''
try:
- jid_id = self.get_jid_id(jid)
+ self.get_jid_id(jid)
except exceptions.PysqliteOperationalError, e:
# Error trying to create a new jid_id. This means there is no log
return []
@@ -547,7 +547,7 @@
for each row in a list of tupples,
returns list with empty tupple if we found nothing to meet our demands'''
try:
- jid_id = self.get_jid_id(jid)
+ self.get_jid_id(jid)
except exceptions.PysqliteOperationalError, e:
# Error trying to create a new jid_id. This means there is no log
return []
@@ -574,7 +574,7 @@
def get_days_with_logs(self, jid, year, month, max_day, account):
'''returns the list of days that have logs (not status messages)'''
try:
- jid_id = self.get_jid_id(jid)
+ self.get_jid_id(jid)
except exceptions.PysqliteOperationalError, e:
# Error trying to create a new jid_id. This means there is no log
return []
Modified: trunk/src/common/nslookup.py
===================================================================
--- trunk/src/common/nslookup.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/nslookup.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -268,7 +268,7 @@
def pollin(self):
try:
res = self.pipe.read()
- except Exception, e:
+ except Exception:
res = ''
if res == '':
return self.pollend()
Modified: trunk/src/common/optparser.py
===================================================================
--- trunk/src/common/optparser.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/optparser.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -261,7 +261,7 @@
)
con.commit()
gajim.logger.init_vars()
- except sqlite.OperationalError, e:
+ except sqlite.OperationalError:
pass
con.close()
@@ -333,7 +333,7 @@
'''
)
con.commit()
- except sqlite.OperationalError, e:
+ except sqlite.OperationalError:
pass
con.close()
gajim.config.set('version', '0.10.1.3')
@@ -454,7 +454,7 @@
'''
)
con.commit()
- except sqlite.OperationalError, e:
+ except sqlite.OperationalError:
pass
con.close()
gajim.config.set('version', '0.11.1.3')
@@ -496,7 +496,7 @@
'''
)
con.commit()
- except sqlite.OperationalError, e:
+ except sqlite.OperationalError:
pass
con.close()
gajim.config.set('version', '0.11.1.5')
@@ -532,7 +532,7 @@
'''
)
con.commit()
- except sqlite.OperationalError, e:
+ except sqlite.OperationalError:
pass
con.close()
gajim.config.set('version', '0.11.4.1')
@@ -569,7 +569,7 @@
'''
)
con.commit()
- except sqlite.OperationalError, e:
+ except sqlite.OperationalError:
pass
con.close()
gajim.config.set('version', '0.11.4.3')
@@ -583,7 +583,7 @@
try:
cur.executescript('DROP TABLE caps_cache;')
con.commit()
- except sqlite.OperationalError, e:
+ except sqlite.OperationalError:
pass
try:
cur.executescript(
Modified: trunk/src/common/passwords.py
===================================================================
--- trunk/src/common/passwords.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/passwords.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -67,7 +67,7 @@
if conf is None:
return None
try:
- unused, auth_token = conf.split('gnomekeyring:')
+ auth_token = conf.split('gnomekeyring:')[1]
auth_token = int(auth_token)
except ValueError:
password = conf
Modified: trunk/src/common/pep.py
===================================================================
--- trunk/src/common/pep.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/pep.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -311,7 +311,7 @@
if 'length' in acc.tune:
del acc.tune['length']
- (user, resource) = gajim.get_room_and_nick_from_fjid(jid)
+ user = gajim.get_room_and_nick_from_fjid(jid)[0]
for contact in gajim.contacts.get_contacts(name, user):
if has_child:
if 'artist' in contact.tune:
@@ -400,7 +400,7 @@
if 'text' in acc.activity:
del acc.activity['text']
- (user, resource) = gajim.get_room_and_nick_from_fjid(jid)
+ user = gajim.get_room_and_nick_from_fjid(jid)[0]
for contact in gajim.contacts.get_contacts(name, user):
if has_child:
if 'activity' in contact.activity:
@@ -452,7 +452,7 @@
gajim.nicks[name] = gajim.config.get_per('accounts',
name, 'name')
- (user, resource) = gajim.get_room_and_nick_from_fjid(jid)
+ user = gajim.get_room_and_nick_from_fjid(jid)[0]
if has_child:
if nick is not None:
for contact in gajim.contacts.get_contacts(name, user):
@@ -541,7 +541,7 @@
gajim.connections[account].send_pb_retract('', xmpp.NS_NICK, '0')
def delete_pep(jid, name):
- (user, resource) = gajim.get_room_and_nick_from_fjid(jid)
+ user = gajim.get_room_and_nick_from_fjid(jid)[0]
if jid == gajim.get_jid_from_account(name):
acc = gajim.connections[name]
Modified: trunk/src/common/proxy65_manager.py
===================================================================
--- trunk/src/common/proxy65_manager.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/proxy65_manager.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -279,7 +279,7 @@
self._send = self._sock.send
self._recv = self._sock.recv
except Exception, ee:
- (errnum, errstr) = ee
+ errnum = ee[0]
# 56 is for freebsd
if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK):
# still trying to connect
@@ -391,7 +391,7 @@
self._send = self._sock.send
self._recv = self._sock.recv
except Exception, ee:
- (errnum, errstr) = ee
+ errnum = ee[0]
# 56 is for freebsd
if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK):
# still trying to connect
Modified: trunk/src/common/sleepy.py
===================================================================
--- trunk/src/common/sleepy.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/sleepy.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -87,6 +87,7 @@
class SleepyUnix:
def __init__(self, away_interval = 60, xa_interval = 120):
+ global SUPPORTED
self.away_interval = away_interval
self.xa_interval = xa_interval
self.state = STATE_AWAKE # assume we are awake
Modified: trunk/src/common/socks5.py
===================================================================
--- trunk/src/common/socks5.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/socks5.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -417,7 +417,7 @@
received = ''
try:
add = self._recv(64)
- except Exception, e:
+ except Exception:
add = ''
received += add
if len(add) == 0:
@@ -427,8 +427,8 @@
def send_raw(self,raw_data):
''' Writes raw outgoing data. '''
try:
- lenn = self._send(raw_data)
- except Exception, e:
+ self._send(raw_data)
+ except Exception:
self.disconnect()
return len(raw_data)
@@ -507,7 +507,7 @@
fd = self.get_fd()
try:
buff = self._recv(MAX_BUFF_LEN)
- except Exception, e:
+ except Exception:
buff = ''
current_time = self.idlequeue.current_time()
self.file_props['elapsed-time'] += current_time - \
@@ -571,7 +571,7 @@
mechanisms '''
auth_mechanisms = []
try:
- ver, num_auth = struct.unpack('!BB', buff[:2])
+ num_auth = struct.unpack('!xB', buff[:2])[0]
for i in xrange(num_auth):
mechanism, = struct.unpack('!B', buff[1 + i])
auth_mechanisms.append(mechanism)
@@ -601,8 +601,7 @@
def _parse_request_buff(self, buff):
try: # don't trust on what comes from the outside
- version, req_type, reserved, host_type, = struct.unpack('!BBBB',
- buff[:4])
+ req_type, host_type, = struct.unpack('!xBxB', buff[:4])
if host_type == 0x01:
host_arr = struct.unpack('!iiii', buff[4:8])
host, = '.'.join(str(s) for s in host_arr)
@@ -765,7 +764,7 @@
return -1 # invalid auth methods received
elif self.state == 3: # get next request
buff = self.receive()
- (req_type, self.sha_msg, port) = self._parse_request_buff(buff)
+ req_type, self.sha_msg = self._parse_request_buff(buff)[:2]
if req_type != 0x01:
return -1 # request is not of type 'connect'
self.state += 1 # go to the next step
@@ -974,7 +973,7 @@
self._send=self._sock.send
self._recv=self._sock.recv
except Exception, ee:
- (errnum, errstr) = ee
+ errnum = ee[0]
self.connect_timeout += 1
if errnum == 111 or self.connect_timeout > 1000:
self.queue._connection_refused(self.streamhost,
@@ -1019,8 +1018,8 @@
sub_buff = buff[:4]
if len(sub_buff) < 4:
return None
- version, command, rsvd, address_type = struct.unpack('!BBBB', buff[:4])
- addrlen, address, port = 0, 0, 0
+ version, address_type = struct.unpack('!BxxB', buff[:4])
+ addrlen = 0
if address_type == 0x03:
addrlen = ord(buff[4])
address = struct.unpack('!%ds' % addrlen, buff[5:addrlen + 5])
Modified: trunk/src/common/stanza_session.py
===================================================================
--- trunk/src/common/stanza_session.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/stanza_session.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -28,6 +28,7 @@
from common import xmpp
from common import exceptions
+import itertools
import random
import string
@@ -91,8 +92,8 @@
return any_removed
def generate_thread_id(self):
- return ''.join([random.choice(string.ascii_letters) for x in xrange(0,
- 32)])
+ return ''.join([f(string.ascii_letters) for f in itertools.repeat(
+ random.choice, 32)])
def send(self, msg):
if self.thread_id:
@@ -386,10 +387,9 @@
parsed = xmpp.Node(node='<node>' + plaintext + '</node>')
if self.negotiated['recv_pubkey'] == 'hash':
- fingerprint = parsed.getTagData('fingerprint')
-
+ # fingerprint = parsed.getTagData('fingerprint')
# XXX find stored pubkey or terminate session
- raise 'unimplemented'
+ raise NotImplementedError()
else:
if self.negotiated['sign_algs'] == (XmlDsig + 'rsa-sha256'):
keyvalue = parsed.getTag(name='RSAKeyValue', namespace=XmlDsig)
@@ -771,7 +771,7 @@
else:
srses = secrets.secrets().retained_secrets(self.conn.name,
self.jid.getStripped())
- rshashes = [self.hmac(self.n_s, rs) for (rs,v) in srses]
+ rshashes = [self.hmac(self.n_s, rs[0]) for rs in srses]
if not rshashes:
# we've never spoken before, but we'll pretend we have
@@ -838,7 +838,8 @@
rshashes = [base64.b64decode(rshash) for rshash in form.getField(
'rshashes').getValues()]
- for (secret, verified) in srses:
+ for s in srses:
+ secret = s[0]
if self.hmac(self.n_o, secret) in rshashes:
srs = secret
break
@@ -889,7 +890,8 @@
srshash = base64.b64decode(form['srshash'])
- for (secret, verified) in srses:
+ for s in srses:
+ secret = s[0]
if self.hmac(secret, 'Shared Retained Secret') == srshash:
srs = secret
break
Modified: trunk/src/common/xmpp/auth.py
===================================================================
--- trunk/src/common/xmpp/auth.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/xmpp/auth.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -61,8 +61,14 @@
token=query.getTagData('token')
seq=query.getTagData('sequence')
self.DEBUG("Performing zero-k authentication",'ok')
- hash = sha.new(sha.new(self.password).hexdigest()+token).hexdigest()
- for foo in xrange(int(seq)): hash = sha.new(hash).hexdigest()
+
+ def hasher(s):
+ return sha.new(s).hexdigest()
+
+ def hash_n_times(s, count):
+ return count and hasher(hash_n_times(s, count-1)) or s
+
+ hash = hash_n_times(hasher(hasher(self.password)+token), int(seq))
query.setTagData('hash',hash)
method='0k'
else:
@@ -182,10 +188,8 @@
resp['username']=self.username
resp['realm']=self._owner.Server
resp['nonce']=chal['nonce']
- cnonce=''
- for i in range(7):
- cnonce+=hex(int(random.random()*65536*4096))[2:]
- resp['cnonce']=cnonce
+ resp['cnonce'] = ''.join("%x" % randint(0, 2**28) for randint in
+ itertools.repeat(random.randint, 7))
resp['nc']=('00000001')
resp['qop']='auth'
resp['digest-uri']='xmpp/'+self._owner.Server
@@ -305,4 +309,4 @@
self.DEBUG('Binding failed: timeout expired.','error')
return ''
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
Modified: trunk/src/common/xmpp/auth_nb.py
===================================================================
--- trunk/src/common/xmpp/auth_nb.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/xmpp/auth_nb.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -20,7 +20,11 @@
from protocol import *
from auth import *
from client import PlugIn
-import sha,base64,random,dispatcher_nb
+import sha
+import base64
+import random
+import itertools
+import dispatcher_nb
try:
import kerberos
@@ -143,27 +147,27 @@
self.MechanismHandler()
def MechanismHandler(self):
- if "GSSAPI" in self.mecs and have_kerberos:
- self.mecs.remove("GSSAPI")
- rc, self.gss_vc = kerberos.authGSSClientInit('xmpp@' +
- self._owner.socket._hostfqdn)
- rc = kerberos.authGSSClientStep(self.gss_vc, '')
+ if 'GSSAPI' in self.mecs and have_kerberos:
+ self.mecs.remove('GSSAPI')
+ self.gss_vc = kerberos.authGSSClientInit('xmpp@' + \
+ self._owner.socket._hostfqdn)[1]
+ kerberos.authGSSClientStep(self.gss_vc, '')
response = kerberos.authGSSClientResponse(self.gss_vc)
node=Node('auth',attrs={'xmlns': NS_SASL, 'mechanism': 'GSSAPI'},
- payload=(response or ""))
- self.mechanism = "GSSAPI"
+ payload=(response or ''))
+ self.mechanism = 'GSSAPI'
self.gss_step = GSS_STATE_STEP
- elif "DIGEST-MD5" in self.mecs:
- self.mecs.remove("DIGEST-MD5")
+ elif 'DIGEST-MD5' in self.mecs:
+ self.mecs.remove('DIGEST-MD5')
node=Node('auth',attrs={'xmlns': NS_SASL, 'mechanism': 'DIGEST-MD5'})
- self.mechanism = "DIGEST-MD5"
- elif "PLAIN" in self.mecs:
- self.mecs.remove("PLAIN")
+ self.mechanism = 'DIGEST-MD5'
+ elif 'PLAIN' in self.mecs:
+ self.mecs.remove('PLAIN')
sasl_data='%s\x00%s\x00%s' % (self.username+'@' + self._owner.Server,
self.username, self.password)
node=Node('auth', attrs={'xmlns':NS_SASL,'mechanism':'PLAIN'},
payload=[base64.encodestring(sasl_data).replace('\n','')])
- self.mechanism = "PLAIN"
+ self.mechanism = 'PLAIN'
else:
self.startsasl='failure'
self.DEBUG('I can only use DIGEST-MD5, GSSAPI and PLAIN mecanisms.', 'error')
@@ -234,10 +238,8 @@
else:
resp['realm'] = self._owner.Server
resp['nonce']=chal['nonce']
- cnonce=''
- for i in range(7):
- cnonce += hex(int(random.random() * 65536 * 4096))[2:]
- resp['cnonce'] = cnonce
+ resp['cnonce'] = ''.join("%x" % randint(0, 2**28) for randint in
+ itertools.repeat(random.randint, 7))
resp['nc'] = ('00000001')
resp['qop'] = 'auth'
resp['digest-uri'] = 'xmpp/'+self._owner.Server
@@ -288,7 +290,7 @@
self.DEBUG('Querying server about possible auth methods', 'start')
self.owner = owner
- resp = owner.Dispatcher.SendAndWaitForResponse(
+ owner.Dispatcher.SendAndWaitForResponse(
Iq('get', NS_AUTH, payload=[Node('username', payload=[self.user])]), func=self._on_username
)
@@ -312,9 +314,14 @@
token=query.getTagData('token')
seq=query.getTagData('sequence')
self.DEBUG("Performing zero-k authentication",'ok')
- hash = sha.new(sha.new(self.password).hexdigest()+token).hexdigest()
- for foo in xrange(int(seq)):
- hash = sha.new(hash).hexdigest()
+
+ def hasher(s):
+ return sha.new(s).hexdigest()
+
+ def hash_n_times(s, count):
+ return count and hasher(hash_n_times(s, count-1)) or s
+
+ hash = hash_n_times(hasher(hasher(self.password) + token), int(seq))
query.setTagData('hash',hash)
self._method='0k'
else:
@@ -386,7 +393,7 @@
self._resource = []
self._owner.onreceive(None)
- resp=self._owner.Dispatcher.SendAndWaitForResponse(
+ self._owner.Dispatcher.SendAndWaitForResponse(
Protocol('iq',typ='set',
payload=[Node('bind', attrs={'xmlns':NS_BIND}, payload=self._resource)]),
func=self._on_bound)
Modified: trunk/src/common/xmpp/browser.py
===================================================================
--- trunk/src/common/xmpp/browser.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/xmpp/browser.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -26,6 +26,8 @@
from dispatcher import *
from client import PlugIn
+DBG_BROWSER = "Browser"
+
class Browser(PlugIn):
""" WARNING! This class is for components only. It will not work in client mode!
@@ -80,7 +82,7 @@
def __init__(self):
"""Initialises internal variables. Used internally."""
PlugIn.__init__(self)
- DBG_LINE='browser'
+ self.DBG_LINE = DBG_BROWSER
self._exported_methods=[]
self._handlers={'':{}}
@@ -89,6 +91,7 @@
Used internally."""
owner.RegisterHandler('iq',self._DiscoveryHandler,typ='get',ns=NS_DISCO_INFO)
owner.RegisterHandler('iq',self._DiscoveryHandler,typ='get',ns=NS_DISCO_ITEMS)
+ owner.debug_flags.append(DBG_BROWSER)
def plugout(self):
""" Unregisters browser's iq handlers from your application dispatcher instance.
@@ -215,4 +218,4 @@
conn.send(rep)
raise NodeProcessed
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
Modified: trunk/src/common/xmpp/commands.py
===================================================================
--- trunk/src/common/xmpp/commands.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/xmpp/commands.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -35,6 +35,8 @@
from protocol import *
from client import PlugIn
+DBG_COMMANDS = 'commands'
+
class Commands(PlugIn):
"""Commands is an ancestor of PlugIn and can be attached to any session.
@@ -47,7 +49,7 @@
def __init__(self, browser):
"""Initialises class and sets up local variables"""
PlugIn.__init__(self)
- DBG_LINE='commands'
+ self.DBG_LINE = DBG_COMMANDS
self._exported_methods=[]
self._handlers={'':{}}
self._browser = browser
@@ -59,13 +61,14 @@
owner.RegisterHandler('iq',self._CommandHandler,typ='set',ns=NS_COMMANDS)
owner.RegisterHandler('iq',self._CommandHandler,typ='get',ns=NS_COMMANDS)
self._browser.setDiscoHandler(self._DiscoHandler,node=NS_COMMANDS,jid='')
+ owner.debug_flags.append(DBG_COMMANDS)
def plugout(self):
"""Removes handlers from the session"""
# unPlug from the session and the disco manager
self._owner.UnregisterHandler('iq',self._CommandHandler,ns=NS_COMMANDS)
for jid in self._handlers:
- self._browser.delDiscoHandler(self._DiscoHandler,node=NS_COMMANDS)
+ self._browser.delDiscoHandler(self._DiscoHandler,node=NS_COMMANDS,jid=jid)
def _CommandHandler(self,conn,request):
"""The internal method to process the routing of command execution requests"""
@@ -194,7 +197,7 @@
def __init__(self,jid=''):
"""Set up the class"""
PlugIn.__init__(self)
- DBG_LINE='command'
+ self.DBG_LINE='command'
self.sessioncount = 0
self.sessions = {}
# Disco information for command list pre-formatted as a tuple
Modified: trunk/src/common/xmpp/dispatcher.py
===================================================================
--- trunk/src/common/xmpp/dispatcher.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/xmpp/dispatcher.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -28,12 +28,14 @@
DefaultTimeout=25
ID=0
+DBG_DISPATCHER = 'dispatcher'
+
class Dispatcher(PlugIn):
""" Ancestor of PlugIn class. Handles XMPP stream, i.e. aware of stream headers.
Can be plugged out/in to restart these headers (used for SASL f.e.). """
def __init__(self):
PlugIn.__init__(self)
- DBG_LINE='dispatcher'
+ self.DBG_LINE = DBG_DISPATCHER
self.handlers={}
self._expected={}
self._defaultHandler=None
@@ -82,6 +84,7 @@
self._owner.lastErr=None
self._owner.lastErrCode=None
self.StreamInit()
+ owner.debug_flags.append(DBG_DISPATCHER)
def plugout(self):
""" Prepares instance to be destructed. """
@@ -292,7 +295,6 @@
for key in list:
if key: chain = chain + self.handlers[xmlns][name][key]
- output=''
if ID in session._expected:
user=0
if isinstance(session._expected[ID], tuple):
@@ -323,7 +325,6 @@
lastErrNode, lastErr and lastErrCode are set accordingly. """
if timeout is None: timeout=DefaultTimeout
self._expected[ID]=None
- has_timed_out=0
abort_time=time.time() + timeout
self.DEBUG("Waiting for ID:%s with timeout %s..." % (ID,timeout),'wait')
while not self._expected[ID]:
Modified: trunk/src/common/xmpp/dispatcher_nb.py
===================================================================
--- trunk/src/common/xmpp/dispatcher_nb.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/xmpp/dispatcher_nb.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -37,7 +37,7 @@
Can be plugged out/in to restart these headers (used for SASL f.e.). '''
def __init__(self):
PlugIn.__init__(self)
- DBG_LINE='dispatcher'
+ self.DBG_LINE='dispatcher'
self.handlers={}
self._expected={}
self._defaultHandler=None
@@ -338,7 +338,6 @@
for key in list:
if key: chain = chain + self.handlers[xmlns][name][key]
- output=''
if ID in session._expected:
user=0
if isinstance(session._expected[ID], tuple):
Modified: trunk/src/common/xmpp/features_nb.py
===================================================================
--- trunk/src/common/xmpp/features_nb.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/xmpp/features_nb.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -118,7 +118,7 @@
disp.SendAndCallForResponse(iq, _ReceivedRegInfo, {'agent': host })
def _ReceivedRegInfo(con, resp, agent):
- iq=Iq('get',NS_REGISTER,to=agent)
+ Iq('get',NS_REGISTER,to=agent)
if not isResultNode(resp):
error_msg = resp.getErrorMsg()
con.Event(NS_REGISTER,REGISTER_DATA_RECEIVED,(agent,None,False,error_msg))
Modified: trunk/src/common/xmpp/filetransfer.py
===================================================================
--- trunk/src/common/xmpp/filetransfer.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/xmpp/filetransfer.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -99,7 +99,8 @@
self.DEBUG('SendHandler called','info')
for sid in self._streams.keys():
stream=self._streams[sid]
- if stream['direction'][:2]=='|>': cont=1
+ if stream['direction'][:2]=='|>':
+ pass
elif stream['direction'][0]=='>':
chunk=stream['fp'].read(stream['block-size'])
if chunk:
Modified: trunk/src/common/xmpp/transports.py
===================================================================
--- trunk/src/common/xmpp/transports.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/xmpp/transports.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -66,13 +66,15 @@
"""Serialise exception into pre-cached descriptive string."""
return self._comment
+DBG_SOCKET = "socket"
+
class TCPsocket(PlugIn):
""" This class defines direct TCP connection method. """
def __init__(self, server=None, use_srv=True):
""" Cache connection point 'server'. 'server' is the tuple of (host, port)
absolutely the same as standard tcp socket uses. """
PlugIn.__init__(self)
- self.DBG_LINE='socket'
+ self.DBG_LINE = DBG_SOCKET
self._exported_methods=[self.send,self.disconnect]
self._server = server
@@ -85,6 +87,7 @@
if not self.connect(self._server): return
self._owner.Connection=self
self._owner.RegisterDisconnectHandler(self.disconnected)
+ owner.debug_flags.append(DBG_SOCKET)
return 'ok'
def getHost(self):
@@ -235,7 +238,7 @@
"""
if 'TLS' in owner.__dict__: return # Already enabled.
PlugIn.PlugIn(self,owner)
- DBG_LINE='TLS'
+ self.DBG_LINE='TLS'
if now: return self._startSSL()
if self._owner.Dispatcher.Stream.features:
try: self.FeaturesHandler(self._owner.Dispatcher,self._owner.Dispatcher.Stream.features)
Modified: trunk/src/common/xmpp/transports_nb.py
===================================================================
--- trunk/src/common/xmpp/transports_nb.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/xmpp/transports_nb.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -38,6 +38,7 @@
USE_PYOPENSSL = False
+DBG_NONBLOCKINGTLS= 'NonBlockingTLS'
try:
#raise ImportError("Manually disabled PyOpenSSL")
import OpenSSL.SSL
@@ -669,6 +670,8 @@
''' Return the 'port' value that is connection is [will be] made to.'''
return self._server[1]
+DBG_NONBLOCKINGTLS = "NonBlockingTLS"
+
class NonBlockingTLS(PlugIn):
''' TLS connection used to encrypts already estabilished tcp connection.'''
@@ -687,12 +690,13 @@
if 'NonBlockingTLS' in owner.__dict__:
return # Already enabled.
PlugIn.PlugIn(self, owner)
- DBG_LINE='NonBlockingTLS'
+ self.DBG_LINE = DBG_NONBLOCKINGTLS
+ owner.debug_flags.append(DBG_NONBLOCKINGTLS)
self.on_tls_start = on_tls_start
if now:
try:
res = self._startSSL()
- except Exception, e:
+ except Exception:
log.error("PlugIn: while trying _startSSL():", exc_info=True)
#traceback.print_exc()
self._owner.socket.pollend()
@@ -867,7 +871,7 @@
self.DEBUG('Got starttls proceed response. Switching to TLS/SSL...','ok')
try:
self._startSSL()
- except Exception, e:
+ except Exception:
log.error("StartTLSHandler:", exc_info=True)
#traceback.print_exc()
self._owner.socket.pollend()
@@ -1108,9 +1112,9 @@
return
# Get the bound address/port
elif reply[3] == "\x01":
- begin, end = 3, 7
+ pass # begin, end = 3, 7
elif reply[3] == "\x03":
- begin, end = 4, 4 + reply[4]
+ pass # begin, end = 4, 4 + reply[4]
else:
self.DEBUG('Invalid proxy reply', 'error')
self._owner.disconnected()
Modified: trunk/src/common/zeroconf/client_zeroconf.py
===================================================================
--- trunk/src/common/zeroconf/client_zeroconf.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/zeroconf/client_zeroconf.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -71,7 +71,7 @@
# will fail when port is busy, or we don't have rights to bind
try:
self._serv.bind((ai[4][0], self.port))
- except Exception, e:
+ except Exception:
# unable to bind, show error dialog
return None
self._serv.listen(socket.SOMAXCONN)
@@ -158,7 +158,7 @@
self.conn_holder.add_connection(self, self.Server, port, self.to)
# count messages in queue
for val in self.stanzaqueue:
- stanza, is_message = val
+ is_message = val[1]
if is_message:
if self.fd == -1:
if on_not_ok:
Modified: trunk/src/common/zeroconf/connection_handlers_zeroconf.py
===================================================================
--- trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -76,7 +76,6 @@
receiver = file_props['receiver']
if sender is None:
sender = file_props['sender']
- proxyhosts = []
sha_str = helpers.get_auth_sha(file_props['sid'], sender,
receiver)
file_props['sha_str'] = sha_str
@@ -382,6 +381,7 @@
try:
idle.init()
except Exception:
+ global HAS_IDLE
HAS_IDLE = False
def _messageCB(self, ip, con, msg):
Modified: trunk/src/common/zeroconf/roster_zeroconf.py
===================================================================
--- trunk/src/common/zeroconf/roster_zeroconf.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/zeroconf/roster_zeroconf.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -56,8 +56,8 @@
if not contact:
return
- (service_jid, domain, interface, protocol, host, address, port, bare_jid, txt) \
- = contact
+ host, address, port = contact[4:7]
+ txt = contact[8]
self._data[jid]={}
self._data[jid]['ask'] = 'no' #?
Modified: trunk/src/common/zeroconf/zeroconf_avahi.py
===================================================================
--- trunk/src/common/zeroconf/zeroconf_avahi.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/zeroconf/zeroconf_avahi.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -292,7 +292,7 @@
return True
else:
return False
- except dbus.DBusException, e:
+ except dbus.DBusException:
gajim.log.debug("Can't remove service. That should not happen")
def browse_domain(self, interface, protocol, domain):
@@ -429,4 +429,4 @@
# END Zeroconf
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
Modified: trunk/src/common/zeroconf/zeroconf_bonjour.py
===================================================================
--- trunk/src/common/zeroconf/zeroconf_bonjour.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/common/zeroconf/zeroconf_bonjour.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -115,7 +115,9 @@
}
# Split on '.' but do not split on '\.'
- name, stype, protocol, domain, dummy = re.split('(?<!\\\\)\.', fullname)
+ result = re.split('(?<!\\\\)\.', fullname)
+ name = result[0]
+ protocol, domain = result[2:4]
# Replace the escaped values
for src, trg in escaping.items():
@@ -329,7 +331,7 @@
try:
pybonjour.DNSServiceUpdateRecord(self.service_sdRef, None, 0, self.txt)
- except pybonjour.BonjourError, e:
+ except pybonjour.BonjourError:
return False
return True
Modified: trunk/src/config.py
===================================================================
--- trunk/src/config.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/config.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -55,7 +55,7 @@
from common import gajim
from common import connection
from common import passwords
-from common import zeroconf
+from common.zeroconf import connection_zeroconf
from common import dataforms
from common import GnuPG
@@ -308,9 +308,6 @@
self.xml.get_widget('sounds_scrolledwindow').set_sensitive(False)
self.xml.get_widget('browse_sounds_hbox').set_sensitive(False)
- # sound player
- player = gajim.config.get('soundplayer')
-
# sounds treeview
self.sound_tree = self.xml.get_widget('sounds_treeview')
@@ -612,27 +609,25 @@
helpers.update_optional_features()
def apply_speller(self):
- for acct in gajim.connections:
- for ctrl in gajim.interface.msg_win_mgr.controls():
- if isinstance(ctrl, chat_control.ChatControlBase):
- try:
- spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
- except Exception:
- spell_obj = None
+ for ctrl in gajim.interface.msg_win_mgr.controls():
+ if isinstance(ctrl, chat_control.ChatControlBase):
+ try:
+ spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
+ except Exception:
+ spell_obj = None
- if not spell_obj:
- gtkspell.Spell(ctrl.msg_textview)
+ if not spell_obj:
+ gtkspell.Spell(ctrl.msg_textview)
def remove_speller(self):
- for acct in gajim.connections:
- for ctrl in gajim.interface.msg_win_mgr.controls():
- if isinstance(ctrl, chat_control.ChatControlBase):
- try:
- spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
- except Exception:
- spell_obj = None
- if spell_obj:
- spell_obj.detach()
+ for ctrl in gajim.interface.msg_win_mgr.controls():
+ if isinstance(ctrl, chat_control.ChatControlBase):
+ try:
+ spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
+ except Exception:
+ spell_obj = None
+ if spell_obj:
+ spell_obj.detach()
def on_speller_checkbutton_toggled(self, widget):
active = widget.get_active()
@@ -644,7 +639,7 @@
lang = gajim.LANG
tv = gtk.TextView()
try:
- spell = gtkspell.Spell(tv, lang)
+ gtkspell.Spell(tv, lang)
except:
dialogs.ErrorDialog(
_('Dictionary for lang %s not available') % lang,
@@ -1031,7 +1026,6 @@
return
buf = self.xml.get_widget('msg_textview').get_buffer()
first_iter, end_iter = buf.get_bounds()
- name = model.get_value(iter, 0)
model.set_value(iter, 1, buf.get_text(first_iter, end_iter))
def on_msg_treeview_key_press_event(self, widget, event):
@@ -1689,7 +1683,7 @@
gajim.interface.instances[account]['remove_account'] = \
RemoveAccountWindow(account)
if win_opened:
- dialog = dialogs.ConfirmationDialog(
+ dialogs.ConfirmationDialog(
_('You have opened chat in account %s') % account,
_('All chat and groupchat windows will be closed. Do you want to '
'continue?'),
@@ -1894,7 +1888,7 @@
def on_synchronise_contacts_button1_clicked(self, widget):
try:
- dialog = dialogs.SynchroniseSelectAccountDialog(self.current_account)
+ dialogs.SynchroniseSelectAccountDialog(self.current_account)
except GajimGeneralException:
# If we showed ErrorDialog, there will not be dialog instance
return
@@ -1908,7 +1902,7 @@
self.xml.get_widget('password_entry1').set_text(new_password)
try:
- dialog = dialogs.ChangePasswordDialog(self.current_account, on_changed)
+ dialogs.ChangePasswordDialog(self.current_account, on_changed)
except GajimGeneralException:
# if we showed ErrorDialog, there will not be dialog instance
return
@@ -2073,14 +2067,10 @@
gajim.config.set_per('accounts', self.current_account, 'keyid',
keyID[0])
- instance = dialogs.ChooseGPGKeyDialog(_('OpenPGP Key Selection'),
+ dialogs.ChooseGPGKeyDialog(_('OpenPGP Key Selection'),
_('Choose your OpenPGP key'), secret_keys, on_key_selected)
def on_use_gpg_agent_checkbutton_toggled(self, widget):
- if self.current_account == gajim.ZEROCONF_ACC_NAME:
- wiget_name_ext = '2'
- else:
- wiget_name_ext = '1'
self.on_checkbutton_toggled(widget, 'use_gpg_agent')
def on_edit_details_button1_clicked(self, widget):
@@ -2170,8 +2160,8 @@
elif not gajim.config.get('enable_zeroconf') and widget.get_active():
self.xml.get_widget('zeroconf_notebook').set_sensitive(True)
# enable (will create new account if not present)
- gajim.connections[gajim.ZEROCONF_ACC_NAME] = common.zeroconf.\
- connection_zeroconf.ConnectionZeroconf(gajim.ZEROCONF_ACC_NAME)
+ gajim.connections[gajim.ZEROCONF_ACC_NAME] = connection_zeroconf.\
+ ConnectionZeroconf(gajim.ZEROCONF_ACC_NAME)
if gajim.connections[gajim.ZEROCONF_ACC_NAME].gpg:
self.xml.get_widget('gpg_choose_button2').set_sensitive(True)
self.init_account_gpg()
@@ -2470,7 +2460,7 @@
return
model = self.affiliation_treeview[affiliation].get_model()
model.append((jid,'', '', ''))
- instance = dialogs.InputDialog(title, prompt, ok_handler=on_ok)
+ dialogs.InputDialog(title, prompt, ok_handler=on_ok)
def on_remove_button_clicked(self, widget, affiliation):
selection = self.affiliation_treeview[affiliation].get_selection()
@@ -2576,7 +2566,7 @@
gajim.connections[self.account].unregister_account(
self._on_remove_success)
- w = dialogs.PassphraseDialog(
+ dialogs.PassphraseDialog(
_('Password Required'),
_('Enter your password for account %s') % self.account,
_('Save password'), ok_handler=on_ok)
@@ -2587,7 +2577,7 @@
self._on_remove_success(True)
if gajim.connections[self.account].connected:
- dialog = dialogs.ConfirmationDialog(
+ dialogs.ConfirmationDialog(
_('Account "%s" is connected to the server') % self.account,
_('If you remove it, the connection will be lost.'),
on_response_ok=remove)
Modified: trunk/src/conversation_textview.py
===================================================================
--- trunk/src/conversation_textview.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/conversation_textview.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -611,7 +611,7 @@
def on_textview_motion_notify_event(self, widget, event):
'''change the cursor to a hand when we are over a mail or an
url'''
- pointer_x, pointer_y, spam = self.tv.window.get_pointer()
+ pointer_x, pointer_y = self.tv.window.get_pointer()[0:2]
x, y = self.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT,
pointer_x, pointer_y)
tags = self.tv.get_iter_at_location(x, y).get_tags()
Modified: trunk/src/dataforms_widget.py
===================================================================
--- trunk/src/dataforms_widget.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/dataforms_widget.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -567,7 +567,6 @@
def on_jid_multi_remove_button_clicked(self, widget, treeview, field):
selection = treeview.get_selection()
- model = treeview.get_model()
deleted = []
def remove(model, path, iter_, deleted):
Modified: trunk/src/dialogs.py
===================================================================
--- trunk/src/dialogs.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/dialogs.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -436,7 +436,6 @@
'''
Return activity and messsage (None if no activity selected)
'''
- message = None
if self.checkbutton.get_active():
pep.user_send_activity(self.account, self.activity,
self.subactivity,
@@ -660,7 +659,7 @@
self.preset_messages_dict[msg_name] = msg_text
gajim.config.set_per('statusmsg', msg_name, 'message',
msg_text_1l)
- dlg2 = ConfirmationDialog(_('Overwrite Status Message?'),
+ ConfirmationDialog(_('Overwrite Status Message?'),
_('This name is already used. Do you want to overwrite this '
'status message?'), on_response_ok=on_ok2)
return
@@ -1862,7 +1861,7 @@
return
else:
try:
- dialog = SynchroniseSelectContactsDialog(self.account, remote_account)
+ SynchroniseSelectContactsDialog(self.account, remote_account)
except GajimGeneralException:
# if we showed ErrorDialog, there will not be dialog instance
return
@@ -2205,7 +2204,7 @@
if lang:
spell1.set_language(lang)
spell2.set_language(lang)
- except gobject.GError, msg:
+ except gobject.GError:
AspellDictError(lang)
self.prepare_widgets_for(self.action)
@@ -2979,7 +2978,7 @@
except GajimGeneralException:
pass
- dialog = YesNoDialog(pritext, sectext, on_response_yes=on_yes)
+ YesNoDialog(pritext, sectext, on_response_yes=on_yes)
class ProgressDialog:
def __init__(self, title_text, during_text, messages_queue):
@@ -3166,7 +3165,6 @@
self.window.destroy()
def on_listen_sound_combobox_changed(self, widget):
- model = widget.get_model()
active = widget.get_active()
if active == 1: # user selected 'choose sound'
def on_ok(widget, path_to_snd_file):
@@ -3669,9 +3667,6 @@
'server_and_guests_hseparator', 'server_select_label'):
self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add)
- # set comboboxentry
- renderer_servers = gtk.CellRendererText()
-
server_list = []
self.servers = gtk.ListStore(str)
self.server_list_comboboxentry.set_model(self.servers)
@@ -3914,7 +3909,7 @@
'encrypt messages.')
image = 'security-low-big.png'
else:
- msgenc, error = gajim.connections[account].gpg.encrypt('test', [keyID])
+ error = gajim.connections[account].gpg.encrypt('test', [keyID])[1]
if error:
verification_status = _('''Contact's identity NOT verified''')
info = _('GPG key is assigned to this contact, but <b>you do not '
Modified: trunk/src/disco.py
===================================================================
--- trunk/src/disco.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/disco.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -971,7 +971,6 @@
def _agent_info(self, jid, node, identities, features, data):
'''Callback for when we receive info about an agent's item.'''
- addr = get_agent_address(jid, node)
iter = self._find_item(jid, node)
if not iter:
# Not in the treeview, stop
@@ -1101,7 +1100,7 @@
if not props or self.tooltip.id != props[0]:
self.tooltip.hide_tooltip()
if props:
- [row, col, x, y] = props
+ row = props[0]
iter = None
try:
iter = self.model.get_iter(row)
@@ -1432,7 +1431,7 @@
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 = self._friendly_category(cat, type_)[0]
iter = self.model.get_iter_root()
while iter:
if self.model.get_value(iter, 3).decode('utf-8') == cat:
@@ -1542,7 +1541,6 @@
self._expand_all()
def _update_error(self, iter_, jid, node):
- addr = get_agent_address(jid, node)
self.model[iter_][4] = 2
self._progress += 1
self._update_progressbar()
@@ -1637,7 +1635,6 @@
room = model[iter][1].decode('utf-8')
if 'join_gc' not in gajim.interface.instances[self.account]:
try:
- room_jid = '%s@%s' % (service, room)
dialogs.JoinGroupchatWindow(self.account, service)
except GajimGeneralException:
pass
Modified: trunk/src/features_window.py
===================================================================
--- trunk/src/features_window.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/features_window.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -149,7 +149,6 @@
if not rows:
return
path = rows[0]
- available = self.model[path][1]
feature = self.model[path][0].decode('utf-8')
text = self.features[feature][1] + '\n'
if os.name == 'nt':
Modified: trunk/src/filetransfers_window.py
===================================================================
--- trunk/src/filetransfers_window.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/filetransfers_window.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -160,7 +160,7 @@
dialog.destroy()
if 'file-name' not in file_props:
return
- (path, file) = os.path.split(file_props['file-name'])
+ path = os.path.split(file_props['file-name'])[0]
if os.path.exists(path) and os.path.isdir(path):
helpers.launch_file_manager(path)
self.tree.get_selection().unselect_all()
@@ -286,7 +286,7 @@
return
(jid, resource) = contact.split('/', 1)
contact = gajim.contacts.create_contact(jid=jid, resource=resource)
- (file_dir, file_name) = os.path.split(file_path)
+ file_name = os.path.split(file_path)[1]
file_props = self.get_send_file_props(account, contact,
file_path, file_name, file_desc)
if file_props is None:
@@ -317,7 +317,7 @@
if 'desc' in file_props:
sec_text += '\n\t' + _('Description: %s') % file_props['desc']
prim_text = _('%s wants to send you a file:') % contact.jid
- dialog, dialog2 = None, None
+ dialog = None
def on_response_ok(account, contact, file_props):
@@ -596,7 +596,7 @@
text_labels += '<b>' + _('Recipient: ') + '</b>'
if file_props['type'] == 'r':
- (file_path, file_name) = os.path.split(file_props['file-name'])
+ file_name = os.path.split(file_props['file-name'])[1]
else:
file_name = file_props['name']
text_props = gobject.markup_escape_text(file_name) + '\n'
@@ -617,14 +617,13 @@
def on_transfers_list_motion_notify_event(self, widget, event):
pointer = self.tree.get_pointer()
- orig = widget.window.get_origin()
props = widget.get_path_at_pos(int(event.x), int(event.y))
self.height_diff = pointer[1] - int(event.y)
if self.tooltip.timeout > 0:
if not props or self.tooltip.id != props[0]:
self.tooltip.hide_tooltip()
if props:
- [row, col, x, y] = props
+ row = props[0]
iter = None
try:
iter = self.model.get_iter(row)
@@ -886,7 +885,7 @@
self.tooltip.hide_tooltip()
iter = None
try:
- store, iter = self.tree.get_selection().get_selected()
+ iter = self.tree.get_selection().get_selected()[1]
except TypeError:
self.tree.get_selection().unselect_all()
@@ -904,8 +903,7 @@
self.tooltip.hide_tooltip()
path = None
try:
- path, column, x, y = self.tree.get_path_at_pos(int(event.x),
- int(event.y))
+ path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0]
except TypeError:
self.tree.get_selection().unselect_all()
if path is None:
@@ -918,8 +916,7 @@
self.tooltip.hide_tooltip()
path, iter = None, None
try:
- path, column, x, y = self.tree.get_path_at_pos(int(event.x),
- int(event.y))
+ path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0]
except TypeError:
self.tree.get_selection().unselect_all()
if event.button == 3: # Right click
@@ -939,7 +936,7 @@
file_props = self.files_props[sid[0]][sid[1:]]
if 'file-name' not in file_props:
return
- (path, file) = os.path.split(file_props['file-name'])
+ path = os.path.split(file_props['file-name'])[0]
if os.path.exists(path) and os.path.isdir(path):
helpers.launch_file_manager(path)
Modified: trunk/src/gajim.py
===================================================================
--- trunk/src/gajim.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/gajim.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -115,7 +115,7 @@
try:
shortargs = 'hqvl:p:c:'
longargs = 'help quiet verbose loglevel= profile= config_path='
- opts, args = getopt.getopt(sys.argv[1:], shortargs, longargs.split())
+ opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0]
except getopt.error, msg:
print msg
print 'for help use --help'
Modified: trunk/src/gajim_themes_window.py
===================================================================
--- trunk/src/gajim_themes_window.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/gajim_themes_window.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -121,7 +121,7 @@
model.clear()
for config_theme in gajim.config.get_per('themes'):
theme = config_theme.replace('_', ' ')
- iter = model.append([theme])
+ model.append([theme])
def select_active_theme(self):
model = self.themes_tree.get_model()
Modified: trunk/src/groupchat_control.py
===================================================================
--- trunk/src/groupchat_control.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/groupchat_control.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -1008,7 +1008,6 @@
contact in a room'''
if nick is None:
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 ctrl and msg:
@@ -1809,7 +1808,7 @@
on_minimize(self)
return
if method == self.parent_win.CLOSE_ESC:
- model, iter = self.list_treeview.get_selection().get_selected()
+ iter = self.list_treeview.get_selection().get_selected()[1]
if iter:
self.list_treeview.get_selection().unselect_all()
on_no(self)
@@ -1838,7 +1837,7 @@
sectext = _('If you close this window, you will be disconnected '
'from this group chat.')
- dialog = dialogs.ConfirmationDialogCheck(pritext, sectext,
+ dialogs.ConfirmationDialogCheck(pritext, sectext,
_('Do _not ask me again'), on_response_ok=on_ok,
on_response_cancel=on_cancel)
return
@@ -1872,7 +1871,7 @@
# will work yet
gajim.connections[self.account].send_gc_subject(self.room_jid, subject)
- instance = dialogs.InputTextDialog(_('Changing Subject'),
+ dialogs.InputTextDialog(_('Changing Subject'),
_('Please specify the new subject:'), input_str=self.subject,
ok_handler=on_ok)
@@ -1904,7 +1903,7 @@
jid)
# Ask for a reason
- instance = dialogs.DubbleInputDialog(_('Destroying %s') % self.room_jid,
+ dialogs.DubbleInputDialog(_('Destroying %s') % self.room_jid,
_('You are going to definitively destroy this room.\n'
'You may specify a reason below:'),
_('You may also enter an alternate venue:'), ok_handler=on_ok)
@@ -1927,7 +1926,6 @@
path = treeview.get_selection().get_selected_rows()[1][0]
iter = model.get_iter(path)
type = model[iter][2]
- account = model[iter][4].decode('utf-8')
if type != 'contact': # source is not a contact
return
contact_jid = data.decode('utf-8')
@@ -2055,7 +2053,7 @@
def on_list_treeview_key_press_event(self, widget, event):
if event.keyval == gtk.keysyms.Escape:
selection = widget.get_selection()
- model, iter = selection.get_selected()
+ iter = selection.get_selected()[1]
if iter:
widget.get_selection().unselect_all()
return True
@@ -2079,7 +2077,7 @@
'none', reason)
# ask for reason
- instance = dialogs.InputDialog(_('Kicking %s') % nick,
+ dialogs.InputDialog(_('Kicking %s') % nick,
_('You may specify a reason below:'), ok_handler=on_ok)
def mk_menu(self, event, iter_):
@@ -2235,13 +2233,13 @@
'''popup user's group's or agent menu'''
# hide tooltip, no matter the button is pressed
self.tooltip.hide_tooltip()
+ try:
+ pos = widget.get_path_at_pos(int(event.x), int(event.y))
+ path, x = pos[0], pos[2]
+ except TypeError:
+ widget.get_selection().unselect_all()
+ return
if event.button == 3: # right click
- try:
- path, column, x, y = widget.get_path_at_pos(int(event.x),
- int(event.y))
- except TypeError:
- widget.get_selection().unselect_all()
- return
widget.get_selection().select_path(path)
model = widget.get_model()
iter = model.get_iter(path)
@@ -2250,12 +2248,6 @@
return True
elif event.button == 2: # middle click
- try:
- path, column, x, y = widget.get_path_at_pos(int(event.x),
- int(event.y))
- except TypeError:
- widget.get_selection().unselect_all()
- return
widget.get_selection().select_path(path)
model = widget.get_model()
iter = model.get_iter(path)
@@ -2265,13 +2257,6 @@
return True
elif event.button == 1: # left click
- try:
- path, column, x, y = widget.get_path_at_pos(int(event.x),
- int(event.y))
- except TypeError:
- widget.get_selection().unselect_all()
- return
-
if gajim.single_click and not event.state & gtk.gdk.SHIFT_MASK:
self.on_row_activated(widget, path)
return True
@@ -2385,7 +2370,7 @@
# to ban we know the real jid. so jid is not fakejid
nick = gajim.get_nick_from_jid(jid)
# ask for reason
- instance = dialogs.InputDialog(_('Banning %s') % nick,
+ dialogs.InputDialog(_('Banning %s') % nick,
_('You may specify a reason below:'), ok_handler=on_ok)
def grant_membership(self, widget, jid):
Modified: trunk/src/gtkexcepthook.py
===================================================================
--- trunk/src/gtkexcepthook.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/gtkexcepthook.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -82,7 +82,6 @@
# on expand the details the dialog remains centered on screen
dialog.set_position(gtk.WIN_POS_CENTER_ALWAYS)
- close_clicked = False
def on_dialog_response(dialog, response):
if response == RESPONSE_REPORT_BUG:
url = 'http://trac.gajim.org/wiki/HowToCreateATicket'
Modified: trunk/src/gtkgui_helpers.py
===================================================================
--- trunk/src/gtkgui_helpers.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/gtkgui_helpers.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -97,7 +97,7 @@
x = window_x + button_x
y = window_y + button_y
- menu_width, menu_height = menu.size_request()
+ menu_height = menu.size_request()[1]
## should we pop down or up?
if (y + button.allocation.height + menu_height
@@ -494,7 +494,7 @@
win32con.FILE_ATTRIBUTE_NORMAL, # normal file
0 # no attr. template
)
- except pywintypes.error, e:
+ except pywintypes.error:
return True
else: # in case all went ok, close file handle (go to hell WinAPI)
hfile.Close()
@@ -808,10 +808,6 @@
dialog.destroy()
def on_ok(widget):
- def on_ok2(file_path, pixbuf):
- pixbuf.save(file_path, 'jpeg')
- dialog.destroy()
-
file_path = dialog.get_filename()
file_path = decode_filechooser_file_paths((file_path,))[0]
if os.path.exists(file_path):
Modified: trunk/src/history_manager.py
===================================================================
--- trunk/src/history_manager.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/history_manager.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -220,7 +220,7 @@
def on_no():
gtk.main_quit()
- dialog = dialogs.YesNoDialog(
+ dialogs.YesNoDialog(
_('Do you want to clean up the database? '
'(STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)'),
_('Normally allocated database size will not be freed, '
@@ -296,7 +296,7 @@
(user will see the first pm as if it was message in room's public chat)
and after that all okay'''
- possible_room_jid, possible_nick = jid.split('/', 1)
+ possible_room_jid = jid.split('/', 1)[0]
self.cur.execute('SELECT jid_id FROM jids WHERE jid = ? AND type = ?',
(possible_room_jid, constants.JID_ROOM_TYPE))
@@ -421,9 +421,6 @@
xml.get_widget('delete_menuitem').connect('activate',
self.on_delete_menuitem_activate, widget)
- liststore, list_of_paths = self.jids_listview.get_selection()\
- .get_selected_rows()
-
xml.signal_autoconnect(self)
xml.get_widget('context_menu').popup(None, None, None,
event.button, event.time)
Modified: trunk/src/history_window.py
===================================================================
--- trunk/src/history_window.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/history_window.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -333,7 +333,7 @@
# first day of month is 1 not 0
widget.clear_marks()
month = gtkgui_helpers.make_gtk_month_python_month(month)
- weekday, days_in_this_month = calendar.monthrange(year, month)
+ days_in_this_month = calendar.monthrange(year, month)[1]
try:
log_days = gajim.logger.get_days_with_logs(self.jid, year, month,
days_in_this_month, self.account)
@@ -525,7 +525,7 @@
'''a row was double clicked, get date from row, and select it in calendar
which results to showing conversation logs for that date'''
# get currently selected date
- cur_year, cur_month, cur_day = self.calendar.get_date()
+ cur_year, cur_month = self.calendar.get_date()[0:2]
cur_month = gtkgui_helpers.make_gtk_month_python_month(cur_month)
model = widget.get_model()
# make it a tupple (Y, M, D, 0, 0, 0...)
Modified: trunk/src/htmltextview.py
===================================================================
--- trunk/src/htmltextview.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/htmltextview.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -1034,7 +1034,7 @@
def on_textview_motion_notify_event(widget, event):
'''change the cursor to a hand when we are over a mail or an url'''
global change_cursor
- pointer_x, pointer_y, spam = htmlview.window.get_pointer()
+ pointer_x, pointer_y = htmlview.window.get_pointer()[0:2]
x, y = htmlview.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, pointer_x,
pointer_y)
tags = htmlview.get_iter_at_location(x, y).get_tags()
@@ -1043,7 +1043,6 @@
gtk.gdk.Cursor(gtk.gdk.XTERM))
change_cursor = None
tag_table = htmlview.get_buffer().get_tag_table()
- over_line = False
for tag in tags:
try:
if tag.is_anchor:
Modified: trunk/src/ipython_view.py
===================================================================
--- trunk/src/ipython_view.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/ipython_view.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -245,7 +245,6 @@
@param header: Header to be printed before output
@type header: string
'''
- stat = 0
if verbose or debug: print header+cmd
# flush stdout so we don't mangle python's buffering
if not debug:
Modified: trunk/src/message_control.py
===================================================================
--- trunk/src/message_control.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/message_control.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -142,10 +142,8 @@
self.session = session
- new_key = None
if session:
session.control = self
- new_key = session.thread_id
if oldsession:
oldsession.control = None
Modified: trunk/src/message_window.py
===================================================================
--- trunk/src/message_window.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/message_window.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -213,7 +213,6 @@
self.on_delete_ok -= 1
# Make sure all controls are okay with being deleted
- ctrl_to_minimize = []
self.on_delete_ok = self.get_nb_controls()
for ctrl in self.controls():
ctrl.allow_shutdown(self.CLOSE_CLOSE_BUTTON, on_yes, on_no,
@@ -671,11 +670,7 @@
yield ctrl
def get_nb_controls(self):
- nb_ctrl = 0
- for jid_dict in self._controls.values():
- for ctrl in jid_dict.values():
- nb_ctrl += 1
- return nb_ctrl
+ return sum(len(jid_dict) for jid_dict in self._controls.values())
def move_to_next_unread_tab(self, forward):
ind = self.notebook.get_current_page()
@@ -776,7 +771,7 @@
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)
+ dest_page_num = self.get_tab_at_xy(x, y)[0]
source_child = self.notebook.get_nth_page(source_page_num)
if dest_page_num != source_page_num:
self.notebook.reorder_child(source_child, dest_page_num)
Modified: trunk/src/notify.py
===================================================================
--- trunk/src/notify.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/notify.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -533,8 +533,8 @@
if gajim.interface.systray_enabled and \
gajim.config.get('attach_notifications_to_systray'):
x, y = gajim.interface.systray.img_tray.window.get_origin()
- x_, y_, width, height, depth = \
- gajim.interface.systray.img_tray.window.get_geometry()
+ width, height, = \
+ gajim.interface.systray.img_tray.window.get_geometry()[2:4]
pos_x = x + (width / 2)
pos_y = y + (height / 2)
hints = {'x': pos_x, 'y': pos_y}
Modified: trunk/src/roster_window.py
===================================================================
--- trunk/src/roster_window.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/roster_window.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -514,7 +514,6 @@
# Family might has changed (actual big brother not on top).
# Remove childs first then big brother
family_in_roster = False
- big_brother_jid = None
for data in nearby_family:
_account = data['account']
_jid = data['jid']
@@ -821,7 +820,6 @@
def remove_transport(self, jid, account):
'''Remove transport from roster and redraw account and group.'''
- contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
self.remove_contact(jid, account, force=True, backend=True)
return True
@@ -1144,8 +1142,8 @@
is_big_brother = False
have_visible_children = False
if family:
- nearby_family, bb_jid, bb_account = \
- self._get_nearby_family_and_big_brother(family, account)
+ bb_jid, bb_account = \
+ self._get_nearby_family_and_big_brother(family, account)[1:]
is_big_brother = (jid, account) == (bb_jid, bb_account)
iters = self._get_contact_iter(jid, account)
have_visible_children = iters \
@@ -1723,7 +1721,7 @@
obj = bus.get_object('com.google.code.Awn', '/com/google/code/Awn')
awn = dbus.Interface(obj, 'com.google.code.Awn')
awn.SetTaskIconByName('Gajim', os.path.abspath(path))
- except Exception, e:
+ except Exception:
pass
def music_track_changed(self, unused_listener, music_track_info,
@@ -1735,14 +1733,10 @@
artist = ''
title = ''
source = ''
- track = ''
- length = ''
elif hasattr(music_track_info, 'paused') and music_track_info.paused == 0:
artist = ''
title = ''
source = ''
- track = ''
- length = ''
else:
artist = music_track_info.artist
title = music_track_info.title
@@ -1910,7 +1904,6 @@
self.set_connecting_state(account)
if not gajim.connections[account].password:
- passphrase = ''
text = _('Enter your password for account %s') % account
if passwords.USER_HAS_GNOMEKEYRING and \
not passwords.USER_USES_GNOMEKEYRING:
@@ -1924,7 +1917,7 @@
passwords.save_password(account, passphrase)
keyid = gajim.config.get_per('accounts', account, 'keyid')
if keyid and not gajim.connections[account].gpg:
- dialog = dialogs.WarningDialog(_('GPG is not usable'),
+ dialogs.WarningDialog(_('GPG is not usable'),
_('You will be connected to %s without OpenPGP.') % \
account)
self.send_status_continue(account, status, txt, auto, to)
@@ -1937,14 +1930,14 @@
gajim.interface.systray.change_status('offline')
self.update_status_combobox()
- w = dialogs.PassphraseDialog(_('Password Required'), text,
+ dialogs.PassphraseDialog(_('Password Required'), text,
_('Save password'), ok_handler=on_ok,
cancel_handler=on_cancel)
return
keyid = gajim.config.get_per('accounts', account, 'keyid')
if keyid and not gajim.connections[account].gpg:
- dialog = dialogs.WarningDialog(_('GPG is not usable'),
+ dialogs.WarningDialog(_('GPG is not usable'),
_('You will be connected to %s without OpenPGP.') % account)
self.send_status_continue(account, status, txt, auto, to)
@@ -2278,7 +2271,7 @@
break
if unread or recent:
- dialog = dialogs.ConfirmationDialog(_('You have unread messages'),
+ dialogs.ConfirmationDialog(_('You have unread messages'),
_('Messages will only be available for reading them later if you'
' have history enabled and contact is in your roster.'),
on_response_ok=(on_continue2, message))
@@ -2386,7 +2379,7 @@
if not props or self.tooltip.id != props[0]:
self.tooltip.hide_tooltip()
if props:
- [row, col, x, y] = props
+ row = props[0]
titer = None
try:
titer = model.get_iter(row)
@@ -2540,7 +2533,6 @@
if msg is None:
# user pressed Cancel to change status message dialog
return
- model = self.modelfilter
accounts = []
if group is None:
for (contact, account) in list_:
@@ -2583,7 +2575,6 @@
def on_unblock(self, widget, list_, group=None):
''' When clicked on the 'unblock' button in context menu. '''
- model = self.modelfilter
accounts = []
if group is None:
for (contact, account) in list_:
@@ -2655,7 +2646,6 @@
if 'rename' in gajim.interface.instances:
gajim.interface.instances['rename'].dialog.present()
return
- model = self.modelfilter
# account is offline, don't allow to rename
if gajim.connections[account].connected < 2:
@@ -2768,7 +2758,7 @@
u.keyID = helpers.prepare_and_validate_gpg_keyID(account,
contact.jid, keyID)
- instance = dialogs.ChooseGPGKeyDialog(_('Assign OpenPGP Key'),
+ dialogs.ChooseGPGKeyDialog(_('Assign OpenPGP Key'),
_('Select a key to apply to the contact'), public_keys,
on_key_selected, selected=keyID)
@@ -2885,7 +2875,8 @@
resource = None):
''' resource parameter MUST NOT be used if more than one contact in
list '''
- for (contact, acct) in list_:
+ for e in list_:
+ contact = e[0]
contact_jid = contact.jid
if resource: # we MUST have one contact only in list_
contact_jid += '/' + resource
@@ -2930,10 +2921,10 @@
helpers.launch_browser_mailer('url', url)
def on_change_activity_activate(self, widget, account):
- dlg = dialogs.ChangeActivityDialog(account)
+ dialogs.ChangeActivityDialog(account)
def on_change_mood_activate(self, widget, account):
- dlg = dialogs.ChangeMoodDialog(account)
+ dialogs.ChangeMoodDialog(account)
def on_change_status_message_activate(self, widget, account):
show = gajim.SHOW_LIST[gajim.connections[account].connected]
@@ -2992,8 +2983,7 @@
def on_roster_treeview_button_release_event(self, widget, event):
try:
- path, column, x, y = self.tree.get_path_at_pos(int(event.x),
- int(event.y))
+ path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0]
except TypeError:
return False
@@ -3009,8 +2999,8 @@
# hide tooltip, no matter the button is pressed
self.tooltip.hide_tooltip()
try:
- path, column, x, y = self.tree.get_path_at_pos(int(event.x),
- int(event.y))
+ pos = self.tree.get_path_at_pos(int(event.x), int(event.y))
+ path, x = pos[0], pos[2]
except TypeError:
self.tree.get_selection().unselect_all()
return False
@@ -3121,7 +3111,6 @@
if len(list_) == 1:
contact = list_[0][0]
- account = list_[0][1]
pritext = _('Contact "%s" will be removed from your roster') % \
contact.get_shown_name()
if contact.sub == 'to':
@@ -3260,7 +3249,7 @@
def on_cancel():
self.update_status_combobox()
- dialog = dialogs.ConfirmationDialog(
+ dialogs.ConfirmationDialog(
_('You are participating in one or more group chats'),
_('Changing your status to invisible will result in '
'disconnection from those group chats. Are you sure you want to '
@@ -3414,7 +3403,7 @@
gajim.interface.msg_win_mgr.one_window_opened():
# let message window close the tab
return
- model, list_of_paths = self.tree.get_selection().get_selected_rows()
+ list_of_paths = self.tree.get_selection().get_selected_rows()[1]
if not len(list_of_paths) and gajim.interface.systray_enabled and \
not gajim.config.get('quit_on_roster_x_button'):
self.tooltip.hide_tooltip()
@@ -3533,8 +3522,8 @@
jid = model[titer][C_JID].decode('utf-8')
account = model[titer][C_ACCOUNT].decode('utf-8')
family = gajim.contacts.get_metacontacts_family(account, jid)
- nearby_family, bb_jid, bb_account = \
- self._get_nearby_family_and_big_brother(family, account)
+ nearby_family = \
+ self._get_nearby_family_and_big_brother(family, account)[0]
# Redraw all brothers to show pending events
for data in nearby_family:
self.draw_contact(data['jid'], data['account'])
@@ -3573,8 +3562,8 @@
jid = model[titer][C_JID].decode('utf-8')
account = model[titer][C_ACCOUNT].decode('utf-8')
family = gajim.contacts.get_metacontacts_family(account, jid)
- nearby_family, bb_jid, bb_account = \
- self._get_nearby_family_and_big_brother(family, account)
+ nearby_family = \
+ self._get_nearby_family_and_big_brother(family, account)[0]
# Redraw all brothers to show pending events
for data in nearby_family:
self.draw_contact(data['jid'], data['account'])
@@ -3835,7 +3824,7 @@
def drag_drop(self, treeview, context, x, y, timestamp):
target_list = treeview.drag_dest_get_target_list()
target = treeview.drag_dest_find_target(context, target_list)
- selection = treeview.drag_get_data(context, target)
+ treeview.drag_get_data(context, target)
context.finish(False, True)
return True
@@ -5411,10 +5400,11 @@
else:
execute_command_menuitem.set_sensitive(False)
- our_jid_other_resource = None
- if our_jid:
- # It's another resource of us, be sure to send invite to her
- our_jid_other_resource = contact.resource
+ # This does nothing:
+ # our_jid_other_resource = None
+ # if our_jid:
+ # # It's another resource of us, be sure to send invite to her
+ # our_jid_other_resource = contact.resource
# Else this var is useless but harmless in next connect calls
if gajim.capscache.is_supported(contact, NS_FILE):
@@ -5775,7 +5765,6 @@
def make_groupchat_menu(self, event, titer):
model = self.modelfilter
- path = model.get_path(titer)
jid = model[titer][C_JID].decode('utf-8')
account = model[titer][C_ACCOUNT].decode('utf-8')
contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
@@ -6351,8 +6340,7 @@
if not gajim.ZEROCONF_ACC_NAME in gajim.config.get_per('accounts'):
# Create zeroconf in config file
from common.zeroconf import connection_zeroconf
- zeroconf = connection_zeroconf.ConnectionZeroconf(
- gajim.ZEROCONF_ACC_NAME)
+ connection_zeroconf.ConnectionZeroconf(gajim.ZEROCONF_ACC_NAME)
if sys.platform == 'darwin':
self.setup_for_osx()
Modified: trunk/src/tooltips.py
===================================================================
--- trunk/src/tooltips.py 2008-12-02 15:13:08 UTC (rev 10751)
+++ trunk/src/tooltips.py 2008-12-02 15:53:23 UTC (rev 10752)
@@ -655,7 +655,7 @@
properties = []
name = file_props['name']
if file_props['type'] == 'r':
- (file_path, file_name) = os.path.split(file_props['file-name'])
+ file_name = os.path.split(file_props['file-name'])[1]
else:
file_name = file_props['name']
properties.append((_('Name: '),
1
0
02 Dec '08
Author: asterix
Date: 2008-12-02 16:13:08 +0100 (Tue, 02 Dec 2008)
New Revision: 10751
Modified:
trunk/src/common/nslookup.py
trunk/src/osx/growler.py
trunk/src/osx/syncmenu/test-menu.py
Log:
[thorstenp] fix global use
Modified: trunk/src/common/nslookup.py
===================================================================
--- trunk/src/common/nslookup.py 2008-12-02 15:10:31 UTC (rev 10750)
+++ trunk/src/common/nslookup.py 2008-12-02 15:13:08 UTC (rev 10751)
@@ -316,7 +316,6 @@
resolver = Resolver(idlequeue)
def clicked(widget):
- global resolver
host = text_view.get_text()
def on_result(host, result_array):
print 'Result:\n' + repr(result_array)
Modified: trunk/src/osx/growler.py
===================================================================
--- trunk/src/osx/growler.py 2008-12-02 15:10:31 UTC (rev 10750)
+++ trunk/src/osx/growler.py 2008-12-02 15:13:08 UTC (rev 10751)
@@ -22,7 +22,7 @@
def init():
- global growler, notifications
+ global growler
icon = open(os.path.join(gajim.DATA_DIR, "pixmaps", "gajim.icns"), "r")
growler = GrowlNotifier(applicationName = "Gajim",
notifications = notifications,
@@ -33,7 +33,6 @@
def notify(event_type, jid, account, msg_type, path_to_image, title, text):
- global notifications
if not event_type in notifications:
event_type = GENERIC_NOTIF
if not text:
Modified: trunk/src/osx/syncmenu/test-menu.py
===================================================================
--- trunk/src/osx/syncmenu/test-menu.py 2008-12-02 15:10:31 UTC (rev 10750)
+++ trunk/src/osx/syncmenu/test-menu.py 2008-12-02 15:13:08 UTC (rev 10751)
@@ -6,7 +6,6 @@
def menu_item_activate_cb(item, user_data):
- global open_item, copy_item
print "Item activated: %s" % user_data
#g_object_get (G_OBJECT (copy_item),
@@ -77,4 +76,4 @@
gtk.main()
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
1
0