Author: asterix
Date: 2009-03-11 10:47:16 +0100 (Wed, 11 Mar 2009)
New Revision: 11152
Modified:
trunk/src/common/dataforms.py
Log:
[brubru] fallback to field 's identifier (var) when there is no Human-readable name (label). Fixes #4894
Modified: trunk/src/common/dataforms.py
===================================================================
--- trunk/src/common/dataforms.py 2009-03-11 09:40:08 UTC (rev 11151)
+++ trunk/src/common/dataforms.py 2009-03-11 09:47:16 UTC (rev 11152)
@@ -159,7 +159,10 @@
def label():
'''Human-readable field name.'''
def fget(self):
- return self.getAttr('label')
+ l = self.getAttr('label')
+ if not l:
+ l = self.var
+ return l
def fset(self, value):
assert isinstance(value, basestring)
@@ -263,7 +266,10 @@
v = element.getTagData('value')
if v is None:
raise WrongFieldValue
- options.append((element.getAttr('label'), v))
+ l = element.getAttr('label')
+ if not l:
+ l = v
+ options.append((l, v))
return options
def fset(self, values):
1
0
Author: asterix
Date: 2009-03-11 10:40:08 +0100 (Wed, 11 Mar 2009)
New Revision: 11151
Modified:
trunk/src/config.py
Log:
[brubru] don't fail when open pref window with no accoutn configured. Fixes #4895
Modified: trunk/src/config.py
===================================================================
--- trunk/src/config.py 2009-03-11 09:17:23 UTC (rev 11150)
+++ trunk/src/config.py 2009-03-11 09:40:08 UTC (rev 11151)
@@ -522,8 +522,11 @@
self.window.hide()
def get_per_account_option(self, opt):
- '''Return the value of the option opt if it's the same in all accoutns
+ '''Return the value of the option opt if it's the same in all accounts
else returns "mixed"'''
+ if len(gajim.connections) = 0:
+ # a non existant key return default value
+ return gajim.config.get_per('accounts', '__default__', opt)
val = None
for account in gajim.connections:
v = gajim.config.get_per('accounts', account, opt)
1
0
Author: asterix
Date: 2009-03-11 10:17:23 +0100 (Wed, 11 Mar 2009)
New Revision: 11150
Modified:
trunk/src/chat_control.py
trunk/src/config.py
trunk/src/dialogs.py
trunk/src/gajim.py
Log:
check OSError from gtkspell.py. Fixes #4897
Modified: trunk/src/chat_control.py
===================================================================
--- trunk/src/chat_control.py 2009-03-11 09:16:07 UTC (rev 11149)
+++ trunk/src/chat_control.py 2009-03-11 09:17:23 UTC (rev 11150)
@@ -314,7 +314,7 @@
if lang:
self.msg_textview.lang = lang
spell.set_language(lang)
- except (gobject.GError, RuntimeError, TypeError):
+ except (gobject.GError, RuntimeError, TypeError, OSError):
dialogs.AspellDictError(lang)
def on_msg_textview_populate_popup(self, textview, menu):
Modified: trunk/src/config.py
===================================================================
--- trunk/src/config.py 2009-03-11 09:16:07 UTC (rev 11149)
+++ trunk/src/config.py 2009-03-11 09:17:23 UTC (rev 11150)
@@ -636,7 +636,7 @@
if isinstance(ctrl, chat_control.ChatControlBase):
try:
spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
- except (TypeError, RuntimeError):
+ except (TypeError, RuntimeError, OSError):
spell_obj = None
if not spell_obj:
@@ -663,7 +663,7 @@
tv = gtk.TextView()
try:
gtkspell.Spell(tv, lang)
- except (TypeError, RuntimeError):
+ except (TypeError, RuntimeError, OSError):
dialogs.ErrorDialog(
_('Dictionary for lang %s not available') % lang,
_('You have to install %s dictionary to use spellchecking, or '
Modified: trunk/src/dialogs.py
===================================================================
--- trunk/src/dialogs.py 2009-03-11 09:16:07 UTC (rev 11149)
+++ trunk/src/dialogs.py 2009-03-11 09:17:23 UTC (rev 11150)
@@ -2203,7 +2203,7 @@
lang = gajim.LANG
gtkspell.Spell(self.conversation_textview.tv, lang)
gtkspell.Spell(self.message_textview, lang)
- except (gobject.GError, TypeError, RuntimeError):
+ except (gobject.GError, TypeError, RuntimeError, OSError):
AspellDictError(lang)
self.prepare_widgets_for(self.action)
Modified: trunk/src/gajim.py
===================================================================
--- trunk/src/gajim.py 2009-03-11 09:16:07 UTC (rev 11149)
+++ trunk/src/gajim.py 2009-03-11 09:17:23 UTC (rev 11150)
@@ -3409,7 +3409,7 @@
try:
import gtkspell
spell = gtkspell.Spell(tv, lang)
- except (ImportError, TypeError, RuntimeError):
+ except (ImportError, TypeError, RuntimeError, OSError):
dialogs.AspellDictError(lang)
if gajim.config.get('soundplayer') == '':
1
0
Author: asterix
Date: 2009-03-11 10:16:07 +0100 (Wed, 11 Mar 2009)
New Revision: 11149
Modified:
trunk/src/common/gajim.py
trunk/src/gajim.py
Log:
[brubru] colored output of logging system. Fixes #4875
Modified: trunk/src/common/gajim.py
===================================================================
--- trunk/src/common/gajim.py 2009-03-11 07:28:21 UTC (rev 11148)
+++ trunk/src/common/gajim.py 2009-03-11 09:16:07 UTC (rev 11149)
@@ -67,16 +67,9 @@
config = config.Config()
version = config.get('version')
connections = {} # 'account name': 'account (connection.Connection) instance'
-verbose = False
ipython_window = None
-h = logging.StreamHandler()
-f = logging.Formatter('%(asctime)s %(name)s: %(message)s', '%d %b %Y %H:%M:%S')
-h.setFormatter(f)
-log = logging.getLogger('Gajim')
-log.addHandler(h)
-del h
-del f
+log = logging.getLogger('gajim')
import logger
logger = logger.Logger() # init the logger
Modified: trunk/src/gajim.py
===================================================================
--- trunk/src/gajim.py 2009-03-11 07:28:21 UTC (rev 11148)
+++ trunk/src/gajim.py 2009-03-11 09:16:07 UTC (rev 11149)
@@ -65,56 +65,18 @@
# needed for docutils
sys.path.append('.')
+from common import logging_helpers
+logging_helpers.init('TERM' in os.environ)
+
import logging
-consoleloghandler = logging.StreamHandler()
-consoleloghandler.setLevel(1)
-consoleloghandler.setFormatter(
- logging.Formatter('%(asctime)s %(name)s: %(levelname)s: %(message)s')
- )
-log = logging.getLogger('gajim')
-log.setLevel(logging.WARNING)
-log.addHandler(consoleloghandler)
-log.propagate = False
+# gajim.gui or gajim.gtk more appropriate ?
log = logging.getLogger('gajim.gajim')
-# create intermediate loggers
-logging.getLogger('gajim.c')
-logging.getLogger('gajim.c.x')
-
import getopt
from common import i18n
-def parseLogLevel(arg):
- if arg.isdigit():
- return int(arg)
- if arg.isupper():
- return getattr(logging, arg)
- raise ValueError(_('%s is not a valid loglevel'), repr(arg))
-
-def parseLogTarget(arg):
- arg = arg.lower()
- if arg.startswith('.'): return arg[1:]
- if arg.startswith('gajim'): return arg
- return 'gajim.' + arg
-
-def parseAndSetLogLevels(arg):
- for directive in arg.split(','):
- directive = directive.strip()
- targets, level = directive.rsplit('=', 1)
- level = parseLogLevel(level.strip())
- for target in targets.split('='):
- target = parseLogTarget(target.strip())
- if target == '':
- consoleloghandler.setLevel(level)
- print "consoleloghandler level set to %s" % level
- else:
- logger = logging.getLogger(target)
- logger.setLevel(level)
- print "Logger %s level set to %d" % (target, level)
-
def parseOpts():
profile = ''
- verbose = False
config_path = None
try:
@@ -130,21 +92,19 @@
print 'gajim [--help] [--quiet] [--verbose] [--loglevel subsystem=level[,subsystem=level[...]]] [--profile name] [--config-path]'
sys.exit()
elif o in ('-q', '--quiet'):
- consoleloghandler.setLevel(logging.CRITICAL)
- verbose = False
+ logging_helpers.set_quiet()
elif o in ('-v', '--verbose'):
- consoleloghandler.setLevel(logging.INFO)
- verbose = True
+ logging_helpers.set_verbose()
elif o in ('-p', '--profile'): # gajim --profile name
profile = a
elif o in ('-l', '--loglevel'):
- parseAndSetLogLevels(a)
+ logging_helpers.set_loglevels(a)
elif o in ('-c', '--config-path'):
config_path = a
- return profile, verbose, config_path
+ return profile, config_path
-profile, verbose, config_path = parseOpts()
-del parseOpts, parseAndSetLogLevels, parseLogTarget, parseLogLevel
+profile, config_path = parseOpts()
+del parseOpts
import locale
profile = unicode(profile, locale.getpreferredencoding())
@@ -288,9 +248,6 @@
from common import dataforms
from common import passwords
-if verbose: gajim.verbose = True
-del verbose
-
gajimpaths = common.configpaths.gajimpaths
pid_filename = gajimpaths['PID_FILE']
@@ -3250,9 +3207,9 @@
}
cfg_was_read = parser.read()
- # Do not set gajim.verbose to False if -v option was given
+ # override logging settings from config (don't take care of '-q' option)
if gajim.config.get('verbose'):
- gajim.verbose = True
+ logging_helpers.set_verbose()
# Is Gajim default app?
if os.name != 'nt' and gajim.config.get('check_if_gajim_is_default'):
@@ -3300,11 +3257,6 @@
if gajim.config.get('autodetect_browser_mailer') or not cfg_was_read:
gtkgui_helpers.autodetect_browser_mailer()
- if gajim.verbose:
- gajim.log.setLevel(gajim.logging.DEBUG)
- else:
- gajim.log.setLevel(None)
-
gajim.idlequeue = idlequeue.get_idlequeue()
# resolve and keep current record of resolved hosts
gajim.resolver = resolver.get_resolver(gajim.idlequeue)
@@ -3500,9 +3452,8 @@
# ^C exits the application normally to delete pid file
signal.signal(signal.SIGINT, sigint_cb)
- if gajim.verbose:
- print >> sys.stderr, "Encodings: d:%s, fs:%s, p:%s" % \
- (sys.getdefaultencoding(), sys.getfilesystemencoding(), locale.getpreferredencoding())
+ log.info("Encodings: d:%s, fs:%s, p:%s", sys.getdefaultencoding(), \
+ sys.getfilesystemencoding(), locale.getpreferredencoding())
if ((os.name != 'nt') and (sys.platform != 'darwin')):
# Session Management support
1
0
Author: asterix
Date: 2009-03-11 08:28:21 +0100 (Wed, 11 Mar 2009)
New Revision: 11148
Modified:
trunk/data/glade/preferences_window.glade
Log:
fix GTK warning with spinButton
Modified: trunk/data/glade/preferences_window.glade
===================================================================
--- trunk/data/glade/preferences_window.glade 2009-03-10 16:02:35 UTC (rev 11147)
+++ trunk/data/glade/preferences_window.glade 2009-03-11 07:28:21 UTC (rev 11148)
@@ -211,55 +211,45 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkComboBox" id="one_window_type_combobox">
- <property name="width_request">50</property>
+ <widget class="GtkLabel" id="label379">
<property name="visible">True</property>
- <property name="items" translatable="yes">Detached roster with detached chats
-Detached roster with single chat
-Single window for everything
-Detached roster with chat grouped by account
-Detached roster with chat grouped by type</property>
- <signal name="changed" handler="on_one_window_type_combo_changed"/>
+ <property name="xalign">0</property>
+ <property name="xpad">1</property>
+ <property name="label" translatable="yes">_Window behavior:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">one_window_type_combobox</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="speller_checkbutton">
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">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.</property>
- <property name="label" translatable="yes">_Highlight misspelled words</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_speller_checkbutton_toggled"/>
+ <widget class="GtkComboBox" id="emoticons_combobox">
+ <property name="visible">True</property>
+ <signal name="changed" handler="on_emoticons_combobox_changed"/>
</widget>
<packing>
+ <property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="xhtml_checkbutton">
+ <widget class="GtkEventBox" id="eventbox5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property>
- <property name="label" translatable="yes">_Ignore rich content in incoming messages</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/>
+ <property name="tooltip" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property>
+ <child>
+ <widget class="GtkLabel" id="label381">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">1</property>
+ <property name="label" translatable="yes">_Emoticons:</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
@@ -281,46 +271,56 @@
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="eventbox5">
+ <widget class="GtkCheckButton" id="xhtml_checkbutton">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property>
- <child>
- <widget class="GtkLabel" id="label381">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">1</property>
- <property name="label" translatable="yes">_Emoticons:</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property>
+ <property name="label" translatable="yes">_Ignore rich content in incoming messages</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/>
</widget>
<packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="emoticons_combobox">
- <property name="visible">True</property>
- <signal name="changed" handler="on_emoticons_combobox_changed"/>
+ <widget class="GtkCheckButton" id="speller_checkbutton">
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">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.</property>
+ <property name="label" translatable="yes">_Highlight misspelled words</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_speller_checkbutton_toggled"/>
</widget>
<packing>
- <property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label379">
+ <widget class="GtkComboBox" id="one_window_type_combobox">
+ <property name="width_request">50</property>
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">1</property>
- <property name="label" translatable="yes">_Window behavior:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">one_window_type_combobox</property>
+ <property name="items" translatable="yes">Detached roster with detached chats
+Detached roster with single chat
+Single window for everything
+Detached roster with chat grouped by account
+Detached roster with chat grouped by type</property>
+ <signal name="changed" handler="on_one_window_type_combo_changed"/>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
</widget>
@@ -730,67 +730,67 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkComboBox" id="outgoing_chat_states_combobox">
+ <widget class="GtkComboBox" id="displayed_chat_states_combobox">
<property name="visible">True</property>
<property name="items" translatable="yes">All chat states
Composing only
Disabled</property>
- <signal name="changed" handler="on_outgoing_chat_states_combobox_changed"/>
+ <signal name="changed" handler="on_displayed_chat_states_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="eventbox9">
+ <widget class="GtkEventBox" id="eventbox8">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">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.</property>
+ <property name="tooltip" translatable="yes">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.</property>
<child>
- <widget class="GtkLabel" id="label34">
+ <widget class="GtkLabel" id="label33">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Send chat state notifications:</property>
+ <property name="label" translatable="yes">_Display chat state notifications:</property>
<property name="use_underline">True</property>
</widget>
</child>
</widget>
<packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="eventbox8">
+ <widget class="GtkEventBox" id="eventbox9">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">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.</property>
+ <property name="tooltip" translatable="yes">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.</property>
<child>
- <widget class="GtkLabel" id="label33">
+ <widget class="GtkLabel" id="label34">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Display chat state notifications:</property>
+ <property name="label" translatable="yes">_Send chat state notifications:</property>
<property name="use_underline">True</property>
</widget>
</child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="displayed_chat_states_combobox">
+ <widget class="GtkComboBox" id="outgoing_chat_states_combobox">
<property name="visible">True</property>
<property name="items" translatable="yes">All chat states
Composing only
Disabled</property>
- <signal name="changed" handler="on_displayed_chat_states_combobox_changed"/>
+ <signal name="changed" handler="on_outgoing_chat_states_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
</widget>
@@ -854,60 +854,65 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="auto_xa_message_entry">
+ <widget class="GtkCheckButton" id="auto_away_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message
-$S will be replaced by previous status message
-$T will be replaced by auto-not-available timeout</property>
- <signal name="changed" handler="on_auto_xa_message_entry_changed"/>
+ <property name="tooltip" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property>
+ <property name="label" translatable="yes">_Away after:</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="auto_xa_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property>
+ <property name="label" translatable="yes">_Not available after:</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/>
+ </widget>
+ <packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="auto_away_message_entry">
+ <widget class="GtkLabel" id="label77">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message
-$S will be replaced by previous status message
-$T will be replaced by auto-away timeout</property>
- <signal name="changed" handler="on_auto_away_message_entry_changed"/>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">minutes</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment34">
+ <widget class="GtkLabel" id="label78">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <child>
- <widget class="GtkSpinButton" id="auto_xa_time_spinbutton">
- <property name="width_request">50</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">20 1 1440 1 10 10</property>
- <property name="climb_rate">1</property>
- <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/>
- </widget>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">minutes</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -920,7 +925,7 @@
<property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">12 1 720 1 10 10</property>
+ <property name="adjustment">12 1 720 1 10 0</property>
<property name="climb_rate">1</property>
<signal name="value_changed" handler="on_auto_away_time_spinbutton_value_changed"/>
</widget>
@@ -934,67 +939,62 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label78">
+ <widget class="GtkAlignment" id="alignment34">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">minutes</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <child>
+ <widget class="GtkSpinButton" id="auto_xa_time_spinbutton">
+ <property name="width_request">50</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">20 1 1440 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label77">
+ <widget class="GtkEntry" id="auto_away_message_entry">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">minutes</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message
+$S will be replaced by previous status message
+$T will be replaced by auto-away timeout</property>
+ <signal name="changed" handler="on_auto_away_message_entry_changed"/>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="auto_xa_checkbutton">
+ <widget class="GtkEntry" id="auto_xa_message_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property>
- <property name="label" translatable="yes">_Not available after:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/>
+ <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message
+$S will be replaced by previous status message
+$T will be replaced by auto-not-available timeout</property>
+ <signal name="changed" handler="on_auto_xa_message_entry_changed"/>
</widget>
<packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
- <child>
- <widget class="GtkCheckButton" id="auto_away_checkbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property>
- <property name="label" translatable="yes">_Away after:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -1152,24 +1152,40 @@
<placeholder/>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow23">
+ <widget class="GtkVButtonBox" id="vbuttonbox3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="spacing">5</property>
+ <property name="layout_style">GTK_BUTTONBOX_START</property>
<child>
- <widget class="GtkTextView" id="msg_textview">
+ <widget class="GtkButton" id="new_msg_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="border_width">3</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-new</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_new_msg_button_clicked"/>
</widget>
</child>
+ <child>
+ <widget class="GtkButton" id="delete_msg_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-delete</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_delete_msg_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -1192,40 +1208,24 @@
</widget>
</child>
<child>
- <widget class="GtkVButtonBox" id="vbuttonbox3">
+ <widget class="GtkScrolledWindow" id="scrolledwindow23">
<property name="visible">True</property>
- <property name="spacing">5</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
<child>
- <widget class="GtkButton" id="new_msg_button">
+ <widget class="GtkTextView" id="msg_textview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-new</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_new_msg_button_clicked"/>
+ <property name="border_width">3</property>
+ <property name="wrap_mode">GTK_WRAP_WORD</property>
</widget>
</child>
- <child>
- <widget class="GtkButton" id="delete_msg_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-delete</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_delete_msg_button_clicked"/>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -1291,14 +1291,15 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <widget class="GtkFontButton" id="conversation_fontbutton">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Chat message:</property>
+ <property name="can_focus">True</property>
+ <property name="response_id">0</property>
+ <signal name="font_set" handler="on_conversation_fontbutton_font_set"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
<child>
@@ -1319,15 +1320,14 @@
</packing>
</child>
<child>
- <widget class="GtkFontButton" id="conversation_fontbutton">
+ <widget class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
- <signal name="font_set" handler="on_conversation_fontbutton_font_set"/>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Chat message:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
</widget>
@@ -1377,43 +1377,35 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="label249">
+ <widget class="GtkCheckButton" id="transports_iconsets_checkbutton">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">T_heme:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">theme_combobox</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="manage_theme_button">
- <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Configure color and font of the interface</property>
- <property name="label" translatable="yes">Ma_nage...</property>
+ <property name="tooltip" translatable="yes">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...)</property>
+ <property name="label" translatable="yes">Use _transports icons</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
- <signal name="clicked" handler="on_manage_theme_button_clicked"/>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/>
</widget>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="theme_combobox">
+ <widget class="GtkComboBox" id="iconset_combobox">
<property name="visible">True</property>
- <signal name="changed" handler="on_theme_combobox_changed"/>
+ <signal name="changed" handler="on_iconset_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1432,37 +1424,45 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="iconset_combobox">
+ <widget class="GtkComboBox" id="theme_combobox">
<property name="visible">True</property>
- <signal name="changed" handler="on_iconset_combobox_changed"/>
+ <signal name="changed" handler="on_theme_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="transports_iconsets_checkbutton">
+ <widget class="GtkButton" id="manage_theme_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">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...)</property>
- <property name="label" translatable="yes">Use _transports icons</property>
+ <property name="tooltip" translatable="yes">Configure color and font of the interface</property>
+ <property name="label" translatable="yes">Ma_nage...</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/>
+ <signal name="clicked" handler="on_manage_theme_button_clicked"/>
</widget>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label249">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">T_heme:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">theme_combobox</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -1502,119 +1502,62 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox3022">
+ <widget class="GtkLabel" id="label72">
<property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label383">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="reset_colors_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_reset_colors_button_clicked"/>
- <child>
- <widget class="GtkAlignment" id="alignment52">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox2936">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image439">
- <property name="visible">True</property>
- <property name="stock">gtk-revert-to-saved</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label217">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Reset to Default Colors</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Incoming message:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">True</property>
+ <property name="mnemonic_widget">incoming_msg_colorbutton</property>
</widget>
<packing>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="url_msg_colorbutton">
+ <widget class="GtkColorButton" id="incoming_msg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
- <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/>
+ <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label371">
+ <widget class="GtkLabel" id="label70">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_URL highlight:</property>
+ <property name="label" translatable="yes">_Outgoing message:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">url_msg_colorbutton</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">True</property>
+ <property name="mnemonic_widget">outgoing_msg_colorbutton</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="status_msg_colorbutton">
+ <widget class="GtkColorButton" id="outgoing_msg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
- <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/>
+ <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1636,63 +1579,120 @@
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="outgoing_msg_colorbutton">
+ <widget class="GtkColorButton" id="status_msg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
- <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/>
+ <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label70">
+ <widget class="GtkLabel" id="label371">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Outgoing message:</property>
+ <property name="label" translatable="yes">_URL highlight:</property>
<property name="use_underline">True</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">True</property>
- <property name="mnemonic_widget">outgoing_msg_colorbutton</property>
+ <property name="mnemonic_widget">url_msg_colorbutton</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="incoming_msg_colorbutton">
+ <widget class="GtkColorButton" id="url_msg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
- <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/>
+ <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options"></property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label72">
+ <widget class="GtkHBox" id="hbox3022">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Incoming message:</property>
- <property name="use_underline">True</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">True</property>
- <property name="mnemonic_widget">incoming_msg_colorbutton</property>
+ <child>
+ <widget class="GtkLabel" id="label383">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="reset_colors_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_reset_colors_button_clicked"/>
+ <child>
+ <widget class="GtkAlignment" id="alignment52">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox2936">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image439">
+ <property name="visible">True</property>
+ <property name="stock">gtk-revert-to-saved</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label217">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Reset to Default Colors</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -1779,85 +1779,85 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label199">
+ <widget class="GtkEntry" id="custom_file_manager_entry">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Browser:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">custom_browser_entry</property>
+ <property name="can_focus">True</property>
+ <signal name="changed" handler="on_custom_file_manager_entry_changed"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label200">
+ <widget class="GtkLabel" id="label355">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Mail client:</property>
+ <property name="label" translatable="yes">_File manager:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">custom_mail_client_entry</property>
+ <property name="mnemonic_widget">custom_file_manager_entry</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="custom_mail_client_entry">
+ <widget class="GtkEntry" id="custom_browser_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <signal name="changed" handler="on_custom_mail_client_entry_changed"/>
+ <signal name="changed" handler="on_custom_browser_entry_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="custom_browser_entry">
+ <widget class="GtkEntry" id="custom_mail_client_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <signal name="changed" handler="on_custom_browser_entry_changed"/>
+ <signal name="changed" handler="on_custom_mail_client_entry_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label355">
+ <widget class="GtkLabel" id="label200">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_File manager:</property>
+ <property name="label" translatable="yes">_Mail client:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">custom_file_manager_entry</property>
+ <property name="mnemonic_widget">custom_mail_client_entry</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="custom_file_manager_entry">
+ <widget class="GtkLabel" id="label199">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="changed" handler="on_custom_file_manager_entry_changed"/>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Browser:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">custom_browser_entry</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1917,23 +1917,21 @@
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">3</property>
- <property name="n_columns">1</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="log_encrypted_chats_checkbutton">
+ <widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">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.</property>
- <property name="label" translatable="yes">Log _encrypted chat session</property>
+ <property name="tooltip" translatable="yes">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</property>
+ <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1953,18 +1951,19 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton">
+ <widget class="GtkCheckButton" id="log_encrypted_chats_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">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</property>
- <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property>
+ <property name="tooltip" translatable="yes">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.</property>
+ <property name="label" translatable="yes">Log _encrypted chat session</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
</widget>
1
0
Author: asterix
Date: 2009-03-10 17:02:35 +0100 (Tue, 10 Mar 2009)
New Revision: 11147
Modified:
branches/gajim_0.12/data/pixmaps/gajim.ico
Log:
[BellChan] Working Windows .ico file for Vista
Modified: branches/gajim_0.12/data/pixmaps/gajim.ico
===================================================================
(Binary files differ)
1
0
[commit-gajim] r11146 - in branches/gajim_0.12: . data data/glade data/pixmaps/events m4 scripts src src/common src/common/xmpp src/osx src/osx/growl src/osx/syncmenu
by asterix＠gajim.org 10 Mar '09
by asterix＠gajim.org 10 Mar '09
10 Mar '09
Author: asterix
Date: 2009-03-10 12:27:24 +0100 (Tue, 10 Mar 2009)
New Revision: 11146
Added:
branches/gajim_0.12/data/pixmaps/events/subscription_request.png
branches/gajim_0.12/data/pixmaps/events/unsubscribed.png
branches/gajim_0.12/src/common/latex.py
Removed:
branches/gajim_0.12/data/glade/zeroconf_properties_window.glade
branches/gajim_0.12/scripts/gajim-remote.in
Modified:
branches/gajim_0.12/Makefile.am
branches/gajim_0.12/README.html
branches/gajim_0.12/configure.ac
branches/gajim_0.12/data/defs.py.in
branches/gajim_0.12/data/glade/accounts_window.glade
branches/gajim_0.12/data/glade/vcard_information_window.glade
branches/gajim_0.12/m4/acinclude.m4
branches/gajim_0.12/scripts/gajim.in
branches/gajim_0.12/src/Makefile.am
branches/gajim_0.12/src/chat_control.py
branches/gajim_0.12/src/common/GnuPG.py
branches/gajim_0.12/src/common/atom.py
branches/gajim_0.12/src/common/config.py
branches/gajim_0.12/src/common/configpaths.py
branches/gajim_0.12/src/common/connection.py
branches/gajim_0.12/src/common/connection_handlers.py
branches/gajim_0.12/src/common/dataforms.py
branches/gajim_0.12/src/common/dbus_support.py
branches/gajim_0.12/src/common/defs.py
branches/gajim_0.12/src/common/events.py
branches/gajim_0.12/src/common/exceptions.py
branches/gajim_0.12/src/common/gajim.py
branches/gajim_0.12/src/common/helpers.py
branches/gajim_0.12/src/common/i18n.py
branches/gajim_0.12/src/common/optparser.py
branches/gajim_0.12/src/common/proxy65_manager.py
branches/gajim_0.12/src/common/stanza_session.py
branches/gajim_0.12/src/common/xmpp/auth_nb.py
branches/gajim_0.12/src/common/xmpp/dispatcher_nb.py
branches/gajim_0.12/src/common/xmpp/transports_nb.py
branches/gajim_0.12/src/config.py
branches/gajim_0.12/src/conversation_textview.py
branches/gajim_0.12/src/dialogs.py
branches/gajim_0.12/src/disco.py
branches/gajim_0.12/src/features_window.py
branches/gajim_0.12/src/gajim-remote.py
branches/gajim_0.12/src/gajim.py
branches/gajim_0.12/src/groupchat_control.py
branches/gajim_0.12/src/gtkgui_helpers.py
branches/gajim_0.12/src/history_manager.py
branches/gajim_0.12/src/htmltextview.py
branches/gajim_0.12/src/message_window.py
branches/gajim_0.12/src/music_track_listener.py
branches/gajim_0.12/src/network_manager_listener.py
branches/gajim_0.12/src/notify.py
branches/gajim_0.12/src/osx/Makefile.am
branches/gajim_0.12/src/osx/growl/Makefile.am
branches/gajim_0.12/src/osx/growl/_growl.c
branches/gajim_0.12/src/osx/growl/_growlImage.m
branches/gajim_0.12/src/osx/nsapp.m
branches/gajim_0.12/src/osx/syncmenu/Makefile.am
branches/gajim_0.12/src/osx/syncmenu/pysyncmenu.c
branches/gajim_0.12/src/remote_control.py
branches/gajim_0.12/src/roster_window.py
branches/gajim_0.12/src/secrets.py
branches/gajim_0.12/src/session.py
branches/gajim_0.12/src/statusicon.py
branches/gajim_0.12/src/systray.py
branches/gajim_0.12/src/tooltips.py
Log:
import buxfixes from trunk:
[10911] [10929] [10930] [10934] [10935] [10936] [10938] [10939] [10941] [10946] [10947] [10948] [10949] [10950] [10951] [10954] [10956] [10976] [10977] [10978] [10979] [10980] [10986] [10987] [10988] [10990] [10991] [10993] [10995] [10999] [11003] [11004] [11005] [11009] [11011] [11013] [11014] [11028] [11029] [11030] [11031] [11032] [11033] [11036] [11037] [11038] [11040] [11042] [11043] [11044] [11046] [11047] [11048] [11051] [11052] [11053] [11054] [11056] [11057] [11058] [r1060] [r1061] [11064] [11065] [11069] [11070] [11071] [11072] [11073] [11074] [11075] [11079] [11080] [11082] [11084] [11088] [11089] [11098] [11105] [11106] [11111] [11112] [11113] [11115] [11116] [11118] [11119] [11122] [11123] [11125] [11127] [11128] [11137] [11139] [11140]
Fixes #4616, #4605, #4627, #4638, #4624, #4618, #4641, #4652, #4631, #4667, #4670, #4642, #4650, #4618, #4692, #4658, #4630, #4705, #4629, #4712, #4684, #4720, #4672, #663, #4703, #4710, #3474, #4715, #4735, #4730, #4739, #4737, #4741, #4748, #4744, #4738, #4760, #4762, #4764, #4767, #4556, #4774, #4788, #4783, #4770, #4798, #4801, #4436, #4708, #2243, #4800, #4536, #4299, #3781, #4820, #4819, #4826, #4263, #4831, #4834, #4832, #4847, #4855, #4828
Modified: branches/gajim_0.12/Makefile.am
===================================================================
--- branches/gajim_0.12/Makefile.am 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/Makefile.am 2009-03-10 11:27:24 UTC (rev 11146)
@@ -8,7 +8,7 @@
OPTIONAL_BIN =
endif
-bin_SCRIPTS = scripts/gajim $(OPTIONAL_BIN)
+bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager $(OPTIONAL_BIN)
docfilesdir = $(docdir)
@@ -28,15 +28,15 @@
intltool-update.in \
gajim.nsi \
setup_win32.py \
- scripts/gajim.in \
- scripts/gajim-remote.in
+ scripts/gajim.in
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update \
scripts/gajim \
- scripts/gajim-remote
+ scripts/gajim-remote \
+ scripts/gajim-histrory-manager
MAINTAINERCLEANFILES = \
configure \
Modified: branches/gajim_0.12/README.html
===================================================================
--- branches/gajim_0.12/README.html 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/README.html 2009-03-10 11:27:24 UTC (rev 11146)
@@ -31,12 +31,12 @@
<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li>
<li>python-crypto to enable End to end encryption</li>
<li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
-<li>dnsutils (or whatever package provides the nslookup binary) for SRV support; if you don't know what that is, you don't need it</li>
+<li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
<li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li>
<li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li>
<li>gnome-python-desktop (for GnomeKeyring support)</li>
<li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
-<li>D-Bus running to have gajim-remote working</li>
+<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim.</li>
<li>python-dbus bindings</li>
<li>python-sexy to have clickable URLs in chat windows</li>
<li>python-kerberos to use GSSAPI authentication. Note: version1.1 or higher is required</li>
Modified: branches/gajim_0.12/configure.ac
===================================================================
--- branches/gajim_0.12/configure.ac 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/configure.ac 2009-03-10 11:27:24 UTC (rev 11146)
@@ -1,5 +1,5 @@
AC_INIT([Gajim - A Jabber Instant Messager],
- [0.12.1],[http://trac.gajim.org/],[gajim])
+ [0.12.2],[http://trac.gajim.org/],[gajim])
AC_PREREQ([2.59])
AM_INIT_AUTOMAKE([1.8])
AC_CONFIG_HEADER(config.h)
@@ -207,18 +207,12 @@
AC_SUBST([PYTHON_INCLUDES])
AS_AC_EXPAND(DATADIR, "${datadir}")
-
-AS_AC_EXPAND(LIBDIR, ${libdir})
-
+AS_AC_EXPAND(LIBDIR, "${libdir}")
AS_AC_EXPAND(DOCDIR, "${docdir}")
+AS_AC_EXPAND(LOCALEDIR, "${localedir}")
AC_SUBST(VERSION)
AC_SUBST(PACKAGE)
-AC_SUBST(DATADIR)
-AC_SUBST(LIBDIR)
-AS_AC_EXPAND(DATADIR, "${DATADIR}")
-AC_SUBST(DOCDIR)
-AS_AC_EXPAND(DOCDIR, "${DOCDIR}")
AC_CONFIG_FILES([
Makefile
@@ -237,7 +231,8 @@
src/osx/growl/Makefile
src/osx/syncmenu/Makefile
scripts/gajim
- scripts/gajim-remote
+ scripts/gajim-remote:scripts/gajim.in
+ scripts/gajim-history-manager:scripts/gajim.in
po/Makefile.in
])
AC_OUTPUT
Modified: branches/gajim_0.12/data/defs.py.in
===================================================================
--- branches/gajim_0.12/data/defs.py.in 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/data/defs.py.in 2009-03-10 11:27:24 UTC (rev 11146)
@@ -5,3 +5,5 @@
datadir = "@DATADIR@"
version = "@VERSION@"
+
+localedir = "@LOCALEDIR@"
Modified: branches/gajim_0.12/data/glade/accounts_window.glade
===================================================================
--- branches/gajim_0.12/data/glade/accounts_window.glade 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/data/glade/accounts_window.glade 2009-03-10 11:27:24 UTC (rev 11146)
@@ -178,134 +178,32 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkEntry" id="resource_entry1">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Jabber ID:</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Password:</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="password_entry1">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="visibility">False</property>
- <property name="activates_default">True</property>
- <signal name="changed" handler="on_password_entry1_changed"/>
+ <property name="tooltip" translatable="yes">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)</property>
+ <property name="text" translatable="yes">Gajim</property>
+ <signal name="focus_out_event" handler="on_resource_entry1_focus_out_event"/>
</widget>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="save_password_checkbutton1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will remember the password for this account</property>
- <property name="label" translatable="yes">Save pass_word</property>
- <property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_save_password_checkbutton1_toggled"/>
- </widget>
- <packing>
- <property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Resour_ce:</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkEntry" id="jid_entry1">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Priori_ty:</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="adjust_priority_with_status_checkbutton1">
- <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Priority will change automatically according to your status.</property>
- <property name="label" translatable="yes">_Adjust to status</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_adjust_priority_with_status_checkbutton1_toggled"/>
+ <property name="activates_default">True</property>
+ <signal name="focus_out_event" handler="on_jid_entry1_focus_out_event"/>
</widget>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="priority_spinbutton1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">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</property>
- <property name="adjustment">5 0 127 1 5 5</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
- <signal name="value_changed" handler="on_priority_spinbutton1_value_changed"/>
- </widget>
- <packing>
- <property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -368,35 +266,141 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="jid_entry1">
+ <widget class="GtkSpinButton" id="priority_spinbutton1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <signal name="focus_out_event" handler="on_jid_entry1_focus_out_event"/>
+ <property name="tooltip" translatable="yes">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</property>
+ <property name="adjustment">5 0 127 1 5 5</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ <signal name="value_changed" handler="on_priority_spinbutton1_value_changed"/>
</widget>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="resource_entry1">
+ <widget class="GtkCheckButton" id="adjust_priority_with_status_checkbutton1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">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)</property>
- <property name="text" translatable="yes">Gajim</property>
- <signal name="focus_out_event" handler="on_resource_entry1_focus_out_event"/>
+ <property name="tooltip" translatable="yes">Priority will change automatically according to your status.</property>
+ <property name="label" translatable="yes">A_djust to status</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_adjust_priority_with_status_checkbutton1_toggled"/>
</widget>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Priori_ty:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">priority_spinbutton1</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Resour_ce:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">resource_entry1</property>
+ </widget>
+ <packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="save_password_checkbutton1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">If checked, Gajim will remember the password for this account</property>
+ <property name="label" translatable="yes">Save pass_word</property>
+ <property name="use_underline">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_save_password_checkbutton1_toggled"/>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="password_entry1">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="activates_default">True</property>
+ <signal name="changed" handler="on_password_entry1_changed"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">password_entry1</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Jabber ID:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">jid_entry1</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
</child>
<child>
@@ -541,7 +545,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">use HTTP_PROXY environment variable</property>
+ <property name="label" translatable="yes">_use HTTP__PROXY environment variable</property>
+ <property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_use_env_http_proxy_checkbutton1_toggled"/>
@@ -565,7 +570,7 @@
<widget class="GtkButton" id="manage_proxies_button1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Manage...</property>
+ <property name="label" translatable="yes">_Manage...</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_manage_proxies_button1_clicked"/>
@@ -634,7 +639,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection</property>
- <property name="label" translatable="yes">Send keep-alive packets</property>
+ <property name="label" translatable="yes">Send _keep-alive packets</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="active">True</property>
@@ -651,7 +656,7 @@
<widget class="GtkCheckButton" id="custom_host_port_checkbutton1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use custom hostname/port</property>
+ <property name="label" translatable="yes">Use cust_om hostname/port</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
@@ -671,7 +676,8 @@
<child>
<widget class="GtkLabel" id="label10">
<property name="visible">True</property>
- <property name="label" translatable="yes">Hostname: </property>
+ <property name="label" translatable="yes">_Hostname: </property>
+ <property name="use_underline">True</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -691,7 +697,8 @@
<child>
<widget class="GtkLabel" id="label18">
<property name="visible">True</property>
- <property name="label" translatable="yes">Port: </property>
+ <property name="label" translatable="yes">_Port: </property>
+ <property name="use_underline">True</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -824,7 +831,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">If checked, Gajim will get the password from a GPG agent like seahorse</property>
- <property name="label" translatable="yes">Use GPG _Agent</property>
+ <property name="label" translatable="yes">Use G_PG Agent</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
@@ -870,7 +877,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">Information about you, as stored in the server</property>
- <property name="label" translatable="yes">Edit Personal Information...</property>
+ <property name="label" translatable="yes">_Edit Personal Information...</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_edit_details_button1_clicked"/>
@@ -930,7 +937,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Enable</property>
+ <property name="label" translatable="yes">_Enable</property>
+ <property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_enable_zeroconf_checkbutton2_toggled"/>
@@ -953,7 +961,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">If checked, Gajim, when launched, will automatically connect to jabber using this account</property>
- <property name="label" translatable="yes">C_onnect on Gajim startup</property>
+ <property name="label" translatable="yes">Co_nnect on Gajim startup</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
@@ -985,7 +993,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">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</property>
- <property name="label" translatable="yes">Synch_ronize account status with global status</property>
+ <property name="label" translatable="yes">Synchroni_ze account status with global status</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
@@ -1006,7 +1014,7 @@
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">If the default port that is used for incoming messages is unfitting for your setup you can select another one here.
You might consider to change possible firewall settings.</property>
- <property name="label" translatable="yes">Use custom port:</property>
+ <property name="label" translatable="yes">Use cust_om port:</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
@@ -1059,123 +1067,65 @@
<property name="column_spacing">2</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox10">
+ <widget class="GtkEntry" id="jabber_id_entry2">
<property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="label17">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>OpenPGP</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox6">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="gpg_key_label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">No key selected</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="gpg_name_label2">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="gpg_choose_button2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Choose _Key...</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_gpg_choose_button_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="use_gpg_agent_checkbutton2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will get the password from a GPG agent like seahorse</property>
- <property name="label" translatable="yes">Use GPG _Agent</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_use_gpg_agent_checkbutton_toggled"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <signal name="changed" handler="on_jabber_id_entry2_changed"/>
</widget>
<packing>
+ <property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Jabber ID:</property>
+ </widget>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label16">
+ <widget class="GtkLabel" id="label13">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Personal Information</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">E-Mail:</property>
</widget>
<packing>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="first_name_entry2">
+ <widget class="GtkEntry" id="email_entry2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <signal name="changed" handler="on_first_name_entry2_changed"/>
+ <signal name="changed" handler="on_email_entry2_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label15">
+ <widget class="GtkLabel" id="label14">
<property name="visible">True</property>
- <property name="label" translatable="yes">First Name:</property>
+ <property name="label" translatable="yes">Last Name:</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -1195,69 +1145,127 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label14">
+ <widget class="GtkLabel" id="label15">
<property name="visible">True</property>
- <property name="label" translatable="yes">Last Name:</property>
+ <property name="label" translatable="yes">First Name:</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="email_entry2">
+ <widget class="GtkEntry" id="first_name_entry2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <signal name="changed" handler="on_email_entry2_changed"/>
+ <signal name="changed" handler="on_first_name_entry2_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label13">
+ <widget class="GtkLabel" id="label16">
<property name="visible">True</property>
- <property name="label" translatable="yes">E-Mail:</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Personal Information</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label12">
+ <widget class="GtkVBox" id="vbox10">
<property name="visible">True</property>
- <property name="label" translatable="yes">Jabber ID:</property>
+ <property name="spacing">5</property>
+ <child>
+ <widget class="GtkLabel" id="label17">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>OpenPGP</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox6">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="gpg_key_label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">No key selected</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="gpg_name_label2">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="gpg_choose_button2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Choose _Key...</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_gpg_choose_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="use_gpg_agent_checkbutton2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">If checked, Gajim will get the password from a GPG agent like seahorse</property>
+ <property name="label" translatable="yes">Use G_PG Agent</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_use_gpg_agent_checkbutton_toggled"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
- <child>
- <widget class="GtkEntry" id="jabber_id_entry2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="changed" handler="on_jabber_id_entry2_changed"/>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
<packing>
<property name="position">1</property>
Modified: branches/gajim_0.12/data/glade/vcard_information_window.glade
===================================================================
--- branches/gajim_0.12/data/glade/vcard_information_window.glade 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/data/glade/vcard_information_window.glade 2009-03-10 11:27:24 UTC (rev 11146)
@@ -43,52 +43,80 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEventBox" id="status_label_eventbox">
+ <widget class="GtkLabel" id="label51">
<property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="status_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
- </widget>
- </child>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Jabber ID:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label53">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Resource:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label54">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Status:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="os_label">
+ <widget class="GtkLabel" id="label55">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>Client:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label56">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>System:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="client_name_version_label">
+ <widget class="GtkLabel" id="jid_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -96,13 +124,10 @@
<property name="xpad">5</property>
<property name="ypad">5</property>
<property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
@@ -131,7 +156,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="jid_label">
+ <widget class="GtkLabel" id="client_name_version_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -139,86 +164,61 @@
<property name="xpad">5</property>
<property name="ypad">5</property>
<property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label56">
+ <widget class="GtkLabel" id="os_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>System:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label55">
+ <widget class="GtkEventBox" id="status_label_eventbox">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Client:</b></property>
- <property name="use_markup">True</property>
+ <child>
+ <widget class="GtkLabel" id="status_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label54">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Status:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label53">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Resource:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label51">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Jabber ID:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
</child>
<child>
@@ -286,6 +286,10 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
<child>
<widget class="GtkExpander" id="expander5">
@@ -300,34 +304,26 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="ask_title_label">
+ <widget class="GtkEventBox" id="subscription_label_eventbox">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Given Name"><b>Ask:</b></property>
- <property name="use_markup">True</property>
+ <property name="visible_window">False</property>
+ <child>
+ <widget class="GtkLabel" id="subscription_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="subscription_title_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Family Name"><b>Subscription:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
<widget class="GtkEventBox" id="ask_label_eventbox">
<property name="visible">True</property>
<property name="visible_window">False</property>
@@ -348,25 +344,33 @@
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="subscription_label_eventbox">
+ <widget class="GtkLabel" id="subscription_title_label">
<property name="visible">True</property>
- <property name="visible_window">False</property>
- <child>
- <widget class="GtkLabel" id="subscription_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- </widget>
- </child>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes" comments="Family Name"><b>Subscription:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="ask_title_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes" comments="Given Name"><b>Ask:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
</child>
<child>
@@ -382,6 +386,8 @@
</child>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -417,268 +423,128 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="BDAY_label">
+ <widget class="GtkExpander" id="expander1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="TEL_HOME_NUMBER_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="EMAIL_HOME_USERID_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">4</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="FN_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="NICKNAME_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label57">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes"><b>E-Mail:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEventBox" id="eventbox1">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property>
<child>
- <widget class="GtkLabel" id="label13">
+ <widget class="GtkTable" id="table3">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Birthday:</b></property>
- <property name="use_markup">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Phone No.:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label20">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Nickname:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label24">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Name:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label22">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Homepage:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkExpander" id="expander2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <widget class="GtkTable" id="table_ADR_STREET">
- <property name="visible">True</property>
<property name="border_width">6</property>
<property name="n_rows">3</property>
<property name="n_columns">4</property>
- <property name="column_spacing">5</property>
- <property name="row_spacing">5</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label25">
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="N_FAMILY_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Country:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label26">
+ <widget class="GtkLabel" id="N_GIVEN_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Postal Code:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="N_MIDDLE_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label29">
+ <widget class="GtkLabel" id="N_PREFIX_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Extra Address:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label27">
+ <widget class="GtkLabel" id="N_SUFFIX_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label18">
+ <property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>State:</b></property>
+ <property name="label" translatable="yes" comments="Family Name"><b>Family:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label28">
+ <widget class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>City:</b></property>
+ <property name="label" translatable="yes" comments="Middle Name"><b>Middle:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -689,38 +555,88 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label31">
+ <widget class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Street:</b></property>
+ <property name="label" translatable="yes" comments="Prefix in Name"><b>Prefix:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_HOME_CTRY_label">
+ <widget class="GtkLabel" id="label17">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes" comments="Given Name"><b>Given:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label14">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes" comments="Suffix in Name"><b>Suffix:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Full Name</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkExpander" id="expander2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <widget class="GtkTable" id="table_ADR_STREET">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">4</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="ADR_HOME_REGION_label">
+ <widget class="GtkLabel" id="ADR_HOME_STREET_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -732,13 +648,11 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_HOME_PCODE_label">
+ <widget class="GtkLabel" id="ADR_HOME_EXTADR_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -750,8 +664,6 @@
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
@@ -774,7 +686,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_HOME_EXTADR_label">
+ <widget class="GtkLabel" id="ADR_HOME_PCODE_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -786,11 +698,13 @@
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_HOME_STREET_label">
+ <widget class="GtkLabel" id="ADR_HOME_REGION_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -802,102 +716,48 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label30">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Address</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkExpander" id="expander1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <widget class="GtkTable" id="table3">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="n_rows">3</property>
- <property name="n_columns">4</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkLabel" id="label14">
+ <widget class="GtkLabel" id="ADR_HOME_CTRY_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Suffix in Name"><b>Suffix:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label17">
+ <widget class="GtkLabel" id="label31">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Given Name"><b>Given:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label15">
- <property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Prefix in Name"><b>Prefix:</b></property>
+ <property name="label" translatable="yes"><b>Street:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label16">
+ <widget class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Middle Name"><b>Middle:</b></property>
+ <property name="label" translatable="yes"><b>City:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -908,112 +768,77 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label18">
+ <widget class="GtkLabel" id="label27">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Family Name"><b>Family:</b></property>
+ <property name="label" translatable="yes"><b>State:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="N_SUFFIX_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="N_PREFIX_label">
+ <widget class="GtkLabel" id="label29">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Extra Address:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="N_MIDDLE_label">
+ <widget class="GtkLabel" id="label26">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Postal Code:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="N_GIVEN_label">
+ <widget class="GtkLabel" id="label25">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Country:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="N_FAMILY_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label19">
+ <widget class="GtkLabel" id="label30">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Full Name</b></property>
+ <property name="label" translatable="yes"><b>Address</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -1023,11 +848,192 @@
</widget>
<packing>
<property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Homepage:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Name:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Nickname:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label23">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Phone No.:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEventBox" id="eventbox1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property>
+ <child>
+ <widget class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Birthday:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label57">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes"><b>E-Mail:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="NICKNAME_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="FN_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="EMAIL_HOME_USERID_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="TEL_HOME_NUMBER_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="BDAY_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="position">1</property>
@@ -1061,98 +1067,80 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="label33">
+ <widget class="GtkLabel" id="ORG_ORGNAME_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Phone No.:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label32">
+ <widget class="GtkLabel" id="ORG_ORGUNIT_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>E-Mail:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label41">
+ <widget class="GtkLabel" id="TITLE_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Role:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label43">
+ <widget class="GtkLabel" id="ROLE_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Department:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label42">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Position:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label44">
+ <widget class="GtkLabel" id="EMAIL_WORK_USERID_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Company:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="TEL_WORK_NUMBER_label">
- <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -1162,9 +1150,9 @@
</widget>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1181,95 +1169,88 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label34">
+ <widget class="GtkLabel" id="ADR_WORK_STREET_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Country:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label35">
+ <widget class="GtkLabel" id="ADR_WORK_EXTADR_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Postal Code:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label38">
+ <widget class="GtkLabel" id="ADR_WORK_LOCALITY_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Extra Address:</b></property>
- <property name="use_markup">True</property>
- <property name="single_line_mode">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label36">
+ <widget class="GtkLabel" id="ADR_WORK_PCODE_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>State:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label37">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>City:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label39">
+ <widget class="GtkLabel" id="ADR_WORK_REGION_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Street:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1292,88 +1273,95 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_REGION_label">
+ <widget class="GtkLabel" id="label39">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Street:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_PCODE_label">
+ <widget class="GtkLabel" id="label37">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>City:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_LOCALITY_label">
+ <widget class="GtkLabel" id="label36">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>State:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label38">
+ <property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Extra Address:</b></property>
+ <property name="use_markup">True</property>
+ <property name="single_line_mode">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_EXTADR_label">
+ <widget class="GtkLabel" id="label35">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Postal Code:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_STREET_label">
+ <widget class="GtkLabel" id="label34">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Country:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1400,7 +1388,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="EMAIL_WORK_USERID_label">
+ <widget class="GtkLabel" id="TEL_WORK_NUMBER_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -1411,81 +1399,99 @@
</widget>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ROLE_label">
+ <widget class="GtkLabel" id="label44">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>Company:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label42">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Position:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="TITLE_label">
+ <widget class="GtkLabel" id="label43">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>Department:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label41">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Role:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ORG_ORGUNIT_label">
+ <widget class="GtkLabel" id="label32">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>E-Mail:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ORG_ORGNAME_label">
+ <widget class="GtkLabel" id="label33">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>Phone No.:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
Deleted: branches/gajim_0.12/data/glade/zeroconf_properties_window.glade
===================================================================
--- branches/gajim_0.12/data/glade/zeroconf_properties_window.glade 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/data/glade/zeroconf_properties_window.glade 2009-03-10 11:27:24 UTC (rev 11146)
@@ -1,683 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="zeroconf_properties_window">
- <property name="border_width">12</property>
- <property name="title" translatable="yes">Modify Account</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <signal name="destroy" handler="on_zeroconf_properties_window_destroy" last_modification_time="Tue, 19 Sep 2006 22:21:09 GMT"/>
-
- <child>
- <widget class="GtkVBox" id="vbox7">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkHBox" id="hbox23">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkNotebook" id="notebook1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">True</property>
- <property name="show_border">True</property>
- <property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
- <property name="enable_popup">False</property>
-
- <child>
- <widget class="GtkVBox" id="vbox38">
- <property name="border_width">6</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkCheckButton" id="autoconnect_checkbutton">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim, when launched, will automatically connect to jabber using this account</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">C_onnect on Gajim startup</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="log_history_checkbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Save conversation _logs for all contacts</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="sync_with_global_status_checkbutton">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">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</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Synch_ronize account status with global status</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox24">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkCheckButton" id="custom_port_checkbutton">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">If the default port that is used for incoming messages is unfitting for your setup you can select another one here.
-You might consider to change possible firewall settings.</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Use custom port:</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_custom_port_checkbutton_toggled" last_modification_time="Wed, 20 Sep 2006 18:29:49 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="custom_port_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="activates_default">False</property>
- <property name="width_chars">6</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">10</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="label" translatable="yes">General</property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkTable" id="table1">
- <property name="border_width">6</property>
- <property name="visible">True</property>
- <property name="n_rows">6</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">2</property>
-
- <child>
- <widget class="GtkEntry" id="jabber_id_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label363">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Jabber ID:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label364">
- <property name="visible">True</property>
- <property name="label" translatable="yes">E-Mail:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="email_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label362">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Last Name:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="last_name_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label361">
- <property name="visible">True</property>
- <property name="label" translatable="yes">First Name:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="first_name_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label366">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Personal Information</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox96">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkLabel" id="label365">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>OpenPGP</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox25">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkLabel" id="gpg_key_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">No key selected</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="gpg_name_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="gpg_choose_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Choose _Key...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_gpg_choose_button_clicked" last_modification_time="Mon, 02 Oct 2006 00:23:00 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox26">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkCheckButton" id="gpg_save_password_checkbutton">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Save _passphrase (insecure)</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_gpg_save_password_checkbutton_toggled" last_modification_time="Mon, 02 Oct 2006 00:27:36 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="gpg_password_entry">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">False</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label360">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Personal Information</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">2</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox6">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">12</property>
-
- <child>
- <widget class="GtkButton" id="cancel_button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Sun, 17 Apr 2005 18:17:10 GMT"/>
- <accelerator key="Escape" modifiers="0" signal="clicked"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="save_button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-save</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_save_button_clicked" last_modification_time="Mon, 28 Feb 2005 20:30:56 GMT"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
Copied: branches/gajim_0.12/data/pixmaps/events/subscription_request.png (from rev 11084, trunk/data/pixmaps/events/subscription_request.png)
===================================================================
(Binary files differ)
Copied: branches/gajim_0.12/data/pixmaps/events/unsubscribed.png (from rev 11084, trunk/data/pixmaps/events/unsubscribed.png)
===================================================================
(Binary files differ)
Modified: branches/gajim_0.12/m4/acinclude.m4
===================================================================
--- branches/gajim_0.12/m4/acinclude.m4 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/m4/acinclude.m4 2009-03-10 11:27:24 UTC (rev 11146)
@@ -1,6 +1,15 @@
+dnl as-ac-expand.m4 0.2.0 -*- autoconf -*-
+dnl autostars m4 macro for expanding directories using configure's prefix
+
+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+
dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-dnl
-dnl example
+
+dnl example:
dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
@@ -15,7 +24,7 @@
dnl if no prefix given, then use /usr/local, the default prefix
if test "x$prefix" = "xNONE"; then
- prefix=$ac_default_prefix
+ prefix="$ac_default_prefix"
fi
dnl if no exec_prefix given, then use prefix
if test "x$exec_prefix" = "xNONE"; then
@@ -26,7 +35,7 @@
dnl loop until it doesn't change anymore
while true; do
new_full_var="`eval echo $full_var`"
- if test "x$new_full_var"="x$full_var"; then break; fi
+ if test "x$new_full_var" = "x$full_var"; then break; fi
full_var=$new_full_var
done
Deleted: branches/gajim_0.12/scripts/gajim-remote.in
===================================================================
--- branches/gajim_0.12/scripts/gajim-remote.in 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/scripts/gajim-remote.in 2009-03-10 11:27:24 UTC (rev 11146)
@@ -1,32 +0,0 @@
-#!/bin/sh
-## scripts/gajim-remote.in
-##
-## Copyright (C) 2006 Yann Leboulanger <asterix AT lagaule.org>
-## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org>
-##
-## This file is part of Gajim.
-##
-## Gajim is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 3 only.
-##
-## Gajim is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-##
-
-if test $(id -u) -eq 0; then
- echo "You must not launch gajim-remote as root, it is INSECURE"
- exit 1
-fi
-
-datadir=@DATADIR@
-PYTHON_EXEC=@PYTHON@
-
-cd ${datadir}/gajim/src
-export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
-exec ${PYTHON_EXEC} -OO gajim-remote.py "$@"
Modified: branches/gajim_0.12/scripts/gajim.in
===================================================================
--- branches/gajim_0.12/scripts/gajim.in 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/scripts/gajim.in 2009-03-10 11:27:24 UTC (rev 11146)
@@ -21,14 +21,17 @@
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
##
+APP=`basename $0`
if test $(id -u) -eq 0; then
- echo "You must not launch Gajim as root, it is INSECURE"
+ echo "You must not launch $APP as root, it is INSECURE"
exit 1
fi
-datadir=@DATADIR@
+[ "$APP" = "gajim-history-manager" ] && APP="history_manager"
+
+export datadir=@DATADIR@/gajim
PYTHON_EXEC=@PYTHON@
-cd ${datadir}/gajim/src
+cd ${datadir}/src
export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
-exec ${PYTHON_EXEC} -OO gajim.py $@
+exec ${PYTHON_EXEC} -OO $APP.py "$@"
Modified: branches/gajim_0.12/src/Makefile.am
===================================================================
--- branches/gajim_0.12/src/Makefile.am 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/Makefile.am 2009-03-10 11:27:24 UTC (rev 11146)
@@ -8,7 +8,7 @@
if BUILD_GTKSPELL
gtkspelllib_LTLIBRARIES = gtkspell.la
-gtkspelllibdir = $(libdir)/gajim
+gtkspelllibdir = $(pkglibdir)
gtkspell_la_LIBADD = \
$(GTKSPELL_LIBS) $(PYGTK_LIBS)
@@ -23,7 +23,7 @@
endif
if BUILD_TRAYICON
trayiconlib_LTLIBRARIES = trayicon.la
-trayiconlibdir = $(libdir)/gajim
+trayiconlibdir = $(pkglibdir)
trayicon_la_LIBADD = $(PYGTK_LIBS)
trayicon_la_SOURCES = \
eggtrayicon.c \
Modified: branches/gajim_0.12/src/chat_control.py
===================================================================
--- branches/gajim_0.12/src/chat_control.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/chat_control.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -135,7 +135,9 @@
def handle_message_textview_mykey_press(self, widget, event_keyval,
event_keymod):
- pass # Derived should implement this rather than connecting to the event itself.
+ # Derived should implement this rather than connecting to the event
+ # itself.
+ pass
def status_url_clicked(self, widget, url):
helpers.launch_browser_mailer('url', url)
@@ -164,17 +166,18 @@
# 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',
self._on_banner_eventbox_button_press_event)
self.handlers[id] = widget
- self.urlfinder = re.compile(r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]")
+ self.urlfinder = re.compile(
+ r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]")
if gajim.HAVE_PYSEXY:
import sexy
self.banner_status_label = sexy.UrlLabel()
- self.banner_status_label.connect('url_activated', self.status_url_clicked)
+ self.banner_status_label.connect('url_activated',
+ self.status_url_clicked)
else:
self.banner_status_label = gtk.Label()
self.banner_status_label.set_selectable(True)
@@ -273,29 +276,7 @@
# Attach speller
if gajim.config.get('use_speller') and HAS_GTK_SPELL:
- try:
- spell = gtkspell.Spell(self.msg_textview)
- # loop removing non-existant dictionaries
- # iterating on a copy
- for lang in dict(langs):
- try:
- spell.set_language(langs[lang])
- except Exception:
- del langs[lang]
- # now set the one the user selected
- per_type = 'contacts'
- if self.type_id == message_control.TYPE_GC:
- per_type = 'rooms'
- lang = gajim.config.get_per(per_type, self.contact.jid,
- 'speller_language')
- if not lang:
- # use the default one
- lang = gajim.config.get('speller_language')
- if lang:
- self.msg_textview.lang = lang
- spell.set_language(lang)
- except (gobject.GError, RuntimeError), msg:
- dialogs.AspellDictError(lang)
+ self.set_speller()
self.conv_textview.tv.show()
self._paint_banner()
@@ -305,8 +286,37 @@
self.smooth = True
self.msg_textview.grab_focus()
+ def set_speller(self):
+ try:
+ lang = gajim.config.get('speller_language')
+ if not lang:
+ lang = gajim.LANG
+ spell = gtkspell.Spell(self.msg_textview, lang)
+ # loop removing non-existant dictionaries
+ # iterating on a copy
+ for lang in dict(langs):
+ try:
+ spell.set_language(langs[lang])
+ except Exception:
+ del langs[lang]
+ # now set the one the user selected
+ per_type = 'contacts'
+ if self.type_id == message_control.TYPE_GC:
+ per_type = 'rooms'
+ lang = gajim.config.get_per(per_type, self.contact.jid,
+ 'speller_language')
+ if not lang:
+ # use the default one
+ lang = gajim.config.get('speller_language')
+ if lang:
+ self.msg_textview.lang = lang
+ spell.set_language(lang)
+ except (gobject.GError, RuntimeError), msg:
+ dialogs.AspellDictError(lang)
+
def on_msg_textview_populate_popup(self, textview, menu):
- '''we override the default context menu and we prepend an option to switch languages'''
+ '''we override the default context menu and we prepend an option to switch
+ languages'''
def _on_select_dictionary(widget, lang):
per_type = 'contacts'
if self.type_id == message_control.TYPE_GC:
@@ -668,7 +678,7 @@
# other_tags_for_text == ['marked'] --> highlighted gc message
gajim.last_message_time[self.account][full_jid] = time.time()
- if kind in ('incoming', 'incoming_queue'):
+ if kind in ('incoming', 'incoming_queue', 'error'):
gc_message = False
if self.type_id == message_control.TYPE_GC:
gc_message = True
@@ -678,7 +688,7 @@
not self.parent_win.is_active() or not end)) or \
(gc_message and \
jid in gajim.interface.minimized_controls[self.account])) and \
- kind in ('incoming', 'incoming_queue'):
+ kind in ('incoming', 'incoming_queue', 'error'):
# we want to have save this message in events list
# other_tags_for_text == ['marked'] --> highlighted gc message
if gc_message:
@@ -710,7 +720,7 @@
if (not self.parent_win.get_active_control() or \
self != self.parent_win.get_active_control() or \
not self.parent_win.is_active() or not end) and \
- kind in ('incoming', 'incoming_queue'):
+ kind in ('incoming', 'incoming_queue', 'error'):
self.parent_win.redraw_tab(self)
if not self.parent_win.is_active():
self.parent_win.show_title(True, self) # Enabled Urgent hint
@@ -1017,6 +1027,7 @@
ChatControlBase.__init__(self, self.TYPE_ID, parent_win,
'chat_child_vbox', contact, acct, resource)
+ self.gpg_is_active = False
# for muc use:
# widget = self.xml.get_widget('muc_window_actions_button')
self.actions_button = self.xml.get_widget('message_window_actions_button')
@@ -1107,6 +1118,8 @@
self.handlers[id] = message_tv_buffer
widget = self.xml.get_widget('avatar_eventbox')
+ widget.set_property('height-request', gajim.config.get(
+ 'chat_avatar_height'))
id = widget.connect('enter-notify-event',
self.on_avatar_eventbox_enter_notify_event)
self.handlers[id] = widget
@@ -1139,7 +1152,6 @@
# Enable encryption if needed
self.no_autonegotiation = False
e2e_is_active = self.session and self.session.enable_encryption
- self.gpg_is_active = False
gpg_pref = gajim.config.get_per('contacts', contact.jid,
'gpg_enabled')
@@ -1549,7 +1561,8 @@
ChatControlBase.print_conversation_line(self, msg,
'status', '', None)
- loggable = gajim.config.get('log_encrypted_sessions')
+ loggable = gajim.config.get_per('accounts', self.account,
+ 'log_encrypted_sessions')
if self.session:
self.session.loggable = loggable
@@ -1829,12 +1842,13 @@
def print_conversation(self, text, frm='', tim=None, encrypted=False,
subject=None, xhtml=None, simple=False, xep0184_id=None):
- # TODO: contact? ITYM frm.
'''Print a line in the conversation:
- if contact is set to status: it's a status message
- if contact is set to another value: it's an outgoing message
- if contact is set to print_queue: it is incomming from queue
- if contact is not set: it's an incomming message'''
+ if frm is set to status: it's a status message
+ if frm is set to error: it's an error message
+ if frm is set to info: it's a information message
+ if frm is set to print_queue: it is incomming from queue
+ if frm is set to another value: it's an outgoing message
+ if frm is not set: it's an incomming message'''
contact = self.contact
jid = contact.jid
@@ -1843,6 +1857,9 @@
return
kind = 'status'
name = ''
+ elif frm == 'error':
+ kind = 'error'
+ name = ''
elif frm == 'info':
kind = 'info'
name = ''
@@ -2336,10 +2353,10 @@
e2e_is_active = self.session and \
self.session.enable_encryption
- e2e_pref = gajim.config.get_per('accounts',
- self.account, 'autonegotiate_esessions') and \
- gajim.config.get_per('contacts',
- self.contact.jid, 'autonegotiate_esessions')
+ e2e_pref = gajim.config.get_per('accounts', self.account,
+ 'enable_esessions') and gajim.config.get_per('accounts',
+ self.account, 'autonegotiate_esessions') and gajim.config.get_per(
+ 'contacts', self.contact.jid, 'autonegotiate_esessions')
want_e2e = not e2e_is_active and not self.gpg_is_active \
and e2e_pref
Modified: branches/gajim_0.12/src/common/GnuPG.py
===================================================================
--- branches/gajim_0.12/src/common/GnuPG.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/GnuPG.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -35,11 +35,15 @@
GnuPGInterface.GnuPG.__init__(self)
self.use_agent = use_agent
self._setup_my_options()
+ self.always_trust = False
def _setup_my_options(self):
self.options.armor = 1
self.options.meta_interactive = 0
self.options.extra_args.append('--no-secmem-warning')
+ # disable photo viewer when verifying keys
+ self.options.extra_args.append('--verify-options')
+ self.options.extra_args.append('no-show-photo')
if self.use_agent:
self.options.extra_args.append('--use-agent')
@@ -68,10 +72,13 @@
resp[ keyword ] = ""
return resp
- def encrypt(self, str_, recipients):
+ def encrypt(self, str_, recipients, always_trust=False):
self.options.recipients = recipients # a list!
- proc = self.run(['--encrypt'], create_fhs=['stdin', 'stdout', 'status',
+ opt = ['--encrypt']
+ if always_trust or self.always_trust:
+ opt.append('--always-trust')
+ proc = self.run(opt, create_fhs=['stdin', 'stdout', 'status',
'stderr'])
proc.handles['stdin'].write(str_)
try:
@@ -97,6 +104,9 @@
try: proc.wait()
except IOError: pass
+ if 'INV_RECP' in resp and resp['INV_RECP'].split()[0] == '10':
+ # unusable recipient "Key not trusted"
+ return '', 'NOT_TRUSTED'
if 'BEGIN_ENCRYPTION' in resp and 'END_ENCRYPTION' in resp:
# Encryption succeeded, even if there is output on stderr. Maybe
# verbose is on
@@ -142,6 +152,8 @@
except IOError: pass
if 'GOOD_PASSPHRASE' in resp or 'SIG_CREATED' in resp:
return self._stripHeaderFooter(output)
+ if 'KEYEXPIRED' in resp:
+ return 'KEYEXPIRED'
return 'BAD_PASSPHRASE'
def verify(self, str_, sign):
Modified: branches/gajim_0.12/src/common/atom.py
===================================================================
--- branches/gajim_0.12/src/common/atom.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/atom.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -64,7 +64,7 @@
xmpp.Node.__init__(self, 'entry', node=node)
def __repr__(self):
- return '<Atom:Entry object of id="%r">' % self.id
+ return '<Atom:Entry object of id="%r">' % self.getAttr('id')
class OldEntry(xmpp.Node, object):
''' Parser for feeds from pubsub.com. They use old Atom 0.3 format with
@@ -74,7 +74,7 @@
xmpp.Node.__init__(self, 'entry', node=node)
def __repr__(self):
- return '<Atom0.3:Entry object of id="%r">' % self.id
+ return '<Atom0.3:Entry object of id="%r">' % self.getAttr('id')
def get_feed_title(self):
''' Returns title of feed, where the entry was created. The result is the feed name
Modified: branches/gajim_0.12/src/common/config.py
===================================================================
--- branches/gajim_0.12/src/common/config.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/config.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -80,7 +80,6 @@
'notify_on_new_message': [ opt_bool, True ],
'autopopupaway': [ opt_bool, False ],
'use_notif_daemon': [ opt_bool, True , _('Use D-Bus and Notification-Daemon to show notifications') ],
- 'ignore_unknown_contacts': [ opt_bool, False ],
'showoffline': [ opt_bool, False ],
'show_transports_group': [ opt_bool, True ],
'autoaway': [ opt_bool, True ],
@@ -136,6 +135,7 @@
'gc-hpaned-position': [opt_int, 430],
'gc_refer_to_nick_char': [opt_str, ',', _('Character to add after nickname when using nick completion (tab) in group chat.')],
'gc_proposed_nick_char': [opt_str, '_', _('Character to propose to add after desired nickname when desired nickname is used by someone else in group chat.')],
+ 'msgwin-max-state': [opt_bool, False],
'msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide
'msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide
'msgwin-width': [opt_int, 500],
@@ -161,7 +161,6 @@
'time_stamp': [ opt_str, '[%X] ', _('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') ],
'before_nickname': [ opt_str, '', _('Characters that are printed before the nickname in conversations') ],
'after_nickname': [ opt_str, ':', _('Characters that are printed after the nickname in conversations') ],
- 'send_os_info': [ opt_bool, True ],
'notify_on_new_gmail_email': [ opt_bool, True ],
'notify_on_new_gmail_email_extra': [ opt_bool, False ],
'use_gpg_agent': [ opt_bool, False ],
@@ -200,7 +199,6 @@
'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')],
'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')],
'tabs_close_button': [opt_bool, True, _('Show close button in tab?')],
- 'log_encrypted_sessions': [opt_bool, True, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')],
'esession_modp': [opt_str, '5,14', _('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.')],
'chat_avatar_width': [opt_int, 52],
'chat_avatar_height': [opt_int, 52],
@@ -338,6 +336,9 @@
'subscribe_activity': [opt_bool, True],
'subscribe_tune': [opt_bool, True],
'subscribe_nick': [opt_bool, True],
+ 'ignore_unknown_contacts': [ opt_bool, False ],
+ 'send_os_info': [ opt_bool, True ],
+ 'log_encrypted_sessions': [opt_bool, True, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')],
}, {}),
'statusmsg': ({
'message': [ opt_str, '' ],
Modified: branches/gajim_0.12/src/common/configpaths.py
===================================================================
--- branches/gajim_0.12/src/common/configpaths.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/configpaths.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -114,9 +114,19 @@
for n, p in zip(k, v):
self.add_from_root(n, p)
- self.add('DATA', os.path.join(u'..', windowsify(u'data')))
+ datadir = ''
+ if u'datadir' in os.environ:
+ datadir = fse(os.environ[u'datadir'])
+ if not datadir:
+ datadir = u'..'
+ self.add('DATA', os.path.join(datadir, windowsify(u'data')))
self.add('HOME', fse(os.path.expanduser('~')))
- self.add('TMP', fse(tempfile.gettempdir()))
+ try:
+ self.add('TMP', fse(tempfile.gettempdir()))
+ except IOError, e:
+ print >> sys.stderr, 'Error opening tmp folder: %s\nUsing %s' % (
+ str(e), os.path.expanduser('~'))
+ self.add('TMP', fse(os.path.expanduser('~')))
try:
import svn_config
Modified: branches/gajim_0.12/src/common/connection.py
===================================================================
--- branches/gajim_0.12/src/common/connection.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/connection.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -153,6 +153,7 @@
self.blocked_list = []
self.blocked_contacts = []
self.blocked_groups = []
+ self.blocked_all = False
self.music_track_info = 0
self.pep_supported = False
self.mood = {}
@@ -180,6 +181,7 @@
def put_event(self, ev):
if ev[0] in gajim.handlers:
+ log.debug('Sending %s event to GUI: %s' % (ev[0], ev[1:]))
gajim.handlers[ev[0]](self.name, ev[1])
def dispatch(self, event, data):
@@ -222,7 +224,7 @@
if gajim.account_is_connected(self.name):
# we cannot change our status to offline or connecting
# after we auth to server
- self.old_show = STATUS_LIST[self.connected]
+ self.old_show = gajim.SHOW_LIST[self.connected]
self.connected = 0
if not self.on_purpose:
self.dispatch('STATUS', 'offline')
@@ -680,6 +682,9 @@
self.dispatch('FINGERPRINT_ERROR',
(con.Connection.ssl_fingerprint_sha1,))
return True
+ else:
+ gajim.config.set_per('accounts', self.name, 'ssl_fingerprint_sha1',
+ con.Connection.ssl_fingerprint_sha1)
self._register_handlers(con, con_type)
con.auth(name, self.password, self.server_resource, 1, self.__on_auth)
@@ -824,14 +829,39 @@
return
common.xmpp.features_nb.setDefaultPrivacyList(self.connection, listname)
- def build_privacy_rule(self, name, action):
+ def build_privacy_rule(self, name, action, order=1):
'''Build a Privacy rule stanza for invisibility'''
iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '')
l = iq.getTag('query').setTag('list', {'name': name})
- i = l.setTag('item', {'action': action, 'order': '1'})
+ i = l.setTag('item', {'action': action, 'order': str(order)})
i.setTag('presence-out')
return iq
+ def build_invisible_rule(self):
+ iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '')
+ l = iq.getTag('query').setTag('list', {'name': 'invisible'})
+ if self.name in gajim.interface.status_sent_to_groups and \
+ len(gajim.interface.status_sent_to_groups[self.name]) > 0:
+ for group in gajim.interface.status_sent_to_groups[self.name]:
+ i = l.setTag('item', {'type': 'group', 'value': group,
+ 'action': 'allow', 'order': '1'})
+ i.setTag('presence-out')
+ if self.name in gajim.interface.status_sent_to_users and \
+ len(gajim.interface.status_sent_to_users[self.name]) > 0:
+ for jid in gajim.interface.status_sent_to_users[self.name]:
+ i = l.setTag('item', {'type': 'jid', 'value': jid,
+ 'action': 'allow', 'order': '2'})
+ i.setTag('presence-out')
+ i = l.setTag('item', {'action': 'deny', 'order': '3'})
+ i.setTag('presence-out')
+ return iq
+
+ def set_invisible_rule(self):
+ if not gajim.account_is_connected(self.name):
+ return
+ iq = self.build_invisible_rule()
+ self.connection.send(iq)
+
def activate_privacy_rule(self, name):
'''activate a privacy rule'''
if not self.connection:
@@ -860,7 +890,7 @@
self.connection.send(p)
# try to set the privacy rule
- iq = self.build_privacy_rule('invisible', 'deny')
+ iq = self.build_invisible_rule()
self.connection.SendAndCallForResponse(iq, self._continue_invisible,
{'msg': msg, 'signed': signed, 'initial': initial})
@@ -870,7 +900,7 @@
# active the privacy rule
self.privacy_rules_supported = True
self.activate_privacy_rule('invisible')
- self.connected = STATUS_LIST.index('invisible')
+ self.connected = gajim.SHOW_LIST.index('invisible')
self.status = msg
priority = unicode(gajim.get_priority(self.name, 'invisible'))
p = common.xmpp.Presence(priority = priority)
@@ -896,13 +926,18 @@
self.dispatch('SIGNED_IN', ())
def test_gpg_passphrase(self, password):
+ '''Returns 'ok', 'bad_pass' or 'expired' '''
if not self.gpg:
return False
self.gpg.passphrase = password
keyID = gajim.config.get_per('accounts', self.name, 'keyid')
signed = self.gpg.sign('test', keyID)
self.gpg.password = None
- return signed != 'BAD_PASSPHRASE'
+ if signed == 'KEYEXPIRED':
+ return 'expired'
+ elif signed == 'BAD_PASSPHRASE':
+ return 'bad_pass'
+ return 'ok'
def get_signed_presence(self, msg, callback = None):
if gajim.config.get_per('accounts', self.name, 'gpg_sign_presence'):
@@ -952,7 +987,7 @@
self.connection.send(iq)
def send_custom_status(self, show, msg, jid):
- if not show in STATUS_LIST:
+ if not show in gajim.SHOW_LIST:
return -1
if not self.connection:
return
@@ -978,7 +1013,7 @@
self.connection.send(p)
def change_status(self, show, msg, auto = False):
- if not show in STATUS_LIST:
+ if not show in gajim.SHOW_LIST:
return -1
sshow = helpers.get_xmpp_show(show)
if not msg:
@@ -1033,8 +1068,8 @@
signed = self.get_signed_presence(msg)
self.send_invisible_presence(msg, signed)
return
- was_invisible = self.connected == STATUS_LIST.index('invisible')
- self.connected = STATUS_LIST.index(show)
+ was_invisible = self.connected == gajim.SHOW_LIST.index('invisible')
+ self.connected = gajim.SHOW_LIST.index(show)
if was_invisible and self.privacy_rules_supported:
iq = self.build_privacy_rule('visible', 'allow')
self.connection.send(iq)
@@ -1054,11 +1089,11 @@
def _on_disconnected(self):
''' called when a disconnect request has completed successfully'''
+ self.disconnect(on_purpose=True)
self.dispatch('STATUS', 'offline')
- self.disconnect()
def get_status(self):
- return STATUS_LIST[self.connected]
+ return gajim.SHOW_LIST[self.connected]
def send_motd(self, jid, subject = '', msg = '', xhtml = None):
@@ -1091,25 +1126,52 @@
fjid = str(session.jid)
if keyID and self.USE_GPG:
+ xhtml = None
if keyID == 'UNKNOWN':
error = _('Neither the remote presence is signed, nor a key was assigned.')
elif keyID.endswith('MISMATCH'):
error = _('The contact\'s key (%s) does not match the key assigned in Gajim.' % keyID[:8])
else:
+ def _on_encrypted(msgenc, error):
+ output = (msgenc, error)
+ if error == 'NOT_TRUSTED':
+ def _on_always_trust(answer):
+ if answer:
+ msgenc, error = self.gpg.encrypt(msg, [keyID], False)
+ return _on_encrypted(msgenc, error)
+ else:
+ return self._on_message_encrypted(output, type_, msg,
+ msgtxt, original_message, fjid, resource, jid, xhtml,
+ subject, chatstate, composing_xep, forward_from,
+ delayed, session, form_node, user_nick, keyID)
+ self.dispatch('GPG_ALWAYS_TRUST', _on_always_trust)
+ else:
+ return self._on_message_encrypted(output, type_, msg, msgtxt,
+ original_message, fjid, resource, jid, xhtml, subject,
+ chatstate, composing_xep, forward_from, delayed, session,
+ form_node, user_nick, keyID)
#encrypt
- msgenc, error = self.gpg.encrypt(msg, [keyID])
- if msgenc and not error:
- msgtxt = '[This message is *encrypted* (See :XEP:`27`]'
- lang = os.getenv('LANG')
- if lang is not None and lang != 'en': # we're not english
- # one in locale and one en
- msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') + \
- ' (' + msgtxt + ')'
- else:
- # Encryption failed, do not send message
- tim = localtime()
- self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session))
- return 3
+ msgenc, error = self.gpg.encrypt(msg, [keyID], False)
+ return _on_encrypted(msgenc, error)
+
+ def _on_message_encrypted(self, output, type_, msg, msgtxt, original_message,
+ fjid, resource, jid, xhtml, subject, chatstate, composing_xep, forward_from,
+ delayed, session, form_node, user_nick, keyID):
+ msgenc, error = output
+
+ if not msgenc or error:
+ # Encryption failed, do not send message
+ tim = localtime()
+ self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session))
+ return 3
+
+ msgtxt = '[This message is *encrypted* (See :XEP:`27`]'
+ lang = os.getenv('LANG')
+ if lang is not None and lang != 'en': # we're not english
+ # one in locale and one en
+ msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') + \
+ ' (' + msgtxt + ')'
+
if type_ == 'chat':
msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type_,
xhtml = xhtml)
@@ -1494,7 +1556,7 @@
def send_agent_status(self, agent, ptype):
if not self.connection:
return
- show = helpers.get_xmpp_show(STATUS_LIST[self.connected])
+ show = helpers.get_xmpp_show(gajim.SHOW_LIST[self.connected])
p = common.xmpp.Presence(to = agent, typ = ptype, show = show)
p = self.add_sha(p, ptype != 'unavailable')
self.connection.send(p)
@@ -1517,7 +1579,7 @@
# FIXME: This room JID needs to be normalized; see #1364
if not self.connection:
return
- show = helpers.get_xmpp_show(STATUS_LIST[self.connected])
+ show = helpers.get_xmpp_show(gajim.SHOW_LIST[self.connected])
if show == 'invisible':
# Never join a room when invisible
return
@@ -1586,7 +1648,7 @@
self.connection.send(iq)
def send_gc_status(self, nick, jid, show, status):
- if not self.connection:
+ if not gajim.account_is_connected(self.name):
return
if show == 'invisible':
show = 'offline'
Modified: branches/gajim_0.12/src/common/connection_handlers.py
===================================================================
--- branches/gajim_0.12/src/common/connection_handlers.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/connection_handlers.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -55,8 +55,9 @@
import dbus
from music_track_listener import MusicTrackListener
-STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd',
- 'invisible', 'error']
+import logging
+log = logging.getLogger('gajim.c.connection_handlers')
+
# kind of events we can wait for an answer
VCARD_PUBLISHED = 'vcard_published'
VCARD_ARRIVED = 'vcard_arrived'
@@ -631,16 +632,26 @@
def request_register_agent_info(self, agent):
if not self.connection or self.connected < 2:
return None
- iq=common.xmpp.Iq('get', common.xmpp.NS_REGISTER, to=agent)
+ iq = common.xmpp.Iq('get', common.xmpp.NS_REGISTER, to=agent)
id = self.connection.getAnID()
iq.setID(id)
# Wait the answer during 30 secondes
self.awaiting_timeouts[gajim.idlequeue.current_time() + 30] = (id,
- _('Registration information for transport %s has not arrived in time') % \
- agent)
+ _('Registration information for transport %s has not arrived in time')\
+ % agent)
self.connection.SendAndCallForResponse(iq, self._ReceivedRegInfo,
{'agent': agent})
+ def _agent_registered_cb(self, con, resp, agent):
+ if resp.getType() == 'result':
+ self.dispatch('INFORMATION', (_('Registration succeeded'),
+ _('Resgitration with agent %s succeeded') % agent))
+ if resp.getType() == 'error':
+ self.dispatch('ERROR', (_('Registration failed'), _('Resgitration with'
+ ' agent %(agent)s failed with error %(error)s: %(error_msg)s') % {
+ 'agent': agent, 'error': resp.getError(),
+ 'error_msg': resp.getErrorMsg()}))
+
def register_agent(self, agent, info, is_form = False):
if not self.connection or self.connected < 2:
return
@@ -649,7 +660,8 @@
query = iq.getTag('query')
info.setAttr('type', 'submit')
query.addChild(node = info)
- self.connection.send(iq)
+ self.connection.SendAndCallForResponse(iq, self._agent_registered_cb,
+ {'agent': agent})
else:
# fixed: blocking
common.xmpp.features_nb.register(self.connection, agent, info, None)
@@ -725,9 +737,9 @@
hostname = gajim.config.get_per('accounts', self.name,
'hostname')
id = iq_obj.getID()
- if jid == hostname and id[0] == 'p':
+ if jid == hostname and id[0] == 'Gajim_':
for item in items:
- self.discoverInfo(item['jid'], id_prefix='p')
+ self.discoverInfo(item['jid'], id_prefix='Gajim_')
else:
self.dispatch('AGENT_INFO_ITEMS', (jid, node, items))
@@ -759,7 +771,7 @@
raise common.xmpp.NodeProcessed
id = unicode(iq_obj.getAttr('id'))
- if id[0] == 'p':
+ if id[0] == 'Gajim_':
# We get this request from echo.server
raise common.xmpp.NodeProcessed
@@ -829,7 +841,7 @@
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] == 'Gajim_':
if jid == gajim.config.get_per('accounts', self.name, 'hostname'):
if features.__contains__(common.xmpp.NS_GMAILNOTIFY):
gajim.gmail_domains.append(jid)
@@ -1056,12 +1068,12 @@
self.save_vcard_to_hd(our_jid, vcard_iq)
# Send new presence if sha changed and we are not invisible
- if self.vcard_sha != new_sha and STATUS_LIST[self.connected] != \
+ if self.vcard_sha != new_sha and gajim.SHOW_LIST[self.connected] !=\
'invisible':
if not self.connection or self.connected < 2:
return
self.vcard_sha = new_sha
- sshow = helpers.get_xmpp_show(STATUS_LIST[self.connected])
+ sshow = helpers.get_xmpp_show(gajim.SHOW_LIST[self.connected])
p = common.xmpp.Presence(typ = None, priority = self.priority,
show = sshow, status = self.status)
p = self.add_sha(p)
@@ -1228,11 +1240,11 @@
if self.vcard_sha == avatar_sha:
return
self.vcard_sha = avatar_sha
- if STATUS_LIST[self.connected] == 'invisible':
+ if gajim.SHOW_LIST[self.connected] == 'invisible':
return
if not self.connection:
return
- sshow = helpers.get_xmpp_show(STATUS_LIST[self.connected])
+ sshow = helpers.get_xmpp_show(gajim.SHOW_LIST[self.connected])
p = common.xmpp.Presence(typ = None, priority = self.priority,
show = sshow, status = self.status)
p = self.add_sha(p)
@@ -1501,6 +1513,12 @@
for group in item.getTags('group'):
groups.append(group.getData())
self.dispatch('ROSTER_INFO', (jid, name, sub, ask, groups))
+ if not self.connection or self.connected < 2:
+ raise common.xmpp.NodeProcessed
+ server = gajim.config.get_per('accounts', self.name, 'hostname')
+ reply = common.xmpp.Iq(typ='result', attrs={'id': iq_obj.getID()},
+ to=server, frm=iq_obj.getTo(), xmlns=None)
+ self.connection.send(reply)
raise common.xmpp.NodeProcessed
def _VersionCB(self, con, iq_obj):
@@ -1511,7 +1529,7 @@
qp = iq_obj.getTag('query')
qp.setTagData('name', 'Gajim')
qp.setTagData('version', gajim.version)
- send_os = gajim.config.get('send_os_info')
+ send_os = gajim.config.get_per('accounts', self.name, 'send_os_info')
if send_os:
qp.setTagData('os', helpers.get_os_info())
self.connection.send(iq_obj)
@@ -1594,7 +1612,8 @@
qp = iq_obj.setTag('time',
namespace=common.xmpp.NS_TIME_REVISED)
qp.setTagData('utc', strftime('%Y-%m-%dT%H:%M:%SZ', gmtime()))
- zone = -(timezone, altzone)[daylight] / 60
+ isdst = localtime().tm_isdst
+ zone = -(timezone, altzone)[isdst] / 60
tzo = (zone / 60, abs(zone % 60))
qp.setTagData('tzo', '%+03d:%02d' % (tzo))
self.connection.send(iq_obj)
@@ -1812,7 +1831,7 @@
if keyID:
decmsg = self.gpg.decrypt(encmsg, keyID)
# \x00 chars are not allowed in C (so in GTK)
- msgtxt = decmsg.replace('\x00', '')
+ msgtxt = helpers.decode_string(decmsg.replace('\x00', ''))
encrypted = 'xep27'
if mtype == 'error':
self.dispatch_error_message(msg, msgtxt, session, frm, tim)
@@ -2292,13 +2311,14 @@
raise common.xmpp.NodeProcessed
def _getRosterCB(self, con, iq_obj):
+ log.debug('getRosterCB')
if not self.connection:
return
self.connection.getRoster(self._on_roster_set)
self.discoverItems(gajim.config.get_per('accounts', self.name,
- 'hostname'), id_prefix='p')
+ 'hostname'), id_prefix='Gajim_')
self.discoverInfo(gajim.config.get_per('accounts', self.name,
- 'hostname'), id_prefix='p')
+ 'hostname'), id_prefix='Gajim_')
if gajim.config.get_per('accounts', self.name, 'use_ft_proxies'):
self.discover_ft_proxies()
@@ -2365,7 +2385,7 @@
_('You will be connected to %s without OpenPGP.') % self.name))
self.USE_GPG = False
signed = ''
- self.connected = STATUS_LIST.index(show)
+ self.connected = gajim.SHOW_LIST.index(show)
sshow = helpers.get_xmpp_show(show)
# send our presence
if show == 'invisible':
Modified: branches/gajim_0.12/src/common/dataforms.py
===================================================================
--- branches/gajim_0.12/src/common/dataforms.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/dataforms.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -56,7 +56,7 @@
''' Helper function to create a field of given type. '''
f = {
'boolean': BooleanField,
- 'fixed': TextMultiField, # not editable, still can have multiple lines of text
+ 'fixed': StringField,
'hidden': StringField,
'text-private': StringField,
'text-single': StringField,
@@ -76,7 +76,7 @@
typ=node.getAttr('type')
f = {
'boolean': BooleanField,
- 'fixed': TextMultiField,
+ 'fixed': StringField,
'hidden': StringField,
'text-private': StringField,
'text-single': StringField,
Modified: branches/gajim_0.12/src/common/dbus_support.py
===================================================================
--- branches/gajim_0.12/src/common/dbus_support.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/dbus_support.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -40,6 +40,8 @@
pass
import dbus
import dbus.glib
+ # test if dbus-x11 is installed
+ bus = dbus.SessionBus()
supported = True # does user have D-Bus bindings?
except ImportError:
supported = False
Modified: branches/gajim_0.12/src/common/defs.py
===================================================================
--- branches/gajim_0.12/src/common/defs.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/defs.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -27,8 +27,9 @@
docdir = '../'
datadir = '../'
+localedir = '../po'
-version = '0.12.1'
+version = '0.12.2'
import sys, os.path
for base in ('.', 'common'):
Modified: branches/gajim_0.12/src/common/events.py
===================================================================
--- branches/gajim_0.12/src/common/events.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/events.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -28,11 +28,12 @@
class Event:
'''Information concerning each event'''
- def __init__(self, type_, time_, parameters, show_in_roster = False,
- show_in_systray = True):
+ def __init__(self, type_, time_, parameters, show_in_roster=False,
+ show_in_systray=True):
''' type_ in chat, normal, file-request, file-error, file-completed,
file-request-error, file-send-error, file-stopped, gc_msg, pm,
- printed_chat, printed_gc_msg, printed_marked_gc_msg, printed_pm
+ printed_chat, printed_gc_msg, printed_marked_gc_msg, printed_pm,
+ gc-invitation, subscription_request, unsubscribed
parameters is (per type_):
chat, normal, pm: [message, subject, kind, time, encrypted, resource,
msg_id]
@@ -41,7 +42,11 @@
gc_msg: None
printed_chat: control
printed_*: None
- messages that are already printed in chat, but not read'''
+ messages that are already printed in chat, but not read
+ gc-invitation: [room_jid, reason, password, is_continued]
+ subscription_request: [text, nick]
+ unsubscribed: contact
+ '''
self.type_ = type_
self.time_ = time_
self.parameters = parameters
Modified: branches/gajim_0.12/src/common/exceptions.py
===================================================================
--- branches/gajim_0.12/src/common/exceptions.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/exceptions.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -83,7 +83,7 @@
pass
class LatexError(Exception):
- '''sqlite2 raised pysqlite2.dbapi2.OperationalError'''
+ '''LaTeX processing failed for some reason'''
def __init__(self, text=''):
Exception.__init__(self)
self.text = text
Modified: branches/gajim_0.12/src/common/gajim.py
===================================================================
--- branches/gajim_0.12/src/common/gajim.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/gajim.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -105,6 +105,8 @@
else:
LANG = LANG[:2] # en, fr, el etc..
+os_info = None # used to cache os information
+
gmail_domains = ['gmail.com', 'googlemail.com']
transport_type = {} # list the type of transport
@@ -174,6 +176,9 @@
if system('gpg -h >/dev/null 2>&1'):
HAVE_GPG = False
+import latex
+HAVE_LATEX = latex.check_for_latex_support()
+
gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'}
gajim_common_features = [xmpp.NS_BYTESTREAM, xmpp.NS_SI, xmpp.NS_FILE,
xmpp.NS_MUC, xmpp.NS_MUC_USER, xmpp.NS_MUC_ADMIN, xmpp.NS_MUC_OWNER,
Modified: branches/gajim_0.12/src/common/helpers.py
===================================================================
--- branches/gajim_0.12/src/common/helpers.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/helpers.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -41,7 +41,6 @@
import sys
from encodings.punycode import punycode_encode
-import gajim
from i18n import Q_
from i18n import ngettext
import xmpp
@@ -59,11 +58,6 @@
hash_sha1 = sha.new
try:
- from osx import nsapp
-except ImportError:
- pass
-
-try:
import winsound # windows-only built-in module for playing wav
import win32api
import win32con
@@ -198,65 +192,6 @@
else:
raise
-def convert_bytes(string):
- suffix = ''
- # IEC standard says KiB = 1024 bytes KB = 1000 bytes
- # but do we use the standard?
- use_kib_mib = gajim.config.get('use_kib_mib')
- align = 1024.
- bytes = float(string)
- if bytes >= align:
- bytes = round(bytes/align, 1)
- if bytes >= align:
- bytes = round(bytes/align, 1)
- if bytes >= align:
- bytes = round(bytes/align, 1)
- if use_kib_mib:
- #GiB means gibibyte
- suffix = _('%s GiB')
- else:
- #GB means gigabyte
- suffix = _('%s GB')
- else:
- if use_kib_mib:
- #MiB means mibibyte
- suffix = _('%s MiB')
- else:
- #MB means megabyte
- suffix = _('%s MB')
- else:
- if use_kib_mib:
- #KiB means kibibyte
- suffix = _('%s KiB')
- else:
- #KB means kilo bytes
- suffix = _('%s KB')
- else:
- #B means bytes
- suffix = _('%s B')
- return suffix % unicode(bytes)
-
-
-def get_contact_dict_for_account(account):
- ''' create a dict of jid, nick -> contact with all contacts of account.
- Can be used for completion lists'''
- contacts_dict = {}
- for jid in gajim.contacts.get_jid_list(account):
- contact = gajim.contacts.get_contact_with_highest_priority(account,
- jid)
- contacts_dict[jid] = contact
- name = contact.name
- if name in contacts_dict:
- contact1 = contacts_dict[name]
- del contacts_dict[name]
- contacts_dict['%s (%s)' % (name, contact1.jid)] = contact1
- contacts_dict['%s (%s)' % (name, jid)] = contact
- else:
- if contact.name == gajim.get_nick_from_jid(jid):
- del contacts_dict[jid]
- contacts_dict[name] = contact
- return contacts_dict
-
def get_uf_show(show, use_mnemonic = False):
'''returns a userfriendly string for dnd/xa/chat
and makes all strings translatable
@@ -445,6 +380,347 @@
command = '%s "%s"' % (executable, parameter)
return command
+def get_file_path_from_dnd_dropped_uri(uri):
+ path = urllib.unquote(uri) # escape special chars
+ path = path.strip('\r\n\x00') # remove \r\n and NULL
+ # get the path to file
+ if re.match('^file:///[a-zA-Z]:/', path): # windows
+ path = path[8:] # 8 is len('file:///')
+ elif path.startswith('file://'): # nautilus, rox
+ if sys.platform == 'darwin':
+ # OS/X includes hostname in file:// URI
+ path = re.sub('file://[^/]*', '', path)
+ else:
+ path = path[7:] # 7 is len('file://')
+ elif path.startswith('file:'): # xffm
+ path = path[5:] # 5 is len('file:')
+ return path
+
+def from_xs_boolean_to_python_boolean(value):
+ # this is xs:boolean so 'true', 'false', '1', '0'
+ # convert those to True/False (python booleans)
+ if value in ('1', 'true'):
+ val = True
+ else: # '0', 'false' or anything else
+ val = False
+
+ return val
+
+def get_xmpp_show(show):
+ if show in ('online', 'offline'):
+ return None
+ return show
+
+def get_output_of_command(command):
+ try:
+ child_stdin, child_stdout = os.popen2(command)
+ except ValueError:
+ return None
+
+ output = child_stdout.readlines()
+ child_stdout.close()
+ child_stdin.close()
+
+ return output
+
+def decode_string(string):
+ '''try to decode (to make it Unicode instance) given string'''
+ if isinstance(string, unicode):
+ return string
+ # by the time we go to iso15 it better be the one else we show bad characters
+ encodings = (locale.getpreferredencoding(), 'utf-8', 'iso-8859-15')
+ for encoding in encodings:
+ try:
+ string = string.decode(encoding)
+ except UnicodeError:
+ continue
+ break
+
+ return string
+
+def ensure_utf8_string(string):
+ '''make sure string is in UTF-8'''
+ try:
+ string = decode_string(string).encode('utf-8')
+ except Exception:
+ pass
+ return string
+
+def get_windows_reg_env(varname, default=''):
+ '''asks for paths commonly used but not exposed as ENVs
+ in english Windows 2003 those are:
+ 'AppData' = %USERPROFILE%\Application Data (also an ENV)
+ 'Desktop' = %USERPROFILE%\Desktop
+ 'Favorites' = %USERPROFILE%\Favorites
+ 'NetHood' = %USERPROFILE%\NetHood
+ 'Personal' = D:\My Documents (PATH TO MY DOCUMENTS)
+ 'PrintHood' = %USERPROFILE%\PrintHood
+ 'Programs' = %USERPROFILE%\Start Menu\Programs
+ 'Recent' = %USERPROFILE%\Recent
+ 'SendTo' = %USERPROFILE%\SendTo
+ 'Start Menu' = %USERPROFILE%\Start Menu
+ 'Startup' = %USERPROFILE%\Start Menu\Programs\Startup
+ 'Templates' = %USERPROFILE%\Templates
+ 'My Pictures' = D:\My Documents\My Pictures
+ 'Local Settings' = %USERPROFILE%\Local Settings
+ 'Local AppData' = %USERPROFILE%\Local Settings\Application Data
+ 'Cache' = %USERPROFILE%\Local Settings\Temporary Internet Files
+ 'Cookies' = %USERPROFILE%\Cookies
+ 'History' = %USERPROFILE%\Local Settings\History
+ '''
+
+ if os.name != 'nt':
+ return ''
+
+ val = default
+ try:
+ rkey = win32api.RegOpenKey(win32con.HKEY_CURRENT_USER,
+r'Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders')
+ try:
+ val = str(win32api.RegQueryValueEx(rkey, varname)[0])
+ val = win32api.ExpandEnvironmentStrings(val) # expand using environ
+ except Exception:
+ pass
+ finally:
+ win32api.RegCloseKey(rkey)
+ return val
+
+def get_my_pictures_path():
+ '''windows-only atm. [Unix lives in the past]'''
+ return get_windows_reg_env('My Pictures')
+
+def get_desktop_path():
+ if os.name == 'nt':
+ path = get_windows_reg_env('Desktop')
+ else:
+ path = os.path.join(os.path.expanduser('~'), 'Desktop')
+ return path
+
+def get_documents_path():
+ if os.name == 'nt':
+ path = get_windows_reg_env('Personal')
+ else:
+ path = os.path.expanduser('~')
+ return path
+
+def sanitize_filename(filename):
+ '''makes sure the filename we will write does contain only acceptable and
+ latin characters, and is not too long (in that case hash it)'''
+ # 48 is the limit
+ if len(filename) > 48:
+ hash = hash_md5(filename)
+ filename = base64.b64encode(hash.digest())
+
+ filename = punycode_encode(filename) # make it latin chars only
+ filename = filename.replace('/', '_')
+ if os.name == 'nt':
+ filename = filename.replace('?', '_').replace(':', '_')\
+ .replace('\\', '_').replace('"', "'").replace('|', '_')\
+ .replace('*', '_').replace('<', '_').replace('>', '_')
+
+ return filename
+
+def reduce_chars_newlines(text, max_chars = 0, max_lines = 0):
+ '''Cut the chars after 'max_chars' on each line
+ and show only the first 'max_lines'.
+ If any of the params is not present (None or 0) the action
+ on it is not performed'''
+
+ def _cut_if_long(string):
+ if len(string) > max_chars:
+ string = string[:max_chars - 3] + '...'
+ return string
+
+ if isinstance(text, str):
+ text = text.decode('utf-8')
+
+ if max_lines == 0:
+ lines = text.split('\n')
+ else:
+ lines = text.split('\n', max_lines)[:max_lines]
+ if max_chars > 0:
+ if lines:
+ lines = map(lambda e: _cut_if_long(e), lines)
+ if lines:
+ reduced_text = '\n'.join(lines)
+ if reduced_text != text:
+ reduced_text += '...'
+ else:
+ reduced_text = ''
+ return reduced_text
+
+def get_account_status(account):
+ status = reduce_chars_newlines(account['status_line'], 100, 1)
+ return status
+
+def get_avatar_path(prefix):
+ '''Returns the filename of the avatar, distinguishes between user- and
+ contact-provided one. Returns None if no avatar was found at all.
+ prefix is the path to the requested avatar just before the ".png" or
+ ".jpeg".'''
+ # First, scan for a local, user-set avatar
+ for type_ in ('jpeg', 'png'):
+ file_ = prefix + '_local.' + type_
+ if os.path.exists(file_):
+ return file_
+ # If none available, scan for a contact-provided avatar
+ for type_ in ('jpeg', 'png'):
+ file_ = prefix + '.' + type_
+ if os.path.exists(file_):
+ return file_
+ return None
+
+def datetime_tuple(timestamp):
+ '''Converts timestamp using strptime and the format: %Y%m%dT%H:%M:%S
+ Because of various datetime formats are used the following exceptions
+ are handled:
+ - Optional milliseconds appened to the string are removed
+ - Optional Z (that means UTC) appened to the string are removed
+ - XEP-082 datetime strings have all '-' cahrs removed to meet
+ the above format.'''
+ timestamp = timestamp.split('.')[0]
+ timestamp = timestamp.replace('-', '')
+ timestamp = timestamp.replace('z', '')
+ timestamp = timestamp.replace('Z', '')
+ from time import strptime
+ return strptime(timestamp, '%Y%m%dT%H:%M:%S')
+
+def sort_identities_func(i1, i2):
+ cat1 = i1['category']
+ cat2 = i2['category']
+ if cat1 < cat2:
+ return -1
+ if cat1 > cat2:
+ return 1
+ type1 = i1.get('type', '')
+ type2 = i2.get('type', '')
+ if type1 < type2:
+ return -1
+ if type1 > type2:
+ return 1
+ lang1 = i1.get('xml:lang', '')
+ lang2 = i2.get('xml:lang', '')
+ if lang1 < lang2:
+ return -1
+ if lang1 > lang2:
+ return 1
+ return 0
+
+def sort_dataforms_func(d1, d2):
+ f1 = d1.getField('FORM_TYPE')
+ f2 = d2.getField('FORM_TYPE')
+ if f1 and f2 and (f1.getValue() < f2.getValue()):
+ return -1
+ return 1
+
+def compute_caps_hash(identities, features, dataforms=[], hash_method='sha-1'):
+ '''Compute caps hash according to XEP-0115, V1.5
+
+ dataforms are xmpp.DataForms objects as common.dataforms don't allow several
+ values without a field type list-multi'''
+ S = ''
+ identities.sort(cmp=sort_identities_func)
+ for i in identities:
+ c = i['category']
+ type_ = i.get('type', '')
+ lang = i.get('xml:lang', '')
+ name = i.get('name', '')
+ S += '%s/%s/%s/%s<' % (c, type_, lang, name)
+ features.sort()
+ for f in features:
+ S += '%s<' % f
+ dataforms.sort(cmp=sort_dataforms_func)
+ for dataform in dataforms:
+ # fields indexed by var
+ fields = {}
+ for f in dataform.getChildren():
+ fields[f.getVar()] = f
+ form_type = fields.get('FORM_TYPE')
+ if form_type:
+ S += form_type.getValue() + '<'
+ del fields['FORM_TYPE']
+ vars = sorted(fields.keys())
+ for var in vars:
+ S += '%s<' % var
+ values = sorted(fields[var].getValues())
+ for value in values:
+ S += '%s<' % value
+
+ if hash_method == 'sha-1':
+ hash = hash_sha1(S)
+ elif hash_method == 'md5':
+ hash = hash_md5(S)
+ else:
+ return ''
+ return base64.b64encode(hash.digest())
+
+# import gajim only when needed (after decode_string is defined) see #4764
+
+import gajim
+
+try:
+ from osx import nsapp
+except ImportError:
+ pass
+
+def convert_bytes(string):
+ suffix = ''
+ # IEC standard says KiB = 1024 bytes KB = 1000 bytes
+ # but do we use the standard?
+ use_kib_mib = gajim.config.get('use_kib_mib')
+ align = 1024.
+ bytes = float(string)
+ if bytes >= align:
+ bytes = round(bytes/align, 1)
+ if bytes >= align:
+ bytes = round(bytes/align, 1)
+ if bytes >= align:
+ bytes = round(bytes/align, 1)
+ if use_kib_mib:
+ #GiB means gibibyte
+ suffix = _('%s GiB')
+ else:
+ #GB means gigabyte
+ suffix = _('%s GB')
+ else:
+ if use_kib_mib:
+ #MiB means mibibyte
+ suffix = _('%s MiB')
+ else:
+ #MB means megabyte
+ suffix = _('%s MB')
+ else:
+ if use_kib_mib:
+ #KiB means kibibyte
+ suffix = _('%s KiB')
+ else:
+ #KB means kilo bytes
+ suffix = _('%s KB')
+ else:
+ #B means bytes
+ suffix = _('%s B')
+ return suffix % unicode(bytes)
+
+def get_contact_dict_for_account(account):
+ ''' create a dict of jid, nick -> contact with all contacts of account.
+ Can be used for completion lists'''
+ contacts_dict = {}
+ for jid in gajim.contacts.get_jid_list(account):
+ contact = gajim.contacts.get_contact_with_highest_priority(account,
+ jid)
+ contacts_dict[jid] = contact
+ name = contact.name
+ if name in contacts_dict:
+ contact1 = contacts_dict[name]
+ del contacts_dict[name]
+ contacts_dict['%s (%s)' % (name, contact1.jid)] = contact1
+ contacts_dict['%s (%s)' % (name, jid)] = contact
+ else:
+ if contact.name == gajim.get_nick_from_jid(jid):
+ del contacts_dict[jid]
+ contacts_dict[name] = contact
+ return contacts_dict
+
def launch_browser_mailer(kind, uri):
#kind = 'url' or 'mail'
if os.name == 'nt':
@@ -536,49 +812,6 @@
command = build_command(player, path_to_soundfile)
exec_command(command)
-def get_file_path_from_dnd_dropped_uri(uri):
- path = urllib.unquote(uri) # escape special chars
- path = path.strip('\r\n\x00') # remove \r\n and NULL
- # get the path to file
- if re.match('^file:///[a-zA-Z]:/', path): # windows
- path = path[8:] # 8 is len('file:///')
- elif path.startswith('file://'): # nautilus, rox
- if sys.platform == 'darwin':
- # OS/X includes hostname in file:// URI
- path = re.sub('file://[^/]*', '', path)
- else:
- path = path[7:] # 7 is len('file://')
- elif path.startswith('file:'): # xffm
- path = path[5:] # 5 is len('file:')
- return path
-
-def from_xs_boolean_to_python_boolean(value):
- # this is xs:boolean so 'true', 'false', '1', '0'
- # convert those to True/False (python booleans)
- if value in ('1', 'true'):
- val = True
- else: # '0', 'false' or anything else
- val = False
-
- return val
-
-def get_xmpp_show(show):
- if show in ('online', 'offline'):
- return None
- return show
-
-def get_output_of_command(command):
- try:
- child_stdin, child_stdout = os.popen2(command)
- except ValueError:
- return None
-
- output = child_stdout.readlines()
- child_stdout.close()
- child_stdin.close()
-
- return output
-
def get_global_show():
maxi = 0
for account in gajim.connections:
@@ -644,91 +877,6 @@
return contact.show
return 'not in roster'
-def decode_string(string):
- '''try to decode (to make it Unicode instance) given string'''
- if isinstance(string, unicode):
- return string
- # by the time we go to iso15 it better be the one else we show bad characters
- encodings = (locale.getpreferredencoding(), 'utf-8', 'iso-8859-15')
- for encoding in encodings:
- try:
- string = string.decode(encoding)
- except UnicodeError:
- continue
- break
-
- return string
-
-def ensure_utf8_string(string):
- '''make sure string is in UTF-8'''
- try:
- string = decode_string(string).encode('utf-8')
- except Exception:
- pass
- return string
-
-def remove_invalid_xml_chars(string):
- if string:
- string = re.sub(gajim.interface.invalid_XML_chars_re, '', string)
- return string
-
-def get_windows_reg_env(varname, default=''):
- '''asks for paths commonly used but not exposed as ENVs
- in english Windows 2003 those are:
- 'AppData' = %USERPROFILE%\Application Data (also an ENV)
- 'Desktop' = %USERPROFILE%\Desktop
- 'Favorites' = %USERPROFILE%\Favorites
- 'NetHood' = %USERPROFILE%\NetHood
- 'Personal' = D:\My Documents (PATH TO MY DOCUMENTS)
- 'PrintHood' = %USERPROFILE%\PrintHood
- 'Programs' = %USERPROFILE%\Start Menu\Programs
- 'Recent' = %USERPROFILE%\Recent
- 'SendTo' = %USERPROFILE%\SendTo
- 'Start Menu' = %USERPROFILE%\Start Menu
- 'Startup' = %USERPROFILE%\Start Menu\Programs\Startup
- 'Templates' = %USERPROFILE%\Templates
- 'My Pictures' = D:\My Documents\My Pictures
- 'Local Settings' = %USERPROFILE%\Local Settings
- 'Local AppData' = %USERPROFILE%\Local Settings\Application Data
- 'Cache' = %USERPROFILE%\Local Settings\Temporary Internet Files
- 'Cookies' = %USERPROFILE%\Cookies
- 'History' = %USERPROFILE%\Local Settings\History
- '''
-
- if os.name != 'nt':
- return ''
-
- val = default
- try:
- rkey = win32api.RegOpenKey(win32con.HKEY_CURRENT_USER,
-r'Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders')
- try:
- val = str(win32api.RegQueryValueEx(rkey, varname)[0])
- val = win32api.ExpandEnvironmentStrings(val) # expand using environ
- except Exception:
- pass
- finally:
- win32api.RegCloseKey(rkey)
- return val
-
-def get_my_pictures_path():
- '''windows-only atm. [Unix lives in the past]'''
- return get_windows_reg_env('My Pictures')
-
-def get_desktop_path():
- if os.name == 'nt':
- path = get_windows_reg_env('Desktop')
- else:
- path = os.path.join(os.path.expanduser('~'), 'Desktop')
- return path
-
-def get_documents_path():
- if os.name == 'nt':
- path = get_windows_reg_env('Personal')
- else:
- path = os.path.expanduser('~')
- return path
-
def get_full_jid_from_iq(iq_obj):
'''return the full jid (with resource) from an iq as unicode'''
return parse_jid(str(iq_obj.getFrom()))
@@ -742,6 +890,10 @@
''' return sha of sid + initiator + target used for proxy auth'''
return sha.new("%s%s%s" % (sid, initiator, target)).hexdigest()
+def remove_invalid_xml_chars(string):
+ if string:
+ string = re.sub(gajim.interface.invalid_XML_chars_re, '', string)
+ return string
distro_info = {
'Arch Linux': '/etc/arch-release',
@@ -776,6 +928,8 @@
return ''.join(sample(char_sequence, 16))
def get_os_info():
+ if gajim.os_info:
+ return gajim.os_info
if os.name == 'nt':
ver = os.sys.getwindowsversion()
ver_format = ver[3], ver[0], ver[1]
@@ -790,9 +944,11 @@
(2, 6, 0): 'Vista',
}
if ver_format in win_version:
- return 'Windows' + ' ' + win_version[ver_format]
+ os_info = 'Windows' + ' ' + win_version[ver_format]
else:
- return 'Windows'
+ os_info = 'Windows'
+ gajim.os_info = os_info
+ return os_info
elif os.name == 'posix':
executable = 'lsb_release'
params = ' --description --codename --release --short'
@@ -805,6 +961,7 @@
output = temp_failure_retry(p.stdout.readline).strip()
# some distros put n/a in places, so remove those
output = output.replace('n/a', '').replace('N/A', '')
+ gajim.os_info = output
return output
# lsb_release executable not available, so parse files
@@ -832,31 +989,20 @@
text = distro_name
elif path_to_file.endswith('lfs-release'): # file just has version
text = distro_name + ' ' + text
- return text.replace('\n', '')
+ os_info = text.replace('\n', '')
+ gajim.os_info = os_info
+ return os_info
# our last chance, ask uname and strip it
uname_output = get_output_of_command('uname -sr')
if uname_output is not None:
- return uname_output[0] # only first line
- return 'N/A'
+ os_info = uname_output[0] # only first line
+ gajim.os_info = os_info
+ return os_info
+ os_info = 'N/A'
+ gajim.os_info = os_info
+ return os_info
-def sanitize_filename(filename):
- '''makes sure the filename we will write does contain only acceptable and
- latin characters, and is not too long (in that case hash it)'''
- # 48 is the limit
- if len(filename) > 48:
- hash = hash_md5(filename)
- filename = base64.b64encode(hash.digest())
-
- filename = punycode_encode(filename) # make it latin chars only
- filename = filename.replace('/', '_')
- if os.name == 'nt':
- filename = filename.replace('?', '_').replace(':', '_')\
- .replace('\\', '_').replace('"', "'").replace('|', '_')\
- .replace('*', '_').replace('<', '_').replace('>', '_')
-
- return filename
-
def allow_showing_notification(account, type_ = 'notify_on_new_message',
advanced_notif_num = None, is_first_message = True):
'''is it allowed to show nofication?
@@ -927,39 +1073,6 @@
# unknown contact or offline message
return gajim.interface.msg_win_mgr.get_control(contact.jid, account)
-def reduce_chars_newlines(text, max_chars = 0, max_lines = 0):
- '''Cut the chars after 'max_chars' on each line
- and show only the first 'max_lines'.
- If any of the params is not present (None or 0) the action
- on it is not performed'''
-
- def _cut_if_long(string):
- if len(string) > max_chars:
- string = string[:max_chars - 3] + '...'
- return string
-
- if isinstance(text, str):
- text = text.decode('utf-8')
-
- if max_lines == 0:
- lines = text.split('\n')
- else:
- lines = text.split('\n', max_lines)[:max_lines]
- if max_chars > 0:
- if lines:
- lines = map(lambda e: _cut_if_long(e), lines)
- if lines:
- reduced_text = '\n'.join(lines)
- if reduced_text != text:
- reduced_text += '...'
- else:
- reduced_text = ''
- return reduced_text
-
-def get_account_status(account):
- status = reduce_chars_newlines(account['status_line'], 100, 1)
- return status
-
def get_notification_icon_tooltip_dict():
'''returns a dict of the form {acct: {'show': show, 'message': message,
'event_lines': [list of text lines to show in tooltip]}'''
@@ -1094,38 +1207,6 @@
'show': status, 'message': message})
return accounts
-def get_avatar_path(prefix):
- '''Returns the filename of the avatar, distinguishes between user- and
- contact-provided one. Returns None if no avatar was found at all.
- prefix is the path to the requested avatar just before the ".png" or
- ".jpeg".'''
- # First, scan for a local, user-set avatar
- for type_ in ('jpeg', 'png'):
- file_ = prefix + '_local.' + type_
- if os.path.exists(file_):
- return file_
- # If none available, scan for a contact-provided avatar
- for type_ in ('jpeg', 'png'):
- file_ = prefix + '.' + type_
- if os.path.exists(file_):
- return file_
- return None
-
-def datetime_tuple(timestamp):
- '''Converts timestamp using strptime and the format: %Y%m%dT%H:%M:%S
- Because of various datetime formats are used the following exceptions
- are handled:
- - Optional milliseconds appened to the string are removed
- - Optional Z (that means UTC) appened to the string are removed
- - XEP-082 datetime strings have all '-' cahrs removed to meet
- the above format.'''
- timestamp = timestamp.split('.')[0]
- timestamp = timestamp.replace('-', '')
- timestamp = timestamp.replace('z', '')
- timestamp = timestamp.replace('Z', '')
- from time import strptime
- return strptime(timestamp, '%Y%m%dT%H:%M:%S')
-
def get_iconset_path(iconset):
if os.path.isdir(os.path.join(gajim.DATA_DIR, 'iconsets', iconset)):
return os.path.join(gajim.DATA_DIR, 'iconsets', iconset)
@@ -1187,75 +1268,6 @@
keyID = 'UNKNOWN'
return keyID
-def sort_identities_func(i1, i2):
- cat1 = i1['category']
- cat2 = i2['category']
- if cat1 < cat2:
- return -1
- if cat1 > cat2:
- return 1
- type1 = i1.get('type', '')
- type2 = i2.get('type', '')
- if type1 < type2:
- return -1
- if type1 > type2:
- return 1
- lang1 = i1.get('xml:lang', '')
- lang2 = i2.get('xml:lang', '')
- if lang1 < lang2:
- return -1
- if lang1 > lang2:
- return 1
- return 0
-
-def sort_dataforms_func(d1, d2):
- f1 = d1.getField('FORM_TYPE')
- f2 = d2.getField('FORM_TYPE')
- if f1 and f2 and (f1.getValue() < f2.getValue()):
- return -1
- return 1
-
-def compute_caps_hash(identities, features, dataforms=[], hash_method='sha-1'):
- '''Compute caps hash according to XEP-0115, V1.5
-
- dataforms are xmpp.DataForms objects as common.dataforms don't allow several
- values without a field type list-multi'''
- S = ''
- identities.sort(cmp=sort_identities_func)
- for i in identities:
- c = i['category']
- type_ = i.get('type', '')
- lang = i.get('xml:lang', '')
- name = i.get('name', '')
- S += '%s/%s/%s/%s<' % (c, type_, lang, name)
- features.sort()
- for f in features:
- S += '%s<' % f
- dataforms.sort(cmp=sort_dataforms_func)
- for dataform in dataforms:
- # fields indexed by var
- fields = {}
- for f in dataform.getChildren():
- fields[f.getVar()] = f
- form_type = fields.get('FORM_TYPE')
- if form_type:
- S += form_type.getValue() + '<'
- del fields['FORM_TYPE']
- vars = sorted(fields.keys())
- for var in vars:
- S += '%s<' % var
- values = sorted(fields[var].getValues())
- for value in values:
- S += '%s<' % value
-
- if hash_method == 'sha-1':
- hash = hash_sha1(S)
- elif hash_method == 'md5':
- hash = hash_md5(S)
- else:
- return ''
- return base64.b64encode(hash.digest())
-
def update_optional_features(account = None):
if account:
accounts = [account]
@@ -1290,4 +1302,12 @@
gajim.connections[a].change_status(gajim.SHOW_LIST[connected],
gajim.connections[a].status)
+def jid_is_blocked(account, jid):
+ return ((jid in gajim.connections[account].blocked_contacts) or \
+ gajim.connections[account].blocked_all)
+
+def group_is_blocked(account, group):
+ return ((group in gajim.connections[account].blocked_groups) or \
+ gajim.connections[account].blocked_all)
+
# vim: se ts=3:
Modified: branches/gajim_0.12/src/common/i18n.py
===================================================================
--- branches/gajim_0.12/src/common/i18n.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/i18n.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -24,12 +24,10 @@
import locale
import gettext
import os
+import defs
APP = 'gajim'
-if os.path.isdir('../po'):
- DIR = '../po'
-else:
- DIR = '../../locale'
+DIR = defs.localedir
# set '' so each part of the locale that should be modified is set
# according to the environment variables
Copied: branches/gajim_0.12/src/common/latex.py (from rev 10950, trunk/src/common/latex.py)
===================================================================
--- branches/gajim_0.12/src/common/latex.py (rev 0)
+++ branches/gajim_0.12/src/common/latex.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -0,0 +1,158 @@
+# -*- coding:utf-8 -*-
+## src/common/latex.py
+##
+## Copyright (C) 2005 Norman Rasmussen <norman AT rasmussen.co.za>
+## Copyright (C) 2005-2006 Alex Mauer <hawke AT hawkesnest.net>
+## Travis Shirk <travis AT pobox.com>
+## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com>
+## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org>
+## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com>
+## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org>
+## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org>
+## Julien Pivotto <roidelapluie AT gmail.com>
+## Stephan Erb <steve-e AT h3c.de>
+##
+## This file is part of Gajim.
+##
+## Gajim is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published
+## by the Free Software Foundation; version 3 only.
+##
+## Gajim is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
+##
+
+import os
+import random
+from tempfile import gettempdir
+from subprocess import Popen, PIPE
+
+import logging
+log = logging.getLogger('gajim.c.latex')
+
+import gajim
+from exceptions import LatexError
+import helpers
+
+# some latex commands are really bad
+blacklist = ['\\def', '\\let', '\\futurelet',
+ '\\newcommand', '\\renewcomment', '\\else', '\\fi', '\\write',
+ '\\input', '\\include', '\\chardef', '\\catcode', '\\makeatletter',
+ '\\noexpand', '\\toksdef', '\\every', '\\errhelp', '\\errorstopmode',
+ '\\scrollmode', '\\nonstopmode', '\\batchmode', '\\read', '\\csname',
+ '\\newhelp', '\\relax', '\\afterground', '\\afterassignment',
+ '\\expandafter', '\\noexpand', '\\special', '\\command', '\\loop',
+ '\\repeat', '\\toks', '\\output', '\\line', '\\mathcode', '\\name',
+ '\\item', '\\section', '\\mbox', '\\DeclareRobustCommand', '\\[',
+ '\\]']
+# True if the string matches the blacklist
+def check_blacklist(str_):
+ for word in blacklist:
+ if word in str_:
+ return True
+ return False
+
+def get_tmpfile_name():
+ random.seed()
+ int_ = random.randint(0, 100)
+ return os.path.join(gettempdir(), 'gajimtex_' + int_.__str__())
+
+def write_latex(filename, str_):
+ texstr = '\\documentclass[12pt]{article}\\usepackage[dvips]{graphicx}'
+ texstr += '\\usepackage{amsmath}\\usepackage{amssymb}'
+ texstr += '\\pagestyle{empty}'
+ texstr += '\\begin{document}\\begin{large}\\begin{gather*}'
+ texstr += str_
+ texstr += '\\end{gather*}\\end{large}\\end{document}'
+
+ file_ = open(filename, "w+")
+ file_.write(texstr)
+ file_.flush()
+ file_.close()
+
+# a wrapper for Popen so that no window gets opened on Windows
+# (i think this is the reason we're using Popen rather than just system())
+# stdout goes to a pipe so that it can be read
+def popen_nt_friendly(command):
+ if os.name == 'nt':
+ # CREATE_NO_WINDOW
+ return Popen(command, creationflags=0x08000000, cwd=gettempdir(), stdout=PIPE)
+ else:
+ return Popen(command, cwd=gettempdir(), stdout=PIPE)
+
+def check_for_latex_support():
+ '''check is latex is available and if it can create a picture.'''
+
+ try:
+ filename = latex_to_image("test")
+ if filename:
+ # we have a file, conversion succeeded
+ os.remove(filename)
+ return True
+ return False
+ except LatexError:
+ return False
+
+def latex_to_image(str_):
+ result = None
+ exitcode = 0
+
+ # filter latex code with bad commands
+ if check_blacklist(str_):
+ # we triggered the blacklist, immediately return None
+ return None
+
+ tmpfile = get_tmpfile_name()
+
+ # build latex string
+ write_latex(os.path.join(tmpfile + '.tex'), str_)
+
+ # convert TeX to dvi
+ try:
+ p = popen_nt_friendly(['latex', '--interaction=nonstopmode',
+ tmpfile + '.tex'])
+ out = p.communicate()[0]
+ log.info(out)
+ exitcode = p.wait()
+ except Exception, e:
+ exitcode = _('Error executing "%(command)s": %(error)s') % {
+ 'command': 'latex --interaction=nonstopmode %s.tex' % tmpfile,
+ 'error': helpers.decode_string(e.message)}
+
+ if exitcode == 0:
+ # convert dvi to png
+ latex_png_dpi = gajim.config.get('latex_png_dpi')
+ try:
+ p = popen_nt_friendly(['dvipng', '-bg', 'rgb 1.0 1.0 1.0', '-T',
+ 'tight', '-D', latex_png_dpi, tmpfile + '.dvi', '-o',
+ tmpfile + '.png'])
+ out = p.communicate()[0]
+ log.info(out)
+ exitcode = p.wait()
+ except Exception, e:
+ exitcode = _('Error executing "%(command)s": %(error)s') % {
+ 'command': 'dvipng -bg rgb 1.0 1.0 1.0 -T tight -D %s %s.dvi -o '
+ '%s.png' % (latex_png_dpi, tmpfile, tmpfile), 'error': str(e)}
+
+ # remove temp files created by us and TeX
+ extensions = ['.tex', '.log', '.aux', '.dvi']
+ for ext in extensions:
+ try:
+ os.remove(tmpfile + ext)
+ except Exception:
+ pass
+
+ if isinstance(exitcode, (unicode, str)):
+ raise LatexError(exitcode)
+
+ if exitcode == 0:
+ result = tmpfile + '.png'
+
+ return result
+
+# vim: se ts=3:
Modified: branches/gajim_0.12/src/common/optparser.py
===================================================================
--- branches/gajim_0.12/src/common/optparser.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/optparser.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -185,6 +185,8 @@
self.update_config_to_01143()
if old < [0, 11, 4, 4] and new >= [0, 11, 4, 4]:
self.update_config_to_01144()
+ if old < [0, 12, 1, 2] and new >= [0, 12, 1, 2]:
+ self.update_config_to_01212()
gajim.logger.init_vars()
gajim.config.set('version', new_version)
@@ -599,4 +601,13 @@
con.close()
gajim.config.set('version', '0.11.4.4')
+ def update_config_to_01212(self):
+ for opt in ('ignore_unknown_contacts', 'send_os_info',
+ 'log_encrypted_sessions'):
+ if opt in self.old_values:
+ val = self.old_values[opt]
+ for account in gajim.config.get_per('accounts'):
+ gajim.config.set_per('accounts', account, opt, val)
+ gajim.config.set('version', '0.12.1.2')
+
# vim: se ts=3:
Modified: branches/gajim_0.12/src/common/proxy65_manager.py
===================================================================
--- branches/gajim_0.12/src/common/proxy65_manager.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/proxy65_manager.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -23,6 +23,8 @@
import socket
import struct
import errno
+import logging
+log = logging.getLogger('gajim.c.proxy65_manager')
import common.xmpp
from common import gajim
@@ -105,21 +107,22 @@
self.port = int(port)
self.jid = unicode(jid)
self.state = S_RESOLVED
- #FIXME: re-enable proxy testing
- self.state = S_FINISHED
- return
+ log.info('start resolving %s:%s' % (self.host, self.port))
self.receiver_tester = ReceiverTester(self.host, self.port, self.jid,
self.sid, self.sender_jid, self._on_receiver_success,
self._on_connect_failure)
self.receiver_tester.connect()
def _on_receiver_success(self):
+ log.debug('Receiver successfully connected %s:%s' % (self.host,
+ self.port))
self.host_tester = HostTester(self.host, self.port, self.jid,
self.sid, self.sender_jid, self._on_connect_success,
self._on_connect_failure)
self.host_tester.connect()
def _on_connect_success(self):
+ log.debug('Host successfully connected %s:%s' % (self.host, self.port))
iq = common.xmpp.Protocol(name='iq', to=self.jid, typ='set')
query = iq.setTag('query')
query.setNamespace(common.xmpp.NS_BYTESTREAM)
@@ -129,13 +132,22 @@
activate.setData('test(a)gajim.org/test2')
if self.active_connection:
- self.active_connection.SendAndCallForResponse(iq, self.keep_conf)
+ log.debug('Activating bytestream on %s:%s' % (self.host, self.port))
+ self.active_connection.SendAndCallForResponse(iq,
+ self._result_received)
self.state = S_ACTIVATED
else:
self.state = S_INITIAL
- def keep_conf(self, data=None):
+ def _result_received(self, data):
self.disconnect(self.active_connection)
+ if data.getType() == 'result':
+ self.keep_conf()
+ else:
+ self._on_connect_failure()
+
+ def keep_conf(self):
+ log.debug('Bytestream activated %s:%s' % (self.host, self.port))
self.state = S_FINISHED
def _on_connect_failure(self):
@@ -269,7 +281,9 @@
data = self._get_request_buff(self._get_sha1_auth())
self.send_raw(data)
self.state += 1
+ log.debug('Host authenticating to %s:%s' % (self.host, self.port))
elif self.state == 3:
+ log.debug('Host authenticated to %s:%s' % (self.host, self.port))
self.on_success()
self.state += 1
@@ -277,6 +291,7 @@
try:
self._sock.connect((self.host, self.port))
self._sock.setblocking(False)
+ log.debug('Host Connecting to %s:%s' % (self.host, self.port))
self._send = self._sock.send
self._recv = self._sock.recv
except Exception, ee:
@@ -296,6 +311,7 @@
self._recv = self._sock.recv
self.buff = ''
self.state = 1 # connected
+ log.debug('Host connected to %s:%s' % (self.host, self.port))
self.idlequeue.plug_idle(self, True, False)
return
@@ -371,6 +387,7 @@
if version != 0x05 or method == 0xff:
self.pollend()
return
+ log.debug('Receiver authenticating to %s:%s' % (self.host, self.port))
data = self._get_request_buff(self._get_sha1_auth())
self.send_raw(data)
self.state += 1
@@ -382,13 +399,15 @@
if version != 0x05 or reply != 0x00:
self.pollend()
return
+ log.debug('Receiver authenticated to %s:%s' % (self.host, self.port))
self.on_success()
self.state += 1
def do_connect(self):
try:
+ self._sock.setblocking(False)
self._sock.connect((self.host, self.port))
- self._sock.setblocking(False)
+ log.debug('Receiver Connecting to %s:%s' % (self.host, self.port))
self._send = self._sock.send
self._recv = self._sock.recv
except Exception, ee:
@@ -408,7 +427,7 @@
self._recv = self._sock.recv
self.buff = ''
self.state = 1 # connected
+ log.debug('Receiver connected to %s:%s' % (self.host, self.port))
self.idlequeue.plug_idle(self, True, False)
- return
# vim: se ts=3:
Modified: branches/gajim_0.12/src/common/stanza_session.py
===================================================================
--- branches/gajim_0.12/src/common/stanza_session.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/stanza_session.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -351,7 +351,8 @@
return self.decrypter.decrypt(ciphertext)
def logging_preference(self):
- if gajim.config.get('log_encrypted_sessions'):
+ if gajim.config.get_per('accounts', self.conn.name,
+ 'log_encrypted_sessions'):
return ['may', 'mustnot']
else:
return ['mustnot', 'may']
Modified: branches/gajim_0.12/src/common/xmpp/auth_nb.py
===================================================================
--- branches/gajim_0.12/src/common/xmpp/auth_nb.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/xmpp/auth_nb.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -160,14 +160,18 @@
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','')])
+ sasl_data = u'%s\x00%s\x00%s' % (self.username + '@' + \
+ self._owner.Server, self.username, self.password)
+ asl_data = sasl_data.encode('utf-8').encode('base64').replace(
+ '\n','')
+ node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'},
+ payload=[sasl_data])
self.mechanism = "PLAIN"
else:
self.startsasl='failure'
self.DEBUG('I can only use DIGEST-MD5, GSSAPI and PLAIN mecanisms.', 'error')
+ if self.on_sasl:
+ self.on_sasl()
return
self.startsasl='in-process'
self._owner.send(node.__str__())
@@ -249,15 +253,15 @@
resp['qop'], HH(A2)]))
resp['response'] = response
resp['charset'] = 'utf-8'
- sasl_data=''
+ sasl_data = u''
for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', 'digest-uri', 'response', 'qop'):
if key in ['nc','qop','response','charset']:
- sasl_data += "%s=%s," % (key,resp[key])
+ sasl_data += u"%s=%s," % (key,resp[key])
else:
- sasl_data += '%s="%s",' % (key,resp[key])
-########################################3333
- node=Node('response', attrs={'xmlns':NS_SASL},
- payload=[base64.encodestring(sasl_data[:-1]).replace('\r','').replace('\n','')])
+ sasl_data += u'%s="%s",' % (key,resp[key])
+ sasl_data = sasl_data[:-1].encode('utf-8').encode('base64').replace(
+ '\r','').replace('\n','')
+ node = Node('response', attrs={'xmlns':NS_SASL}, payload=[sasl_data])
self._owner.send(node.__str__())
elif 'rspauth' in chal:
self._owner.send(Node('response', attrs={'xmlns':NS_SASL}).__str__())
Modified: branches/gajim_0.12/src/common/xmpp/dispatcher_nb.py
===================================================================
--- branches/gajim_0.12/src/common/xmpp/dispatcher_nb.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/xmpp/dispatcher_nb.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -374,31 +374,34 @@
if not res:
return
self._owner.remove_timeout()
- if self._expected[self._witid] is None:
- return
- if self._witid in self.on_responses:
- i = self._witid # copy id cause it can change in resp() call
- self._owner.onreceive(None)
- resp, args = self.on_responses[self._witid]
- del(self.on_responses[self._witid])
- if args is None:
- resp(self._expected[self._witid])
- else:
- resp(self._owner, self._expected[self._witid], **args)
- del self._expected[i]
+ for (_id, _iq) in self._expected.items():
+ if _iq is None:
+ # If the expected Stanza would have arrived, ProcessNonBlocking
+ # would have placed the reply stanza in there
+ continue
+ if _id in self.on_responses:
+ if len(self._expected) == 1:
+ self._owner.onreceive(None)
+ resp, args = self.on_responses[_id]
+ del self.on_responses[_id]
+ if args is None:
+ resp(_iq)
+ else:
+ resp(self._owner, _iq, **args)
+ del self._expected[_id]
def SendAndWaitForResponse(self, stanza, timeout=None, func=None, args=None):
''' Put stanza on the wire and wait for recipient's response to it. '''
if timeout is None:
timeout = DEFAULT_TIMEOUT_SECONDS
- self._witid = self.send(stanza)
+ _waitid = self.send(stanza)
if func:
- self.on_responses[self._witid] = (func, args)
+ self.on_responses[_waitid] = (func, args)
if timeout:
self._owner.set_timeout(timeout)
self._owner.onreceive(self.WaitForData)
- self._expected[self._witid] = None
- return self._witid
+ self._expected[_waitid] = None
+ return _waitid
def SendAndCallForResponse(self, stanza, func=None, args=None):
''' Put stanza on the wire and call back when recipient replies.
Modified: branches/gajim_0.12/src/common/xmpp/transports_nb.py
===================================================================
--- branches/gajim_0.12/src/common/xmpp/transports_nb.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/common/xmpp/transports_nb.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -466,7 +466,7 @@
errtxt = "Connection closed unexpectedly"
if errnum in (ERR_DISCONN, errno.ECONNRESET, errno.ENOTCONN, errno.ESHUTDOWN):
- log.error("Connection to %s lost: %s [%d]", self.getName(), errtxt, errnum)
+ log.info("Connection to %s lost: %s [%d]", self.getName(), errtxt, errnum)
self.printed_error = True
if not errors_only:
self.pollend(retry=(errnum in (ERR_DISCONN, errno.ECONNRESET)))
@@ -481,7 +481,7 @@
return
elif errnum != 0:
self.DEBUG(errtxt, 'error')
- log.error("Connection to %s lost: %s [%d]", self.getName(), errtxt, errnum)
+ log.info("Connection to %s lost: %s [%d]", self.getName(), errtxt, errnum)
self._owner.disconnected()
self.printed_error = True
if not errors_only and self.state >= 0:
Modified: branches/gajim_0.12/src/config.py
===================================================================
--- branches/gajim_0.12/src/config.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/config.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -486,20 +486,32 @@
self.xml.get_widget('log_show_changes_checkbutton').set_active(st)
# log encrypted chat sessions
- st = gajim.config.get('log_encrypted_sessions')
- self.xml.get_widget('log_encrypted_chats_checkbutton').set_active(st)
+ w = self.xml.get_widget('log_encrypted_chats_checkbutton')
+ st = self.get_per_account_option('log_encrypted_sessions')
+ if st == 'mixed':
+ w.set_inconsistent(True)
+ else:
+ w.set_active(st)
# send os info
- st = gajim.config.get('send_os_info')
- self.xml.get_widget('send_os_info_checkbutton').set_active(st)
+ w = self.xml.get_widget('send_os_info_checkbutton')
+ st = self.get_per_account_option('send_os_info')
+ if st == 'mixed':
+ w.set_inconsistent(True)
+ else:
+ w.set_active(st)
# check if gajm is default
st = gajim.config.get('check_if_gajim_is_default')
self.xml.get_widget('check_default_client_checkbutton').set_active(st)
# Ignore messages from unknown contacts
- self.xml.get_widget('ignore_events_from_unknown_contacts_checkbutton').\
- set_active(gajim.config.get('ignore_unknown_contacts'))
+ w = self.xml.get_widget('ignore_events_from_unknown_contacts_checkbutton')
+ st = self.get_per_account_option('ignore_unknown_contacts')
+ if st == 'mixed':
+ w.set_inconsistent(True)
+ else:
+ w.set_active(st)
self.xml.signal_autoconnect(self)
@@ -523,14 +535,36 @@
if event.keyval == gtk.keysyms.Escape:
self.window.hide()
+ def get_per_account_option(self, opt):
+ '''Return the value of the option opt if it's the same in all accoutns
+ else returns "mixed"'''
+ val = None
+ for account in gajim.connections:
+ v = gajim.config.get_per('accounts', account, opt)
+ if val is None:
+ val = v
+ elif val != v:
+ return 'mixed'
+ return val
+
def on_checkbutton_toggled(self, widget, config_name,
- change_sensitivity_widgets = None):
+ change_sensitivity_widgets=None):
gajim.config.set(config_name, widget.get_active())
if change_sensitivity_widgets:
for w in change_sensitivity_widgets:
w.set_sensitive(widget.get_active())
gajim.interface.save_config()
+ def on_per_account_checkbutton_toggled(self, widget, config_name,
+ change_sensitivity_widgets=None):
+ for account in gajim.connections:
+ gajim.config.set_per('accounts', account, config_name,
+ widget.get_active())
+ if change_sensitivity_widgets:
+ for w in change_sensitivity_widgets:
+ w.set_sensitive(widget.get_active())
+ gajim.interface.save_config()
+
def on_sort_by_show_in_roster_checkbutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'sort_by_show_in_roster')
gajim.interface.roster.setup_and_draw_roster()
@@ -621,7 +655,7 @@
spell_obj = None
if not spell_obj:
- gtkspell.Spell(ctrl.msg_textview)
+ ctrl.set_speller()
def remove_speller(self):
for acct in gajim.connections:
@@ -727,7 +761,8 @@
gajim.config.set('displayed_chat_state_notifications', 'disabled')
def on_ignore_events_from_unknown_contacts_checkbutton_toggled(self, widget):
- self.on_checkbutton_toggled(widget, 'ignore_unknown_contacts')
+ widget.set_inconsistent(False)
+ self.on_per_account_checkbutton_toggled(widget, 'ignore_unknown_contacts')
def on_on_event_combobox_changed(self, widget):
active = widget.get_active()
@@ -968,10 +1003,12 @@
self.on_checkbutton_toggled(widget, 'log_contact_status_changes')
def on_log_encrypted_chats_checkbutton_toggled(self, widget):
- self.on_checkbutton_toggled(widget, 'log_encrypted_sessions')
+ widget.set_inconsistent(False)
+ self.on_per_account_checkbutton_toggled(widget, 'log_encrypted_sessions')
def on_send_os_info_checkbutton_toggled(self, widget):
- self.on_checkbutton_toggled(widget, 'send_os_info')
+ widget.set_inconsistent(False)
+ self.on_per_account_checkbutton_toggled(widget, 'send_os_info')
def on_check_default_client_checkbutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'check_if_gajim_is_default')
@@ -1615,10 +1652,12 @@
custom_host = gajim.config.get_per('accounts', account, 'custom_host')
if not custom_host:
custom_host = gajim.config.get_per('accounts', account, 'hostname')
+ gajim.config.set_per('accounts', account, 'custom_host', custom_host)
self.xml.get_widget('custom_host_entry1').set_text(custom_host)
custom_port = gajim.config.get_per('accounts', account, 'custom_port')
if not custom_port:
custom_port = 5222
+ gajim.config.set_per('accounts', account, 'custom_port', custom_port)
self.xml.get_widget('custom_port_entry1').set_text(unicode(custom_port))
# Personal tab
@@ -1756,7 +1795,8 @@
# change account variable for chat / gc controls
gajim.interface.msg_win_mgr.change_account_name(old_name, new_name)
# upgrade account variable in opened windows
- for kind in ('infos', 'disco', 'gc_config', 'search'):
+ for kind in ('infos', 'disco', 'gc_config', 'search',
+ 'online_dialog'):
for j in gajim.interface.instances[new_name][kind]:
gajim.interface.instances[new_name][kind][j].account = \
new_name
@@ -2177,7 +2217,7 @@
self.init_account_gpg()
# update variables
gajim.interface.instances[gajim.ZEROCONF_ACC_NAME] = {'infos': {},
- 'disco': {}, 'gc_config': {}, 'search': {}}
+ 'disco': {}, 'gc_config': {}, 'search': {}, 'online_dialog': {}}
gajim.interface.minimized_controls[gajim.ZEROCONF_ACC_NAME] = {}
gajim.connections[gajim.ZEROCONF_ACC_NAME].connected = 0
gajim.groups[gajim.ZEROCONF_ACC_NAME] = {}
@@ -2406,6 +2446,8 @@
renderer = gtk.CellRendererText()
col = gtk.TreeViewColumn(_('JID'), renderer)
col.add_attribute(renderer, 'text', 0)
+ col.set_resizable(True)
+ col.set_sort_column_id(0)
self.affiliation_treeview[affiliation].append_column(col)
if affiliation == 'outcast':
@@ -2414,15 +2456,21 @@
renderer.connect('edited', self.on_cell_edited)
col = gtk.TreeViewColumn(_('Reason'), renderer)
col.add_attribute(renderer, 'text', 1)
+ col.set_resizable(True)
+ col.set_sort_column_id(1)
self.affiliation_treeview[affiliation].append_column(col)
elif affiliation == 'member':
renderer = gtk.CellRendererText()
col = gtk.TreeViewColumn(_('Nick'), renderer)
col.add_attribute(renderer, 'text', 2)
+ col.set_resizable(True)
+ col.set_sort_column_id(2)
self.affiliation_treeview[affiliation].append_column(col)
renderer = gtk.CellRendererText()
col = gtk.TreeViewColumn(_('Role'), renderer)
col.add_attribute(renderer, 'text', 3)
+ col.set_resizable(True)
+ col.set_sort_column_id(3)
self.affiliation_treeview[affiliation].append_column(col)
sw = gtk.ScrolledWindow()
@@ -3018,6 +3066,8 @@
# connection instance is saved in gajim.connections and we canceled the
# addition of the account
del gajim.connections[self.account]
+ if self.account in gajim.config.get_per('accounts'):
+ gajim.config.del_per('accounts', self.account)
del gajim.interface.instances['account_creation_wizard']
def on_register_server_features_button_clicked(self, widget):
@@ -3277,6 +3327,8 @@
if self.update_progressbar_timeout_id is not None:
gobject.source_remove(self.update_progressbar_timeout_id)
del gajim.connections[self.account]
+ if self.account in gajim.config.get_per('accounts'):
+ gajim.config.del_per('accounts', self.account)
self.back_button.show()
self.cancel_button.show()
self.go_online_checkbutton.hide()
@@ -3321,6 +3373,8 @@
self.go_online_checkbutton.hide()
self.show_vcard_checkbutton.hide()
del gajim.connections[self.account]
+ if self.account in gajim.config.get_per('accounts'):
+ gajim.config.del_per('accounts', self.account)
img = self.xml.get_widget('finish_image')
img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG)
finish_text = '<big><b>%s</b></big>\n\n%s' % (_('An error occurred during '
@@ -3432,7 +3486,7 @@
# update variables
gajim.interface.instances[self.account] = {'infos': {}, 'disco': {},
- 'gc_config': {}, 'search': {}}
+ 'gc_config': {}, 'search': {}, 'online_dialog': {}}
gajim.interface.minimized_controls[self.account] = {}
gajim.connections[self.account].connected = 0
gajim.connections[self.account].keepalives = gajim.config.get_per(
Modified: branches/gajim_0.12/src/conversation_textview.py
===================================================================
--- branches/gajim_0.12/src/conversation_textview.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/conversation_textview.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -27,9 +27,6 @@
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
##
-import random
-from tempfile import gettempdir
-from subprocess import Popen
from threading import Timer # for smooth scrolling
import gtk
@@ -45,6 +42,7 @@
import gtkgui_helpers
from common import gajim
from common import helpers
+from common import latex
from calendar import timegm
from common.fuzzyclock import FuzzyClock
@@ -623,6 +621,10 @@
# Check if we should hide the line tooltip
if not over_line:
self.line_tooltip.hide_tooltip()
+ if self.xep0184_warning_tooltip.timeout != 0:
+ # Check if we should hide the XEP-184 warning tooltip
+ if not xep0184_warning:
+ self.xep0184_warning_tooltip.hide_tooltip()
if over_line and not self.line_tooltip.win:
self.line_tooltip.timeout = gobject.timeout_add(500,
self.show_line_tooltip)
@@ -923,95 +925,6 @@
return index # the position after *last* special text
- def latex_to_image(self, str_):
- result = None
- exitcode = 0
-
- # some latex commands are really bad
- blacklist = ['\\def', '\\let', '\\futurelet',
- '\\newcommand', '\\renewcomment', '\\else', '\\fi', '\\write',
- '\\input', '\\include', '\\chardef', '\\catcode', '\\makeatletter',
- '\\noexpand', '\\toksdef', '\\every', '\\errhelp', '\\errorstopmode',
- '\\scrollmode', '\\nonstopmode', '\\batchmode', '\\read', '\\csname',
- '\\newhelp', '\\relax', '\\afterground', '\\afterassignment',
- '\\expandafter', '\\noexpand', '\\special', '\\command', '\\loop',
- '\\repeat', '\\toks', '\\output', '\\line', '\\mathcode', '\\name',
- '\\item', '\\section', '\\mbox', '\\DeclareRobustCommand', '\\[',
- '\\]']
-
- str_ = str_[2:len(str_)-2]
-
- # filter latex code with bad commands
- for word in blacklist:
- if word in str_:
- exitcode = 1
- break
-
- if exitcode == 0:
- random.seed()
- tmpfile = os.path.join(gettempdir(), 'gajimtex_' + random.randint(0,
- 100).__str__())
-
- # build latex string
- texstr = '\\documentclass[12pt]{article}\\usepackage[dvips]{graphicx}'
- texstr += '\\usepackage{amsmath}\\usepackage{amssymb}'
- texstr += '\\pagestyle{empty}'
- texstr += '\\begin{document}\\begin{large}\\begin{gather*}'
- texstr += str_
- texstr += '\\end{gather*}\\end{large}\\end{document}'
-
- file = open(os.path.join(tmpfile + '.tex'), 'w+')
- file.write(texstr)
- file.flush()
- file.close()
-
- try:
- if os.name == 'nt':
- # CREATE_NO_WINDOW
- p = Popen(['latex', '--interaction=nonstopmode',
- tmpfile + '.tex'], creationflags=0x08000000, cwd=gettempdir())
- else:
- p = Popen(['latex', '--interaction=nonstopmode',
- tmpfile + '.tex'], cwd=gettempdir())
- exitcode = p.wait()
- except Exception, e:
- exitcode = _('Error executing "%(command)s": %(error)s') % {
- 'command': 'latex --interaction=nonstopmode %s.tex' % tmpfile,
- 'error': str(e)}
-
- if exitcode == 0:
- latex_png_dpi = gajim.config.get('latex_png_dpi')
- try:
- if os.name == 'nt':
- # CREATE_NO_WINDOW
- p = Popen(['dvipng', '-bg', 'rgb 1.0 1.0 1.0', '-T', 'tight',
- '-D', latex_png_dpi, tmpfile + '.dvi', '-o',
- tmpfile + '.png'], creationflags=0x08000000, cwd=gettempdir())
- else:
- p = Popen(['dvipng', '-bg', 'rgb 1.0 1.0 1.0', '-T', 'tight',
- '-D', latex_png_dpi, tmpfile + '.dvi', '-o',
- tmpfile + '.png'], cwd=gettempdir())
- exitcode = p.wait()
- except Exception, e:
- exitcode = _('Error executing "%(command)s": %(error)s') % {
- 'command': 'dvipng -bg rgb 1.0 1.0 1.0 -T tight -D %s %s.dvi -o '
- '%s.png' % (latex_png_dpi, tmpfile, tmpfile), 'error': str(e)}
-
- extensions = ['.tex', '.log', '.aux', '.dvi']
- for ext in extensions:
- try:
- os.remove(tmpfile + ext)
- except Exception:
- pass
-
- if isinstance(exitcode, (unicode, str)):
- raise LatexError(exitcode)
-
- if exitcode == 0:
- result = tmpfile + '.png'
-
- return result
-
def print_special_text(self, special_text, other_tags):
'''is called by detect_and_print_special_text and prints
special text (emots, links, formatting)'''
@@ -1100,17 +1013,18 @@
else:
if not show_ascii_formatting_chars:
special_text = special_text[1:-1] # remove _ _
- elif special_text.startswith('$$') and special_text.endswith('$$'):
+ elif gajim.HAVE_LATEX and special_text.startswith('$$') and \
+ special_text.endswith('$$'):
try:
- imagepath = self.latex_to_image(special_text)
+ imagepath = latex.latex_to_image(special_text[2:-2])
except LatexError, e:
# print the error after the line has been written
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)
if imagepath is not None:
+ anchor = buffer.create_child_anchor(end_iter)
img = gtk.Image()
img.set_from_file(imagepath)
img.show()
@@ -1203,7 +1117,7 @@
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':
+ if kind in ('error', 'info'):
kind = 'status'
other_text_tag = self.detect_other_text_tag(text, kind)
text_tags = other_tags_for_text[:] # create a new list
Modified: branches/gajim_0.12/src/dialogs.py
===================================================================
--- branches/gajim_0.12/src/dialogs.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/dialogs.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -161,9 +161,6 @@
continue
groups[g] = 0
c_groups = contact.groups
- # FIXME: Move to backend
- if not c_groups:
- c_groups = [_('General')]
for g in c_groups:
groups[g] += 1
group_list = []
@@ -1648,6 +1645,9 @@
def on_deny_button_clicked(self, widget):
'''refuse the request'''
gajim.connections[self.account].refuse_authorization(self.jid)
+ contact = gajim.contacts.get_contact(self.account, self.jid)
+ if contact and _('Not in Roster') in contact.get_shown_groups():
+ gajim.interface.roster.remove_contact(self.jid, self.account)
self.window.destroy()
def on_actions_button_clicked(self, widget):
@@ -2199,12 +2199,11 @@
if gajim.config.get('use_speller') and HAS_GTK_SPELL and action == 'send':
try:
- spell1 = gtkspell.Spell(self.conversation_textview.tv)
- spell2 = gtkspell.Spell(self.message_textview)
lang = gajim.config.get('speller_language')
- if lang:
- spell1.set_language(lang)
- spell2.set_language(lang)
+ if not lang:
+ lang = gajim.LANG
+ gtkspell.Spell(self.conversation_textview.tv, lang)
+ gtkspell.Spell(self.message_textview, lang)
except gobject.GError, msg:
AspellDictError(lang)
Modified: branches/gajim_0.12/src/disco.py
===================================================================
--- branches/gajim_0.12/src/disco.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/disco.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -606,7 +606,8 @@
# self.browser._get_agent_address() would break when no browser.
addr = get_agent_address(self.jid, self.node)
- del gajim.interface.instances[self.account]['disco'][addr]
+ if addr in gajim.interface.instances[self.account]['disco']:
+ del gajim.interface.instances[self.account]['disco'][addr]
if self.browser:
self.window.hide()
Modified: branches/gajim_0.12/src/features_window.py
===================================================================
--- branches/gajim_0.12/src/features_window.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/features_window.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -33,10 +33,6 @@
from common import gajim
from common import helpers
-import random
-from tempfile import gettempdir
-from subprocess import Popen
-
class FeaturesWindow:
'''Class for features window'''
@@ -259,57 +255,8 @@
return sleepy.SUPPORTED
def latex_available(self):
- '''check is latex is available and if it can create a picture.'''
+ return gajim.HAVE_LATEX
- exitcode = 0
- random.seed()
- tmpfile = os.path.join(gettempdir(), "gajimtex_" + \
- random.randint(0,100).__str__())
-
- # build latex string
- texstr = '\\documentclass[12pt]{article}\\usepackage[dvips]{graphicx}'
- texstr += '\\usepackage{amsmath}\\usepackage{amssymb}\\pagestyle{empty}'
- 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()
- try:
- if os.name == 'nt':
- # CREATE_NO_WINDOW
- p = Popen(['latex', '--interaction=nonstopmode', tmpfile + '.tex'],
- creationflags=0x08000000, cwd=gettempdir())
- else:
- p = Popen(['latex', '--interaction=nonstopmode', tmpfile + '.tex'],
- cwd=gettempdir())
- exitcode = p.wait()
- except Exception:
- exitcode = 1
- if exitcode == 0:
- try:
- if os.name == 'nt':
- # CREATE_NO_WINDOW
- p = Popen(['dvipng', '-bg', 'white', '-T', 'tight',
- tmpfile + '.dvi', '-o', tmpfile + '.png'],
- creationflags=0x08000000, cwd=gettempdir())
- else:
- p = Popen(['dvipng', '-bg', 'white', '-T', 'tight',
- tmpfile + '.dvi', '-o', tmpfile + '.png'], cwd=gettempdir())
- exitcode = p.wait()
- except Exception:
- exitcode = 1
- extensions = ['.tex', '.log', '.aux', '.dvi', '.png']
- for ext in extensions:
- try:
- os.remove(tmpfile + ext)
- except Exception:
- pass
- if exitcode == 0:
- return True
- return False
-
def pycrypto_available(self):
from common import gajim
return gajim.HAVE_PYCRYPTO
Modified: branches/gajim_0.12/src/gajim-remote.py
===================================================================
--- branches/gajim_0.12/src/gajim-remote.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/gajim-remote.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding:utf-8 -*-
## src/gajim-remote.py
##
@@ -29,6 +28,7 @@
import sys
import locale
+import urllib
import signal
signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application
@@ -52,6 +52,8 @@
import dbus
import dbus.service
import dbus.glib
+ # test if dbus-x11 is installed
+ bus = dbus.SessionBus()
except Exception:
print str(exceptions.DbusNotSupported())
sys.exit(1)
@@ -521,6 +523,10 @@
self.command = sys.argv[1] = 'open_chat'
return
(jid, action) = uri.split('?', 1)
+ try:
+ jid = urllib.unquote(jid)
+ except UnicodeDecodeError:
+ pass
sys.argv[2] = jid
if action == 'join':
self.command = sys.argv[1] = 'join_room'
Property changes on: branches/gajim_0.12/src/gajim-remote.py
___________________________________________________________________
Deleted: svn:executable
- *
Modified: branches/gajim_0.12/src/gajim.py
===================================================================
--- branches/gajim_0.12/src/gajim.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/gajim.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding:utf-8 -*-
## src/gajim.py
##
@@ -150,6 +149,27 @@
common.configpaths.gajimpaths.init_profile(profile)
del profile
+if os.name == 'nt':
+ class MyStderr(object):
+ _file = None
+ _error = None
+ def write(self, text):
+ fname=os.path.join(common.configpaths.gajimpaths.root,
+ os.path.split(sys.executable)[1]+'.log')
+ if self._file is None and self._error is None:
+ try:
+ self._file = open(fname, 'a')
+ except Exception, details:
+ self._error = details
+ if self._file is not None:
+ self._file.write(text)
+ self._file.flush()
+ def flush(self):
+ if self._file is not None:
+ self._file.flush()
+
+ sys.stderr = MyStderr()
+
# PyGTK2.10+ only throws a warning
import warnings
warnings.filterwarnings('error', module='gtk')
@@ -503,10 +523,19 @@
self.complete(None)
def _ok(passphrase, checked, count):
- if gajim.connections[account].test_gpg_passphrase(passphrase):
+ result = gajim.connections[account].test_gpg_passphrase(passphrase)
+ if result == 'ok':
# passphrase is good
self.complete(passphrase)
return
+ elif result == 'expired':
+ dialogs.ErrorDialog(_('GPG key expired'),
+ _('Your GPG key has expied, you will be connected to %s without '
+ 'OpenPGP.') % account)
+ # Don't try to connect with GPG
+ gajim.connections[account].continue_connect_info[2] = False
+ self.complete(None)
+ return
if count < 3:
# ask again
@@ -634,6 +663,12 @@
def handle_event_status(self, account, status): # OUR status
#('STATUS', account, status)
model = self.roster.status_combobox.get_model()
+ if status in ('offline', 'error'):
+ for name in self.instances[account]['online_dialog'].keys():
+ # .keys() is needed to not have a dictionary length changed during
+ # iteration error
+ self.instances[account]['online_dialog'][name].destroy()
+ del self.instances[account]['online_dialog'][name]
if status == 'offline':
# sensitivity for this menuitem
if gajim.get_number_of_connected_accounts() == 0:
@@ -666,7 +701,8 @@
ctrl.parent_win.redraw_tab(ctrl)
self.roster.on_status_changed(account, status)
- if account in self.show_vcard_when_connect:
+ if account in self.show_vcard_when_connect and status not in ('offline',
+ 'error'):
self.edit_own_details(account)
if self.remote_ctrl:
self.remote_ctrl.raise_signal('AccountPresence', (status, account))
@@ -786,6 +822,14 @@
self.roster.draw_contact(contact1.jid, account)
gobject.timeout_add_seconds(5, self.roster.remove_to_be_removed,
contact1.jid, account)
+
+ # unset custom status
+ if (old_show == 0 and new_show > 1) or (old_show > 1 and new_show == 0\
+ and conn.connected > 1):
+ if account in self.status_sent_to_users and \
+ jid in self.status_sent_to_users[account]:
+ del self.status_sent_to_users[account][jid]
+
contact1.show = array[1]
contact1.status = status_message
contact1.priority = priority
@@ -962,10 +1006,26 @@
def handle_event_subscribe(self, account, array):
#('SUBSCRIBE', account, (jid, text, user_nick)) user_nick is JEP-0172
- dialogs.SubscriptionRequestWindow(array[0], array[1], account, array[2])
if self.remote_ctrl:
self.remote_ctrl.raise_signal('Subscribe', (account, array))
+ jid = array[0]
+ text = array[1]
+ nick = array[2]
+ if helpers.allow_popup_window(account) or not self.systray_enabled:
+ dialogs.SubscriptionRequestWindow(jid, text, account, nick)
+ return
+
+ self.add_event(account, jid, 'subscription_request', (text, nick))
+
+ if helpers.allow_showing_notification(account):
+ path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
+ 'subscription_request.png')
+ path = gtkgui_helpers.get_path_to_generic_or_avatar(path)
+ event_type = _('Subscription request')
+ notify.popup(event_type, jid, account, 'subscription_request', path,
+ event_type, jid)
+
def handle_event_subscribed(self, account, array):
#('SUBSCRIBED', account, (jid, resource))
jid = array[0]
@@ -995,7 +1055,20 @@
if self.remote_ctrl:
self.remote_ctrl.raise_signal('Subscribed', (account, array))
+ def show_unsubscribed_dialog(self, account, contact):
+ def on_yes(is_checked, list_):
+ self.roster.on_req_usub(None, list_)
+ list_ = [(contact, account)]
+ dialogs.YesNoDialog(
+ _('Contact "%s" removed subscription from you') % contact.jid,
+ _('You will always see him or her as offline.\nDo you want to '
+ 'remove him or her from your contact list?'),
+ on_response_yes=(on_yes, list_))
+ # FIXME: Per RFC 3921, we can "deny" ack as well, but the GUI does
+ # not show deny
+
def handle_event_unsubscribed(self, account, jid):
+ #('UNSUBSCRIBED', account, jid)
gajim.connections[account].ack_unsubscribed(jid)
if self.remote_ctrl:
self.remote_ctrl.raise_signal('Unsubscribed', (account, jid))
@@ -1003,15 +1076,20 @@
contact = gajim.contacts.get_first_contact_from_jid(account, jid)
if not contact:
return
- def on_yes(is_checked, list_):
- self.roster.on_req_usub(None, list_)
- list_ = [(contact, account)]
- dialogs.YesNoDialog(
- _('Contact "%s" removed subscription from you') % jid,
- _('You will always see him or her as offline.\nDo you want to remove him or her from your contact list?'),
- on_response_yes=(on_yes, list_))
- # FIXME: Per RFC 3921, we can "deny" ack as well, but the GUI does not show deny
+ if helpers.allow_popup_window(account) or not self.systray_enabled:
+ self.show_unsubscribed_dialog(account, contact)
+
+ self.add_event(account, jid, 'unsubscribed', contact)
+
+ if helpers.allow_showing_notification(account):
+ path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
+ 'unsubscribed.png')
+ path = gtkgui_helpers.get_path_to_generic_or_avatar(path)
+ event_type = _('Unsubscribed')
+ notify.popup(event_type, jid, account, 'unsubscribed', path,
+ event_type, jid)
+
def handle_event_agent_info_error(self, account, agent):
#('AGENT_ERROR_INFO', account, (agent))
try:
@@ -1260,6 +1338,8 @@
jids = array[0].split('/', 1)
room_jid = jids[0]
+ msg = array[1]
+
gc_control = self.msg_win_mgr.get_gc_control(room_jid, account)
if not gc_control and \
room_jid in self.minimized_controls[account]:
@@ -1278,9 +1358,11 @@
# message from someone
nick = jids[1]
- gc_control.on_message(nick, array[1], array[2], array[3], xhtml, array[5])
+ gc_control.on_message(nick, msg, array[2], array[3], xhtml, array[5])
if self.remote_ctrl:
+ highlight = gc_control.needs_visual_notification(msg)
+ array += (highlight,)
self.remote_ctrl.raise_signal('GCMessage', (account, array))
def handle_event_gc_subject(self, account, array):
@@ -1475,6 +1557,20 @@
self.gpg_passphrase[keyid] = request
request.add_callback(account, callback)
+ def handle_event_gpg_always_trust(self, account, callback):
+ #('GPG_ALWAYS_TRUST', account, callback)
+ def on_yes(checked):
+ if checked:
+ gajim.connections[account].gpg.always_trust = True
+ callback(True)
+
+ def on_no():
+ callback(False)
+
+ dialogs.YesNoDialog(_('GPG key not trusted'), _('The GPG key used to '
+ 'encrypt this chat is not trusted. Do you really want to encrypt this '
+ 'message?'), checktext=_('Do _not ask me again'),
+ on_response_yes=on_yes, on_response_no=on_no)
def handle_event_roster_info(self, account, array):
#('ROSTER_INFO', account, (jid, name, sub, ask, groups))
jid = array[0]
@@ -1499,7 +1595,7 @@
self.roster.add_contact(jid, account)
else:
# it is an existing contact that might has changed
- re_draw = False
+ re_place = False
# If contact has changed (sub, ask or group) update roster
# Mind about observer status changes:
# According to xep 0162, a contact is not an observer anymore when
@@ -1507,8 +1603,7 @@
old_groups = contacts[0].groups
if contacts[0].sub != sub or contacts[0].ask != ask\
or old_groups != groups:
- re_draw = True
- if re_draw:
+ re_place = True
# c.get_shown_groups() has changed. Reflect that in roster_winodow
self.roster.remove_contact(jid, account, force=True)
for contact in contacts:
@@ -1516,11 +1611,13 @@
contact.sub = sub
contact.ask = ask
contact.groups = groups or []
- if re_draw:
+ if re_place:
self.roster.add_contact(jid, account)
# Refilter and update old groups
for group in old_groups:
self.roster.draw_group(group, account)
+ else:
+ self.roster.draw_contact(jid, account)
if self.remote_ctrl:
self.remote_ctrl.raise_signal('RosterInfo', (account, array))
@@ -1853,7 +1950,7 @@
self.instances[account]['privacy_lists'].privacy_lists_received(data)
def handle_event_privacy_list_received(self, account, data):
- # ('PRIVACY_LISTS_RECEIVED', account, (name, rules))
+ # ('PRIVACY_LIST_RECEIVED', account, (name, rules))
if account not in self.instances:
return
name = data[0]
@@ -1865,10 +1962,13 @@
gajim.connections[account].blocked_contacts = []
gajim.connections[account].blocked_groups = []
gajim.connections[account].blocked_list = []
+ gajim.connections[account].blocked_all = False
for rule in rules:
- if rule['type'] == 'jid' and rule['action'] == 'deny':
+ if not 'type' in rule:
+ gajim.connections[account].blocked_all = True
+ elif rule['type'] == 'jid' and rule['action'] == 'deny':
gajim.connections[account].blocked_contacts.append(rule['value'])
- if rule['type'] == 'group' and rule['action'] == 'deny':
+ elif rule['type'] == 'group' and rule['action'] == 'deny':
gajim.connections[account].blocked_groups.append(rule['value'])
gajim.connections[account].blocked_list.append(rule)
#elif rule['type'] == "group" and action == "deny":
@@ -1992,6 +2092,7 @@
server = gajim.config.get_per('accounts', account, 'hostname')
def on_ok(is_checked):
+ del self.instances[account]['online_dialog']['ssl_error']
if is_checked[0]:
# Check if cert is already in file
certs = ''
@@ -2018,6 +2119,7 @@
gajim.connections[account].ssl_certificate_accepted()
def on_cancel():
+ del self.instances[account]['online_dialog']['ssl_error']
gajim.connections[account].disconnect(on_purpose=True)
self.handle_event_status(account, 'offline')
@@ -2028,27 +2130,36 @@
else:
checktext1 = ''
checktext2 = _('Ignore this error for this certificate.')
- dialogs.ConfirmationDialogDubbleCheck(pritext, sectext, checktext1,
+ if 'ssl_error' in self.instances[account]['online_dialog']:
+ self.instances[account]['online_dialog']['ssl_error'].destroy()
+ self.instances[account]['online_dialog']['ssl_error'] = \
+ dialogs.ConfirmationDialogDubbleCheck(pritext, sectext, checktext1,
checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel)
def handle_event_fingerprint_error(self, account, data):
# ('FINGERPRINT_ERROR', account, (new_fingerprint,))
def on_yes(is_checked):
+ del self.instances[account]['online_dialog']['fingerprint_error']
gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha1',
data[0])
# Reset the ignored ssl errors
gajim.config.set_per('accounts', account, 'ignore_ssl_errors', '')
gajim.connections[account].ssl_certificate_accepted()
def on_no():
+ del self.instances[account]['online_dialog']['fingerprint_error']
gajim.connections[account].disconnect(on_purpose=True)
self.handle_event_status(account, 'offline')
pritext = _('SSL certificate error')
- sectext = _('It seems the SSL certificate has changed or your connection '
- 'is being hacked.\nOld fingerprint: %(old)s\nNew fingerprint: %(new)s'
- '\n\nDo you still want to connect and update the fingerprint of the '
- 'certificate?') % {'old': gajim.config.get_per('accounts', account,
+ sectext = _('It seems the SSL certificate of account %(account)s has '
+ 'changed or your connection is being hacked.\nOld fingerprint: %(old)s'
+ '\nNew fingerprint: %(new)s\n\nDo you still want to connect and update'
+ ' the fingerprint of the certificate?') % {'account': account,
+ 'old': gajim.config.get_per('accounts', account,
'ssl_fingerprint_sha1'), 'new': data[0]}
- dialog = dialogs.YesNoDialog(pritext, sectext, on_response_yes=on_yes,
+ if 'fingerprint_error' in self.instances[account]['online_dialog']:
+ self.instances[account]['online_dialog']['fingerprint_error'].destroy()
+ self.instances[account]['online_dialog']['fingerprint_error'] = \
+ dialogs.YesNoDialog(pritext, sectext, on_response_yes=on_yes,
on_response_no=on_no)
def handle_event_plain_connection(self, account, data):
@@ -2058,11 +2169,15 @@
if not is_checked[0]:
on_cancel()
return
+ # On cancel call del self.instances, so don't call it another time
+ # before
+ del self.instances[account]['online_dialog']['plain_connection']
if is_checked[1]:
gajim.config.set_per('accounts', account,
'warn_when_plaintext_connection', False)
gajim.connections[account].connection_accepted(data[0], 'tcp')
def on_cancel():
+ del self.instances[account]['online_dialog']['plain_connection']
gajim.connections[account].disconnect(on_purpose=True)
self.handle_event_status(account, 'offline')
pritext = _('Insecure connection')
@@ -2070,7 +2185,10 @@
'connection. Are you sure you want to do that?')
checktext1 = _('Yes, I really want to connect insecurely')
checktext2 = _('Do _not ask me again')
- dialog = dialogs.ConfirmationDialogDubbleCheck(pritext, sectext,
+ if 'plain_connection' in self.instances[account]['online_dialog']:
+ self.instances[account]['online_dialog']['plain_connection'].destroy()
+ self.instances[account]['online_dialog']['plain_connection'] = \
+ dialogs.ConfirmationDialogDubbleCheck(pritext, sectext,
checktext1, checktext2, on_response_ok=on_ok,
on_response_cancel=on_cancel, is_modal=False)
@@ -2078,6 +2196,7 @@
# ('INSECURE_SSL_CONNECTION', account, (connection, connection_type))
server = gajim.config.get_per('accounts', account, 'hostname')
def on_ok(is_checked):
+ del self.instances[account]['online_dialog']['insecure_ssl']
if not is_checked[0]:
on_cancel()
return
@@ -2093,6 +2212,7 @@
return
gajim.connections[account].connection_accepted(data[0], data[1])
def on_cancel():
+ del self.instances[account]['online_dialog']['insecure_ssl']
gajim.connections[account].disconnect(on_purpose=True)
self.handle_event_status(account, 'offline')
pritext = _('Insecure connection')
@@ -2100,7 +2220,10 @@
'connection. You should install PyOpenSSL to prevent that. Are you sure you want to do that?')
checktext1 = _('Yes, I really want to connect insecurely')
checktext2 = _('Do _not ask me again')
- dialog = dialogs.ConfirmationDialogDubbleCheck(pritext, sectext,
+ if 'insecure_ssl' in self.instances[account]['online_dialog']:
+ self.instances[account]['online_dialog']['insecure_ssl'].destroy()
+ self.instances[account]['online_dialog']['insecure_ssl'] = \
+ dialogs.ConfirmationDialogDubbleCheck(pritext, sectext,
checktext1, checktext2, on_response_ok=on_ok,
on_response_cancel=on_cancel, is_modal=False)
@@ -2191,6 +2314,7 @@
self.handle_event_unique_room_id_unsupported,
'UNIQUE_ROOM_ID_SUPPORTED': self.handle_event_unique_room_id_supported,
'GPG_PASSWORD_REQUIRED': self.handle_event_gpg_password_required,
+ 'GPG_ALWAYS_TRUST': self.handle_event_gpg_always_trust,
'SSL_ERROR': self.handle_event_ssl_error,
'FINGERPRINT_ERROR': self.handle_event_fingerprint_error,
'PLAIN_CONNECTION': self.handle_event_plain_connection,
@@ -2219,8 +2343,8 @@
show_in_roster = notify.get_show_in_roster(event_type, account, jid)
show_in_systray = notify.get_show_in_systray(event_type, account, jid)
event = gajim.events.create_event(type_, event_args,
- show_in_roster = show_in_roster,
- show_in_systray = show_in_systray)
+ show_in_roster=show_in_roster,
+ show_in_systray=show_in_systray)
gajim.events.add_event(account, jid, event)
self.roster.show_title()
@@ -2352,6 +2476,18 @@
data[1], data[3])
gajim.events.remove_events(account, jid, event)
self.roster.draw_contact(jid, account)
+ elif type_ == 'subscription_request':
+ event = gajim.events.get_first_event(account, jid, type_)
+ data = event.parameters
+ dialogs.SubscriptionRequestWindow(jid, data[0], account, data[1])
+ gajim.events.remove_events(account, jid, event)
+ self.roster.draw_contact(jid, account)
+ elif type_ == 'unsubscribed':
+ event = gajim.events.get_first_event(account, jid, type_)
+ contact = event.parameters
+ self.show_unsubscribed_dialog(account, contact)
+ gajim.events.remove_events(account, jid, event)
+ self.roster.draw_contact(jid, account)
if w:
w.set_active_tab(ctrl)
w.window.window.focus()
@@ -2802,18 +2938,18 @@
state = self.sleeper.getState()
for account in gajim.connections:
if account not in gajim.sleeper_state or \
- not gajim.sleeper_state[account]:
+ not gajim.sleeper_state[account]:
continue
if state == common.sleepy.STATE_AWAKE and \
- gajim.sleeper_state[account] in ('autoaway', 'autoxa'):
+ gajim.sleeper_state[account] in ('autoaway', 'autoxa'):
# we go online
self.roster.send_status(account, 'online',
gajim.status_before_autoaway[account])
gajim.status_before_autoaway[account] = ''
gajim.sleeper_state[account] = 'online'
elif state == common.sleepy.STATE_AWAY and \
- gajim.sleeper_state[account] == 'online' and \
- gajim.config.get('autoaway'):
+ gajim.sleeper_state[account] == 'online' and \
+ gajim.config.get('autoaway'):
# we save out online status
gajim.status_before_autoaway[account] = \
gajim.connections[account].status
@@ -2830,10 +2966,9 @@
}
self.roster.send_status(account, 'away', auto_message, auto=True)
gajim.sleeper_state[account] = 'autoaway'
- elif state == common.sleepy.STATE_XA and (\
- gajim.sleeper_state[account] == 'autoaway' or \
- gajim.sleeper_state[account] == 'online') and \
- gajim.config.get('autoxa'):
+ elif state == common.sleepy.STATE_XA and \
+ gajim.sleeper_state[account] in ('online', 'autoaway',
+ 'autoaway-forced') and gajim.config.get('autoxa'):
# we go extended away [we pass True to auto param]
auto_message = gajim.config.get('autoxa_message')
if not auto_message:
@@ -3176,7 +3311,9 @@
for a in gajim.connections:
self.instances[a] = {'infos': {}, 'disco': {}, 'gc_config': {},
- 'search': {}}
+ 'search': {}, 'online_dialog': {}}
+ # online_dialog contains all dialogs that have a meaning only when we
+ # are not disconnected
self.minimized_controls[a] = {}
gajim.contacts.add_account(a)
gajim.groups[a] = {}
@@ -3205,6 +3342,13 @@
if dbus_support.supported:
def gnome_screensaver_ActiveChanged_cb(active):
if not active:
+ for account in gajim.connections:
+ if gajim.sleeper_state[account] == 'autoaway-forced':
+ # We came back online ofter gnome-screensaver autoaway
+ self.roster.send_status(account, 'online',
+ gajim.status_before_autoaway[account])
+ gajim.status_before_autoaway[account] = ''
+ gajim.sleeper_state[account] = 'online'
return
if not gajim.config.get('autoaway'):
# Don't go auto away if user disabled the option
@@ -3221,9 +3365,16 @@
auto_message = gajim.config.get('autoaway_message')
if not auto_message:
auto_message = gajim.connections[account].status
+ else:
+ auto_message = auto_message.replace('$S','%(status)s')
+ auto_message = auto_message.replace('$T','%(time)s')
+ auto_message = auto_message % {
+ 'status': gajim.status_before_autoaway[account],
+ 'time': gajim.config.get('autoxatime')
+ }
self.roster.send_status(account, 'away', auto_message,
auto=True)
- gajim.sleeper_state[account] = 'autoaway'
+ gajim.sleeper_state[account] = 'autoaway-forced'
try:
bus = dbus.SessionBus()
Property changes on: branches/gajim_0.12/src/gajim.py
___________________________________________________________________
Deleted: executable
- 1
Deleted: svn:executable
- *
Modified: branches/gajim_0.12/src/groupchat_control.py
===================================================================
--- branches/gajim_0.12/src/groupchat_control.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/groupchat_control.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -1059,8 +1059,8 @@
color = gtkgui_helpers._get_fade_color(self.list_treeview,
selected, focus)
colorstring = "#%04x%04x%04x" % (color.red, color.green, color.blue)
- name += '\n' '<span size="small" style="italic" foreground="%s">%s</span>'\
- % (colorstring, gobject.markup_escape_text(status))
+ 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
@@ -1774,7 +1774,8 @@
def shutdown(self, status='offline'):
# destroy banner tooltip - bug #pygtk for that!
self.subject_tooltip.destroy()
- if gajim.gc_connected[self.account][self.room_jid]:
+ if self.room_jid in gajim.gc_connected[self.account] and \
+ gajim.gc_connected[self.account][self.room_jid]:
# Tell connection to note the date we disconnect to avoid duplicate
# logs. We do it only when connected because if connection was lost
# there may be new messages since disconnection.
Modified: branches/gajim_0.12/src/gtkgui_helpers.py
===================================================================
--- branches/gajim_0.12/src/gtkgui_helpers.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/gtkgui_helpers.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -61,7 +61,7 @@
screen_w = gtk.gdk.screen_width()
screen_h = gtk.gdk.screen_height()
-GLADE_DIR = os.path.join('..', 'data', 'glade')
+GLADE_DIR = os.path.join(gajim.DATA_DIR, 'glade')
def get_glade(file_name, root = None):
file_path = os.path.join(GLADE_DIR, file_name)
return gtk.glade.XML(file_path, root=root, domain=i18n.APP)
Modified: branches/gajim_0.12/src/history_manager.py
===================================================================
--- branches/gajim_0.12/src/history_manager.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/history_manager.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding:utf-8 -*-
## src/history_manager.py
##
Property changes on: branches/gajim_0.12/src/history_manager.py
___________________________________________________________________
Deleted: svn:executable
- *
Modified: branches/gajim_0.12/src/htmltextview.py
===================================================================
--- branches/gajim_0.12/src/htmltextview.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/htmltextview.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -347,27 +347,28 @@
callback(frac, *args)
return
- val = float(value[:-2])
- sign = cmp(val,0)
- # validate length
- val = sign*max(minl,min(abs(val*display_resolution),maxl))
+ def get_val():
+ val = float(value[:-2])
+ sign = cmp(val,0)
+ # validate length
+ return sign*max(minl,min(abs(val*display_resolution),maxl))
if value.endswith('pt'): # points
- callback(val*display_resolution, *args)
+ callback(get_val()*display_resolution, *args)
elif value.endswith('em'): # ems, the width of the element's font
attrs = self._get_current_attributes()
font_size = attrs.font.get_size() / pango.SCALE
- callback(val*display_resolution*font_size, *args)
+ callback(get_val()*display_resolution*font_size, *args)
elif value.endswith('ex'): # x-height, ~ the height of the letter 'x'
# FIXME: figure out how to calculate this correctly
# for now 'em' size is used as approximation
attrs = self._get_current_attributes()
font_size = attrs.font.get_size() / pango.SCALE
- callback(val*display_resolution*font_size, *args)
+ callback(get_val()*display_resolution*font_size, *args)
elif value.endswith('px'): # pixels
- callback(val, *args)
+ callback(get_val(), *args)
else:
try:
Modified: branches/gajim_0.12/src/message_window.py
===================================================================
--- branches/gajim_0.12/src/message_window.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/message_window.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -493,7 +493,8 @@
bctrl = self.get_control(jid, ctrl.account)
# keep last_message_time around unless this was our last control with
# that jid
- if not fctrl and not bctrl:
+ if not fctrl and not bctrl and \
+ fjid in gajim.last_message_time[ctrl.account]:
del gajim.last_message_time[ctrl.account][fjid]
# Disconnect tab DnD only if GTK version < 2.10
@@ -995,8 +996,11 @@
# Position and size window based on saved state and window mode
if not self.one_window_opened(contact, acct, type_):
- self._resize_window(win, acct, type_)
- self._position_window(win, acct, type_)
+ if gajim.config.get('msgwin-max-state'):
+ win.window.maximize()
+ else:
+ self._resize_window(win, acct, type_)
+ self._position_window(win, acct, type_)
self._windows[win_key] = win
return win
@@ -1068,6 +1072,7 @@
def save_state(self, msg_win, width_adjust=0):
# Save window size and position
+ max_win_key = 'msgwin-max-state'
pos_x_key = 'msgwin-x-position'
pos_y_key = 'msgwin-y-position'
size_width_key = 'msgwin-width'
@@ -1106,6 +1111,9 @@
gajim.config.set_per('accounts', acct, pos_y_key, y)
else:
+ win_maximized = msg_win.window.window.get_state() == \
+ gtk.gdk.WINDOW_STATE_MAXIMIZED
+ gajim.config.set(max_win_key, win_maximized)
width += width_adjust
gajim.config.set(size_width_key, width)
gajim.config.set(size_height_key, height)
Modified: branches/gajim_0.12/src/music_track_listener.py
===================================================================
--- branches/gajim_0.12/src/music_track_listener.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/music_track_listener.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -98,6 +98,15 @@
'NameOwnerChanged', 'org.freedesktop.DBus',
arg0='net.sacredchao.QuodLibet')
+ ## Totem
+ ## patched by Lucky <lucky1.data(a)gmail.com>
+ ## used with Totem DBus plugin:
+ ## http://lucky.awardspace.co.uk/home/totem-plugins
+ bus.add_signal_receiver(self._totem_playing_started_cb,
+ 'playingStarted', 'org.gnome.Totem')
+ bus.add_signal_receiver(self._totem_playing_stopped_cb,
+ 'playingStopped', 'org.gnome.Totem')
+
def _player_name_owner_changed(self, name, old, new):
if not new:
self.emit('music-track-changed', None)
@@ -196,6 +205,17 @@
info.duration = int(props.get('~#length', 0))
return info
+ def _totem_playing_started_cb(self, title, album, artist, duration):
+ self._last_playing_music = MusicTrackInfo()
+ self._last_playing_music.title = title
+ self._last_playing_music.album = album
+ self._last_playing_music.artist = artist
+ self._last_playing_music.duration = duration
+ self.emit('music-track-changed', self._last_playing_music)
+
+ def _totem_playing_stopped_cb(self):
+ self.emit('music-track-changed', None)
+
def get_playing_track(self):
'''Return a MusicTrackInfo for the currently playing
song, or None if no song is playing'''
Modified: branches/gajim_0.12/src/network_manager_listener.py
===================================================================
--- branches/gajim_0.12/src/network_manager_listener.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/network_manager_listener.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -25,17 +25,32 @@
from common import gajim
def device_now_active(self, *args):
+ '''For Network Manager 0.6'''
for connection in gajim.connections.itervalues():
if gajim.config.get_per('accounts', connection.name,
'listen_to_network_manager') and connection.time_to_reconnect:
connection._reconnect()
def device_no_longer_active(self, *args):
+ '''For Network Manager 0.6'''
for connection in gajim.connections.itervalues():
if gajim.config.get_per('accounts', connection.name,
'listen_to_network_manager') and connection.connected > 1:
connection._disconnectedReconnCB()
+def state_changed(state):
+ '''For Network Manager 0.7'''
+ if props.Get("org.freedesktop.NetworkManager", "State") == 3:
+ for connection in gajim.connections.itervalues():
+ if gajim.config.get_per('accounts', connection.name,
+ 'listen_to_network_manager') and connection.time_to_reconnect:
+ connection._reconnect()
+ else:
+ for connection in gajim.connections.itervalues():
+ if gajim.config.get_per('accounts', connection.name,
+ 'listen_to_network_manager') and connection.connected > 1:
+ connection._disconnectedReconnCB()
+
supported = False
if sys.platform == 'darwin':
@@ -44,22 +59,36 @@
try:
from common.dbus_support import system_bus
- bus = system_bus.SystemBus()
+ bus = system_bus.bus()
if 'org.freedesktop.NetworkManager' in bus.list_names():
+ nm_object = bus.get_object('org.freedesktop.NetworkManager',
+ '/org/freedesktop/NetworkManager')
+ props = dbus.Interface(nm_object,"org.freedesktop.DBus.Properties")
+ bus.add_signal_receiver(state_changed,
+ 'StateChanged',
+ 'org.freedesktop.NetworkManager',
+ 'org.freedesktop.NetworkManager',
+ '/org/freedesktop/NetworkManager')
supported = True
- bus.add_signal_receiver(device_no_longer_active,
- 'DeviceNoLongerActive',
- 'org.freedesktop.NetworkManager',
- 'org.freedesktop.NetworkManager',
- '/org/freedesktop/NetworkManager')
- bus.add_signal_receiver(device_now_active,
- 'DeviceNowActive',
- 'org.freedesktop.NetworkManager',
- 'org.freedesktop.NetworkManager',
- '/org/freedesktop/NetworkManager')
except Exception:
- pass
+ try:
+ if 'org.freedesktop.NetworkManager' in bus.list_names():
+ supported = True
+ bus.add_signal_receiver(device_no_longer_active,
+ 'DeviceNoLongerActive',
+ 'org.freedesktop.NetworkManager',
+ 'org.freedesktop.NetworkManager',
+ '/org/freedesktop/NetworkManager')
+
+ bus.add_signal_receiver(device_now_active,
+ 'DeviceNowActive',
+ 'org.freedesktop.NetworkManager',
+ 'org.freedesktop.NetworkManager',
+ '/org/freedesktop/NetworkManager')
+ except Exception:
+ pass
+
# vim: se ts=3:
Modified: branches/gajim_0.12/src/notify.py
===================================================================
--- branches/gajim_0.12/src/notify.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/notify.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -489,6 +489,10 @@
ntype = 'presence.status'
elif event_type == _('Connection Failed'):
ntype = 'connection.failed'
+ elif event_type == _('Subscription request'):
+ ntype = 'subscription.request'
+ elif event_type == _('Unsubscribed'):
+ ntype = 'unsubscribed'
else:
# default failsafe values
self.path_to_image = os.path.abspath(
@@ -589,6 +593,8 @@
def version_reply_handler(self, name, vendor, version, spec_version=None):
if spec_version:
version = spec_version
+ elif vendor == 'Xfce' and version == '0.1.0':
+ version = '0.9'
version_list = version.split('.')
self.version = []
while len(version_list):
Modified: branches/gajim_0.12/src/osx/Makefile.am
===================================================================
--- branches/gajim_0.12/src/osx/Makefile.am 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/osx/Makefile.am 2009-03-10 11:27:24 UTC (rev 11146)
@@ -10,7 +10,7 @@
if BUILD_IDLE_OSX
idlelib_LTLIBRARIES = idle.la
-idlelibdir = $(libdir)/gajim
+idlelibdir = $(pkglibdir)
idle_la_LIBADD = $(CARBON_LIBS)
@@ -24,7 +24,7 @@
if BUILD_COCOA
nsapplib_LTLIBRARIES = nsapp.la
-nsapplibdir = $(libdir)/gajim
+nsapplibdir = $(pkglibdir)
nsapp_la_LIBADD = $(COCOA_LIBS)
Modified: branches/gajim_0.12/src/osx/growl/Makefile.am
===================================================================
--- branches/gajim_0.12/src/osx/growl/Makefile.am 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/osx/growl/Makefile.am 2009-03-10 11:27:24 UTC (rev 11146)
@@ -6,7 +6,7 @@
if BUILD_CARBON
_growllib_LTLIBRARIES = _growl.la
-_growllibdir = $(libdir)/gajim
+_growllibdir = $(pkglibdir)
_growl_la_LIBADD = $(CARBON_LIBS)
@@ -20,7 +20,7 @@
if BUILD_COCOA
_growlImagelib_LTLIBRARIES = _growlImage.la
-_growlImagelibdir = $(libdir)/gajim
+_growlImagelibdir = $(pkglibdir)
_growlImage_la_LIBADD = $(COCOA_LIBS)
Modified: branches/gajim_0.12/src/osx/growl/_growl.c
===================================================================
--- branches/gajim_0.12/src/osx/growl/_growl.c 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/osx/growl/_growl.c 2009-03-10 11:27:24 UTC (rev 11146)
@@ -2,25 +2,6 @@
* Copyright 2004-2005 The Growl Project.
* Created by Jeremy Rossi <jeremy(a)jeremyrossi.com>
* Released under the BSD license.
- *
- * src/osx/growl/_growl.c
- *
- * Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org>
- *
- * This file is part of Gajim.
- *
- * Gajim is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; version 3 only.
- *
- * Gajim is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Gajim. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#include <Python.h>
Modified: branches/gajim_0.12/src/osx/growl/_growlImage.m
===================================================================
--- branches/gajim_0.12/src/osx/growl/_growlImage.m 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/osx/growl/_growlImage.m 2009-03-10 11:27:24 UTC (rev 11146)
@@ -1,24 +1,6 @@
/*
* Copyright 2004 Mark Rowe <bdash(a)users.sourceforge.net>
* Released under the BSD license.
- * src/osx/growl/_growlImage.m
- *
- * Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org>
- *
- * This file is part of Gajim.
- *
- * Gajim is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; version 3 only.
- *
- * Gajim is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Gajim. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#include "Python.h"
Modified: branches/gajim_0.12/src/osx/nsapp.m
===================================================================
--- branches/gajim_0.12/src/osx/nsapp.m 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/osx/nsapp.m 2009-03-10 11:27:24 UTC (rev 11146)
@@ -1,24 +1,3 @@
-/*
-## src/osx/nsapp.m
-##
-## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org>
-##
-## This file is part of Gajim.
-##
-## Gajim is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 3 only.
-##
-## Gajim is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-##
-*/
-
#import "nsapp.h"
#include <notify.h>
Modified: branches/gajim_0.12/src/osx/syncmenu/Makefile.am
===================================================================
--- branches/gajim_0.12/src/osx/syncmenu/Makefile.am 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/osx/syncmenu/Makefile.am 2009-03-10 11:27:24 UTC (rev 11146)
@@ -8,7 +8,7 @@
if BUILD_COCOA
syncmenulib_LTLIBRARIES = syncmenu.la
-syncmenulibdir = $(libdir)/gajim
+syncmenulibdir = $(pkglibdir)
syncmenu_la_SOURCES = sync-menu.c pysyncmenu.c
syncmenu_la_LDFLAGS = -module -avoid-version -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 $(GTKLDFLAGS)
syncmenu_la_CFLAGS = -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 $(GTKCFLAGS) -Wall -g $(INCLUDES)
Modified: branches/gajim_0.12/src/osx/syncmenu/pysyncmenu.c
===================================================================
--- branches/gajim_0.12/src/osx/syncmenu/pysyncmenu.c 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/osx/syncmenu/pysyncmenu.c 2009-03-10 11:27:24 UTC (rev 11146)
@@ -1,24 +1,3 @@
-/*
-## src/osx/syncmenu/pysyncmenu.c
-##
-## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org>
-##
-## This file is part of Gajim.
-##
-## Gajim is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 3 only.
-##
-## Gajim is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-##
- */
-
#include <errno.h>
#include <string.h>
#include <Python.h>
Modified: branches/gajim_0.12/src/remote_control.py
===================================================================
--- branches/gajim_0.12/src/remote_control.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/remote_control.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -102,7 +102,10 @@
def raise_signal(self, signal, arg):
if self.signal_object:
- getattr(self.signal_object, signal)(get_dbus_struct(arg))
+ try:
+ getattr(self.signal_object, signal)(get_dbus_struct(arg))
+ except UnicodeDecodeError:
+ pass # ignore error when we fail to announce on dbus
class SignalObject(dbus.service.Object):
Modified: branches/gajim_0.12/src/roster_window.py
===================================================================
--- branches/gajim_0.12/src/roster_window.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/roster_window.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -1003,9 +1003,9 @@
if gajim.config.get('show_tunes_in_roster') \
and ('artist' in gajim.connections[account].tune \
or 'title' in gajim.connections[account].tune):
+ path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
self.model[child_iter][C_TUNE_PIXBUF] = \
- gtk.gdk.pixbuf_new_from_file(
- '../data/emoticons/static/music.png')
+ gtk.gdk.pixbuf_new_from_file(path)
else:
self.model[child_iter][C_TUNE_PIXBUF] = None
@@ -1022,7 +1022,7 @@
else:
accounts = [account]
text = gobject.markup_escape_text(group)
- if group in gajim.connections[account].blocked_groups:
+ if helpers.group_is_blocked(account, group):
text = '<span strikethrough="true">%s</span>' % text
if gajim.config.get('show_contacts_number'):
nbr_on, nbr_total = gajim.contacts.get_nb_online_total_contacts(
@@ -1075,11 +1075,11 @@
# Strike name if blocked
strike = False
- if jid in gajim.connections[account].blocked_contacts:
+ if helpers.jid_is_blocked(account, jid):
strike = True
else:
for group in contact.get_shown_groups():
- if group in gajim.connections[account].blocked_groups:
+ if helpers.group_is_blocked(account, group):
strike = True
break
if strike:
@@ -1266,8 +1266,8 @@
jid = jid.decode('utf-8')
contact = gajim.contacts.get_contact(account, jid)
if 'artist' in contact.tune or 'title' in contact.tune:
- pixbuf = gtk.gdk.pixbuf_new_from_file(
- '../data/emoticons/static/music.png')
+ path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
+ pixbuf = gtk.gdk.pixbuf_new_from_file(path)
else:
pixbuf = None
for child_iter in iters:
@@ -1824,6 +1824,14 @@
data[1])
gajim.events.remove_events(account, jid, event)
return True
+ elif event.type_ == 'subscription_request':
+ dialogs.SubscriptionRequestWindow(jid, data[0], account, data[1])
+ gajim.events.remove_events(account, jid, event)
+ return True
+ elif event.type_ == 'unsubscribed':
+ gajim.interface.show_unsubscribed_dialog(account, data)
+ gajim.events.remove_events(account, jid, event)
+ return True
return False
################################################################################
@@ -1952,7 +1960,7 @@
self.send_status_continue(account, status, txt, auto, to)
def send_status_continue(self, account, status, txt, auto, to):
- if gajim.account_is_connected(account):
+ if gajim.account_is_connected(account) and not to:
if status == 'online' and gajim.interface.sleeper.getState() != \
common.sleepy.STATE_UNKNOWN:
gajim.sleeper_state[account] = 'online'
@@ -2036,11 +2044,6 @@
if ctrl:
ctrl.update_status_display(name, uf_show, status)
- # unset custom status
- if account in gajim.interface.status_sent_to_users and \
- contact.jid in gajim.interface.status_sent_to_users[account]:
- del gajim.interface.status_sent_to_users[account][contact.jid]
-
# Delete pep if needed
#FIXME: py2.5only
# keep_pep = any(c.show not in ('error', 'offline') for c in
@@ -2089,15 +2092,20 @@
if sys.platform == 'darwin':
self.make_menu(force=True)
- def get_status_message(self, show, on_response):
+ def get_status_message(self, show, on_response, always_ask=False):
+ ''' get the status message by:
+ 1/ looking in default status message
+ 2/ asking to user if needed depending on ask_on(ff)line_status and
+ always_ask
+ '''
if show in gajim.config.get_per('defaultstatusmsg'):
if gajim.config.get_per('defaultstatusmsg', show, 'enabled'):
on_response(gajim.config.get_per('defaultstatusmsg', show,
'message'))
return
- if (show == 'online' and not gajim.config.get('ask_online_status')) or \
- (show in ('offline', 'invisible')
- and not gajim.config.get('ask_offline_status')):
+ if not always_ask and ((show == 'online' and not gajim.config.get(
+ 'ask_online_status')) or (show in ('offline', 'invisible') and not \
+ gajim.config.get('ask_offline_status'))):
on_response('')
return
@@ -2831,6 +2839,7 @@
if jid in gajim.interface.minimized_controls[account]:
ctrl = gajim.interface.minimized_controls[account][jid]
ctrl.shutdown()
+ ctrl.got_disconnected()
self.remove_groupchat(jid, account)
def on_send_single_message_menuitem_activate(self, widget, account,
@@ -3126,17 +3135,20 @@
account = list_[0][1]
pritext = _('Contact "%s" will be removed from your roster') % \
contact.get_shown_name()
+ sectext = _('You are about to remove "%(name)s" (%(jid)s) from your '
+ 'roster.\n') % {'name': contact.get_shown_name(),
+ 'jid': contact.jid}
if contact.sub == 'to':
- dialogs.ConfirmationDialog(pritext,
+ dialogs.ConfirmationDialog(pritext, sectext + \
_('By removing this contact you also remove authorization '
'resulting in him or her always seeing you as offline.'),
on_response_ok = (on_ok2, list_))
elif _('Not in Roster') in contact.get_shown_groups():
# Contact is not in roster
- dialogs.ConfirmationDialog(pritext, _('Do you want to continue?'),
- on_response_ok = (on_ok2, list_))
+ dialogs.ConfirmationDialog(pritext, sectext + \
+ _('Do you want to continue?'), on_response_ok = (on_ok2, list_))
else:
- dialogs.ConfirmationDialogCheck(pritext,
+ dialogs.ConfirmationDialogCheck(pritext, sectext + \
_('By removing this contact you also by default remove '
'authorization resulting in him or her always seeing you as '
'offline.'),
@@ -3147,7 +3159,8 @@
pritext = _('Contacts will be removed from your roster')
jids = ''
for (contact, account) in list_:
- jids += '\n ' + contact.get_shown_name() + ','
+ jids += '\n ' + contact.get_shown_name() + ' (%s)' % contact.jid +\
+ ','
sectext = _('By removing these contacts:%s\nyou also remove '
'authorization resulting in them always seeing you as offline.') % \
jids
@@ -3156,26 +3169,42 @@
def on_send_custom_status(self, widget, contact_list, show, group=None):
'''send custom status'''
+ # contact_list has only one element except if group != None
def on_response(message):
if message is None: # None if user pressed Cancel
return
+ account_list = []
for (contact, account) in contact_list:
- our_jid = gajim.get_jid_from_account(account)
- accounts = []
- if group and account not in accounts:
+ if account not in account_list:
+ account_list.append(account)
+ # 1. update status_sent_to_[groups|users] list
+ if group:
+ for account in account_list:
if account not in gajim.interface.status_sent_to_groups:
gajim.interface.status_sent_to_groups[account] = {}
gajim.interface.status_sent_to_groups[account][group] = show
- accounts.append(group)
+ else:
+ for (contact, account) in contact_list:
+ if account not in gajim.interface.status_sent_to_users:
+ gajim.interface.status_sent_to_users[account] = {}
+ gajim.interface.status_sent_to_users[account][contact.jid] = show
+
+ # 2. update privacy lists if main status is invisible
+ for account in account_list:
+ if gajim.SHOW_LIST[gajim.connections[account].connected] == \
+ 'invisible':
+ gajim.connections[account].set_invisible_rule()
+
+ # 3. send directed presence
+ for (contact, account) in contact_list:
+ our_jid = gajim.get_jid_from_account(account)
jid = contact.jid
if jid == our_jid:
jid += '/' + contact.resource
self.send_status(account, show, message, to=jid)
- if account not in gajim.interface.status_sent_to_users:
- gajim.interface.status_sent_to_users[account] = {}
- gajim.interface.status_sent_to_users[account][contact.jid] = show
- dialogs.ChangeStatusMessageDialog(on_response, show)
+ self.get_status_message(show, on_response, always_ask=True)
+
def on_status_combobox_changed(self, widget):
'''When we change our status via the combobox'''
model = self.status_combobox.get_model()
@@ -3518,6 +3547,15 @@
gajim.groups[account][group]['expand'] = True
if account + group in self.collapsed_rows:
self.collapsed_rows.remove(account + group)
+ for contact in gajim.contacts.iter_contacts(account):
+ jid = contact.jid
+ if group in contact.groups and gajim.contacts.is_big_brother(
+ account, jid, accounts) and account + group + jid \
+ not in self.collapsed_rows:
+ titers = self._get_contact_iter(jid, account)
+ for titer in titers:
+ path = model.get_path(titer)
+ self.tree.expand_row(path, False)
elif type_ == 'account':
account = accounts[0] # There is only one cause we don't use merge
if account in self.collapsed_rows:
@@ -3534,6 +3572,10 @@
# Metacontact got toggled, update icon
jid = model[titer][C_JID].decode('utf-8')
account = model[titer][C_ACCOUNT].decode('utf-8')
+ contact = gajim.contacts.get_contact(account, jid)
+ for group in contact.groups:
+ if account + group + jid in self.collapsed_rows:
+ self.collapsed_rows.remove(account + group + jid)
family = gajim.contacts.get_metacontacts_family(account, jid)
nearby_family, bb_jid, bb_account = \
self._get_nearby_family_and_big_brother(family, account)
@@ -3563,17 +3605,21 @@
for account in accounts:
if group in gajim.groups[account]: # This account has this group
gajim.groups[account][group]['expand'] = False
- if not account + group in self.collapsed_rows:
+ if account + group not in self.collapsed_rows:
self.collapsed_rows.append(account + group)
elif type_ == 'account':
account = accounts[0] # There is only one cause we don't use merge
- if not account in self.collapsed_rows:
+ if account not in self.collapsed_rows:
self.collapsed_rows.append(account)
self.draw_account(account)
elif type_ == 'contact':
# Metacontact got toggled, update icon
jid = model[titer][C_JID].decode('utf-8')
account = model[titer][C_ACCOUNT].decode('utf-8')
+ contact = gajim.contacts.get_contact(account, jid)
+ for group in contact.groups:
+ if account + group + jid not in self.collapsed_rows:
+ self.collapsed_rows.append(account + group + jid)
family = gajim.contacts.get_metacontacts_family(account, jid)
nearby_family, bb_jid, bb_account = \
self._get_nearby_family_and_big_brother(family, account)
@@ -5072,7 +5118,7 @@
send_custom_status_menuitem = gtk.ImageMenuItem(
_('Send Cus_tom Status'))
# add a special img for this menuitem
- if group in gajim.connections[account].blocked_groups:
+ if helpers.group_is_blocked(account, group):
send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon(
'offline'))
send_custom_status_menuitem.set_sensitive(False)
@@ -5120,10 +5166,10 @@
is_blocked = False
if self.regroup:
for g_account in gajim.connections:
- if group in gajim.connections[g_account].blocked_groups:
+ if helpers.group_is_blocked(g_account, group):
is_blocked = True
else:
- if group in gajim.connections[account].blocked_groups:
+ if helpers.group_is_blocked(account, group):
is_blocked = True
if is_blocked and gajim.connections[account].privacy_rules_supported:
@@ -5329,11 +5375,11 @@
# send custom status icon
blocked = False
- if jid in gajim.connections[account].blocked_contacts:
+ if helpers.jid_is_blocked(account, jid):
blocked = True
else:
for group in contact.get_shown_groups():
- if group in gajim.connections[account].blocked_groups:
+ if helpers.group_is_blocked(account, group):
blocked = True
break
if gajim.get_transport_name_from_jid(jid, use_config_setting=False):
@@ -5497,7 +5543,7 @@
if gajim.connections[account] and gajim.connections[account].\
privacy_rules_supported:
- if jid in gajim.connections[account].blocked_contacts:
+ if helpers.jid_is_blocked(account, jid):
block_menuitem.set_no_show_all(True)
block_menuitem.hide()
if gajim.get_transport_name_from_jid(jid, use_config_setting=False):
@@ -5551,7 +5597,7 @@
privacy_rules_supported = False
contact = gajim.contacts.get_contact_with_highest_priority(account,
jid)
- if jid not in gajim.connections[account].blocked_contacts:
+ if helpers.jid_is_blocked(account, jid):
is_blocked = False
list_.append((contact, account))
@@ -5653,7 +5699,7 @@
menu.append(item)
blocked = False
- if jid in gajim.connections[account].blocked_contacts:
+ if helpers.jid_is_blocked(account, jid):
blocked = True
# Send Custom Status
Modified: branches/gajim_0.12/src/secrets.py
===================================================================
--- branches/gajim_0.12/src/secrets.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/secrets.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -41,10 +41,8 @@
raise exceptions.Cancelled
def save(self):
- pickle.dumps(self)
-
f = open(secrets_filename, 'w')
- f.write(pickle.dumps(self))
+ pickle.dump(self, f)
f.close()
def retained_secrets(self, account, bare_jid):
@@ -99,7 +97,7 @@
f = open(filename, 'r')
try:
- secrets = pickle.loads(f.read())
+ secrets = pickle.load(f)
except KeyError:
f.close()
secrets = Secrets(filename)
Modified: branches/gajim_0.12/src/session.py
===================================================================
--- branches/gajim_0.12/src/session.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/session.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -184,8 +184,9 @@
if not msgtxt: # empty message text
return
- if gajim.config.get('ignore_unknown_contacts') and \
- not gajim.contacts.get_contacts(self.conn.name, jid) and not pm:
+ if gajim.config.get_per('accounts', self.conn.name,
+ 'ignore_unknown_contacts') and not gajim.contacts.get_contacts(
+ self.conn.name, jid) and not pm:
return
if not contact:
@@ -295,12 +296,17 @@
self.conn.name, jid, user_nick)
if not self.control:
- # if no control exists and message comes from highest prio, the new
- # control shouldn't have a resource
- if highest_contact and contact.resource == highest_contact.resource \
- and not jid == gajim.get_jid_from_account(self.conn.name):
- fjid = jid
- resource_for_chat = None
+ ctrl = gajim.interface.msg_win_mgr.get_control(fjid, self.conn.name)
+ if ctrl:
+ self.control = ctrl
+ self.control.set_session(self)
+ else:
+ # if no control exists and message comes from highest prio, the new
+ # control shouldn't have a resource
+ if highest_contact and contact.resource == highest_contact.resource\
+ and not jid == gajim.get_jid_from_account(self.conn.name):
+ fjid = jid
+ resource_for_chat = None
# Do we have a queue?
no_queue = len(gajim.events.get_events(self.conn.name, fjid)) == 0
@@ -318,7 +324,7 @@
typ = ''
if msg_type == 'error':
- typ = 'status'
+ typ = 'error'
self.control.print_conversation(msg, typ, tim=tim, encrypted=encrypted,
subject=subject, xhtml=xhtml)
Modified: branches/gajim_0.12/src/statusicon.py
===================================================================
--- branches/gajim_0.12/src/statusicon.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/statusicon.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -64,10 +64,7 @@
self.unsubscribe_events()
def on_status_icon_left_clicked(self, widget):
- if len(gajim.events.get_systray_events()) == 0:
- self.on_left_click()
- else:
- self.on_middle_click()
+ self.on_left_click()
def set_img(self):
'''apart from image, we also update tooltip text here'''
Modified: branches/gajim_0.12/src/systray.py
===================================================================
--- branches/gajim_0.12/src/systray.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/systray.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -64,10 +64,6 @@
self.added_hide_menuitem = False
self.img_tray = gtk.Image()
self.status = 'offline'
- self.double_click = False
- self.double_click_id = None
- self.double_click_time = gtk.settings_get_default().get_property(
- 'gtk-double-click-time')
self.xml = gtkgui_helpers.get_glade('systray_context_menu.glade')
self.systray_context_menu = self.xml.get_widget('systray_context_menu')
self.xml.signal_autoconnect(self)
@@ -323,26 +319,25 @@
gajim.interface.roster.on_quit_request()
def on_left_click(self):
- self.double_click_id = None
- if self.double_click:
- self.double_click = False
- return
win = gajim.interface.roster.window
- # toggle visible/hidden for roster window
- if win.get_property('visible') and (win.get_property('has-toplevel-focus') or \
- os.name == 'nt'):
- # visible in ANY virtual desktop?
+ if len(gajim.events.get_systray_events()) == 0:
+ # No pending events, so toggle visible/hidden for roster window
+ if win.get_property('visible') and (win.get_property(
+ 'has-toplevel-focus')):
+ # visible in ANY virtual desktop?
- # we could be in another VD right now. eg vd2
- # and we want to show it in vd2
- if not gtkgui_helpers.possibly_move_window_in_current_desktop(win):
- win.hide() # else we hide it from VD that was visible in
+ # we could be in another VD right now. eg vd2
+ # and we want to show it in vd2
+ if not gtkgui_helpers.possibly_move_window_in_current_desktop(win):
+ win.hide() # else we hide it from VD that was visible in
+ else:
+ # in Windows (perhaps other Window Managers too) minimize state
+ # is remembered, so make sure it's not minimized (iconified)
+ # because user wants to see roster
+ win.deiconify()
+ win.present()
else:
- # in Windows (perhaps other Window Managers too) minimize state
- # is remembered, so make sure it's not minimized (iconified)
- # because user wants to see roster
- win.deiconify()
- win.present()
+ self.handle_first_event()
def handle_first_event(self):
account, jid, event = gajim.events.get_first_systray_event()
@@ -351,27 +346,18 @@
def on_middle_click(self):
'''middle click raises window to have complete focus (fe. get kbd events)
but if already raised, it hides it'''
- if gajim.events.get_nb_systray_events() == 0:
- return
- self.handle_first_event()
+ win = gajim.interface.roster.window
+ if win.is_active(): # is it fully raised? (eg does it receive kbd events?)
+ win.hide()
+ else:
+ win.present()
def on_clicked(self, widget, event):
self.on_tray_leave_notify_event(widget, None)
- if event.type == gtk.gdk._2BUTTON_PRESS:
- if len(gajim.events.get_systray_events()) == 0:
- return
- self.double_click = True
- self.on_middle_click()
if event.type != gtk.gdk.BUTTON_PRESS:
return
if event.button == 1: # Left click
- if len(gajim.events.get_systray_events()) == 0:
- self.on_left_click()
- else:
- if self.double_click_id:
- gobject.source_remove(self.double_click_id)
- self.double_click_id = gobject.timeout_add(
- self.double_click_time, self.on_left_click)
+ self.on_left_click()
elif event.button == 2: # middle click
self.on_middle_click()
elif event.button == 3: # right click
Modified: branches/gajim_0.12/src/tooltips.py
===================================================================
--- branches/gajim_0.12/src/tooltips.py 2009-03-06 22:18:04 UTC (rev 11145)
+++ branches/gajim_0.12/src/tooltips.py 2009-03-10 11:27:24 UTC (rev 11146)
@@ -427,8 +427,8 @@
name_markup = u'<span weight="bold">' + \
gobject.markup_escape_text(prim_contact.get_shown_name())\
+ '</span>'
- if self.account and prim_contact.jid in gajim.connections[
- self.account].blocked_contacts:
+ if self.account and helpers.jid_is_blocked(self.account,
+ prim_contact.jid):
name_markup += _(' [blocked]')
if self.account and \
self.account in gajim.interface.minimized_controls and \
1
0
Author: js
Date: 2009-03-06 23:18:04 +0100 (Fri, 06 Mar 2009)
New Revision: 11145
Modified:
branches/osx_newbuildsys/src/roster_window.py
Log:
Fix #4854. Seems a merge went wrong there.
Modified: branches/osx_newbuildsys/src/roster_window.py
===================================================================
--- branches/osx_newbuildsys/src/roster_window.py 2009-03-06 21:46:52 UTC (rev 11144)
+++ branches/osx_newbuildsys/src/roster_window.py 2009-03-06 22:18:04 UTC (rev 11145)
@@ -999,8 +999,8 @@
and ('artist' in gajim.connections[account].tune \
or 'title' in gajim.connections[account].tune):
self.model[child_iter][C_TUNE_PIXBUF] = \
- gtk.gdk.pixbuf_new_from_file(
- '../data/emoticons/static/music.png')
+ gtk.gdk.pixbuf_new_from_file(os.path.join(gajim.DATA_DIR,
+ 'emoticons', 'static', 'music.png'))
else:
self.model[child_iter][C_TUNE_PIXBUF] = None
@@ -1261,8 +1261,8 @@
jid = jid.decode('utf-8')
contact = gajim.contacts.get_contact(account, jid)
if 'artist' in contact.tune or 'title' in contact.tune:
- pixbuf = gtk.gdk.pixbuf_new_from_file(
- '../data/emoticons/static/music.png')
+ pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(gajim.DATA_DIR,
+ 'emoticons', 'static', 'music.png'))
else:
pixbuf = None
for child_iter in iters:
1
0
[commit-gajim] r11144 - in branches/osx_newbuildsys: data/glade po scripts src src/common
by js＠gajim.org 06 Mar '09
by js＠gajim.org 06 Mar '09
06 Mar '09
Author: js
Date: 2009-03-06 22:46:52 +0100 (Fri, 06 Mar 2009)
New Revision: 11144
Added:
branches/osx_newbuildsys/src/gtkspell.py
Modified:
branches/osx_newbuildsys/data/glade/account_creation_wizard_window.glade
branches/osx_newbuildsys/data/glade/preferences_window.glade
branches/osx_newbuildsys/po/sk.po
branches/osx_newbuildsys/po/sv.po
branches/osx_newbuildsys/po/uk.po
branches/osx_newbuildsys/scripts/gajim.in
branches/osx_newbuildsys/src/common/config.py
branches/osx_newbuildsys/src/config.py
branches/osx_newbuildsys/src/conversation_textview.py
branches/osx_newbuildsys/src/gajim.py
branches/osx_newbuildsys/src/roster_window.py
Log:
Merge trunk r11143.
Modified: branches/osx_newbuildsys/data/glade/account_creation_wizard_window.glade
===================================================================
--- branches/osx_newbuildsys/data/glade/account_creation_wizard_window.glade 2009-03-06 05:55:50 UTC (rev 11143)
+++ branches/osx_newbuildsys/data/glade/account_creation_wizard_window.glade 2009-03-06 21:46:52 UTC (rev 11144)
@@ -129,22 +129,14 @@
<child>
<widget class="GtkTable" id="table27">
<property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">3</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">4</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <signal name="changed" handler="on_username_entry_changed"/>
<signal name="key_press_event" handler="on_username_entry_key_press_event"/>
</widget>
<packing>
@@ -154,38 +146,6 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label267">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Server:</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBoxEntry" id="server_comboboxentry">
- <property name="visible">True</property>
- <signal name="changed" handler="on_server_comboboxentry_changed"/>
- <child internal-child="entry">
- <widget class="GtkEntry" id="comboboxentry-entry1">
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
<widget class="GtkLabel" id="label263">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -194,8 +154,8 @@
<property name="mnemonic_widget">password_entry</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -215,9 +175,9 @@
</widget>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -232,8 +192,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
@@ -241,7 +201,7 @@
<widget class="GtkLabel" id="label262">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Username:</property>
+ <property name="label" translatable="yes">_Jabber ID:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">username_entry</property>
</widget>
@@ -251,37 +211,35 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label258">
+ <widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Your JID:</property>
+ <property name="label" translatable="yes">@</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="jid_label">
+ <widget class="GtkComboBoxEntry" id="server_comboboxentry">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="comboboxentry-entry1">
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
Modified: branches/osx_newbuildsys/data/glade/preferences_window.glade
===================================================================
--- branches/osx_newbuildsys/data/glade/preferences_window.glade 2009-03-06 05:55:50 UTC (rev 11143)
+++ branches/osx_newbuildsys/data/glade/preferences_window.glade 2009-03-06 21:46:52 UTC (rev 11144)
@@ -211,45 +211,55 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label379">
+ <widget class="GtkComboBox" id="one_window_type_combobox">
+ <property name="width_request">50</property>
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">1</property>
- <property name="label" translatable="yes">_Window behavior:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">one_window_type_combobox</property>
+ <property name="items" translatable="yes">Detached roster with detached chats
+Detached roster with single chat
+Single window for everything
+Detached roster with chat grouped by account
+Detached roster with chat grouped by type</property>
+ <signal name="changed" handler="on_one_window_type_combo_changed"/>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="emoticons_combobox">
- <property name="visible">True</property>
- <signal name="changed" handler="on_emoticons_combobox_changed"/>
+ <widget class="GtkCheckButton" id="speller_checkbutton">
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">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.</property>
+ <property name="label" translatable="yes">_Highlight misspelled words</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_speller_checkbutton_toggled"/>
</widget>
<packing>
- <property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="eventbox5">
+ <widget class="GtkCheckButton" id="xhtml_checkbutton">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property>
- <child>
- <widget class="GtkLabel" id="label381">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">1</property>
- <property name="label" translatable="yes">_Emoticons:</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property>
+ <property name="label" translatable="yes">_Ignore rich content in incoming messages</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/>
</widget>
<packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
@@ -271,56 +281,46 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="xhtml_checkbutton">
+ <widget class="GtkEventBox" id="eventbox5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property>
- <property name="label" translatable="yes">_Ignore rich content in incoming messages</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/>
+ <property name="tooltip" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property>
+ <child>
+ <widget class="GtkLabel" id="label381">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">1</property>
+ <property name="label" translatable="yes">_Emoticons:</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="speller_checkbutton">
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">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.</property>
- <property name="label" translatable="yes">_Highlight misspelled words</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_speller_checkbutton_toggled"/>
+ <widget class="GtkComboBox" id="emoticons_combobox">
+ <property name="visible">True</property>
+ <signal name="changed" handler="on_emoticons_combobox_changed"/>
</widget>
<packing>
+ <property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="one_window_type_combobox">
- <property name="width_request">50</property>
+ <widget class="GtkLabel" id="label379">
<property name="visible">True</property>
- <property name="items" translatable="yes">Detached roster with detached chats
-Detached roster with single chat
-Single window for everything
-Detached roster with chat grouped by account
-Detached roster with chat grouped by type</property>
- <signal name="changed" handler="on_one_window_type_combo_changed"/>
+ <property name="xalign">0</property>
+ <property name="xpad">1</property>
+ <property name="label" translatable="yes">_Window behavior:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">one_window_type_combobox</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
</widget>
@@ -730,67 +730,67 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkComboBox" id="displayed_chat_states_combobox">
+ <widget class="GtkComboBox" id="outgoing_chat_states_combobox">
<property name="visible">True</property>
<property name="items" translatable="yes">All chat states
Composing only
Disabled</property>
- <signal name="changed" handler="on_displayed_chat_states_combobox_changed"/>
+ <signal name="changed" handler="on_outgoing_chat_states_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="eventbox8">
+ <widget class="GtkEventBox" id="eventbox9">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">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.</property>
+ <property name="tooltip" translatable="yes">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.</property>
<child>
- <widget class="GtkLabel" id="label33">
+ <widget class="GtkLabel" id="label34">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Display chat state notifications:</property>
+ <property name="label" translatable="yes">_Send chat state notifications:</property>
<property name="use_underline">True</property>
</widget>
</child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="eventbox9">
+ <widget class="GtkEventBox" id="eventbox8">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">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.</property>
+ <property name="tooltip" translatable="yes">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.</property>
<child>
- <widget class="GtkLabel" id="label34">
+ <widget class="GtkLabel" id="label33">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Send chat state notifications:</property>
+ <property name="label" translatable="yes">_Display chat state notifications:</property>
<property name="use_underline">True</property>
</widget>
</child>
</widget>
<packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="outgoing_chat_states_combobox">
+ <widget class="GtkComboBox" id="displayed_chat_states_combobox">
<property name="visible">True</property>
<property name="items" translatable="yes">All chat states
Composing only
Disabled</property>
- <signal name="changed" handler="on_outgoing_chat_states_combobox_changed"/>
+ <signal name="changed" handler="on_displayed_chat_states_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
</widget>
@@ -854,65 +854,60 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="auto_away_checkbutton">
+ <widget class="GtkEntry" id="auto_xa_message_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property>
- <property name="label" translatable="yes">_Away after:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/>
+ <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message
+$S will be replaced by previous status message
+$T will be replaced by auto-not-available timeout</property>
+ <signal name="changed" handler="on_auto_xa_message_entry_changed"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="auto_xa_checkbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property>
- <property name="label" translatable="yes">_Not available after:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/>
- </widget>
- <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label77">
+ <widget class="GtkEntry" id="auto_away_message_entry">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">minutes</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message
+$S will be replaced by previous status message
+$T will be replaced by auto-away timeout</property>
+ <signal name="changed" handler="on_auto_away_message_entry_changed"/>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label78">
+ <widget class="GtkAlignment" id="alignment34">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">minutes</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <child>
+ <widget class="GtkSpinButton" id="auto_xa_time_spinbutton">
+ <property name="width_request">50</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">20 1 1440 1 10 10</property>
+ <property name="climb_rate">1</property>
+ <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -939,62 +934,67 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment34">
+ <widget class="GtkLabel" id="label78">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <child>
- <widget class="GtkSpinButton" id="auto_xa_time_spinbutton">
- <property name="width_request">50</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">20 1 1440 1 10 10</property>
- <property name="climb_rate">1</property>
- <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/>
- </widget>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">minutes</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="auto_away_message_entry">
+ <widget class="GtkLabel" id="label77">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message
-$S will be replaced by previous status message
-$T will be replaced by auto-away timeout</property>
- <signal name="changed" handler="on_auto_away_message_entry_changed"/>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">minutes</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="auto_xa_message_entry">
+ <widget class="GtkCheckButton" id="auto_xa_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message
-$S will be replaced by previous status message
-$T will be replaced by auto-not-available timeout</property>
- <signal name="changed" handler="on_auto_xa_message_entry_changed"/>
+ <property name="tooltip" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property>
+ <property name="label" translatable="yes">_Not available after:</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkCheckButton" id="auto_away_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property>
+ <property name="label" translatable="yes">_Away after:</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -1152,40 +1152,24 @@
<placeholder/>
</child>
<child>
- <widget class="GtkVButtonBox" id="vbuttonbox3">
+ <widget class="GtkScrolledWindow" id="scrolledwindow23">
<property name="visible">True</property>
- <property name="spacing">5</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
<child>
- <widget class="GtkButton" id="new_msg_button">
+ <widget class="GtkTextView" id="msg_textview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-new</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_new_msg_button_clicked"/>
+ <property name="border_width">3</property>
+ <property name="wrap_mode">GTK_WRAP_WORD</property>
</widget>
</child>
- <child>
- <widget class="GtkButton" id="delete_msg_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-delete</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_delete_msg_button_clicked"/>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -1208,24 +1192,40 @@
</widget>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow23">
+ <widget class="GtkVButtonBox" id="vbuttonbox3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="spacing">5</property>
+ <property name="layout_style">GTK_BUTTONBOX_START</property>
<child>
- <widget class="GtkTextView" id="msg_textview">
+ <widget class="GtkButton" id="new_msg_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="border_width">3</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-new</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_new_msg_button_clicked"/>
</widget>
</child>
+ <child>
+ <widget class="GtkButton" id="delete_msg_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-delete</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_delete_msg_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -1291,15 +1291,14 @@
<placeholder/>
</child>
<child>
- <widget class="GtkFontButton" id="conversation_fontbutton">
+ <widget class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
- <signal name="font_set" handler="on_conversation_fontbutton_font_set"/>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Chat message:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1320,14 +1319,15 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <widget class="GtkFontButton" id="conversation_fontbutton">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Chat message:</property>
+ <property name="can_focus">True</property>
+ <property name="response_id">0</property>
+ <signal name="font_set" handler="on_conversation_fontbutton_font_set"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
</widget>
@@ -1377,35 +1377,43 @@
<placeholder/>
</child>
<child>
- <widget class="GtkCheckButton" id="transports_iconsets_checkbutton">
+ <widget class="GtkLabel" id="label249">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">T_heme:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">theme_combobox</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="manage_theme_button">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">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...)</property>
- <property name="label" translatable="yes">Use _transports icons</property>
+ <property name="tooltip" translatable="yes">Configure color and font of the interface</property>
+ <property name="label" translatable="yes">Ma_nage...</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/>
+ <signal name="clicked" handler="on_manage_theme_button_clicked"/>
</widget>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="iconset_combobox">
+ <widget class="GtkComboBox" id="theme_combobox">
<property name="visible">True</property>
- <signal name="changed" handler="on_iconset_combobox_changed"/>
+ <signal name="changed" handler="on_theme_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1424,45 +1432,37 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="theme_combobox">
+ <widget class="GtkComboBox" id="iconset_combobox">
<property name="visible">True</property>
- <signal name="changed" handler="on_theme_combobox_changed"/>
+ <signal name="changed" handler="on_iconset_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="manage_theme_button">
+ <widget class="GtkCheckButton" id="transports_iconsets_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Configure color and font of the interface</property>
- <property name="label" translatable="yes">Ma_nage...</property>
+ <property name="tooltip" translatable="yes">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...)</property>
+ <property name="label" translatable="yes">Use _transports icons</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
- <signal name="clicked" handler="on_manage_theme_button_clicked"/>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/>
</widget>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label249">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">T_heme:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">theme_combobox</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -1502,65 +1502,119 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label72">
+ <widget class="GtkHBox" id="hbox3022">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Incoming message:</property>
- <property name="use_underline">True</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">True</property>
- <property name="mnemonic_widget">incoming_msg_colorbutton</property>
+ <child>
+ <widget class="GtkLabel" id="label383">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="reset_colors_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_reset_colors_button_clicked"/>
+ <child>
+ <widget class="GtkAlignment" id="alignment52">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox2936">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image439">
+ <property name="visible">True</property>
+ <property name="stock">gtk-revert-to-saved</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label217">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Reset to Default Colors</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="incoming_msg_colorbutton">
+ <widget class="GtkColorButton" id="url_msg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="response_id">0</property>
- <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/>
+ <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options"></property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label70">
+ <widget class="GtkLabel" id="label371">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Outgoing message:</property>
+ <property name="label" translatable="yes">_URL highlight:</property>
<property name="use_underline">True</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">True</property>
- <property name="mnemonic_widget">outgoing_msg_colorbutton</property>
+ <property name="mnemonic_widget">url_msg_colorbutton</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="outgoing_msg_colorbutton">
+ <widget class="GtkColorButton" id="status_msg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
- <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/>
+ <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
@@ -1582,120 +1636,63 @@
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="status_msg_colorbutton">
+ <widget class="GtkColorButton" id="outgoing_msg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
- <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/>
+ <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label371">
+ <widget class="GtkLabel" id="label70">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_URL highlight:</property>
+ <property name="label" translatable="yes">_Outgoing message:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">url_msg_colorbutton</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">True</property>
+ <property name="mnemonic_widget">outgoing_msg_colorbutton</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="url_msg_colorbutton">
+ <widget class="GtkColorButton" id="incoming_msg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
- <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/>
+ <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox3022">
+ <widget class="GtkLabel" id="label72">
<property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label383">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="reset_colors_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_reset_colors_button_clicked"/>
- <child>
- <widget class="GtkAlignment" id="alignment52">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox2936">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image439">
- <property name="visible">True</property>
- <property name="stock">gtk-revert-to-saved</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label217">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Reset to Default Colors</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Incoming message:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">True</property>
+ <property name="mnemonic_widget">incoming_msg_colorbutton</property>
</widget>
<packing>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -1782,85 +1779,85 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="custom_file_manager_entry">
+ <widget class="GtkLabel" id="label199">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="changed" handler="on_custom_file_manager_entry_changed"/>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Browser:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">custom_browser_entry</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label355">
+ <widget class="GtkLabel" id="label200">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_File manager:</property>
+ <property name="label" translatable="yes">_Mail client:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">custom_file_manager_entry</property>
+ <property name="mnemonic_widget">custom_mail_client_entry</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="custom_browser_entry">
+ <widget class="GtkEntry" id="custom_mail_client_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <signal name="changed" handler="on_custom_browser_entry_changed"/>
+ <signal name="changed" handler="on_custom_mail_client_entry_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="custom_mail_client_entry">
+ <widget class="GtkEntry" id="custom_browser_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <signal name="changed" handler="on_custom_mail_client_entry_changed"/>
+ <signal name="changed" handler="on_custom_browser_entry_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label200">
+ <widget class="GtkLabel" id="label355">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Mail client:</property>
+ <property name="label" translatable="yes">_File manager:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">custom_mail_client_entry</property>
+ <property name="mnemonic_widget">custom_file_manager_entry</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label199">
+ <widget class="GtkEntry" id="custom_file_manager_entry">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Browser:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">custom_browser_entry</property>
+ <property name="can_focus">True</property>
+ <signal name="changed" handler="on_custom_file_manager_entry_changed"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1924,18 +1921,19 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton">
+ <widget class="GtkCheckButton" id="log_encrypted_chats_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">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</property>
- <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property>
+ <property name="tooltip" translatable="yes">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.</property>
+ <property name="label" translatable="yes">Log _encrypted chat session</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -1955,19 +1953,18 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="log_encrypted_chats_checkbutton">
+ <widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">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.</property>
- <property name="label" translatable="yes">Log _encrypted chat session</property>
+ <property name="tooltip" translatable="yes">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</property>
+ <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
</widget>
Modified: branches/osx_newbuildsys/po/sk.po
===================================================================
--- branches/osx_newbuildsys/po/sk.po 2009-03-06 05:55:50 UTC (rev 11143)
+++ branches/osx_newbuildsys/po/sk.po 2009-03-06 21:46:52 UTC (rev 11144)
@@ -1,16 +1,21 @@
# Slovak translation for gajim
-# Copyright (c) (c) 2005 Canonical Ltd, and Rosetta Contributors 2005
+# Copyright (c) (c) 2005-2009 Canonical Ltd, and Rosetta Contributors 2005-2009
# This file is distributed under the same license as the gajim package.
# Juraj Michalek <juraj.michalek(a)asinus.org>, 2005.
-# Pavol Klačanský <pavolzetor(a)gmail.com>, 2008.
+# Pavol Klačanský <pavolzetor(a)gmail.com>, 2008, 2009.
#
+#. app_name (string)
+#. replaces_id (uint)
+#. event_id (string)
+#. app_icon (string)
+#: ../src/notify.py:530
msgid ""
msgstr ""
"Project-Id-Version: gajim\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 20:37+0100\n"
-"PO-Revision-Date: 2008-11-17 17:09+0100\n"
-"Last-Translator: Pavol Klačanský <pavolzetor(a)gmail.com>\n"
+"POT-Creation-Date: 2009-03-01 14:53+0100\n"
+"PO-Revision-Date: 2009-02-22 10:18+0100\n"
+"Last-Translator: Pavol Klačanský <pavol(a)klacansky.com>\n"
"Language-Team: Slovak <sk-i18n(a)lists.linux.sk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +24,7 @@
#: ../data/gajim.desktop.in.in.h:1
msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber klientco"
+msgstr "GTK+ Jabber klient"
#: ../data/gajim.desktop.in.in.h:2
msgid "Gajim Instant Messenger"
@@ -39,7 +44,7 @@
msgstr "_Pridať kontakt..."
#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
msgid "_Discover Services"
msgstr "_Preskúmať služby"
@@ -60,7 +65,7 @@
msgstr "_Osobné udalosti"
#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
msgid "_Start Chat..."
msgstr "_Začať rozhovor..."
@@ -75,7 +80,7 @@
"\n"
"Please wait..."
msgstr ""
-"<b>Pripájam k serveru</b>\n"
+"<b>Pripája sa k serveru</b>\n"
"\n"
"Prosím počkajte..."
@@ -100,63 +105,52 @@
"certifikátu:\n"
#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Kliknite pre zistenie vlastností (ako MSN, ICQ transport) jabber serverov"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:11
msgid "Connect when I press Finish"
msgstr "Pripojiť, keď stlačím Dokončiť"
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:11
msgid "Gajim: Account Creation Wizard"
msgstr "Gajim: Pomocník - Tvorba účtu"
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:12
msgid "I already have an account I want to _use"
msgstr "Už mám účet a chcem ho po_užívať"
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:13
msgid "I want to _register for a new account"
msgstr "Chcem si za_registrovať nový účet"
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:14
#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:24
msgid "If checked, Gajim will remember the password for this account"
msgstr "Ak je zaškrtnuté, Gajim si zapamätá heslo pre tento účet"
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:15
#: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
msgid "Manage..."
msgstr "Spravovať..."
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:16
msgid "Prox_y:"
msgstr "Prox_y:"
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:17
#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:45
msgid "Save pass_word"
msgstr "Uložiť hes_lo"
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Vlastnosti servera"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:18
msgid "Set my profile when I connect"
msgstr "Nastaviť môj profil, keď som pripojený"
-#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_creation_wizard_window.glade.h:19
#: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
msgid "Use custom hostname/port"
msgstr "Použiť vlastný názov hostiteľa/portu"
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../data/glade/account_creation_wizard_window.glade.h:20
msgid ""
"You need to have an account in order to connect\n"
"to the Jabber network."
@@ -164,40 +158,39 @@
"Potrebujete mať účet, aby ste sa mohli pripojiť\n"
"do siete Jabber."
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:22
msgid "Your JID:"
msgstr "Vaše JID:"
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:15
msgid "_Advanced"
msgstr "_Pokročilé"
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:24
msgid "_Finish"
msgstr "_Dokončiť"
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:25
msgid "_Hostname:"
msgstr "Názov _hostiteľa:"
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:26
#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:59
msgid "_Password:"
msgstr "_Heslo:"
-#: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:27
msgid "_Port:"
msgstr "_Port:"
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/glade/account_creation_wizard_window.glade.h:28
msgid "_Server:"
msgstr "_Server:"
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:16
msgid "_Username:"
msgstr "_Používateľské meno:"
@@ -209,18 +202,16 @@
#: ../data/glade/account_modification_window.glade.h:2
#: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
msgid "<b>OpenPGP</b>"
msgstr "<b>OpenPGP</b>"
#: ../data/glade/account_modification_window.glade.h:3
#: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
msgid "<b>Personal Information</b>"
msgstr "<b>Osobné informácie</b>"
#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
msgid "Account"
msgstr "Účet"
@@ -229,23 +220,22 @@
msgstr "Úpravy účtu"
#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
msgid "Administration operations"
msgstr "Administrátorské operácie"
#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
msgid "Auto-reconnect when connection is lost"
msgstr "Automaticky pripojiť, keď zlyhá spojenie"
#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:10
msgid "C_onnect on Gajim startup"
msgstr "Prip_ojiť sa pri štarte programu Gajim"
#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:11
msgid "Chan_ge Password"
msgstr "Zme_niť heslo"
@@ -261,37 +251,35 @@
"poskytované serverom. Pri povolení tejto vlastnosti bude TLS deaktivované."
#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:13
msgid "Choose _Key..."
msgstr "Vybrať _kľúč..."
#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
msgid "Click to change account's password"
msgstr "Kliknite pre zmenu hesla účtu"
#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
msgid "Click to request authorization to all contacts of another account"
msgstr "Kliknite pre požiadavku autorizácie pre všetky kontakty z iného účtu"
#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
msgid "Connection"
msgstr "Spojenie"
#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
msgid "Edit Personal Information..."
msgstr "Upraviť osobné informácie..."
#. 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
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1152 ../src/notify.py:526 ../src/notify.py:544
+#: ../src/notify.py:580 ../src/notify.py:592
msgid "Gajim"
msgstr "Gajim"
@@ -300,21 +288,18 @@
#. General group cannot be changed
#: ../data/glade/account_modification_window.glade.h:17
#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/preferences_window.glade.h: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
+#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2644
+#: ../src/roster_window.py:5194
msgid "General"
msgstr "Všeobecné"
#: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
msgid "Hostname: "
msgstr "Názov hostiteľa:"
#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:22
msgid ""
"If checked, Gajim will also broadcast some more IPs except from just your "
"IP, so file transfer has higher chances of working."
@@ -323,7 +308,7 @@
"adries okrem vašej, takže je vyššia šanca, že prenos súborov bude fungovať."
#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:25
msgid ""
"If checked, Gajim will send keep-alive packets to prevent connection timeout "
"which results in disconnection"
@@ -332,7 +317,6 @@
"zamedzenie straty spojenia, ktoré vyústi do odpojenia"
#: ../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"
@@ -341,8 +325,7 @@
"len pre vás"
#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:26
msgid ""
"If checked, Gajim, when launched, will automatically connect to jabber using "
"this account"
@@ -351,8 +334,7 @@
"tento účet"
#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:27
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 "
@@ -362,48 +344,49 @@
"menu na spodku zoznamu) spôsobí zmenu stavu aj v tomto účte"
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:30
msgid "Information about you, as stored in the server"
msgstr "Informácie o vás sú uložené na serveri"
#: ../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/accounts_window.glade.h:34 ../src/config.py:1564
+#: ../src/config.py:2067
msgid "No key selected"
msgstr "Žiadny kľúč nie je vybraný"
#. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. useauth_checkbutton.set_active(False)
+#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
#: ../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/accounts_window.glade.h:36
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1115
+#: ../src/config.py:1204 ../src/config.py:1472 ../src/config.py:1477
+#: ../src/config.py:1975 ../src/config.py:2053 ../src/config.py:2066
+#: ../src/config.py:3167 ../src/config.py:3235 ../src/dialogs.py:291
+#: ../src/dialogs.py:293 ../src/dialogs.py:519 ../src/roster_window.py:2713
+#: ../src/roster_window.py:2719 ../src/roster_window.py:2724
msgid "None"
msgstr "Žiadny"
#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:37
#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
msgid "Personal Information"
msgstr "Osobné informácie"
#: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
msgid "Port: "
msgstr "Port:"
#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:38
msgid "Priori_ty:"
msgstr "Priori_ta:"
#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:39
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 "
@@ -414,7 +397,7 @@
"najvyššou priritou obdrží udalosť"
#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:40
msgid "Priority will change automatically according to your status."
msgstr "Priorita sa zmení automatický podľa stavu."
@@ -423,12 +406,12 @@
msgstr "Proxy:"
#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:42
msgid "Resour_ce:"
msgstr "Z_droj:"
#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:43
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 "
@@ -443,29 +426,25 @@
"prioritou získava udalosti (viď nižšie)"
#: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
msgid "Save _passphrase (insecure)"
msgstr "Uložiť _heslo (nie je bezpečné)"
#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:44
msgid "Save conversation _logs for all contacts"
msgstr "Uložiť _záznam z rozhovoru pre všetky účty"
#: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
msgid "Send keep-alive packets"
msgstr "Poslať pakety na udržiavanie spojenia"
#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:47
msgid "Synch_ronize account status with global status"
msgstr "Synch_ronizovať stav účtu s globálnym stavom"
#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:49
#: ../data/glade/synchronise_contacts_dialog.glade.h:2
#: ../data/glade/synchronise_select_account_dialog.glade.h:2
msgid "Synchronise contacts"
@@ -476,12 +455,11 @@
msgstr "Použiť _SSL (historické dôvody)"
#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:53
msgid "Use file transfer proxies"
msgstr "Použiť proxy pre prenos súborov"
#: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
msgid "_Adjust to status"
msgstr "_Upraviť stav"
@@ -491,6 +469,7 @@
msgstr "_Jabber ID:"
#: ../data/glade/account_modification_window.glade.h:49
+#: ../data/glade/manage_proxies_window.glade.h:14
msgid "_Name:"
msgstr "_Názov:"
@@ -498,11 +477,16 @@
msgid "<b>Proxy</b>"
msgstr "<b>Proxy</b>"
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Upraviť stav"
+
+#: ../data/glade/accounts_window.glade.h:7
msgid "Accounts"
msgstr "Účty"
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
msgid ""
"Check this so Gajim will ask you before sending your password over an "
"insecure connection."
@@ -511,31 +495,27 @@
"nezabezpečené spojenie."
#: ../data/glade/accounts_window.glade.h:16
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "Prip_ojiť sa pri štarte programu Gajim"
+
+#: ../data/glade/accounts_window.glade.h:18
#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
msgid "E-Mail:"
msgstr "E-mail:"
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Povoliť"
-
#: ../data/glade/accounts_window.glade.h:19
#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
msgid "First Name:"
msgstr "Prvé meno:"
-#: ../data/glade/accounts_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:23
msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
msgstr ""
"Ak je zaškrtnuté, Gajim bude získavať heslo z GPG agenta podobného ako "
"seahorse"
-#: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:28
msgid ""
"If the default port that is used for incoming messages is unfitting for your "
"setup you can select another one here.\n"
@@ -545,57 +525,98 @@
"vlastný.\n"
"Zoberte v úvahu aj prípadné nastavenie firewallu."
-#: ../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/accounts_window.glade.h:31
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:675
msgid "Jabber ID:"
msgstr "Jabber ID:"
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:32
#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
msgid "Last Name:"
msgstr "Posledné meno:"
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:33
msgid "Mer_ge accounts"
msgstr "Z_lúčiť účty"
#. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5145
msgid "Re_name"
msgstr "Preme_novať"
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:46
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Poslať pakety na udržiavanie spojenia"
+
+#: ../data/glade/accounts_window.glade.h:48
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Synch_ronizovať stav účtu s globálnym stavom"
+
+#: ../data/glade/accounts_window.glade.h:50
+#, fuzzy
+msgid "Use G_PG Agent"
msgstr "Použit GPG _agenta"
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Použiť vlastný názov hostiteľa/portu"
+
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om port:"
msgstr "Použiť vlastný port:"
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/glade/accounts_window.glade.h:54
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Upraviť osobné informácie..."
+
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Enable"
+msgstr "Povoliť"
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Názov _hostiteľa:"
+
+#: ../data/glade/accounts_window.glade.h:58
+#, fuzzy
+msgid "_Manage..."
+msgstr "Spravovať..."
+
+#: ../data/glade/accounts_window.glade.h:60
+#, fuzzy
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/glade/accounts_window.glade.h:61
msgid "_Warn before using an insecure connection"
msgstr "V_arovať pred použitím nezabezpečeného spojenia"
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:62
+#, fuzzy
+msgid "_use HTTP__PROXY environment variable"
+msgstr "Použiť HTTP_PROXY premenu prostredia"
+
+#: ../data/glade/accounts_window.glade.h:63
msgid "gtk-add"
msgstr "gtk-add"
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/accounts_window.glade.h:64
#: ../data/glade/features_window.glade.h:4
+#: ../data/glade/manage_sounds_window.glade.h:1
msgid "gtk-close"
msgstr "gtk-close"
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:65
msgid "gtk-remove"
msgstr "gtk-remove"
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr "Použiť HTTP_PROXY premenu prostredia"
-
#: ../data/glade/add_new_contact_window.glade.h:1
msgid "A_ccount:"
msgstr "Úč_et:"
@@ -619,6 +640,9 @@
"protocol. Click on register button to\n"
"proceed."
msgstr ""
+"Musíte sa registrovať pomocou tohto transportu\n"
+"aby ste mohli pridať kontakt z tohto protokolu. \n"
+"Pre pokračocanie kliknite na tlačidlo registrovať."
#: ../data/glade/add_new_contact_window.glade.h:9
msgid ""
@@ -775,7 +799,7 @@
msgstr "Všetky stavy"
#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:215
msgid "Away"
msgstr "Preč"
@@ -792,7 +816,7 @@
msgstr "Má"
#: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:225
msgid "Invisible"
msgstr "Neviditeľný"
@@ -801,7 +825,7 @@
msgstr "Vykonať príkaz"
#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:198
msgid "Not Available"
msgstr "Neprítomný"
@@ -1031,9 +1055,9 @@
#: ../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/roster_window.glade.h:21
#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5841
msgid "_History"
msgstr "_História"
@@ -1139,7 +1163,7 @@
msgid "When a file transfer is complete show a popup notification"
msgstr "Keď je prenos súboru dokončený zobraziť vyskakovacie upozornenie"
-#: ../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 "_Pokračovať"
@@ -1175,7 +1199,7 @@
"Riadok s kontaktom\n"
"Titulok diskusie"
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:752
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:749
msgid "Bold"
msgstr "Tučné"
@@ -1199,7 +1223,7 @@
msgid "Inactive"
msgstr "Neaktívny"
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:753
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:750
msgid "Italic"
msgstr "Kurzíva"
@@ -1303,13 +1327,13 @@
msgid "Create new post"
msgstr "Vytvoriť novú správu"
-#: ../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:240
msgid "From"
msgstr "Od"
#. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:170
+#: ../src/history_manager.py:201
msgid "Subject"
msgstr "Predmet"
@@ -1358,7 +1382,7 @@
msgid "_Search Database"
msgstr "_Hľadať v databáze"
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
msgid "Conversation History"
msgstr "História konverzácie"
@@ -1381,7 +1405,7 @@
msgid "_Log conversation history"
msgstr "Zaznamenávať históriu k_onverzácie"
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1698
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1697
msgid "Join Group Chat"
msgstr "Pripojiť sa k diskusnej skupine"
@@ -1408,8 +1432,8 @@
msgid "Room:"
msgstr "Miestnosť:"
-#: ../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:1619
msgid "_Join"
msgstr "_Pripojiť"
@@ -1466,37 +1490,56 @@
msgstr "<b>Nastavenia</b>"
#: ../data/glade/manage_proxies_window.glade.h:3
+#, fuzzy
+msgid "B_OSH Port:"
+msgstr "_Port:"
+
+#: ../data/glade/manage_proxies_window.glade.h:4
+#, fuzzy
msgid ""
"HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
msgstr ""
"HTTP pripojenie\n"
"SOCKS5"
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:7
msgid "Manage Proxy Profiles"
msgstr "Spravovať Proxy profily"
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Meno:"
-
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/glade/manage_proxies_window.glade.h:8
msgid "Pass_word:"
msgstr "He_slo:"
-#: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Typ:"
-
#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Použiť overenie"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy:"
#: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Hostiteľ:"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Port:"
+#: ../data/glade/manage_proxies_window.glade.h:11
+msgid "Use HTTP prox_y"
+msgstr ""
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Použiť overenie"
+
+#: ../data/glade/manage_proxies_window.glade.h:13
+msgid "_BOSH URL:"
+msgstr ""
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+#, fuzzy
+msgid "_Type:"
+msgstr "Typ:"
+
#: ../data/glade/message_window.glade.h:1
msgid "Add this contact to roster (Ctrl+D)"
msgstr "Pridať tento kontakt do zoznamu (Ctrl+D)"
@@ -1644,10 +1687,14 @@
"neviditeľný"
#: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
msgid "Ask status message when I:"
msgstr "Vyžiadať správu o stave, keď som:"
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
msgid ""
"Autodetect on every Gajim startup\n"
"Always use GNOME default applications\n"
@@ -1661,19 +1708,19 @@
"Vždy použiť štandartné aplikácie Xfce\n"
"Vlastné"
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
msgid "Chat message:"
msgstr "Správa rozhovoru:"
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
msgid "Check on startup if Gajim is the _default Jabber client"
msgstr "Kontrolovať pri spustení, či je Gajim pre_dvoleným Jabber klientom"
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
msgid "Configure color and font of the interface"
msgstr "Nastavovať farbu a písmo rozhrania"
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
msgid ""
"Detached roster with detached chats\n"
"Detached roster with single chat\n"
@@ -1687,31 +1734,31 @@
"Oddelený zoznam od spojených rozhovorov podľa účtu\n"
"Oddelený zoznam od spojených rozhovorov podľa typu"
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
msgid "Display _activity of contacts in roster"
msgstr "Zobraziť _aktivitu kontaktov v zozname kontaktov"
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
msgid "Display _extra email details"
msgstr "Zobraziť ďalši_e podrobnosti o e-maile"
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
msgid "Display _tunes of contacts in roster"
msgstr "Zobraziť _hudbu kontaktov v zozname kontaktov"
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
msgid "Display a_vatars of contacts in roster"
msgstr "Zobraziť a_vatary v zozname kontaktov"
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
msgid "Display m_ood of contacts in roster"
msgstr "Zobraziť _náladu kontaktov v zozname kontaktov"
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
msgid "Display status _messages of contacts in roster"
msgstr "Zobraziť stavovú _informáciu kontaktov v zozname kontaktov"
-#: ../data/glade/preferences_window.glade.h:46
+#: ../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 "
@@ -1721,7 +1768,7 @@
"inou osobou. Tu môžete vybrať stavy, ktoré majú byť zobrazované v diskusnom "
"okne."
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
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 "
@@ -1731,7 +1778,7 @@
"vašim kontaktom. Tu môžete vybrať stavy, o ktorých majú byť odosielané "
"informácie druhej strane."
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
msgid ""
"Gajim will notify you via a popup window in the bottom right of the screen "
"about contacts that just signed out"
@@ -1739,11 +1786,11 @@
"Gajim vás bude upozorňovať vyskakovacími oknami v pravej spodnej časti "
"obrazovky na kontakty, ktoré sa práve odpojili"
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
msgid "Hide all buttons in chat windows"
msgstr "Skryje všetky tlačidlá v oknách rozhovorov"
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
msgid ""
"If checked, Gajim will allow others to detect the operation system you are "
"using"
@@ -1751,20 +1798,20 @@
"Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
"používate"
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
msgid ""
"If checked, Gajim will also include information about the sender of the new "
"emails"
msgstr ""
"Ak je zaškrtnuté, Gajim pridá informácie o odosielateľovi do nových e-mailov"
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
msgid ""
"If checked, Gajim will change status to Away when the computer is unused."
msgstr ""
"Ak je zaškrtnuté, Gajim zmení stav na Preč, keď nebude používaný počítač."
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
msgid ""
"If checked, Gajim will change status to Not Available when the computer has "
"not been used even longer"
@@ -1772,7 +1819,7 @@
"Ak je zaškrtnuté, Gajim zmení stav na Neprítomný, keď nebude dlhšie "
"používaný počítač."
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
msgid ""
"If checked, Gajim will display avatars of contacts in roster window and in "
"group chats"
@@ -1780,7 +1827,7 @@
"Ak je zaškrtnuté, Gajim bude zobrazovať avatarov v zozname kontaktov a v "
"oknách s diskusnými skupinami."
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
msgid ""
"If checked, Gajim will display status messages of contacts under the contact "
"name in roster window and in group chats"
@@ -1788,28 +1835,28 @@
"Ak je zaškrtnuté, Gajim bude zobrazovať správu o stave kontaktov pod menom v "
"zozname kontaktov a v oknách s diskusnými skupinami"
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
msgid ""
"If checked, Gajim will display the activity of contacts in the roster window"
msgstr ""
"Ak je zaškrtnuté, Gajim bude zobrazovať aktivitu kontaktov v okne sozoznamom "
"kontaktov."
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
msgid ""
"If checked, Gajim will display the mood of contacts in the roster window"
msgstr ""
"Ak je zaškrtnuté, Gajim bude zobrazovať náladu kontaktov v okne so zoznamom "
"kontaktovi."
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
msgid ""
"If checked, Gajim will display the tunes of contacts in the roster window"
msgstr ""
"Ak je zaškrtnuté, Gajim bude zobrazovať hudbu kontaktov v okne so zoznamom "
"kontaktov"
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
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 "
@@ -1820,7 +1867,7 @@
"pravým na vstupné pole, predvolený jazyk bude použitý pre tento kontakt "
"alebo diskusnú skupinu."
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
msgid ""
"If checked, Gajim will ignore incoming events from unauthorized contacts. "
"Use with caution, because it blocks all messages from any contact that is "
@@ -1830,14 +1877,14 @@
"neautorizovaných kontaktov. Použite opatrne, pretože to blokuje všetky "
"správy od akýchkoľvek kontaktov, ktoré nie sú v zozname"
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
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 ""
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
msgid ""
"If checked, Gajim will show a notification when a new e-mail is received via "
"GMail"
@@ -1845,7 +1892,7 @@
"Ak je zaškrtnuté, Gajim zobrazí upozornenie, keď bude prijatý nový e-mail "
"cez GMail"
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
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, "
@@ -1855,7 +1902,7 @@
"kontakt z MSN bude mať ekvivalentné ikonky pre stavy prítomný, preč, "
"zaneprázdnený, atď...)"
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
msgid ""
"If enabled, Gajim will not ask for a status message. The specified default "
"message will be used instead."
@@ -1863,7 +1910,7 @@
"Ak je povolené, Gajim sa nebude pýtať na správu o stave. Namiesto nej bude "
"použitá predvolená špecifikovaná správa."
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
msgid ""
"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
"animated or static graphical emoticons"
@@ -1871,43 +1918,50 @@
"Ak nie je zakázané, Gajim nahradí ascii emotikony ako ':)' ekvivalentným "
"grafickým obrázkom"
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
msgid "Log _encrypted chat session"
msgstr "Zaznamenať reláciu šifrova_ného rozhovoru"
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
msgid "Ma_ke message windows compact"
msgstr "Zmeniť okno správ na _kompaktné"
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
msgid "Ma_nage..."
msgstr "_Spravovať..."
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
msgid "Notifications"
msgstr "Upozornenia"
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
msgid "Notify me about contacts that sign _in"
msgstr "Upozorniť ma, keď sa kontakty pr_ihlásia"
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
msgid "Notify me about contacts that sign _out"
msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
msgid "Notify on new _GMail email"
msgstr "Upozorniť keď príde na _Gmail e-mail"
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
msgid "Personal Events"
msgstr "Osobné udalosti"
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
msgid "Play _sounds"
msgstr "Prehrať _zvuky"
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
msgid ""
"Pop it up\n"
"Notify me about it\n"
@@ -1915,21 +1969,26 @@
msgstr ""
"Vyskakovacie okno\n"
"Upozorniť ma o tom\n"
-"Zobraziť len v zozname"
+"Zobraziť len v zozname kontaktov"
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
msgid "Preferences"
msgstr "Predvoľby"
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "_Zobraziť udalosť v oblasti systémových upozornení"
+
+#: ../data/glade/preferences_window.glade.h:85
msgid "Sign _in"
msgstr "Prihlás_il sa"
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
msgid "Sign _out"
msgstr "_Odhlásil sa"
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
msgid ""
"Some messages may include rich content (formatting, colors etc). If checked, "
"Gajim will just display the raw message text."
@@ -1937,139 +1996,145 @@
"Niektoré správy môžu obsahovať rozširujúce informácie (formátovanie, farby, "
"atď.). Ak je zaškrtnuté, Gajim bude zobrazovať len jednoduchý text."
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
msgid "Sort contacts by status"
msgstr "Usporiadať kontakty podľa stavu"
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:387
msgid "Status"
msgstr "Stav"
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
msgid "Status _iconset:"
msgstr "Zostava stavových _ikôn:"
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
msgid "Style"
msgstr "Štýl"
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
msgid "T_heme:"
msgstr "_Téma:"
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
msgid ""
"The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
msgstr ""
"Automatická správa pre stav preč. Ak je prázdna, Gajim nebude meniť súčasnú "
"stavovú správu o stave"
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
msgid ""
"The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
msgstr ""
"Automatická správa pre stav neprítomný. Ak je prázdna, Gajim nebude meniť "
"súčasnú správu o stave"
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
msgid "Use _transports icons"
msgstr "Použiť ikony _transportov"
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
msgid "Use system _default"
msgstr "Použiť systémové _nastavenia"
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
msgid "When new event is received:"
msgstr "Keď nastane nová udalosť:"
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
msgid "_Away after:"
msgstr "_Preč po:"
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
msgid "_Browser:"
msgstr "_Prehliadač:"
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
msgid "_Display chat state notifications:"
msgstr "Zo_braziť upozornenia o stave rozhovoru:"
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
msgid "_Emoticons:"
msgstr "_Emotikony:"
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
msgid "_File manager:"
msgstr "_Správca súborov:"
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
msgid "_Highlight misspelled words"
msgstr "_Zvýrazniť zle napísané slová"
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
msgid "_Ignore events from contacts not in the roster"
msgstr "_Ignorovať udalosti od kontaktov, ktoré nie sú v zozname"
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
msgid "_Ignore rich content in incoming messages"
msgstr "_Ignorovať rozšírený obsah prichádzajúcich správ"
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
msgid "_Incoming message:"
msgstr "_Prichádzajúca správa:"
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
msgid "_Log status changes of contacts"
msgstr "_Zaznamenať zmenu stavu kontaktu"
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
msgid "_Mail client:"
msgstr "_E-mailový klient:"
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
msgid "_Not available after:"
msgstr "_Neprítomný po:"
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
msgid "_Open..."
msgstr "_Otvoriť..."
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
msgid "_Outgoing message:"
msgstr "_Odchádzajúca správa:"
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
msgid "_Reset to Default Colors"
msgstr "Náv_rat k pôvodnému nastaveniu farieb"
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
msgid "_Send chat state notifications:"
msgstr "Odo_slať upozornenia o stave rozhovoru:"
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
msgid "_Status message:"
msgstr "_Správa o stave:"
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
msgid "_URL highlight:"
msgstr "Zvýrazňovanie _URL:"
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
msgid "_Window behavior:"
msgstr "_Správanie okna:"
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
msgid "in _group chats"
msgstr "v _diskusných skupiných"
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
msgid "in _roster"
msgstr "v _zozname kontaktov"
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
msgid "minutes"
msgstr "minút"
@@ -2117,7 +2182,7 @@
msgid "Order:"
msgstr "Poradie:"
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2571
msgid "Privacy List"
msgstr "Súkromný zoznam"
@@ -2182,108 +2247,108 @@
msgstr "<b>Spoločnosť:</b>"
#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
msgid "<b>Country:</b>"
msgstr "<b>Krajina:</b>"
#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
msgid "<b>Department:</b>"
msgstr "<b>Oddelenie:</b>"
#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
msgid "<b>E-Mail:</b>"
msgstr "<b>E-mail:</b>"
#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
msgid "<b>Extra Address:</b>"
msgstr "<b>Ďaľšia adresa:</b>"
#. Family Name
#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
msgid "<b>Family:</b>"
msgstr "<b>Priezvisko:</b>"
#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
msgid "<b>Full Name</b>"
msgstr "<b>Celé meno</b>"
#. Given Name
#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
msgid "<b>Given:</b>"
msgstr "<b>Krstné meno:</b>"
#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
msgid "<b>Homepage:</b>"
msgstr "<b>Domovská stránka:</b>"
#. Middle Name
#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
msgid "<b>Middle:</b>"
msgstr "<b>Druhé meno:</b>"
#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
msgid "<b>Name:</b>"
msgstr "<b>Meno:</b>"
#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
msgid "<b>Nickname:</b>"
msgstr "<b>Prezývka:</b>"
#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
msgid "<b>Phone No.:</b>"
msgstr "<b>Telefónne č.:</b>"
#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
msgid "<b>Position:</b>"
msgstr "<b>Pozícia:</b>"
#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
msgid "<b>Postal Code:</b>"
msgstr "<b>PSČ:</b>"
#. Prefix in Name
#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
msgid "<b>Prefix:</b>"
msgstr "<b>Titul pred:</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:30 ../src/vcard.py:328
msgid "<b>Role:</b>"
msgstr "<b>Úloha:</b>"
#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
msgid "<b>State:</b>"
msgstr "<b>Štát:</b>"
#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
msgid "<b>Street:</b>"
msgstr "<b>Ulica:</b>"
#. Suffix in Name
#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
msgid "<b>Suffix:</b>"
msgstr "<b>Titul za:</b>"
#. "About" is the text of a tab of vcard window
#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
msgid "About"
msgstr "O mne"
@@ -2293,17 +2358,17 @@
#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
msgid "Format: YYYY-MM-DD"
msgstr "Formát: YYYY-MM-DD"
#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
msgid "Personal Info"
msgstr "Osobné informácie"
#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
msgid "Work"
msgstr "Práca"
@@ -2321,8 +2386,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:5182
+#: ../src/roster_window.py:5660 ../src/roster_window.py:5789
msgid "_Remove"
msgstr "O_dstrániť"
@@ -2344,14 +2409,14 @@
#. Execute Command
#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5732
msgid "Execute Command..."
msgstr "Vykonať príkaz..."
#. 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:5100 ../src/roster_window.py:5613
msgid "In_vite to"
msgstr "Poz_vať do"
@@ -2361,7 +2426,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:5110 ../src/roster_window.py:5698
msgid "Send Cus_tom Status"
msgstr "Poslať vlas_tný stav"
@@ -2387,8 +2452,8 @@
msgstr "_Povoliť jemu/jej vidieť môj stav"
#: ../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:5173 ../src/roster_window.py:5650
+#: ../src/roster_window.py:5779
msgid "_Block"
msgstr "_Blokovať"
@@ -2414,8 +2479,8 @@
msgstr "_Požiadavky"
#: ../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:5167 ../src/roster_window.py:5644
+#: ../src/roster_window.py:5776
msgid "_Unblock"
msgstr "_Odblokovať"
@@ -2448,56 +2513,61 @@
msgstr "Profil, a_vatar"
#: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Zobraziť _odhlásené kontakty"
+
+#: ../data/glade/roster_window.glade.h:10
msgid "Show Trans_ports"
msgstr "Zobraziť trans_porty"
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
msgid "Show _Offline Contacts"
msgstr "Zobraziť _odhlásené kontakty"
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
msgid "Show _roster"
msgstr "Zobraziť _zoznam"
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
msgid "_Accounts"
msgstr "Úč_ty"
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
#: ../data/glade/subscription_request_window.glade.h:6
msgid "_Actions"
msgstr "_Akcie"
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
msgid "_Contents"
msgstr "Ob_sah"
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1353
msgid "_Edit"
msgstr "_Upraviť"
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
msgid "_FAQ"
msgstr "Často k_ladené otázky"
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
msgid "_Help"
msgstr "_Pomocník"
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
msgid "_Preferences"
msgstr "_Predvoľby"
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
msgid "_Quit"
msgstr "_Koniec"
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
msgid "_Send Single Message..."
msgstr "Poslať krátku _správu..."
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
msgid "_View"
msgstr "_Zobraziť"
@@ -2514,11 +2584,11 @@
msgstr "_Pridať kontakt"
#. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5801
msgid "_Information"
msgstr "_Informácie"
-#: ../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 "_Hľadať"
@@ -2654,49 +2724,54 @@
msgid "<b>Client:</b>"
msgstr "<b>Klient:</b>"
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Štát:</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
msgid "<b>Jabber ID:</b>"
msgstr "<b>Jabber ID:</b>"
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
msgid "<b>Resource:</b>"
msgstr "<b>Zdroj:</b>"
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
msgid "<b>Status:</b>"
msgstr "<b>Stav:</b>"
#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
msgid "<b>Subscription:</b>"
msgstr "<b>Podpis:</b>"
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
msgid "<b>System:</b>"
msgstr "<b>Systém:</b>"
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
msgid "Comments"
msgstr "Komentáre"
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
msgid "Configured avatar:"
msgstr "Nastavovaný avatar:"
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
#: ../data/glade/zeroconf_information_window.glade.h:1
msgid "Contact"
msgstr "Kontakt"
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
msgid "Contact Information"
msgstr "Kontaktné informácie"
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
msgid "More"
msgstr "Viac"
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
msgid "User avatar:"
msgstr "Používa avatar:"
@@ -2708,6 +2783,11 @@
msgid "<b>XML Input</b>"
msgstr "<b>XML vstup</b>"
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Povoliť"
+
#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
#: ../data/glade/xml_console_window.glade.h:6
msgid "Info/Query"
@@ -2736,13 +2816,13 @@
#. Edit Groups
#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5633
msgid "Edit _Groups"
msgstr "Upraviť _skupiny"
#. Rename
#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5759
msgid "_Rename"
msgstr "_Premenovať"
@@ -2766,10 +2846,6 @@
msgid "Status:"
msgstr "Stav:"
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Upraviť účet"
-
#: ../src/adhoc_commands.py:264
msgid "Cancel confirmation"
msgstr "Zrušiť potvrdenie"
@@ -2813,7 +2889,7 @@
msgid "Text"
msgstr "Text"
-#: ../src/advanced.py:102 ../src/chat_control.py:772
+#: ../src/advanced.py:102 ../src/chat_control.py:769
msgid "Color"
msgstr "Farba"
@@ -2843,168 +2919,169 @@
#. #!/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 "Angličtina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Belarusian"
msgstr "Bieloruština"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Bulgarian"
msgstr "Bulharčina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Breton"
msgstr "Bretónčina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Czech"
msgstr "Čeština"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "German"
msgstr "Nemčina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Greek"
msgstr "Gréčtina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "British"
msgstr "Britština"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Esperanto"
msgstr "Esperanto"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Spanish"
msgstr "Španielčina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Basque"
msgstr "Baskičtina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "French"
msgstr "Francúzština"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Croatian"
msgstr "Chorvátčina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Italian"
msgstr "Taliančina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Norwegian (b)"
msgstr "Nórčina (b)"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Dutch"
msgstr "Holandština"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Norwegian"
msgstr "Nórčina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Polish"
msgstr "Poľština"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Portuguese"
msgstr "Portugalčina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Brazilian Portuguese"
msgstr "Brazílska portugalčina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Russian"
msgstr "Ruština"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Serbian"
msgstr "Srbština"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Slovak"
msgstr "Slovenčina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Swedish"
msgstr "Švédčina"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Chinese (Ch)"
msgstr "Čínština (Ch)"
-#: ../src/chat_control.py:336
+#: ../src/chat_control.py:345
msgid "Spelling language"
msgstr "Jazyk používaný pri kontrole pravopisu"
#. we are not connected
-#: ../src/chat_control.py:359 ../src/chat_control.py:555
+#: ../src/chat_control.py:368 ../src/chat_control.py:556
msgid "A connection is not available"
msgstr "Pripojenie nie je dostupné"
-#: ../src/chat_control.py:360 ../src/chat_control.py:556
+#: ../src/chat_control.py:369 ../src/chat_control.py:557
msgid "Your message can not be sent until you are connected."
msgstr "Vašu správu nie je možné odoslať, pokiaľ nebudete pripojený."
-#: ../src/chat_control.py:754
+#: ../src/chat_control.py:751
#, fuzzy
msgid "Underline"
msgstr "Neurčitý"
-#: ../src/chat_control.py:755
+#: ../src/chat_control.py:752
#, fuzzy
msgid "Strike"
msgstr "Chorý"
-#: ../src/chat_control.py:778
+#: ../src/chat_control.py:775
msgid "Font"
msgstr ""
-#: ../src/chat_control.py:787
+#: ../src/chat_control.py:784
#, fuzzy
msgid "Clear formating"
msgstr "Kontaktné informácie"
-#: ../src/chat_control.py:1215 ../src/chat_control.py:1611
+#: ../src/chat_control.py:1220 ../src/chat_control.py:1623
msgid "GPG encryption enabled"
msgstr "Povolené GPG šifrovanie"
#. Add to roster
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1237 ../src/chat_control.py:2107
-#: ../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/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:1250 ../src/chat_control.py:2125
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:56
+#: ../src/common/helpers.py:227 ../src/conversation_textview.py:858
+#: ../src/dialogs.py:900 ../src/dialogs.py:1648 ../src/gajim.py:999
+#: ../src/gajim.py:1731 ../src/normal_control.py:483
+#: ../src/roster_window.py:910 ../src/roster_window.py:1541
+#: ../src/roster_window.py:1543 ../src/roster_window.py:1894
+#: ../src/roster_window.py:3083 ../src/roster_window.py:3109
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5479
msgid "Not in Roster"
msgstr "Nie je v zozname"
-#: ../src/chat_control.py:1369 ../src/tooltips.py:627
+#: ../src/chat_control.py:1382 ../src/tooltips.py:627
msgid "Unknown Artist"
msgstr "Neznámy umelec"
-#: ../src/chat_control.py:1371 ../src/tooltips.py:632
+#: ../src/chat_control.py:1384 ../src/tooltips.py:632
msgid "Unknown Title"
msgstr "Neznámy titulok"
-#: ../src/chat_control.py:1373 ../src/tooltips.py:637
+#: ../src/chat_control.py:1386 ../src/tooltips.py:637
msgid "Unknown Source"
msgstr "Neznámy zdroj"
-#: ../src/chat_control.py:1377 ../src/tooltips.py:639
+#: ../src/chat_control.py:1390 ../src/tooltips.py:639
#, python-format
msgid ""
"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3013,7 +3090,7 @@
"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
"z <i>%(source)s</i>"
-#: ../src/chat_control.py:1382
+#: ../src/chat_control.py:1395
#, python-format
msgid ""
"%(title)s by %(artist)s\n"
@@ -3022,92 +3099,92 @@
"%(title)s od %(artist)s\n"
"z %(source)s"
-#: ../src/chat_control.py:1506
+#: ../src/chat_control.py:1518
#, python-format
msgid "%(nickname)s from group chat %(room_name)s"
msgstr "%(nickname)s z diskusnej skupiny %(room_name)s"
#. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1591 ../src/dialogs.py:3911
+#: ../src/chat_control.py:1603 ../src/dialogs.py:3912
msgid "No GPG key assigned"
msgstr ""
-#: ../src/chat_control.py:1592
+#: ../src/chat_control.py:1604
msgid ""
"No GPG key is assigned to this contact. So you cannot encrypt messages with "
"GPG."
msgstr "=="
-#: ../src/chat_control.py:1601
+#: ../src/chat_control.py:1613
msgid "GPG encryption disabled"
msgstr "Zakázané GPG šifrovanie"
-#: ../src/chat_control.py:1626
+#: ../src/chat_control.py:1639
msgid "Session WILL be logged"
msgstr "Relácia BUDE zaznamenaná"
-#: ../src/chat_control.py:1628
+#: ../src/chat_control.py:1641
msgid "Session WILL NOT be logged"
msgstr "Relácia NEBUDE zaznamenaná"
#. encryption %s active
-#: ../src/chat_control.py:1642
+#: ../src/chat_control.py:1655
msgid "is"
msgstr "je"
-#: ../src/chat_control.py:1642
+#: ../src/chat_control.py:1655
msgid "is NOT"
msgstr "NIE je"
#. chat session %s be logged
-#: ../src/chat_control.py:1644
+#: ../src/chat_control.py:1657
msgid "will"
msgstr "bude"
-#: ../src/chat_control.py:1644
+#: ../src/chat_control.py:1657
msgid "will NOT"
msgstr "NEbude"
#. About encrypted chat session
-#: ../src/chat_control.py:1648
+#: ../src/chat_control.py:1661
msgid "and authenticated"
msgstr "a overený"
#. About encrypted chat session
-#: ../src/chat_control.py:1652
+#: ../src/chat_control.py:1665
msgid "and NOT authenticated"
msgstr "a NEoverený"
#. 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:1658
+#: ../src/chat_control.py:1671
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
"Your chat session %(logged)s be logged."
msgstr ""
-#: ../src/chat_control.py:1706
+#: ../src/chat_control.py:1719
msgid "Command not supported for zeroconf account."
msgstr ""
-#: ../src/chat_control.py:1717 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1730 ../src/groupchat_control.py:1657
#, python-format
msgid "Commands: %s"
msgstr "Príkazy: %s"
-#: ../src/chat_control.py:1720 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1733 ../src/groupchat_control.py:1671
#, python-format
msgid "Usage: /%s, clears the text window."
msgstr "Použitie: /%s, vyčistí textové okno."
-#: ../src/chat_control.py:1723 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1736 ../src/groupchat_control.py:1676
#, python-format
msgid "Usage: /%s, hide the chat buttons."
msgstr "Použitie: /%s, skryje tlačidlá rozhovoru."
-#: ../src/chat_control.py:1726 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1739 ../src/groupchat_control.py:1692
#, python-format
msgid ""
"Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3116,77 +3193,77 @@
"Použitie: /%(command)s <akcia>, odošle akciu pre aktuálnu diskusnú skupinu. "
"Použite tretiu osobu. (napr. /%(command)s explodoval.)"
-#: ../src/chat_control.py:1731
+#: ../src/chat_control.py:1744
#, python-format
msgid "Usage: /%s, sends a ping to the contact"
msgstr "Použitie: /%s, pošle ping kontaktu"
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1747
#, python-format
msgid "Usage: /%s, send the message to the contact"
msgstr "Použitie: /%s, pošle správu kontaktu"
-#: ../src/chat_control.py:1737 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1750 ../src/groupchat_control.py:1715
#, python-format
msgid "No help info for /%s"
msgstr "Žiadne informácie s pomocou pre /%s"
-#: ../src/chat_control.py:1870
+#: ../src/chat_control.py:1883
msgid "Session negotiation cancelled"
msgstr ""
-#: ../src/chat_control.py:1877
+#: ../src/chat_control.py:1890
msgid "This session is encrypted"
msgstr "Táto relácia je šifrovaná"
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1893
msgid " and WILL be logged"
msgstr " a BUDE zaznamenaná"
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1895
msgid " and WILL NOT be logged"
msgstr " a NEBUDE zaznamenaná"
-#: ../src/chat_control.py:1887
+#: ../src/chat_control.py:1900
msgid ""
"Remote contact's identity not verified. Click the shield button for more "
"details."
msgstr ""
-#: ../src/chat_control.py:1889
+#: ../src/chat_control.py:1902
msgid "E2E encryption disabled"
msgstr "E2E šifrovanie zakázané"
-#: ../src/chat_control.py:1918 ../src/chat_control.py:1931
+#: ../src/chat_control.py:1936 ../src/chat_control.py:1949
msgid "The following message was NOT encrypted"
msgstr "Nasledujúca správa NEbola šifrovaná"
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1942
msgid "The following message was encrypted"
msgstr "Nasledujúca správa bola šifrovaná"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2295
+#: ../src/chat_control.py:2313
#, python-format
msgid "You just received a new message from \"%s\""
msgstr "Práve ste prijali novú správu od \"%s\""
-#: ../src/chat_control.py:2296
+#: ../src/chat_control.py:2314
msgid ""
"If you close this tab and you have history disabled, this message will be "
"lost."
msgstr ""
"Ak zatvoríte túto kartu a máte deaktivovanú históriu, správa bude stratená."
-#: ../src/chat_control.py:2446 ../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/chat_control.py:2462 ../src/common/connection_handlers.py:1961
+#: ../src/common/connection_handlers.py:2007
+#: ../src/common/connection_handlers.py:2195
+#: ../src/common/connection_handlers.py:2328 ../src/common/connection.py:1344
+#: ../src/gajim.py:177
msgid "Database Error"
msgstr "Chyba databázy"
-#: ../src/chat_control.py:2447
+#: ../src/chat_control.py:2463
#, python-format
msgid ""
"The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3195,163 +3272,175 @@
"Súbor databázy (%s) nemôže byť prečítaný. Skúste ho opraviť alebo ho "
"odstrániť (všetko v histórii bude stratené)."
-#: ../src/chat_control.py:2678
+#: ../src/chat_control.py:2699
#, python-format
msgid "%(name)s is now %(status)s"
msgstr "%(name)s je teraz %(status)s"
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
msgid "creating logs database"
msgstr "vytváranie záznamov databáz"
-#: ../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 je súbor ale mal byť priečinok"
-#: ../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 "Gajim bude ukončený"
-#: ../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 je priečinok ale mal byť súbor"
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:153
#, python-format
msgid "creating %s directory"
msgstr "vytváram priečinok %s"
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
msgid "Change status information"
msgstr "Zmeniť informáciu o stave"
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
msgid "Change status"
msgstr "Zmeniť stav"
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
msgid "Set the presence type and description"
msgstr ""
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
msgid "Free for chat"
msgstr "Mám čas na debatu"
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
msgid "Online"
msgstr "Prítomný"
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
msgid "Extended away"
msgstr ""
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
msgid "Do not disturb"
msgstr "Nerušiť"
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
msgid "Offline - disconnect"
msgstr "Odhlásený - odpojený"
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
msgid "Presence description:"
msgstr ""
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
msgid "The status has been changed."
msgstr "Stav bol zmenený."
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
msgid "Leave Groupchats"
msgstr "Opustiť diskusnú skupinu"
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
#, python-format
msgid "%(nickname)s on %(room_jid)s"
msgstr "%(nickname)s v %(room_jid)s"
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
msgid "You have not joined a groupchat."
msgstr "Neboli ste prihlásený do diskusnej skupiny."
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
msgid "Choose the groupchats you want to leave"
msgstr "Zvolte diskusné skupiny, ktoré chcete opustiť"
#. 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/commands.py:205 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:56 ../src/roster_window.py:784
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1547
+#: ../src/roster_window.py:5070
msgid "Groupchats"
msgstr "Diskuné skupiny"
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
msgid "You left the following groupchats:"
msgstr "Opustili ste nasledujúce diskusné skupiny:"
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
msgid "Forward unread messages"
-msgstr ""
+msgstr "Preposlať neprečítané správy"
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
msgid "All unread messages have been forwarded."
msgstr ""
#: ../src/common/config.py:82
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:83
msgid "Use D-Bus and Notification-Daemon to show notifications"
msgstr "Použiť D-Bus a Notification-Daemon pre zobrazenie upozornení"
-#: ../src/common/config.py:87
+#: ../src/common/config.py:85
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:88
msgid "Time in minutes, after which your status changes to away."
msgstr "Čas v minútach, po ktorých sa zmení stav na preč."
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
msgid "$S (Away as a result of being idle more than $T min)"
msgstr "$S (Preč ako výsledok nečinnosti viac ako $T minút)"
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
msgid "$S will be replaced by current status message, $T by autoaway time."
msgstr ""
-#: ../src/common/config.py:90
+#: ../src/common/config.py:91
msgid "Time in minutes, after which your status changes to not available."
msgstr "Čas v minútach, po ktorých sa zmení stav na neprítomný."
-#: ../src/common/config.py:91
+#: ../src/common/config.py:92
msgid "$S (Not available as a result of being idle more than $T min)"
msgstr "$S (Neprítomný ako výsledok nečinnosti viac ako $T minút)"
-#: ../src/common/config.py:91
+#: ../src/common/config.py:92
msgid "$S will be replaced by current status message, $T by autoxa time."
msgstr ""
-#: ../src/common/config.py:111
+#: ../src/common/config.py:102
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:112
msgid ""
"List (space separated) of rows (accounts and groups) that are collapsed."
msgstr ""
"Zoznam (oddelený medzerami) a riadkov (účet a skupina), ktoré sú zabalené."
#. 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:3121
+#: ../src/common/config.py:113 ../src/common/config.py:464
+#: ../src/common/optparser.py:221 ../src/common/optparser.py:439
+#: ../src/common/optparser.py:473 ../src/gajim.py:3263
msgid "default"
msgstr "predvolená"
-#: ../src/common/config.py:116
+#: ../src/common/config.py:117
msgid "Enable link-local/zeroconf messaging"
msgstr "Povoliť link-local/zeroconf správy"
-#: ../src/common/config.py:119
+#: ../src/common/config.py:120
msgid "Language used by speller"
msgstr "Jazyk pre kontrolu pravopisu"
-#: ../src/common/config.py:120
+#: ../src/common/config.py:121
msgid ""
"'always' - print time for every message.\n"
"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3361,25 +3450,25 @@
"'sometimes' - zobraziť každých print_ichat_every_foo_minutes minút.\n"
"'never' - nezobrazovať čas."
-#: ../src/common/config.py:121
+#: ../src/common/config.py:122
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 ""
-#: ../src/common/config.py:124
+#: ../src/common/config.py:125
msgid "Treat * / _ pairs as possible formatting characters."
msgstr "Použiť * / _ pár znakov ako možné formátovacie znaky."
-#: ../src/common/config.py:125
+#: ../src/common/config.py:126
msgid ""
"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
msgstr ""
"Ak je pravda, neodstaňuj */_ . Takže *abc* bude tečné a * * nebude "
"odstránené."
-#: ../src/common/config.py:128
+#: ../src/common/config.py:129
msgid ""
"Uses ReStructured text markup to send HTML, plus ascii formatting if "
"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3390,7 +3479,7 @@
"sourceforge.net/docs/ref/rst/restructuredtext.html (Ak to chcete používať, "
"nainštalujte docutils)"
-#: ../src/common/config.py:137
+#: ../src/common/config.py:138
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -3398,7 +3487,7 @@
"Znak použitý za prezývkou, keď sa používa automatické dopĺňanie (tab) v "
"diskusnej skupine."
-#: ../src/common/config.py:138
+#: ../src/common/config.py:139
msgid ""
"Character to propose to add after desired nickname when desired nickname is "
"used by someone else in group chat."
@@ -3406,26 +3495,26 @@
"Vaša prezývka sa zhoduje s inou prezývkou v diskusnej miestnosti aj po "
"pripojení znaku."
-#: ../src/common/config.py:161
+#: ../src/common/config.py:167
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 ""
-#: ../src/common/config.py:162
+#: ../src/common/config.py:168
msgid "Characters that are printed before the nickname in conversations"
msgstr "Znaky zobrazené za prezývkou v konverzáciách"
-#: ../src/common/config.py:163
+#: ../src/common/config.py:169
msgid "Characters that are printed after the nickname in conversations"
msgstr "Znaky zobrazené pred prezývkou v konverzáciách"
-#: ../src/common/config.py:168
+#: ../src/common/config.py:173
msgid "Add * and [n] in roster title?"
msgstr "Pridať * a [n] do titulku zoznamu?"
-#: ../src/common/config.py:169
+#: ../src/common/config.py:174
msgid ""
"How many lines to remember from previous conversation when a chat tab/window "
"is reopened."
@@ -3433,11 +3522,11 @@
"Koľko riadkov si pamätať z predchádzajúceho rozhovoru, keď bude karta/okno "
"znovu otvorená."
-#: ../src/common/config.py:170
+#: ../src/common/config.py:175
msgid "How many minutes should last lines from previous conversation last."
msgstr "Z koľkých minút majú byť riadky s predchádzajúcej konverzácie."
-#: ../src/common/config.py:171
+#: ../src/common/config.py:176
msgid ""
"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
"Client default behaviour)."
@@ -3445,11 +3534,11 @@
"Poslať správu pri stlačení Ctrl+Enter a pri Enter spraviť nový riadok "
"(chovanie podobné ako Mirabilis ICQ klient)"
-#: ../src/common/config.py:173
+#: ../src/common/config.py:178
msgid "How many lines to store for Ctrl+KeyUP."
msgstr "Koľko riadkov posunúť pri stlačení Ctrl+KP_hore."
-#: ../src/common/config.py:176
+#: ../src/common/config.py:181
#, python-format
msgid ""
"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3458,12 +3547,12 @@
"Ani url s %s kde je %s slovo/fráza alebo 'WIKTIONARY' čo znamená použitie "
"wiktionary."
-#: ../src/common/config.py:179
+#: ../src/common/config.py:184
msgid "If checked, Gajim can be controlled remotely using gajim-remote."
msgstr ""
"Ak je zaškrtnuté, Gajim môže byť ovládaný na diaľku s použitím gajim-remote."
-#: ../src/common/config.py:180
+#: ../src/common/config.py:185
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 "
@@ -3474,20 +3563,20 @@
"účtov (nie je nutné, aby listen_to_network_manager bolo nastavené na False) "
"podľa stavu sieťového pripojenia."
-#: ../src/common/config.py:181
+#: ../src/common/config.py:186
msgid ""
"Sent chat state notifications. Can be one of all, composing_only, disabled."
msgstr ""
"Posielanie informácii o stave diskusie. Môže byť nastavené na hodnotu all, "
"composing_only, disabled."
-#: ../src/common/config.py:182
+#: ../src/common/config.py:187
msgid ""
"Displayed chat state notifications in chat windows. Can be one of all, "
"composing_only, disabled."
msgstr ""
-#: ../src/common/config.py:184
+#: ../src/common/config.py:189
msgid ""
"When not printing time for every message (print_time==sometimes), print it "
"every x minutes."
@@ -3495,11 +3584,11 @@
"Pokiaľ sa čas pri každej správe (print_time==sometimes), vypíše sa každých x "
"minút."
-#: ../src/common/config.py:185
+#: ../src/common/config.py:190
msgid "Ask before closing a group chat tab/window."
msgstr "Spýtať sa pred zatvorením okna/záložky pre diskusnú skupinu."
-#: ../src/common/config.py:186
+#: ../src/common/config.py:191
msgid ""
"Always ask before closing group chat tab/window in this space separated list "
"of group chat jids."
@@ -3507,7 +3596,7 @@
"Vždy sa spýtať pred zatvorením okna/záložky diskusnej skupiny, ktorej meno "
"je uvedené v zozname diskusných JID."
-#: ../src/common/config.py:187
+#: ../src/common/config.py:192
msgid ""
"Never ask before closing group chat tab/window in this space separated list "
"of group chat jids."
@@ -3515,56 +3604,50 @@
"Nikdy sa nepýtať pred zatvorením karty/okna pre diskusnú skupinu, ktorej "
"meno je uvedené v zozname JID."
-#: ../src/common/config.py:190
+#: ../src/common/config.py:195
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 ""
-#: ../src/common/config.py:192
+#: ../src/common/config.py:197
msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
msgstr "IEC štandard znamená KiB = 1024 bajtov, KB = 1000 bajtov."
-#: ../src/common/config.py:194
+#: ../src/common/config.py:199
msgid "Notify of events in the system trayicon."
msgstr "Upozorňovať na udalosti v oblasti systémových upozornení."
-#: ../src/common/config.py:200
+#: ../src/common/config.py:205
msgid "Show tab when only one conversation?"
msgstr "Ukázať kartu len ak prebieha konverzácia?"
-#: ../src/common/config.py:201
+#: ../src/common/config.py:206
msgid "Show tabbed notebook border in chat windows?"
msgstr ""
-#: ../src/common/config.py:202
+#: ../src/common/config.py:207
msgid "Show close button in tab?"
msgstr "Zobraziť zatváracie tlačidlo v karte?"
-#: ../src/common/config.py:203
+#: ../src/common/config.py:208
msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../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 ""
-#: ../src/common/config.py:213
+#: ../src/common/config.py:217
msgid "Preview new messages in notification popup?"
msgstr "Predbežné zobrazenie nových správ vo vyskakovacom upozornení."
-#: ../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 "Bodkočiarkou oddelený zoznam slov bude zvýraznený v diskusnej skupine."
-#: ../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."
@@ -3572,14 +3655,14 @@
"Ak je pravda, Gajim skončí keď bude X tlačidlo vo Window manažéri stlačené. "
"Toto nastavenie je použíté, len v prípade, že sa používa trayikona."
-#: ../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 ""
"Ak je pravda, Gajim bude kontrolovať pri každom štarte, či je štandartný "
"klient."
-#: ../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."
@@ -3587,7 +3670,7 @@
"Ak je pravda, Gajim zobrazí ikonku na každej záložke obsahujúcej neprečítané "
"správy. Závisí na téme, ikonka môže byť animovaná."
-#: ../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."
@@ -3595,11 +3678,11 @@
"Ak je pravda, Gajim zobrazí stavovú správu v zozname kontaktov, za "
"predpokladu, že táto správa nie je prázdna."
-#: ../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 ""
-#: ../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."
@@ -3607,7 +3690,7 @@
"Ak je pravda, Gajim si vyžiada avatara, pre každý kontakt, ktorý nemá "
"avatara z posledného spojenia, alebo ak nie je cache príliš zastaralá."
-#: ../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."
@@ -3615,7 +3698,7 @@
"Ak nie je pravda, nebudete vidieť informáciu o zmene stavu kontaktu a jeho/"
"jej stavovú správu"
-#: ../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 "
@@ -3624,28 +3707,28 @@
"group chat."
msgstr ""
-#: ../src/common/config.py:232
+#: ../src/common/config.py:236
msgid "Background color of contacts when they just signed in."
msgstr "Farba pozadia použitá pri prihlásení kontaktu."
-#: ../src/common/config.py:233
+#: ../src/common/config.py:237
msgid "Background color of contacts when they just signed out."
msgstr "Farba pozadia použitá pri odhlásení kontaktu."
-#: ../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 "Ak je pravda, obnovené správy budú zobrazené menším písmom."
-#: ../src/common/config.py:236
+#: ../src/common/config.py:240
msgid "Don't show avatar for the transport itself."
msgstr "Nezobrazovať avatarov pre transport."
-#: ../src/common/config.py:237
+#: ../src/common/config.py:241
msgid "Don't show roster in the system taskbar."
msgstr "Nezobrazovať zoznam v paneli úloh."
-#: ../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 "
@@ -3655,7 +3738,7 @@
"2.8, potom bude okno blikať (bežné správanie pre väčšinu okenných "
"manažérov), keď sa udeje nejaká udalosť."
-#: ../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 "
@@ -3666,7 +3749,7 @@
"informácie o prítomnosti v diskusnej skupine."
#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../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"
@@ -3686,31 +3769,31 @@
"'pertype' - Každý typ správy (napr., rozhovory proti diskusiám) sú odoslané "
"do špecifikovaného okna."
-#: ../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 "Ak nie je pravda, neuvidíte avatarov v diskusnom okne"
-#: ../src/common/config.py:245
+#: ../src/common/config.py:249
msgid "If True, pressing the escape key closes a tab/window."
msgstr "Ak je pravda, stlačením Esc klávesy zatvoríte kartu/okno."
-#: ../src/common/config.py:246
+#: ../src/common/config.py:250
msgid "Hides the buttons in chat windows."
msgstr "Skývať tlačidlá v okne rozhovoru."
-#: ../src/common/config.py:247
+#: ../src/common/config.py:251
msgid "Hides the banner in a group chat window"
msgstr "Skrývanie titulku v okne s diskusnou skupinou"
-#: ../src/common/config.py:248
+#: ../src/common/config.py:252
msgid "Hides the banner in two persons chat window"
msgstr "Skryť titulok v okne s diskusiou dvoch osôb."
-#: ../src/common/config.py:249
+#: ../src/common/config.py:253
msgid "Hides the group chat occupants list in group chat window."
msgstr "Skrývanie zoznamu účastníkov v okne s diskusnou skupinou."
-#: ../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."
@@ -3718,15 +3801,15 @@
"V rozhovore sa zobrazí prezývka na začiatku riadku, len v prípade, že "
"predchádzajúca správa prišla od inej osoby."
-#: ../src/common/config.py:251
+#: ../src/common/config.py:255
msgid "Indentation when using merge consecutive nickname."
msgstr ""
-#: ../src/common/config.py:252
+#: ../src/common/config.py:256
msgid "Smooth scroll message in conversation window"
msgstr ""
-#: ../src/common/config.py:253
+#: ../src/common/config.py:257
#, fuzzy
msgid ""
"List of colors, separated by \":\", that will be used to color nicknames in "
@@ -3734,13 +3817,13 @@
msgstr ""
"Zoznam farieb, ktoré budú použité na zafarbenie prezývok v diskusnej skupine."
-#: ../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 vás presunie na ďalšiu kartu, pokiaľ už nie sú žiadne neprečítané "
"správy."
-#: ../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."
@@ -3748,14 +3831,14 @@
"Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
"znamená, že dialóg sa nezobrazuje."
-#: ../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 ""
-#: ../src/common/config.py:257
+#: ../src/common/config.py:261
msgid ""
"If True, Gajim will use Gnome Keyring (if available) to store account "
"passwords."
@@ -3763,7 +3846,7 @@
"Ak je pravda, Gajim bude používať Správca zväzku kľúčov (ak je prítomný) na "
"ukladanie hesiel."
-#: ../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."
@@ -3771,13 +3854,13 @@
"Ak je pravda, Gajim bude zobrazovať počet prítomných a všetkých kontaktov v "
"riadku účtu a skupiny."
-#: ../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"
msgstr ""
-#: ../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."
@@ -3785,17 +3868,17 @@
"Ak je pravda, Gajim naroluje a označí kontakt, ktorý poslal poslednú správu, "
"ak nie je práve otvorené okno rozhovoru."
-#: ../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 ""
-#: ../src/common/config.py:262
+#: ../src/common/config.py:266
msgid "Time of inactivity needed before the change status window closes down."
msgstr "Doba neaktivity potrebná na zmenenie stavu na zatvoril okno."
-#: ../src/common/config.py:263
+#: ../src/common/config.py:267
msgid ""
"Maximum number of lines that are printed in conversations. Oldest lines are "
"cleared."
@@ -3803,29 +3886,29 @@
"Maximálny počet riadkov zobrazených v rozhovore. Najstaršie riadky budú "
"zmazané."
-#: ../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 ""
-#: ../src/common/config.py:265
+#: ../src/common/config.py:269
msgid "Choose interval between 2 checks of idleness."
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 ""
-#: ../src/common/config.py:267
+#: ../src/common/config.py:271
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 separately)"
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."
@@ -3833,60 +3916,60 @@
"Priorita sa zmení automaticky vzhľadom k vášmu stavu. Priority sú definované "
"v premenných autopriority_* nastaveniach."
-#: ../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 ""
-#: ../src/common/config.py:287
+#: ../src/common/config.py:291
msgid "If enabled, restore the last status that was used."
msgstr "Ak je povolené, obnoví sa naposledy použitý stav."
-#: ../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 ""
-#: ../src/common/config.py:294
+#: ../src/common/config.py:298
msgid "Enable ESessions encryption for this account."
msgstr "Povoliť šifrovanie ESessions pre tento účet."
-#: ../src/common/config.py:295
+#: ../src/common/config.py:299
msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr ""
+msgstr "Má Gajim automaticky spúšťať šifrovanú reláciu keď je to možné?"
-#: ../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 ""
-#: ../src/common/config.py:297
+#: ../src/common/config.py:301
msgid ""
"Show a warning dialog before sending password on an plaintext connection."
msgstr "Zobraziť upozornenie pred poslaním hesla cez plaintext spojenie."
-#: ../src/common/config.py:298
+#: ../src/common/config.py:302
msgid "Show a warning dialog before using standard SSL library."
msgstr "Zobraziť upozornenie pred použitím štandardnej SSL knižnice."
-#: ../src/common/config.py:300
+#: ../src/common/config.py:304
msgid "Space separated list of ssl errors to ignore."
msgstr ""
-#: ../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 ""
-#: ../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."
@@ -3894,19 +3977,25 @@
"Ak je zaškrtnuté, Gajim použije vašu IP adresu a proxy definovanú v "
"premennej file_transfer_proxies na prenos súborov."
-#: ../src/common/config.py:334
+#: ../src/common/config.py:338
msgid "Answer to receipt requests"
msgstr ""
-#: ../src/common/config.py:335
+#: ../src/common/config.py:339
msgid "Sent receipt requests"
msgstr ""
-#: ../src/common/config.py:389
+#: ../src/common/config.py:347
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:405
msgid "Is OpenPGP enabled for this contact?"
msgstr "Má tento kontakt k dispozícii OpenPGP?"
-#: ../src/common/config.py:390
+#: ../src/common/config.py:406
msgid ""
"Should Gajim automatically start an encrypted session with this contact when "
"possible?"
@@ -3914,168 +4003,199 @@
"Mal by sa Gajim spúšťať automaticky so šifrovanou reláciou pre tento kontakt "
"keď je to možné?"
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:407 ../src/common/config.py:410
msgid "Language for which we want to check misspelled words"
msgstr "Jazyk v ktorom má byť prevádzaná kontrola pravopisu"
-#: ../src/common/config.py:400
+#: ../src/common/config.py:416
msgid "all or space separated status"
msgstr "všetky alebo medzerou oddelené stavy"
-#: ../src/common/config.py:401
+#: ../src/common/config.py:417
msgid "'yes', 'no', or 'both'"
msgstr "'áno', 'nie', alebo 'oboje'"
-#: ../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:418 ../src/common/config.py:420
+#: ../src/common/config.py:421 ../src/common/config.py:424
+#: ../src/common/config.py:425
msgid "'yes', 'no' or ''"
msgstr "'áno', 'nie' alebo ''"
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:431 ../src/common/pep.py:159
msgid "Sleeping"
msgstr "Spím"
-#: ../src/common/config.py:416
+#: ../src/common/config.py:432
msgid "Back soon"
msgstr "Hneď som späť"
-#: ../src/common/config.py:416
+#: ../src/common/config.py:432
msgid "Back in some minutes."
msgstr "Som späť za pár minút."
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:433 ../src/common/pep.py:129
msgid "Eating"
msgstr "Jem"
-#: ../src/common/config.py:417
+#: ../src/common/config.py:433
msgid "I'm eating, so leave me a message."
msgstr "Práve jem, prosím nechajte mi odkaz."
-#: ../src/common/config.py:418
+#: ../src/common/config.py:434
msgid "Movie"
msgstr "Film"
-#: ../src/common/config.py:418
+#: ../src/common/config.py:434
msgid "I'm watching a movie."
msgstr "Pozerám film."
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:435 ../src/common/pep.py:188
msgid "Working"
msgstr "Pracujem"
-#: ../src/common/config.py:419
+#: ../src/common/config.py:435
msgid "I'm working."
msgstr "Pracujem."
-#: ../src/common/config.py:420
+#: ../src/common/config.py:436
msgid "Phone"
msgstr "Telefonujem"
-#: ../src/common/config.py:420
+#: ../src/common/config.py:436
msgid "I'm on the phone."
msgstr "Telefonujem."
-#: ../src/common/config.py:421
+#: ../src/common/config.py:437
msgid "Out"
msgstr "Vonku"
-#: ../src/common/config.py:421
+#: ../src/common/config.py:437
msgid "I'm out enjoying life."
msgstr "Som vonku a užívam si život."
-#: ../src/common/config.py:425
+#: ../src/common/config.py:441
msgid "I'm available."
msgstr "Prítomný."
-#: ../src/common/config.py:426
+#: ../src/common/config.py:442
msgid "I'm free for chat."
msgstr "Mám čas na rozhovor."
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:443 ../src/config.py:1404
msgid "Be right back."
msgstr "Za chvíľu som späť."
-#: ../src/common/config.py:428
+#: ../src/common/config.py:444
msgid "I'm not available."
msgstr "Nie som prítomný."
-#: ../src/common/config.py:429
+#: ../src/common/config.py:445
msgid "Do not disturb."
msgstr "Nerušiť."
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:446 ../src/common/config.py:447
msgid "Bye!"
msgstr "Ahoj!"
-#: ../src/common/config.py:441
+#: ../src/common/config.py:457
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 ""
-#: ../src/common/config.py:442
+#: ../src/common/config.py:458
msgid "Sound to play when any MUC message arrives."
msgstr "Prehrať zvuk keď príde nejaká MUC správa."
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:467 ../src/common/optparser.py:235
msgid "green"
msgstr "zelená"
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:471 ../src/common/optparser.py:221
msgid "grocery"
msgstr "obchod s potravinami"
-#: ../src/common/config.py:459
+#: ../src/common/config.py:475
msgid "human"
msgstr "človek"
-#: ../src/common/config.py:463
+#: ../src/common/config.py:479
msgid "marine"
msgstr "námornícka"
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:74
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
msgid "Unable to load idle module"
msgstr "Nie je možné nahrať idle modul"
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:236
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
msgid "Wrong host"
msgstr "Nesprávny hostiteľ"
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:237
msgid "Invalid local address? :-O"
msgstr "Neplatná miestna adresa? :-O"
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:670
#, python-format
msgid "Registration information for transport %s has not arrived in time"
msgstr "Redistračné informácie pre službu %s nedorazili včas"
-#: ../src/common/connection_handlers.py:930
-#: ../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:677
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Registrovať na %s"
+
+#: ../src/common/connection_handlers.py:678
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:680
+#, fuzzy
+msgid "Registration failed"
+msgstr "Spojenie zlyhalo"
+
+#: ../src/common/connection_handlers.py:680
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:968
+#: ../src/common/connection_handlers.py:1959
+#: ../src/common/connection_handlers.py:2005
+#: ../src/common/connection_handlers.py:2193
+#: ../src/common/connection_handlers.py:2326 ../src/common/connection.py:1342
+#: ../src/gajim.py:400
msgid "Disk Write Error"
msgstr "Chyba pri zápise na disk"
-#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1175 ../src/common/connection.py:917
msgid "Invisibility not supported"
msgstr "Neviditeľnosť nie je podporovaná"
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1176 ../src/common/connection.py:918
#, python-format
msgid "Account %s doesn't support invisibility."
msgstr "Účet %s nepodporuje neviditeľnosť."
-#: ../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:1787 ../src/common/connection.py:1157
+#: ../src/config.py:1829 ../src/config.py:1837 ../src/config.py:1880
+#: ../src/config.py:3105 ../src/dataforms_widget.py:603 ../src/dialogs.py:2357
+msgid "Invalid Jabber ID"
+msgstr "Nesprávné Jabber ID"
+
+#: ../src/common/connection_handlers.py:1788
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1962
+#: ../src/common/connection_handlers.py:2008
+#: ../src/common/connection_handlers.py:2196
+#: ../src/common/connection_handlers.py:2329 ../src/common/connection.py:1345
+#: ../src/gajim.py:178
#, fuzzy, python-format
msgid ""
"The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4084,7 +4204,7 @@
"Súbor databázy (%s) nemôže byť prečítaný. Skúste ho opraviť alebo ho "
"odstrániť (všetko v histórii bude stratené)."
-#: ../src/common/connection_handlers.py:1966
+#: ../src/common/connection_handlers.py:2080
#, python-format
msgid "Nickname not allowed: %s"
msgstr "Prezývka nie je povolená: %s"
@@ -4092,70 +4212,70 @@
#. we are banned
#. group chat does not exist
#. user may close the window before we are here
-#: ../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:556
+#: ../src/common/connection_handlers.py:2155
+#: ../src/common/connection_handlers.py:2158
+#: ../src/common/connection_handlers.py:2161
+#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2168 ../src/gajim.py:548
msgid "Unable to join group chat"
msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
-#: ../src/common/connection_handlers.py:2042
+#: ../src/common/connection_handlers.py:2156
#, python-format
msgid "You are banned from group chat %s."
msgstr ""
-#: ../src/common/connection_handlers.py:2045
+#: ../src/common/connection_handlers.py:2159
#, python-format
msgid "Group chat %s does not exist."
msgstr "Diskusná skupina %s neexistuje."
-#: ../src/common/connection_handlers.py:2048
+#: ../src/common/connection_handlers.py:2162
msgid "Group chat creation is restricted."
msgstr "Vytváranie diskusných skupín je obmedzené."
-#: ../src/common/connection_handlers.py:2051
+#: ../src/common/connection_handlers.py:2165
#, python-format
msgid "Your registered nickname must be used in group chat %s."
msgstr "Vaša zaregistrovaná prezývka musí byť použitá v diskusnej skupine %s."
-#: ../src/common/connection_handlers.py:2055
+#: ../src/common/connection_handlers.py:2169
#, python-format
msgid "You are not in the members list in groupchat %s."
-msgstr ""
+msgstr "Nie ste v zozname členov v skupinovej diskusii %s."
#. Room has been destroyed. see
#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2097
+#: ../src/common/connection_handlers.py:2211
msgid "Room has been destroyed"
msgstr "Miestnosť bola zničená"
-#: ../src/common/connection_handlers.py:2104
+#: ../src/common/connection_handlers.py:2218
#, python-format
msgid "You can join this room instead: %s"
msgstr ""
-#: ../src/common/connection_handlers.py:2131
+#: ../src/common/connection_handlers.py:2245
msgid "I would like to add you to my roster."
msgstr "Chcem si vás pridať do môjho zoznamu."
#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2152
+#: ../src/common/connection_handlers.py:2266
#, python-format
msgid "we are now subscribed to %s"
msgstr "sme prihlásení k %s"
-#: ../src/common/connection_handlers.py:2154
+#: ../src/common/connection_handlers.py:2268
#, python-format
msgid "unsubscribe request from %s"
msgstr "požiadavka na odhlásenie od %s"
-#: ../src/common/connection_handlers.py:2156
+#: ../src/common/connection_handlers.py:2270
#, python-format
msgid "we are now unsubscribed from %s"
msgstr "sme odhlásení od %s"
-#: ../src/common/connection_handlers.py:2331
+#: ../src/common/connection_handlers.py:2453
#, python-format
msgid ""
"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4166,215 +4286,220 @@
"odstránenie"
#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2356
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2478
+#: ../src/common/zeroconf/connection_zeroconf.py:173
msgid "OpenPGP passphrase was not given"
msgstr "OpenPGP passfráza nebola zadaná"
#. %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/common/connection_handlers.py:2480
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1935
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "Budete pripojený k %s bez OpenPGP."
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
msgid "Unable to get issuer certificate"
msgstr ""
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
msgid "Unable to get certificate CRL"
msgstr "Nepodarilo sa získať certifikát CRL"
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
msgid "Unable to decrypt certificate's signature"
msgstr "Nepodarilo sa dešifrovať podpis certifikátu"
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
msgid "Unable to decrypt CRL's signature"
msgstr "Nepodarilo sa dešifrovať CRL podpis"
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
msgid "Unable to decode issuer public key"
msgstr ""
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
msgid "Certificate signature failure"
msgstr "Podpísanie certifikátu zlyhalo"
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
msgid "CRL signature failure"
msgstr ""
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
msgid "Certificate is not yet valid"
msgstr ""
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
msgid "Certificate has expired"
msgstr "Certifikát vypršal"
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
msgid "CRL is not yet valid"
msgstr ""
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
msgid "CRL has expired"
msgstr "CRL vypršal"
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
msgid "Format error in certificate's notBefore field"
msgstr ""
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
msgid "Format error in certificate's notAfter field"
msgstr ""
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
msgid "Format error in CRL's lastUpdate field"
msgstr ""
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
msgid "Format error in CRL's nextUpdate field"
msgstr ""
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
msgid "Out of memory"
msgstr ""
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
msgid "Self signed certificate"
msgstr ""
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
msgid "Self signed certificate in certificate chain"
msgstr ""
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
msgid "Unable to get local issuer certificate"
msgstr ""
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
msgid "Unable to verify the first certificate"
msgstr "Nepodarilo sa overiť prvý certifikát"
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
msgid "Certificate chain too long"
msgstr "Reťazec certifikátu je príliš dlhý"
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
msgid "Certificate revoked"
msgstr ""
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
msgid "Invalid CA certificate"
msgstr "Neplatný CA certifikát"
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
msgid "Path length constraint exceeded"
msgstr ""
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
msgid "Unsupported certificate purpose"
msgstr ""
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
msgid "Certificate not trusted"
msgstr "Certifikát nie je dôverný"
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
msgid "Certificate rejected"
msgstr "Certifikát odmietnutý"
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
msgid "Subject issuer mismatch"
msgstr ""
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
msgid "Authority and subject key identifier mismatch"
msgstr ""
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
msgid "Authority and issuer serial number mismatch"
msgstr ""
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
msgid "Key usage does not include certificate signing"
msgstr ""
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
msgid "Application verification failure"
msgstr ""
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:271
+#: ../src/common/zeroconf/connection_zeroconf.py:215
#, python-format
msgid "Connection with account \"%s\" has been lost"
msgstr "Spojenie s účtom \"%s\" bolo stratené"
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:272
msgid "Reconnect manually."
msgstr "Znovu pripojiť manuálne."
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:283
#, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
msgstr "Server %(name)s odpovedal zle na požiadavku o registráciu: %(error)s"
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:317
#, python-format
msgid "Server %s provided a different registration form"
msgstr "Server %s poskytol rozdielny registračný formulár"
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:330
#, python-format
msgid "Unknown SSL error: %d"
msgstr "Neznáma chyba SSL: %d"
#. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:345
msgid "Invalid answer"
msgstr "Nesprávna odpoveď"
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:346
#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
msgstr ""
"Transport %(name)s odpovedal nesprávne pri odoslaní registračnej požiadavky: "
"%(error)s"
-#: ../src/common/connection.py:522
-msgid "Connection to proxy failed"
-msgstr "Pripojenie k proxy zlyhalo"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1355
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../src/common/connection.py:629 ../src/common/connection.py:755
+#: ../src/common/connection.py:1478
+#: ../src/common/zeroconf/connection_zeroconf.py:249
#, python-format
msgid "Could not connect to \"%s\""
msgstr "Nie je možné pripojiť sa k \"%s\""
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:630 ../src/gajim.py:1094
msgid "Check your connection or try again later."
msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr."
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:635
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Uložené do: %s"
+
+#: ../src/common/connection.py:648
+msgid "Connection to proxy failed"
+msgstr "Pripojenie k proxy zlyhalo"
+
+#: ../src/common/connection.py:679 ../src/common/connection.py:735
#, python-format
msgid "Could not connect to account %s"
msgstr "Nie je možné pripojiť sa k účtu %s"
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:680 ../src/common/connection.py:736
#, python-format
msgid "Connection with account %s has been lost. Retry connecting."
msgstr "Spojenie s účtom \"%s\" bolo stratené. Zopakuje sa pripájanie."
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:702
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
msgstr ""
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:705
#, python-format
msgid ""
"\n"
@@ -4383,7 +4508,7 @@
"\n"
"Chyba SSL: <b>%s</b>"
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:707
#, python-format
msgid ""
"\n"
@@ -4392,24 +4517,24 @@
"\n"
"Neznáma chyba SSL: %d"
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:756
msgid "Check your connection or try again later"
msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr"
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:781
#, python-format
msgid "Authentication failed with \"%s\""
msgstr "Overenie zlyhalo s \"%s\""
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:783
msgid "Please check your login and password for correctness."
msgstr "Prosím, skontrolujte správnosť prihlasovacieho mena a hesla."
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:844
msgid "Error while removing privacy list"
msgstr "Chyba počas odstraňovania súkromného zoznamu"
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:845
#, python-format
msgid ""
"Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4418,25 +4543,30 @@
"Súkromný zoznam %s nebol odstránený. Možno je používaný jedným z vašich "
"pripojených zdrojov. Deaktivujte ho a skúste to znovu."
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../src/common/connection.py:1158 ../src/dialogs.py:2358
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Nie je možné poslať prázdne súbory"
+
+#: ../src/common/connection.py:1180
+#: ../src/common/zeroconf/connection_zeroconf.py:389
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:1182
+#: ../src/common/zeroconf/connection_zeroconf.py:391
#, python-format
msgid "The contact's key (%s) does not match the key assigned in Gajim."
msgstr "Kľúč (%s) kontaktu sa nezhoduje s kľúčom prideleným v programe Gajim."
#. we're not english
#. one in locale and one en
-#: ../src/common/connection.py:1105
+#: ../src/common/connection.py:1230
msgid "[This message is *encrypted* (See :XEP:`27`]"
msgstr "[Táto správa je *šifrovaná* (Pozrite :XEP:`27`]"
-#: ../src/common/connection.py:1210
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1332
+#: ../src/common/zeroconf/connection_zeroconf.py:468
#, python-format
msgid ""
"Subject: %(subject)s\n"
@@ -4445,19 +4575,20 @@
"Predmet: %(subject)s\n"
"%(message)s"
-#: ../src/common/connection.py:1388
+#: ../src/common/connection.py:1511 ../src/common/connection.py:1532
msgid "Not fetched because of invisible status"
msgstr "Nie je možné získať, pretože aktuálny stav je: Neviditeľný"
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:56
+#: ../src/gajim.py:999
msgid "Observers"
msgstr "Pozorovatelia"
#: ../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/common/helpers.py:56 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1350 ../src/gajim.py:812 ../src/roster_window.py:814
+#: ../src/roster_window.py:1468 ../src/roster_window.py:1537
+#: ../src/roster_window.py:1539 ../src/roster_window.py:1688
msgid "Transports"
msgstr "Transporty"
@@ -4466,11 +4597,11 @@
msgstr "Nie je v zozname"
#. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:49
msgid "D-Bus python bindings are missing in this computer"
msgstr "D-Bus python väzby chýbajú na tomto počítači"
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:50
msgid "D-Bus capabilities of Gajim cannot be used"
msgstr "D-Bus vlastnosti programu Gajim nemôžu byť použité"
@@ -4650,229 +4781,229 @@
msgid "Weekend!"
msgstr "Víkend!"
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:141
msgid "Invalid character in username."
msgstr "Nepovolený znak v názve účtu."
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:146
msgid "Server address required."
msgstr "Adresa serveru je požadovaná."
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:152
msgid "Invalid character in hostname."
msgstr "Nepovolený znak v názve hostiteľa."
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:159
msgid "Invalid character in resource."
msgstr "Nepovolený znak v zdroji."
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:191
msgid "_Busy"
msgstr "_Zaneprázdnený"
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:193
msgid "Busy"
msgstr "Zaneprázdnený"
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:196
msgid "_Not Available"
msgstr "_Neprítomný"
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:201
msgid "_Free for Chat"
msgstr "_Mám čas na debatu"
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:203
msgid "Free for Chat"
msgstr "Mám čas na debatu"
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:206
msgid "_Available"
msgstr "_Prítomný"
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:208 ../src/features_window.py:115
msgid "Available"
msgstr "Prítomný"
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:210
msgid "Connecting"
msgstr "Pripájanie"
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:213
msgid "A_way"
msgstr "P_reč"
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:218
msgid "_Offline"
msgstr "_Odhlásený"
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:220
msgid "Offline"
msgstr "Odhlásený"
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:223
msgid "_Invisible"
msgstr "_Neviditeľný"
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:229
msgid "?contact has status:Unknown"
msgstr "?kontakt má stav:Neznámy"
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:231
msgid "?contact has status:Has errors"
msgstr "?kontakt má stav:Chyba"
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:236
msgid "?Subscription we already have:None"
msgstr "?Zápis už máme:Žiadny"
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:238
msgid "To"
msgstr "Pre"
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:242
msgid "Both"
msgstr "Oba"
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:250
msgid "?Ask (for Subscription):None"
msgstr "?Vyžiadať (zápis): Žiadny"
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:252
msgid "Subscribe"
msgstr "Zapísať"
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:261
msgid "?Group Chat Contact Role:None"
msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:264
msgid "Moderators"
msgstr "Moderátori"
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:266
msgid "Moderator"
msgstr "Moderátor"
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:269
msgid "Participants"
msgstr "Účastníci"
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:271
msgid "Participant"
msgstr "Účastník"
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:274
msgid "Visitors"
msgstr "Návštevníci"
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:276
msgid "Visitor"
msgstr "Návštevník"
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:282
msgid "?Group Chat Contact Affiliation:None"
msgstr "?Príslušnosť kontaktu v diskusnej skupine: žiadna"
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:284
msgid "Owner"
msgstr "Vlastník"
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:286
msgid "Administrator"
msgstr "Administrátor"
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:288
msgid "Member"
msgstr "Člen"
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:325
msgid "is paying attention to the conversation"
msgstr "sleduje konverzáciu"
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:327
msgid "is doing something else"
msgstr "robí niečo iné"
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:329
msgid "is composing a message..."
msgstr "píše správu..."
#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:332
msgid "paused composing a message"
msgstr "prestal písať správu"
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:334
msgid "has closed the chat window or tab"
msgstr "zatvoril okno alebo záložku"
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:662
#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:665
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:669
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:672
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:676
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:679
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:682
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1089 ../src/common/helpers.py:1096
+#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
msgstr[0] "%d správ čaká"
msgstr[1] "%d správa čaká"
msgstr[2] "%d správy čakajú"
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1102
#, python-format
msgid " from room %s"
msgstr " z miestnosti %s"
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1105 ../src/common/helpers.py:1124
#, python-format
msgid " from user %s"
msgstr " od používateľa %s"
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1107
#, python-format
msgid " from %s"
msgstr " od %s"
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1114 ../src/common/helpers.py:1121
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
@@ -4880,29 +5011,34 @@
msgstr[1] "%d udalosť čaká"
msgstr[2] "%d udalosti čakajú"
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1154
#, python-format
msgid "Gajim - %s"
msgstr "Gajim - %s"
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, fuzzy, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
+
#. we talk about a file
#: ../src/common/optparser.py:56
#, python-format
msgid "error: cannot open %s for reading"
msgstr "chyba: nie je možné otvoriť %s na čítanie"
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:230 ../src/common/optparser.py:231
msgid "cyan"
msgstr "azúrová"
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:347
msgid "migrating logs database to indices"
msgstr ""
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim účet %s"
+#: ../src/common/passwords.py:117
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "účtu %s"
#: ../src/common/pep.py:29
msgid "Afraid"
@@ -5539,12 +5675,12 @@
msgstr "Píšem"
#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
#, python-format
msgid "Unable to bind to port %s."
msgstr "Nie je možné použiť port %s."
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
msgid ""
"Maybe you have another running instance of Gajim. File Transfer will be "
"cancelled."
@@ -5552,7 +5688,7 @@
"Možno máte spustenú inú inštanciu programu Gajim. Prenos súboru bude zrušený."
#. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
msgid ""
"[This is part of an encrypted session. If you see this message, something "
"went wrong.]"
@@ -5560,30 +5696,23 @@
"[Toto je časť šifrovanej relácie. Ak vidíte túto správu, potom je niečo "
"nesprávne.]"
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Spojenie na hostiteľa nie je možné vytvoriť: Vypršal časový limit pri "
-"odosielaní dát."
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
#, python-format
msgid ""
"The host %s you configured as the ft_add_hosts_to_send advanced option is "
"not valid, so ignored."
msgstr ""
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:216
msgid "To continue sending and receiving messages, you will need to reconnect."
msgstr ""
"Pre pokračovanie odosielania a prijímania správ, sa musíte znovu pripojiť."
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:239
msgid "Avahi error"
msgstr "Chyba Avahi"
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:239
#, python-format
msgid ""
"%s\n"
@@ -5592,31 +5721,31 @@
"%s\n"
"Link-local správy nemusia správne fungovať."
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:250
msgid "Please check if Avahi or Bonjour is installed."
msgstr "Prosím skontrolujte, či je nainštalovaný program Avahi alebo Bonjour."
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
msgid "Could not start local service"
msgstr "Nie je možné spustiť lokálnu službu"
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:260
#, python-format
msgid "Unable to bind to port %d."
msgstr "Nie je možné použiť port %d."
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
msgid "Please check if avahi-daemon is running."
msgstr "Prosím skontrolujte, či je spustený program avahi-daemon"
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:358
#, python-format
msgid "Could not change status of account \"%s\""
msgstr "Nie je možné zmeniť stav účtu \"%s\""
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:381
msgid ""
"You are not connected or not visible to others. Your message could not be "
"sent."
@@ -5625,59 +5754,58 @@
"odoslať."
#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:399
msgid "[This message is encrypted]"
msgstr "[Táto správa je šifrovaná]"
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:483
msgid "Your message could not be sent."
msgstr "Vašu správu nie je možné odoslať."
#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:489
msgid "Contact is offline. Your message could not be sent."
msgstr "Kontakt je odhlásený. Vašu správu nie je možné odoslať."
+#: ../src/common/zeroconf/connection_zeroconf.py:586
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Spojenie na hostiteľa nie je možné vytvoriť: Vypršal časový limit pri "
+"odosielaní dát."
+
#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
#, python-format
msgid "Error while adding service. %s"
msgstr "Chyba pri pridávaní služby. %s"
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:602
msgid "Disabled"
msgstr "Zakázané"
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Aktívne"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Udalosť"
-
-#: ../src/config.py:405
+#: ../src/config.py:392
msgid "Default Message"
msgstr "Predvolená správa"
-#: ../src/config.py:412
+#: ../src/config.py:399
msgid "Enabled"
msgstr "Povolené"
-#: ../src/config.py:454
+#: ../src/config.py:441
msgid "Always use OS/X default applications"
msgstr "Vždy použiť štandartné aplikácie OS/X"
-#: ../src/config.py:455
+#: ../src/config.py:442
msgid "Custom"
msgstr "Vlastný"
-#: ../src/config.py:650 ../src/dialogs.py:1200
+#: ../src/config.py:668 ../src/dialogs.py:1196
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "Slovník pre jazyk %s nie je k dispozícii"
-#: ../src/config.py:651
+#: ../src/config.py:669
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -5687,252 +5815,212 @@
"pravopisu, prípadne si môžete zvoliť iný jazyk na kontrolu pravopisu "
"nastavením premennej setting the speller_language."
-#: ../src/config.py:1016
+#: ../src/config.py:1046
msgid "status message title"
msgstr "titulok správy o stave"
-#: ../src/config.py:1016
+#: ../src/config.py:1046
msgid "status message text"
msgstr "text správy o stave"
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Prvá prijatá správa"
-
-#: ../src/config.py:1054
-msgid "Next Message Received Focused"
-msgstr "Ďalšia prijatá správa zameraná"
-
-#: ../src/config.py:1056
-msgid "Next Message Received Unfocused"
-msgstr "Ďalšia prijatá správa nezameraná"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Kontakt pripojený"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Kontakt odpojený"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Správa odoslaná"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Zvýraznenie správ v diskusnej skupine"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Prijatá správa - diskusná skupina"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "Prijatý GMail e-mail"
-
#. 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/config.py:1326 ../src/dialogs.py:1823 ../src/dialogs.py:1887
+#: ../src/disco.py:771 ../src/disco.py:1563 ../src/disco.py:1809
#: ../src/history_window.py:87
msgid "Name"
msgstr "Meno"
-#: ../src/config.py:1405
+#: ../src/config.py:1412
msgid "Relogin now?"
msgstr "Prihlásiť znovu?"
-#: ../src/config.py:1406
+#: ../src/config.py:1413
msgid "If you want all the changes to apply instantly, you must relogin."
msgstr ""
"Ak chcete, aby boli všetky zmeny naraz aplikované, musíte sa znovu prihlásiť."
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1538 ../src/config.py:1639
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
msgstr "OpenPGP nie je použiteľné na tomto počítači"
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1675 ../src/config.py:1718
msgid "Unread events"
msgstr "Neprečítané udalosti"
-#: ../src/config.py:1667
+#: ../src/config.py:1676
msgid "Read all pending events before removing this account."
msgstr "Prečítať všetky správy pred odstránením tohoto účtu."
-#: ../src/config.py:1693
+#: ../src/config.py:1702
#, python-format
msgid "You have opened chat in account %s"
msgstr "Máte otvorený rozhovor pod účtom %s"
-#: ../src/config.py:1694
+#: ../src/config.py:1703
msgid "All chat and groupchat windows will be closed. Do you want to continue?"
msgstr ""
"Všetky okná s diskusiami a diskusnými skupinami budú zatvorené. Prajete si "
"pokračovať?"
-#: ../src/config.py:1705
+#: ../src/config.py:1714
msgid "You are currently connected to the server"
msgstr "Ste pripojený na server"
-#: ../src/config.py:1706
+#: ../src/config.py:1715
msgid "To change the account name, you must be disconnected."
msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
-#: ../src/config.py:1710
+#: ../src/config.py:1719
msgid "To change the account name, you must read all pending events."
msgstr "Pre zmenu názvu účtu, musíte mať prečítané všetky čakajúce správy."
-#: ../src/config.py:1716
+#: ../src/config.py:1725
msgid "Account Name Already Used"
msgstr "Názov účtu je už použitý"
-#: ../src/config.py:1717
+#: ../src/config.py:1726
msgid ""
"This name is already used by another of your accounts. Please choose another "
"name."
msgstr ""
"Tento názov je už použitý jedným z vašich účtov. Prosím, zvoľte si iný názov."
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1730 ../src/config.py:1734
msgid "Invalid account name"
msgstr "Nesprávny názov účtu"
-#: ../src/config.py:1722
+#: ../src/config.py:1731
msgid "Account name cannot be empty."
msgstr "Názov účtu nemôže byť prázdny."
-#: ../src/config.py:1726
+#: ../src/config.py:1735
msgid "Account name cannot contain spaces."
msgstr "Názov účtu nemôže obsahovať medzery."
-#: ../src/config.py:1800
+#: ../src/config.py:1810
msgid "Rename Account"
msgstr "Premenovať účet"
-#: ../src/config.py:1801
+#: ../src/config.py:1811
#, python-format
msgid "Enter a new name for account %s"
msgstr "Zadať nový názov pre účet %s"
-#: ../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 "Nesprávné Jabber ID"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1838
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "Jabber ID musí byť v tvare \"používateľ@menoserveru\"."
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2028 ../src/config.py:3177
msgid "Invalid entry"
msgstr "Nesprávny záznam"
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2029 ../src/config.py:3178
msgid "Custom port must be a port number."
msgstr "Vlastný port musí byť číslo portu."
-#: ../src/config.py:2040
+#: ../src/config.py:2050
msgid "Failed to get secret keys"
msgstr "Nepodarilo sa získať tajné kľúče"
-#: ../src/config.py:2041
+#: ../src/config.py:2051
msgid "There was a problem retrieving your OpenPGP secret keys."
msgstr "Vznikol problém pri získavaní vášho OpenPGP tajného kľúča."
-#: ../src/config.py:2076
+#: ../src/config.py:2086
msgid "OpenPGP Key Selection"
msgstr "Výber OpenPGP kľúča"
-#: ../src/config.py:2077
+#: ../src/config.py:2087
msgid "Choose your OpenPGP key"
msgstr "Vyberte váš OpenPGP kľúč"
-#: ../src/config.py:2088
+#: ../src/config.py:2094
msgid "No such account available"
msgstr "Taký účet nie je k dispozícii"
-#: ../src/config.py:2089
+#: ../src/config.py:2095
msgid "You must create your account before editing your personal information."
msgstr ""
"Musíte si vytvoriť účet predtým, než budete môcť meniť vaše osobné "
"informácie."
-#: ../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:2102 ../src/dialogs.py:1675 ../src/dialogs.py:1811
+#: ../src/dialogs.py:1990 ../src/disco.py:439 ../src/profile_window.py:317
msgid "You are not connected to the server"
msgstr "Nie ste pripojený k serveru"
-#: ../src/config.py:2097
+#: ../src/config.py:2103
msgid "Without a connection, you can not edit your personal information."
msgstr "Bez pripojenia nemôžete meniť osobné informácie."
-#: ../src/config.py:2101
+#: ../src/config.py:2107
msgid "Your server doesn't support Vcard"
msgstr "Server nepodporuje Vcard"
-#: ../src/config.py:2102
+#: ../src/config.py:2108
msgid "Your server can't save your personal information."
msgstr "Váš server neumožňuje uloženie vašich osobných informácií."
-#: ../src/config.py:2133
+#: ../src/config.py:2139
msgid "Account Local already exists."
msgstr "Účet Local už existuje."
-#: ../src/config.py:2134
+#: ../src/config.py:2140
msgid "Please rename or remove it before enabling link-local messaging."
msgstr "Prosím, premenujte alebo odstráňte to pred zapnutím link-local správ."
-#: ../src/config.py:2317
+#: ../src/config.py:2323
#, python-format
msgid "Edit %s"
msgstr "Upraviť %s"
-#: ../src/config.py:2319
+#: ../src/config.py:2325
#, python-format
msgid "Register to %s"
msgstr "Registrovať na %s"
#. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2361
msgid "Ban List"
msgstr "Čierna listina"
-#: ../src/config.py:2356
+#: ../src/config.py:2362
msgid "Member List"
msgstr "Zoznam členov"
-#: ../src/config.py:2357
+#: ../src/config.py:2363
msgid "Owner List"
msgstr "Zoznam vlastníkov"
-#: ../src/config.py:2358
+#: ../src/config.py:2364
msgid "Administrator List"
msgstr "Zoznam správcov"
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2413 ../src/disco.py:778 ../src/history_manager.py:183
msgid "JID"
msgstr "JID"
-#: ../src/config.py:2415
+#: ../src/config.py:2423
msgid "Reason"
msgstr "Dôvod"
-#: ../src/config.py:2420
+#: ../src/config.py:2430
msgid "Nick"
msgstr "Prezývka"
-#: ../src/config.py:2424
+#: ../src/config.py:2436
msgid "Role"
msgstr "Rola"
-#: ../src/config.py:2449
+#: ../src/config.py:2463
msgid "Banning..."
msgstr "Zakazujem..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2465
msgid ""
"<b>Whom do you want to ban?</b>\n"
"\n"
@@ -5940,11 +6028,11 @@
"<b>Koho chcete zakázať?</b>\n"
"\n"
-#: ../src/config.py:2453
+#: ../src/config.py:2467
msgid "Adding Member..."
msgstr "Pridáva sa člen..."
-#: ../src/config.py:2454
+#: ../src/config.py:2468
msgid ""
"<b>Whom do you want to make a member?</b>\n"
"\n"
@@ -5952,11 +6040,11 @@
"<b>Koho chcete pridať k členom?</b>\n"
"\n"
-#: ../src/config.py:2456
+#: ../src/config.py:2470
msgid "Adding Owner..."
msgstr "Pridáva sa vlastník..."
-#: ../src/config.py:2457
+#: ../src/config.py:2471
msgid ""
"<b>Whom do you want to make an owner?</b>\n"
"\n"
@@ -5964,24 +6052,25 @@
"<b>Koho chcete určiť za vlastníka?</b>\n"
"\n"
-#: ../src/config.py:2459
+#: ../src/config.py:2473
msgid "Adding Administrator..."
msgstr "Pridáva sa Administrátor..."
-#: ../src/config.py:2460
+#: ../src/config.py:2474
msgid ""
"<b>Whom do you want to make an administrator?</b>\n"
"\n"
msgstr ""
-#: ../src/config.py:2461
+#: ../src/config.py:2475
+#, fuzzy
msgid ""
"Can be one of the following:\n"
"1. user@domain/resource (only that resource matches).\n"
"2. user@domain (any resource matches).\n"
"3. domain/resource (only that resource matches).\n"
"4. domain (the domain itself matches, as does any user@domain,\n"
-"domain/resource, or address containing a subdomain."
+"domain/resource, or address containing a subdomain)."
msgstr ""
"Je možné použiť niektorú z nasledujúcich možností:\n"
"1. používateľ@doména/zdroj (práve jeden zdroj).\n"
@@ -5990,85 +6079,86 @@
"4. doména (doména sama o sebe, ľubovoľný používateľ@doména,\n"
"doména/zdroj, alebo adresa obsahujúca subdoménu."
-#: ../src/config.py:2558
+#: ../src/config.py:2572
#, python-format
msgid "Removing %s account"
msgstr "Odstraňuje sa účet %s"
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2594 ../src/gajim.py:1482 ../src/gajim.py:1569
msgid "Password Required"
msgstr "Heslo je požadované"
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#. ('PASSWORD_REQUIRED', account, None)
+#: ../src/config.py:2595 ../src/gajim.py:1552
#, python-format
msgid "Enter your password for account %s"
msgstr "Vložte heslo pre váš účet %s"
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2596 ../src/gajim.py:1569
msgid "Save password"
msgstr "Uložiť heslo"
-#: ../src/config.py:2591
+#: ../src/config.py:2605
#, python-format
msgid "Account \"%s\" is connected to the server"
msgstr "Účet \"%s\" je pripojený na server"
-#: ../src/config.py:2592
+#: ../src/config.py:2606
msgid "If you remove it, the connection will be lost."
msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
-#: ../src/config.py:2688
+#: ../src/config.py:2702
msgid "Default"
msgstr "Predvolené"
-#: ../src/config.py:2688
+#: ../src/config.py:2702
msgid "?print_status:All"
msgstr "?zobrazovaný stav:All"
-#: ../src/config.py:2689
+#: ../src/config.py:2703
msgid "Enter and leave only"
msgstr "Len vstúpiť a vystúpiť"
-#: ../src/config.py:2690
+#: ../src/config.py:2704
msgid "?print_status:None"
msgstr "?zobrazovaný stav:None"
-#: ../src/config.py:2758
+#: ../src/config.py:2772
msgid "New Group Chat"
msgstr "Nová diskusná skupina"
-#: ../src/config.py:2791
+#: ../src/config.py:2805
msgid "This bookmark has invalid data"
msgstr "Táto záložka obsahuje chybné údaje"
-#: ../src/config.py:2792
+#: ../src/config.py:2806
msgid ""
"Please be sure to fill out server and room fields or remove this bookmark."
msgstr ""
"Prosim, uistite sa, že je vyplnená položka server a miestnosť alebo "
"odstráňte túto záložku."
-#: ../src/config.py:3072
+#: ../src/config.py:3088
msgid "Invalid username"
msgstr "Nesprávne meno používateľa"
-#: ../src/config.py:3074
+#: ../src/config.py:3090
msgid "You must provide a username to configure this account."
msgstr "Musíte vložiť meno používateľa pre konfuguráciu tohoto účtu."
-#: ../src/config.py:3100
+#: ../src/config.py:3116
msgid "Duplicate Jabber ID"
msgstr "Dvojité Jabber ID"
-#: ../src/config.py:3101
+#: ../src/config.py:3117
msgid "This account is already configured in Gajim."
msgstr "Tento účet už nastavný v Gajim."
-#: ../src/config.py:3118
+#: ../src/config.py:3134
msgid "Account has been added successfully"
msgstr "Účet bol úspešne pridaný"
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3135 ../src/config.py:3326
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 "
@@ -6077,24 +6167,24 @@
"Môžete nastaviť pokročilé vlastnosti účtu stlačením tlačidla Pokročilé, "
"alebo neskôr zvolením položky Účty v menu Upraviť v hlavnom okne."
-#: ../src/config.py:3137
+#: ../src/config.py:3153
msgid "Invalid server"
msgstr "Neplatný server"
-#: ../src/config.py:3138
+#: ../src/config.py:3154
msgid "Please provide a server on which you want to register."
msgstr "Poskytnite, prosím, server na ktorom sa chcete zaregistrovať."
-#: ../src/config.py:3189 ../src/gajim.py:2000
+#: ../src/config.py:3205 ../src/gajim.py:2102
msgid "Certificate Already in File"
msgstr "Certifikát už v súbore"
-#: ../src/config.py:3190 ../src/gajim.py:2001
+#: ../src/config.py:3206 ../src/gajim.py:2103
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr "Tento certifikát je práve v súbore %s, preto nebude znova pridaný."
-#: ../src/config.py:3258
+#: ../src/config.py:3274
#, python-format
msgid ""
"<b>Security Warning</b>\n"
@@ -6109,7 +6199,7 @@
"SSL chyba: %(error)s\n"
"Chcete sa ešte pripojiť k tomuto serveru?"
-#: ../src/config.py:3264 ../src/gajim.py:2024
+#: ../src/config.py:3280 ../src/gajim.py:2127
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -6120,30 +6210,74 @@
"SHA1 fingerprint certifikátu:\n"
"%s"
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3305 ../src/config.py:3346
msgid "An error occurred during account creation"
msgstr "Vyskytla sa chyba počas tvorby účtu"
-#: ../src/config.py:3307
+#: ../src/config.py:3325
msgid "Your new account has been created successfully"
msgstr "Váš nový účet bol úspešne vytvorený"
-#: ../src/config.py:3410
+#: ../src/config.py:3430
msgid "Account name is in use"
msgstr "Názov účtu je už používaný"
-#: ../src/config.py:3411
+#: ../src/config.py:3431
msgid "You already have an account using this name."
msgstr "Už máte účet s týmto názvom."
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3584
+msgid "Active"
+msgstr "Aktívne"
+
+#: ../src/config.py:3592
+msgid "Event"
+msgstr "Udalosť"
+
+#: ../src/config.py:3627
+msgid "First Message Received"
+msgstr "Prvá prijatá správa"
+
+#: ../src/config.py:3628
+msgid "Next Message Received Focused"
+msgstr "Ďalšia prijatá správa zameraná"
+
+#: ../src/config.py:3630
+msgid "Next Message Received Unfocused"
+msgstr "Ďalšia prijatá správa nezameraná"
+
+#: ../src/config.py:3631
+msgid "Contact Connected"
+msgstr "Kontakt pripojený"
+
+#: ../src/config.py:3632
+msgid "Contact Disconnected"
+msgstr "Kontakt odpojený"
+
+#: ../src/config.py:3633
+msgid "Message Sent"
+msgstr "Správa odoslaná"
+
+#: ../src/config.py:3634
+msgid "Group Chat Message Highlight"
+msgstr "Zvýraznenie správ v diskusnej skupine"
+
+#: ../src/config.py:3635
+msgid "Group Chat Message Received"
+msgstr "Prijatá správa - diskusná skupina"
+
+#: ../src/config.py:3636
+msgid "GMail Email Received"
+msgstr "Prijatý GMail e-mail"
+
+#: ../src/conversation_textview.py:560
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 ""
-#: ../src/conversation_textview.py:568
+#: ../src/conversation_textview.py:579
msgid ""
"Text below this line is what has been said since the\n"
"last time you paid attention to this group chat"
@@ -6151,74 +6285,69 @@
"Zatiaľ čo ste nevenovali pozornosť tejto diskusnej skupine, pribudol "
"nasledujúci text, ktorý je pod čiarou"
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:689
#, python-format
msgid "_Actions for \"%s\""
msgstr "_Akcie pre \"%s\""
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:701
msgid "Read _Wikipedia Article"
msgstr "Čítať článok na _Wikipédii"
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:706
msgid "Look it up in _Dictionary"
msgstr "Vyhľadať to v _slovníku"
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:723
#, python-format
msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
msgstr "URL slovníku chýba \"%s\" a to nie je WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:736
#, python-format
msgid "Web Search URL is missing an \"%s\""
msgstr "URL pre web vyhľadávanie chýba \"%s\""
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:739
msgid "Web _Search for it"
msgstr "_Hľadať na webe"
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:745
msgid "Open as _Link"
msgstr "Otvoriť ako _odkaz"
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, fuzzy, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1199
msgid "Yesterday"
msgstr "Včera"
#. 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:1203
#, python-format
msgid "%i days ago"
msgstr "Pred %i dňami"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1237
#, python-format
msgid "Subject: %s\n"
msgstr "Predmet: %s\n"
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:607
msgid "Jabber ID already in list"
msgstr "Jabber Id je už v zozname"
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:608
msgid "The Jabber ID you entered is already in the list. Choose another one."
msgstr ""
#. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:619
msgid "new(a)jabber.id"
msgstr "nové(a)jabber.id"
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
#, python-format
msgid "new%d(a)jabber.id"
msgstr "nové%d(a)jabber.id"
@@ -6233,144 +6362,144 @@
msgid "Jabber ID: <i>%s</i>"
msgstr "Jabber ID: <i>%s</i>"
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
msgid "Group"
msgstr "Skupina"
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
msgid "In the group"
msgstr "V skupine"
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:276
msgid "KeyID"
msgstr "ID kľúča"
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:281
msgid "Contact name"
msgstr "Meno kontaktu"
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:457
msgid "Set Mood"
msgstr "Nastaviť náladu"
-#: ../src/dialogs.py:549
+#: ../src/dialogs.py:545
#, python-format
msgid "%s Status Message"
msgstr "%s správa o stave"
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:547
msgid "Status Message"
msgstr "Správa o stave"
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:659
msgid "Overwrite Status Message?"
msgstr "Prepísať správu o stave?"
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:660
msgid ""
"This name is already used. Do you want to overwrite this status message?"
msgstr "Tento názov je už použitý. Chcete prepísať túto správu o stave?"
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:669
msgid "Save as Preset Status Message"
msgstr "Uložiť ako prednastavenú správu o stave"
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:670
msgid "Please type a name for this status message"
msgstr "Zadajte prosím názov pre túto stavovú správu"
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:676
msgid "AIM Address:"
msgstr "AIM adresa:"
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:677
msgid "GG Number:"
msgstr "GG číslo:"
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:678
msgid "ICQ Number:"
msgstr "ICQ číslo:"
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:679
msgid "MSN Address:"
msgstr "MSN adresa:"
-#: ../src/dialogs.py:684
+#: ../src/dialogs.py:680
msgid "Yahoo! Address:"
msgstr "Yahoo! adresa:"
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:716
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať do účtu %s"
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:718
msgid "Please fill in the data of the contact you want to add"
msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať"
-#: ../src/dialogs.py:879 ../src/dialogs.py:885 ../src/dialogs.py:890
+#: ../src/dialogs.py:875 ../src/dialogs.py:881 ../src/dialogs.py:886
msgid "Invalid User ID"
msgstr "Nespravné ID používateľa"
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:882
msgid "The user ID must not contain a resource."
msgstr "ID používateľa nesmie obsahovať zdroj."
-#: ../src/dialogs.py:891
+#: ../src/dialogs.py:887
msgid "You cannot add yourself to your roster."
msgstr "Nemôžete pridať seba do vášho zoznamu kontaktov."
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:901
msgid "Contact already in roster"
msgstr "Kontakt je už v zozname"
-#: ../src/dialogs.py:906
+#: ../src/dialogs.py:902
msgid "This contact is already listed in your roster."
msgstr "Tento kontakt je už uvedený v zozname."
-#: ../src/dialogs.py:942
+#: ../src/dialogs.py:938
msgid "User ID:"
msgstr "Používateľské ID:"
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:996
msgid "A GTK+ jabber client"
msgstr "GTK+ jabber klient"
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:997
msgid "GTK+ Version:"
msgstr "Verzia GTK+:"
-#: ../src/dialogs.py:1002
+#: ../src/dialogs.py:998
msgid "PyGTK Version:"
msgstr "Verzia PyGTK:"
-#: ../src/dialogs.py:1012
+#: ../src/dialogs.py:1008
msgid "Current Developers:"
msgstr "Súčasní vývojári:"
-#: ../src/dialogs.py:1014
+#: ../src/dialogs.py:1010
msgid "Past Developers:"
msgstr "Bývalí vývojári:"
-#: ../src/dialogs.py:1020
+#: ../src/dialogs.py:1016
msgid "THANKS:"
msgstr "POĎAKOVANIE:"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1026
+#: ../src/dialogs.py:1022
msgid "Last but not least, we would like to thank all the package maintainers."
msgstr "V neposlednom rade ďakujeme všetkým správcom balíkov."
#. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1039
+#: ../src/dialogs.py:1035
msgid "translator-credits"
msgstr ""
"Juraj Michálek (juraj.michalek AT asinus.org)\n"
"Peter Trško (dogmat AT dogmat.us)\n"
-"Pavol Klačanský <pavolzetor(a)gmail.com>"
+"Pavol Klačanský <pavol(a)klacansky.com>"
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1197
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -6379,88 +6508,88 @@
"Highlighting misspelled words feature will not be used"
msgstr ""
-#: ../src/dialogs.py:1605
+#: ../src/dialogs.py:1601
#, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
msgstr "Požiadavka na zápis pre účet %(account)s od %(jid)s"
-#: ../src/dialogs.py:1608
+#: ../src/dialogs.py:1604
#, python-format
msgid "Subscription request from %s"
msgstr "Požiadavka na prihlásenie od %s"
-#: ../src/dialogs.py:1669 ../src/gajim.py:2624
+#: ../src/dialogs.py:1668 ../src/gajim.py:2767
#, python-format
msgid "You are already in group chat %s"
msgstr "Už ste v diskusnej skupine %s"
-#: ../src/dialogs.py:1677
+#: ../src/dialogs.py:1676
msgid "You can not join a group chat unless you are connected."
msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ nie ste prihlásený."
-#: ../src/dialogs.py:1696
+#: ../src/dialogs.py:1695
#, python-format
msgid "Join Group Chat with account %s"
msgstr "Pripojiť sa k diskusnej skupine s účtom %s"
-#: ../src/dialogs.py:1767
+#: ../src/dialogs.py:1766
msgid "Invalid Nickname"
msgstr "Neplatná prezývka"
-#: ../src/dialogs.py:1768 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
+#: ../src/dialogs.py:1767 ../src/groupchat_control.py:1455
+#: ../src/groupchat_control.py:1738
msgid "The nickname has not allowed characters."
msgstr "Prezývka obsahuje nepovolené znaky."
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
+#: ../src/groupchat_control.py:1908
msgid "Invalid group chat Jabber ID"
msgstr "Nesprávne Jabber ID diskusnej skupiny"
-#: ../src/dialogs.py:1773 ../src/dialogs.py:1779
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
+#: ../src/groupchat_control.py:1909
msgid "The group chat Jabber ID has not allowed characters."
msgstr "Jabber ID diskusnej skupiny obsahuje nepovolené znaky."
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:1784
msgid "This is not a group chat"
msgstr "Toto nie je diskusná skupina"
-#: ../src/dialogs.py:1786
+#: ../src/dialogs.py:1785
#, python-format
msgid "%s is not the name of a group chat."
msgstr "%s nie je názov diskusnej skupiny."
-#: ../src/dialogs.py:1813
+#: ../src/dialogs.py:1812
msgid "Without a connection, you can not synchronise your contacts."
msgstr "Bez pripojenie nemôžete synchronizovať vaše kontakty."
-#: ../src/dialogs.py:1827
+#: ../src/dialogs.py:1826
msgid "Server"
msgstr "Server"
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:1859
msgid "This account is not connected to the server"
msgstr "Tento účet nie je pripojený k serveru"
-#: ../src/dialogs.py:1861
+#: ../src/dialogs.py:1860
msgid "You cannot synchronize with an account unless it is connected."
-msgstr ""
+msgstr "Nemôžete sa synchronizovať s kontaktom ak nie je prihlásený."
-#: ../src/dialogs.py:1885
+#: ../src/dialogs.py:1884
msgid "Synchronise"
msgstr "Synchronizovať"
-#: ../src/dialogs.py:1943
+#: ../src/dialogs.py:1942
#, python-format
msgid "Start Chat with account %s"
msgstr "Začať rozhovor s účtom %s"
-#: ../src/dialogs.py:1945
+#: ../src/dialogs.py:1944
msgid "Start Chat"
msgstr "Začať rozhovor"
-#: ../src/dialogs.py:1946
+#: ../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:"
@@ -6469,275 +6598,275 @@
"odoslať správu:"
#. if offline or connecting
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2344 ../src/dialogs.py:2487
+#: ../src/dialogs.py:1969 ../src/dialogs.py:2343 ../src/dialogs.py:2493
#: ../src/normal_control.py:640
msgid "Connection not available"
msgstr "Pripojenie nie je dostupné"
-#: ../src/dialogs.py:1971 ../src/dialogs.py:2345 ../src/dialogs.py:2488
+#: ../src/dialogs.py:1970 ../src/dialogs.py:2344 ../src/dialogs.py:2494
#: ../src/normal_control.py:641
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "Prosím, uistite sa, že ste pripojený k \"%s\"."
-#: ../src/dialogs.py:1980 ../src/dialogs.py:1983
+#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
msgid "Invalid JID"
msgstr "Nesprávne JID"
-#: ../src/dialogs.py:1983
+#: ../src/dialogs.py:1982
#, python-format
msgid "Unable to parse \"%s\"."
msgstr "Nie je možné spracovať \"%s\"."
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:1991
msgid "Without a connection, you can not change your password."
msgstr "Bez pripojenia nemôžete meniť heslo."
-#: ../src/dialogs.py:2011
+#: ../src/dialogs.py:2010
msgid "Invalid password"
msgstr "Nesprávne heslo"
-#: ../src/dialogs.py:2011
+#: ../src/dialogs.py:2010
msgid "You must enter a password."
msgstr "Musíte vložiť heslo."
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2014
msgid "Passwords do not match"
msgstr "Heslá sa nezhodujú"
-#: ../src/dialogs.py:2016
+#: ../src/dialogs.py:2015
msgid "The passwords typed in both fields must be identical."
msgstr "Heslá vložené do oboch polí sa musia zhodovať."
#. 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:473
#: ../src/osx/growler.py:12
msgid "Contact Signed In"
msgstr "Kontakt sa prihlasil"
-#: ../src/dialogs.py:2057 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/dialogs.py:2057 ../src/notify.py:253 ../src/notify.py:475
#: ../src/osx/growler.py:12
msgid "Contact Signed Out"
msgstr "Kontakt sa odhlásil"
#. 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:477
#: ../src/osx/growler.py:12
msgid "New Message"
msgstr "Nová správa"
#. 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:477
#: ../src/osx/growler.py:13
msgid "New Single Message"
msgstr "Nová krátka správa"
#. 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:478
#: ../src/osx/growler.py:13
msgid "New Private Message"
msgstr "Nová súkromná správa"
-#: ../src/dialogs.py:2060 ../src/gajim.py:1587 ../src/notify.py:472
+#: ../src/dialogs.py:2060 ../src/gajim.py:1685 ../src/notify.py:487
#: ../src/osx/growler.py:13
msgid "New E-mail"
msgstr "Nový e-mail"
-#: ../src/dialogs.py:2062 ../src/gajim.py:1653 ../src/notify.py:466
+#: ../src/dialogs.py:2062 ../src/gajim.py:1751 ../src/notify.py:480
#: ../src/osx/growler.py:14
msgid "File Transfer Request"
msgstr "Požiadavka na prenos súboru"
-#: ../src/dialogs.py:2064 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2064 ../src/gajim.py:1651 ../src/gajim.py:1718
+#: ../src/notify.py:482 ../src/osx/growler.py:14
msgid "File Transfer Error"
msgstr "Chyba pri prenose súboru"
-#: ../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:2066 ../src/gajim.py:1793 ../src/gajim.py:1815
+#: ../src/gajim.py:1832 ../src/notify.py:484 ../src/osx/growler.py:15
msgid "File Transfer Completed"
msgstr "Prenos súboru dokončený"
-#: ../src/dialogs.py:2067 ../src/gajim.py:1698 ../src/notify.py:470
+#: ../src/dialogs.py:2067 ../src/gajim.py:1796 ../src/notify.py:485
#: ../src/osx/growler.py:15
msgid "File Transfer Stopped"
msgstr "Prenos súboru zastavený"
-#: ../src/dialogs.py:2069 ../src/gajim.py:1445 ../src/notify.py:474
+#: ../src/dialogs.py:2069 ../src/gajim.py:1503 ../src/notify.py:489
#: ../src/osx/growler.py:16
msgid "Groupchat Invitation"
msgstr "Pozvánka do diskusnej skupiny"
-#: ../src/dialogs.py:2071 ../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 "Kontakt zmenil stav"
-#: ../src/dialogs.py:2263 ../src/normal_control.py:241
+#: ../src/dialogs.py:2262 ../src/normal_control.py:241
#, python-format
msgid "Single Message using account %s"
msgstr "Krátka správa s použitím účtu %s"
-#: ../src/dialogs.py:2265 ../src/normal_control.py:243
+#: ../src/dialogs.py:2264 ../src/normal_control.py:243
#, python-format
msgid "Single Message in account %s"
msgstr "Krátka správa v účte %s"
-#: ../src/dialogs.py:2267 ../src/normal_control.py:245
+#: ../src/dialogs.py:2266 ../src/normal_control.py:245
msgid "Single Message"
-msgstr "Krátka správa"
+msgstr "Krátku správu"
#. prepare UI for Sending
-#: ../src/dialogs.py:2270 ../src/normal_control.py:248
+#: ../src/dialogs.py:2269 ../src/normal_control.py:248
#, python-format
msgid "Send %s"
msgstr "Poslať %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2293 ../src/normal_control.py:290
+#: ../src/dialogs.py:2292 ../src/normal_control.py:290
#, python-format
msgid "Received %s"
msgstr "Prijatý %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2316 ../src/normal_control.py:324
+#: ../src/dialogs.py:2315 ../src/normal_control.py:324
#, python-format
msgid "Form %s"
msgstr "Od %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:2394 ../src/normal_control.py:692
#, python-format
msgid "RE: %s"
msgstr "RE: %s"
-#: ../src/dialogs.py:2389 ../src/normal_control.py:696
+#: ../src/dialogs.py:2395 ../src/normal_control.py:696
#, python-format
msgid "%s wrote:\n"
msgstr "%s napísal:\n"
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2439
#, python-format
msgid "XML Console for %s"
msgstr "XML konzola pre %s"
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2441
msgid "XML Console"
msgstr "XML konzola"
-#: ../src/dialogs.py:2559
+#: ../src/dialogs.py:2565
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "Súkromný zoznam <b><i>%s</i></b>"
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:2569
#, python-format
msgid "Privacy List for %s"
msgstr "Súkromný zoznam pre %s"
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:2625
#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
msgstr ""
"Poradie: %(order)s, akcia: %(action)s, typ: %(type)s, hodnota: %(value)s"
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:2630
#, python-format
msgid "Order: %(order)s, action: %(action)s"
msgstr "Poradie: %(order)s, akcia: %(action)s"
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:2672
msgid "<b>Edit a rule</b>"
msgstr "<b>Upraviť pravidlo</b>"
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:2759
msgid "<b>Add a rule</b>"
msgstr "<b>Pridať pravidlo</b>"
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:2855
#, python-format
msgid "Privacy Lists for %s"
msgstr "Súkromné zoznamy pre %s"
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:2857
msgid "Privacy Lists"
msgstr "Súkromné zoznamy"
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:2927
msgid "Invalid List Name"
msgstr "Nesprávny názov zoznamu"
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:2928
msgid "You must enter a name to create a privacy list."
msgstr "Musíte vložiť názov, aby bolo možné vytvoriť nový súkromný zoznam."
-#: ../src/dialogs.py:2954
+#: ../src/dialogs.py:2960
msgid "You are invited to a groupchat"
msgstr "Ste pozvaný do diskusnej skupiny"
-#: ../src/dialogs.py:2957
+#: ../src/dialogs.py:2963
msgid "$Contact has invited you to join a discussion"
msgstr ""
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:2965
#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr ""
-#: ../src/dialogs.py:2967
+#: ../src/dialogs.py:2973
#, python-format
msgid "Comment: %s"
msgstr "Komentár: %s"
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2975
msgid "Do you want to accept the invitation?"
msgstr "Chcete prijať pozvanie?"
-#: ../src/dialogs.py:3024
+#: ../src/dialogs.py:3030
msgid "Choose Sound"
msgstr "Vybrať zvuk"
-#: ../src/dialogs.py:3034 ../src/dialogs.py:3085
+#: ../src/dialogs.py:3040 ../src/dialogs.py:3091
msgid "All files"
msgstr "Všetky súbory"
-#: ../src/dialogs.py:3039
+#: ../src/dialogs.py:3045
msgid "Wav Sounds"
msgstr "Wav zvuky"
-#: ../src/dialogs.py:3072
+#: ../src/dialogs.py:3078
msgid "Choose Image"
msgstr "Vybrať obrázok"
-#: ../src/dialogs.py:3090
+#: ../src/dialogs.py:3096
msgid "Images"
msgstr "Obrázky"
-#: ../src/dialogs.py:3155
+#: ../src/dialogs.py:3161
#, python-format
msgid "When %s becomes:"
msgstr "Keď %s sa stane:"
-#: ../src/dialogs.py:3157
+#: ../src/dialogs.py:3163
#, python-format
msgid "Adding Special Notification for %s"
msgstr "Pridáva sa špeciálne upozornenie pre %s"
#. # means number
-#: ../src/dialogs.py:3228
+#: ../src/dialogs.py:3232
msgid "#"
msgstr "#"
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3238
msgid "Condition"
msgstr "Podmienka"
-#: ../src/dialogs.py:3352
+#: ../src/dialogs.py:3356
msgid "when I am "
msgstr "keď som "
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:3828
#, python-format
msgid ""
"Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6745,38 +6874,38 @@
"This session's Short Authentication String is <b>%(sas)s</b>."
msgstr ""
-#: ../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 "Identita kontaktu overená"
-#: ../src/dialogs.py:3845
+#: ../src/dialogs.py:3846
msgid "Verify again..."
msgstr "Overiť znovu..."
-#: ../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 "
"below."
msgstr ""
-#: ../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 "Identita kontaktu NEoverená"
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:3861
msgid "Verify..."
msgstr "Overiť..."
-#: ../src/dialogs.py:3872
+#: ../src/dialogs.py:3873
msgid "Have you verified the contact's identity?"
-msgstr ""
+msgstr "Overili ste identitu kontaktu?"
-#: ../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> "
@@ -6786,30 +6915,32 @@
"This session's Short Authentication String is <b>%(sas)s</b>."
msgstr ""
-#: ../src/dialogs.py:3874
+#: ../src/dialogs.py:3875
msgid "Did you talk to the remote contact and verify the SAS?"
msgstr ""
-#: ../src/dialogs.py:3906
+#: ../src/dialogs.py:3907
#, fuzzy, python-format
msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
msgstr "Kľúč (%s) kontaktu sa nezhoduje s kľúčom prideleným v programe Gajim."
-#: ../src/dialogs.py:3912
+#: ../src/dialogs.py:3913
+#, fuzzy
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
-msgstr ""
+msgstr "=="
-#: ../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."
msgstr ""
-#: ../src/dialogs.py:3925
+#: ../src/dialogs.py:3926
+#, fuzzy
msgid ""
"GPG Key is assigned to this contact, and you trust his key, so messages will "
"be encrypted."
-msgstr ""
+msgstr "=="
#: ../src/disco.py:116
msgid "Others"
@@ -6833,11 +6964,11 @@
msgid "Service Discovery"
msgstr "Prehliadanie služieb"
-#: ../src/disco.py:656
+#: ../src/disco.py:657
msgid "The service could not be found"
msgstr "Služba nebola nájdená"
-#: ../src/disco.py:657
+#: ../src/disco.py:658
msgid ""
"There is no service at the address you entered, or it is not responding. "
"Check the address and try again."
@@ -6845,56 +6976,56 @@
"Žiadna služba nie je k dispozícii na zadanej adrese alebo neodpovedá. "
"Skontrolujte adresu a skúste opäť."
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:662 ../src/disco.py:958
msgid "The service is not browsable"
msgstr "Služba nie je prehľadávateľná"
-#: ../src/disco.py:662
+#: ../src/disco.py:663
msgid "This type of service does not contain any items to browse."
msgstr "Tento typ služby neobsahuje žiadne položky na prehľadávanie."
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:700 ../src/disco.py:710
msgid "Invalid Server Name"
msgstr "Neplatný názov servera"
-#: ../src/disco.py:754
+#: ../src/disco.py:757
#, python-format
msgid "Browsing %(address)s using account %(account)s"
msgstr "Prehliadanie %(address)s s použitím účtu %(account)s"
-#: ../src/disco.py:794
+#: ../src/disco.py:797
msgid "_Browse"
msgstr "_Prehliadať"
-#: ../src/disco.py:956
+#: ../src/disco.py:959
msgid "This service does not contain any items to browse."
msgstr "Táto služba neobsahuje žiadne položky na prehliadanie."
-#: ../src/disco.py:1179
+#: ../src/disco.py:1181
msgid "_Execute Command"
msgstr "_Vykonať príkaz"
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1191 ../src/disco.py:1355
msgid "Re_gister"
msgstr "Re_gistrácia"
-#: ../src/disco.py:1390
+#: ../src/disco.py:1392
#, python-format
msgid "Scanning %(current)d / %(total)d.."
msgstr "Prieskúmava sa %(current)d / %(total)d.."
#. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1573
msgid "Users"
msgstr "Používatelia"
#. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1581
msgid "Description"
msgstr "Popis"
#. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1589
msgid "Id"
msgstr "Id"
@@ -6918,145 +7049,149 @@
msgid "_Unsubscribe"
msgstr "_Odhlásiť"
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:45
+#, fuzzy
+msgid "SSL certificat validation"
+msgstr "Chyba SSL certifikátu"
-#: ../src/features_window.py:52
+#: ../src/features_window.py:46
msgid ""
"A library used to validate server certificates to ensure a secure connection."
msgstr ""
"Knižnica používaná k overeniu serverových certifikátov, kvôli zaisteniu "
"bezpečného pripojenia."
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:47 ../src/features_window.py:48
msgid "Requires python-pyopenssl."
msgstr "Vyžaduje python-pyopenssl."
-#: ../src/features_window.py:55
+#: ../src/features_window.py:49
msgid "Bonjour / Zeroconf"
msgstr "Bonjour / Zeroconf"
-#: ../src/features_window.py:56
+#: ../src/features_window.py:50
msgid "Serverless chatting with autodetected clients in a local network."
msgstr ""
-#: ../src/features_window.py:57
+#: ../src/features_window.py:51
msgid "Requires python-avahi."
msgstr "Vyžaduje python-avahi."
-#: ../src/features_window.py:58
+#: ../src/features_window.py:52
msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
msgstr "Vyžaduje pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr "gajim-remote"
+#: ../src/features_window.py:53
+#, fuzzy
+msgid "Command line"
+msgstr "Príkazy: %s"
-#: ../src/features_window.py:60
+#: ../src/features_window.py:54
msgid "A script to control Gajim via commandline."
msgstr "Skript na ovládanie programu Gajim cez príkazový riadok."
-#: ../src/features_window.py:61
+#: ../src/features_window.py:55
msgid "Requires python-dbus."
msgstr "Vyžaduje 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:56 ../src/features_window.py:60
+#: ../src/features_window.py:64 ../src/features_window.py:68
+#: ../src/features_window.py:72 ../src/features_window.py:80
+#: ../src/features_window.py:84
msgid "Feature not available under Windows."
msgstr "Funkcia nie je dostupná pod Windows."
-#: ../src/features_window.py:63
-msgid "OpenGPG"
-msgstr "OpenGPG"
+#: ../src/features_window.py:57
+#, fuzzy
+msgid "OpenGPG message encryption"
+msgstr "Výber OpenPGP kľúča"
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
+#: ../src/features_window.py:58
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
msgstr "Šifruje správy rozhovoru pomocou gpg kľúčov."
-#: ../src/features_window.py:65
+#: ../src/features_window.py:59
msgid "Requires gpg and python-GnuPGInterface."
msgstr "Vyžaduje gpg a python-GnuPGInterface."
-#: ../src/features_window.py:67
-msgid "network-manager"
+#: ../src/features_window.py:61
+#, fuzzy
+msgid "Network-manager"
msgstr "network-manager"
-#: ../src/features_window.py:68
+#: ../src/features_window.py:62
msgid "Autodetection of network status."
msgstr "Automaticky zistí stav siete."
-#: ../src/features_window.py:69
+#: ../src/features_window.py:63
msgid "Requires gnome-network-manager and python-dbus."
msgstr "Vyžaduje gnome-network-manager a python-dbus."
-#: ../src/features_window.py:71
+#: ../src/features_window.py:65
msgid "Session Management"
msgstr "Správa sedenia"
-#: ../src/features_window.py:72
+#: ../src/features_window.py:66
msgid "Gajim session is stored on logout and restored on login."
msgstr "Sedenie Gajim bude uložené pri odhlásení a obnovené pri prihlásení."
-#: ../src/features_window.py:73
+#: ../src/features_window.py:67
msgid "Requires python-gnome2."
msgstr "Vyžaduje python-gnome2."
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr "gnome-keyring"
+#: ../src/features_window.py:69
+#, fuzzy
+msgid "Password encryption"
+msgstr "Heslo pre vstup do miestnosti"
-#: ../src/features_window.py:76
+#: ../src/features_window.py:70
msgid "Passwords can be stored securely and not just in plaintext."
msgstr "Heslá môžu byť bezpečne uložené a nie sú v obyčajnom texte."
-#: ../src/features_window.py:77
+#: ../src/features_window.py:71
msgid "Requires gnome-keyring and python-gnome2-desktop."
msgstr "Vyžaduje gnome-keyring a python-gnome2-desktop."
-#: ../src/features_window.py:79
+#: ../src/features_window.py:73
msgid "SRV"
msgstr "SRV"
-#: ../src/features_window.py:80
+#: ../src/features_window.py:74
msgid "Ability to connect to servers which are using SRV records."
msgstr "Schopnosť pripojiť sa k serverom, ktoré používajú SRV protokoly."
-#: ../src/features_window.py:81
+#: ../src/features_window.py:75
msgid "Requires dnsutils."
msgstr "Vyžaduje dnsutils."
-#: ../src/features_window.py:82
+#: ../src/features_window.py:76
msgid "Requires nslookup to use SRV records."
msgstr "Vyžaduje nslookup k použitiu SRV protokolov."
-#: ../src/features_window.py:83
+#: ../src/features_window.py:77
msgid "Spell Checker"
msgstr "Kontrola pravopisu"
-#: ../src/features_window.py:84
+#: ../src/features_window.py:78
msgid "Spellchecking of composed messages."
msgstr "Kontrolovať pravopis vo vytvorených správach."
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
-"Vyžaduje python-gnome2-extras alebo kompiláciu gtkspell modulu zo zdrojových "
-"kódov Gajim."
+#: ../src/features_window.py:79
+#, fuzzy
+msgid "Requires libgtkspell."
+msgstr "Vyžaduje python-sexy."
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr "Notification-daemon"
+#: ../src/features_window.py:81
+#, fuzzy
+msgid "Notification"
+msgstr "Upozornenia"
-#: ../src/features_window.py:88
+#: ../src/features_window.py:82
msgid "Passive popups notifying for new events."
msgstr "Nereagujúce vyskakovacie upozornenia pre nové udalosti."
-#: ../src/features_window.py:89
+#: ../src/features_window.py:83
msgid ""
"Requires python-notify or instead python-dbus in conjunction with "
"notification-daemon."
@@ -7064,47 +7199,53 @@
"Vyžaduje python-notify alebo instead python-dbus v spojení s notification-"
"daemon."
-#: ../src/features_window.py:91
+#: ../src/features_window.py:85
msgid "Trayicon"
msgstr "Trayikona"
-#: ../src/features_window.py:92
+#: ../src/features_window.py:86
msgid "A icon in systemtray reflecting the current presence."
msgstr "Ikona v oblasti systémových upozornení odráža prítomnosť."
-#: ../src/features_window.py:93
+#: ../src/features_window.py:87
msgid ""
"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
msgstr ""
"Vyžaduje python-gnome2-extras alebo skompilovaný modul trayicon zo "
"zdrojových kódov Gajim."
-#: ../src/features_window.py:94
+#: ../src/features_window.py:88
msgid "Requires PyGTK >= 2.10."
msgstr "Vyžaduje PyGTK >= 2.10."
-#: ../src/features_window.py:95
-msgid "Idle"
-msgstr "Nečinný"
+#: ../src/features_window.py:89
+#, fuzzy
+msgid "Automatic status"
+msgstr "_Upraviť stav"
-#: ../src/features_window.py:96
+#: ../src/features_window.py:90
msgid "Ability to measure idle time, in order to set auto status."
msgstr ""
"Schopnosť odhadnúť čas nečinnosti v nastavení poradia automatických stavov."
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
-msgstr "Vyžaduje kompiláciu idle modulu zo zdrojový kódov Gajim."
+#: ../src/features_window.py:91
+msgid "Requires libxss library."
+msgstr ""
-#: ../src/features_window.py:99
+#: ../src/features_window.py:92
+#, fuzzy
+msgid "Requires python2.5."
+msgstr "Vyžaduje python-gnome2."
+
+#: ../src/features_window.py:93
msgid "LaTeX"
msgstr "LaTeX"
-#: ../src/features_window.py:100
+#: ../src/features_window.py:94
msgid "Transform LaTeX expressions between $$ $$."
msgstr "Prevádza LaTeX výrazy medzi $$ $$."
-#: ../src/features_window.py:101
+#: ../src/features_window.py:95
#, fuzzy
msgid ""
"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
@@ -7113,7 +7254,7 @@
"Vyžaduje texlive-latex-base, dvips a imagemagick. Nastavte 'use_latex' na "
"pravda v Editor rozšírenej konfigurácie."
-#: ../src/features_window.py:102
+#: ../src/features_window.py:96
#, fuzzy
msgid ""
"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
@@ -7122,23 +7263,25 @@
"Vyžaduje texlive-latex-base, dvips a imagemagick. Nastavte 'use_latex' na "
"pravda v Editor rozšírenej konfigurácie."
-#: ../src/features_window.py:103
-msgid "End to End Encryption"
+#: ../src/features_window.py:97
+#, fuzzy
+msgid "End to End message encryption"
msgstr "End to End šifrovanie"
-#: ../src/features_window.py:104
-msgid "Encrypting chatmessages."
+#: ../src/features_window.py:98
+#, fuzzy
+msgid "Encrypting chat messages."
msgstr "Šifrovanie správ rozhovorov."
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:99 ../src/features_window.py:100
msgid "Requires python-crypto."
msgstr "Vyžaduje python-crypto."
-#: ../src/features_window.py:107
+#: ../src/features_window.py:101
msgid "RST Generator"
msgstr "RST generátor"
-#: ../src/features_window.py:108
+#: ../src/features_window.py:102
msgid ""
"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
"docs/ref/rst/restructuredtext.html)."
@@ -7146,25 +7289,25 @@
"Generuje XHTML z výstupu RST kódu (pozrite http://docutils.sourceforge.net/"
"docs/ref/rst/restructuredtext.html)."
-#: ../src/features_window.py:109 ../src/features_window.py:110
+#: ../src/features_window.py:103 ../src/features_window.py:104
msgid "Requires python-docutils."
msgstr "Vyžaduje python-docutils."
-#: ../src/features_window.py:111
-msgid "libsexy"
-msgstr "libsexy"
+#: ../src/features_window.py:105
+msgid "Banners and clickable links"
+msgstr ""
-#: ../src/features_window.py:112
+#: ../src/features_window.py:106
msgid "Ability to have clickable URLs in chat and groupchat window banners."
msgstr ""
"Schopnosť spraviť klikacie URL v titulkoch okien rozhovorov a diskusných "
"skupín."
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:107 ../src/features_window.py:108
msgid "Requires python-sexy."
msgstr "Vyžaduje python-sexy."
-#: ../src/features_window.py:128
+#: ../src/features_window.py:122
msgid "Feature"
msgstr "Funkcia"
@@ -7193,7 +7336,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:495
msgid "You"
msgstr "Vy"
@@ -7274,34 +7417,34 @@
msgid "%s wants to send you a file:"
msgstr "%s vám chce poslať súbor:"
-#: ../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 "Nie je možné prepísať existujúci súbor \"%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 ""
"Súbor s rovnakým názvom už existuje a nemáte oprávnenie na jeho prepísanie."
-#: ../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 "Tento súbor už existuje"
-#: ../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 "Čo si prajete vykonať?"
#. 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 "Do priečinku \"%s\" nie je možné zapisovať"
-#: ../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 "Nemáte oprávnenie vytvoriť súbor v tomto priečinku."
@@ -7345,40 +7488,40 @@
msgid "Sender: "
msgstr "Odosielateľ: "
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
msgid "Pause"
msgstr "Pozastaviť"
-#: ../src/gajim.py:83
+#: ../src/gajim.py:92
#, python-format
msgid "%s is not a valid loglevel"
msgstr ""
-#: ../src/gajim.py:156
+#: ../src/gajim.py:164
msgid "Gajim needs X server to run. Quiting..."
msgstr "Gajim potrebuje X server k behu. Ukončujem..."
-#: ../src/gajim.py:186
+#: ../src/gajim.py:193
msgid "Gajim needs PyGTK 2.8 or above"
msgstr "Gajim potrebuje PyGTK 2.8 alebo vyššie"
-#: ../src/gajim.py:187
+#: ../src/gajim.py:194
msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
msgstr "Gajim potrebuje PyGTK 2.8 alebo vyššie k behu. Ukončujem..."
-#: ../src/gajim.py:189
+#: ../src/gajim.py:196
msgid "Gajim needs GTK 2.8 or above"
msgstr "Gajim potrebuje GTK 2.8 alebo vyššie"
-#: ../src/gajim.py:190
+#: ../src/gajim.py:197
msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
msgstr "Gajim potrebuje GTK 2.8 alebo vyššie k behu. Ukončujem..."
-#: ../src/gajim.py:195
+#: ../src/gajim.py:202
msgid "GTK+ runtime is missing libglade support"
msgstr "GTK+ prostredie nepodporuje libglade"
-#: ../src/gajim.py:197
+#: ../src/gajim.py:204
#, python-format
msgid ""
"Please remove your current GTK+ runtime and install the latest stable "
@@ -7387,22 +7530,22 @@
"Prosím, odstráňte vašu aktuálnu verziu GTK+ prostredia a nainštalujte si "
"poslednú stabilnú verziu z %s"
-#: ../src/gajim.py:199
+#: ../src/gajim.py:206
msgid ""
"Please make sure that GTK+ and PyGTK have libglade support in your system."
msgstr ""
"Prosím, uistite sa, že GTK+ a PyGTK majú podporu pre libglade vo vašom "
"systéme."
-#: ../src/gajim.py:204
+#: ../src/gajim.py:211
msgid "Gajim needs PySQLite2 to run"
msgstr "Gajim potrebuje PySQLite2 pre svoj beh"
-#: ../src/gajim.py:212
+#: ../src/gajim.py:219
msgid "Gajim needs pywin32 to run"
msgstr "Gajim vyžaduje pywin32 na spustenie"
-#: ../src/gajim.py:213
+#: ../src/gajim.py:220
#, python-format
msgid ""
"Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7412,11 +7555,11 @@
"získať na %s"
#. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:374
msgid "Gajim is already running"
msgstr "Gajim už beží"
-#: ../src/gajim.py:367
+#: ../src/gajim.py:375
msgid ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
@@ -7424,25 +7567,35 @@
"Pravdepodobne už jeden program Gajim beží\n"
"Želáte si aj napriek tomu spustiť Gajim?"
-#: ../src/gajim.py:493
+#: ../src/gajim.py:460
msgid "Passphrase Required"
msgstr "Passfráza je požadovaná"
-#: ../src/gajim.py:494
+#: ../src/gajim.py:461
#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
msgstr "Vložiť heslo ku GPG kľúču pre účet %(keyid)s (account %(account)s)."
+#: ../src/gajim.py:475
+#, fuzzy
+msgid "GPG key expired"
+msgstr "CRL vypršal"
+
+#: ../src/gajim.py:476
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Budete pripojený k %s bez OpenPGP."
+
#. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:485
msgid "Wrong Passphrase"
msgstr "Nesprávna passfráza"
-#: ../src/gajim.py:510
+#: ../src/gajim.py:486
msgid "Please retype your GPG passphrase or press Cancel."
msgstr "Prosím zadajte znova vašu GPG passfrázu alebo stlačte Zrušiť."
-#: ../src/gajim.py:557
+#: ../src/gajim.py:549
#, python-format
msgid ""
"Your desired nickname in group chat %s is in use or registered by another "
@@ -7450,51 +7603,56 @@
"Please specify another nickname below:"
msgstr ""
-#: ../src/gajim.py:571
+#: ../src/gajim.py:563
msgid "Do you accept this request?"
msgstr "Prijať túto požiadavku?"
-#: ../src/gajim.py:573
+#: ../src/gajim.py:565
#, python-format
msgid "Do you accept this request on account %s?"
msgstr ""
-#: ../src/gajim.py:576
+#: ../src/gajim.py:568
#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
msgstr "Overenie HTTP (%(method)s) pre %(url)s (id: %(id)s)"
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:619 ../src/notify.py:493 ../src/osx/growler.py:17
msgid "Connection Failed"
msgstr "Spojenie zlyhalo"
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:937 ../src/gajim.py:941
#, python-format
msgid "Error %(code)s: %(msg)s"
msgstr "Chyba %(code)s: %(msg)s"
#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:951 ../src/gajim.py:965
#, python-format
msgid "error while sending %(message)s ( %(error)s )"
msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
-#: ../src/gajim.py:989
+#: ../src/gajim.py:988 ../src/notify.py:495
+#, fuzzy
+msgid "Subscription request"
+msgstr "Požiadavka o zapísanie"
+
+#: ../src/gajim.py:1013
msgid "Authorization accepted"
msgstr "Autorizácia akceptovaná"
-#: ../src/gajim.py:990
+#: ../src/gajim.py:1014
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr ""
"Kontakt \"%s\" vás autorizoval, aby ste mohol vidieť jeho alebo jej stav."
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1026
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "Kontakt \"%s\" vás odstránil zo svojho zoznamu"
-#: ../src/gajim.py:1010
+#: ../src/gajim.py:1027
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
@@ -7502,73 +7660,78 @@
"Budete vždy vidieť jeho alebo ju ako neprihlásený.\n"
"Chcete odstrániť jeho alebo ju zo zoznamu kontaktov?"
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1052 ../src/notify.py:497
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Odhlásiť"
+
+#: ../src/gajim.py:1093
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "Spojenie s \"%s\" nie je možné nadviazať"
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1281 ../src/groupchat_control.py:1166
#, python-format
msgid "%(nick)s is now known as %(new_nick)s"
msgstr "%(nick)s je známy ako %(new_nick)s"
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../src/notify.py:232
+#: ../src/gajim.py:1299 ../src/groupchat_control.py:1341
+#: ../src/history_window.py:428 ../src/notify.py:232
#, python-format
msgid "%(nick)s is now %(status)s"
msgstr "%(nick)s je teraz %(status)s"
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1366
#, python-format
msgid "%(jid)s has set the subject to %(subject)s"
msgstr "%(jid)s má nastavený predmet na %(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:1430 ../src/groupchat_control.py:1126
msgid "Any occupant is allowed to see your full JID"
msgstr ""
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1433
msgid "Room now shows unavailable member"
msgstr ""
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1435
msgid "room now does not show unavailable members"
msgstr ""
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1438
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:1441
msgid "Room logging is now enabled"
-msgstr ""
+msgstr "Zaznamenávanie miestnosti je teraz povolené"
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1443
msgid "Room logging is now disabled"
-msgstr ""
+msgstr "Zaznamenávanie miestnosti je teraz zakázané"
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1445
msgid "Room is now non-anonymous"
-msgstr ""
+msgstr "Miestnosť je teraz neanonymná"
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1448
msgid "Room is now semi-anonymous"
-msgstr ""
+msgstr "Miestnosť je teraz poloanonymná"
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1451
msgid "Room is now fully-anonymous"
-msgstr ""
+msgstr "Miestnosť je teraz anonymná"
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1483
#, python-format
msgid "A Password is required to join the room %s. Please type it."
msgstr ""
"Pre prihlásenie do miestnosti %s je potrebné heslo. Zadajte ho, prosím."
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1517
msgid ""
"You configured Gajim to use GPG agent, but there is no GPG agent running or "
"it returned a wrong passphrase.\n"
@@ -7576,20 +7739,45 @@
"Nastavili ste Gajim aby používal GPG agenta, ale tu nie je žiadny spustený "
"GPG agent alebo vrátil nesprávne heslo.\n"
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1519
msgid "You are currently connected without your OpenPGP key."
msgstr "Momentálne ste pripojený bez vášho OpenPGP kľúča."
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1522
msgid "Your passphrase is incorrect"
msgstr "Vaša passfráza je nesprávna"
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1545
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG je nepoužitelný"
+
+#: ../src/gajim.py:1545
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gajim.py:1547 ../src/gajim.py:2185 ../src/gajim.py:2220
+#: ../src/groupchat_control.py:1849 ../src/roster_window.py:3826
+msgid "Do _not ask me again"
+msgstr "Znovu sa už _nepýtať"
+
+#: ../src/gajim.py:1555
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Správca zväzku kľúčov je nainštalovaný, ale \t\t\t\t\t\t\tnesprávne spustený "
+"(pravdepodobne je \t\t\t\t\t\t\tnesprávne nastavená premenná prostredia)"
+
+#: ../src/gajim.py:1662
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "Nový e-mail %(gmail_mail_address)s"
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1664
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
@@ -7597,7 +7785,7 @@
msgstr[1] ""
msgstr[2] ""
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1677
#, python-format
msgid ""
"\n"
@@ -7612,80 +7800,80 @@
"Predmet: %(subject)s\n"
"%(snippet)s"
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1748
#, python-format
msgid "%s wants to send you a file."
msgstr "%s vám chce poslať súbor."
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1816
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "Úspešne prijatý súbor %(filename)s od %(name)s."
#. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1820
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1833
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "Úspešne odoslaný súbor %(filename)s pre %(name)s."
#. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1837
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
-#: ../src/gajim.py:1827
+#: ../src/gajim.py:1925
#, python-format
msgid ""
"Unable to decrypt message from %s\n"
"It may have been tampered with."
msgstr ""
-#: ../src/gajim.py:1834
+#: ../src/gajim.py:1932
msgid "Unable to decrypt message"
msgstr "Nepodarilo sa dešifrovať správu"
-#: ../src/gajim.py:1905
+#: ../src/gajim.py:2006
msgid "Username Conflict"
msgstr "Konflikt používateľských mien"
-#: ../src/gajim.py:1906
+#: ../src/gajim.py:2007
msgid "Please type a new username for your local account"
msgstr "Prosím, zadajte nové používateľské meno pre váš miestny účet"
-#: ../src/gajim.py:1918
+#: ../src/gajim.py:2019
msgid "Ping?"
msgstr "Ping?"
-#: ../src/gajim.py:1931
+#: ../src/gajim.py:2032
#, python-format
msgid "Pong! (%s s.)"
msgstr "Pong! (%s s.)"
-#: ../src/gajim.py:1942
+#: ../src/gajim.py:2043
msgid "Error."
msgstr "Chyba."
-#: ../src/gajim.py:1967
+#: ../src/gajim.py:2068
msgid "Resource Conflict"
msgstr "Konflikt zdroju"
-#: ../src/gajim.py:1968
+#: ../src/gajim.py:2069
msgid ""
"You are already connected to this account with the same resource. Please "
"type a new one"
msgstr ""
-#: ../src/gajim.py:2021
+#: ../src/gajim.py:2124
msgid "Error verifying SSL certificate"
msgstr "Chyba overovania SSL certifikátu"
-#: ../src/gajim.py:2022
+#: ../src/gajim.py:2125
#, python-format
msgid ""
"There was an error verifying the SSL certificate of your jabber server: %"
@@ -7693,30 +7881,36 @@
"Do you still want to connect to this server?"
msgstr ""
-#: ../src/gajim.py:2027
+#: ../src/gajim.py:2130
msgid "Ignore this error for this certificate."
msgstr "Ignorovať túto chybu pre tento certifikát."
-#: ../src/gajim.py:2042
+#: ../src/gajim.py:2150
msgid "SSL certificate error"
msgstr "Chyba SSL certifikátu"
-#: ../src/gajim.py:2043
-#, python-format
+#: ../src/gajim.py:2151
+#, fuzzy, python-format
msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
"Old fingerprint: %(old)s\n"
"New fingerprint: %(new)s\n"
"\n"
"Do you still want to connect and update the fingerprint of the certificate?"
msgstr ""
+"Vyzerá to že bol zmenený SSL certifikát alebo vaše pripojenie bolo "
+"hacknuté.\n"
+"Starý odtlačok: %(old)s\n"
+"Nový odtlačok: %(new)s\n"
+"\n"
+"Chcete sa predsa len pripojiť a aktualizovať odtlačok certifikátu?"
-#: ../src/gajim.py:2065 ../src/gajim.py:2095
+#: ../src/gajim.py:2181 ../src/gajim.py:2216
msgid "Insecure connection"
msgstr "Nezabezpečené spojenie"
-#: ../src/gajim.py:2066
+#: ../src/gajim.py:2182
msgid ""
"You are about to send your password on an unencrypted connection. Are you "
"sure you want to do that?"
@@ -7724,16 +7918,11 @@
"Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Ste si istý, "
"že to chcete urobiť?"
-#: ../src/gajim.py:2068 ../src/gajim.py:2098
+#: ../src/gajim.py:2184 ../src/gajim.py:2219
msgid "Yes, I really want to connect insecurely"
msgstr "Áno, chcem sa naozaj pripojiť nezabezpečene"
-#: ../src/gajim.py:2069 ../src/gajim.py:2099 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-msgid "Do _not ask me again"
-msgstr "Znovu sa už _nepýtať"
-
-#: ../src/gajim.py:2096
+#: ../src/gajim.py:2217
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?"
@@ -7741,28 +7930,28 @@
"Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Mali by ste "
"tomu predíssť nainštalovaním PyOpenSSL. Ste si istý, že to chcete urobiť?"
-#: ../src/gajim.py:2113
+#: ../src/gajim.py:2237
msgid "PEP node was not removed"
msgstr ""
-#: ../src/gajim.py:2114
+#: ../src/gajim.py:2238
#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
msgstr ""
#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2582 ../src/gajim.py:2603
+#: ../src/gajim.py:2724 ../src/gajim.py:2746
msgid "Emoticons disabled"
msgstr "Emotikony zakázané"
-#: ../src/gajim.py:2583
+#: ../src/gajim.py:2725
msgid ""
"Your configured emoticons theme has not been found, so emoticons have been "
"disabled."
msgstr ""
"Vami nastavená téma emotikôn nebola nájdená, takže emotikony budú zakázané."
-#: ../src/gajim.py:2604
+#: ../src/gajim.py:2747
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 "
@@ -7772,103 +7961,103 @@
"aktualizovať formát súboru emoticons.py. Pre viac podrobností pozrite http://"
"trac.gajim.org/wiki/Emoticons."
-#: ../src/gajim.py:2630 ../src/roster_window.py:3324
+#: ../src/gajim.py:2773 ../src/roster_window.py:3314
msgid "You cannot join a group chat while you are invisible"
msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ ste neviditeľný"
#. it is good to notify the user
#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2910
+#: ../src/gajim.py:3051
msgid "Could not save your settings and preferences"
msgstr "Nie je možné uložiť nastavenia"
-#: ../src/gajim.py:3007
+#: ../src/gajim.py:3148
msgid "Bookmark already set"
msgstr "Záložka je už nastavená"
-#: ../src/gajim.py:3008
+#: ../src/gajim.py:3149
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "Diskusná skupina \"%s\" je už vo vašich záložkách."
-#: ../src/gajim.py:3021
+#: ../src/gajim.py:3162
msgid "Bookmark has been added successfully"
msgstr "Záložka bola úspešne pridaná"
-#: ../src/gajim.py:3022
+#: ../src/gajim.py:3163
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr "Môžete spravovať záložky cez Akcie v menu vo vašom zozname."
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:81
msgid "Shows a help on specific command"
msgstr "Zobrazí pomocníka pre daný príkaz"
#. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:84
msgid "command"
msgstr "príkaz"
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:85
msgid "show help on command"
msgstr "ukáž pomocníka pre príkaz"
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:89
msgid "Shows or hides the roster window"
msgstr "Zobraziť alebo skryť okno so zoznamom"
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:93
msgid "Pops up a window with the next pending event"
msgstr "Vyskakovacie okno s ďalšou čakajúcou udalosťou"
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:97
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:100 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:272
msgid "account"
msgstr "účet"
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:100
msgid "show only contacts of the given account"
msgstr "zobraziť len kontakty daného účtu"
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:106
msgid "Prints a list of registered accounts"
msgstr "Vypíše zoznam registrovaných účtov"
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:110
msgid "Changes the status of account or accounts"
msgstr "Zmeniť stav účtu alebo účtov"
#. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:113
msgid "status"
msgstr "stav"
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:113
msgid "one of: offline, online, chat, away, xa, dnd, invisible "
msgstr ""
"jeden z: odhlásený, prítomný, chat, preč, diskutovať, zaneprázdnený, "
"neviditeľný"
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:160
msgid "message"
msgstr "správa"
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:114
msgid "status message"
msgstr "správa o stave"
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:115
msgid ""
"change status of account \"account\". If not specified, try to change status "
"of all accounts that have \"sync with global status\" option set"
@@ -7876,19 +8065,19 @@
"zmeniť stav účtu \"účet\". Ak nie je špecifikovaný, pokús sa zmeniť všetky "
"účty, ktoré majú nastavenú vlastnosť \"synchronizácia s globálnym stavom\""
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:121
msgid "Shows the chat dialog so that you can send messages to a contact"
msgstr "Zobrazí diskusné okno, takže môžete odoslať správu kontaktu"
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:123
msgid "JID of the contact that you want to chat with"
msgstr "JID kontaktu, s ktorým chcete komunikovať"
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:212
msgid "if specified, contact is taken from the contact list of this account"
msgstr "ak je špecifikované, kontakt je zobraný zo zoznamu pre tento účet"
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:130
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 "
@@ -7898,30 +8087,30 @@
"nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
"'OpenPGP kľúč' na ''."
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
msgid "JID of the contact that will receive the message"
msgstr "JID kontaktu, ktorý prijme správu"
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
msgid "message contents"
msgstr "obsah správy"
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
msgid "pgp key"
msgstr "pgp kľúč"
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
msgid "if specified, the message will be encrypted using this public key"
msgstr ""
"ak je špecifikovaný, správa bude zašifrovaná s použitím verejného kľúča"
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
msgid "if specified, the message will be sent using this account"
msgstr "ak je špecifikovaný, správa bude odoslaná s použitím tohoto účtu"
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
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 "
@@ -7931,136 +8120,136 @@
"nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
"'OpenPGP kľúč' na ''."
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
msgid "subject"
msgstr "predmet"
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
msgid "message subject"
msgstr "predmet správy"
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
msgid "Sends new message to a groupchat you've joined."
msgstr ""
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
msgid "JID of the room that will receive the message"
msgstr ""
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
msgid "Gets detailed info on a contact"
msgstr "Získať podrobné informácie o kontakte"
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
msgid "JID of the contact"
msgstr "JID kontaktu"
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
msgid "Gets detailed info on a account"
msgstr "Získať podrobné informácie o účte"
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
msgid "Name of the account"
msgstr "Názov účtu"
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
msgid "Sends file to a contact"
msgstr "Poslať súbor kontaktu"
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
msgid "file"
msgstr "súbor"
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
msgid "File path"
msgstr "Cesta k súboru"
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
msgid "if specified, file will be sent using this account"
msgstr "ak je špecifikovaný, súbor bude odoslaný s použitím tohto účtom"
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
msgid "Lists all preferences and their values"
msgstr "Výpis všetkých nastavení a ich hodnôt"
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
msgid "Sets value of 'key' to 'value'."
msgstr "Nastavuje hodnotu 'kľúča' na 'hodnotu'."
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
msgid "key=value"
msgstr "kľúč=hodnota"
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
msgid "'key' is the name of the preference, 'value' is the value to set it to"
msgstr ""
"'kľúč' je názov vlastnosti, 'hodnota' je hodnota, na ktorú má byť nastavený"
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
msgid "Deletes a preference item"
msgstr "Odstrániť položku predvoľby"
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
msgid "key"
msgstr "kľúč"
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
msgid "name of the preference to be deleted"
msgstr "názov nastavenia, ktoré má byť zmazané"
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
msgid "Writes the current state of Gajim preferences to the .config file"
msgstr "Zapíše aktuálny stav nastavení programu Gajim do súboru .config"
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
msgid "Removes contact from roster"
msgstr "Odstráni kontakt zo zoznamu"
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
msgid "Adds contact to roster"
msgstr "Pridá kontakt do zoznamu"
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
msgid "jid"
msgstr "jid"
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
msgid "Adds new contact to this account"
msgstr "Pridá nový kontakt do tohto účtu"
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
msgid "Returns current status (the global one unless account is specified)"
msgstr "Vráti aktuálny stav (použije sa globálny, pokiaľ nie je vybraný účet)"
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
msgid ""
"Returns current status message (the global one unless account is specified)"
msgstr ""
"Vráti aktuálnu správu o stave (použije sa globálny, pokiaľ nie je vybraný "
"účet)"
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
msgid "Returns number of unread messages"
msgstr "Vráti počet neprečítaných správ"
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
msgid "Opens 'Start Chat' dialog"
msgstr "Otvorí dialóg 'Začiatok diskusie'"
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
msgid "Starts chat, using this account"
msgstr "Začať rozhovor s použitím účtu %s"
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
msgid "Sends custom XML"
msgstr "Odoslať vlastné XML"
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
msgid "XML to send"
msgstr "XML na odoslanie"
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
msgid ""
"Account in which the xml will be sent; if not specified, xml will be sent to "
"all accounts"
@@ -8068,67 +8257,67 @@
"Účet na ktorý bude XML odoslané; ak nie je špecifikovaný, XML bude odoslané "
"všetkým účtom"
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
msgid "Handle a xmpp:/ uri"
msgstr ""
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
msgid "uri"
msgstr "uri"
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
msgid "URI to handle"
msgstr ""
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
msgid "Account in which you want to handle it"
msgstr "Účet ktorý chcete ovládať"
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:267
msgid "Join a MUC room"
msgstr "Pripojiť MUC miestnosť"
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:269
msgid "room"
msgstr "miestnosť"
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:269
msgid "Room JID"
msgstr "JID miestnosti"
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:270
msgid "nick"
msgstr "prezývka"
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:270
msgid "Nickname to use"
msgstr "Prezývka na používanie"
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:271
msgid "password"
msgstr "heslo"
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:271
msgid "Password to enter the room"
msgstr "Heslo pre vstup do miestnosti"
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:272
msgid "Account from which you want to enter the room"
msgstr "Účet s ktorým chcete vstúpiť do miestnosti"
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:277
msgid "Check if Gajim is running"
msgstr "Kontrolovať, či je Gajim spustený"
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:281
msgid "Shows or hides the ipython window"
msgstr "Zobraziť alebo skryť okno ipython"
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:308
msgid "Missing argument \"contact_jid\""
msgstr "Chýbajúci argument \"contact_jid\""
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:327
#, python-format
msgid ""
"'%s' is not in your roster.\n"
@@ -8137,15 +8326,15 @@
"'%s' nie je vo vašom zozname.\n"
"Prosím, špecifikujte účet, z ktorého odoslať správu."
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:330
msgid "You have no active account"
msgstr "Nemáte žiadny aktívny účet"
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:382
msgid "It seems Gajim is not running. So you can't use gajim-remote."
msgstr "Vyzerá že Gajim nebeží. Nemôžete tak použiť gajim-remote."
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:405
#, python-format
msgid ""
"Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8154,16 +8343,16 @@
"Použitie: %(basename)s %(command)s %(arguments)s \n"
"\t %(help)s"
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:409
msgid "Arguments:"
msgstr "Argumenty:"
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:413
#, python-format
msgid "%s not found"
msgstr "%s nenájdený"
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:417
#, python-format
msgid ""
"Usage: %s command [arguments]\n"
@@ -8172,7 +8361,7 @@
"Použitie: %s príkaz [argumenty]\n"
"Príkaz je jeden z:\n"
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:482
#, python-format
msgid ""
"Too many arguments. \n"
@@ -8181,7 +8370,7 @@
"Príliš veľa argumentov. \n"
"Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:487
#, python-format
msgid ""
"Argument \"%(arg)s\" is not specified. \n"
@@ -8190,7 +8379,7 @@
"Argument \"%(arg)s\" nie je špecifikovaný. \n"
"Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:506
msgid "Wrong uri"
msgstr "Nesprávna uri"
@@ -8219,147 +8408,147 @@
msgid "Please first choose another for your current theme."
msgstr "Prosím, vyberte najskôr inú tému ako sučastnú."
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
msgid "Sending private message failed"
msgstr "Odoslanie súkromnej správy sa nepodarilo"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
#, python-format
msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
msgstr ""
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:453
msgid "Insert Nickname"
msgstr "Vložiť prezývku"
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:605
msgid "Conversation with "
msgstr "Rozhovor s "
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:607
msgid "Continued conversation"
msgstr "Pokračovanie rozhovoru"
-#: ../src/groupchat_control.py:1027
+#: ../src/groupchat_control.py:1014
msgid "Really send file?"
msgstr "Skutočne poslať súbor?"
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1015
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
msgstr "Ak pošlete súbor %s, on/ona budú poznať vaše skutočné Jabber ID."
#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1129
msgid "Room logging is enabled"
msgstr "Zaznamenávanie miestosti je povolené"
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1131
msgid "A new room has been created"
msgstr "Bola vytvorená nová miestnosť"
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1134
msgid "The server has assigned or modified your roomnick"
msgstr ""
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1140
#, python-format
msgid "%(nick)s has been kicked: %(reason)s"
msgstr "%(nick)s bol vykopnutý: %(reason)s"
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1144
#, python-format
msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
msgstr "%(nick)s bol vykopnutý %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1151
#, python-format
msgid "%(nick)s has been banned: %(reason)s"
msgstr "%(nick)s bol zakázaný: %(reason)s"
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1155
#, python-format
msgid "%(nick)s has been banned by %(who)s: %(reason)s"
msgstr "%(nick)s bol zakázaný %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1164
#, python-format
msgid "You are now known as %s"
msgstr "Teraz ste známy ako %s"
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1202 ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1211
#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
msgstr "%(nick)s bol odstránený z miestnosti (%(reason)s)"
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1203
msgid "affiliation changed"
msgstr "príslušnosť zmenená"
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
msgid "room configuration changed to members-only"
-msgstr ""
+msgstr "nastavenie miestnosti sa zmenilo na len členovia"
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1213
msgid "system shutdown"
msgstr "vypnutie systému"
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1282
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
msgstr ""
-#: ../src/groupchat_control.py:1284
+#: ../src/groupchat_control.py:1286
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
msgstr ""
-#: ../src/groupchat_control.py:1299
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1301
+#, python-format
msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
-msgstr "%(nick)s bol vykopnutý %(who)s: %(reason)s"
+msgstr "** Rola %(nick)s bola nastavená na %(role)s kontaktom %(actor)s"
-#: ../src/groupchat_control.py:1303
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1305
+#, python-format
msgid "** Role of %(nick)s has been set to %(role)s"
-msgstr "%(nick)s bol vykopnutý: %(reason)s"
+msgstr "** Rola %(nick)s bola nastavená na %(role)s"
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1334
#, python-format
msgid "%s has left"
msgstr "%s odišiel"
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1339
#, python-format
msgid "%s has joined the group chat"
msgstr "%s sa pripojil do diskusnej skupiny"
#. Invalid Nickname
#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1737
msgid "Invalid nickname"
msgstr "Neplatná prezývka"
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1478 ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1582 ../src/groupchat_control.py:1599
#, python-format
msgid "Nickname not found: %s"
msgstr "Prezývka nenájdená: %s"
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1512
msgid "This group chat has no subject"
msgstr "Diskusná skupina nemá nastavený predmet"
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1524
#, python-format
msgid "Invited %(contact_jid)s to %(room_jid)s."
msgstr "Pozvaný %(contact_jid)s do %(room_jid)s."
-#: ../src/groupchat_control.py:1656
+#: ../src/groupchat_control.py:1660
#, python-format
msgid ""
"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8372,7 +8561,7 @@
"práve v diskusnej skupine, on/ona/ono bude vykoponutý. Medzery v prezývkach "
"nie sú podporované."
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1667
#, python-format
msgid ""
"Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8381,7 +8570,7 @@
"Použite: /%s <prezývka>, otvorí okno sukromného rozhovoru s určeným "
"používateľom."
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1673
#, python-format
msgid ""
"Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8390,7 +8579,7 @@
"Použitie: /%s [dôvod], zatvorí aktuálnu kartu v okne a zobrazí zdôvodnenie, "
"pokiaľ je špecifikované."
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1679
#, python-format
msgid ""
"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8399,7 +8588,7 @@
"Použitie: /%s <JID> [dôvod], pozve JID do aktuálnej diskusnej skupiny, "
"prípadne sa zobrazí aj dôvod."
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1683
#, python-format
msgid ""
"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8408,7 +8597,7 @@
"Použitie: /%s <miestnosť>@<server>[/prezývka], ponúkne možnosť pripojiť sa "
"do miestnosť@server pre prezývku, ak je špecifikovaný."
-#: ../src/groupchat_control.py:1683
+#: ../src/groupchat_control.py:1687
#, python-format
msgid ""
"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8419,7 +8608,7 @@
"podľa prezývky, prípadne zobrazí dôvod. Medzery v prezývkach nie sú "
"podporované."
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1696
#, python-format
msgid ""
"Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8428,83 +8617,83 @@
"Použitie: /%s <prezývka> [správa], otvorí okno sukromného rozhovoru a pošle "
"správu určenému používateľovi podľa prezývky."
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1701
#, python-format
msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
msgstr ""
"Použitie: /%s <prezývka>, zmení prezývku v aktuálnej diskusnej skupine."
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1705
#, python-format
msgid "Usage: /%s , display the names of group chat occupants."
msgstr "Použitie: /%s , zobrazí mená členov v diskusnej skupine."
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1709
#, python-format
msgid "Usage: /%s [topic], displays or updates the current group chat topic."
msgstr ""
"Použitie: /%s [téma], zobrazí alebo aktualizuje tému v diskusnej skupine."
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1712
#, python-format
msgid ""
"Usage: /%s <message>, sends a message without looking for other commands."
msgstr "Použitie: /%s <správa>, odošle správu, bezohľadu na ďalšie príkazy."
-#: ../src/groupchat_control.py:1837
+#: ../src/groupchat_control.py:1843
#, python-format
msgid "Are you sure you want to leave group chat \"%s\"?"
msgstr "Ste si istý, že chcete opustiť diskusnú skupinu \"%s\"?"
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1845
msgid ""
"If you close this window, you will be disconnected from this group chat."
msgstr "Ak zatvoríte okno, budete odpojený z tejto diskusnej skupiny."
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1882
msgid "Changing Subject"
msgstr "Zmena predmetu"
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1883
msgid "Please specify the new subject:"
msgstr "Prosím, špecifikujte nový predmet:"
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1887
msgid "Changing Nickname"
msgstr "Zmena prezývky"
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1888
msgid "Please specify the new nickname you want to use:"
msgstr "Prosím špecifikujte novú prezývku, ktorú chcete používať:"
#. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1915
#, python-format
msgid "Destroying %s"
msgstr "Ničí sa %s"
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1916
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
msgstr ""
-#: ../src/groupchat_control.py:1911
+#: ../src/groupchat_control.py:1918
msgid "You may also enter an alternate venue:"
msgstr ""
#. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2089
#, python-format
msgid "Kicking %s"
msgstr "Vykopnúť %s"
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2090 ../src/groupchat_control.py:2381
msgid "You may specify a reason below:"
msgstr "Môžete dole špecifikovať dôvod:"
#. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2380
#, python-format
msgid "Banning %s"
msgstr "Zakazujem %s"
@@ -8573,44 +8762,44 @@
msgstr ""
"Obrázok nie je možné uložiť vo formáte %(type)s. Uložiť ako %(new_filename)s?"
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:840
msgid "Save Image as..."
msgstr "Uložiť obrázok ako..."
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:96
msgid "Cannot find history logs database"
msgstr "Nie je možné nájsť databázu so záznamami o histórii"
#. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:136
msgid "Contacts"
msgstr "Kontakty"
#. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:149 ../src/history_manager.py:189
#: ../src/history_window.py:95
msgid "Date"
msgstr "Dátum"
#. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:155 ../src/history_manager.py:207
msgid "Nickname"
msgstr "Prezývka"
#. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:163 ../src/history_manager.py:195
#: ../src/history_window.py:103
msgid "Message"
msgstr "Správa"
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:223
msgid ""
"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
"RUNNING)"
msgstr ""
"Skutočne si želáte vyčistiť databázu? (SILNE SA NEODPORÚČA, KEĎ BEŽÍ GAJIM)"
-#: ../src/history_manager.py:226
+#: ../src/history_manager.py:225
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 "
@@ -8624,87 +8813,87 @@
"\n"
"V prípade, že zvolite Áno, prosíme o strpenie..."
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:433
msgid "Exporting History Logs..."
msgstr "Exportovanie záznamov histórie..."
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:508
#, python-format
msgid "%(who)s on %(time)s said: %(message)s\n"
msgstr "%(who)s o %(time)s povedal: %(message)s\n"
-#: ../src/history_manager.py:549
+#: ../src/history_manager.py:545
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] "Skutočne chcete odstrániť záznamy vybraných kontaktov?"
msgstr[1] "Skutočne chcete odstrániť záznamy vybraného kontaktu?"
msgstr[2] "Skutočne chcete odstrániť záznamy vybraných kontaktov?"
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:549 ../src/history_manager.py:584
msgid "This is an irreversible operation."
msgstr "Toto je nevratná operácia."
-#: ../src/history_manager.py:585
+#: ../src/history_manager.py:581
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the selected messages?"
msgstr[0] "Skutočne si želáte zmazať vybraných správ?"
msgstr[1] "Skutočne si želáte zmazať vybranú správu?"
msgstr[2] "Skutočne si želáte zmazať vybrané správy?"
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
#, python-format
msgid "Conversation History with %s"
msgstr "História konverzácie s %s"
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
#, fuzzy
msgid "Disk Error"
msgstr "Chyba pri zápise na disk"
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
#, python-format
msgid "%(nick)s is now %(status)s: %(status_msg)s"
msgstr "%(nick)s je teraz %(status)s: %(status_msg)s"
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
#, python-format
msgid "Status is now: %(status)s: %(status_msg)s"
msgstr "Stav je teraz: %(status)s: %(status_msg)s"
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
#, python-format
msgid "Status is now: %(status)s"
msgstr "Stav je teraz: %(status)s"
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:564 ../src/htmltextview.py:575
msgid "Timeout loading image"
msgstr "Vypršal čas nahrávania obrázku"
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:585
msgid "Image is too big"
msgstr "Obrázok je príliš veľký"
-#: ../src/message_window.py:446
+#: ../src/message_window.py:443
msgid "Chats"
msgstr "Rozhovory"
-#: ../src/message_window.py:448
+#: ../src/message_window.py:445
msgid "Group Chats"
msgstr "Diskusné skupiny"
-#: ../src/message_window.py:450
+#: ../src/message_window.py:447
msgid "Private Chats"
msgstr "Súkromné rozhovory"
-#: ../src/message_window.py:456
+#: ../src/message_window.py:453
msgid "Messages"
msgstr "Správy"
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
msgid "- messages will be logged"
msgstr "- správy budú zaznamenané"
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
msgid "- messages will not be logged"
msgstr "- správy nebudú zaznamenané"
@@ -8748,50 +8937,55 @@
msgid "New Message from %(nickname)s"
msgstr "Správa od %(nickname)s"
+#: ../src/notify.py:534
+#, fuzzy
+msgid "Ignore"
+msgstr "_Ignorovať"
+
#: ../src/osx/growler.py:10
msgid "Generic"
msgstr "Spoločné"
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
msgid "Retrieving profile..."
msgstr "Získava sa profil..."
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2758
msgid "File is empty"
msgstr "Súbor je prázdny"
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2761
msgid "File does not exist"
msgstr "Súbor neexistuje"
#. 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:2763 ../src/roster_window.py:2774
msgid "Could not load image"
msgstr "Nie je možné načítať obrázok"
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
msgid "Information received"
msgstr "Informácie prijaté"
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
msgid "Without a connection you can not publish your contact information."
msgstr "Bez pripojenie nemôžete publikovať informácie o vašom kontakte."
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
msgid "Sending profile..."
msgstr "Odosielanie profilu..."
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
msgid "Information NOT published"
msgstr "Informácie neboli zverejnené"
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
msgid "vCard publication failed"
msgstr "zverejnenia vCard zlyhalo"
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
msgid ""
"There was an error while publishing your personal information, try again "
"later."
@@ -8799,55 +8993,47 @@
"Nastala chyba pri zverejňovaní vašich osobných údajov, skúste to prosím "
"neskôr."
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:285 ../src/roster_window.py:939
msgid "Merged accounts"
msgstr "Zlúčené účty"
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1874
msgid "Authorization has been sent"
msgstr "Autorizácia bola odoslaná"
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1875
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "Od teraz bude \"%s\" vidieť váš stav."
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1895
msgid "Subscription request has been sent"
msgstr "Žiadosť o zapísanie bola odoslaná"
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1896
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr ""
"Ak \"%s\" akceptuje túto požiadavku, budete vidieť jeho alebo jej stav."
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1908
msgid "Authorization has been removed"
msgstr "Autorizácia bola odstránená"
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1909
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "Odteraz vás \"%s\" uvidí len v stave odhlásený."
-#: ../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 ""
-"Správca zväzku kľúčov je nainštalovaný, ale \t\t\t\t\t\t\tnesprávne spustený "
-"(pravdepodobne je \t\t\t\t\t\t\tnesprávne nastavená premenná prostredia)"
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1934
msgid "GPG is not usable"
msgstr "GPG je nepoužitelný"
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2093 ../src/roster_window.py:3258
msgid "You are participating in one or more group chats"
msgstr "Ste v jednej alebo viacerých diskusných skupinách"
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../src/roster_window.py:2094 ../src/roster_window.py:3259
msgid ""
"Changing your status to invisible will result in disconnection from those "
"group chats. Are you sure you want to go invisible?"
@@ -8856,15 +9042,15 @@
"diskusných skupín. Ste si skutočne istý, že chcete zmeniť stav na "
"neviditeľný?"
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2120
msgid "desync'ed"
msgstr ""
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../src/roster_window.py:2258 ../src/roster_window.py:2495
msgid "You have unread messages"
msgstr "Máte neprečítané správy"
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2259
msgid ""
"Messages will only be available for reading them later if you have history "
"enabled and contact is in your roster."
@@ -8872,16 +9058,16 @@
"Správu bude možné prečítať neskôr len vtedy, ak máte povolenú históriu a "
"kontakt je vo vašom zozname kontaktov."
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2496
msgid "You must read them before removing this transport."
msgstr "Musíte si ich prečítať pred odstránením tohoto transportu."
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2499
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "Transport \"%s\" bude odstránený"
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2500
msgid ""
"You will no longer be able to send and receive messages from contacts using "
"this transport."
@@ -8889,11 +9075,11 @@
"Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
"transport."
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2503
msgid "Transports will be removed"
msgstr "Transport bude odstránený"
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2508
#, python-format
msgid ""
"You will no longer be able to send and receive messages to contacts from "
@@ -8903,52 +9089,57 @@
"transport: %s"
#. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2639
msgid "Rename Contact"
msgstr "Premenovať kontakt"
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2640
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "Zadať novú prezývku pre kontakt %s"
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2647
msgid "Rename Group"
msgstr "Premenovať skupinu"
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2648
#, python-format
msgid "Enter a new name for group %s"
msgstr "Zadať nové meno skupiny %s"
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2704
msgid "Remove Group"
msgstr "Odstrániť skupinu"
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2705
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "Chcete skutočne odstrániť skupinu %s zo zoznamu kontaktov?"
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2706
msgid "Also remove all contacts in this group from your roster"
msgstr ""
"Tiež odstráni všetky kontakty v tejto skupine z vášho zoznamu kontaktov"
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2745
msgid "Assign OpenPGP Key"
msgstr "Prideliť Open_PGP kľúč"
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2746
msgid "Select a key to apply to the contact"
msgstr "Vybrať kľúč a aplikovať ho na kontakt"
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3099
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3101
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3106
msgid ""
"By removing this contact you also remove authorization resulting in him or "
"her always seeing you as offline."
@@ -8957,11 +9148,11 @@
"znamená, že ona alebo on vás vždy uvidí ako odhlásený."
#. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3112
msgid "Do you want to continue?"
msgstr "Chcete pokračovať?"
-#: ../src/roster_window.py:3141
+#: ../src/roster_window.py:3115
msgid ""
"By removing this contact you also by default remove authorization resulting "
"in him or her always seeing you as offline."
@@ -8969,16 +9160,16 @@
"Odstránením tohto kontaktu, automaticky odstránite aj autorizáciu, to "
"znamená, že ona alebo on vás vždy uvidí ako odhlásený."
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3118
msgid "I want this contact to know my status after removal"
msgstr "Chcem upozorniť kontakt, na to, že bol odstránený"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3122
msgid "Contacts will be removed from your roster"
msgstr "Kontakt bude odstránený zo zoznamu"
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3127
#, python-format
msgid ""
"By removing these contacts:%s\n"
@@ -8988,20 +9179,20 @@
"taktiež odstránite vašu autorizáciu, to znamená, že vás budú vidieť ako "
"odhlásený."
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3182
msgid "No account available"
msgstr "Žiadne účty nie sú dostupné"
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3183
msgid "You must create an account before you can chat with other contacts."
msgstr ""
"Musíte si vytvoriť účet predtým, než budete môcť komunikovať s ostatnými."
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3733
msgid "Metacontacts storage not supported by your server"
msgstr "Server nepodporuje ukladanie metakontaktov"
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3735
msgid ""
"Your server does not support storing metacontacts information. So those "
"information will not be saved on next reconnection."
@@ -9009,25 +9200,25 @@
"Váš server nepodporuje ukladanie informácií metakontaktov. Tak tieto "
"informácie nebudú uložené pri ďalšom prihlásení."
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3820
msgid ""
"You are about to create a metacontact. Are you sure you want to continue?"
msgstr ""
"Práve sa chystáte vytvoriť metakontakt. Ste si skutočne istý, že chcete "
"pokračovať?"
-#: ../src/roster_window.py:3786
+#: ../src/roster_window.py:3822
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 ""
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:3935
msgid "Invalid file URI:"
msgstr "Neplatná URI súboru:"
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:3946
#, python-format
msgid "Do you want to send this file to %s:"
msgid_plural "Do you want to send these files to %s:"
@@ -9040,123 +9231,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:4623 ../src/roster_window.py:4694
+#: ../src/roster_window.py:4703 ../src/systray.py:215 ../src/systray.py:262
+#: ../src/systray.py:268
#, python-format
msgid "using account %s"
msgstr "použiť účet %s"
#. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4710
#, python-format
msgid "to %s account"
msgstr "pre %s účet"
#. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4715
#, python-format
msgid "using %s account"
msgstr "použiť %s účet"
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4752 ../src/systray.py:278
msgid "_Manage Bookmarks..."
msgstr "_Spravovať záložky..."
#. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4772
#, python-format
msgid "of account %s"
msgstr "účtu %s"
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4812
#, python-format
msgid "for account %s"
msgstr "pre účet %s"
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4874 ../src/roster_window.py:4983
msgid "_Change Status Message"
msgstr "_Zmeniť správu o stave"
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4901
msgid "Publish Tune"
msgstr "Hudba"
-#: ../src/roster_window.py:4872
+#: ../src/roster_window.py:4908
msgid "Mood"
msgstr "Nálada"
-#: ../src/roster_window.py:4876
+#: ../src/roster_window.py:4912
msgid "Activity"
msgstr "Aktivita"
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4917
msgid "Configure Services..."
msgstr "Nastavovať služby..."
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5071
msgid "_Maximize All"
msgstr "_Maximalizovať všetko"
#. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5079 ../src/roster_window.py:5605
msgid "Send Group M_essage"
msgstr "Poslať sprá_vu skupine"
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5087
msgid "To all users"
msgstr "Všetkým používateľom"
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5091
msgid "To all online users"
msgstr "Všetkým pripojeným používateľom"
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5502
msgid "I would like to add you to my roster"
msgstr "Chcem si vás pridať do svojho zoznamu"
#. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5625
msgid "_Manage Contacts"
msgstr "S_pravovať kontakty"
#. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5686
msgid "Send Single Message"
msgstr "Poslať krátku správu"
#. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5742
msgid "_Manage Transport"
msgstr "S_pravovať transport"
#. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5750
msgid "_Modify Transport"
msgstr "_Upraviť transport"
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5824
msgid "_Maximize"
msgstr "Ma_ximalizovať"
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5831
msgid "_Disconnect"
msgstr "O_dpojiť"
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5911
msgid "_New Group Chat"
msgstr "_Nová diskusná skupina"
#. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6024
msgid "History Manager"
msgstr "Správca histórie"
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6033
msgid "_Join New Group Chat"
msgstr "_Pripojiť sa k diskusnej skupine"
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6243
msgid "Change Status Message..."
msgstr "Zmeniť správu o stave..."
@@ -9173,7 +9364,7 @@
msgid "No result"
msgstr "Žiadny výsledok"
-#: ../src/session.py:124
+#: ../src/session.py:123
msgid "Disk WriteError"
msgstr "Chyba pri zápise na disk"
@@ -9182,11 +9373,11 @@
msgid "Subject: %s"
msgstr "Predmet: %s"
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:403 ../src/session.py:438
msgid "Confirm these session options"
msgstr "Potvrdiť tieto voľby relácie"
-#: ../src/session.py:400
+#: ../src/session.py:405
#, python-format
msgid ""
"The remote client wants to negotiate an session with these features:\n"
@@ -9196,7 +9387,7 @@
"\tAre these options acceptable?"
msgstr ""
-#: ../src/session.py:434
+#: ../src/session.py:439
#, python-format
msgid ""
"The remote client selected these options:\n"
@@ -9211,11 +9402,11 @@
"\n"
"Pokračovať s reláciou?"
-#: ../src/systray.py:188
+#: ../src/systray.py:176
msgid "_Change Status Message..."
msgstr "_Zmeniť správu o stave..."
-#: ../src/systray.py:322
+#: ../src/systray.py:293
msgid "Hide this menu"
msgstr "Skryť toto menu"
@@ -9336,24 +9527,29 @@
"Táto služba neodpovedala podrobnejšími informáciami.\n"
"Je pravdepodobne zastaralá alebo poškodená"
-#: ../src/vcard.py:245
+#: ../src/vcard.py:246
msgid "?Client:Unknown"
msgstr "?Klient: Neznámy"
-#: ../src/vcard.py:247
+#: ../src/vcard.py:248
msgid "?OS:Unknown"
msgstr "?OS:Neznámy"
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:269
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Klient: Neznámy"
+
+#: ../src/vcard.py:293 ../src/vcard.py:303 ../src/vcard.py:524
#, python-format
msgid "since %s"
msgstr "od %s"
-#: ../src/vcard.py:311
+#: ../src/vcard.py:332
msgid "<b>Affiliation:</b>"
msgstr "<b>Pričlenenie:</b>"
-#: ../src/vcard.py:319
+#: ../src/vcard.py:340
msgid ""
"This contact is interested in your presence information, but you are not "
"interested in his/her presence"
@@ -9361,7 +9557,7 @@
"Tento kontakt sa zaujíma o vaše informácie o prítomnosti, ale vy sa "
"nezaujímate o jeho/jej informácie o prítomnosti"
-#: ../src/vcard.py:321
+#: ../src/vcard.py:342
msgid ""
"You are interested in the contact's presence information, but he/she is not "
"interested in yours"
@@ -9369,12 +9565,12 @@
"Zaujímate sa o informácie o prítomnosti vášho kontaktu, ale on/ona sa "
"nezaujíma o vaše"
-#: ../src/vcard.py:323
+#: ../src/vcard.py:344
msgid "You and the contact are interested in each other's presence information"
msgstr ""
#. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:346
msgid ""
"You are not interested in the contact's presence, and neither he/she is "
"interested in yours"
@@ -9382,30 +9578,88 @@
"Nezaujímate sa o informácie o prítomnosti vášho kontaktu a ani on/ona sa "
"nezaujíma o vaše"
-#: ../src/vcard.py:332
+#: ../src/vcard.py:353
msgid "You are waiting contact's answer about your subscription request"
msgstr "Čakáte na odpoveď od kontaktu ohľadne vašej požiadavky na zápis"
-#: ../src/vcard.py:334
+#: ../src/vcard.py:355
msgid "There is no pending subscription request."
msgstr ""
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:360 ../src/vcard.py:415 ../src/vcard.py:549
msgid " resource with priority "
msgstr " zdroj s prioritou "
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Kliknite pre zistenie vlastností (ako MSN, ICQ transport) jabber serverov"
+
+#~ msgid "Servers Features"
+#~ msgstr "Vlastnosti servera"
+
+#~ msgid "Name:"
+#~ msgstr "Meno:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Hostiteľ:"
+
+#~ msgid "Modify Account"
+#~ msgstr "Upraviť účet"
+
#~ msgid "The username used to identify the Last.fm account."
#~ msgstr "Používateľské meno používané na idintifikovanie Last.fm účtu."
+#~ msgid "Gajim account %s"
+#~ msgstr "Gajim účet %s"
+
+#~ msgid "Thoughtful"
+#~ msgstr "Zamyslený"
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenGPG"
+
+#~ msgid "gnome-keyring"
+#~ msgstr "gnome-keyring"
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Vyžaduje python-gnome2-extras alebo kompiláciu gtkspell modulu zo "
+#~ "zdrojových kódov Gajim."
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Notification-daemon"
+
+#~ msgid "Idle"
+#~ msgstr "Nečinný"
+
+#~ msgid "Requires compilation of the idle module from Gajim sources."
+#~ msgstr "Vyžaduje kompiláciu idle modulu zo zdrojový kódov Gajim."
+
+#, fuzzy
+#~ msgid ""
+#~ "Requires texlive-latex-base, dvips and imagemagick. You have to set "
+#~ "'use_latex' to True in the Advanced Configuration Editor."
+#~ msgstr ""
+#~ "Vyžaduje texlive-latex-base, dvips a imagemagick. Nastavte 'use_latex' na "
+#~ "pravda v Editor rozšírenej konfigurácie."
+
+#~ msgid "libsexy"
+#~ msgstr "libsexy"
+
#~ msgid "Network Manager support not available"
#~ msgstr "Podpora pre správcu sieťových spojení nie je k dispozícii"
#~ msgid "Session Management support not available (missing gnome.ui module)"
#~ msgstr "Podpora Správy sedenia nie je dostupná (chýba modul gnome.ui)"
-#~ msgid "Thoughtful"
-#~ msgstr "Zamyslený"
-
#~ msgid ""
#~ "If checked, Gajim will sort contacts in roster window and groupchats by "
#~ "their status and not by the shown name"
Modified: branches/osx_newbuildsys/po/sv.po
===================================================================
--- branches/osx_newbuildsys/po/sv.po 2009-03-06 05:55:50 UTC (rev 11143)
+++ branches/osx_newbuildsys/po/sv.po 2009-03-06 21:46:52 UTC (rev 11144)
@@ -1,70 +1,74 @@
-# Swedish translation for gajim
-# Copyright (c) (c) 2005 Canonical Ltd, and Rosetta Contributors 2005
-# This file is distributed under the same license as the gajim package.
-# Oscar Hellström <oscar(a)oscarh.net>, 2005.
-#
+# Swedish translation for gajim
+# Copyright (c) (c) 2005-2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gajim package.
+# Nafallo Bjälevik, 2007.
+# Oscar Hellström <oscar(a)oscarh.net>, 2005.
+# Daniel Nylander <po(a)danielnylander.se>, 2007, 2009.
+#
+#. app_name (string)
+#. replaces_id (uint)
+#. event_id (string)
+#. app_icon (string)
+#: ../src/notify.py:530
msgid ""
msgstr ""
"Project-Id-Version: gajim\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
-"PO-Revision-Date: 2007-01-20 16:54+0100\n"
-"Last-Translator: Oscar Hellström <oscar(a)oscarh.net>\n"
-"Language-Team: Swedish <sv(a)li.org>\n"
+"POT-Creation-Date: 2009-03-01 14:33+0100\n"
+"PO-Revision-Date: 2009-02-26 10:45+0100\n"
+"Last-Translator: Daniel Nylander <po(a)danielnylander.se>\n"
+"Language-Team: Swedish <tp-sv(a)listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/gajim.desktop.in.in.h:1
msgid "A GTK+ Jabber client"
-msgstr "A GTK+ Jabber client"
+msgstr "En GTK+-baserad Jabber-klient"
#: ../data/gajim.desktop.in.in.h:2
msgid "Gajim Instant Messenger"
-msgstr "Gajim IM-klient"
+msgstr "Snabbmeddelandeklienten Gajim"
#: ../data/gajim.desktop.in.in.h:3
msgid "Jabber IM Client"
-msgstr "Jabber IM-klient"
+msgstr "Jabber-snabbmeddelandeklient"
#: ../data/glade/account_context_menu.glade.h:1
#: ../data/glade/roster_window.glade.h:7
msgid "Join _Group Chat..."
-msgstr "Anslut till _gruppchatt..."
+msgstr "Gå in i _gruppchatt..."
#: ../data/glade/account_context_menu.glade.h:2
msgid "_Add Contact..."
msgstr "_Lägg till kontakt..."
#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
msgid "_Discover Services"
msgstr "_Upptäck tjänster"
#: ../data/glade/account_context_menu.glade.h:4
msgid "_Execute Command..."
-msgstr "_Exekvera kommando..."
+msgstr "_Kör kommando..."
#: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
msgid "_Modify Account"
-msgstr "Redigera konto"
+msgstr "_Redigera konto"
#: ../data/glade/account_context_menu.glade.h:6
msgid "_Open Gmail Inbox"
-msgstr "_Öppna Gmail Inbox"
+msgstr "_Öppna Gmail-inkorg"
#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
msgid "_Personal Events"
-msgstr "Personlig info"
+msgstr "_Personliga händelser"
#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
-#, fuzzy
+#: ../data/glade/roster_window.glade.h:25
msgid "_Start Chat..."
-msgstr "_Starta chatt"
+msgstr "_Starta chatt..."
#: ../data/glade/account_context_menu.glade.h:9
#: ../data/glade/zeroconf_context_menu.glade.h:2
@@ -72,136 +76,122 @@
msgstr "_Status"
#: ../data/glade/account_creation_wizard_window.glade.h:1
-#, fuzzy
msgid ""
"<b>Connecting to server</b>\n"
"\n"
"Please wait..."
msgstr ""
-"<b>Konto skapas</b>\n"
+"<b>Ansluter till server</b>\n"
"\n"
-"Var god vänta..."
+"Vänta..."
#: ../data/glade/account_creation_wizard_window.glade.h:4
msgid "<b>Please choose one of the options below:</b>"
-msgstr "<b>Välj ett av alternativen nedan:</b>"
+msgstr "<b>Välj ett av nedanstående alternativ:</b>"
#: ../data/glade/account_creation_wizard_window.glade.h:5
msgid "<b>Please fill in the data for your existing account</b>"
-msgstr "Fyll i informationen för ditt existerande konto"
+msgstr "<b>Fyll i informationen för ditt befintliga konto</b>"
#: ../data/glade/account_creation_wizard_window.glade.h:6
msgid "<b>Please select a server</b>"
-msgstr ""
+msgstr "<b>Välj en server</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 ""
+"Lägg till detta certifikat till listan över pålitliga certifikat.\n"
+"SHA1-fingeravtryck för certifikatet:\n"
#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Klicka för att visa funktioner (som MSN, ICQ transporter) på jabberservrar"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:11
msgid "Connect when I press Finish"
-msgstr "Anslut när jag trycker på Slutför"
+msgstr "Anslut när jag trycker på Färdigställ"
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:11
msgid "Gajim: Account Creation Wizard"
msgstr "Gajim: Kontoskaparen"
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#, fuzzy
+#: ../data/glade/account_creation_wizard_window.glade.h:12
msgid "I already have an account I want to _use"
-msgstr "Jag har redan ett konto jag vill använda"
+msgstr "Jag har redan ett konto som _jag vill använda"
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:13
msgid "I want to _register for a new account"
msgstr "Jag vill _registrera ett nytt konto"
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:14
#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:24
msgid "If checked, Gajim will remember the password for this account"
-msgstr "Om kryssad kommer Gajim komma ihåg lösenordet för det här kontot"
+msgstr "Om kryssad kommer Gajim att komma ihåg lösenordet för detta konto"
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:15
#: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
msgid "Manage..."
msgstr "Hantera..."
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#, fuzzy
+#: ../data/glade/account_creation_wizard_window.glade.h:16
msgid "Prox_y:"
-msgstr "Proxy:"
+msgstr "Prox_yserver:"
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:17
#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:45
msgid "Save pass_word"
msgstr "Spara lösen_ord"
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Serverns funktioner"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:18
msgid "Set my profile when I connect"
msgstr "Ställ in min profil när jag ansluter"
-#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_creation_wizard_window.glade.h:19
#: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
msgid "Use custom hostname/port"
msgstr "Använd anpassat värdnamn/port"
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../data/glade/account_creation_wizard_window.glade.h:20
msgid ""
"You need to have an account in order to connect\n"
"to the Jabber network."
msgstr ""
-"Du behöver ha ett konto för att lyckas ansluta till\n"
+"Du behöver ha ett konto för att kunna ansluta till\n"
"Jabber-nätverket."
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:22
msgid "Your JID:"
msgstr "Ditt JID:"
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:15
msgid "_Advanced"
msgstr "_Avancerat"
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:24
msgid "_Finish"
-msgstr "_Slutför"
+msgstr "F_ärdigställ"
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#, fuzzy
+#: ../data/glade/account_creation_wizard_window.glade.h:25
msgid "_Hostname:"
-msgstr "Värdnamn: "
+msgstr "_Värdnamn:"
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:26
#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:59
msgid "_Password:"
msgstr "_Lösenord:"
-#: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:27
msgid "_Port:"
msgstr "_Port:"
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/glade/account_creation_wizard_window.glade.h:28
msgid "_Server:"
msgstr "_Server:"
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:16
msgid "_Username:"
msgstr "_Användarnamn:"
@@ -213,45 +203,40 @@
#: ../data/glade/account_modification_window.glade.h:2
#: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
msgid "<b>OpenPGP</b>"
msgstr "<b>OpenPGP</b>"
#: ../data/glade/account_modification_window.glade.h:3
#: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
msgid "<b>Personal Information</b>"
msgstr "<b>Personlig information</b>"
#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
msgid "Account"
msgstr "Konto"
#: ../data/glade/account_modification_window.glade.h:5
msgid "Account Modification"
-msgstr "Kontomodifiering"
+msgstr "Kontoändring"
#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
-#, fuzzy
+#: ../data/glade/accounts_window.glade.h:8
msgid "Administration operations"
-msgstr "Administratörslista"
+msgstr "Administrationsåtgärder"
#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
-#, fuzzy
+#: ../data/glade/accounts_window.glade.h:9
msgid "Auto-reconnect when connection is lost"
-msgstr "Återanslut när anslutningen förloras"
+msgstr "Återanslut automatiskt när anslutningen förloras"
#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:10
msgid "C_onnect on Gajim startup"
-msgstr "_Anslut vid start av Gajim"
+msgstr "A_nslut vid start av Gajim"
#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:11
msgid "Chan_ge Password"
msgstr "_Byt lösenord"
@@ -262,42 +247,42 @@
"default if broadcasted by the server, and with this option enabled TLS will "
"be disabled"
msgstr ""
-"Kryssa i det här så att Gajim ansluter till port 5223 där tidigare servrar "
-"förväntades ha SSL-support. Notera att Gajim använder TLS kryptering som "
-"standard om servern stödjer det och med det här valet kommer TLS slås av"
+"Kryssa i det här så att Gajim ansluter till port 5223 där äldre servrar "
+"förväntades ha SSL-stöd. Observera att Gajim använder TLS-kryptering som "
+"standard om servern har stöd för det, samt att med det här alternativet så "
+"kommer TLS att inaktiveras"
#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:13
msgid "Choose _Key..."
msgstr "Välj nyc_kel..."
#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
msgid "Click to change account's password"
msgstr "Klicka för att byta kontots lösenord"
#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
msgid "Click to request authorization to all contacts of another account"
msgstr ""
+"Klicka för att begära auktorisation till alla kontakter för annat konto"
#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
msgid "Connection"
-msgstr "Förbindelse"
+msgstr "Anslutning"
#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
msgid "Edit Personal Information..."
msgstr "Redigera personlig information..."
#. 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
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1152 ../src/notify.py:526 ../src/notify.py:544
+#: ../src/notify.py:580 ../src/notify.py:592
msgid "Gajim"
msgstr "Gajim"
@@ -306,110 +291,106 @@
#. General group cannot be changed
#: ../data/glade/account_modification_window.glade.h:17
#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/preferences_window.glade.h: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
+#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2644
+#: ../src/roster_window.py:5194
msgid "General"
-msgstr "Generellt"
+msgstr "Allmänt"
#: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
msgid "Hostname: "
msgstr "Värdnamn: "
#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:22
msgid ""
"If checked, Gajim will also broadcast some more IPs except from just your "
"IP, so file transfer has higher chances of working."
msgstr ""
"Om kryssad kommer Gajim att sända ut fler IP-adresser än bara ditt IP. Detta "
-"för att öka möjligheten att filöverföringar ska fungera som de ska."
+"för att öka chanserna att filöverföringar ska fungera som de ska."
#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:25
msgid ""
"If checked, Gajim will send keep-alive packets to prevent connection timeout "
"which results in disconnection"
msgstr ""
-"Om kryssad kommer Gajim skicka keep-alive-paket som förhindrar att "
-"anslutningen gör timeout vilket leder till frånkoppling"
+"Om kryssad kommer Gajim att skicka keep-alive-paket som förhindrar att "
+"anslutningen överstiger tidsgränsen, vilket leder till frånkoppling"
#: ../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 ""
-"Om kryssad kommer Gajim spara lösenordet i ~/.gajim/config med \"läs\"-"
+"Om kryssad kommer Gajim att spara lösenordet i ~/.gajim/config med \"läs\"-"
"rättigheter enbart för dig och din administratör"
#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:26
msgid ""
"If checked, Gajim, when launched, will automatically connect to jabber using "
"this account"
msgstr ""
-"Om kryssad kommer Gajim att vid start automatiskt ansluta till jabber genom "
-"det här kontot"
+"Om kryssad kommer Gajim att, vid start, automatiskt ansluta till jabber med "
+"detta konto"
#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:27
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 ""
-"Om kryssad kommer varje ändring av global status (hanteras av komborutan i "
-"botten av registerfönstret) att påverka även detta konto"
+"Om kryssad kommer varje ändring av global status (hanteras av "
+"kombinationsrutan i botten av kontaktlistfönstret) att påverka statusen även "
+"för detta konto"
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:30
msgid "Information about you, as stored in the server"
msgstr "Information om dig, som den är sparad på servern"
#: ../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/accounts_window.glade.h:34 ../src/config.py:1564
+#: ../src/config.py:2067
msgid "No key selected"
msgstr "Ingen nyckel vald"
#. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. useauth_checkbutton.set_active(False)
+#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
#: ../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/accounts_window.glade.h:36
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1115
+#: ../src/config.py:1204 ../src/config.py:1472 ../src/config.py:1477
+#: ../src/config.py:1975 ../src/config.py:2053 ../src/config.py:2066
+#: ../src/config.py:3167 ../src/config.py:3235 ../src/dialogs.py:291
+#: ../src/dialogs.py:293 ../src/dialogs.py:519 ../src/roster_window.py:2713
+#: ../src/roster_window.py:2719 ../src/roster_window.py:2724
msgid "None"
msgstr "Ingen"
#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:37
#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
msgid "Personal Information"
msgstr "Personlig information"
#: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
msgid "Port: "
msgstr "Port: "
#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:38
msgid "Priori_ty:"
msgstr "Priori_tet:"
#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:39
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 "
@@ -420,22 +401,21 @@
"Klienten med den högsta prioriteten får händelserna"
#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:40
msgid "Priority will change automatically according to your status."
-msgstr "Prioritet ändras automatiskt beroende på din status."
+msgstr "Prioritet kommer att ändras automatiskt beroende på din status."
#: ../data/glade/account_modification_window.glade.h:35
msgid "Proxy:"
-msgstr "Proxy:"
+msgstr "Proxyserver:"
#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
-#, fuzzy
+#: ../data/glade/accounts_window.glade.h:42
msgid "Resour_ce:"
-msgstr "Resur_s: "
+msgstr "Resur_s:"
#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:43
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 "
@@ -443,55 +423,49 @@
"account with resource 'Home' and 'Work' at the same time. The resource which "
"has the highest priority will get the events. (see below)"
msgstr ""
-"Resurs skickas till Jabberservern för att separera samma JID i två eller "
+"Resursen skickas till Jabberservern för att separera samma JID i två eller "
"flera delar beroende på antalet klienter anslutna till samma server med "
"samma konto. Så du kan vara ansluten till samma konto med resurserna \"Hem\" "
"och \"Jobb\" samtidigt. Resursen med högst prioritet kommer få händelserna. "
"(se nedan)"
#: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
msgid "Save _passphrase (insecure)"
msgstr "Spara _lösenfras (osäkert)"
#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:44
msgid "Save conversation _logs for all contacts"
msgstr "Spara konversations_loggar för alla kontakter"
#: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
msgid "Send keep-alive packets"
msgstr "Skicka keep-alive-paket"
#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:47
msgid "Synch_ronize account status with global status"
msgstr "Synk_ronisera kontostatus med global status"
#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:49
#: ../data/glade/synchronise_contacts_dialog.glade.h:2
#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
msgid "Synchronise contacts"
-msgstr "Visa frånkopplade _kontakter"
+msgstr "Synkronisera kontakter"
#: ../data/glade/account_modification_window.glade.h:44
msgid "Use _SSL (legacy)"
-msgstr "Använd _SSL (föråldrat)"
+msgstr "Använd _SSL (äldre)"
#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:53
msgid "Use file transfer proxies"
-msgstr "Använd proxy för filöverföringar"
+msgstr "Använd proxyservrar för filöverföringar"
#: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
msgid "_Adjust to status"
-msgstr "_Ändra efter status"
+msgstr "_Justera efter status"
#: ../data/glade/account_modification_window.glade.h:48
#: ../data/glade/accounts_window.glade.h:57
@@ -499,120 +473,147 @@
msgstr "_Jabber-ID:"
#: ../data/glade/account_modification_window.glade.h:49
-#, fuzzy
+#: ../data/glade/manage_proxies_window.glade.h:14
msgid "_Name:"
-msgstr "_Namn: "
+msgstr "_Namn:"
#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
msgid "<b>Proxy</b>"
-msgstr "<b>Logg</b>"
+msgstr "<b>Proxyserver</b>"
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+msgid "A_djust to status"
+msgstr "Justera _efter status"
+
+#: ../data/glade/accounts_window.glade.h:7
msgid "Accounts"
msgstr "Konton"
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
msgid ""
"Check this so Gajim will ask you before sending your password over an "
"insecure connection."
msgstr ""
+"Kryssa för denna så att Gajim frågar dig innan ditt lösenord skickas över en "
+"osäker anslutning."
#: ../data/glade/accounts_window.glade.h:16
+msgid "Co_nnect on Gajim startup"
+msgstr "A_nslut vid start av Gajim"
+
+#: ../data/glade/accounts_window.glade.h:18
#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
msgid "E-Mail:"
msgstr "E-post:"
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Aktivera"
-
#: ../data/glade/accounts_window.glade.h:19
#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
msgid "First Name:"
msgstr "Förnamn:"
-#: ../data/glade/accounts_window.glade.h:24
-#, fuzzy
+#: ../data/glade/accounts_window.glade.h:23
msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Om kryssad kommer Gajim komma ihåg lösenordet för det här kontot"
+msgstr ""
+"Om kryssad kommer Gajim att få lösenordet från en GPG-agent, t.ex. Seahorse"
-#: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:28
msgid ""
"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 ""
"Om standardporten som används för inkommande meddelanden inte passar din "
-"konfiguration kan du välja en annan här.\n"
-"Du kan vilja ändra möjliga brandväggsregler."
+"konfiguration så kan du välja en annan här.\n"
+"Du kan dock överväga att ändra möjliga brandväggsregler."
-#: ../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/accounts_window.glade.h:31
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:675
msgid "Jabber ID:"
msgstr "Jabber-ID:"
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:32
#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
msgid "Last Name:"
msgstr "Efternamn:"
-#: ../data/glade/accounts_window.glade.h:35
-#, fuzzy
+#: ../data/glade/accounts_window.glade.h:33
msgid "Mer_ge accounts"
msgstr "Sa_mmanfoga konton"
#. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5145
msgid "Re_name"
-msgstr "Döp om"
+msgstr "Byt _namn"
+#: ../data/glade/accounts_window.glade.h:46
+msgid "Send _keep-alive packets"
+msgstr "Skicka _keep-alive-paket"
+
+#: ../data/glade/accounts_window.glade.h:48
+msgid "Synchroni_ze account status with global status"
+msgstr "Synk_ronisera kontostatus med global status"
+
+#: ../data/glade/accounts_window.glade.h:50
+msgid "Use G_PG Agent"
+msgstr "Använd G_PG-agent"
+
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use cust_om hostname/port"
+msgstr "Använd anpassa_t värdnamn/port"
+
#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
-msgstr ""
+msgid "Use cust_om port:"
+msgstr "Använd anpassad p_ort:"
#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Använd anpassad port:"
+msgid "_Edit Personal Information..."
+msgstr "R_edigera personlig information..."
-#: ../data/glade/accounts_window.glade.h:59
-msgid "_Warn before using an insecure connection"
-msgstr ""
+#: ../data/glade/accounts_window.glade.h:55
+msgid "_Enable"
+msgstr "_Aktivera"
+#: ../data/glade/accounts_window.glade.h:56
+msgid "_Hostname: "
+msgstr "_Värdnamn: "
+
+#: ../data/glade/accounts_window.glade.h:58
+msgid "_Manage..."
+msgstr "_Hantera..."
+
#: ../data/glade/accounts_window.glade.h:60
-msgid "gtk-add"
-msgstr ""
+msgid "_Port: "
+msgstr "_Port: "
#: ../data/glade/accounts_window.glade.h:61
-#: ../data/glade/features_window.glade.h:4
-msgid "gtk-close"
-msgstr ""
+msgid "_Warn before using an insecure connection"
+msgstr "_Varna innan en osäker anslutning används"
#: ../data/glade/accounts_window.glade.h:62
-msgid "gtk-remove"
-msgstr ""
+msgid "_use HTTP__PROXY environment variable"
+msgstr "_Använd miljövariabeln HTTP__PROXY"
#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr ""
+msgid "gtk-add"
+msgstr "Lägg till"
+#: ../data/glade/accounts_window.glade.h:64
+#: ../data/glade/features_window.glade.h:4
+#: ../data/glade/manage_sounds_window.glade.h:1
+msgid "gtk-close"
+msgstr "Stäng"
+
+#: ../data/glade/accounts_window.glade.h:65
+msgid "gtk-remove"
+msgstr "Ta bort"
+
#: ../data/glade/add_new_contact_window.glade.h:1
-#, fuzzy
msgid "A_ccount:"
-msgstr "Konto:"
+msgstr "K_onto:"
#: ../data/glade/add_new_contact_window.glade.h:2
-#, fuzzy
msgid "A_llow this contact to view my status"
-msgstr "Tillåt henne/honom att se min status"
+msgstr "Tillåt _denna kontakt att se min status"
#: ../data/glade/add_new_contact_window.glade.h:3
msgid "Add New Contact"
@@ -629,16 +630,18 @@
"protocol. Click on register button to\n"
"proceed."
msgstr ""
-"Du måste registrera dig med transportenför att kunna lägga till kontakter "
-"från dethär protokollet. Klicka på knappen Registreraför att fortsätta."
+"Du måste registrera dig med transporten\n"
+"för att kunna lägga till en kontakt från det\n"
+"här protokollet. Klicka på knappen \n"
+"Registrera för att fortsätta."
#: ../data/glade/add_new_contact_window.glade.h:9
msgid ""
"You must be connected to the transport to be able\n"
"to add a contact from this protocol."
msgstr ""
-"Du måste vara ansluten till transporten för att kunnalägga till en kontakt "
-"från det här protokollet."
+"Du måste vara ansluten till transporten för att kunna\n"
+"lägga till en kontakt från det här protokollet."
#: ../data/glade/add_new_contact_window.glade.h:11
msgid "_Group:"
@@ -653,22 +656,20 @@
msgstr "_Protokoll:"
#: ../data/glade/add_new_contact_window.glade.h:14
-#, fuzzy
msgid "_Register"
-msgstr "Re_gistrera"
+msgstr "_Registrera"
#: ../data/glade/add_new_contact_window.glade.h:15
-#, fuzzy
msgid "_User ID:"
-msgstr "Användar-ID:"
+msgstr "_Användar-id:"
#: ../data/glade/adhoc_commands_window.glade.h:1
msgid "<b>An error has occurred:</b>"
-msgstr "<b>Ett fel har uppstått:</b>"
+msgstr "<b>Ett fel har inträffat:</b>"
#: ../data/glade/adhoc_commands_window.glade.h:2
msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Välj kommando att exekvera:</b>"
+msgstr "<b>Välj kommando att köra:</b>"
#: ../data/glade/adhoc_commands_window.glade.h:3
msgid "Ad-hoc Commands - Gajim"
@@ -676,28 +677,27 @@
#: ../data/glade/adhoc_commands_window.glade.h:4
msgid "Check once more"
-msgstr "Kontrollera igen"
+msgstr "Kontrollera en gång till"
#: ../data/glade/adhoc_commands_window.glade.h:5
msgid "Error description..."
-msgstr "Fel beskrivning..."
+msgstr "Felbeskrivning..."
#: ../data/glade/adhoc_commands_window.glade.h:6
msgid "Please wait while retrieving command list..."
-msgstr "Vänta medans kommandolistan tas emot..."
+msgstr "Vänta under tiden kommandolistan hämtas..."
#: ../data/glade/adhoc_commands_window.glade.h:7
msgid "Please wait while the command is sending..."
-msgstr "Vänta medans kommandot skickar..."
+msgstr "Vänta under tiden kommandot skickar..."
#: ../data/glade/adhoc_commands_window.glade.h:8
msgid "Please wait..."
msgstr "Vänta..."
#: ../data/glade/adhoc_commands_window.glade.h:9
-#, fuzzy
msgid "This jabber entity does not expose any commands."
-msgstr "Den här jabber-entiteten visar inga kommandon."
+msgstr "Denna jabber-entitet visar inga kommandon."
#: ../data/glade/advanced_configuration_window.glade.h:1
#: ../data/glade/features_window.glade.h:1
@@ -707,8 +707,8 @@
#: ../data/glade/advanced_configuration_window.glade.h:2
msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
msgstr ""
-"<b>OBSERVERA:</b> Du bör starta om Gajim för att vissa inställningarska ta "
-"effekt"
+"<b>OBSERVERA:</b> Du bör starta om Gajim för att vissa inställningar ska bli "
+"aktiva"
#: ../data/glade/advanced_configuration_window.glade.h:3
msgid "Advanced Configuration Editor"
@@ -720,40 +720,37 @@
#: ../data/glade/advanced_menuitem_menu.glade.h:1
msgid "Delete MOTD"
-msgstr "Radera MOTD"
+msgstr "Ta bort MOTD"
#: ../data/glade/advanced_menuitem_menu.glade.h:2
msgid "Deletes Message of the Day"
-msgstr "Raderar dagens meddelande"
+msgstr "Tar bort dagens meddelande"
#: ../data/glade/advanced_menuitem_menu.glade.h:3
-#, fuzzy
msgid "Edit _Privacy Lists..."
-msgstr "_Personliga integritetslistor"
+msgstr "Redigera _integritetslistor..."
#: ../data/glade/advanced_menuitem_menu.glade.h:4
msgid "Sends a message to users currently connected to this server"
msgstr ""
-"Skickar ett meddelande till klienter för närvarande anslutna till den här "
-"servern"
+"Skickar ett meddelande till användare som för närvarande är anslutna till "
+"denna server"
#: ../data/glade/advanced_menuitem_menu.glade.h:5
-#, fuzzy
msgid "Set MOTD..."
-msgstr "Sätt MOTD"
+msgstr "Ange MOTD..."
#: ../data/glade/advanced_menuitem_menu.glade.h:6
msgid "Sets Message of the Day"
-msgstr "Sätter dagens meddelande"
+msgstr "Ställer in dagens meddelande"
#: ../data/glade/advanced_menuitem_menu.glade.h:7
msgid "Show _XML Console"
msgstr "Visa _XML-konsoll"
#: ../data/glade/advanced_menuitem_menu.glade.h:8
-#, fuzzy
msgid "Update MOTD..."
-msgstr "Uppdatera MOTD"
+msgstr "Uppdatera MOTD..."
#: ../data/glade/advanced_menuitem_menu.glade.h:9
msgid "Updates Message of the Day"
@@ -764,13 +761,12 @@
msgstr "_Administratör"
#: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
msgid "_Send Server Message..."
-msgstr "_Skicka servermeddelande"
+msgstr "_Skicka servermeddelande..."
#: ../data/glade/advanced_notifications_window.glade.h:1
msgid " a window/tab opened with that contact "
-msgstr " ett fönster/tabb öppnad med den kontakten "
+msgstr " ett fönster/flik öppnad med den kontakten "
#: ../data/glade/advanced_notifications_window.glade.h:2
msgid "<b>Actions</b>"
@@ -798,7 +794,7 @@
msgstr "Alla statusar"
#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:215
msgid "Away"
msgstr "Frånvarande"
@@ -815,7 +811,7 @@
msgstr "Har "
#: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:225
msgid "Invisible"
msgstr "Osynlig"
@@ -824,7 +820,7 @@
msgstr "Kör ett kommando"
#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:198
msgid "Not Available"
msgstr "Inte tillgänglig"
@@ -838,7 +834,7 @@
#: ../data/glade/advanced_notifications_window.glade.h:17
msgid "Play a sound"
-msgstr "Spela ett ljud"
+msgstr "Spela upp ett ljud"
#: ../data/glade/advanced_notifications_window.glade.h:18
msgid ""
@@ -852,13 +848,13 @@
"File Transfer Finished"
msgstr ""
"Ta emot ett meddelande\n"
-"Kontakten kopplade ner \n"
+"Kontakten kopplade från \n"
"Kontakten ändrade status \n"
"Markeringsmeddelande i gruppchatt \n"
"Meddelande mottaget i gruppchatt \n"
"Filöverföring begärd \n"
"Filöverföring startad \n"
-"Filöverföring stoppad"
+"Filöverföring färdig"
#: ../data/glade/advanced_notifications_window.glade.h:26
msgid "When "
@@ -868,7 +864,7 @@
msgid ""
"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
msgstr ""
-"_Aktivera fönsterhanterarens UrgencyHint för att chattfönster ska blinkar i "
+"_Aktivera fönsterhanterarens UrgencyHint för att chattfönster ska blinka i "
"verktygsraden"
#: ../data/glade/advanced_notifications_window.glade.h:28
@@ -877,7 +873,7 @@
#: ../data/glade/advanced_notifications_window.glade.h:29
msgid "_Disable existing popup window"
-msgstr "_Inaktivera befintligt popup-fönster"
+msgstr "_Inaktivera befintligt popupfönster"
#: ../data/glade/advanced_notifications_window.glade.h:30
msgid "_Disable existing sound for this event"
@@ -885,15 +881,15 @@
#: ../data/glade/advanced_notifications_window.glade.h:31
msgid "_Disable showing event in roster"
-msgstr "_Inaktivera att visa händelser i registret"
+msgstr "_Inaktivera visning av händelser i kontaktlista"
#: ../data/glade/advanced_notifications_window.glade.h:32
msgid "_Disable showing event in systray"
-msgstr "_Inaktivera att visa händelser i notifieringsyta"
+msgstr "_Inaktivera visning av händelser i notifieringsyta"
#: ../data/glade/advanced_notifications_window.glade.h:33
msgid "_Inform me with a popup window"
-msgstr "_Informera mig med ett popup-fönster"
+msgstr "_Informera mig med ett popupfönster"
#: ../data/glade/advanced_notifications_window.glade.h:34
msgid "_Open chat window with user"
@@ -901,7 +897,7 @@
#: ../data/glade/advanced_notifications_window.glade.h:35
msgid "_Show event in roster"
-msgstr "_Visa händelse i registret"
+msgstr "_Visa händelse i kontaktlista"
#: ../data/glade/advanced_notifications_window.glade.h:36
msgid "_Show event in systray"
@@ -930,9 +926,8 @@
msgstr "när jag är i"
#: ../data/glade/atom_entry_window.glade.h:1
-#, fuzzy
msgid "Entry:"
-msgstr "Objekt:"
+msgstr ""
#: ../data/glade/atom_entry_window.glade.h:2
msgid "Feed name:"
@@ -943,42 +938,36 @@
msgstr "Senast ändrad:"
#: ../data/glade/atom_entry_window.glade.h:4
-#, fuzzy
msgid "New entry received"
-msgstr "Nytt objekt mottaget"
+msgstr ""
#: ../data/glade/atom_entry_window.glade.h:5
-#, fuzzy
msgid "You have received new entry:"
-msgstr "Du har mottagit ett nytt objekt:"
+msgstr ""
#: ../data/glade/blocked_contacts_window.glade.h:1
-#, fuzzy
msgid "Blocked Contacts"
-msgstr "Kontakter"
+msgstr "Blockerade kontakter"
#: ../data/glade/change_activity_dialog.glade.h:1
-#, fuzzy
msgid "<b>Message:</b> "
-msgstr "<b>Sparade statusmeddelanden</b>"
+msgstr "<b>Meddelande:</b> "
#: ../data/glade/change_activity_dialog.glade.h:2
msgid "Set Activity"
-msgstr ""
+msgstr "Ställ in aktivitet"
#: ../data/glade/change_activity_dialog.glade.h:3
msgid "Set an activity"
-msgstr ""
+msgstr "Ställ in en aktivitet"
#: ../data/glade/change_mood_dialog.glade.h:1
-#, fuzzy
msgid "<b>Message:</b>"
-msgstr "<b>Logg</b>"
+msgstr "<b>Meddelande:</b>"
#: ../data/glade/change_mood_dialog.glade.h:2
-#, fuzzy
msgid "<b>Mood:</b>"
-msgstr "<b>Logg</b>"
+msgstr "<b>Humör:</b>"
#: ../data/glade/change_password_dialog.glade.h:1
msgid "Change Password"
@@ -986,33 +975,32 @@
#: ../data/glade/change_password_dialog.glade.h:2
msgid "Enter it again for confirmation:"
-msgstr "Skriv in det igen för att bekräfta:"
+msgstr "Ange det igen för att bekräfta:"
#: ../data/glade/change_password_dialog.glade.h:3
msgid "Enter new password:"
-msgstr "Skriv nytt lösenord:"
+msgstr "Ange nytt lösenord:"
#: ../data/glade/change_status_message_dialog.glade.h:1
msgid "<b>Type your new status message</b>"
-msgstr "<b>Skriv in ditt nya statusmeddelande</b>"
+msgstr "<b>Ange ditt nya statusmeddelande</b>"
#: ../data/glade/change_status_message_dialog.glade.h:2
msgid "Preset messages:"
-msgstr "Sparade meddelanden:"
+msgstr "Förvalda meddelanden:"
#: ../data/glade/change_status_message_dialog.glade.h:3
msgid "Save as Preset..."
-msgstr "Spara meddelande..."
+msgstr "Spara som förval..."
#: ../data/glade/chat_context_menu.glade.h:1
msgid "Join _Group Chat"
-msgstr "Anslut till _gruppchatt"
+msgstr "Gå in i _gruppchatt"
#: ../data/glade/chat_context_menu.glade.h:2
#: ../data/glade/roster_contact_context_menu.glade.h:13
-#, fuzzy
msgid "_Add to Roster..."
-msgstr "_Lägg till registret"
+msgstr "_Lägg till i kontaktlista..."
#: ../data/glade/chat_context_menu.glade.h:3
msgid "_Copy JID/Email Address"
@@ -1020,11 +1008,11 @@
#: ../data/glade/chat_context_menu.glade.h:4
msgid "_Copy Link Location"
-msgstr "_Kopiera länkadress"
+msgstr "_Kopiera länkplats"
#: ../data/glade/chat_context_menu.glade.h:5
msgid "_Open Email Composer"
-msgstr "_Skicka e-post"
+msgstr "_Skriv e-post"
#: ../data/glade/chat_context_menu.glade.h:6
msgid "_Open Link in Browser"
@@ -1037,9 +1025,8 @@
msgstr "_Starta chatt"
#: ../data/glade/chat_control_popup_menu.glade.h:1
-#, fuzzy
msgid "Invite _Contacts"
-msgstr "Kontakter"
+msgstr "Bjud in _kontakter"
#: ../data/glade/chat_control_popup_menu.glade.h:2
#: ../data/glade/gc_occupants_menu.glade.h:3
@@ -1048,52 +1035,51 @@
msgstr "Skicka _fil"
#: ../data/glade/chat_control_popup_menu.glade.h:3
-#, fuzzy
msgid "Toggle End to End Encryption"
-msgstr "Slå på/av Open_PGP-kryptering"
+msgstr "Växla användarkryptering"
#: ../data/glade/chat_control_popup_menu.glade.h:4
msgid "Toggle Open_PGP Encryption"
-msgstr "Slå på/av Open_PGP-kryptering"
+msgstr "Växla Open_PGP-kryptering"
#: ../data/glade/chat_control_popup_menu.glade.h:5
#: ../data/glade/gc_occupants_menu.glade.h:4
msgid "_Add to Roster"
-msgstr "_Lägg till registret"
+msgstr "_Lägg till i kontaktlista"
#: ../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
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:21
#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5841
msgid "_History"
msgstr "_Historik"
#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
msgid "In_vite"
-msgstr "In_bjud till"
+msgstr "Bjud _in"
#: ../data/glade/chat_to_muc_window.glade.h:2
msgid "Invite Friends!"
-msgstr ""
+msgstr "Bjud in vänner!"
#: ../data/glade/chat_to_muc_window.glade.h:3
-#, fuzzy
msgid "MUC server"
-msgstr "Observerande"
+msgstr "MUC-server"
#: ../data/glade/chat_to_muc_window.glade.h:4
msgid "Please select a MUC server."
-msgstr ""
+msgstr "Välj en MUC-server."
#: ../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 ""
+"Du är på väg att påbörja en fleranvändarchatt.\n"
+"Välj kontakterna som du vill bjuda in"
#: ../data/glade/data_form_window.glade.h:1
msgid "Fill in the form."
@@ -1108,26 +1094,24 @@
msgstr "Redigera grupper"
#: ../data/glade/esession_info_window.glade.h:1
-#, fuzzy
msgid "(<b>ESession</b> info)"
-msgstr "<b>Beskrivning</b>"
+msgstr "(<b>ESession</b>-info)"
#: ../data/glade/esession_info_window.glade.h:2
msgid "_Verify"
-msgstr ""
+msgstr "_Verifiera"
#: ../data/glade/features_window.glade.h:2
msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
+msgstr "<b>Lista över möjliga funktioner i Gajim:</b>"
#: ../data/glade/features_window.glade.h:3
-#, fuzzy
msgid "Features"
-msgstr "Serverns funktioner"
+msgstr "Funktioner"
#: ../data/glade/filetransfers.glade.h:1
msgid "A list of active, completed and stopped file transfers"
-msgstr "En lista på aktiva, kompletta och stoppade filöverföringar"
+msgstr "En lista över aktiva, färdigställda och stoppade filöverföringar"
#: ../data/glade/filetransfers.glade.h:2
msgid "Cancel file transfer"
@@ -1135,16 +1119,16 @@
#: ../data/glade/filetransfers.glade.h:3
msgid "Cancels the selected file transfer"
-msgstr "Avbryter den valda filöverföringen"
+msgstr "Avbryter den markerade filöverföringen"
#: ../data/glade/filetransfers.glade.h:4
msgid "Cancels the selected file transfer and removes incomplete file"
msgstr ""
-"Avbryter den valda filöverföringen och tar bort den ofullständiga filen"
+"Avbryter den markerade filöverföringen och tar bort den ofullständiga filen"
#: ../data/glade/filetransfers.glade.h:5
msgid "Clean _up"
-msgstr "Städa _upp"
+msgstr "Rensa _upp"
#: ../data/glade/filetransfers.glade.h:6
msgid "File Transfers"
@@ -1152,19 +1136,17 @@
#: ../data/glade/filetransfers.glade.h:7
msgid "Hides the window"
-msgstr "Gömmer fönstret"
+msgstr "Döljer fönstret"
#: ../data/glade/filetransfers.glade.h:8
msgid "Remove file transfer from the list."
msgstr "Ta bort filöverföring från listan."
#: ../data/glade/filetransfers.glade.h:9
-#, fuzzy
msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Tar bort klara, avbrutna och felaktiga filöverföringar från listan"
+msgstr "Tar bort färdiga, avbrutna och misslyckade filöverföringar från listan"
#: ../data/glade/filetransfers.glade.h:10
-#, fuzzy
msgid "Shows a list of file transfers between you and others"
msgstr "Visar en lista med filöverföringar mellan dig och andra"
@@ -1173,14 +1155,14 @@
"This action removes single file transfer from the list. If the transfer is "
"active, it is first stopped and then removed"
msgstr ""
-"Den här handlingen tar bort en filöverföring från listan. Om överföringen är "
-"aktiv, stoppas den först och tas sedan bort"
+"Denna åtgärd tar bort en filöverföring från listan. Om överföringen är aktiv "
+"så stoppas den först och tas sedan bort"
#: ../data/glade/filetransfers.glade.h:12
msgid "When a file transfer is complete show a popup notification"
-msgstr "När en filöverföring är färdig, visa en popupnotifiering"
+msgstr "När en filöverföring är färdig så visa en popupnotifiering"
-#: ../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 "_Fortsätt"
@@ -1203,7 +1185,7 @@
#: ../data/glade/gajim_themes_window.glade.h:1
msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Tabbfärger för chattstatus</b>"
+msgstr "<b>Flikfärger för chattstatus</b>"
#: ../data/glade/gajim_themes_window.glade.h:2
msgid ""
@@ -1217,9 +1199,9 @@
"Kontaktrad\n"
"Chattbanner"
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:749
msgid "Bold"
-msgstr "Fetstil"
+msgstr "Fet"
#: ../data/glade/gajim_themes_window.glade.h:7
msgid "Composing"
@@ -1227,21 +1209,21 @@
#: ../data/glade/gajim_themes_window.glade.h:8
msgid "Font style:"
-msgstr "Teckensnitt-stil:"
+msgstr "Typsnittsstil:"
#: ../data/glade/gajim_themes_window.glade.h:9
msgid "Gajim Themes Customization"
-msgstr "Gajim temaanpassare"
+msgstr "Gajims temaanpassare"
#: ../data/glade/gajim_themes_window.glade.h:10
msgid "Gone"
-msgstr "Frånvarande"
+msgstr "Borta"
#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
msgid "Inactive"
msgstr "Inaktiv"
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:750
msgid "Italic"
msgstr "Kursiv"
@@ -1250,7 +1232,7 @@
"MUC\n"
"Messages"
msgstr ""
-"MUC\n"
+"MUC-\n"
"meddelanden"
#: ../data/glade/gajim_themes_window.glade.h:15
@@ -1271,53 +1253,47 @@
#: ../data/glade/gajim_themes_window.glade.h:19
msgid "Text _font:"
-msgstr "Text-_teckensnitt:"
+msgstr "Text_typsnitt:"
#: ../data/glade/gajim_themes_window.glade.h:20
msgid "_Background:"
msgstr "_Bakgrund:"
#: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
msgid "Change _Nickname..."
-msgstr "Byt smek_namn"
+msgstr "Byt smek_namn..."
#: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
msgid "Change _Subject..."
-msgstr "Byt _ämne"
+msgstr "Byt _ämne..."
#: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
msgid "Configure _Room..."
-msgstr "Konfigurera _rum"
+msgstr "Konfigurera _rum..."
#: ../data/glade/gc_control_popup_menu.glade.h:4
-#, fuzzy
msgid "_Bookmark"
-msgstr "_Bokmärk det här rummet"
+msgstr "_Bokmärk"
#: ../data/glade/gc_control_popup_menu.glade.h:5
msgid "_Destroy Room"
msgstr ""
#: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
msgid "_Manage Room"
-msgstr "Hantera bokmärken"
+msgstr "_Hantera rum"
#: ../data/glade/gc_control_popup_menu.glade.h:8
msgid "_Minimize on close"
-msgstr ""
+msgstr "_Minimera vid stängning"
#: ../data/glade/gc_occupants_menu.glade.h:1
msgid "Mo_derator"
msgstr "Mo_derator"
#: ../data/glade/gc_occupants_menu.glade.h:2
-#, fuzzy
msgid "Occupant Actions"
-msgstr "_Operatörsåtgärder"
+msgstr ""
#: ../data/glade/gc_occupants_menu.glade.h:5
msgid "_Admin"
@@ -1329,7 +1305,7 @@
#: ../data/glade/gc_occupants_menu.glade.h:8
msgid "_Kick"
-msgstr "_Sparka ut"
+msgstr "Sparka _ut"
#: ../data/glade/gc_occupants_menu.glade.h:9
msgid "_Member"
@@ -1351,13 +1327,13 @@
msgid "Create new post"
msgstr "Skapa ny post"
-#: ../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:240
msgid "From"
msgstr "Från"
#. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:170
+#: ../src/history_manager.py:201
msgid "Subject"
msgstr "Ämne"
@@ -1376,13 +1352,12 @@
"regel att radera för kontakter du just nu chattar med."
#: ../data/glade/history_manager.glade.h:3
-#, fuzzy
msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
-msgstr "Gajims historikhanterare"
+msgstr "<big><b>Välkommen till Gajims hanterare för historikloggar</b></big>"
#: ../data/glade/history_manager.glade.h:4
msgid "Delete"
-msgstr "Radera"
+msgstr "Ta bort"
#: ../data/glade/history_manager.glade.h:5
msgid "Export"
@@ -1390,7 +1365,7 @@
#: ../data/glade/history_manager.glade.h:6
msgid "Gajim History Logs Manager"
-msgstr "Gajims historikhanterare"
+msgstr "Gajims hanterare för historikloggar"
#: ../data/glade/history_manager.glade.h:7
msgid ""
@@ -1400,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 ""
+"Denna logghanterare är inte tänkt för loggvisning. Om du letar efter sådan "
+"funktionalitet så bör du använda historikfönstret istället.\n"
+"\n"
+"Använd detta program för att ta bort eller exportera loggar. Du kan välja "
+"loggar från vänstra sidan och/eller sökdatabasen nedan."
#: ../data/glade/history_manager.glade.h:10
msgid "_Search Database"
msgstr "_Sök i databasen"
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
msgid "Conversation History"
msgstr "Konversationshistorik"
@@ -1415,24 +1395,26 @@
"Groupchat Histories\n"
"All Chat Histories"
msgstr ""
+"Ange JID eller kontaktens namn\n"
+"Historik för gruppchattar\n"
+"All chatthistorik"
#: ../data/glade/history_window.glade.h:5
-#, fuzzy
msgid "Search:"
-msgstr "Sök"
+msgstr "Sök:"
#: ../data/glade/history_window.glade.h:6
#: ../data/glade/zeroconf_information_window.glade.h:10
msgid "_Log conversation history"
msgstr "_Logga konversationshistorik"
-#: ../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 "Gå in i gruppchatt"
#: ../data/glade/join_groupchat_window.glade.h:2
msgid "Join this room automatically when I connect"
-msgstr "Gå in i rummet automatiskt när jag ansluter"
+msgstr "Gå in detta rum automatiskt när jag ansluter"
#: ../data/glade/join_groupchat_window.glade.h:3
#: ../data/glade/manage_bookmarks_window.glade.h:5
@@ -1446,15 +1428,15 @@
#: ../data/glade/join_groupchat_window.glade.h:5
msgid "Recently:"
-msgstr "Nyligen:"
+msgstr "Senaste:"
#: ../data/glade/join_groupchat_window.glade.h:6
#: ../data/glade/manage_bookmarks_window.glade.h:8
msgid "Room:"
msgstr "Rum:"
-#: ../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:1619
msgid "_Join"
msgstr "_Gå in i"
@@ -1468,7 +1450,7 @@
#: ../data/glade/manage_bookmarks_window.glade.h:2
msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Om kryssad kommer Gajim gå in i den här gruppchatten vid start"
+msgstr "Om kryssad kommer Gajim att gå in i den här gruppchatten vid uppstart"
#: ../data/glade/manage_bookmarks_window.glade.h:3
msgid "Manage Bookmarks"
@@ -1476,7 +1458,7 @@
#: ../data/glade/manage_bookmarks_window.glade.h:4
msgid "Minimize on Auto Join"
-msgstr ""
+msgstr "Minimera när du gått in automatiskt"
#: ../data/glade/manage_bookmarks_window.glade.h:7
msgid "Print status:"
@@ -1491,19 +1473,16 @@
msgstr "Titel:"
#: ../data/glade/manage_pep_services_window.glade.h:1
-#, fuzzy
msgid "PEP Service Configuration"
-msgstr "Rumkonfiguration"
+msgstr "PEP-tjänstekonfiguration"
#: ../data/glade/manage_pep_services_window.glade.h:2
-#, fuzzy
msgid "_Configure"
-msgstr "_Fortsätt"
+msgstr "_Konfigurera"
#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
msgid "gtk-delete"
-msgstr "Radera"
+msgstr "Ta bort"
#: ../data/glade/manage_proxies_window.glade.h:1
msgid "<b>Properties</b>"
@@ -1514,83 +1493,97 @@
msgstr "<b>Inställningar</b>"
#: ../data/glade/manage_proxies_window.glade.h:3
-#, fuzzy
+msgid "B_OSH Port:"
+msgstr "B_OSH-port:"
+
+#: ../data/glade/manage_proxies_window.glade.h:4
msgid ""
"HTTP Connect\n"
-"SOCKS5"
-msgstr "HTTP-anslut"
+"SOCKS5\n"
+"BOSH"
+msgstr ""
+"HTTP Connect\n"
+"SOCKS5\n"
+"BOSH"
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:7
msgid "Manage Proxy Profiles"
msgstr "Hantera proxyprofiler"
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Namn:"
-
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/glade/manage_proxies_window.glade.h:8
msgid "Pass_word:"
msgstr "Lösen_ord:"
-#: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Typ:"
-
#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Använd autentisering"
+msgid "Proxy _Host:"
+msgstr "Proxyser_ver:"
#: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Värd:"
+msgid "Proxy _Port:"
+msgstr "Proxyserverns _port:"
+#: ../data/glade/manage_proxies_window.glade.h:11
+msgid "Use HTTP prox_y"
+msgstr "Använd HTTP-prox_y"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+msgid "Use proxy auth_entication"
+msgstr "Använd autentiser_ing för proxyserver"
+
+#: ../data/glade/manage_proxies_window.glade.h:13
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Type:"
+msgstr "_Typ:"
+
#: ../data/glade/message_window.glade.h:1
-#, fuzzy
msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Lägger till en kontakt till registret"
+msgstr "Lägg till denna kontakt till kontaktlistan (Ctrl+D)"
#: ../data/glade/message_window.glade.h:2
-#, fuzzy
msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Bokmärk det här rummet"
+msgstr "Bokmärk detta rum (Ctrl+B)"
#: ../data/glade/message_window.glade.h:3
msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
+msgstr "Bläddra i chatthistoriken (Ctrl+H)"
#: ../data/glade/message_window.glade.h:4
msgid "Change the room's subject (Alt+T)"
-msgstr ""
+msgstr "Ändra rummets ärende (Alt+T)"
#: ../data/glade/message_window.glade.h:5
-#, fuzzy
msgid "Change your nickname (Ctrl+N)"
-msgstr "Byt smek_namn"
+msgstr "Ändra ditt smeknamn (Ctrl+N)"
#: ../data/glade/message_window.glade.h:6
-#, fuzzy
msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "uppmärksammar konversationen"
+msgstr "Bjud in kontakter till konversationen (Ctrl+G)"
#: ../data/glade/message_window.glade.h:7
msgid "Send a file (Ctrl+F)"
-msgstr ""
+msgstr "Skicka en fil (Ctrl+F)"
#: ../data/glade/message_window.glade.h:8
-#, fuzzy
msgid "Show a list of emoticons (Alt+M)"
-msgstr "Klicka för att sätta in en känsloikon (Alt+M)"
+msgstr "Visa en lista över känsloikoner (Alt+M)"
#: ../data/glade/message_window.glade.h:9
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+msgid "Show a list of formattings"
+msgstr "Visa en lista över formateringar"
#: ../data/glade/message_window.glade.h:10
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr "Visa en meny över avancerade funktioner (Alt+A)"
+
+#: ../data/glade/message_window.glade.h:11
msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
+msgstr "Visa kontaktens profil (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"
@@ -1609,34 +1602,29 @@
msgstr "<b>Program</b>"
#: ../data/glade/preferences_window.glade.h:3
-#, fuzzy
msgid "<b>Auto Status</b>"
-msgstr "<b>Åtgärder</b>"
+msgstr "<b>Automatisk status</b>"
#: ../data/glade/preferences_window.glade.h:4
-#, fuzzy
msgid "<b>Chat Appearance</b>"
-msgstr "<b>Format av en rad</b>"
+msgstr "<b>Chattutseende</b>"
#: ../data/glade/preferences_window.glade.h:5
-#, fuzzy
msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Tabbfärger för chattstatus</b>"
+msgstr "<b>Radfärger för chatt</b>"
#: ../data/glade/preferences_window.glade.h:6
-#, fuzzy
msgid "<b>Chat state notifications</b>"
-msgstr "<b>Visuella meddelanden</b>"
+msgstr "<b>Notifieringar för chattstatus</b>"
#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
#: ../data/glade/preferences_window.glade.h:8
msgid "<b>Custom</b>"
-msgstr "<b>Anpassa</b>"
+msgstr "<b>Anpassad</b>"
#: ../data/glade/preferences_window.glade.h:9
-#, fuzzy
msgid "<b>Font</b>"
-msgstr "<b>Logg</b>"
+msgstr "<b>Typsnitt</b>"
#: ../data/glade/preferences_window.glade.h:10
msgid "<b>GMail Options</b>"
@@ -1644,39 +1632,35 @@
#: ../data/glade/preferences_window.glade.h:12
msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Sparade statusmeddelanden</b>"
+msgstr "<b>Förvalda statusmeddelanden</b>"
#: ../data/glade/preferences_window.glade.h:13
-#, fuzzy
msgid "<b>Privacy</b>"
-msgstr "<i>Privata integritetslistor</i>"
+msgstr "<b>Integritet</b>"
#: ../data/glade/preferences_window.glade.h:14
msgid "<b>Roster Appearance</b>"
-msgstr ""
+msgstr "<b>Kontaktlistans utseende</b>"
#: ../data/glade/preferences_window.glade.h:16
-#, fuzzy
msgid "<b>Status Messages</b>"
-msgstr "<b>Sparade statusmeddelanden</b>"
+msgstr "<b>Statusmeddelanden</b>"
#: ../data/glade/preferences_window.glade.h:17
-#, fuzzy
msgid "<b>Themes</b>"
-msgstr "<b>Egenskaper</b>"
+msgstr "<b>Teman</b>"
#: ../data/glade/preferences_window.glade.h:18
msgid "<b>Visual Notifications</b>"
-msgstr "<b>Visuella meddelanden</b>"
+msgstr "<b>Visuella notifieringar</b>"
#: ../data/glade/preferences_window.glade.h:19
msgid "Advanced"
-msgstr "Avancerad"
+msgstr "Avancerat"
#: ../data/glade/preferences_window.glade.h:20
-#, fuzzy
msgid "Advanced..."
-msgstr "Avancerad"
+msgstr "Avancerat..."
#: ../data/glade/preferences_window.glade.h:21
msgid ""
@@ -1684,25 +1668,29 @@
"Composing only\n"
"Disabled"
msgstr ""
-"Alla chattlägen\n"
-"Författande enbart\n"
-"Frånslagen"
+"Alla chattstatusar\n"
+"Endast skrivande\n"
+"Inaktiverad"
#: ../data/glade/preferences_window.glade.h:24
msgid "Allow _OS information to be sent"
-msgstr "Tillåt _OS-information att skickas"
+msgstr "Tillåt information om _operativsystem att skickas"
#: ../data/glade/preferences_window.glade.h:25
msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
msgstr ""
-"Tillåt popups/notifieringar när jag är _frånvarande/inte tillgänglig/"
-"upptagen/osynlig"
+"Tillåt popup/notifieringar när jag är _frånvarande/inte tillgänglig/upptagen/"
+"osynlig"
#: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr "Tillåt ljud när jag är _upptagen"
+
+#: ../data/glade/preferences_window.glade.h:27
msgid "Ask status message when I:"
msgstr "Fråga efter statusmeddelande när jag:"
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
#, fuzzy
msgid ""
"Autodetect on every Gajim startup\n"
@@ -1717,21 +1705,19 @@
"Använd alltid XFCE4s standardprogram\n"
"Anpassa"
-#: ../data/glade/preferences_window.glade.h:32
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:33
msgid "Chat message:"
-msgstr "_Statusmeddelande:"
+msgstr "Chattmeddelande:"
-#: ../data/glade/preferences_window.glade.h:33
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:34
msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Kolla alltid vid start om Gajim är _standardklient för Jabber"
+msgstr "Kontrollera vid uppstart om Gajim är _standardklient för Jabber"
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
msgid "Configure color and font of the interface"
-msgstr "Konfigurera färger och teckensnitt för gränssnittet"
+msgstr "Konfigurera färger och typsnitt för gränssnittet"
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
msgid ""
"Detached roster with detached chats\n"
"Detached roster with single chat\n"
@@ -1739,111 +1725,113 @@
"Detached roster with chat grouped by account\n"
"Detached roster with chat grouped by type"
msgstr ""
+"Frikopplad kontaktlista med frikopplade chattar\n"
+"Frikopplad kontaktlista med en chatt\n"
+"Ett enda fönster för allting\n"
+"Frikopplad kontaktlista med chatt, grupperad efter konto\n"
+"Frikopplad kontaktlista med chatt, grupperad efter typ"
-#: ../data/glade/preferences_window.glade.h:40
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:41
msgid "Display _activity of contacts in roster"
-msgstr "Visa a_vatarer för kontakter i registret"
+msgstr "Visa _aktivitet för kontakter i kontaktlista"
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
msgid "Display _extra email details"
msgstr "Visa _extra e-postdetaljer"
-#: ../data/glade/preferences_window.glade.h:42
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:43
msgid "Display _tunes of contacts in roster"
-msgstr "Visa a_vatarer för kontakter i registret"
+msgstr "Visa _låtar för kontakter i kontaktlista"
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
msgid "Display a_vatars of contacts in roster"
-msgstr "Visa a_vatarer för kontakter i registret"
+msgstr "Visa a_vatarer för kontakter i kontaktlista"
-#: ../data/glade/preferences_window.glade.h:44
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:45
msgid "Display m_ood of contacts in roster"
-msgstr "Visa a_vatarer för kontakter i registret"
+msgstr "Visa _humör för kontakter i kontaktlista"
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
msgid "Display status _messages of contacts in roster"
-msgstr "Visa status_meddelanden för kontakter i registret"
+msgstr "Visa status_meddelanden för kontakter i kontaktlista"
-#: ../data/glade/preferences_window.glade.h:46
+#: ../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 "
"display in chat windows."
msgstr ""
-"Gajim kan skicka och ta emot meta-information relaterad till en konversation "
-"som du har med en kontakt. Här kan du specificera vilka chattstatusar du "
-"vill visa i chattfönster."
+"Gajim kan skicka och ta emot metainformation relaterad till en konversation "
+"som du har med en kontakt. Här kan du ange vilka chattstatusar som du vill "
+"visa i chattfönster."
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
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 kan skicka och ta emot meta-information relaterad till en konversation "
-"som du har med en kontakt: Här kan du specificera vilka chattstatusar du "
-"vill skicka till den andra parten."
+"Gajim kan skicka och ta emot metainformation relaterad till en konversation "
+"som du har med en kontakt. Här kan du ange vilka chattstatusar som du vill "
+"skicka till den andra parten."
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
msgid ""
"Gajim will notify you via a popup window in the bottom right of the screen "
"about contacts that just signed out"
msgstr ""
-"Gajim kommer meddela dig via ett popup-fönster i det nedre högra hörnet av "
+"Gajim kommer att notifiera dig via ett popupfönster i nedre högra hörnet av "
"skärmen om kontakter som just loggat ut"
-#: ../data/glade/preferences_window.glade.h:50
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:51
msgid "Hide all buttons in chat windows"
-msgstr "Gömmer knapparna i gruppchattfönstret"
+msgstr "Dölj alla knappar i chattfönster"
-#: ../data/glade/preferences_window.glade.h:51
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:52
msgid ""
"If checked, Gajim will allow others to detect the operation system you are "
"using"
-msgstr "Om kryssad kommer Gajim gå in i den här gruppchatten vid start"
+msgstr ""
+"Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
+"du använder"
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
msgid ""
"If checked, Gajim will also include information about the sender of the new "
"emails"
msgstr ""
-"Om kryssad kommer Gajim också inkludera information om vem som skickade den "
+"Om kryssad kommer Gajim även att inkludera information om avsändaren av den "
"nya e-posten"
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
#, fuzzy
msgid ""
"If checked, Gajim will change status to Away when the computer is unused."
msgstr "Om ibockad kommer Gajim också att ha en aktivitetsfältsikon"
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
msgid ""
"If checked, Gajim will change status to Not Available when the computer has "
"not been used even longer"
msgstr ""
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
msgid ""
"If checked, Gajim will display avatars of contacts in roster window and in "
"group chats"
msgstr ""
-"Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
-"gruppchattsfönstren"
+"Om kryssad kommer Gajim att visa avatarer för kontakter i kontaktfönster och "
+"gruppchattar"
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
msgid ""
"If checked, Gajim will display status messages of contacts under the contact "
"name in roster window and in group chats"
msgstr ""
"Om kryssad kommer Gajim att visa statusmeddelanden för kontakter under "
-"kontaktens namn i register- och gruppchattsfönstren"
+"kontaktens namn i kontaktfönster och gruppchattar"
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
#, fuzzy
msgid ""
"If checked, Gajim will display the activity of contacts in the roster window"
@@ -1851,7 +1839,7 @@
"Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
"gruppchattsfönstren"
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
#, fuzzy
msgid ""
"If checked, Gajim will display the mood of contacts in the roster window"
@@ -1859,7 +1847,7 @@
"Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
"gruppchattsfönstren"
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
#, fuzzy
msgid ""
"If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1867,14 +1855,14 @@
"Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
"gruppchattsfönstren"
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
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 ""
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
#, fuzzy
msgid ""
"If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1885,14 +1873,14 @@
"irriterar dig. Använd med förstånd, för det blockerar alla meddelanden från "
"alla kontakter som inte finns i ditt register"
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
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 ""
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
#, fuzzy
msgid ""
"If checked, Gajim will show a notification when a new e-mail is received via "
@@ -1901,23 +1889,23 @@
"Om kryssad kommer Gajim också inkludera information om vem som skickade den "
"nya e-posten"
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
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 ""
-"Om kryssad kommer Gajim använda protokoll-specifika statusikoner (t.ex. en "
-"kontakt från MSN kommer ha msnikonen för status tillgänlig, frånvarande, "
-"upptagen, osv...)"
+"Om kryssad kommer Gajim att använda protokollspecifika statusikoner (t.ex. "
+"en kontakt från MSN kommer att ha motsvarade MSN-ikon för tillgänglig, "
+"frånvarande, upptagen, osv...)"
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
msgid ""
"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
+#: ../data/glade/preferences_window.glade.h:67
#, fuzzy
msgid ""
"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -1926,224 +1914,225 @@
"Om inte avstängd kommer Gajim ersätta ascii-smilies som \":)\" med "
"motsvarande animerade eller statiska grafiska känsloikoner"
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
msgid "Log _encrypted chat session"
-msgstr ""
+msgstr "Logga kr_ypterad chattsession"
-#: ../data/glade/preferences_window.glade.h:68
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:69
msgid "Ma_ke message windows compact"
-msgstr "Ett meddelandefönster:"
+msgstr "_Gör meddelandefönstren kompakta"
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
msgid "Ma_nage..."
msgstr "Ha_ntera..."
-#: ../data/glade/preferences_window.glade.h:70
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+"Aldrig\n"
+"Endast vid väntande händelser\n"
+"Alltid"
+
+#: ../data/glade/preferences_window.glade.h:74
msgid "Notifications"
-msgstr "Kontomodifiering"
+msgstr "Notifieringar"
-#: ../data/glade/preferences_window.glade.h:71
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:75
msgid "Notify me about contacts that sign _in"
-msgstr "Notifiera mig om kontakter som: "
+msgstr "Notifiera mig om kontakter som loggar _in"
-#: ../data/glade/preferences_window.glade.h:72
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:76
msgid "Notify me about contacts that sign _out"
-msgstr "Notifiera mig om kontakter som: "
+msgstr "Notifiera mig om kontakter som loggar _ut"
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
msgid "Notify on new _GMail email"
-msgstr "Notifiera om ny e-post på _Gmail"
+msgstr "Notifiera vid ny _Gmail-e-post"
-#: ../data/glade/preferences_window.glade.h:74
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:78
msgid "Personal Events"
-msgstr "Personlig info"
+msgstr "Personliga händelser"
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
msgid "Play _sounds"
-msgstr "_Spela ljud"
+msgstr "Spela _upp ljud"
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
msgid ""
"Pop it up\n"
"Notify me about it\n"
"Show only in roster"
msgstr ""
+"Visa popup\n"
+"Notifiera mig om den\n"
+"Visa endast i kontaktlista"
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
msgid "Preferences"
msgstr "Inställningar"
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+msgid "Show systray:"
+msgstr "Visa i notifieringsyta:"
+
+#: ../data/glade/preferences_window.glade.h:85
msgid "Sign _in"
msgstr "Loggar _in"
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
msgid "Sign _out"
msgstr "Loggar _ut"
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
msgid ""
"Some messages may include rich content (formatting, colors etc). If checked, "
"Gajim will just display the raw message text."
msgstr ""
-"Vissa meddelanden kan innehålla textformatering (storlekar, färger etc). Om "
-"kryssad kommer Gajim bara att visa rå text."
+"Vissa meddelanden kan innehålla textformatering (formatering, färger etc). "
+"Om kryssad kommer Gajim att endast visa rå meddelandetext."
-#: ../data/glade/preferences_window.glade.h:83
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:88
msgid "Sort contacts by status"
-msgstr "_Sortera kontakter efter status"
+msgstr "Sortera kontakter efter status"
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:387
msgid "Status"
msgstr "Status"
-#: ../data/glade/preferences_window.glade.h:85
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:90
msgid "Status _iconset:"
-msgstr "Standarduppsättning av status_ikoner:"
+msgstr "Status_ikoner:"
-#: ../data/glade/preferences_window.glade.h:86
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:91
msgid "Style"
-msgstr "Avstannad"
+msgstr "Stil"
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
msgid "T_heme:"
-msgstr "_Tema:"
+msgstr "T_ema:"
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
msgid ""
"The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
msgstr ""
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
msgid ""
"The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
msgstr ""
-#: ../data/glade/preferences_window.glade.h:90
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:99
msgid "Use _transports icons"
-msgstr ""
-"Använd _transporternas\n"
-"ikonuppsättningar"
+msgstr "Använd _transporternas ikoner"
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
msgid "Use system _default"
msgstr "Använd systemets _standard"
-#: ../data/glade/preferences_window.glade.h:92
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:101
msgid "When new event is received:"
-msgstr "När en ny händelse tas emot"
+msgstr "När ny händelse tas emot:"
-#: ../data/glade/preferences_window.glade.h:93
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:102
msgid "_Away after:"
-msgstr "Automatiskt _frånvarande efter:"
+msgstr "_Frånvarande efter:"
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
msgid "_Browser:"
msgstr "_Webbläsare:"
-#: ../data/glade/preferences_window.glade.h:95
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:104
msgid "_Display chat state notifications:"
-msgstr "Visa chattstatusnoti_fieringar:"
+msgstr "Visa _notifieringar för chattstatus:"
-#: ../data/glade/preferences_window.glade.h:96
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:105
msgid "_Emoticons:"
-msgstr "Känsloikoner:"
+msgstr "_Känsloikoner:"
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
msgid "_File manager:"
msgstr "_Filhanterare:"
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
msgid "_Highlight misspelled words"
msgstr "_Markera felstavade ord"
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignorera händelser från kontakter som inte finns i registret"
+msgstr "_Ignorera händelser från kontakter som inte finns i kontaktlistan"
-#: ../data/glade/preferences_window.glade.h:100
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:109
msgid "_Ignore rich content in incoming messages"
-msgstr "Ignorera textformatering i inkommande meddelanden"
+msgstr "_Ignorera textformatering i inkommande meddelanden"
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
msgid "_Incoming message:"
msgstr "_Inkommande meddelande:"
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
msgid "_Log status changes of contacts"
-msgstr "_Logga statusändringar hos kontakter"
+msgstr "_Logga statusändringar för kontakter"
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
msgid "_Mail client:"
msgstr "_E-postklient:"
-#: ../data/glade/preferences_window.glade.h:104
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:113
msgid "_Not available after:"
-msgstr "Automatiskt _ej tillgänglig efter:"
+msgstr "_Inte tillgänglig efter:"
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
msgid "_Open..."
msgstr "_Öppna..."
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
msgid "_Outgoing message:"
msgstr "_Utgående meddelande:"
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
msgid "_Reset to Default Colors"
-msgstr "Återställ till standardfärger"
+msgstr "_Återställ till standardfärger"
-#: ../data/glade/preferences_window.glade.h:108
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:117
msgid "_Send chat state notifications:"
-msgstr "Visa chattstatusnoti_fieringar:"
+msgstr "_Skicka notifieringar för chattstatus:"
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
msgid "_Status message:"
msgstr "_Statusmeddelande:"
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
msgid "_URL highlight:"
msgstr ""
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
msgid "_Window behavior:"
-msgstr ""
+msgstr "_Fönsterbeteende:"
-#: ../data/glade/preferences_window.glade.h:112
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:121
msgid "in _group chats"
-msgstr "Anslut till _gruppchatt"
+msgstr "i _gruppchattar"
-#: ../data/glade/preferences_window.glade.h:113
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:122
msgid "in _roster"
-msgstr "Inte i registret"
+msgstr "i _kontaktlista"
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
msgid "minutes"
msgstr "minuter"
#: ../data/glade/privacy_lists_window.glade.h:1
msgid "Privacy Lists:"
-msgstr "Privata integritetslistor:"
+msgstr "Integritetslistor:"
#: ../data/glade/privacy_list_window.glade.h:1
msgid "<b>Add / Edit a rule</b>"
@@ -2151,19 +2140,19 @@
#: ../data/glade/privacy_list_window.glade.h:2
msgid "<b>List of rules</b>"
-msgstr "<b>Lista på regler</b>"
+msgstr "<b>Lista över regler</b>"
#: ../data/glade/privacy_list_window.glade.h:3
msgid "<i>Privacy List</i>"
-msgstr "<i>Privata integritetslistor</i>"
+msgstr "<i>Integritetslistor</i>"
#: ../data/glade/privacy_list_window.glade.h:4
msgid "Active for this session"
-msgstr "Aktiv för den här sessionen"
+msgstr "Aktiv för denna session"
#: ../data/glade/privacy_list_window.glade.h:5
msgid "Active on each startup"
-msgstr "Anslut vid varje start"
+msgstr "Aktiv vid varje uppstart"
#: ../data/glade/privacy_list_window.glade.h:6
msgid "All"
@@ -2178,17 +2167,16 @@
msgstr "Neka"
#: ../data/glade/privacy_list_window.glade.h:9
-#, fuzzy
msgid "JabberID"
-msgstr "Jabber-ID:"
+msgstr "JabberID"
#: ../data/glade/privacy_list_window.glade.h:10
msgid "Order:"
msgstr "Ordning:"
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2571
msgid "Privacy List"
-msgstr "Privat integritetslista"
+msgstr "Integritetslista"
#: ../data/glade/privacy_list_window.glade.h:12
msgid "all by subscription"
@@ -2215,9 +2203,8 @@
msgstr "att skicka mig meddelanden"
#: ../data/glade/privacy_list_window.glade.h:19
-#, fuzzy
msgid "to send me queries"
-msgstr "att skicka mig queries"
+msgstr "att skicka mig frågor"
#: ../data/glade/privacy_list_window.glade.h:20
msgid "to send me status"
@@ -2225,179 +2212,155 @@
#: ../data/glade/privacy_list_window.glade.h:21
msgid "to view my status"
-msgstr "att visa min status"
+msgstr "att se min status"
#: ../data/glade/profile_window.glade.h:1
#: ../data/glade/vcard_information_window.glade.h:1
-#, fuzzy
msgid "<b>Address</b>"
-msgstr "<b>Format av en rad</b>"
+msgstr "<b>Adress</b>"
#: ../data/glade/profile_window.glade.h:2
-#, fuzzy
msgid "<b>Avatar:</b>"
-msgstr "Ställ in _avatar"
+msgstr "<b>Avatar:</b>"
#: ../data/glade/profile_window.glade.h:3
#: ../data/glade/vcard_information_window.glade.h:4
-#, fuzzy
msgid "<b>Birthday:</b>"
-msgstr "Födelsedag:"
+msgstr "<b>Födelsedag:</b>"
#: ../data/glade/profile_window.glade.h:4
#: ../data/glade/vcard_information_window.glade.h:5
-#, fuzzy
msgid "<b>City:</b>"
-msgstr "<b>Anpassa</b>"
+msgstr "<b>Stad:</b>"
#: ../data/glade/profile_window.glade.h:5
#: ../data/glade/vcard_information_window.glade.h:7
-#, fuzzy
msgid "<b>Company:</b>"
-msgstr "<b>Anpassa</b>"
+msgstr "<b>Företag:</b>"
#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:9
msgid "<b>Country:</b>"
-msgstr "<b>Ljud</b>"
+msgstr "<b>Land:</b>"
#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:10
msgid "<b>Department:</b>"
-msgstr "Avdelning:"
+msgstr "<b>Avdelning:</b>"
#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:11
msgid "<b>E-Mail:</b>"
-msgstr "E-post:"
+msgstr "<b>E-post:</b>"
#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:12
msgid "<b>Extra Address:</b>"
-msgstr "Extra adress:"
+msgstr "<b>Extra adress:</b>"
#. Family Name
#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:14
msgid "<b>Family:</b>"
-msgstr "Efternamn:"
+msgstr "<b>Efternamn:</b>"
#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:15
msgid "<b>Full Name</b>"
-msgstr "<b>Anpassa</b>"
+msgstr "<b>Fullständigt namn</b>"
#. Given Name
#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:17
msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgstr "<b>Tilltalsnamn:</b>"
#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:18
msgid "<b>Homepage:</b>"
-msgstr "Hemsida:"
+msgstr "<b>Webbplats:</b>"
#. Middle Name
#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:21
msgid "<b>Middle:</b>"
-msgstr "<b>Format av en rad</b>"
+msgstr "<b>Mellannamn:</b>"
#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:22
msgid "<b>Name:</b>"
-msgstr "<b>Anpassa</b>"
+msgstr "<b>Namn:</b>"
#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:23
msgid "<b>Nickname:</b>"
-msgstr "Smeknamn:"
+msgstr "<b>Smeknamn:</b>"
#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:24
msgid "<b>Phone No.:</b>"
-msgstr "Telefonnr.:"
+msgstr "<b>Telefonnr.:</b>"
#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:25
msgid "<b>Position:</b>"
-msgstr "<b>Villkor</b>"
+msgstr "<b>Position:</b>"
#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:26
msgid "<b>Postal Code:</b>"
-msgstr "Postnummer:"
+msgstr "<b>Postnummer:</b>"
#. Prefix in Name
#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:28
msgid "<b>Prefix:</b>"
-msgstr "<b>Egenskaper</b>"
+msgstr "<b>Titel:</b>"
#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:328
msgid "<b>Role:</b>"
-msgstr "<b>Logg</b>"
+msgstr "<b>Roll:</b>"
#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:31
msgid "<b>State:</b>"
-msgstr "<b>Inställningar</b>"
+msgstr "<b>Län:</b>"
#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:33
msgid "<b>Street:</b>"
-msgstr "<b>Inställningar</b>"
+msgstr "<b>Gatuadress:</b>"
#. Suffix in Name
#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:37
msgid "<b>Suffix:</b>"
-msgstr "<b>Ljud</b>"
+msgstr "<b>Suffix:</b>"
#. "About" is the text of a tab of vcard window
#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
msgid "About"
msgstr "Om"
#: ../data/glade/profile_window.glade.h:32
msgid "Click to set your avatar"
-msgstr "Klicka för att visa din avatar"
+msgstr "Klicka för att ange din avatar"
#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
msgid "Format: YYYY-MM-DD"
msgstr "Format: ÅÅÅÅ-MM-DD"
#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
msgid "Personal Info"
msgstr "Personlig info"
#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
msgid "Work"
msgstr "Jobb"
@@ -2407,16 +2370,16 @@
#: ../data/glade/remove_account_window.glade.h:2
msgid "Remove account _only from Gajim"
-msgstr "Ta bort konto _enbart från Gajim"
+msgstr "Ta bort kontot _endast från Gajim"
#: ../data/glade/remove_account_window.glade.h:3
msgid "Remove account from Gajim and from _server"
-msgstr "Ta bort konto från Gajim och från _servern"
+msgstr "Ta bort kontot från Gajim och från _servern"
#. 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:5182
+#: ../src/roster_window.py:5660 ../src/roster_window.py:5789
msgid "_Remove"
msgstr "Ta _bort"
@@ -2425,57 +2388,51 @@
msgstr "_Be om att få se hans/hennes status"
#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
msgid "Add Special _Notification..."
-msgstr "Lägg till speciell _notifiering"
+msgstr "Lägg till speciell _notifiering..."
#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
msgid "Assign Open_PGP Key..."
-msgstr "Tilldela Open_PGP-nyckel"
+msgstr "Tilldela Open_PGP-nyckel..."
#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
msgid "Edit _Groups..."
-msgstr "Redigera _grupper"
+msgstr "Redigera _grupper..."
#. Execute Command
#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5732
msgid "Execute Command..."
-msgstr "Exekvera kommando..."
+msgstr "Kör kommando..."
#. 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:5100 ../src/roster_window.py:5613
msgid "In_vite to"
-msgstr "In_bjud till"
+msgstr "Bjud _in till"
#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
msgid "Remo_ve"
msgstr "Ta _bort"
#. 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:5110 ../src/roster_window.py:5698
msgid "Send Cus_tom Status"
-msgstr "Skickar anpassad XML"
+msgstr "Skicka a_npassad status"
#: ../data/glade/roster_contact_context_menu.glade.h:9
msgid "Send Single _Message..."
-msgstr "Skicka enstaka _meddelande"
+msgstr "Skicka ett _meddelande"
#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
msgid "Send _File..."
-msgstr "Skicka _fil"
+msgstr "Skicka _fil..."
#: ../data/glade/roster_contact_context_menu.glade.h:11
msgid "Set Custom _Avatar..."
-msgstr ""
+msgstr "Ställ in anpassad _avatar..."
#: ../data/glade/roster_contact_context_menu.glade.h:12
#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
@@ -2487,10 +2444,10 @@
msgstr "_Tillåt henne/honom att se min status"
#: ../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:5173 ../src/roster_window.py:5650
+#: ../src/roster_window.py:5779
msgid "_Block"
-msgstr ""
+msgstr "_Blockera"
#: ../data/glade/roster_contact_context_menu.glade.h:16
msgid "_Forbid him/her to see my status"
@@ -2498,144 +2455,137 @@
#: ../data/glade/roster_contact_context_menu.glade.h:18
msgid "_Ignore"
-msgstr ""
+msgstr "_Ignorera"
#: ../data/glade/roster_contact_context_menu.glade.h:19
#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
msgid "_Manage Contact"
-msgstr "Kontakter"
+msgstr "_Hantera kontakt"
#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
msgid "_Rename..."
-msgstr "Byt _namn"
+msgstr "Byt _namn..."
#: ../data/glade/roster_contact_context_menu.glade.h:21
msgid "_Subscription"
msgstr "_Prenumeration"
#: ../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:5167 ../src/roster_window.py:5644
+#: ../src/roster_window.py:5776
msgid "_Unblock"
-msgstr ""
+msgstr "A_vblockera"
#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
msgid "_Unignore"
-msgstr "_Fortsätt"
+msgstr "A_vignorera"
#: ../data/glade/roster_window.glade.h:1
-#, fuzzy
msgid "Add _Contact..."
-msgstr "_Lägg till kontakt..."
+msgstr "Lägg till _kontakt..."
#: ../data/glade/roster_window.glade.h:2
-#, fuzzy
msgid "Fea_tures"
-msgstr "Serverns funktioner"
+msgstr "Fun_ktioner"
#: ../data/glade/roster_window.glade.h:3
msgid "File _Transfers"
-msgstr "_Filöverföringar"
+msgstr "Fil_överföringar"
#: ../data/glade/roster_window.glade.h:4
msgid "Frequently Asked Questions (online)"
-msgstr "Vanliga frågor (webb)"
+msgstr "Frågor och svar (webb)"
#: ../data/glade/roster_window.glade.h:6
msgid "Help online"
-msgstr "Hjälp online"
+msgstr "Hjälp på nätet"
#: ../data/glade/roster_window.glade.h:8
msgid "Profile, A_vatar"
msgstr "Profil, a_vatar"
#: ../data/glade/roster_window.glade.h:9
+msgid "Show Only _Active Contacts"
+msgstr "Visa endast _aktiva kontakter"
+
+#: ../data/glade/roster_window.glade.h:10
msgid "Show Trans_ports"
msgstr "Visa _transporter"
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
msgid "Show _Offline Contacts"
msgstr "Visa frånkopplade _kontakter"
-#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
+#: ../data/glade/roster_window.glade.h:12
msgid "Show _roster"
-msgstr "Visa _registret"
+msgstr "Visa _kontaktlista"
-#: ../data/glade/roster_window.glade.h:12
-#, fuzzy
+#: ../data/glade/roster_window.glade.h:13
msgid "_Accounts"
-msgstr "Konton"
+msgstr "K_onton"
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
#: ../data/glade/subscription_request_window.glade.h:6
msgid "_Actions"
msgstr "_Åtgärder"
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
msgid "_Contents"
msgstr "_Innehåll"
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1353
msgid "_Edit"
msgstr "R_edigera"
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
msgid "_FAQ"
-msgstr "_FAQ"
+msgstr "_Frågor och svar"
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
msgid "_Help"
msgstr "_Hjälp"
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
msgid "_Preferences"
msgstr "_Inställningar"
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
msgid "_Quit"
-msgstr "_Avsluta"
+msgstr "A_vsluta"
-#: ../data/glade/roster_window.glade.h:23
-#, fuzzy
+#: ../data/glade/roster_window.glade.h:24
msgid "_Send Single Message..."
-msgstr "Skicka enstaka _meddelande"
+msgstr "Skicka ett _meddelande..."
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
msgid "_View"
msgstr "_Visa"
#: ../data/glade/search_window.glade.h:1
-#, fuzzy
msgid "Please wait while retrieving search form..."
-msgstr "Vänta medans kommandolistan tas emot..."
+msgstr "Vänta under tiden sökformuläret hämtas..."
#: ../data/glade/search_window.glade.h:2
msgid "Search"
msgstr "Sök"
#: ../data/glade/search_window.glade.h:3
-#, fuzzy
msgid "_Add contact"
-msgstr "Lägg till _kontakt"
+msgstr "_Lägg till kontakt"
#. 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:5801
msgid "_Information"
-msgstr "Kontaktinformation"
+msgstr "_Information"
-#: ../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 "_Sök"
#: ../data/glade/service_discovery_window.glade.h:1
msgid "G_o"
-msgstr "K_ör"
+msgstr "G_å"
#: ../data/glade/service_discovery_window.glade.h:2
msgid "_Address:"
@@ -2643,7 +2593,7 @@
#: ../data/glade/service_registration_window.glade.h:1
msgid "Register to"
-msgstr "Registrera till"
+msgstr "Registrera hos"
#: ../data/glade/service_registration_window.glade.h:2
msgid "_Cancel"
@@ -2691,57 +2641,56 @@
#: ../data/glade/single_message_window.glade.h:10
msgid "_Send & Close"
-msgstr "_Skicka & stäng"
+msgstr "_Skicka och stäng"
#: ../data/glade/subscription_request_window.glade.h:1
-#, fuzzy
msgid "Au_thorize"
-msgstr "_Auktorisera"
+msgstr "Au_ktorisera"
#: ../data/glade/subscription_request_window.glade.h:2
msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Auktorisera kontakt så han eller hon kan veta när du är ansluten"
+msgstr "Auktorisera kontakt så att han eller hon vet när du är ansluten"
#: ../data/glade/subscription_request_window.glade.h:3
msgid ""
"Deny authorization from contact so he or she cannot know when you're "
"connected"
msgstr ""
-"Avvisa auktorisering från kontakt så att han eller hon inte kan veta när du "
-"är ansluten"
+"Neka auktorisering från kontakt så att han eller hon inte vet när du är "
+"ansluten"
#: ../data/glade/subscription_request_window.glade.h:4
msgid "Subscription Request"
-msgstr "Prenumerationsförfrågan"
+msgstr "Prenumerationsbegäran"
#: ../data/glade/subscription_request_window.glade.h:7
msgid "_Deny"
msgstr "_Neka"
#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+#, fuzzy
msgid "Select the account with which to synchronise"
-msgstr ""
+msgstr "Välj kontot med vilket du vill synkronisera"
#: ../data/glade/synchronise_select_account_dialog.glade.h:1
msgid "Select the account with which you want to synchronise"
-msgstr ""
+msgstr "Välj kontot med vilket du vill synkronisera"
#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
-#, fuzzy
msgid "Select the contacts you want to synchronise"
-msgstr "JID för kontakten som du vill chatta med"
+msgstr "Välj kontakterna som du vill synkronisera"
#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
msgid "Synchronise : select contacts"
-msgstr ""
+msgstr "Synkronisera : välj kontakter"
#: ../data/glade/systray_context_menu.glade.h:1
msgid "Mute Sounds"
-msgstr "Tysta ljud"
+msgstr "Inga ljud"
#: ../data/glade/systray_context_menu.glade.h:2
msgid "Send Single _Message"
-msgstr "Skicka enstaka _meddelande"
+msgstr "Skicka ett _meddelande"
#: ../data/glade/systray_context_menu.glade.h:3
msgid "Show All Pending _Events"
@@ -2749,7 +2698,7 @@
#: ../data/glade/systray_context_menu.glade.h:4
msgid "Show _Roster"
-msgstr "Visa _registret"
+msgstr "Visa _kontaktlista"
#: ../data/glade/systray_context_menu.glade.h:5
msgid "Sta_tus"
@@ -2761,67 +2710,63 @@
#. Given Name
#: ../data/glade/vcard_information_window.glade.h:3
-#, fuzzy
msgid "<b>Ask:</b>"
-msgstr "<b>Åtgärder</b>"
+msgstr "<b>Fråga:</b>"
#: ../data/glade/vcard_information_window.glade.h:6
-#, fuzzy
msgid "<b>Client:</b>"
-msgstr "<b>Anpassa</b>"
+msgstr "<b>Klient:</b>"
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Län:</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
msgid "<b>Jabber ID:</b>"
-msgstr "Jabber-ID:"
+msgstr "<b>Jabber-ID:</b>"
-#: ../data/glade/vcard_information_window.glade.h:28
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:29
msgid "<b>Resource:</b>"
-msgstr "Resurs:"
+msgstr "<b>Resurs:</b>"
-#: ../data/glade/vcard_information_window.glade.h:31
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:32
msgid "<b>Status:</b>"
-msgstr "<b>Inställningar</b>"
+msgstr "<b>Status:</b>"
#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:35
msgid "<b>Subscription:</b>"
-msgstr "<b>Beskrivning</b>"
+msgstr "<b>Prenumeration:</b>"
-#: ../data/glade/vcard_information_window.glade.h:37
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:38
msgid "<b>System:</b>"
-msgstr "<b>Anpassa</b>"
+msgstr "<b>System:</b>"
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
msgid "Comments"
msgstr "Kommentarer"
-#: ../data/glade/vcard_information_window.glade.h:41
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:42
msgid "Configured avatar:"
-msgstr "Konfigurera _rum"
+msgstr "Konfigurerad avatar:"
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
#: ../data/glade/zeroconf_information_window.glade.h:1
msgid "Contact"
msgstr "Kontakt"
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
msgid "Contact Information"
msgstr "Kontaktinformation"
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
msgid "More"
msgstr "Mer"
-#: ../data/glade/vcard_information_window.glade.h:48
-#, fuzzy
+#: ../data/glade/vcard_information_window.glade.h:49
msgid "User avatar:"
-msgstr "Välj avatar"
+msgstr "Användaravatar:"
#: ../data/glade/xml_console_window.glade.h:1
msgid "<b>Jabber Traffic</b>"
@@ -2829,12 +2774,17 @@
#: ../data/glade/xml_console_window.glade.h:2
msgid "<b>XML Input</b>"
-msgstr "<b>XML-inskrivning</b>"
+msgstr "<b>XML-inmatning</b>"
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Aktivera"
+
#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
#: ../data/glade/xml_console_window.glade.h:6
msgid "Info/Query"
-msgstr "Info/Förfrågan (Info/Query)"
+msgstr "Info/Fråga (Info/Query)"
#. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
#: ../data/glade/xml_console_window.glade.h:8
@@ -2859,19 +2809,19 @@
#. Edit Groups
#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5633
msgid "Edit _Groups"
msgstr "Redigera _grupper"
#. Rename
#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5759
msgid "_Rename"
msgstr "Byt _namn"
#: ../data/glade/zeroconf_context_menu.glade.h:1
msgid "_Modify Account..."
-msgstr "_Modifiera konto..."
+msgstr "_Redigera konto..."
#: ../data/glade/zeroconf_information_window.glade.h:6
msgid "Local jid:"
@@ -2889,19 +2839,14 @@
msgid "Status:"
msgstr "Status:"
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Redigera konto"
-
#: ../src/adhoc_commands.py:264
-#, fuzzy
msgid "Cancel confirmation"
-msgstr "Kontaktinformation"
+msgstr "Avbryt bekräftelse"
#: ../src/adhoc_commands.py:265
msgid ""
"You are in process of executing command. Do you really want to cancel it?"
-msgstr ""
+msgstr "Du håller på att köra ett kommando. Vill du verkligen avbryta det?"
#: ../src/adhoc_commands.py:304
msgid "Service changed the session identifier."
@@ -2914,7 +2859,7 @@
#. when stanza doesn't have error description
#: ../src/adhoc_commands.py:398
msgid "Service returned an error."
-msgstr ""
+msgstr "Tjänsten returnerade ett fel."
#. For i18n
#: ../src/advanced.py:97
@@ -2937,7 +2882,7 @@
msgid "Text"
msgstr "Text"
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:769
msgid "Color"
msgstr "Färg"
@@ -2967,517 +2912,532 @@
#. #!/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 "engelska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Belarusian"
msgstr "vitryska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Bulgarian"
msgstr "bulgariska"
-#: ../src/chat_control.py:68
-#, fuzzy
+#: ../src/chat_control.py:67
msgid "Breton"
msgstr "bretonska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Czech"
msgstr "tjeckiska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "German"
msgstr "tyska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Greek"
msgstr "grekiska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "British"
msgstr "brittiska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Esperanto"
msgstr "esperanto"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Spanish"
msgstr "spanska"
-#: ../src/chat_control.py:68
-#, fuzzy
+#: ../src/chat_control.py:67
msgid "Basque"
msgstr "baskiska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "French"
msgstr "franska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Croatian"
msgstr "kroatiska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Italian"
msgstr "italienska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Norwegian (b)"
msgstr "norska (bokmål)"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Dutch"
msgstr "nederländska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Norwegian"
msgstr "norska (nynorsk)"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Polish"
msgstr "polska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Portuguese"
msgstr "portugisiska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Brazilian Portuguese"
msgstr "brasiliansk portugisiska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Russian"
msgstr "ryska"
-#: ../src/chat_control.py:68
-#, fuzzy
+#: ../src/chat_control.py:67
msgid "Serbian"
-msgstr "tyska"
+msgstr "serbiska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Slovak"
msgstr "slovakiska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Swedish"
msgstr "svenska"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Chinese (Ch)"
msgstr "kinesiska"
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:345
msgid "Spelling language"
msgstr "Stavningsspråk"
#. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:368 ../src/chat_control.py:556
msgid "A connection is not available"
-msgstr "En förbindelse är inte tillgänglig"
+msgstr "En anslutning är inte tillgänglig"
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:369 ../src/chat_control.py:557
msgid "Your message can not be sent until you are connected."
-msgstr "Ditt meddelande kan inte skickas förren du är ansluten."
+msgstr "Ditt meddelande kan inte skickas förrän du är ansluten."
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
-#, fuzzy
+#: ../src/chat_control.py:751
+msgid "Underline"
+msgstr "Understruken"
+
+#: ../src/chat_control.py:752
+msgid "Strike"
+msgstr "Genomstruken"
+
+#: ../src/chat_control.py:775
+msgid "Font"
+msgstr "Typsnitt"
+
+#: ../src/chat_control.py:784
+msgid "Clear formating"
+msgstr "Ingen formatering"
+
+#: ../src/chat_control.py:1220 ../src/chat_control.py:1623
msgid "GPG encryption enabled"
-msgstr "Kryptering aktiverad"
+msgstr "GPG-kryptering aktiverad"
#. 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/chat_control.py:1250 ../src/chat_control.py:2125
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:56
+#: ../src/common/helpers.py:227 ../src/conversation_textview.py:858
+#: ../src/dialogs.py:900 ../src/dialogs.py:1648 ../src/gajim.py:999
+#: ../src/gajim.py:1731 ../src/normal_control.py:483
+#: ../src/roster_window.py:910 ../src/roster_window.py:1541
+#: ../src/roster_window.py:1543 ../src/roster_window.py:1894
+#: ../src/roster_window.py:3083 ../src/roster_window.py:3109
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5479
msgid "Not in Roster"
-msgstr "Inte i registret"
+msgstr "Inte i kontaktlista"
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1382 ../src/tooltips.py:627
msgid "Unknown Artist"
-msgstr ""
+msgstr "Okänd artist"
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1384 ../src/tooltips.py:632
msgid "Unknown Title"
-msgstr ""
+msgstr "Okänd titel"
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1386 ../src/tooltips.py:637
msgid "Unknown Source"
-msgstr ""
+msgstr "Okänd källa"
-#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#: ../src/chat_control.py:1390 ../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> av <i>%(artist)s</i>\n"
+"från <i>%(source)s</i>"
-#: ../src/chat_control.py:1314
-#, fuzzy, python-format
+#: ../src/chat_control.py:1395
+#, python-format
msgid ""
"%(title)s by %(artist)s\n"
"from %(source)s"
-msgstr "\"%(title)s\" av %(artist)s"
+msgstr ""
+"%(title)s av %(artist)s\n"
+"från %(source)s"
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1518
#, python-format
msgid "%(nickname)s from group chat %(room_name)s"
-msgstr "%(nickname)s från gruppchatt %(room_name)s"
+msgstr "%(nickname)s från gruppchatten %(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:1603 ../src/dialogs.py:3912
msgid "No GPG key assigned"
-msgstr ""
+msgstr "Ingen GPG-nyckel tilldelad"
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1604
msgid ""
"No GPG key is assigned to this contact. So you cannot encrypt messages with "
"GPG."
msgstr ""
+"Ingen GPG-nyckel har tilldelats denna kontakt. Därför kan du inte kryptera "
+"meddelanden med GPG."
-#: ../src/chat_control.py:1533
-#, fuzzy
+#: ../src/chat_control.py:1613
msgid "GPG encryption disabled"
-msgstr "Kryptering deaktiverad"
+msgstr "GPG-kryptering inaktiverad"
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1639
msgid "Session WILL be logged"
-msgstr ""
+msgstr "Sessionen KOMMER att loggas"
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1641
msgid "Session WILL NOT be logged"
-msgstr ""
+msgstr "Sessionen KOMMER INTE att loggas"
#. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1655
msgid "is"
-msgstr ""
+msgstr "är"
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1655
msgid "is NOT"
-msgstr ""
+msgstr "är INTE"
#. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1657
msgid "will"
-msgstr ""
+msgstr "kommer"
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1657
msgid "will NOT"
-msgstr ""
+msgstr "kommer INTE"
#. About encrypted chat session
-#: ../src/chat_control.py:1580
-#, fuzzy
+#: ../src/chat_control.py:1661
msgid "and authenticated"
-msgstr "Använd autentisering"
+msgstr "och autentiserad"
#. About encrypted chat session
-#: ../src/chat_control.py:1584
-#, fuzzy
+#: ../src/chat_control.py:1665
msgid "and NOT authenticated"
-msgstr "Använd autentisering"
+msgstr "och INTE autentiserad"
#. 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:1671
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
"Your chat session %(logged)s be logged."
msgstr ""
+"%(type)s-kryptering %(status)s aktiv %(authenticated)s.\n"
+"Din chattsession %(logged)s att loggas."
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1719
msgid "Command not supported for zeroconf account."
-msgstr ""
+msgstr "Kommandot stöds inte för zeroconf-konto."
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1730 ../src/groupchat_control.py:1657
#, python-format
msgid "Commands: %s"
msgstr "Kommandon: %s"
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1733 ../src/groupchat_control.py:1671
#, python-format
msgid "Usage: /%s, clears the text window."
-msgstr "Användning: /%s, tömmer fönstret från text."
+msgstr "Användning: /%s, tömmer textfönstret."
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1736 ../src/groupchat_control.py:1676
#, python-format
msgid "Usage: /%s, hide the chat buttons."
-msgstr "Användning: /%s, gömmer knapparna."
+msgstr "Användning: /%s, döljer chattknapparna."
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
-#, fuzzy, python-format
+#: ../src/chat_control.py:1739 ../src/groupchat_control.py:1692
+#, python-format
msgid ""
"Usage: /%(command)s <action>, sends action to the current group chat. Use "
"third person. (e.g. /%(command)s explodes.)"
msgstr ""
-"Användning: /%s <handling>, skickar handling till aktivt rum. Använd tredje "
-"person. (t.ex. /%s exploderar.)"
+"Användning: /%(command)s <åtgärd>, skickar åtgärd till aktuell gruppchatt. "
+"Använd tredje person. (t.ex. /%(command)s exploderar.)"
-#: ../src/chat_control.py:1663
-#, fuzzy, python-format
+#: ../src/chat_control.py:1744
+#, python-format
msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Användning: /%s, ställer om ett gruppchatfönster till kompaktvy."
+msgstr "Användning: /%s, skickar en ping till kontakten"
-#: ../src/chat_control.py:1666
-#, fuzzy, python-format
+#: ../src/chat_control.py:1747
+#, python-format
msgid "Usage: /%s, send the message to the contact"
-msgstr "Användning: /%s, gömmer knapparna."
+msgstr "Användning: /%s, skickar meddelandet till kontakten"
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1750 ../src/groupchat_control.py:1715
#, python-format
msgid "No help info for /%s"
msgstr "Ingen hjälp för /%s"
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1883
msgid "Session negotiation cancelled"
-msgstr ""
+msgstr "Sessionsförhandlingen avbröts"
-#: ../src/chat_control.py:1807
-#, fuzzy
+#: ../src/chat_control.py:1890
msgid "This session is encrypted"
-msgstr "[Det här meddelandet är krypterat]"
+msgstr "Denna session är krypterad"
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1893
msgid " and WILL be logged"
-msgstr ""
+msgstr " och KOMMER att loggas"
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1895
msgid " and WILL NOT be logged"
-msgstr ""
+msgstr " och KOMMER INTE att loggas"
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1900
msgid ""
"Remote contact's identity not verified. Click the shield button for more "
"details."
msgstr ""
+"Fjärrkontaktens identitet har inte verifierats. Klicka på sköldknappen för "
+"mer information."
-#: ../src/chat_control.py:1819
-#, fuzzy
+#: ../src/chat_control.py:1902
msgid "E2E encryption disabled"
-msgstr "Kryptering deaktiverad"
+msgstr "E2E-kryptering inaktiverad"
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
-#, fuzzy
+#: ../src/chat_control.py:1936 ../src/chat_control.py:1949
msgid "The following message was NOT encrypted"
-msgstr "[Det här meddelandet är krypterat]"
+msgstr "Följande meddelande var INTE krypterat"
-#: ../src/chat_control.py:1854
-#, fuzzy
+#: ../src/chat_control.py:1942
msgid "The following message was encrypted"
-msgstr "[Det här meddelandet är krypterat]"
+msgstr "Följande meddelande var krypterat"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2313
#, python-format
msgid "You just received a new message from \"%s\""
-msgstr "Du mottog just ett meddelande från \"%s\""
+msgstr "Du tog just emot ett meddelande från \"%s\""
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2314
msgid ""
"If you close this tab and you have history disabled, this message will be "
"lost."
msgstr ""
-"Om du stänger den här fliken och har historik avslagen kommer meddelandet "
-"att förloras."
+"Om du stänger den här fliken och har historik inaktiverad så kommer "
+"meddelandet att förloras."
-#: ../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:2462 ../src/common/connection_handlers.py:1961
+#: ../src/common/connection_handlers.py:2007
+#: ../src/common/connection_handlers.py:2195
+#: ../src/common/connection_handlers.py:2328 ../src/common/connection.py:1344
+#: ../src/gajim.py:177
msgid "Database Error"
-msgstr ""
+msgstr "Databasfel"
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2463
#, python-format
msgid ""
"The database file (%s) cannot be read. Try to repair it or remove it (all "
"history will be lost)."
msgstr ""
+"Databasfilen (%s) kan inte läsas. Försök att reparera den eller ta bort den "
+"(all historik kommer att förloras)."
-#: ../src/chat_control.py:2608
-#, fuzzy, python-format
+#: ../src/chat_control.py:2699
+#, python-format
msgid "%(name)s is now %(status)s"
-msgstr "%(nick)s är nu %(status)s"
+msgstr "%(name)s är nu %(status)s"
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
msgid "creating logs database"
-msgstr "skapar logdatabas"
+msgstr "skapar loggdatabas"
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
-#, fuzzy, python-format
+#: ../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 är en fil, men borde vara en katalog"
+msgstr "%s är en fil men den borde vara en katalog"
-#: ../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 "Gajim kommer nu avslutas"
+msgstr "Gajim kommer nu att avslutas"
-#: ../src/common/check_paths.py:136
-#, fuzzy, python-format
+#: ../src/common/check_paths.py:137
+#, python-format
msgid "%s is a directory but should be a file"
-msgstr "%s är en katalog, men borde vara en fil"
+msgstr "%s är en katalog men den borde vara en fil"
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:153
#, python-format
msgid "creating %s directory"
msgstr "skapar katalogen %s"
-#: ../src/common/commands.py:80
-#, fuzzy
+#: ../src/common/commands.py:79
msgid "Change status information"
-msgstr "Kontaktinformation"
+msgstr "Ändra statusinformation"
-#: ../src/common/commands.py:93
-#, fuzzy
+#: ../src/common/commands.py:92
msgid "Change status"
-msgstr "Kontakt Loggade Ut"
+msgstr "Ändra status"
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
msgid "Set the presence type and description"
-msgstr ""
+msgstr "Ställ in närvarotypen och en beskrivning"
-#: ../src/common/commands.py:100
-#, fuzzy
+#: ../src/common/commands.py:99
msgid "Free for chat"
msgstr "Ledig för chatt"
-#: ../src/common/commands.py:101
-#, fuzzy
+#: ../src/common/commands.py:100
msgid "Online"
-msgstr "_Fortsätt"
+msgstr "Ansluten"
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
msgid "Extended away"
-msgstr "Inte tillgänglig"
+msgstr "Utökad frånvaro"
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
msgid "Do not disturb"
msgstr "Stör inte"
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
msgid "Offline - disconnect"
-msgstr "Frånkopplad - Koppla från"
+msgstr "Frånkopplad - koppla från"
-#: ../src/common/commands.py:110
-#, fuzzy
+#: ../src/common/commands.py:109
msgid "Presence description:"
-msgstr "Beskrivning"
+msgstr "Beskrivning av närvaro:"
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
msgid "The status has been changed."
msgstr "Statusen har ändrats."
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
-#, fuzzy
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
msgid "Leave Groupchats"
-msgstr "Gruppchatt"
+msgstr "Lämna gruppchattar"
-#: ../src/common/commands.py:191
-#, fuzzy, python-format
+#: ../src/common/commands.py:190
+#, python-format
msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s: %(message)s"
+msgstr "%(nickname)s på %(room_jid)s"
-#: ../src/common/commands.py:195
-#, fuzzy
+#: ../src/common/commands.py:194
msgid "You have not joined a groupchat."
-msgstr "I gruppen"
+msgstr "Du har inte gått in i en gruppchatt."
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
msgid "Choose the groupchats you want to leave"
-msgstr "Välj de gruppchattar du vill lämna"
+msgstr "Välj de gruppchattar som du vill lämna"
#. 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
-#, fuzzy
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:56 ../src/roster_window.py:784
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1547
+#: ../src/roster_window.py:5070
msgid "Groupchats"
-msgstr "Gruppchatt"
+msgstr "Gruppchattar"
-#: ../src/common/commands.py:247
-#, fuzzy
+#: ../src/common/commands.py:246
msgid "You left the following groupchats:"
-msgstr "Du är redan i rummet %s"
+msgstr "Du lämnade följande gruppchattar:"
-#: ../src/common/commands.py:259
-#, fuzzy
+#: ../src/common/commands.py:258
msgid "Forward unread messages"
-msgstr "Gajim - ett oläst meddelande"
+msgstr "Vidarebefordra olästa meddelanden"
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
msgid "All unread messages have been forwarded."
-msgstr ""
+msgstr "Alla olästa meddelanden har vidarebefordrats."
#: ../src/common/config.py:82
-#, fuzzy
+msgid "Play sound when user is busy"
+msgstr "Spela upp ljud när användaren är upptagen"
+
+#: ../src/common/config.py:83
msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Använd DBus och Notification-Daemon för att visa meddelanden"
+msgstr "Använd D-Bus och Notification-Daemon för att visa meddelanden"
-#: ../src/common/config.py:87
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Tid i minuter tills din status ändras till borta."
+#: ../src/common/config.py:85
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+"Visa endast kontakter som är anslutna och lediga för chatt i kontaktlistan."
#: ../src/common/config.py:88
-#, fuzzy
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Tid i minuter efter vilken din status ändras till frånvarande."
+
+#: ../src/common/config.py:89
msgid "$S (Away as a result of being idle more than $T min)"
-msgstr "Borta på grund av inaktivitet"
+msgstr "$S (Frånvarande på grund av overksam i mer än $T min)"
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
msgid "$S will be replaced by current status message, $T by autoaway time."
msgstr ""
-#: ../src/common/config.py:90
+#: ../src/common/config.py:91
msgid "Time in minutes, after which your status changes to not available."
-msgstr "Tid i minuter tills din status ändras till inte tillgänglig."
+msgstr "Tid i minuter efter vilken din status ändras till inte tillgänglig."
-#: ../src/common/config.py:91
-#, fuzzy
+#: ../src/common/config.py:92
msgid "$S (Not available as a result of being idle more than $T min)"
-msgstr "Inte tillgänglig på grund av inaktivitet"
+msgstr "$S (Inte tillgänglig på grund av overksam i mer än $T min)"
-#: ../src/common/config.py:91
+#: ../src/common/config.py:92
msgid "$S will be replaced by current status message, $T by autoxa time."
msgstr ""
-#: ../src/common/config.py:111
+#: ../src/common/config.py:102
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:112
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:3114
-#, fuzzy
+#: ../src/common/config.py:113 ../src/common/config.py:464
+#: ../src/common/optparser.py:221 ../src/common/optparser.py:439
+#: ../src/common/optparser.py:473 ../src/gajim.py:3263
msgid "default"
-msgstr "Standard"
+msgstr "standard"
-#: ../src/common/config.py:116
-#, fuzzy
+#: ../src/common/config.py:117
msgid "Enable link-local/zeroconf messaging"
msgstr "Aktivera link-local-/zeroconf-meddelanden"
-#: ../src/common/config.py:119
-#, fuzzy
+#: ../src/common/config.py:120
msgid "Language used by speller"
-msgstr "Språk använt av stavaren"
+msgstr "Språk som används för stavningskontroll"
-#: ../src/common/config.py:120
+#: ../src/common/config.py:121
msgid ""
"'always' - print time for every message.\n"
"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3487,107 +3447,110 @@
"\"ibland\" - skriv ut tid var print_ichat_every_foo_minutes minut.\n"
"\"aldrig\" - skriv aldrig ut tid."
-#: ../src/common/config.py:121
+#: ../src/common/config.py:122
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 ""
-#: ../src/common/config.py:124
+#: ../src/common/config.py:125
msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Behandla par av * / _ som möliga formateringstecken."
+msgstr "Behandla par av * / _ som möjliga formateringstecken."
-#: ../src/common/config.py:125
+#: ../src/common/config.py:126
msgid ""
"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
msgstr ""
-"Om True tas inte */_ bort. *abc* blir fetstil men * * / / _ _ inte borttagna."
+"Om sant så tas inte */_ bort. Så *abc* blir i fet stil men * * / / _ _ tas "
+"inte bort."
-#: ../src/common/config.py:128
+#: ../src/common/config.py:129
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 ""
-#: ../src/common/config.py:137
+#: ../src/common/config.py:138
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
msgstr ""
-"Tecken att lägga till efter smeknamnet när du använder "
-"smeknamnskomplettering (tabb) i gruppchatt."
+"Tecken att lägga till efter smeknamnet när smeknamnskomplettering används "
+"(tabb) i gruppchatt."
-#: ../src/common/config.py:138
+#: ../src/common/config.py:139
msgid ""
"Character to propose to add after desired nickname when desired nickname is "
"used by someone else in group chat."
msgstr ""
-"Teckens som föreslås läggas till efter ditt valda smeknamn om smeknamnet "
-"används av någon annan i gruppchatten."
+"Tecken att föreslå för att läggas till efter önskat smeknamn när önskat "
+"smeknamn används av någon annan i gruppchatten."
-#: ../src/common/config.py:161
+#: ../src/common/config.py:167
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 ""
-"Det här valet låter dig anpassa tidsstämplar som skrivs ut i konversationer. "
-"T.ex. \"[%H:%M] \" kommer visa \"[timme:minut] \". Läs python-manualen om "
-"strftime för full dokumentation: http://docs.python.org/lib/module-time.html"
+"Detta alternativ låter dig anpassa tidsstämplar som skrivs ut i "
+"konversationer. Till exempel kommer \"[%H.%M] \" att visa \"[timme.minut] "
+"\". Läs python-manualen för strftime för fullständig dokumentation: http://"
+"docs.python.org/lib/module-time.html"
-#: ../src/common/config.py:162
+#: ../src/common/config.py:168
msgid "Characters that are printed before the nickname in conversations"
msgstr "Tecken som skrivs ut före smeknamnet i konversationer"
-#: ../src/common/config.py:163
+#: ../src/common/config.py:169
msgid "Characters that are printed after the nickname in conversations"
msgstr "Tecken som skrivs ut efter smeknamnet i konversationer"
-#: ../src/common/config.py:168
+#: ../src/common/config.py:173
msgid "Add * and [n] in roster title?"
-msgstr "Lägg till * och [n] i registerfönstrets titel."
+msgstr "Lägg till * och [n] i kontaktlistans titel?"
-#: ../src/common/config.py:169
+#: ../src/common/config.py:174
msgid ""
"How many lines to remember from previous conversation when a chat tab/window "
"is reopened."
msgstr ""
"Hur många rader som skall kommas ihåg från tidigare konversation när en "
-"chatt-flik/fönster öppnas igen."
+"chattflik/chattfönster öppnas igen."
-#: ../src/common/config.py:170
+#: ../src/common/config.py:175
msgid "How many minutes should last lines from previous conversation last."
msgstr ""
-"Mur många minuter skall de sista raderna från tidigare konversation sparas."
+"Hur många minuter skall de sista raderna från tidigare konversation finnas "
+"kvar."
-#: ../src/common/config.py:171
+#: ../src/common/config.py:176
msgid ""
"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
"Client default behaviour)."
msgstr ""
-"Skicka meddelande med Ctrl+Enter och gör radbryt med Enter (Mirabilis ICQ "
-"Klientens standardbeteende)."
+"Skicka meddelande med Ctrl+Enter och gör radbrytning med Enter (ICQ-klienten "
+"Mirabilis standardbeteende)."
-#: ../src/common/config.py:173
+#: ../src/common/config.py:178
msgid "How many lines to store for Ctrl+KeyUP."
msgstr "Hur många rader skall sparas för Ctrl+KeyUP."
-#: ../src/common/config.py:176
+#: ../src/common/config.py:181
#, python-format
msgid ""
"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
"which means use wiktionary."
msgstr ""
-"Skriv in url med %s i där %s är ordet/frasen eller 'WIKTIONARY' vilket "
-"betyder att wiktionary skall användas."
+"Antingen en anpassad url med %s, där %s är ordet/frasen eller \"WIKTIONARY\" "
+"vilket betyder att wiktionary skall användas."
-#: ../src/common/config.py:179
+#: ../src/common/config.py:184
msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Om ibockad kan Gajim bli fjärrstyrd med gajim-remote."
+msgstr "Om kryssad så kan Gajim fjärrstyras med gajim-remote."
-#: ../src/common/config.py:180
+#: ../src/common/config.py:185
#, fuzzy
msgid ""
"If True, listen to D-Bus signals from NetworkManager and change the status "
@@ -3599,28 +3562,28 @@
"för konton (om de nu inte har listen_to_network_manager satt till False och "
"dem synkar med global status) baserat på om nätverkets status."
-#: ../src/common/config.py:181
+#: ../src/common/config.py:186
msgid ""
"Sent chat state notifications. Can be one of all, composing_only, disabled."
msgstr ""
-#: ../src/common/config.py:182
+#: ../src/common/config.py:187
msgid ""
"Displayed chat state notifications in chat windows. Can be one of all, "
"composing_only, disabled."
msgstr ""
-#: ../src/common/config.py:184
+#: ../src/common/config.py:189
msgid ""
"When not printing time for every message (print_time==sometimes), print it "
"every x minutes."
msgstr ""
-#: ../src/common/config.py:185
+#: ../src/common/config.py:190
msgid "Ask before closing a group chat tab/window."
msgstr "Fråga innan gruppchattflik eller -fönster stängs."
-#: ../src/common/config.py:186
+#: ../src/common/config.py:191
#, fuzzy
msgid ""
"Always ask before closing group chat tab/window in this space separated list "
@@ -3629,7 +3592,7 @@
"Fråga alltid innan guppchattab/-förster i denna kommaseparerade lista med "
"rum (jid) stängs."
-#: ../src/common/config.py:187
+#: ../src/common/config.py:192
#, fuzzy
msgid ""
"Never ask before closing group chat tab/window in this space separated list "
@@ -3638,7 +3601,7 @@
"Fråga aldrig innan guppchattab/-förster i denna kommaseparerade lista med "
"rum (jid) stängs."
-#: ../src/common/config.py:190
+#: ../src/common/config.py:195
#, fuzzy
msgid ""
"Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3647,76 +3610,70 @@
"Åtsidosätter vilket värdnamn vi skickar vid filöverföring, t.ex. vid NAT och "
"port forwarding."
-#: ../src/common/config.py:192
+#: ../src/common/config.py:197
msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "IEC standarden säger att KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "IEC-standarden säger: KiB = 1024 byte, KB = 1000 byte."
-#: ../src/common/config.py:194
+#: ../src/common/config.py:199
#, fuzzy
msgid "Notify of events in the system trayicon."
msgstr "Notifiera om händelser in systemets statusikon."
-#: ../src/common/config.py:200
+#: ../src/common/config.py:205
msgid "Show tab when only one conversation?"
msgstr "Visa flik när endast en konversation är aktiv?"
-#: ../src/common/config.py:201
+#: ../src/common/config.py:206
#, fuzzy
msgid "Show tabbed notebook border in chat windows?"
msgstr "Visa flikkant om endast en konversation är aktiv?"
-#: ../src/common/config.py:202
+#: ../src/common/config.py:207
msgid "Show close button in tab?"
-msgstr "Visa stängknapp i flik?"
+msgstr "Visa stängningsknapp i flik?"
-#: ../src/common/config.py:203
+#: ../src/common/config.py:208
msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../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 ""
-#: ../src/common/config.py:213
+#: ../src/common/config.py:217
#, fuzzy
msgid "Preview new messages in notification popup?"
msgstr "Chattstatusmeddelanden:"
-#: ../src/common/config.py:218
+#: ../src/common/config.py:222
#, fuzzy
msgid ""
"A semicolon-separated list of words that will be highlighted in group chats."
msgstr "En semikolonseparerad lista av ord som blir upplysta i gruppchatt."
-#: ../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 ""
-"Om True avslutar Gajim när fönsterhanterarens X-knapp trycks på. Denna "
-"inställning behandlas bara när aktivitetsfältet används."
+"Om sant så avslutas Gajim när fönsterhanterarens X-knapp klickas. Denna "
+"inställning behandlas endast när aktivitetsfältsikonen används."
-#: ../src/common/config.py:220
+#: ../src/common/config.py:224
#, fuzzy
msgid ""
"If True, Gajim will check if it's the default jabber client on each startup."
msgstr "Om True registreras Gajim för xmpp:// vid varje uppstart."
-#: ../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 ""
-"Om True kommer Gajim att visa en ikon på varje flik som innehåller olästa "
-"meddelanden. Beroende på tema kan denna ikon vara animerad."
+"Om sant kommer Gajim att visa en ikon på varje flik som innehåller olästa "
+"meddelanden. Beroende på temat så kan denna ikon vara animerad."
-#: ../src/common/config.py:222
+#: ../src/common/config.py:226
#, fuzzy
msgid ""
"If True, Gajim will display the status message, if not empty, for every "
@@ -3725,19 +3682,20 @@
"Om True kommer Gajim att visa statusmeddelande, om inte tomt, för varje "
"kontakt under dess namn i registerfönstret"
-#: ../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 ""
-#: ../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 ""
-"Om True kommer Gajim att fråga alla kontakter som antingen inte hade en "
-"avatar, eller som har en för gammal cachad avatar om deras nuvarande avatar."
+"Om sant kommer Gajim att fråga alla kontakter som antingen inte hade en "
+"avatar senaste gången, eller som har en mellanlagrad avatar som är för "
+"gammal."
-#: ../src/common/config.py:229
+#: ../src/common/config.py:233
#, fuzzy
msgid ""
"If False, Gajim will no longer print status line in chats when a contact "
@@ -3746,7 +3704,7 @@
"Om False kommer du inte längre att se en statusrad i chattfönstret när en "
"kontakt byter hans eller hennes status och/eller statusmeddelande."
-#: ../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,38 +3713,38 @@
"group chat."
msgstr ""
-#: ../src/common/config.py:232
+#: ../src/common/config.py:236
msgid "Background color of contacts when they just signed in."
msgstr "Bakgrundsfärg på kontakter när de precis loggat in."
-#: ../src/common/config.py:233
+#: ../src/common/config.py:237
msgid "Background color of contacts when they just signed out."
msgstr "Bakgrundsfärg på kontakter när de precis loggat ut."
-#: ../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 ""
-#: ../src/common/config.py:236
+#: ../src/common/config.py:240
msgid "Don't show avatar for the transport itself."
-msgstr "Visa inte avatar för transporten själv."
+msgstr "Visa inte avatar för själva transporten."
-#: ../src/common/config.py:237
+#: ../src/common/config.py:241
msgid "Don't show roster in the system taskbar."
-msgstr "Visa inte registret i systemets fönsterlista."
+msgstr "Visa inte kontaktlista i systemets fönsterlista."
-#: ../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 ""
-"Om True och GTK+ och PyGTK är av version 2.8 eller högre kommer fönstret att "
-"blinka (standardbeteende i de flesta fönsterhanterare) när det finns "
-"väntande händelser."
+"Om sant och versionerna av GTK+ och PyGTK är 2.8 eller högre så kommer "
+"fönstret att blinka (standardbeteendet i de flesta fönsterhanterare) när det "
+"finns väntande händelser."
-#: ../src/common/config.py:240
+#: ../src/common/config.py:244
#, fuzzy
msgid ""
"Jabberd1.4 does not like sha info when one join a password protected group "
@@ -3798,7 +3756,7 @@
"SHA-info i gruppchattnärvaroinformation"
#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:247
#, fuzzy
msgid ""
"Controls the window where new messages are placed.\n"
@@ -3818,52 +3776,50 @@
"visas i ett specifikt fönster. OBS: Gajim måste startas om för att denna "
"inställning skall börja gälla."
-#: ../src/common/config.py:244
+#: ../src/common/config.py:248
#, fuzzy
msgid "If False, you will no longer see the avatar in the chat window."
msgstr "Of False kommer du inte längre att se avatarer i chattfönstret"
-#: ../src/common/config.py:245
+#: ../src/common/config.py:249
#, fuzzy
msgid "If True, pressing the escape key closes a tab/window."
msgstr "Om True kommer escape att stänga en tabb eller ett fönster"
-#: ../src/common/config.py:246
-#, fuzzy
+#: ../src/common/config.py:250
msgid "Hides the buttons in chat windows."
-msgstr "Gömmer knapparna i gruppchattfönstret"
+msgstr "Döljer knapparna i chattfönster."
-#: ../src/common/config.py:247
+#: ../src/common/config.py:251
msgid "Hides the banner in a group chat window"
-msgstr "Gömmer bannern i gruppchatfönstret"
+msgstr "Döljer bannern i ett gruppchattfönster"
-#: ../src/common/config.py:248
+#: ../src/common/config.py:252
msgid "Hides the banner in two persons chat window"
-msgstr "Gömmer bannern i tvåpersoners chattfönster"
+msgstr "Döljer bannern i chattfönster för två personer"
-#: ../src/common/config.py:249
-#, fuzzy
+#: ../src/common/config.py:253
msgid "Hides the group chat occupants list in group chat window."
-msgstr "Gömmer deltagarelistan i gruppchatfönstret"
+msgstr "Döljer deltagarlistan i gruppchattfönster."
-#: ../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."
msgstr ""
-"I en chatt, visa bara smeknamnet vid början av en rad om det inte är samma "
-"person som pratar som i förra meddelandet."
+"Visa endast smeknamnet, i en chatt, vid början av en rad om det inte är "
+"samma person som pratar som i förra meddelandet."
-#: ../src/common/config.py:251
+#: ../src/common/config.py:255
msgid "Indentation when using merge consecutive nickname."
msgstr ""
-#: ../src/common/config.py:252
+#: ../src/common/config.py:256
#, fuzzy
msgid "Smooth scroll message in conversation window"
msgstr "Skicka meddelande och stäng fönster"
-#: ../src/common/config.py:253
+#: ../src/common/config.py:257
#, fuzzy
msgid ""
"List of colors, separated by \":\", that will be used to color nicknames in "
@@ -3871,270 +3827,274 @@
msgstr ""
"Lista på färger som kommer användas för att färga smeknamnet i gruppchattar.<"
-#: ../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 går till nästa författningsflik när ingen är oläst."
+msgstr "Ctrl+Tabb går till nästa skrivflik när ingen är oläst."
-#: ../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."
msgstr ""
-#: ../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 ""
-#: ../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 ""
-#: ../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 ""
-#: ../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"
msgstr ""
-#: ../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 ""
-#: ../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 ""
-#: ../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 ""
-#: ../src/common/config.py:265
+#: ../src/common/config.py:269
msgid "Choose interval between 2 checks of idleness."
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 ""
-#: ../src/common/config.py:267
+#: ../src/common/config.py:271
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."
msgstr ""
-#: ../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 ""
-#: ../src/common/config.py:287
+#: ../src/common/config.py:291
msgid "If enabled, restore the last status that was used."
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 ""
-#: ../src/common/config.py:294
+#: ../src/common/config.py:298
msgid "Enable ESessions encryption for this account."
-msgstr ""
+msgstr "Aktivera ESessions-kryptering för detta konto."
-#: ../src/common/config.py:295
+#: ../src/common/config.py:299
msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr ""
+msgstr "Ska Gajim automatiskt starta en krypterad session när det är möjligt?"
-#: ../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 ""
-#: ../src/common/config.py:297
+#: ../src/common/config.py:301
msgid ""
"Show a warning dialog before sending password on an plaintext connection."
msgstr ""
+"Visa en varningsdialog innan lösenord skickas i klartext över en anslutning."
-#: ../src/common/config.py:298
+#: ../src/common/config.py:302
msgid "Show a warning dialog before using standard SSL library."
-msgstr ""
+msgstr "Visa en varningsdialog innan standard-SSL-biblioteket används."
-#: ../src/common/config.py:300
+#: ../src/common/config.py:304
msgid "Space separated list of ssl errors to ignore."
msgstr ""
-#: ../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 workaround"
+msgstr "Temporär lösning för 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."
msgstr ""
-"If ibockad kommer Gajim kommer gajim att använda ditt IP och proxies "
-"definerade i file_transfer_proxies under inställningar för filöverföringar."
+"Om kryssad så kommer Gajim att använda ditt IP och proxyservrar definerade i "
+"alternativet file_transfer_proxies för filöverföringar."
-#: ../src/common/config.py:334
+#: ../src/common/config.py:338
msgid "Answer to receipt requests"
msgstr ""
-#: ../src/common/config.py:335
+#: ../src/common/config.py:339
msgid "Sent receipt requests"
msgstr ""
-#: ../src/common/config.py:389
-#, fuzzy
+#: ../src/common/config.py:347
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:405
msgid "Is OpenPGP enabled for this contact?"
-msgstr "OpenPGP är inte användbart på den här datorn"
+msgstr "Är OpenPGP aktiverat för denna kontakt?"
-#: ../src/common/config.py:390
+#: ../src/common/config.py:406
msgid ""
"Should Gajim automatically start an encrypted session with this contact when "
"possible?"
msgstr ""
+"Ska Gajim automatiskt starta en krypterad session med denna kontakt om "
+"möjligt?"
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:407 ../src/common/config.py:410
msgid "Language for which we want to check misspelled words"
-msgstr "Språk för vilket vi vill titta efter felstavade ord"
+msgstr "Språket för vilket vi vill leta efter felstavade ord"
-#: ../src/common/config.py:400
+#: ../src/common/config.py:416
msgid "all or space separated status"
msgstr "alla eller mellanslagsseparerad status"
-#: ../src/common/config.py:401
+#: ../src/common/config.py:417
msgid "'yes', 'no', or 'both'"
-msgstr "\"yes\", \"no\" eller \"båda\""
+msgstr "\"yes\", \"no\" eller \"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:418 ../src/common/config.py:420
+#: ../src/common/config.py:421 ../src/common/config.py:424
+#: ../src/common/config.py:425
msgid "'yes', 'no' or ''"
msgstr "\"yes\", \"no\" eller \"\""
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:431 ../src/common/pep.py:159
msgid "Sleeping"
msgstr "Sover"
-#: ../src/common/config.py:416
+#: ../src/common/config.py:432
msgid "Back soon"
msgstr "Snart tillbaka"
-#: ../src/common/config.py:416
+#: ../src/common/config.py:432
msgid "Back in some minutes."
msgstr "Tillbaka om några minuter."
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:433 ../src/common/pep.py:129
msgid "Eating"
msgstr "Äter"
-#: ../src/common/config.py:417
+#: ../src/common/config.py:433
msgid "I'm eating, so leave me a message."
-msgstr "Jag äter, så lämna ett meddelande."
+msgstr "Jag äter, lämna ett meddelande."
-#: ../src/common/config.py:418
+#: ../src/common/config.py:434
msgid "Movie"
msgstr "Film"
-#: ../src/common/config.py:418
+#: ../src/common/config.py:434
msgid "I'm watching a movie."
msgstr "Jag tittar på film."
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:435 ../src/common/pep.py:188
msgid "Working"
msgstr "Arbetar"
-#: ../src/common/config.py:419
+#: ../src/common/config.py:435
msgid "I'm working."
msgstr "Jag arbetar."
-#: ../src/common/config.py:420
+#: ../src/common/config.py:436
msgid "Phone"
msgstr "Telefon"
-#: ../src/common/config.py:420
+#: ../src/common/config.py:436
msgid "I'm on the phone."
msgstr "Jag pratar i telefon."
-#: ../src/common/config.py:421
+#: ../src/common/config.py:437
msgid "Out"
msgstr "Ute"
-#: ../src/common/config.py:421
-#, fuzzy
+#: ../src/common/config.py:437
msgid "I'm out enjoying life."
msgstr "Jag är ute och njuter av livet."
-#: ../src/common/config.py:425
-#, fuzzy
+#: ../src/common/config.py:441
msgid "I'm available."
-msgstr "Tillgänglig"
+msgstr "Jag är tillgänglig."
-#: ../src/common/config.py:426
-#, fuzzy
+#: ../src/common/config.py:442
msgid "I'm free for chat."
-msgstr "Ledig för chatt"
+msgstr "Jag är ledig för chatt."
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:443 ../src/config.py:1404
msgid "Be right back."
msgstr "Strax tillbaka."
-#: ../src/common/config.py:428
-#, fuzzy
+#: ../src/common/config.py:444
msgid "I'm not available."
-msgstr "Tjänst är inte tillgänglig"
+msgstr "Jag är inte tillgänglig."
-#: ../src/common/config.py:429
+#: ../src/common/config.py:445
msgid "Do not disturb."
msgstr "Stör inte."
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:446 ../src/common/config.py:447
msgid "Bye!"
msgstr "Hejdå!"
-#: ../src/common/config.py:441
+#: ../src/common/config.py:457
#, fuzzy
msgid ""
"Sound to play when a group chat message contains one of the words in "
@@ -4143,464 +4103,507 @@
"Ljud att spela när MUC-meddelande innehåller ett av orden i "
"muc_highlight_words, eller när MUC-meddelande innehåller ditt smeknamn."
-#: ../src/common/config.py:442
+#: ../src/common/config.py:458
msgid "Sound to play when any MUC message arrives."
-msgstr "Ljud att spela när ett MUC-meddelande inkommer."
+msgstr "Ljud att spela upp när ett MUC-meddelande anländer."
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:467 ../src/common/optparser.py:235
msgid "green"
-msgstr "grön"
+msgstr "green"
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:471 ../src/common/optparser.py:221
msgid "grocery"
-msgstr "grönsaker"
+msgstr "grocery"
-#: ../src/common/config.py:459
+#: ../src/common/config.py:475
msgid "human"
-msgstr "mänsklig"
+msgstr "human"
-#: ../src/common/config.py:463
+#: ../src/common/config.py:479
msgid "marine"
-msgstr "marin"
+msgstr "marine"
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:74
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
msgid "Unable to load idle module"
-msgstr "Lyckades inte ladda tomgångsmodul"
+msgstr "Kunde inte läsa in idle-modul"
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
-#, fuzzy
+#: ../src/common/connection_handlers.py:236
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
msgid "Wrong host"
-msgstr "Fel Lösenfras"
+msgstr "Fel värd"
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:237
msgid "Invalid local address? :-O"
-msgstr ""
+msgstr "Ogiltig lokal adress? :-O"
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:670
#, python-format
msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registreringsinformation för transport %s har inte kommit fram i tid"
+msgstr "Registreringsinformation för transporten %s har inte kommit fram i tid"
-#: ../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:677
+msgid "Registration succeeded"
+msgstr "Registreringen lyckades"
+
+#: ../src/common/connection_handlers.py:678
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr "Registrering med agenten %s lyckades"
+
+#: ../src/common/connection_handlers.py:680
+msgid "Registration failed"
+msgstr "Registreringen misslyckades"
+
+#: ../src/common/connection_handlers.py:680
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+"Registrering med agenten %(agent)s misslyckades med fel %(error)s: %"
+"(error_msg)s"
+
+#: ../src/common/connection_handlers.py:968
+#: ../src/common/connection_handlers.py:1959
+#: ../src/common/connection_handlers.py:2005
+#: ../src/common/connection_handlers.py:2193
+#: ../src/common/connection_handlers.py:2326 ../src/common/connection.py:1342
+#: ../src/gajim.py:400
msgid "Disk Write Error"
msgstr ""
-#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
-#, fuzzy
+#: ../src/common/connection_handlers.py:1175 ../src/common/connection.py:917
msgid "Invisibility not supported"
-msgstr "Utökning stöds inte"
+msgstr "Osynlighet stöds inte"
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1176 ../src/common/connection.py:918
#, python-format
msgid "Account %s doesn't support invisibility."
+msgstr "Kontot %s saknar stöd för osynlighet."
+
+#: ../src/common/connection_handlers.py:1787 ../src/common/connection.py:1157
+#: ../src/config.py:1829 ../src/config.py:1837 ../src/config.py:1880
+#: ../src/config.py:3105 ../src/dataforms_widget.py:603 ../src/dialogs.py:2357
+msgid "Invalid Jabber ID"
+msgstr "Ogiltigt Jabber-ID"
+
+#: ../src/common/connection_handlers.py:1788
+msgid "A message from a non-valid JID arrived, it has been ignored."
msgstr ""
-#: ../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:1962
+#: ../src/common/connection_handlers.py:2008
+#: ../src/common/connection_handlers.py:2196
+#: ../src/common/connection_handlers.py:2329 ../src/common/connection.py:1345
+#: ../src/gajim.py:178
#, 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 ""
+"Databasfilen (%s) kan inte läsas. Försök att reparera den (se http://trac."
+"gajim.org/wiki/DatabaseBackup) eller ta bort den (alla historik kommer att "
+"förloras)."
-#: ../src/common/connection_handlers.py:1978
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2080
+#, python-format
msgid "Nickname not allowed: %s"
-msgstr "Smeknamnet kunde inte hittas: %s"
+msgstr "Smeknamnet tillåts inte: %s"
#. 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
-#, fuzzy
+#: ../src/common/connection_handlers.py:2155
+#: ../src/common/connection_handlers.py:2158
+#: ../src/common/connection_handlers.py:2161
+#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2168 ../src/gajim.py:548
msgid "Unable to join group chat"
-msgstr "Lyckades inte gå med i rummet"
+msgstr "Kunde inte gå in i gruppchatt"
-#: ../src/common/connection_handlers.py:2054
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2156
+#, python-format
msgid "You are banned from group chat %s."
-msgstr "Du är bannlyst från detta rummet."
+msgstr "Du är bannlyst från gruppchatten %s."
-#: ../src/common/connection_handlers.py:2057
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2159
+#, python-format
msgid "Group chat %s does not exist."
-msgstr "Det finns inget sådant rum."
+msgstr "Gruppchatten %s finns inte."
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2162
#, fuzzy
msgid "Group chat creation is restricted."
msgstr "Möjligheten att skapa rum är begränsad."
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2165
#, fuzzy, python-format
msgid "Your registered nickname must be used in group chat %s."
msgstr "Ditt registrerade smeknamn måste användas."
-#: ../src/common/connection_handlers.py:2067
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:2169
+#, python-format
msgid "You are not in the members list in groupchat %s."
-msgstr "Du är inte med i medlemslistan."
+msgstr "Du är inte med i medlemslistan i gruppchatten %s."
#. Room has been destroyed. see
#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2211
#, fuzzy
msgid "Room has been destroyed"
msgstr "Auktorisering har tagits bort"
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2218
#, python-format
msgid "You can join this room instead: %s"
-msgstr ""
+msgstr "Du kan gå in i detta rum istället: %s"
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2245
msgid "I would like to add you to my roster."
-msgstr "Jag skulle vilja lägga till dig i mitt register."
+msgstr "Jag skulle vilja lägga till dig i min kontaktlista."
#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2266
#, python-format
msgid "we are now subscribed to %s"
msgstr "vi prenumererar nu på %s"
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2268
#, python-format
msgid "unsubscribe request from %s"
msgstr "avprenumerationsförfrågan från %s"
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2270
#, python-format
msgid "we are now unsubscribed from %s"
msgstr "vi prenumererar inte längre på %s"
-#: ../src/common/connection_handlers.py:2343
+#: ../src/common/connection_handlers.py:2453
#, 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 följer inte RFC. Dt kommer inte att läggas till till ditt register. "
-"Använd registerhanteringsverktyg så som http://jru.jabberstudio.org/ för "
-"att ta bort det"
+"JID %s följer inte RFC-standarden. Det kommer inte att läggas till din "
+"kontaktlista. Använd kontakthanteringsverktyg såsom http://jru.jabberstudio."
+"org/ för att ta bort det"
#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2478
+#: ../src/common/zeroconf/connection_zeroconf.py:173
msgid "OpenPGP passphrase was not given"
msgstr "Lösenordsfras för OpenPGP angavs inte"
#. %s is the account name here
-#: ../src/common/connection_handlers.py:2370
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../src/common/connection_handlers.py:2480
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1935
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "Du kommer ansluta till %s utan OpenPGP."
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
msgid "Unable to get issuer certificate"
-msgstr ""
+msgstr "Kunde inte få tag på utfärdarens certifikat"
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
msgid "Unable to get certificate CRL"
-msgstr ""
+msgstr "Kunde inte få tag på certifikatspärrlista"
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
msgid "Unable to decrypt certificate's signature"
-msgstr ""
+msgstr "Kunde inte dekryptera certifikatets signatur"
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
msgid "Unable to decrypt CRL's signature"
-msgstr ""
+msgstr "Kunde inte dekryptera spärrlistans signatur"
-#: ../src/common/connection.py:70
-#, fuzzy
+#: ../src/common/connection.py:71
msgid "Unable to decode issuer public key"
-msgstr "Lyckades inte ladda tomgångsmodul"
+msgstr "Kunde inte avkoda utfärdarens publika nyckel"
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
msgid "Certificate signature failure"
-msgstr ""
+msgstr "Fel i certifikatsignatur"
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
msgid "CRL signature failure"
-msgstr ""
+msgstr "Fel i spärrlistans signatur"
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
msgid "Certificate is not yet valid"
-msgstr ""
+msgstr "Certifikatet är ännu inte giltigt"
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
msgid "Certificate has expired"
-msgstr ""
+msgstr "Certifikatet har gått ut"
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
msgid "CRL is not yet valid"
-msgstr ""
+msgstr "Spärrlistan är ännu inte giltig"
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
msgid "CRL has expired"
-msgstr ""
+msgstr "Spärrlistan har gått ut"
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
msgid "Format error in certificate's notBefore field"
-msgstr ""
+msgstr "Formateringsfel i certifikatets notBefore-fält"
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
msgid "Format error in certificate's notAfter field"
-msgstr ""
+msgstr "Formateringsfel i certifikatets notAfter-fält"
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
msgid "Format error in CRL's lastUpdate field"
-msgstr ""
+msgstr "Formateringsfel i spärrlistans lastUpdate-fält"
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
msgid "Format error in CRL's nextUpdate field"
-msgstr ""
+msgstr "Formateringsfel i spärrlistans nextUpdate-fält"
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
msgid "Out of memory"
-msgstr ""
+msgstr "Slut på minne"
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
msgid "Self signed certificate"
-msgstr ""
+msgstr "Självsignerat certifikat"
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
msgid "Self signed certificate in certificate chain"
-msgstr ""
+msgstr "Självsignerat certifikat i certifikatkedja"
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
msgid "Unable to get local issuer certificate"
msgstr ""
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
msgid "Unable to verify the first certificate"
-msgstr ""
+msgstr "Kunde inte verifiera det första certifikatet"
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
msgid "Certificate chain too long"
-msgstr ""
+msgstr "Certifikatkedjan är för lång"
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
msgid "Certificate revoked"
-msgstr ""
+msgstr "Certifikatet spärrat"
-#: ../src/common/connection.py:88
-#, fuzzy
+#: ../src/common/connection.py:89
msgid "Invalid CA certificate"
-msgstr "Ogiltigt användarnamn"
+msgstr "Ogiltigt CA-certifikat"
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
msgid "Path length constraint exceeded"
msgstr ""
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
msgid "Unsupported certificate purpose"
msgstr ""
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
msgid "Certificate not trusted"
-msgstr ""
+msgstr "Certifikatet är inte pålitligt"
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
msgid "Certificate rejected"
-msgstr ""
+msgstr "Certifikatet nekades"
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
msgid "Subject issuer mismatch"
msgstr ""
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
msgid "Authority and subject key identifier mismatch"
msgstr ""
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
msgid "Authority and issuer serial number mismatch"
msgstr ""
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
msgid "Key usage does not include certificate signing"
-msgstr ""
+msgstr "Nyckelanvändning inkluderar inte certifikatsignering"
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
msgid "Application verification failure"
msgstr ""
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:271
+#: ../src/common/zeroconf/connection_zeroconf.py:215
#, python-format
msgid "Connection with account \"%s\" has been lost"
msgstr "Anslutningen med konto \"%s\" har brutits"
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:272
msgid "Reconnect manually."
msgstr "Återanslut manuellt."
-#: ../src/common/connection.py:278
-#, fuzzy, python-format
+#: ../src/common/connection.py:283
+#, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr "Transporten %s svarade felaktigt på en registreringsbegäran."
+msgstr ""
+"Servern %(name)s svarade felaktigt på en registreringsbegäran: %(error)s"
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:317
#, python-format
msgid "Server %s provided a different registration form"
-msgstr ""
+msgstr "Servern %s tillhandahöll ett annat registreringsformulär"
-#: ../src/common/connection.py:325
-#, fuzzy, python-format
+#: ../src/common/connection.py:330
+#, python-format
msgid "Unknown SSL error: %d"
-msgstr "Okänd D-Busversion: %s"
+msgstr "Okänt SSL-fel: %d"
#. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:345
msgid "Invalid answer"
msgstr "Ogiltigt lösenord"
-#: ../src/common/connection.py:341
-#, fuzzy, python-format
+#: ../src/common/connection.py:346
+#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
-msgstr "Transporten %s svarade felaktigt på en registreringsbegäran."
+msgstr ""
+"Transporten %(name)s svarade felaktigt på en registreringsbegäran: %(error)s"
-#: ../src/common/connection.py:522
-#, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Förbindelse"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../src/common/connection.py:629 ../src/common/connection.py:755
+#: ../src/common/connection.py:1478
+#: ../src/common/zeroconf/connection_zeroconf.py:249
#, python-format
msgid "Could not connect to \"%s\""
msgstr "Kunde inte ansluta till \"%s\""
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:630 ../src/gajim.py:1094
msgid "Check your connection or try again later."
-msgstr "Kontrollera din förbindelse eller försök igen senare."
+msgstr "Kontrollera din anslutning eller försök igen senare."
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:635
#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Sparad i: %s"
+
+#: ../src/common/connection.py:648
+msgid "Connection to proxy failed"
+msgstr "Anslutning till proxyservern misslyckades"
+
+#: ../src/common/connection.py:679 ../src/common/connection.py:735
+#, python-format
msgid "Could not connect to account %s"
-msgstr "Kunde inte ansluta till \"%s\""
+msgstr "Kunde inte ansluta till kontot %s"
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
-#, fuzzy, python-format
+#: ../src/common/connection.py:680 ../src/common/connection.py:736
+#, python-format
msgid "Connection with account %s has been lost. Retry connecting."
-msgstr "Anslutningen med konto \"%s\" har brutits"
+msgstr "Anslutningen med kontot \"%s\" har förlorats. Försök att ansluta igen."
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:702
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
msgstr ""
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:705
#, python-format
msgid ""
"\n"
"SSL Error: <b>%s</b>"
msgstr ""
+"\n"
+"SSL-fel: <b>%s</b>"
-#: ../src/common/connection.py:671
-#, fuzzy, python-format
+#: ../src/common/connection.py:707
+#, python-format
msgid ""
"\n"
"Unknown SSL error: %d"
-msgstr "Okänd D-Busversion: %s"
+msgstr ""
+"\n"
+"Okänt SSL-fel: %d"
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:756
msgid "Check your connection or try again later"
-msgstr "Kontrollera din förbindelse eller försök igen"
+msgstr "Kontrollera din anslutning eller försök igen senare"
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:781
#, python-format
msgid "Authentication failed with \"%s\""
-msgstr "Inloggning misslyckades med \"%s\""
+msgstr "Autentisering mot \"%s\" misslyckades"
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:783
msgid "Please check your login and password for correctness."
msgstr "Kontrollera ditt inloggningsnamn och lösenord."
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:844
#, fuzzy
msgid "Error while removing privacy list"
msgstr "problem vid sändning %s ( %s )"
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:845
#, 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 ""
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../src/common/connection.py:1158 ../src/dialogs.py:2358
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Det är inte möjligt att skicka tomma filer"
+
+#: ../src/common/connection.py:1180
+#: ../src/common/zeroconf/connection_zeroconf.py:389
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:1182
+#: ../src/common/zeroconf/connection_zeroconf.py:391
#, python-format
msgid "The contact's key (%s) does not match the key assigned in Gajim."
msgstr ""
#. we're not english
#. one in locale and one en
-#: ../src/common/connection.py:1105
-#, fuzzy
+#: ../src/common/connection.py:1230
msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[Det här meddelandet är krypterat]"
+msgstr "[Detta meddelande är *krypterat* (Se :XEP:`27`]"
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
-#, fuzzy, python-format
+#: ../src/common/connection.py:1332
+#: ../src/common/zeroconf/connection_zeroconf.py:468
+#, python-format
msgid ""
"Subject: %(subject)s\n"
"%(message)s"
msgstr ""
-"Ämne: %s\n"
-"%s"
+"Ämne: %(subject)s\n"
+"%(message)s"
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1511 ../src/common/connection.py:1532
msgid "Not fetched because of invisible status"
msgstr "Inte hämtad på grund av osynlig status"
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:56
+#: ../src/gajim.py:999
msgid "Observers"
msgstr "Observerande"
#: ../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/common/helpers.py:56 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1350 ../src/gajim.py:812 ../src/roster_window.py:814
+#: ../src/roster_window.py:1468 ../src/roster_window.py:1537
+#: ../src/roster_window.py:1539 ../src/roster_window.py:1688
msgid "Transports"
msgstr "Transporter"
#: ../src/common/contacts.py:356
-#, fuzzy
msgid "Not in roster"
-msgstr "Inte i registret"
+msgstr "Inte i kontaktlista"
#. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:49
msgid "D-Bus python bindings are missing in this computer"
msgstr "D-Bus python-bindningar saknas på den här datorn"
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:50
msgid "D-Bus capabilities of Gajim cannot be used"
msgstr "Gajims D-Bus-egenskaper kan inte användas"
@@ -4609,9 +4612,8 @@
msgstr "pysqlite2- (aka python-pysqlite2) beroende saknas. Stänger av..."
#: ../src/common/exceptions.py:47
-#, fuzzy
msgid "Database cannot be read."
-msgstr "Kontonamnet kan inte vara tomt."
+msgstr "Databasen kan inte läsas."
#: ../src/common/exceptions.py:55
msgid "Service not available: Gajim is not running, or remote_control is False"
@@ -4631,56 +4633,48 @@
"Läs http://trac.gajim.org/wiki/GajimDBus för hjälp"
#: ../src/common/fuzzyclock.py:42
-#, fuzzy
msgid "one"
-msgstr "Ingen"
+msgstr "ett"
#: ../src/common/fuzzyclock.py:42
-#, fuzzy
msgid "two"
-msgstr "vem"
+msgstr "två"
#: ../src/common/fuzzyclock.py:42
-#, fuzzy
msgid "three"
-msgstr "Gatuadress:"
+msgstr "tre"
#: ../src/common/fuzzyclock.py:42
-#, fuzzy
msgid "four"
-msgstr "Port: "
+msgstr "fyra"
#: ../src/common/fuzzyclock.py:42
-#, fuzzy
msgid "five"
-msgstr "fil"
+msgstr "fem"
#: ../src/common/fuzzyclock.py:42
msgid "six"
msgstr "sex"
#: ../src/common/fuzzyclock.py:43
-#, fuzzy
msgid "seven"
-msgstr "Händelse"
+msgstr "sju"
#: ../src/common/fuzzyclock.py:43
msgid "eight"
msgstr "åtta"
#: ../src/common/fuzzyclock.py:43
-#, fuzzy
msgid "nine"
-msgstr "_Fortsätt"
+msgstr "nio"
#: ../src/common/fuzzyclock.py:43
msgid "ten"
msgstr "tio"
#: ../src/common/fuzzyclock.py:43
-#, fuzzy
msgid "eleven"
-msgstr "Radera"
+msgstr "elva"
#: ../src/common/fuzzyclock.py:44
msgid "twelve"
@@ -4697,9 +4691,8 @@
msgstr "fem över $0"
#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-#, fuzzy
msgid "ten past $0"
-msgstr "Registrera till %s"
+msgstr "tio i $0"
#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
msgid "quarter past $0"
@@ -4718,29 +4711,24 @@
msgstr "halv $1"
#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-#, fuzzy
msgid "twenty five to $1"
-msgstr "Registrera till %s"
+msgstr "fem över halv $1"
#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-#, fuzzy
msgid "twenty to $1"
-msgstr "Registrera till %s"
+msgstr "tjugo i $1"
#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-#, fuzzy
msgid "quarter to $1"
-msgstr "Registrera till %s"
+msgstr "kvart i $1"
#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-#, fuzzy
msgid "ten to $1"
-msgstr "Registrera till %s"
+msgstr "tio i $1"
#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-#, fuzzy
msgid "five to $1"
-msgstr "Registrera till %s"
+msgstr "fem i $1"
#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
msgid "$1 o'clock"
@@ -4755,27 +4743,24 @@
msgstr "Tidig morgon"
#: ../src/common/fuzzyclock.py:64
-#, fuzzy
msgid "Morning"
-msgstr "Arbetar"
+msgstr "Morgon"
#: ../src/common/fuzzyclock.py:64
msgid "Almost noon"
-msgstr ""
+msgstr "Nästan mitt på dagen"
#: ../src/common/fuzzyclock.py:65
-#, fuzzy
msgid "Noon"
-msgstr "Ingen"
+msgstr "Mitt på dagen"
#: ../src/common/fuzzyclock.py:65
msgid "Afternoon"
msgstr "Eftermiddag"
#: ../src/common/fuzzyclock.py:65
-#, fuzzy
msgid "Evening"
-msgstr "Händelse"
+msgstr "Kväll"
#: ../src/common/fuzzyclock.py:65
msgid "Late evening"
@@ -4797,636 +4782,599 @@
msgid "Weekend!"
msgstr "Helg!"
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:141
msgid "Invalid character in username."
msgstr "Ogiltigt tecken i användarnamn"
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:146
msgid "Server address required."
msgstr "Serveradress krävs."
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:152
msgid "Invalid character in hostname."
msgstr "Ogiltigt tecken i värdnamn."
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:159
msgid "Invalid character in resource."
msgstr "Ogiltigt tecken i resurs."
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:191
msgid "_Busy"
msgstr "_Upptagen"
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:193
msgid "Busy"
msgstr "Upptagen"
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:196
msgid "_Not Available"
msgstr "_Inte tillgänglig"
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:201
msgid "_Free for Chat"
msgstr "_Ledig för chatt"
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:203
msgid "Free for Chat"
msgstr "Ledig för chatt"
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:206
msgid "_Available"
msgstr "_Tillgänglig"
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:208 ../src/features_window.py:115
msgid "Available"
msgstr "Tillgänglig"
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:210
msgid "Connecting"
-msgstr "Upprättar förbindelse"
+msgstr "Ansluter"
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:213
msgid "A_way"
-msgstr "_Borta"
+msgstr "Fr_ånvarande"
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:218
msgid "_Offline"
msgstr "_Frånkopplad"
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:220
msgid "Offline"
msgstr "Frånkopplad"
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:223
msgid "_Invisible"
msgstr "_Osynlig"
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:229
msgid "?contact has status:Unknown"
msgstr "?kontakt har status:Okänd"
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:231
msgid "?contact has status:Has errors"
msgstr "?kontakt har status:Har fel"
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:236
msgid "?Subscription we already have:None"
msgstr "?Prenumeration vi redan har:Ingen"
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:238
msgid "To"
msgstr "Till"
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:242
msgid "Both"
msgstr "Båda"
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:250
msgid "?Ask (for Subscription):None"
msgstr "?Fråga (för prenumeration):Ingen"
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:252
msgid "Subscribe"
msgstr "Prenumerera"
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:261
msgid "?Group Chat Contact Role:None"
msgstr "?Gruppchatt kontaktroll:Ingen"
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:264
msgid "Moderators"
msgstr "Moderatorer"
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:266
msgid "Moderator"
msgstr "Moderator"
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:269
msgid "Participants"
msgstr "Deltagare"
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:271
msgid "Participant"
msgstr "Deltagare"
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:274
msgid "Visitors"
msgstr "Besökare"
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:276
msgid "Visitor"
msgstr "Besökare"
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:282
#, fuzzy
msgid "?Group Chat Contact Affiliation:None"
msgstr "?Gruppchatt kontaktroll:Ingen"
-#: ../src/common/helpers.py:360
-#, fuzzy
+#: ../src/common/helpers.py:284
msgid "Owner"
-msgstr "_Ägare"
+msgstr "Ägare"
-#: ../src/common/helpers.py:362
-#, fuzzy
+#: ../src/common/helpers.py:286
msgid "Administrator"
-msgstr "_Administratör"
+msgstr "Administratör"
-#: ../src/common/helpers.py:364
-#, fuzzy
+#: ../src/common/helpers.py:288
msgid "Member"
-msgstr "_Medlem"
+msgstr "Medlem"
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:325
msgid "is paying attention to the conversation"
msgstr "uppmärksammar konversationen"
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:327
msgid "is doing something else"
msgstr "gör något annat"
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:329
msgid "is composing a message..."
msgstr "skriver ett meddelande..."
#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:332
msgid "paused composing a message"
msgstr "tog en paus i skrivandet"
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:334
msgid "has closed the chat window or tab"
msgstr "har stängt chattfönstret eller fliken"
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
-#, fuzzy, python-format
+#. GiB means gibibyte
+#: ../src/common/helpers.py:662
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:665
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:669
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:672
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:676
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:679
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:682
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1089 ../src/common/helpers.py:1096
+#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
-msgstr[0] "Skicka meddelande"
-msgstr[1] "Skicka meddelande"
+msgstr[0] "%d meddelande väntar"
+msgstr[1] "%d meddelanden väntar"
-#: ../src/common/helpers.py:1005
-#, fuzzy, python-format
+#: ../src/common/helpers.py:1102
+#, python-format
msgid " from room %s"
-msgstr "Från %s"
+msgstr " från rummet %s"
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
-#, fuzzy, python-format
+#: ../src/common/helpers.py:1105 ../src/common/helpers.py:1124
+#, python-format
msgid " from user %s"
-msgstr "Från %s"
+msgstr " från användaren %s"
-#: ../src/common/helpers.py:1010
-#, fuzzy, python-format
+#: ../src/common/helpers.py:1107
+#, python-format
msgid " from %s"
-msgstr "Från %s"
+msgstr " från %s"
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1114 ../src/common/helpers.py:1121
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d väntande händelse"
+msgstr[1] "%d väntande händelser"
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1154
#, python-format
msgid "Gajim - %s"
msgstr "Gajim - %s"
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Fel vid körning av \"%(command)s\": %(error)s"
+
#. we talk about a file
#: ../src/common/optparser.py:56
#, python-format
msgid "error: cannot open %s for reading"
msgstr "fel: kan inte öppna %s för läsning"
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:230 ../src/common/optparser.py:231
msgid "cyan"
msgstr "cyan"
-#: ../src/common/optparser.py:341
-#, fuzzy
+#: ../src/common/optparser.py:347
msgid "migrating logs database to indices"
-msgstr "skapar logdatabas"
+msgstr "migrerar loggdatabas till index"
-#: ../src/common/passwords.py:92
-#, fuzzy, python-format
-msgid "Gajim account %s"
-msgstr "för konto %s"
+#: ../src/common/passwords.py:117
+#, python-format
+msgid "XMPP account %s@%s"
+msgstr "XMPP-kontot %s@%s"
#: ../src/common/pep.py:29
msgid "Afraid"
-msgstr ""
+msgstr "Rädd"
#: ../src/common/pep.py:30
msgid "Amazed"
-msgstr ""
+msgstr "Förvånad"
#: ../src/common/pep.py:31
msgid "Amorous"
-msgstr ""
+msgstr "Kärleksfull"
#: ../src/common/pep.py:32
msgid "Angry"
-msgstr ""
+msgstr "Arg"
#: ../src/common/pep.py:33
msgid "Annoyed"
-msgstr ""
+msgstr "Irriterad"
#: ../src/common/pep.py:34
msgid "Anxious"
-msgstr ""
+msgstr "Ängslig"
#: ../src/common/pep.py:35
-#, fuzzy
msgid "Aroused"
-msgstr "Pausad"
+msgstr "Intresserad"
#: ../src/common/pep.py:36
msgid "Ashamed"
-msgstr ""
+msgstr "Skamsen"
#: ../src/common/pep.py:37
-#, fuzzy
msgid "Bored"
-msgstr "Fetstil"
+msgstr "Uttråkad"
#: ../src/common/pep.py:38
-#, fuzzy
msgid "Brave"
-msgstr "Har "
+msgstr "Modig"
#: ../src/common/pep.py:39
msgid "Calm"
-msgstr ""
+msgstr "Lugn"
#: ../src/common/pep.py:40
-#, fuzzy
msgid "Cautious"
-msgstr "Chattar"
+msgstr "Försiktig"
#: ../src/common/pep.py:41
-#, fuzzy
msgid "Cold"
-msgstr "Fetstil"
+msgstr "Kall"
#: ../src/common/pep.py:42
-#, fuzzy
msgid "Confident"
-msgstr "_Innehåll"
+msgstr "Självsäker"
#: ../src/common/pep.py:43
msgid "Confused"
-msgstr ""
+msgstr "Förvirrad"
#: ../src/common/pep.py:44
-#, fuzzy
msgid "Contemplative"
-msgstr "Färdig"
+msgstr "Kontemplativ"
#: ../src/common/pep.py:45
-#, fuzzy
msgid "Contented"
-msgstr "_Innehåll"
+msgstr "Utmanad"
#: ../src/common/pep.py:46
msgid "Cranky"
-msgstr ""
+msgstr "Excentrisk"
#: ../src/common/pep.py:47
msgid "Crazy"
-msgstr ""
+msgstr "Galen"
#: ../src/common/pep.py:48
-#, fuzzy
msgid "Creative"
-msgstr "Inaktiverad"
+msgstr "Kreativ"
#: ../src/common/pep.py:49
-#, fuzzy
msgid "Curious"
-msgstr "_Föregående"
+msgstr "Nyfiken"
#: ../src/common/pep.py:50
-#, fuzzy
msgid "Dejected"
-msgstr "Radera"
+msgstr "Bedrövad"
#: ../src/common/pep.py:51
msgid "Depressed"
-msgstr ""
+msgstr "Deprimerad"
#: ../src/common/pep.py:52
-#, fuzzy
msgid "Disappointed"
-msgstr "Avstängd"
+msgstr "Besviken"
#: ../src/common/pep.py:53
msgid "Disgusted"
-msgstr ""
+msgstr "Äcklad"
#: ../src/common/pep.py:54
-#, fuzzy
msgid "Dismayed"
-msgstr "Avstängd"
+msgstr "Förskräckt"
#: ../src/common/pep.py:55
-#, fuzzy
msgid "Distracted"
-msgstr "Avstängd"
+msgstr "Distraherad"
#: ../src/common/pep.py:56
msgid "Embarrassed"
-msgstr ""
+msgstr "Besvärad"
#: ../src/common/pep.py:57
-#, fuzzy
msgid "Envious"
-msgstr "_Föregående"
+msgstr "Avundsjuk"
#: ../src/common/pep.py:58
-#, fuzzy
msgid "Excited"
-msgstr "Aktiverad"
+msgstr "Upphetsad"
#: ../src/common/pep.py:59
msgid "Flirtatious"
-msgstr ""
+msgstr "Flirtig"
#: ../src/common/pep.py:60
msgid "Frustrated"
-msgstr ""
+msgstr "Frustrerad"
#: ../src/common/pep.py:61
msgid "Grateful"
-msgstr ""
+msgstr "Tacksam"
#: ../src/common/pep.py:62
msgid "Grieving"
-msgstr ""
+msgstr "Sörjer"
#: ../src/common/pep.py:63
-#, fuzzy
msgid "Grumpy"
-msgstr "Grupp"
+msgstr "Grinig"
#: ../src/common/pep.py:64
msgid "Guilty"
-msgstr ""
+msgstr "Skyldig"
#: ../src/common/pep.py:65
msgid "Happy"
-msgstr ""
+msgstr "Glad"
#: ../src/common/pep.py:66
msgid "Hopeful"
-msgstr ""
+msgstr "Hoppfull"
#: ../src/common/pep.py:67
-#, fuzzy
msgid "Hot"
-msgstr "_Värd:"
+msgstr "Het"
#: ../src/common/pep.py:68
msgid "Humbled"
-msgstr ""
+msgstr "Spak"
#: ../src/common/pep.py:69
msgid "Humiliated"
-msgstr ""
+msgstr "Förödmjukad"
#: ../src/common/pep.py:70
msgid "Hungry"
-msgstr ""
+msgstr "Hungrig"
#: ../src/common/pep.py:71
msgid "Hurt"
-msgstr ""
+msgstr "Sårad"
#: ../src/common/pep.py:72
-#, fuzzy
msgid "Impressed"
-msgstr "meddelande"
+msgstr "Imponerad"
#: ../src/common/pep.py:73
msgid "In Awe"
-msgstr ""
+msgstr "Respektfull"
#: ../src/common/pep.py:74
msgid "In Love"
-msgstr ""
+msgstr "Kär"
#: ../src/common/pep.py:75
msgid "Indignant"
-msgstr ""
+msgstr "Upprörd"
#: ../src/common/pep.py:76
msgid "Interested"
-msgstr ""
+msgstr "Intresserad"
#: ../src/common/pep.py:77
-#, fuzzy
msgid "Intoxicated"
-msgstr "Aktiverad"
+msgstr "Berusad"
#: ../src/common/pep.py:78
-#, fuzzy
msgid "Invincible"
-msgstr "Osynlig"
+msgstr "Oövervinnelig"
#: ../src/common/pep.py:79
msgid "Jealous"
-msgstr ""
+msgstr "Avundsjuk"
#: ../src/common/pep.py:80
-#, fuzzy
msgid "Lonely"
-msgstr "Ingen"
+msgstr "Ensam"
#: ../src/common/pep.py:81
-#, fuzzy
msgid "Lost"
-msgstr "_Värd:"
+msgstr "Förlorad"
#: ../src/common/pep.py:82
msgid "Lucky"
-msgstr ""
+msgstr "Lycklig"
#: ../src/common/pep.py:83
-#, fuzzy
msgid "Mean"
-msgstr "tyska"
+msgstr "Elak"
#: ../src/common/pep.py:84
-#, fuzzy
msgid "Moody"
-msgstr "_Modifiera"
+msgstr "Lynnig"
#: ../src/common/pep.py:85
-#, fuzzy
msgid "Nervous"
-msgstr "_Föregående"
+msgstr "Nervös"
#: ../src/common/pep.py:86
msgid "Neutral"
-msgstr ""
+msgstr "Neutral"
#: ../src/common/pep.py:87
-#, fuzzy
msgid "Offended"
-msgstr "Frånkopplad"
+msgstr "Förolämpad"
#: ../src/common/pep.py:88
msgid "Outraged"
-msgstr ""
+msgstr "Rasande"
#: ../src/common/pep.py:89
msgid "Playful"
-msgstr ""
+msgstr "Lekfull"
#: ../src/common/pep.py:90
-#, fuzzy
msgid "Proud"
-msgstr "Grupp"
+msgstr "Stolt"
#: ../src/common/pep.py:91
msgid "Relaxed"
-msgstr ""
+msgstr "Avslappnad"
#: ../src/common/pep.py:92
-#, fuzzy
msgid "Relieved"
-msgstr "Radera"
+msgstr "Lättad"
#: ../src/common/pep.py:93
msgid "Remorseful"
-msgstr ""
+msgstr "Ångerfull"
#: ../src/common/pep.py:94
msgid "Restless"
-msgstr ""
+msgstr "Rastlös"
#: ../src/common/pep.py:95
-#, fuzzy
msgid "Sad"
-msgstr "Avstannad"
+msgstr "Ledsen"
#: ../src/common/pep.py:96
msgid "Sarcastic"
-msgstr ""
+msgstr "Sarkastisk"
#: ../src/common/pep.py:97
-#, fuzzy
msgid "Satisfied"
-msgstr "Senast ändrad:"
+msgstr "Nöjd"
#: ../src/common/pep.py:98
-#, fuzzy
msgid "Serious"
-msgstr "_Föregående"
+msgstr "Seriös"
#: ../src/common/pep.py:99
msgid "Shocked"
-msgstr ""
+msgstr "Chockad"
#: ../src/common/pep.py:100
msgid "Shy"
-msgstr ""
+msgstr "Blyg"
#: ../src/common/pep.py:101
-#, fuzzy
msgid "Sick"
-msgstr "Smeknamn"
+msgstr "Sjuk"
#: ../src/common/pep.py:102
-#, fuzzy
msgid "Sleepy"
-msgstr "Sover"
+msgstr "Sömning"
#: ../src/common/pep.py:103
msgid "Spontaneous"
-msgstr ""
+msgstr "Spontan"
#: ../src/common/pep.py:104
-#, fuzzy
msgid "Stressed"
-msgstr "Gatuadress:"
+msgstr "Stressad"
#: ../src/common/pep.py:105
msgid "Strong"
-msgstr ""
+msgstr "Stark"
#: ../src/common/pep.py:106
-#, fuzzy
msgid "Surprised"
-msgstr "Prenumerera"
+msgstr "Överraskad"
#: ../src/common/pep.py:107
msgid "Thankful"
-msgstr ""
+msgstr "Tacksam"
#: ../src/common/pep.py:108
msgid "Thirsty"
-msgstr ""
+msgstr "Törstig"
#: ../src/common/pep.py:109
-#, fuzzy
msgid "Tired"
-msgstr "Tid"
+msgstr "Trött"
#: ../src/common/pep.py:110
-#, fuzzy
msgid "Undefined"
-msgstr "Understrykning"
+msgstr "Odefinierad"
#: ../src/common/pep.py:111
msgid "Weak"
-msgstr ""
+msgstr "Svag"
#: ../src/common/pep.py:112
msgid "Worried"
-msgstr ""
+msgstr "Bekymrad"
#: ../src/common/pep.py:115
#, fuzzy
@@ -5435,89 +5383,83 @@
#: ../src/common/pep.py:116
msgid "Buying Groceries"
-msgstr ""
+msgstr "Handlar mat"
#: ../src/common/pep.py:117
-#, fuzzy
msgid "Cleaning"
-msgstr "Händelse"
+msgstr "Städar"
#: ../src/common/pep.py:118
-#, fuzzy
msgid "Cooking"
-msgstr "Skriver"
+msgstr "Lagar mat"
#: ../src/common/pep.py:119
msgid "Doing Maintenance"
-msgstr ""
+msgstr "Reparerar"
#: ../src/common/pep.py:120
msgid "Doing the Dishes"
-msgstr ""
+msgstr "Diskar"
#: ../src/common/pep.py:121
msgid "Doing the Laundry"
-msgstr ""
+msgstr "Tvättar"
#: ../src/common/pep.py:122
-#, fuzzy
msgid "Gardening"
-msgstr "Arbetar"
+msgstr "Arbetar i trädgården"
#: ../src/common/pep.py:123
msgid "Running an Errand"
-msgstr ""
+msgstr "Springer ett ärende"
#: ../src/common/pep.py:124
-#, fuzzy
msgid "Walking the Dog"
-msgstr "alla i gruppen"
+msgstr "Ute och går med hunden"
#: ../src/common/pep.py:125
-#, fuzzy
msgid "Drinking"
-msgstr "Arbetar"
+msgstr "Dricker"
#: ../src/common/pep.py:126
msgid "Having a Beer"
-msgstr ""
+msgstr "Tar en öl"
#: ../src/common/pep.py:127
msgid "Having Coffee"
-msgstr ""
+msgstr "Dricker kaffe"
#: ../src/common/pep.py:128
msgid "Having Tea"
-msgstr ""
+msgstr "Dricker te"
#: ../src/common/pep.py:130
msgid "Having a Snack"
-msgstr ""
+msgstr "Tar ett mellanmål"
#: ../src/common/pep.py:131
msgid "Having Breakfast"
-msgstr ""
+msgstr "Äter frukost"
#: ../src/common/pep.py:132
msgid "Having Dinner"
-msgstr ""
+msgstr "Äter middag"
#: ../src/common/pep.py:133
msgid "Having Lunch"
-msgstr ""
+msgstr "Äter lunch"
#: ../src/common/pep.py:134
msgid "Exercising"
-msgstr ""
+msgstr "Tränar"
#: ../src/common/pep.py:135 ../src/common/pep.py:180
msgid "Cycling"
-msgstr ""
+msgstr "Cyklar"
#: ../src/common/pep.py:136
-#, fuzzy
msgid "Dancing"
-msgstr "Händelse"
+msgstr "Dansar"
#: ../src/common/pep.py:137
#, fuzzy
@@ -5525,31 +5467,28 @@
msgstr "Sparkar %s"
#: ../src/common/pep.py:138
-#, fuzzy
msgid "Jogging"
-msgstr "_Gå in i"
+msgstr "Joggar"
#: ../src/common/pep.py:139
msgid "Playing Sports"
-msgstr ""
+msgstr "Sportar"
#: ../src/common/pep.py:140
msgid "Running"
-msgstr ""
+msgstr "Springer"
#: ../src/common/pep.py:141
-#, fuzzy
msgid "Skiing"
-msgstr "Arbetar"
+msgstr "Åker skidor"
#: ../src/common/pep.py:142
msgid "Swimming"
-msgstr ""
+msgstr "Simmar"
#: ../src/common/pep.py:143
-#, fuzzy
msgid "Working out"
-msgstr "Arbetar"
+msgstr "Tränar"
#: ../src/common/pep.py:144
#, fuzzy
@@ -5558,212 +5497,187 @@
#: ../src/common/pep.py:145
msgid "At the Spa"
-msgstr ""
+msgstr "Njuter på ett spa"
#: ../src/common/pep.py:146
msgid "Brushing Teeth"
-msgstr ""
+msgstr "Borstar tänderna"
#: ../src/common/pep.py:147
msgid "Getting a Haircut"
-msgstr ""
+msgstr "Är hos frissan"
#: ../src/common/pep.py:148
-#, fuzzy
msgid "Shaving"
-msgstr "Äter"
+msgstr "Rakar sig"
#: ../src/common/pep.py:149
msgid "Taking a Bath"
-msgstr ""
+msgstr "Tar ett bad"
#: ../src/common/pep.py:150
msgid "Taking a Shower"
-msgstr ""
+msgstr "Tar en dusch"
#: ../src/common/pep.py:151
msgid "Having an Appointment"
-msgstr ""
+msgstr "I ett möte"
#: ../src/common/pep.py:153
msgid "Day Off"
-msgstr ""
+msgstr "Har en ledig dag"
#: ../src/common/pep.py:154
-#, fuzzy
msgid "Hanging out"
-msgstr "Ändrar Ämne"
+msgstr "Hänger"
#: ../src/common/pep.py:155
-#, fuzzy
msgid "Hiding"
-msgstr "Sparkar %s"
+msgstr "Gömmer sig"
#: ../src/common/pep.py:156
msgid "On Vacation"
-msgstr ""
+msgstr "På semester"
#: ../src/common/pep.py:157
-#, fuzzy
msgid "Praying"
-msgstr "Äter"
+msgstr "Ber"
#: ../src/common/pep.py:158
msgid "Scheduled Holiday"
-msgstr ""
+msgstr "Planerad ledighet"
#: ../src/common/pep.py:160
-#, fuzzy
msgid "Thinking"
-msgstr "Arbetar"
+msgstr "Tänker"
#: ../src/common/pep.py:161
-#, fuzzy
msgid "Relaxing"
-msgstr "enkel"
+msgstr "Slappar"
#: ../src/common/pep.py:162
-#, fuzzy
msgid "Fishing"
-msgstr "Sparkar %s"
+msgstr "Fiskar"
#: ../src/common/pep.py:163
-#, fuzzy
msgid "Gaming"
-msgstr "Äter"
+msgstr "Spelar"
#: ../src/common/pep.py:164
-#, fuzzy
msgid "Going out"
-msgstr "Loggar _ut"
+msgstr "Går ut"
#: ../src/common/pep.py:165
-#, fuzzy
msgid "Partying"
-msgstr "Äter"
+msgstr "Festar"
#: ../src/common/pep.py:166
-#, fuzzy
msgid "Reading"
-msgstr "Anledning"
+msgstr "Läser"
#: ../src/common/pep.py:167
-#, fuzzy
msgid "Rehearsing"
-msgstr "Anledning"
+msgstr "Pluggar"
#: ../src/common/pep.py:168
-#, fuzzy
msgid "Shopping"
-msgstr "Sover"
+msgstr "Handlar"
#: ../src/common/pep.py:169
-#, fuzzy
msgid "Smoking"
-msgstr "Arbetar"
+msgstr "Röker"
#: ../src/common/pep.py:170
msgid "Socializing"
-msgstr ""
+msgstr "Minglar"
#: ../src/common/pep.py:171
-#, fuzzy
msgid "Sunbathing"
-msgstr "Äter"
+msgstr "Solar"
#: ../src/common/pep.py:172
msgid "Watching TV"
-msgstr ""
+msgstr "Ser på tv"
#: ../src/common/pep.py:173
-#, fuzzy
msgid "Watching a Movie"
-msgstr "Jag tittar på film."
+msgstr "Ser en film"
#: ../src/common/pep.py:174
-#, fuzzy
msgid "Talking"
-msgstr "Äter"
+msgstr "Pratar"
#: ../src/common/pep.py:175
msgid "In Real Life"
-msgstr ""
+msgstr "I verkliga livet"
#: ../src/common/pep.py:176
-#, fuzzy
msgid "On the Phone"
-msgstr "Jag pratar i telefon."
+msgstr "Pratar i telefon"
#: ../src/common/pep.py:177
msgid "On Video Phone"
-msgstr ""
+msgstr "I ett videosamtal"
#: ../src/common/pep.py:178
-#, fuzzy
msgid "Traveling"
-msgstr "Överför"
+msgstr "Reser"
#: ../src/common/pep.py:179
-#, fuzzy
msgid "Commuting"
-msgstr "Skriver"
+msgstr "Pendlar"
#: ../src/common/pep.py:181
msgid "Driving"
-msgstr ""
+msgstr "Kör bil"
#: ../src/common/pep.py:182
msgid "In a Car"
-msgstr ""
+msgstr "I en bil"
#: ../src/common/pep.py:183
msgid "On a Bus"
-msgstr ""
+msgstr "På en buss"
#: ../src/common/pep.py:184
-#, fuzzy
msgid "On a Plane"
-msgstr "_Fortsätt"
+msgstr "På ett flygplan"
#: ../src/common/pep.py:185
-#, fuzzy
msgid "On a Train"
-msgstr "Öppna som _länk"
+msgstr "På ett tåg"
#: ../src/common/pep.py:186
msgid "On a Trip"
-msgstr ""
+msgstr "På resa"
#: ../src/common/pep.py:187
-#, fuzzy
msgid "Walking"
-msgstr "Arbetar"
+msgstr "Promenerar"
#: ../src/common/pep.py:189
-#, fuzzy
msgid "Coding"
-msgstr "Skriver"
+msgstr "Programmerar"
#: ../src/common/pep.py:190
msgid "In a Meeting"
-msgstr ""
+msgstr "I ett möte"
#: ../src/common/pep.py:191
msgid "Studying"
-msgstr ""
+msgstr "Studerar"
#: ../src/common/pep.py:192
-#, fuzzy
msgid "Writing"
-msgstr "Arbetar"
+msgstr "Skriver"
#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
-#, fuzzy, python-format
+#: ../src/common/socks5.py:86
+#, python-format
msgid "Unable to bind to port %s."
-msgstr "Lyckades inte gå med i rummet"
+msgstr "Kunde inte binda till port %s."
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
msgid ""
"Maybe you have another running instance of Gajim. File Transfer will be "
"cancelled."
@@ -5771,36 +5685,32 @@
"Du kanske har en annan Gajiminstans igång. Filöverföringen kommer stängas."
#. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
msgid ""
"[This is part of an encrypted session. If you see this message, something "
"went wrong.]"
msgstr ""
+"[Detta är en del av en krypterad session. Om du ser detta meddelande så har "
+"någonting gått fel.]"
-#: ../src/common/zeroconf/client_zeroconf.py:408
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#, python-format
msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Anslutning till värd kunde inte etableras: Timeout medan data skickades."
-
-#: ../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 ""
-"Värden du angav för det avancerade valet ft_override_host_to_send är inte "
-"giltigt, så ignoreras."
+"Värden %s som du konfigurerade som det avancerade alternativet "
+"ft_add_hosts_to_send är inte giltig, därför ignoreras den."
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:216
msgid "To continue sending and receiving messages, you will need to reconnect."
msgstr "För att fortsätta skicka och ta emot meddelanden måste du återansluta."
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:239
msgid "Avahi error"
msgstr "Avahifel"
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:239
#, python-format
msgid ""
"%s\n"
@@ -5809,33 +5719,31 @@
"%s\n"
"Link-local-meddelanden kanske inte fungerar korrekt."
-#: ../src/common/zeroconf/connection_zeroconf.py:249
-#, fuzzy
+#: ../src/common/zeroconf/connection_zeroconf.py:250
msgid "Please check if Avahi or Bonjour is installed."
-msgstr "Kontrollera om Avahi är installerat."
+msgstr "Kontrollera om Avahi eller Bonjour är installerat."
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
-#, fuzzy
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
msgid "Could not start local service"
-msgstr "Kunde inte ladda bild"
+msgstr "Kunde inte starta lokal tjänst"
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#, fuzzy, python-format
+#: ../src/common/zeroconf/connection_zeroconf.py:260
+#, python-format
msgid "Unable to bind to port %d."
-msgstr "Lyckades inte gå med i rummet"
+msgstr "Kunde inte binda till port %d."
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
msgid "Please check if avahi-daemon is running."
msgstr "Kontrollera om avahi-daemon körs."
-#: ../src/common/zeroconf/connection_zeroconf.py:357
-#, fuzzy, python-format
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+#, python-format
msgid "Could not change status of account \"%s\""
-msgstr "Kunde inte ansluta till \"%s\""
+msgstr "Kunde inte ändra status för kontot \"%s\""
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:381
msgid ""
"You are not connected or not visible to others. Your message could not be "
"sent."
@@ -5844,63 +5752,57 @@
"skickas."
#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:399
msgid "[This message is encrypted]"
msgstr "[Det här meddelandet är krypterat]"
-#: ../src/common/zeroconf/connection_zeroconf.py:457
-#, fuzzy
+#: ../src/common/zeroconf/connection_zeroconf.py:483
msgid "Your message could not be sent."
-msgstr "Kontakten är nerkopplad. Ditt meddelande kunde inte skickas."
+msgstr "Ditt meddelande kunde inte skickas."
#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:489
msgid "Contact is offline. Your message could not be sent."
msgstr "Kontakten är nerkopplad. Ditt meddelande kunde inte skickas."
+#: ../src/common/zeroconf/connection_zeroconf.py:586
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Anslutning till värd kunde inte etableras: Timeout medan data skickades."
+
#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
-#, fuzzy, python-format
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
+#, python-format
msgid "Error while adding service. %s"
-msgstr "problem vid sändning %s ( %s )"
+msgstr "Fel när tjänsten lades till. %s"
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:602
msgid "Disabled"
msgstr "Avstängd"
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Aktiv"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Händelse"
-
-#: ../src/config.py:405
-#, fuzzy
+#: ../src/config.py:392
msgid "Default Message"
-msgstr "Förinställda statusmeddelanden"
+msgstr "Standardmeddelande"
-#: ../src/config.py:412
-#, fuzzy
+#: ../src/config.py:399
msgid "Enabled"
-msgstr "Aktivera"
+msgstr "Aktiverad"
-#: ../src/config.py:454
+#: ../src/config.py:441
msgid "Always use OS/X default applications"
-msgstr ""
+msgstr "Använd alltid OS/X standardprogram"
-#: ../src/config.py:455
-#, fuzzy
+#: ../src/config.py:442
msgid "Custom"
-msgstr "<b>Anpassa</b>"
+msgstr "Anpassad"
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:668 ../src/dialogs.py:1196
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "Ordbok för språket %s inte tillgängligt"
-#: ../src/config.py:651
+#: ../src/config.py:669
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -5909,253 +5811,207 @@
"Du måste installera %s ordboken för att använda stavningskontroll, eller "
"välj ett annat språk genom att sätta valet speller_language"
-#: ../src/config.py:1016
+#: ../src/config.py:1046
msgid "status message title"
msgstr "titel för statusmeddelande"
-#: ../src/config.py:1016
+#: ../src/config.py:1046
msgid "status message text"
msgstr "text för statusmeddelande"
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Första meddelandet mottaget"
-
-#: ../src/config.py:1054
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "Nytt meddelande har mottagits"
-
-#: ../src/config.py:1056
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "Nytt meddelande har mottagits"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Kontakt loggade in"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Kontakt loggade ut"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Meddelande skickat"
-
-#: ../src/config.py:1060
-#, fuzzy
-msgid "Group Chat Message Highlight"
-msgstr "Gruppchattsmeddelande markerat"
-
-#: ../src/config.py:1061
-#, fuzzy
-msgid "Group Chat Message Received"
-msgstr "Gruppchattsmeddelande mottaget"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "E-post mottaget på 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:1326 ../src/dialogs.py:1823 ../src/dialogs.py:1887
+#: ../src/disco.py:771 ../src/disco.py:1563 ../src/disco.py:1809
#: ../src/history_window.py:87
msgid "Name"
msgstr "Namn"
-#: ../src/config.py:1405
+#: ../src/config.py:1412
msgid "Relogin now?"
msgstr "Återanslut nu?"
-#: ../src/config.py:1406
+#: ../src/config.py:1413
msgid "If you want all the changes to apply instantly, you must relogin."
msgstr "Om du vill att ändringarna skall ske omedelbart måste du återansluta."
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
-msgstr "OpenPGP är oanvändbart på den här datorn"
+#: ../src/config.py:1538 ../src/config.py:1639
+msgid "OpenPGP is not usable on this computer"
+msgstr "OpenPGP är inte användbar på den här datorn"
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1675 ../src/config.py:1718
msgid "Unread events"
msgstr "Olästa händelser"
-#: ../src/config.py:1667
+#: ../src/config.py:1676
msgid "Read all pending events before removing this account."
msgstr "Läs alla väntande händelser innan du tar bort detta konto."
-#: ../src/config.py:1693
+#: ../src/config.py:1702
#, python-format
msgid "You have opened chat in account %s"
msgstr "Du har öppnat chatt i kontot %s"
-#: ../src/config.py:1694
+#: ../src/config.py:1703
msgid "All chat and groupchat windows will be closed. Do you want to continue?"
msgstr "Alla chatts- och gruppchattsfönster kommer stängas. Vill du fortsätta?"
-#: ../src/config.py:1705
+#: ../src/config.py:1714
msgid "You are currently connected to the server"
msgstr "Du är för närvarande ansluten till servern"
-#: ../src/config.py:1706
+#: ../src/config.py:1715
msgid "To change the account name, you must be disconnected."
msgstr "För att ändra kontonamnet måste du vara frånkopplad"
-#: ../src/config.py:1710
+#: ../src/config.py:1719
msgid "To change the account name, you must read all pending events."
msgstr "För att ändra kontonamnet måste du läsa alla väntande händelser."
-#: ../src/config.py:1716
+#: ../src/config.py:1725
msgid "Account Name Already Used"
msgstr "Kontonamn används redan"
-#: ../src/config.py:1717
+#: ../src/config.py:1726
msgid ""
"This name is already used by another of your accounts. Please choose another "
"name."
msgstr ""
"Detta namn används redan av ett annat av dina konton. Välj ett annat namn."
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1730 ../src/config.py:1734
msgid "Invalid account name"
msgstr "Ogiltigt kontonamn"
-#: ../src/config.py:1722
+#: ../src/config.py:1731
msgid "Account name cannot be empty."
msgstr "Kontonamnet kan inte vara tomt."
-#: ../src/config.py:1726
+#: ../src/config.py:1735
msgid "Account name cannot contain spaces."
msgstr "Kontonamnet kan inte innehålla mellanslag."
-#: ../src/config.py:1800
-#, fuzzy
+#: ../src/config.py:1810
msgid "Rename Account"
-msgstr "Hantera konton"
+msgstr "Byt namn på konto"
-#: ../src/config.py:1801
-#, fuzzy, python-format
+#: ../src/config.py:1811
+#, python-format
msgid "Enter a new name for account %s"
-msgstr "Skriv in GPG-nyckelns lösenfras för konto %s."
+msgstr "Ange ett nytt namn för kontot %s"
-#: ../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 "Ogiltigt Jabber-ID"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1838
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "Ett Jabber-ID måste vara av formen \"användare@servernamn\"."
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2028 ../src/config.py:3177
msgid "Invalid entry"
msgstr "Ogiltig post"
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2029 ../src/config.py:3178
msgid "Custom port must be a port number."
msgstr "Inställd port måste vara ett portnummer."
-#: ../src/config.py:2040
+#: ../src/config.py:2050
msgid "Failed to get secret keys"
msgstr "Lyckades inte hämta hemliga nycklar"
-#: ../src/config.py:2041
+#: ../src/config.py:2051
msgid "There was a problem retrieving your OpenPGP secret keys."
msgstr "Det uppstod problem när dina hemliga OpenPGP-nycklar skulle hämtas."
-#: ../src/config.py:2076
+#: ../src/config.py:2086
msgid "OpenPGP Key Selection"
msgstr "Val av OpenPGP-nyckel"
-#: ../src/config.py:2077
+#: ../src/config.py:2087
msgid "Choose your OpenPGP key"
msgstr "Välj din OpenPGP-nyckel"
-#: ../src/config.py:2088
+#: ../src/config.py:2094
msgid "No such account available"
msgstr "Inget sådant konto tillgängligt"
-#: ../src/config.py:2089
+#: ../src/config.py:2095
msgid "You must create your account before editing your personal information."
msgstr ""
"Du måste skapa ditt konto innan du redigerar din personliga information."
-#: ../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:2102 ../src/dialogs.py:1675 ../src/dialogs.py:1811
+#: ../src/dialogs.py:1990 ../src/disco.py:439 ../src/profile_window.py:317
msgid "You are not connected to the server"
msgstr "Du är inte ansluten till servern"
-#: ../src/config.py:2097
+#: ../src/config.py:2103
msgid "Without a connection, you can not edit your personal information."
-msgstr "Du kan inte redigera din personliga information utan en förbindelse."
+msgstr "Du kan inte redigera din personliga information utan en anslutning."
-#: ../src/config.py:2101
+#: ../src/config.py:2107
msgid "Your server doesn't support Vcard"
-msgstr "Din server stödjer inte Vcard"
+msgstr "Din server saknar stöd för Vcard"
-#: ../src/config.py:2102
+#: ../src/config.py:2108
msgid "Your server can't save your personal information."
msgstr "Din server kan inte spara din personliga information."
-#: ../src/config.py:2133
+#: ../src/config.py:2139
msgid "Account Local already exists."
msgstr "Kontot Local används redan."
-#: ../src/config.py:2134
+#: ../src/config.py:2140
msgid "Please rename or remove it before enabling link-local messaging."
msgstr "Byt namn eller ta bort det innan du aktiverar link-local-meddelanden."
-#: ../src/config.py:2317
+#: ../src/config.py:2323
#, python-format
msgid "Edit %s"
msgstr "Redigera %s"
-#: ../src/config.py:2319
+#: ../src/config.py:2325
#, python-format
msgid "Register to %s"
msgstr "Registrera till %s"
#. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2361
msgid "Ban List"
msgstr "Bannlista"
-#: ../src/config.py:2356
+#: ../src/config.py:2362
msgid "Member List"
msgstr "Medlemslista"
-#: ../src/config.py:2357
+#: ../src/config.py:2363
msgid "Owner List"
msgstr "Ägarlista"
-#: ../src/config.py:2358
+#: ../src/config.py:2364
msgid "Administrator List"
msgstr "Administratörslista"
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2413 ../src/disco.py:778 ../src/history_manager.py:183
msgid "JID"
msgstr "JID"
-#: ../src/config.py:2415
+#: ../src/config.py:2423
msgid "Reason"
msgstr "Anledning"
-#: ../src/config.py:2420
+#: ../src/config.py:2430
msgid "Nick"
msgstr "Smeknamn"
-#: ../src/config.py:2424
+#: ../src/config.py:2436
msgid "Role"
msgstr "Roll"
-#: ../src/config.py:2449
+#: ../src/config.py:2463
msgid "Banning..."
msgstr "Bannlyser..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2465
msgid ""
"<b>Whom do you want to ban?</b>\n"
"\n"
@@ -6163,11 +6019,11 @@
"<b>Vem vill du bannlysa?</b>\n"
"\n"
-#: ../src/config.py:2453
+#: ../src/config.py:2467
msgid "Adding Member..."
msgstr "Lägger till medlem..."
-#: ../src/config.py:2454
+#: ../src/config.py:2468
msgid ""
"<b>Whom do you want to make a member?</b>\n"
"\n"
@@ -6175,11 +6031,11 @@
"<b>Vem vill du göra till medlem?</b>\n"
"\n"
-#: ../src/config.py:2456
+#: ../src/config.py:2470
msgid "Adding Owner..."
msgstr "Lägger till ägare..."
-#: ../src/config.py:2457
+#: ../src/config.py:2471
msgid ""
"<b>Whom do you want to make an owner?</b>\n"
"\n"
@@ -6187,11 +6043,11 @@
"<b>Vem vill du göra till ägare?</b>\n"
"\n"
-#: ../src/config.py:2459
+#: ../src/config.py:2473
msgid "Adding Administrator..."
msgstr "Lägger till administratör..."
-#: ../src/config.py:2460
+#: ../src/config.py:2474
msgid ""
"<b>Whom do you want to make an administrator?</b>\n"
"\n"
@@ -6199,7 +6055,7 @@
"<b>Vem vill du göra till administratör?</b>\n"
"\n"
-#: ../src/config.py:2461
+#: ../src/config.py:2475
msgid ""
"Can be one of the following:\n"
"1. user@domain/resource (only that resource matches).\n"
@@ -6215,85 +6071,86 @@
"4. domän (domänen i sig matchar, så gör även alla användare@domän,\n"
"domän/resurs, eller adress som innehåller en underdomän."
-#: ../src/config.py:2558
+#: ../src/config.py:2572
#, python-format
msgid "Removing %s account"
msgstr "Tar bort %s konto"
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2594 ../src/gajim.py:1482 ../src/gajim.py:1569
msgid "Password Required"
msgstr "Lösenord krävs"
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#. ('PASSWORD_REQUIRED', account, None)
+#: ../src/config.py:2595 ../src/gajim.py:1552
#, python-format
msgid "Enter your password for account %s"
-msgstr "Skriv in lösenordet för konto %s"
+msgstr "Ange ditt lösenord för kontot %s"
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2596 ../src/gajim.py:1569
msgid "Save password"
msgstr "Spara lösenord"
-#: ../src/config.py:2591
+#: ../src/config.py:2605
#, python-format
msgid "Account \"%s\" is connected to the server"
msgstr "Konto \"%s\" är anslutet till servern"
-#: ../src/config.py:2592
+#: ../src/config.py:2606
msgid "If you remove it, the connection will be lost."
msgstr "Om du tar bort det kommer anslutningen att förloras."
-#: ../src/config.py:2688
+#: ../src/config.py:2702
msgid "Default"
msgstr "Standard"
-#: ../src/config.py:2688
+#: ../src/config.py:2702
msgid "?print_status:All"
msgstr "?print_status:Alla"
-#: ../src/config.py:2689
+#: ../src/config.py:2703
msgid "Enter and leave only"
msgstr "In- och utgång enbart"
-#: ../src/config.py:2690
+#: ../src/config.py:2704
msgid "?print_status:None"
msgstr "?print_status:Ingen"
-#: ../src/config.py:2758
+#: ../src/config.py:2772
msgid "New Group Chat"
msgstr "Ny gruppchatt"
-#: ../src/config.py:2791
+#: ../src/config.py:2805
msgid "This bookmark has invalid data"
msgstr "Det här bokmärket har ogiltig data"
-#: ../src/config.py:2792
+#: ../src/config.py:2806
msgid ""
"Please be sure to fill out server and room fields or remove this bookmark."
msgstr ""
"Var säker på att fylla i server- och rumfälten eller ta bort det här "
"bokmärket."
-#: ../src/config.py:3072
+#: ../src/config.py:3088
msgid "Invalid username"
msgstr "Ogiltigt användarnamn"
-#: ../src/config.py:3074
+#: ../src/config.py:3090
msgid "You must provide a username to configure this account."
msgstr "Du behöver ange ett användarnamn för att konfigurera detta konto."
-#: ../src/config.py:3100
+#: ../src/config.py:3116
msgid "Duplicate Jabber ID"
msgstr "Dubblerat Jabber-ID"
-#: ../src/config.py:3101
+#: ../src/config.py:3117
msgid "This account is already configured in Gajim."
msgstr "Detta kontot är redan konfigurerat i Gajim."
-#: ../src/config.py:3118
+#: ../src/config.py:3134
msgid "Account has been added successfully"
-msgstr "Kontot har blivit tillagt"
+msgstr "Kontot har lagts till"
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3135 ../src/config.py:3326
#, fuzzy
msgid ""
"You can set advanced account options by pressing the Advanced button, or "
@@ -6303,27 +6160,24 @@
"Du kan ställa in avancerade alternativ genom att trycka på \"Avancerat\", "
"eller senare genom att använda \"Redigera->Konton\" från huvudfönstret."
-#: ../src/config.py:3137
-#, fuzzy
+#: ../src/config.py:3153
msgid "Invalid server"
-msgstr "Ogiltigt användarnamn"
+msgstr "Ogiltig server"
-#: ../src/config.py:3138
-#, fuzzy
+#: ../src/config.py:3154
msgid "Please provide a server on which you want to register."
-msgstr "Ange det nya smeknamnet du vill använda:"
+msgstr "Ange en server på vilken du vill registrera."
-#: ../src/config.py:3189 ../src/gajim.py:1996
-#, fuzzy
+#: ../src/config.py:3205 ../src/gajim.py:2102
msgid "Certificate Already in File"
-msgstr "Kontakten finns redan i registret"
+msgstr "Certifikatet finns redan i filen"
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../src/config.py:3206 ../src/gajim.py:2103
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr ""
-#: ../src/config.py:3258
+#: ../src/config.py:3274
#, python-format
msgid ""
"<b>Security Warning</b>\n"
@@ -6332,40 +6186,91 @@
"SSL Error: %(error)s\n"
"Do you still want to connect to this server?"
msgstr ""
+"<b>Säkerhetsvarning</b>\n"
+"\n"
+"Äktheten för SSL-certfikatet för %(hostname)s kan vara ogiltig.\n"
+"SSL-fel: %(error)s\n"
+"Vill du fortfarande ansluta till denna server?"
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3280 ../src/gajim.py:2127
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
"SHA1 fingerprint of the certificate:\n"
"%s"
msgstr ""
+"Lägg till detta certifikat till listan över pålitliga certifikat.\n"
+"SHA1-fingeravtryck för certifikatet:\n"
+"%s"
-#: ../src/config.py:3287 ../src/config.py:3326
-#, fuzzy
+#: ../src/config.py:3305 ../src/config.py:3346
msgid "An error occurred during account creation"
-msgstr "Ett fel uppstod när kontot skulle skapas"
+msgstr "Ett fel uppstod när kontot skapades"
-#: ../src/config.py:3307
+#: ../src/config.py:3325
msgid "Your new account has been created successfully"
msgstr "Ditt nya konto har skapats"
-#: ../src/config.py:3410
+#: ../src/config.py:3430
msgid "Account name is in use"
msgstr "Kontonamnet används redan"
-#: ../src/config.py:3411
+#: ../src/config.py:3431
msgid "You already have an account using this name."
msgstr "Du har redan ett konto med det namnet."
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3584
+msgid "Active"
+msgstr "Aktiv"
+
+#: ../src/config.py:3592
+msgid "Event"
+msgstr "Händelse"
+
+#: ../src/config.py:3627
+msgid "First Message Received"
+msgstr "Första meddelandet mottaget"
+
+#: ../src/config.py:3628
+msgid "Next Message Received Focused"
+msgstr "Nästa meddelande blev fokuserat"
+
+#: ../src/config.py:3630
+msgid "Next Message Received Unfocused"
+msgstr "Nästa meddelande blev ofokuserat"
+
+#: ../src/config.py:3631
+msgid "Contact Connected"
+msgstr "Kontakt loggade in"
+
+#: ../src/config.py:3632
+msgid "Contact Disconnected"
+msgstr "Kontakt loggade ut"
+
+#: ../src/config.py:3633
+msgid "Message Sent"
+msgstr "Meddelande skickat"
+
+#: ../src/config.py:3634
+msgid "Group Chat Message Highlight"
+msgstr "Meddelande markerat i gruppchatt"
+
+#: ../src/config.py:3635
+msgid "Group Chat Message Received"
+msgstr "Meddelande mottaget i gruppchatt"
+
+#: ../src/config.py:3636
+msgid "GMail Email Received"
+msgstr "E-post mottaget på GMail"
+
+#: ../src/conversation_textview.py:560
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 ""
-#: ../src/conversation_textview.py:568
+#: ../src/conversation_textview.py:579
#, fuzzy
msgid ""
"Text below this line is what has been said since the\n"
@@ -6374,661 +6279,641 @@
"Texten under denna linje är vad som har sagts sedan du senast hade fokus på "
"denna gruppchatt"
-#: ../src/conversation_textview.py:678
-#, fuzzy, python-format
+#: ../src/conversation_textview.py:689
+#, python-format
msgid "_Actions for \"%s\""
-msgstr "Åtgärder för \"%s\""
+msgstr "_Åtgärder för \"%s\""
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:701
msgid "Read _Wikipedia Article"
msgstr "Läs _Wikipedia Artikel"
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:706
msgid "Look it up in _Dictionary"
msgstr "Kolla upp det i _Uppslagsbok"
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:723
#, python-format
msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
msgstr "URL för uppslagsbok saknar ett \"%s\" och det är inte en WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:736
#, python-format
msgid "Web Search URL is missing an \"%s\""
msgstr "URL för webbsökning saknar ett \"%s\""
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:739
msgid "Web _Search for it"
msgstr "_Sök på webben efter det"
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:745
msgid "Open as _Link"
msgstr "Öppna som _länk"
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1199
msgid "Yesterday"
msgstr "Igår"
#. 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:1203
#, python-format
msgid "%i days ago"
msgstr "%i dagar sen"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1237
#, python-format
msgid "Subject: %s\n"
msgstr "Ämne: %s\n"
-#: ../src/dataforms_widget.py:540
-#, fuzzy
+#: ../src/dataforms_widget.py:607
msgid "Jabber ID already in list"
-msgstr "Jabber IM-klient"
+msgstr "Jabber-ID finns redan i listan"
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:608
msgid "The Jabber ID you entered is already in the list. Choose another one."
msgstr ""
#. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:619
msgid "new(a)jabber.id"
-msgstr ""
+msgstr "ny(a)jabber.id"
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
#, python-format
msgid "new%d(a)jabber.id"
-msgstr ""
+msgstr "ny%d(a)jabber.id"
#: ../src/dialogs.py:75
-#, fuzzy, python-format
+#, python-format
msgid "Contact name: <i>%s</i>"
msgstr "Kontaktens namn: <i>%s</i>"
#: ../src/dialogs.py:77
-#, fuzzy, python-format
+#, python-format
msgid "Jabber ID: <i>%s</i>"
-msgstr "JID: <i>%s</i>"
+msgstr "Jabber-ID: <i>%s</i>"
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
msgid "Group"
msgstr "Grupp"
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
msgid "In the group"
msgstr "I gruppen"
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:276
msgid "KeyID"
msgstr "Nyckel-ID"
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:281
msgid "Contact name"
msgstr "Kontaktnamn"
-#: ../src/dialogs.py:461
-#, fuzzy
+#: ../src/dialogs.py:457
msgid "Set Mood"
-msgstr "Sätt MOTD"
+msgstr "Ange humör"
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:545
#, python-format
msgid "%s Status Message"
msgstr "Statusmeddelande för %s"
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:547
msgid "Status Message"
msgstr "Statusmeddelande"
-#: ../src/dialogs.py:672
-#, fuzzy
+#: ../src/dialogs.py:659
msgid "Overwrite Status Message?"
-msgstr "Statusmeddelande"
+msgstr "Skriv över statusmeddelande?"
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:660
#, fuzzy
msgid ""
"This name is already used. Do you want to overwrite this status message?"
msgstr ""
"Detta namn används redan av ett annat av dina konton. Välj ett annat namn."
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:669
msgid "Save as Preset Status Message"
msgstr "Spara som Valbart Statusmeddelande"
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:670
msgid "Please type a name for this status message"
-msgstr "Skriv ett namn för detta statusmeddelande"
+msgstr "Ange ett namn för detta statusmeddelande"
-#: ../src/dialogs.py:689
-#, fuzzy
+#: ../src/dialogs.py:676
msgid "AIM Address:"
-msgstr "_Adress:"
+msgstr "AIM-adress:"
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:677
msgid "GG Number:"
msgstr "GG-nummer:"
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:678
msgid "ICQ Number:"
msgstr "ICQ-nummer:"
-#: ../src/dialogs.py:692
-#, fuzzy
+#: ../src/dialogs.py:679
msgid "MSN Address:"
-msgstr "_Adress:"
+msgstr "MSN-adress:"
-#: ../src/dialogs.py:693
-#, fuzzy
+#: ../src/dialogs.py:680
msgid "Yahoo! Address:"
-msgstr "Extra adress:"
+msgstr "Yahoo!-adress:"
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:716
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr "Fyll i informationen om kontakten du vill lägga till i konto %s"
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:718
msgid "Please fill in the data of the contact you want to add"
msgstr "Fyll i informationen om kontakten du vill lägga till"
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:875 ../src/dialogs.py:881 ../src/dialogs.py:886
msgid "Invalid User ID"
msgstr "Ogiltigt Jabber-ID"
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:882
msgid "The user ID must not contain a resource."
msgstr "Användarens ID får inte innehålla en resurs."
-#: ../src/dialogs.py:900
-#, fuzzy
+#: ../src/dialogs.py:887
msgid "You cannot add yourself to your roster."
-msgstr "Jag skulle vilja lägga till dig i mitt register."
+msgstr "Du kan inte lägga till dig själv i din kontaktlista."
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:901
msgid "Contact already in roster"
-msgstr "Kontakten finns redan i registret"
+msgstr "Kontakten finns redan i kontaktlistan"
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:902
msgid "This contact is already listed in your roster."
-msgstr "Den här kontakten finns redan i ditt register."
+msgstr "Denna kontakt finns redan i din kontaktlista."
-#: ../src/dialogs.py:951
-#, fuzzy
+#: ../src/dialogs.py:938
msgid "User ID:"
-msgstr "Användar-ID:"
+msgstr "Användar-id:"
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:996
msgid "A GTK+ jabber client"
msgstr "En GTK+ jabberklient"
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:997
msgid "GTK+ Version:"
msgstr "GTK+ version:"
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:998
msgid "PyGTK Version:"
msgstr "PyGTK version:"
-#: ../src/dialogs.py:1021
-#, fuzzy
+#: ../src/dialogs.py:1008
msgid "Current Developers:"
-msgstr "Tidigare utvecklare:"
+msgstr "Nuvarande utvecklare:"
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1010
msgid "Past Developers:"
msgstr "Tidigare utvecklare:"
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1016
msgid "THANKS:"
msgstr "TACK:"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1022
msgid "Last but not least, we would like to thank all the package maintainers."
msgstr "Sist men inte minst vill vi tacka alla anvsraiga paketerare."
#. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1035
msgid "translator-credits"
msgstr ""
+"Daniel Nylander <po(a)danielnylander.se>\n"
"Christian Bjälevik <nafallo(a)magicalforest.se>\n"
-"Oscar Hellström <oscar(a)oscarh.net>"
+"Oscar Hellström <oscar(a)oscarh.net>\n"
+"\n"
+"Skicka synpunkter på översättningen till\n"
+"<tp-sv(a)listor.tp-sv.se>."
-#: ../src/dialogs.py:1210
-#, fuzzy, python-format
+#: ../src/dialogs.py:1197
+#, 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 ""
-"Du måste installera %s ordboken för att använda stavningskontroll, eller "
-"välj ett annat språk genom att sätta valet speller_language"
+"Du måste installera %s-ordboken för att använda stavningskontroll, eller "
+"välja ett annat språk genom att ställa in alternativet speller_language.\n"
+"\n"
+"Markeringsfunktionen för felstavade ord kommer inte att användas"
-#: ../src/dialogs.py:1614
-#, fuzzy, python-format
+#: ../src/dialogs.py:1601
+#, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
-msgstr "Prenumerationsförfrågan för konto %s från %s"
+msgstr "Prenumerationsbegäran för kontot %(account)s från %(jid)s"
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1604
#, python-format
msgid "Subscription request from %s"
msgstr "Prenumerationsförfrågan från %s"
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
-#, fuzzy, python-format
+#: ../src/dialogs.py:1668 ../src/gajim.py:2767
+#, python-format
msgid "You are already in group chat %s"
-msgstr "Du är redan i rummet %s"
+msgstr "Du är redan i gruppchatten %s"
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1676
msgid "You can not join a group chat unless you are connected."
msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1695
#, python-format
msgid "Join Group Chat with account %s"
msgstr "Anslut till gruppchatt med konto %s"
-#: ../src/dialogs.py:1776
-#, fuzzy
+#: ../src/dialogs.py:1766
msgid "Invalid Nickname"
-msgstr "Ogiltigt användarnamn"
+msgstr "Ogiltigt smeknamn"
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-#, fuzzy
+#: ../src/dialogs.py:1767 ../src/groupchat_control.py:1455
+#: ../src/groupchat_control.py:1738
msgid "The nickname has not allowed characters."
-msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
+msgstr "Smeknamnet innehåller icke-tillåtna tecken."
-#: ../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:1908
#, fuzzy
msgid "Invalid group chat Jabber ID"
msgstr "Ogiltigt 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:1909
#, fuzzy
msgid "The group chat Jabber ID has not allowed characters."
msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:1784
msgid "This is not a group chat"
msgstr "Det här är ingen gruppchatt"
-#: ../src/dialogs.py:1795
-#, fuzzy, python-format
+#: ../src/dialogs.py:1785
+#, python-format
msgid "%s is not the name of a group chat."
-msgstr "Gömmer bannern i gruppchatfönstret"
+msgstr "%s är inte namnet på en gruppchatt."
-#: ../src/dialogs.py:1822
-#, fuzzy
+#: ../src/dialogs.py:1812
msgid "Without a connection, you can not synchronise your contacts."
-msgstr "Utan en förbindelse kan du inte ändra ditt lösenord."
+msgstr "Du kan inte synkronisera dina kontakter utan en anslutning."
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:1826
msgid "Server"
msgstr "Server"
-#: ../src/dialogs.py:1869
-#, fuzzy
+#: ../src/dialogs.py:1859
msgid "This account is not connected to the server"
-msgstr "Konto \"%s\" är anslutet till servern"
+msgstr "Detta konto är inte anslutet till servern"
-#: ../src/dialogs.py:1870
-#, fuzzy
+#: ../src/dialogs.py:1860
msgid "You cannot synchronize with an account unless it is connected."
-msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
+msgstr "Du kan inte synkronisera med ett konto utan att vara ansluten."
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:1884
msgid "Synchronise"
-msgstr ""
+msgstr "Synkronisera"
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:1942
#, python-format
msgid "Start Chat with account %s"
msgstr "Starta Chatt med konto %s"
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:1944
msgid "Start Chat"
msgstr "Starta Chatt"
-#: ../src/dialogs.py:1955
-#, fuzzy
+#: ../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:"
msgstr ""
-"Fyll i kontakt-ID för kontakten du vill\n"
+"Ange ett smeknamn eller Jabber-ID för kontakten som du vill\n"
"skicka ett chattmeddelande till:"
#. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/dialogs.py:1969 ../src/dialogs.py:2343 ../src/dialogs.py:2493
#: ../src/normal_control.py:640
msgid "Connection not available"
-msgstr "Förbindelse inte tillgänglig"
+msgstr "Anslutningen är inte tillgänglig"
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/dialogs.py:1970 ../src/dialogs.py:2344 ../src/dialogs.py:2494
#: ../src/normal_control.py:641
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "Kontrollera att du är ansluten med \"%s\"."
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
-#, fuzzy
+#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
msgid "Invalid JID"
-msgstr "Ogiltigt Jabber-ID"
+msgstr "Ogiltigt JID"
-#: ../src/dialogs.py:1992
-#, fuzzy, python-format
+#: ../src/dialogs.py:1982
+#, python-format
msgid "Unable to parse \"%s\"."
-msgstr "Lyckades inte skriva fil i %s"
+msgstr "Kunde inte tolka \"%s\"."
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:1991
msgid "Without a connection, you can not change your password."
-msgstr "Utan en förbindelse kan du inte ändra ditt lösenord."
+msgstr "Du kan inte ändra ditt lösenord utan en anslutning."
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2010
msgid "Invalid password"
msgstr "Ogiltigt lösenord"
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2010
msgid "You must enter a password."
msgstr "Du måste skriva in ett lösenord."
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2014
msgid "Passwords do not match"
msgstr "Lösenorden stämmer inte överens"
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2015
msgid "The passwords typed in both fields must be identical."
msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
#. 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:473
#: ../src/osx/growler.py:12
msgid "Contact Signed In"
-msgstr "Kontakt Loggade In"
+msgstr "Kontakten loggade in"
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/dialogs.py:2057 ../src/notify.py:253 ../src/notify.py:475
#: ../src/osx/growler.py:12
msgid "Contact Signed Out"
msgstr "Kontakt Loggade Ut"
#. 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:477
#: ../src/osx/growler.py:12
msgid "New Message"
msgstr "Nytt Meddelande"
#. 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:477
#: ../src/osx/growler.py:13
msgid "New Single Message"
msgstr "Nytt Enstaka Meddelande"
#. 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:478
#: ../src/osx/growler.py:13
msgid "New Private Message"
msgstr "Skicka Privat Meddelande"
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
+#: ../src/dialogs.py:2060 ../src/gajim.py:1685 ../src/notify.py:487
#: ../src/osx/growler.py:13
msgid "New E-mail"
msgstr "Ny E-post"
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
+#: ../src/dialogs.py:2062 ../src/gajim.py:1751 ../src/notify.py:480
#: ../src/osx/growler.py:14
msgid "File Transfer Request"
msgstr "Förfrågan om Filöverföring"
-#: ../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:1651 ../src/gajim.py:1718
+#: ../src/notify.py:482 ../src/osx/growler.py:14
msgid "File Transfer Error"
msgstr "Fel i Filöverföring"
-#: ../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:1793 ../src/gajim.py:1815
+#: ../src/gajim.py:1832 ../src/notify.py:484 ../src/osx/growler.py:15
msgid "File Transfer Completed"
msgstr "Filöverföring Klar"
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
+#: ../src/dialogs.py:2067 ../src/gajim.py:1796 ../src/notify.py:485
#: ../src/osx/growler.py:15
msgid "File Transfer Stopped"
msgstr "Filöverföring Stoppad"
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
+#: ../src/dialogs.py:2069 ../src/gajim.py:1503 ../src/notify.py:489
#: ../src/osx/growler.py:16
msgid "Groupchat Invitation"
msgstr "Inbjudan till Gruppchatt"
-#: ../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
-#, fuzzy
msgid "Contact Changed Status"
-msgstr "Kontakt Loggade Ut"
+msgstr "Kontakten ändrade status"
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
-#, fuzzy, python-format
+#: ../src/dialogs.py:2262 ../src/normal_control.py:241
+#, python-format
msgid "Single Message using account %s"
-msgstr "Enstaka Meddelande med konto %s"
+msgstr "Ett meddelande med kontot %s"
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
-#, fuzzy, python-format
+#: ../src/dialogs.py:2264 ../src/normal_control.py:243
+#, python-format
msgid "Single Message in account %s"
-msgstr "Enstaka Meddelande med konto %s"
+msgstr "Ett meddelande i kontot %s"
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2266 ../src/normal_control.py:245
msgid "Single Message"
msgstr "Enstaka meddelande"
#. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2269 ../src/normal_control.py:248
#, python-format
msgid "Send %s"
msgstr "Skicka %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2292 ../src/normal_control.py:290
#, python-format
msgid "Received %s"
msgstr "Mottog %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#: ../src/dialogs.py:2315 ../src/normal_control.py:324
#, fuzzy, python-format
msgid "Form %s"
msgstr "Från %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:2394 ../src/normal_control.py:692
#, python-format
msgid "RE: %s"
msgstr "SV: %s"
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2395 ../src/normal_control.py:696
#, python-format
msgid "%s wrote:\n"
msgstr "%s skrev:\n"
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2439
#, python-format
msgid "XML Console for %s"
msgstr "XML-konsol för %s"
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2441
msgid "XML Console"
msgstr "XML-konsol"
-#: ../src/dialogs.py:2568
+#: ../src/dialogs.py:2565
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "Privat identitetslista <b><i>%s</i></b>"
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2569
#, python-format
msgid "Privacy List for %s"
msgstr "Privat integritetslista för %s"
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2625
#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
msgstr ""
+"Ordning: %(order)s, åtgärd: %(action)s, typ: %(type)s, värde: %(value)s"
-#: ../src/dialogs.py:2633
-#, fuzzy, python-format
+#: ../src/dialogs.py:2630
+#, python-format
msgid "Order: %(order)s, action: %(action)s"
-msgstr "Beskrivning: %s"
+msgstr "Ordning: %(order)s, åtgärd: %(action)s"
-#: ../src/dialogs.py:2675
-#, fuzzy
+#: ../src/dialogs.py:2672
msgid "<b>Edit a rule</b>"
-msgstr "<b>Format av en rad</b>"
+msgstr "<b>Redigera en regel</b>"
-#: ../src/dialogs.py:2762
-#, fuzzy
+#: ../src/dialogs.py:2759
msgid "<b>Add a rule</b>"
-msgstr "<b>Format av en rad</b>"
+msgstr "<b>Lägg till en regel</b>"
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:2855
#, python-format
msgid "Privacy Lists for %s"
msgstr "Privata integritetslistor för %s"
-#: ../src/dialogs.py:2860
-#, fuzzy
+#: ../src/dialogs.py:2857
msgid "Privacy Lists"
-msgstr "Privat Chatt"
+msgstr "Integritetslistor"
-#: ../src/dialogs.py:2930
-#, fuzzy
+#: ../src/dialogs.py:2927
msgid "Invalid List Name"
-msgstr "Ogiltigt användarnamn"
+msgstr "Ogiltigt listnamn"
-#: ../src/dialogs.py:2931
-#, fuzzy
+#: ../src/dialogs.py:2928
msgid "You must enter a name to create a privacy list."
-msgstr "Du måste skriva in ett lösenord för det nya kontot."
+msgstr "Du måste ange ett namn för att skapa en integritetslista."
-#: ../src/dialogs.py:2963
-#, fuzzy
+#: ../src/dialogs.py:2960
msgid "You are invited to a groupchat"
-msgstr "I gruppen"
+msgstr "Du är inbjuden till en gruppchatt"
-#: ../src/dialogs.py:2966
-#, fuzzy
+#: ../src/dialogs.py:2963
msgid "$Contact has invited you to join a discussion"
-msgstr "$Contact har bjudit in dig till %(room_jid)s"
+msgstr "$Contact har bjudit in dig till en diskussion"
-#: ../src/dialogs.py:2968
-#, fuzzy, python-format
+#: ../src/dialogs.py:2965
+#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
-msgstr "$Contact har bjudit in dig till %(room_jid)s"
+msgstr "$Contact har bjudit in dig till gruppchatten %(room_jid)s"
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:2973
#, python-format
msgid "Comment: %s"
msgstr "Kommentar: %s"
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:2975
msgid "Do you want to accept the invitation?"
-msgstr ""
+msgstr "Vill du acceptera inbjudan?"
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3030
msgid "Choose Sound"
msgstr "Välj ljud"
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3040 ../src/dialogs.py:3091
msgid "All files"
msgstr "Alla filer"
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3045
msgid "Wav Sounds"
msgstr "Wav-ljud"
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3078
msgid "Choose Image"
msgstr "Välj Bild"
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3096
msgid "Images"
msgstr "Bilder"
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3161
#, python-format
msgid "When %s becomes:"
msgstr "När %s blir:"
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3163
#, python-format
msgid "Adding Special Notification for %s"
msgstr "Lägger Till Speciellt Meddelande För %s"
#. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3232
msgid "#"
msgstr "#"
-#: ../src/dialogs.py:3243
-#, fuzzy
+#: ../src/dialogs.py:3238
msgid "Condition"
-msgstr "Förbindelse"
+msgstr "Villkor"
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3356
msgid "when I am "
msgstr "när jag är "
-#: ../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 ""
+"Din chattsession med <b>%(jid)s</b> är krypterad.\n"
+"\n"
+"Denna sessions Short Authentication String är <b>%(sas)s</b>."
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:3832
msgid "You have already verified this contact's identity."
-msgstr ""
+msgstr "Du har redan verifierat identiteten för denna kontakt."
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:3838 ../src/dialogs.py:3925
msgid "Contact's identity verified"
-msgstr ""
+msgstr "Kontaktens identitet är verifierad"
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:3846
msgid "Verify again..."
-msgstr ""
+msgstr "Verifiera igen..."
-#: ../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 ""
-#: ../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 "Kontaktens identitet är INTE verifierad"
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:3861
msgid "Verify..."
-msgstr ""
+msgstr "Verifiera..."
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:3873
msgid "Have you verified the contact's identity?"
-msgstr ""
+msgstr "Har du verifierat kontaktens identitet?"
-#: ../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> "
@@ -7038,26 +6923,26 @@
"This session's Short Authentication String is <b>%(sas)s</b>."
msgstr ""
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:3875
msgid "Did you talk to the remote contact and verify the SAS?"
msgstr ""
-#: ../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 ""
-#: ../src/dialogs.py:3921
+#: ../src/dialogs.py:3913
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
msgstr ""
-#: ../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 ""
-#: ../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."
@@ -7074,7 +6959,7 @@
#: ../src/disco.py:440
msgid "Without a connection, you can not browse available services"
-msgstr "Utan en förbindelse kan du inte bläddra bland tillgängliga tjänster"
+msgstr "Du kan inte bläddra bland tillgängliga tjänster utan en anslutning"
#: ../src/disco.py:514
#, python-format
@@ -7085,11 +6970,11 @@
msgid "Service Discovery"
msgstr "Tjänstefinnare"
-#: ../src/disco.py:656
+#: ../src/disco.py:657
msgid "The service could not be found"
msgstr "Denna tjänst kunde inte hittas"
-#: ../src/disco.py:657
+#: ../src/disco.py:658
msgid ""
"There is no service at the address you entered, or it is not responding. "
"Check the address and try again."
@@ -7097,65 +6982,62 @@
"Adressen du angav är ingen tjänstadress eller så svarar inte tjänsten. "
"Kontrollera adressen och försök igen."
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:662 ../src/disco.py:958
msgid "The service is not browsable"
msgstr "Tjänst är inte bläddringsbar"
-#: ../src/disco.py:662
+#: ../src/disco.py:663
msgid "This type of service does not contain any items to browse."
msgstr "Denna typ av tjänst innehåller inga objekt att bläddra genom."
-#: ../src/disco.py:699 ../src/disco.py:709
-#, fuzzy
+#: ../src/disco.py:700 ../src/disco.py:710
msgid "Invalid Server Name"
-msgstr "Ogiltigt användarnamn"
+msgstr "Ogiltigt servernamn"
-#: ../src/disco.py:754
-#, fuzzy, python-format
+#: ../src/disco.py:757
+#, python-format
msgid "Browsing %(address)s using account %(account)s"
-msgstr "Bläddrar %s med konto %s"
+msgstr "Bläddrar i %(address)s med kontot %(account)s"
-#: ../src/disco.py:794
+#: ../src/disco.py:797
msgid "_Browse"
msgstr "_Bläddra"
-#: ../src/disco.py:956
+#: ../src/disco.py:959
msgid "This service does not contain any items to browse."
msgstr "Denna tjänst innehåller inga objekt att bläddra genom."
-#: ../src/disco.py:1179
-#, fuzzy
+#: ../src/disco.py:1181
msgid "_Execute Command"
-msgstr "_Exekvera kommando..."
+msgstr "_Kör kommando"
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1191 ../src/disco.py:1355
msgid "Re_gister"
msgstr "Re_gistrera"
-#: ../src/disco.py:1390
-#, fuzzy, python-format
+#: ../src/disco.py:1392
+#, python-format
msgid "Scanning %(current)d / %(total)d.."
-msgstr "Undersöker %d / %d.."
+msgstr "Söker av %(current)d / %(total)d.."
#. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1573
msgid "Users"
msgstr "Användare"
#. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1581
msgid "Description"
msgstr "Beskrivning"
#. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1589
msgid "Id"
msgstr "ID"
#: ../src/disco.py:1818
-#, fuzzy
msgid "Subscribed"
-msgstr "Prenumerera"
+msgstr "Prenumererar"
#: ../src/disco.py:1826
msgid "Node"
@@ -7170,248 +7052,245 @@
msgstr "_Prenumerera"
#: ../src/disco.py:1895
-#, fuzzy
msgid "_Unsubscribe"
-msgstr "_Prenumerera"
+msgstr "Säg _upp prenumeration"
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
-msgstr ""
+#: ../src/features_window.py:45
+msgid "SSL certificat validation"
+msgstr "Validering av SSL-certifikat"
-#: ../src/features_window.py:52
+#: ../src/features_window.py:46
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:47 ../src/features_window.py:48
msgid "Requires python-pyopenssl."
-msgstr ""
+msgstr "Kräver python-pyopenssl."
-#: ../src/features_window.py:55
+#: ../src/features_window.py:49
msgid "Bonjour / Zeroconf"
-msgstr ""
+msgstr "Bonjour / Zeroconf"
-#: ../src/features_window.py:56
+#: ../src/features_window.py:50
msgid "Serverless chatting with autodetected clients in a local network."
msgstr ""
-#: ../src/features_window.py:57
+#: ../src/features_window.py:51
msgid "Requires python-avahi."
-msgstr ""
+msgstr "Kräver python-avahi."
-#: ../src/features_window.py:58
+#: ../src/features_window.py:52
msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr ""
+msgstr "Kräver pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr ""
+#: ../src/features_window.py:53
+msgid "Command line"
+msgstr "Kommandorad"
-#: ../src/features_window.py:60
+#: ../src/features_window.py:54
msgid "A script to control Gajim via commandline."
-msgstr ""
+msgstr "Ett skript för att styra Gajim via kommandraden."
-#: ../src/features_window.py:61
+#: ../src/features_window.py:55
msgid "Requires python-dbus."
-msgstr ""
+msgstr "Kräver 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:56 ../src/features_window.py:60
+#: ../src/features_window.py:64 ../src/features_window.py:68
+#: ../src/features_window.py:72 ../src/features_window.py:80
+#: ../src/features_window.py:84
msgid "Feature not available under Windows."
-msgstr ""
+msgstr "Funktionen är inte tillgänglig under Windows."
-#: ../src/features_window.py:63
-#, fuzzy
-msgid "OpenGPG"
-msgstr "OpenPGP: "
+#: ../src/features_window.py:57
+msgid "OpenGPG message encryption"
+msgstr "OpenPGP-meddelandekryptering"
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+#: ../src/features_window.py:58
+msgid "Encrypting chat messages with gpg keys."
+msgstr "Krypterar chattmeddelanden med gpg-nycklar."
-#: ../src/features_window.py:65
+#: ../src/features_window.py:59
msgid "Requires gpg and python-GnuPGInterface."
-msgstr ""
+msgstr "Kräver gpg och python-GnuPGInterface."
-#: ../src/features_window.py:67
-#, fuzzy
-msgid "network-manager"
-msgstr "Hantera Historik"
+#: ../src/features_window.py:61
+msgid "Network-manager"
+msgstr "Network-manager"
-#: ../src/features_window.py:68
+#: ../src/features_window.py:62
msgid "Autodetection of network status."
-msgstr ""
+msgstr "Automatisk detektering av nätverksstatus."
-#: ../src/features_window.py:69
+#: ../src/features_window.py:63
msgid "Requires gnome-network-manager and python-dbus."
-msgstr ""
+msgstr "Kräver gnome-network-manager och python-dbus."
-#: ../src/features_window.py:71
-#, fuzzy
+#: ../src/features_window.py:65
msgid "Session Management"
-msgstr "Meddelande skickat"
+msgstr "Sessionshantering"
-#: ../src/features_window.py:72
+#: ../src/features_window.py:66
msgid "Gajim session is stored on logout and restored on login."
-msgstr ""
+msgstr "Gajim-sessionen lagras vid utloggning och återskapas vid inloggning."
-#: ../src/features_window.py:73
+#: ../src/features_window.py:67
msgid "Requires python-gnome2."
-msgstr ""
+msgstr "Kräver python-gnome2."
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr ""
+#: ../src/features_window.py:69
+msgid "Password encryption"
+msgstr "Lösenordskryptering"
-#: ../src/features_window.py:76
+#: ../src/features_window.py:70
msgid "Passwords can be stored securely and not just in plaintext."
-msgstr ""
+msgstr "Lösenord kan lagras säkert och inte bara i klartext."
-#: ../src/features_window.py:77
+#: ../src/features_window.py:71
msgid "Requires gnome-keyring and python-gnome2-desktop."
-msgstr ""
+msgstr "Kräver gnome-keyring och python-gnome2-desktop."
-#: ../src/features_window.py:79
+#: ../src/features_window.py:73
msgid "SRV"
-msgstr ""
+msgstr "SRV"
-#: ../src/features_window.py:80
+#: ../src/features_window.py:74
msgid "Ability to connect to servers which are using SRV records."
-msgstr ""
+msgstr "Möjlighet att ansluta till servrar som använder SRV-poster."
-#: ../src/features_window.py:81
+#: ../src/features_window.py:75
msgid "Requires dnsutils."
-msgstr ""
+msgstr "Kräver dnsutils."
-#: ../src/features_window.py:82
+#: ../src/features_window.py:76
msgid "Requires nslookup to use SRV records."
-msgstr ""
+msgstr "Kräver nslookup för att använda SRV-poster."
-#: ../src/features_window.py:83
+#: ../src/features_window.py:77
msgid "Spell Checker"
-msgstr ""
+msgstr "Stavningskontroll"
-#: ../src/features_window.py:84
+#: ../src/features_window.py:78
msgid "Spellchecking of composed messages."
-msgstr ""
+msgstr "Stavningskontrollerar meddelanden."
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
+#: ../src/features_window.py:79
+msgid "Requires libgtkspell."
+msgstr "Kräver libgtkspell."
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr ""
+#: ../src/features_window.py:81
+msgid "Notification"
+msgstr "Notifiering"
-#: ../src/features_window.py:88
+#: ../src/features_window.py:82
msgid "Passive popups notifying for new events."
msgstr ""
-#: ../src/features_window.py:89
+#: ../src/features_window.py:83
msgid ""
"Requires python-notify or instead python-dbus in conjunction with "
"notification-daemon."
msgstr ""
+"Kräver python-notify eller python-dbus i kombination med notification-daemon."
-#: ../src/features_window.py:91
+#: ../src/features_window.py:85
msgid "Trayicon"
-msgstr ""
+msgstr "Aktivitetsikon"
-#: ../src/features_window.py:92
+#: ../src/features_window.py:86
msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
+msgstr "En ikon i aktivitetsfältet som beskriver aktuell närvaro."
-#: ../src/features_window.py:93
+#: ../src/features_window.py:87
msgid ""
"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
msgstr ""
+"Kräver python-gnome2-extras eller kompilerad trayicon-modul från Gajims "
+"källkod."
-#: ../src/features_window.py:94
+#: ../src/features_window.py:88
msgid "Requires PyGTK >= 2.10."
-msgstr ""
+msgstr "Kräver PyGTK >= 2.10."
-#: ../src/features_window.py:95
-#, fuzzy
-msgid "Idle"
-msgstr "ID"
+#: ../src/features_window.py:89
+msgid "Automatic status"
+msgstr "Automatisk status"
-#: ../src/features_window.py:96
+#: ../src/features_window.py:90
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 ""
+#: ../src/features_window.py:91
+msgid "Requires libxss library."
+msgstr "Kräver libxss-biblioteket."
-#: ../src/features_window.py:99
+#: ../src/features_window.py:92
+msgid "Requires python2.5."
+msgstr "Kräver python2.5."
+
+#: ../src/features_window.py:93
msgid "LaTeX"
-msgstr ""
+msgstr "LaTeX"
-#: ../src/features_window.py:100
+#: ../src/features_window.py:94
msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
+msgstr "Transformera LaTeX-uttryck mellan $$ $$."
-#: ../src/features_window.py:101
+#: ../src/features_window.py:95
msgid ""
"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
"in the Advanced Configuration Editor."
msgstr ""
-#: ../src/features_window.py:102
+#: ../src/features_window.py:96
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
+#: ../src/features_window.py:97
#, fuzzy
-msgid "End to End Encryption"
+msgid "End to End message encryption"
msgstr "OpenPGP-kryptering"
-#: ../src/features_window.py:104
-#, fuzzy
-msgid "Encrypting chatmessages."
-msgstr "_Inkommande meddelande:"
+#: ../src/features_window.py:98
+msgid "Encrypting chat messages."
+msgstr "Krypterar chattmeddelanden."
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:99 ../src/features_window.py:100
msgid "Requires python-crypto."
-msgstr ""
+msgstr "Kräver python-crypto."
-#: ../src/features_window.py:107
-#, fuzzy
+#: ../src/features_window.py:101
msgid "RST Generator"
-msgstr "Generellt"
+msgstr "RST-generator"
-#: ../src/features_window.py:108
+#: ../src/features_window.py:102
msgid ""
"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
"docs/ref/rst/restructuredtext.html)."
msgstr ""
-#: ../src/features_window.py:109 ../src/features_window.py:110
+#: ../src/features_window.py:103 ../src/features_window.py:104
msgid "Requires python-docutils."
-msgstr ""
+msgstr "Kräver python-docutils."
-#: ../src/features_window.py:111
-msgid "libsexy"
-msgstr ""
+#: ../src/features_window.py:105
+msgid "Banners and clickable links"
+msgstr "Banners och klickbara länkar"
-#: ../src/features_window.py:112
+#: ../src/features_window.py:106
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:107 ../src/features_window.py:108
msgid "Requires python-sexy."
-msgstr ""
+msgstr "Kräver python-sexy."
-#: ../src/features_window.py:128
-#, fuzzy
+#: ../src/features_window.py:122
msgid "Feature"
-msgstr "Serverns funktioner"
+msgstr "Funktion"
#: ../src/filetransfers_window.py:76
msgid "File"
@@ -7438,7 +7317,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:495
msgid "You"
msgstr "Du"
@@ -7462,37 +7341,34 @@
msgstr "Filöverföring färdig"
#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
-#, fuzzy
msgid "File transfer cancelled"
-msgstr "Filöverföring avbruten"
+msgstr "Filöverföringen avbruten"
#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
msgid "Connection with peer cannot be established."
-msgstr "Förbindelse med motpart kan inte etableras."
+msgstr "Anslutning med motpart kan inte etableras."
#: ../src/filetransfers_window.py:228
-#, fuzzy, python-format
+#, python-format
msgid "Recipient: %s"
-msgstr "Mottagare: "
+msgstr "Mottagare: %s"
#: ../src/filetransfers_window.py:230
-#, fuzzy, python-format
+#, python-format
msgid "Error message: %s"
-msgstr "Skriv ditt meddelande:"
+msgstr "Felmeddelande: %s"
#: ../src/filetransfers_window.py:231
-#, fuzzy
msgid "File transfer stopped by the contact at the other end"
-msgstr "Filöverföring stoppad av motparten"
+msgstr "Filöverföringen stoppades av kontakten på andra sidan"
#: ../src/filetransfers_window.py:252
msgid "Choose File to Send..."
msgstr "Välj fil att skicka..."
#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
-#, fuzzy
msgid "Description: "
-msgstr "Beskrivning: %s"
+msgstr "Beskrivning: "
#: ../src/filetransfers_window.py:279
msgid "Gajim cannot access this file"
@@ -7522,12 +7398,12 @@
msgid "%s wants to send you a file:"
msgstr "%s vill skicka en fil till dig:"
-#: ../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 "Kan inte skriv över filen \"%s\""
+msgstr "Kan inte skriva över befintliga filen \"%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."
@@ -7535,22 +7411,22 @@
"En fil med det här namnet existerar redan och du har inte rättigheter att "
"skriva över den."
-#: ../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 "Den här filen finns redan"
-#: ../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 "Vad vill du göra?"
#. 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 "Katalogen \"%s\" är inte skrivbar"
-#: ../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 "Du har inte rättigheter att skapa filer i den här katalogen."
@@ -7594,69 +7470,62 @@
msgid "Sender: "
msgstr "Sändare: "
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
msgid "Pause"
msgstr "Paus"
-#: ../src/gajim.py:83
+#: ../src/gajim.py:92
#, python-format
msgid "%s is not a valid loglevel"
-msgstr ""
+msgstr "%s är inte en giltig loggnivå"
-#: ../src/gajim.py:156
-#, fuzzy
+#: ../src/gajim.py:164
msgid "Gajim needs X server to run. Quiting..."
-msgstr "Gajim behöver Xserver för att fungera. Avbryter..."
+msgstr "Gajim behöver Xserver för att köra. Avbryter..."
-#: ../src/gajim.py:186
-#, fuzzy
+#: ../src/gajim.py:193
msgid "Gajim needs PyGTK 2.8 or above"
-msgstr "Gajim behöver PyGTK 2.6 eller senare"
+msgstr "Gajim behöver PyGTK 2.8 eller senare"
-#: ../src/gajim.py:187
-#, fuzzy
+#: ../src/gajim.py:194
msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
-msgstr "Gajim behöver PyGTK 2.6 eller senare för att fungera. Avbryter..."
+msgstr "Gajim behöver PyGTK 2.8 eller senare för att köra. Avbryter..."
-#: ../src/gajim.py:189
-#, fuzzy
+#: ../src/gajim.py:196
msgid "Gajim needs GTK 2.8 or above"
-msgstr "Gajim behöver GTK 2.6 eller senare"
+msgstr "Gajim behöver GTK 2.8 eller senare"
-#: ../src/gajim.py:190
-#, fuzzy
+#: ../src/gajim.py:197
msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
-msgstr "Gajim behöver GTK 2.6 eller senare för att fungera. Avbryter..."
+msgstr "Gajim behöver GTK 2.8 eller senare för att köra. Avbryter..."
-#: ../src/gajim.py:195
+#: ../src/gajim.py:202
msgid "GTK+ runtime is missing libglade support"
msgstr "GTK+ runtime saknar libgladestöd"
-#: ../src/gajim.py:197
+#: ../src/gajim.py:204
#, python-format
msgid ""
"Please remove your current GTK+ runtime and install the latest stable "
"version from %s"
msgstr ""
-"Vänligen ta bort din nuvarande GTK+ runtime och installera senaste stabila "
-"version från %s"
+"Ta bort din nuvarande GTK+ runtime och installera senaste stabila version "
+"från %s"
-#: ../src/gajim.py:199
+#: ../src/gajim.py:206
msgid ""
"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Vänligen kontrollera att GTK+ och PyGTK har libgladestöd i ditt system."
+msgstr "Kontrollera att GTK+ och PyGTK har libglade-stöd i ditt system."
-#: ../src/gajim.py:204
+#: ../src/gajim.py:211
msgid "Gajim needs PySQLite2 to run"
msgstr "Gajim behöver PySQLite2 för att fungera"
-#: ../src/gajim.py:212
-#, fuzzy
+#: ../src/gajim.py:219
msgid "Gajim needs pywin32 to run"
-msgstr "Gajim behöver PySQLite2 för att fungera"
+msgstr "Gajim behöver pywin32 för att köra"
-#: ../src/gajim.py:213
+#: ../src/gajim.py:220
#, python-format
msgid ""
"Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7665,11 +7534,11 @@
"Kontrollera att Pywin32 är installerat på ditt system. Du kan hämta det på %s"
#. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:374
msgid "Gajim is already running"
msgstr "Gajim körs redan"
-#: ../src/gajim.py:367
+#: ../src/gajim.py:375
msgid ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
@@ -7677,177 +7546,226 @@
"En annan instans of Gajim verkar redan vara igång\n"
"Starta ändå?"
-#: ../src/gajim.py:493
+#: ../src/gajim.py:460
msgid "Passphrase Required"
msgstr "Lösenfras krävs"
-#: ../src/gajim.py:494
-#, fuzzy, python-format
+#: ../src/gajim.py:461
+#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Skriv in GPG-nyckelns lösenfras för konto %s."
+msgstr ""
+"Ange GPG-nyckelns lösenfras för nyckeln %(keyid)s (kontot %(account)s)."
+#: ../src/gajim.py:475
+#, fuzzy
+msgid "GPG key expired"
+msgstr "Ingen GPG-nyckel tilldelad"
+
+#: ../src/gajim.py:476
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Du kommer ansluta till %s utan OpenPGP."
+
#. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:485
msgid "Wrong Passphrase"
-msgstr "Fel Lösenfras"
+msgstr "Felaktig lösenfras"
-#: ../src/gajim.py:510
+#: ../src/gajim.py:486
msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Vänligen skriv om ditt GPG-lösenord eller tryck Avbryt."
+msgstr "Ange ditt GPG-lösenord igen eller tryck på Avbryt."
-#: ../src/gajim.py:557
-#, fuzzy, python-format
+#: ../src/gajim.py:549
+#, 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 ""
-"Ditt önskade smeknamn används redan eller är registrerat av en annan "
-"deltagare.\n"
-"Vänligen ange ett annat smeknamn nedan:"
+"Ditt önskade smeknamn i gruppchatten %s används redan eller är registrerat "
+"av\n"
+"en annan deltagare. Ange ett annat smeknamn nedan:"
-#: ../src/gajim.py:571
+#: ../src/gajim.py:563
msgid "Do you accept this request?"
msgstr "Accepterar du den här förfrågan?"
-#: ../src/gajim.py:573
-#, fuzzy, python-format
+#: ../src/gajim.py:565
+#, python-format
msgid "Do you accept this request on account %s?"
-msgstr "Accepterar du den här förfrågan?"
+msgstr "Accepterar du den här begäran på kontot %s?"
-#: ../src/gajim.py:576
-#, fuzzy, python-format
+#: ../src/gajim.py:568
+#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%s) Auktorisering för %s (id: %s)"
+msgstr "HTTP (%(method)s)-auktorisering för %(url)s (id: %(id)s)"
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
-#, fuzzy
+#: ../src/gajim.py:619 ../src/notify.py:493 ../src/osx/growler.py:17
msgid "Connection Failed"
-msgstr "Förbindelse"
+msgstr "Anslutningsfel"
-#: ../src/gajim.py:930 ../src/gajim.py:934
-#, fuzzy, python-format
+#: ../src/gajim.py:937 ../src/gajim.py:941
+#, python-format
msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s: %(message)s"
+msgstr "Fel %(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:951 ../src/gajim.py:965
+#, python-format
msgid "error while sending %(message)s ( %(error)s )"
-msgstr "problem vid sändning %s ( %s )"
+msgstr "fel vid sändning av %(message)s ( %(error)s )"
-#: ../src/gajim.py:989
+#: ../src/gajim.py:988 ../src/notify.py:495
+#, fuzzy
+msgid "Subscription request"
+msgstr "Prenumerationsbegäran"
+
+#: ../src/gajim.py:1013
msgid "Authorization accepted"
msgstr "Auktorisering accepterad"
-#: ../src/gajim.py:990
+#: ../src/gajim.py:1014
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "Kontakten \"%s\" har auktoriserat dig att se hans eller hennes status."
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1026
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
-#: ../src/gajim.py:1010
+#: ../src/gajim.py:1027
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
msgstr ""
+"Du kommer alltid att se honom eller henne som frånkopplad.\n"
+"Vill du ta bort honom eller henne från din kontaktlista?"
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1052 ../src/notify.py:497
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Säg _upp prenumeration"
+
+#: ../src/gajim.py:1093
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "Kontakt med \"%s\" kan inte etableras"
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
-#, fuzzy, python-format
+#: ../src/gajim.py:1281 ../src/groupchat_control.py:1166
+#, python-format
msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s är nu känd som %s"
+msgstr "%(nick)s är nu känd som %(new_nick)s"
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../src/notify.py:232
+#: ../src/gajim.py:1299 ../src/groupchat_control.py:1341
+#: ../src/history_window.py:428 ../src/notify.py:232
#, python-format
msgid "%(nick)s is now %(status)s"
msgstr "%(nick)s är nu %(status)s"
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1366
#, python-format
msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
+msgstr "%(jid)s har ställt in ämnet till %(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:1430 ../src/groupchat_control.py:1126
msgid "Any occupant is allowed to see your full JID"
msgstr ""
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1433
msgid "Room now shows unavailable member"
-msgstr ""
+msgstr "Rummet visar nu otillgängliga medlemmar"
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1435
msgid "room now does not show unavailable members"
-msgstr ""
+msgstr "rummet visar nu inga otillgängliga medlemmar"
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1438
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:1441
msgid "Room logging is now enabled"
-msgstr ""
+msgstr "Rumsloggning är nu aktiverad"
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1443
msgid "Room logging is now disabled"
-msgstr ""
+msgstr "Rumsloggning är nu inaktiverad"
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1445
msgid "Room is now non-anonymous"
msgstr ""
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1448
msgid "Room is now semi-anonymous"
msgstr ""
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1451
msgid "Room is now fully-anonymous"
msgstr ""
-#: ../src/gajim.py:1425
-#, fuzzy, python-format
+#: ../src/gajim.py:1483
+#, python-format
msgid "A Password is required to join the room %s. Please type it."
-msgstr "Det krävs en lösenfras för att ansluta till detta rum."
+msgstr "Ett lösenord krävs för att gå in i rummet %s. Ange lösenordet."
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1517
msgid ""
"You configured Gajim to use GPG agent, but there is no GPG agent running or "
"it returned a wrong passphrase.\n"
msgstr ""
+"Du har konfigurerat Gajim till att använda GPG-agent, men det finns ingen "
+"GPG-agent igång eller så returnerade den en felaktig lösenfras.\n"
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1519
msgid "You are currently connected without your OpenPGP key."
msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1522
msgid "Your passphrase is incorrect"
msgstr "Din lösenfras är inkorrekt."
-#: ../src/gajim.py:1564
-#, fuzzy, python-format
+#: ../src/gajim.py:1545
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG är inte användbar"
+
+#: ../src/gajim.py:1545
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gajim.py:1547 ../src/gajim.py:2185 ../src/gajim.py:2220
+#: ../src/groupchat_control.py:1849 ../src/roster_window.py:3826
+msgid "Do _not ask me again"
+msgstr "Fråga mig i_nte igen"
+
+#: ../src/gajim.py:1555
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring är installerad men inte \t\t\t\t\t\t\tkorrekt startad "
+"(miljövariabeln är förmodligen inte \t\t\t\t\t\t\tkorrekt inställd)"
+
+#: ../src/gajim.py:1662
+#, python-format
msgid "New mail on %(gmail_mail_address)s"
-msgstr "Ny Epost på %(gmail_mail_address)s"
+msgstr "Ny e-post på %(gmail_mail_address)s"
-#: ../src/gajim.py:1566
-#, fuzzy, python-format
+#: ../src/gajim.py:1664
+#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
-msgstr[0] "Du har %d oläst E-postmeddelanden"
-msgstr[1] "Du har %d olästa E-postmeddelanden"
+msgstr[0] "Du har %d ny e-postkonversation"
+msgstr[1] "Du har %d nya e-postkonversationer"
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1677
#, python-format
msgid ""
"\n"
@@ -7856,288 +7774,292 @@
"Subject: %(subject)s\n"
"%(snippet)s"
msgstr ""
+"\n"
+"\n"
+"Från: %(from_address)s\n"
+"Ämne: %(subject)s\n"
+"%(snippet)s"
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1748
#, python-format
msgid "%s wants to send you a file."
msgstr "%s vill skicka en fil till dig."
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1816
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "%(filename)s har mattagits från %(name)s."
#. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1820
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "Överföringen av %(filename)s från %(name)s har stannat."
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1833
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "%(filename)s har skickats till %(name)s."
#. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1837
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "Överföringen av %(filename)s till %(name)s har stannat."
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1925
#, python-format
msgid ""
"Unable to decrypt message from %s\n"
"It may have been tampered with."
msgstr ""
-#: ../src/gajim.py:1830
-#, fuzzy
+#: ../src/gajim.py:1932
msgid "Unable to decrypt message"
-msgstr "Vid varje _meddelande"
+msgstr "Kunde inte dekryptera meddelande"
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:2006
msgid "Username Conflict"
msgstr "Användarnamn-konflikt"
-#: ../src/gajim.py:1902
-#, fuzzy
+#: ../src/gajim.py:2007
msgid "Please type a new username for your local account"
-msgstr "<b>Vänligen fyll i informationen för ditt nya konto</b>"
+msgstr "Ange ett nytt användarnamn för ditt lokala konto"
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2019
msgid "Ping?"
-msgstr ""
+msgstr "Ping?"
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2032
#, python-format
msgid "Pong! (%s s.)"
-msgstr ""
+msgstr "Pong! (%s s.)"
-#: ../src/gajim.py:1938
-#, fuzzy
+#: ../src/gajim.py:2043
msgid "Error."
-msgstr "Fel:"
+msgstr "Fel."
-#: ../src/gajim.py:1963
-#, fuzzy
+#: ../src/gajim.py:2068
msgid "Resource Conflict"
-msgstr "Användarnamn-konflikt"
+msgstr "Resurskonflikt"
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:2069
msgid ""
"You are already connected to this account with the same resource. Please "
"type a new one"
-msgstr ""
+msgstr "Du är redan ansluten till detta konto med samma resurs. Ange en annan"
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2124
msgid "Error verifying SSL certificate"
-msgstr ""
+msgstr "Fel vid verifiering av SSL-certifikat"
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2125
#, 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 ""
+"Det uppstod ett fel vid verifiering av SSL-certifikatet på din jabber-"
+"server: %(error)s\n"
+"Vill du fortfarande ansluta till denna server?"
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2130
msgid "Ignore this error for this certificate."
-msgstr ""
+msgstr "Ignorera detta fel med certifikatet."
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2150
msgid "SSL certificate error"
-msgstr ""
+msgstr "SSL-certifikatfel"
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2151
#, python-format
msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
"Old fingerprint: %(old)s\n"
"New fingerprint: %(new)s\n"
"\n"
"Do you still want to connect and update the fingerprint of the certificate?"
msgstr ""
+"Det verkar som om SSL-certifikatet för kontot %(account)s har ändrats eller "
+"att din anslutning har komprometterats.\n"
+"Gammalt fingeravtryck: %(old)s\n"
+"Nytt fingeravtryck: %(new)s\n"
+"\n"
+"Vill du fortfarande ansluta och uppdatera fingeravtrycket för certifikatet?"
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
-#, fuzzy
+#: ../src/gajim.py:2181 ../src/gajim.py:2216
msgid "Insecure connection"
-msgstr "Förbindelse"
+msgstr "Osäker anslutning"
-#: ../src/gajim.py:2062
-#, fuzzy
+#: ../src/gajim.py:2182
msgid ""
"You are about to send your password on an unencrypted connection. Are you "
"sure you want to do that?"
-msgstr "Du måste skapa ett konto innan du kan chatta med andra kontakter."
+msgstr ""
+"Du är på väg att skicka ditt lösenord över en okrypterad anslutning. Är du "
+"säker på att du vill göra det?"
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2184 ../src/gajim.py:2219
msgid "Yes, I really want to connect insecurely"
-msgstr ""
+msgstr "Ja, jag vill verkligen ansluta på ett osäkert sätt"
-#: ../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 "Fråga mig i_nte igen"
-
-#: ../src/gajim.py:2092
+#: ../src/gajim.py:2217
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 ""
+"Du är på väg att skicka ditt lösenord över en osäker anslutning. Du bör "
+"installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
+"skicka lösenordet?"
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2237
msgid "PEP node was not removed"
msgstr ""
-#: ../src/gajim.py:2110
+#: ../src/gajim.py:2238
#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
msgstr ""
#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2575 ../src/gajim.py:2596
-#, fuzzy
+#: ../src/gajim.py:2724 ../src/gajim.py:2746
msgid "Emoticons disabled"
-msgstr "Kryptering deaktiverad"
+msgstr "Känsloikoner inaktiverade"
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2725
msgid ""
"Your configured emoticons theme has not been found, so emoticons have been "
"disabled."
msgstr ""
-#: ../src/gajim.py:2597
+#: ../src/gajim.py:2747
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 ""
-#: ../src/gajim.py:2623 ../src/roster_window.py:3324
-#, fuzzy
+#: ../src/gajim.py:2773 ../src/roster_window.py:3314
msgid "You cannot join a group chat while you are invisible"
-msgstr "Du kan inte ansluta till ett rum när du är osynlig"
+msgstr "Du kan inte gå in i en gruppchatt när du är osynlig"
#. 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:3051
msgid "Could not save your settings and preferences"
msgstr "Kunde inte spara dina inställningar"
-#: ../src/gajim.py:3000
+#: ../src/gajim.py:3148
msgid "Bookmark already set"
msgstr "Bokmärke finns redan"
-#: ../src/gajim.py:3001
-#, fuzzy, python-format
+#: ../src/gajim.py:3149
+#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Rummet \"%s\" finns redan i dina bokmärken."
+msgstr "Gruppchatten \"%s\" finns redan i dina bokmärken."
-#: ../src/gajim.py:3014
+#: ../src/gajim.py:3162
msgid "Bookmark has been added successfully"
-msgstr "Bokmärke har blivit ordentligt tillagt"
+msgstr "Bokmärket har lagts till"
-#: ../src/gajim.py:3015
+#: ../src/gajim.py:3163
msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Du kan hantera dina bokmärken via åtgärdsmenyn i ditt register."
+msgstr "Du kan hantera dina bokmärken via åtgärdsmenyn i din kontaktlista."
-#: ../src/gajim-remote.py:79
-#, fuzzy
+#: ../src/gajim-remote.py:81
msgid "Shows a help on specific command"
-msgstr "visar hjälp för ett specifikt kommando"
+msgstr "Visar hjälp för ett specifikt kommando"
#. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:84
msgid "command"
msgstr "kommando"
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:85
msgid "show help on command"
msgstr "visar hjälp för kommando"
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:89
msgid "Shows or hides the roster window"
-msgstr "Visar eller gömmer registerfönstret"
+msgstr "Visar eller döljer kontaktlistan"
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:93
#, fuzzy
msgid "Pops up a window with the next pending event"
msgstr "Öppnar ett fönster med nästa olästa meddelande"
-#: ../src/gajim-remote.py:95
-#, fuzzy
+#: ../src/gajim-remote.py:97
msgid ""
"Prints a list of all contacts in the roster. Each contact appears on a "
"separate line"
msgstr ""
-"Skriv ut en lista på alla kontakter i registret. Varje kontakt hamnar på en "
-"egen rad"
+"Skriver ut en lista över alla kontakter i kontaktlistan. Varje kontakt "
+"hamnar på en egen rad"
-#: ../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:100 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:272
msgid "account"
msgstr "konto"
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:100
msgid "show only contacts of the given account"
msgstr "visa bara kontakter för det givna kontot"
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:106
msgid "Prints a list of registered accounts"
msgstr "Skriver ut en lista över registrerade konton"
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:110
msgid "Changes the status of account or accounts"
msgstr "Ändrar status för konto eller konton"
#. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:113
msgid "status"
msgstr "status"
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:113
msgid "one of: offline, online, chat, away, xa, dnd, invisible "
msgstr "en av: offline, online, chat, away, xa, dnd, invisible "
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:160
msgid "message"
msgstr "meddelande"
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:114
msgid "status message"
msgstr "statusmeddelande"
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:115
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 ""
-"ändra status för konto \"konto\". Om inte specificerad, försök ändra status "
-"på alla konton som har \"synka med global status\" satt"
+"ändra status för kontot \"konto\". Om inte angivet, försök ändra status på "
+"alla konton som har alternativet \"synkronisera med global status\" inställt"
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:121
msgid "Shows the chat dialog so that you can send messages to a contact"
msgstr "Visa chattdialogen så att du kan skicka meddelanden till en kontakt"
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:123
msgid "JID of the contact that you want to chat with"
msgstr "JID för kontakten som du vill chatta med"
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:212
msgid "if specified, contact is taken from the contact list of this account"
msgstr ""
"om specificerat tas kontakten bort från kontaktlistan för det här kontot"
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:130
#, fuzzy
msgid ""
"Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8148,30 +8070,30 @@
"konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
"sätt bara \"OpenPGP-nyckel\" till \"\"."
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
msgid "JID of the contact that will receive the message"
msgstr "JID för kontakten som kommer ta emot meddelandet"
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
msgid "message contents"
msgstr "meddelandeinnehåll"
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
msgid "pgp key"
msgstr "pgp-nyckel"
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
msgid "if specified, the message will be encrypted using this public key"
msgstr ""
"om specificerat kommer meddelandet bli krypterat med den här publika nyckeln"
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
msgid "if specified, the message will be sent using this account"
msgstr "om specificerat kommer meddelandet bli skickat genom det här kontot"
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
#, fuzzy
msgid ""
"Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8182,144 +8104,137 @@
"konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
"sätt bara \"OpenPGP-nyckel\" till \"\"."
-#: ../src/gajim-remote.py:146
-#, fuzzy
+#: ../src/gajim-remote.py:148
msgid "subject"
-msgstr "Ämne"
+msgstr "ämne"
-#: ../src/gajim-remote.py:146
-#, fuzzy
+#: ../src/gajim-remote.py:148
msgid "message subject"
-msgstr "Meddelande Skickat"
+msgstr "meddelandeämne"
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
msgid "Sends new message to a groupchat you've joined."
-msgstr ""
+msgstr "Skickar nytt meddelande till en gruppchatt som du gått in i."
-#: ../src/gajim-remote.py:157
-#, fuzzy
+#: ../src/gajim-remote.py:159
msgid "JID of the room that will receive the message"
-msgstr "JID för kontakten som kommer ta emot meddelandet"
+msgstr "JID för rummet som kommer ta emot meddelandet"
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
msgid "Gets detailed info on a contact"
msgstr "Hämta detaljerad information om kontakt"
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
msgid "JID of the contact"
msgstr "JID för kontakten"
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
msgid "Gets detailed info on a account"
msgstr "Hämtar detaljerad information för kontakt"
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
msgid "Name of the account"
msgstr "Namn för kontot"
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
msgid "Sends file to a contact"
msgstr "Skicka fil till en kontakt"
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
msgid "file"
msgstr "fil"
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
msgid "File path"
msgstr "Sökväg"
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
msgid "if specified, file will be sent using this account"
msgstr "om specificerat kommer filen bli skickad genom det här kontot"
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
msgid "Lists all preferences and their values"
msgstr "Listar alla inställningar och deras värden"
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
msgid "Sets value of 'key' to 'value'."
msgstr "Sätter värdet av \"nyckel\" till \"värde\"."
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
msgid "key=value"
msgstr "nyckel=värde"
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
msgid "'key' is the name of the preference, 'value' is the value to set it to"
msgstr ""
"\"nyckel\" är namnet på inställningen, \"värde\" är värdet att sätta den till"
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
msgid "Deletes a preference item"
msgstr "Tar bort en inställning"
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
msgid "key"
msgstr "nyckel"
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
msgid "name of the preference to be deleted"
msgstr "namnet på inställningen som skall tas bort"
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
msgid "Writes the current state of Gajim preferences to the .config file"
msgstr "Skriver Gajims nuvarande inställningar till .config-filen"
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
msgid "Removes contact from roster"
-msgstr "Ta bort en kontakt från register"
+msgstr "Ta bort en kontakt från kontaktlista"
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
msgid "Adds contact to roster"
-msgstr "Lägger till en kontakt till registret"
+msgstr "Lägger till en kontakt till kontaktlistan"
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
msgid "jid"
msgstr "JID"
-#: ../src/gajim-remote.py:219
-#, fuzzy
+#: ../src/gajim-remote.py:221
msgid "Adds new contact to this account"
-msgstr "Lägger till ny kontakt till detta kontot."
+msgstr "Lägger till ny kontakt till detta kontot"
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
msgid "Returns current status (the global one unless account is specified)"
msgstr ""
"Returnerar nuvarande status (global status om inget konto specificerats)"
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
msgid ""
"Returns current status message (the global one unless account is specified)"
msgstr ""
"Returnerar nuvarande statusmeddelande (det globala om inget konto "
"specificerats)"
-#: ../src/gajim-remote.py:238
-#, fuzzy
+#: ../src/gajim-remote.py:240
msgid "Returns number of unread messages"
msgstr "Returnerar antalet olästa meddelanden"
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
msgid "Opens 'Start Chat' dialog"
msgstr "Öppnar \"Starta chatt\" dialogen"
-#: ../src/gajim-remote.py:244
-#, fuzzy
+#: ../src/gajim-remote.py:246
msgid "Starts chat, using this account"
-msgstr "Starta Chatt med konto %s"
+msgstr "Startar chatt, med detta kontot"
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
msgid "Sends custom XML"
msgstr "Skickar anpassad XML"
-#: ../src/gajim-remote.py:250
-#, fuzzy
+#: ../src/gajim-remote.py:252
msgid "XML to send"
-msgstr "XML-konsol"
+msgstr "XML att skicka"
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
msgid ""
"Account in which the xml will be sent; if not specified, xml will be sent to "
"all accounts"
@@ -8327,109 +8242,104 @@
"Konto för vilket XML kommer skickas. Om du inte specificerat kommer XML "
"skickas till alla konton"
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
msgid "Handle a xmpp:/ uri"
msgstr "Hantera en xmpp:/ URI"
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
msgid "uri"
msgstr "URI"
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
msgid "URI to handle"
-msgstr ""
+msgstr "URI att hantera"
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
msgid "Account in which you want to handle it"
-msgstr ""
+msgstr "Konto i vilket du vill hanterare den"
-#: ../src/gajim-remote.py:265
-#, fuzzy
+#: ../src/gajim-remote.py:267
msgid "Join a MUC room"
-msgstr "Anslut till nytt _rum"
+msgstr "Gå in i ett MUC-rum"
-#: ../src/gajim-remote.py:267
-#, fuzzy
+#: ../src/gajim-remote.py:269
msgid "room"
-msgstr "Från"
+msgstr "rum"
-#: ../src/gajim-remote.py:267
-#, fuzzy
+#: ../src/gajim-remote.py:269
msgid "Room JID"
-msgstr "Rum:"
+msgstr "Rummets JID"
-#: ../src/gajim-remote.py:268
-#, fuzzy
+#: ../src/gajim-remote.py:270
msgid "nick"
-msgstr "Smeknamn"
+msgstr "smeknamn"
-#: ../src/gajim-remote.py:268
-#, fuzzy
+#: ../src/gajim-remote.py:270
msgid "Nickname to use"
-msgstr "Smeknamnet kunde inte hittas: %s"
+msgstr "Smeknamn att använda"
-#: ../src/gajim-remote.py:269
-#, fuzzy
+#: ../src/gajim-remote.py:271
msgid "password"
-msgstr "Lösenord:"
+msgstr "lösenord"
-#: ../src/gajim-remote.py:269
-#, fuzzy
+#: ../src/gajim-remote.py:271
msgid "Password to enter the room"
-msgstr "Lösenorden stämmer inte överens"
+msgstr "Lösenord för att gå in i rummet"
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:272
msgid "Account from which you want to enter the room"
-msgstr ""
+msgstr "Konto från vilket du vill gå in i rummet"
-#: ../src/gajim-remote.py:275
-#, fuzzy
+#: ../src/gajim-remote.py:277
msgid "Check if Gajim is running"
-msgstr "Kontrollera om avahi-daemon körs."
+msgstr "Kontrollera om Gajim är igång"
-#: ../src/gajim-remote.py:279
-#, fuzzy
+#: ../src/gajim-remote.py:281
msgid "Shows or hides the ipython window"
-msgstr "Visar eller gömmer registerfönstret"
+msgstr "Visar eller döljer ipython-fönstret"
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:308
msgid "Missing argument \"contact_jid\""
msgstr "Saknar argument \"contact_jid\""
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:327
#, python-format
msgid ""
"'%s' is not in your roster.\n"
"Please specify account for sending the message."
msgstr ""
-"\"%s\" finns inte i ditt register.\n"
-"Specificera konto för att skicka meddelandet."
+"\"%s\" finns inte i din kontaktlista.\n"
+"Ange konto för att skicka meddelandet."
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:330
msgid "You have no active account"
msgstr "Du har inget aktivt konto"
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:382
msgid "It seems Gajim is not running. So you can't use gajim-remote."
msgstr ""
+"Det verkar som om Gajim inte är igång. Därför kan du inte använda gajim-"
+"remote."
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:405
#, python-format
msgid ""
"Usage: %(basename)s %(command)s %(arguments)s \n"
"\t %(help)s"
msgstr ""
+"Användning: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:409
msgid "Arguments:"
msgstr "Parametrar:"
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:413
#, python-format
msgid "%s not found"
msgstr "%s kunde inte hittas"
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:417
#, python-format
msgid ""
"Usage: %s command [arguments]\n"
@@ -8438,25 +8348,25 @@
"Användning: %s kommando [parametrar]\n"
"Kommando är en av:\n"
-#: ../src/gajim-remote.py:493
-#, fuzzy, python-format
+#: ../src/gajim-remote.py:482
+#, python-format
msgid ""
"Too many arguments. \n"
"Type \"%(basename)s help %(command)s\" for more info"
msgstr ""
-"Parameter \"%s\" är inte specificerad. \n"
-"Skriv \"%s help %s\" för mer info"
+"För många argument. \n"
+"Skriv \"%(basename)s help %(command)s\" för mer information"
-#: ../src/gajim-remote.py:498
-#, fuzzy, python-format
+#: ../src/gajim-remote.py:487
+#, python-format
msgid ""
"Argument \"%(arg)s\" is not specified. \n"
"Type \"%(basename)s help %(command)s\" for more info"
msgstr ""
-"Parameter \"%s\" är inte specificerad. \n"
-"Skriv \"%s help %s\" för mer info"
+"Argumentet \"%(arg)s\" är inte angivet. \n"
+"Skriv \"%(basename)s help %(command)s\" för mer info"
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:506
#, fuzzy
msgid "Wrong uri"
msgstr "Fel Lösenfras"
@@ -8466,13 +8376,12 @@
msgstr "Tema"
#: ../src/gajim_themes_window.py:97
-#, fuzzy
msgid "You cannot make changes to the default theme"
-msgstr "Du kan inte ta bort ditt nuvarande tema"
+msgstr "Du kan inte göra ändringar i standardtemat"
#: ../src/gajim_themes_window.py:98
msgid "Please create a clean new theme with your desired name."
-msgstr ""
+msgstr "Skapa ett nytt, tomt tema med ditt önskade namn."
#. don't confuse translators
#: ../src/gajim_themes_window.py:172
@@ -8485,156 +8394,153 @@
#: ../src/gajim_themes_window.py:190
msgid "Please first choose another for your current theme."
-msgstr "Vänligen välj ett annat tema först."
+msgstr "Välj först ett annat för ditt aktuella tema."
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
msgid "Sending private message failed"
msgstr "Skicka privat meddelande misslyckades"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:154
+#, python-format
msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
-msgstr "Du är inte längre i rummet \"%s\" eller \"%s\" har lämnat."
+msgstr ""
+"Du är inte längre i gruppchatten \"%(room)s\" eller \"%(nick)s\" har lämnat."
-#: ../src/groupchat_control.py:451
-#, fuzzy
+#: ../src/groupchat_control.py:453
msgid "Insert Nickname"
-msgstr "Byt smek_namn"
+msgstr "Infoga smeknamn"
-#: ../src/groupchat_control.py:603
-#, fuzzy
+#: ../src/groupchat_control.py:605
msgid "Conversation with "
-msgstr "Konversationshistorik"
+msgstr "Konversation med "
-#: ../src/groupchat_control.py:605
-#, fuzzy
+#: ../src/groupchat_control.py:607
msgid "Continued conversation"
-msgstr "Förbindelse"
+msgstr "Fortsatt konversation"
-#: ../src/groupchat_control.py:1027
+#: ../src/groupchat_control.py:1014
msgid "Really send file?"
-msgstr ""
+msgstr "Verkligen skicka filen?"
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1015
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
msgstr ""
+"Om du skickar en fil till %s så kommer han/hon att få veta ditt riktiga "
+"Jabber-ID."
#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1129
msgid "Room logging is enabled"
-msgstr ""
+msgstr "Rumsloggning är aktiverad"
-#: ../src/groupchat_control.py:1129
-#, fuzzy
+#: ../src/groupchat_control.py:1131
msgid "A new room has been created"
-msgstr "Ditt nya konto har skapats"
+msgstr "Ett nytt rum har skapats"
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1134
msgid "The server has assigned or modified your roomnick"
-msgstr ""
+msgstr "Servern har tilldelat eller ändrat ditt rumsnamn"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1140
#, python-format
msgid "%(nick)s has been kicked: %(reason)s"
msgstr "%(nick)s har blivit sparkad: %(reason)s"
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1144
#, python-format
msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
msgstr "%(nick)s har blivit sparkad av %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1151
#, python-format
msgid "%(nick)s has been banned: %(reason)s"
msgstr "%(nick)s har blivit bannlyst: %(reason)s"
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1155
#, python-format
msgid "%(nick)s has been banned by %(who)s: %(reason)s"
msgstr "%(nick)s har blivit bannlyst av %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1164
#, python-format
msgid "You are now known as %s"
msgstr "Du är nu känd som %s"
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1202 ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1211
+#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
-msgstr "%(nick)s har blivit sparkad av %(who)s: %(reason)s"
+msgstr "%(nick)s har tagits bort från rummet (%(reason)s)"
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1203
#, fuzzy
msgid "affiliation changed"
msgstr "Anknytning: "
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
msgid "room configuration changed to members-only"
-msgstr ""
+msgstr "rumskonfigurationen har ändrats till members-only"
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1213
msgid "system shutdown"
msgstr ""
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1282
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
msgstr ""
-#: ../src/groupchat_control.py:1284
+#: ../src/groupchat_control.py:1286
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
msgstr ""
-#: ../src/groupchat_control.py:1299
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1301
+#, python-format
msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
-msgstr "%(nick)s har blivit sparkad av %(who)s: %(reason)s"
+msgstr "** Rollen för %(nick)s har ställts in till %(role)s av %(actor)s"
-#: ../src/groupchat_control.py:1303
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1305
+#, python-format
msgid "** Role of %(nick)s has been set to %(role)s"
-msgstr "%(nick)s har blivit sparkad: %(reason)s"
+msgstr "** Rollen för %(nick)s har ställts in till %(role)s"
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1334
#, python-format
msgid "%s has left"
msgstr "%s har lämnat"
-#: ../src/groupchat_control.py:1337
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1339
+#, python-format
msgid "%s has joined the group chat"
-msgstr "I gruppen"
+msgstr "%s har gått in i gruppchatten"
#. Invalid Nickname
#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
+#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1737
msgid "Invalid nickname"
-msgstr "Ogiltigt användarnamn"
+msgstr "Ogiltigt smeknamn"
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1478 ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1582 ../src/groupchat_control.py:1599
#, python-format
msgid "Nickname not found: %s"
msgstr "Smeknamnet kunde inte hittas: %s"
-#: ../src/groupchat_control.py:1510
-#, fuzzy
+#: ../src/groupchat_control.py:1512
msgid "This group chat has no subject"
-msgstr "Det här rummet har inget ämne"
+msgstr "Denna gruppchatt saknar ämne"
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1524
#, python-format
msgid "Invited %(contact_jid)s to %(room_jid)s."
msgstr "Bjöd in %(contact_jid)s till %(room_jid)s."
-#: ../src/groupchat_control.py:1656
+#: ../src/groupchat_control.py:1660
#, fuzzy, python-format
msgid ""
"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8647,7 +8553,7 @@
"befinner sig i rummet kommer han/hon/den/det också att att bli sparkad. "
"Stödjer INTE mellanslag i smeknamn."
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1667
#, fuzzy, python-format
msgid ""
"Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8656,7 +8562,7 @@
"Användning: /%s <semknamn>, öppnar ett privat chattfönster till den "
"specificerade deltagaren."
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1673
#, python-format
msgid ""
"Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8665,7 +8571,7 @@
"Användning: /%s [anledning], stänger aktuellt fönster eller flik och visar "
"anledning om sådan specificerades."
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1679
#, fuzzy, python-format
msgid ""
"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8674,7 +8580,7 @@
"Användning: /%s <JID> [anledning], bjuder in JID till aktivt rum med en "
"valbar anledning."
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1683
#, python-format
msgid ""
"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8683,17 +8589,18 @@
"Användning: /%s <rum>@<server>[/smeknamn], erbjuder att delta i rum@server "
"med valbart smeknamn"
-#: ../src/groupchat_control.py:1683
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1687
+#, 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 ""
-"Användning: /%s <smeknamn> [anledning], tar bort medlemmen specificerad med "
-"smeknamn och visar en valbar anledning. Stödjer INTE mellanslag i smeknamnet."
+"Användning: /%s <smeknamn> [anledning], tar bort medlemmen angiven med "
+"smeknamn från gruppchatten och visar en valfri anledning. Tillåter INTE "
+"blanksteg i smeknamnet."
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1696
#, fuzzy, python-format
msgid ""
"Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8702,22 +8609,23 @@
"Användning: /%s <smeknamn> [meddelande], öppnar ett privat meddelandefönster "
"och skickar ett meddelande till medlemmen specificerad med smeknamn."
-#: ../src/groupchat_control.py:1697
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1701
+#, python-format
msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Användning /%s <smeknamn>, byter ditt smeknamn i aktivt rum."
+msgstr "Användning: /%s <smeknamn>, ändrar ditt smeknamn i aktuell gruppchatt."
-#: ../src/groupchat_control.py:1701
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1705
+#, python-format
msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Användning /%s [ämne], visar eller uppdaterar nuvarande ämne."
+msgstr "Användning: /%s, visa namnen för gruppchattens deltagare."
-#: ../src/groupchat_control.py:1705
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1709
+#, python-format
msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Användning /%s [ämne], visar eller uppdaterar nuvarande ämne."
+msgstr ""
+"Användning: /%s [ämne], visar eller uppdaterar ämnet för aktuell gruppchatt."
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1712
#, python-format
msgid ""
"Usage: /%s <message>, sends a message without looking for other commands."
@@ -8725,62 +8633,62 @@
"Användning: /%s <meddelande>, skickar meddelande utan att leta efter andra "
"kommandon."
-#: ../src/groupchat_control.py:1837
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1843
+#, python-format
msgid "Are you sure you want to leave group chat \"%s\"?"
-msgstr "Är du säker på att du vill lämna rum \"%s\"?"
+msgstr "Är du säker på att du vill lämna gruppchatten \"%s\"?"
-#: ../src/groupchat_control.py:1839
-#, fuzzy
+#: ../src/groupchat_control.py:1845
msgid ""
"If you close this window, you will be disconnected from this group chat."
msgstr ""
-"Om du stänger det här fönstret kommer du bli frånkopplad från det här rummet."
+"Du kommer att bli frånkopplad från denna gruppchatt om du stänger detta "
+"fönster."
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1882
msgid "Changing Subject"
msgstr "Ändrar Ämne"
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1883
msgid "Please specify the new subject:"
msgstr "Ange det nya ämnet:"
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1887
msgid "Changing Nickname"
msgstr "Byter Smeknamn"
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1888
msgid "Please specify the new nickname you want to use:"
msgstr "Ange det nya smeknamnet du vill använda:"
#. Ask for a reason
-#: ../src/groupchat_control.py:1908
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1915
+#, python-format
msgid "Destroying %s"
-msgstr "Beskrivning: %s"
+msgstr "Förstör %s"
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1916
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
msgstr ""
-#: ../src/groupchat_control.py:1911
+#: ../src/groupchat_control.py:1918
msgid "You may also enter an alternate venue:"
msgstr ""
#. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2089
#, python-format
msgid "Kicking %s"
msgstr "Sparkar %s"
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2090 ../src/groupchat_control.py:2381
msgid "You may specify a reason below:"
msgstr "Du kan ange en orsak här under:"
#. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2380
#, python-format
msgid "Banning %s"
msgstr "Bannlyser %s"
@@ -8794,12 +8702,12 @@
"It probably is not fatal, but should be reported to the developers "
"nonetheless."
msgstr ""
-"Det är antagligen inte förödande, men det bör rapporteras till utvecklarna "
-"likafullt."
+"Det är antagligen inte ödesdigert men det bör dock rapporteras till "
+"utvecklarna oavsett."
#: ../src/gtkexcepthook.py:54
msgid "_Report Bug"
-msgstr "_Rapportera Bug"
+msgstr "_Rapportera fel"
#: ../src/gtkexcepthook.py:77
msgid "Details"
@@ -8829,14 +8737,12 @@
#. xmpp: is currently handled by another program, so ask the user
#: ../src/gtkgui_helpers.py:733
-#, fuzzy
msgid "Gajim is not the default Jabber client"
-msgstr "Gajim - en GTK+ Jabberklient"
+msgstr "Gajim är inte standardklient för Jabber"
#: ../src/gtkgui_helpers.py:734
-#, fuzzy
msgid "Would you like to make Gajim the default Jabber client?"
-msgstr "Vill du skriva över den?"
+msgstr "Vill du göra Gajim till standardklient för Jabber?"
#: ../src/gtkgui_helpers.py:735
msgid "Always check to see if Gajim is the default Jabber client on startup"
@@ -8851,44 +8757,43 @@
msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
msgstr "Bilden kan inte sparas i %(type)s format. Spara som %(new_filename)s?"
-#: ../src/gtkgui_helpers.py:844
-#, fuzzy
+#: ../src/gtkgui_helpers.py:840
msgid "Save Image as..."
-msgstr "Spara fil som..."
+msgstr "Spara bild som..."
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:96
msgid "Cannot find history logs database"
msgstr "Kan inte hitta historie- och logdatabas"
#. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:136
msgid "Contacts"
msgstr "Kontakter"
#. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:149 ../src/history_manager.py:189
#: ../src/history_window.py:95
msgid "Date"
msgstr "Datum"
#. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:155 ../src/history_manager.py:207
msgid "Nickname"
msgstr "Smeknamn"
#. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:163 ../src/history_manager.py:195
#: ../src/history_window.py:103
msgid "Message"
msgstr "Meddelande"
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:223
msgid ""
"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
"RUNNING)"
msgstr "Vill du städa upp databasen? (DU AVRÅDS ATT GÖRA DETTA OM GAJIM KÖRS)"
-#: ../src/history_manager.py:226
+#: ../src/history_manager.py:225
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 "
@@ -8896,119 +8801,117 @@
"\n"
"In case you click YES, please wait..."
msgstr ""
-"Normalt så förgörst inte den allokerade databasen, den blir bara "
+"Normalt så frigörs inte den allokerade databasen, den blir bara "
"återanvändbar. Om du verkligen vill minska databasens storlok, klicka JA, "
-"klicka NAJ annars.\n"
+"klicka NEJ annars.\n"
"\n"
-"Om du väljer JA, vänligen vänta..."
+"Om du väljer JA, vänta..."
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:433
msgid "Exporting History Logs..."
msgstr "Exporterar Loggar..."
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:508
#, python-format
msgid "%(who)s on %(time)s said: %(message)s\n"
msgstr "%(who)s på %(time)s sa: %(message)s\n"
-#: ../src/history_manager.py:549
+#: ../src/history_manager.py:545
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] "Vill du verkligen ta bort loggar för den valda kontakten?"
msgstr[1] "Vill du verkligen ta bort loggar för de valda kontakterna?"
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:549 ../src/history_manager.py:584
msgid "This is an irreversible operation."
msgstr "Denna operation kan inte göras ogjord."
-#: ../src/history_manager.py:585
+#: ../src/history_manager.py:581
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the selected messages?"
msgstr[0] "Vill du verkligen ta bort det valda meddelandet?"
msgstr[1] "Vill du verkligen ta bort det valda meddelandena?"
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
#, python-format
msgid "Conversation History with %s"
msgstr "Konversationshistorik med %s"
-#: ../src/history_window.py:332
-#, fuzzy
+#: ../src/history_window.py:343
msgid "Disk Error"
-msgstr "Fel:"
+msgstr "Diskfel"
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
#, python-format
msgid "%(nick)s is now %(status)s: %(status_msg)s"
msgstr "%(nick)s är nu %(status)s:%(status_msg)s"
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
#, python-format
msgid "Status is now: %(status)s: %(status_msg)s"
msgstr "Status är nu: %(status)s: %(status_msg)s"
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
#, python-format
msgid "Status is now: %(status)s"
msgstr "Status är nu: %(status)s"
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
-#, fuzzy
+#: ../src/htmltextview.py:564 ../src/htmltextview.py:575
msgid "Timeout loading image"
-msgstr "Kunde inte ladda bild"
+msgstr "Tidsgräns översteg vid inläsning av bild"
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:585
msgid "Image is too big"
msgstr "Bild är för stor"
-#: ../src/message_window.py:446
+#: ../src/message_window.py:443
msgid "Chats"
msgstr "Chattar"
-#: ../src/message_window.py:448
+#: ../src/message_window.py:445
msgid "Group Chats"
msgstr "Gruppchatt"
-#: ../src/message_window.py:450
+#: ../src/message_window.py:447
msgid "Private Chats"
msgstr "Privat Chatt"
-#: ../src/message_window.py:456
+#: ../src/message_window.py:453
msgid "Messages"
msgstr "Meddelanden"
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
msgid "- messages will be logged"
-msgstr ""
+msgstr "- meddelanden kommer att loggas"
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
msgid "- messages will not be logged"
-msgstr ""
+msgstr "- meddelanden kommer inte att loggas"
#: ../src/notify.py:230
-#, fuzzy, python-format
+#, python-format
msgid "%(nick)s Changed Status"
-msgstr "%(nick)s är nu %(status)s"
+msgstr "%(nick)s ändrade status"
#: ../src/notify.py:240
#, python-format
msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s Loggade In"
+msgstr "%(nickname)s loggade in"
#: ../src/notify.py:248
#, python-format
msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s Loggade Ut"
+msgstr "%(nickname)s loggade ut"
#: ../src/notify.py:260
#, python-format
msgid "New Single Message from %(nickname)s"
-msgstr "Nytt Enstaka Meddelande %(nickname)s"
+msgstr "Nytt meddelande från %(nickname)s"
#: ../src/notify.py:268
-#, fuzzy, python-format
+#, python-format
msgid "New Private Message from group chat %s"
-msgstr "Nytt Privat Meddelande från rum %s"
+msgstr "Nytt privat meddelande från gruppchatten %s"
#: ../src/notify.py:270
#, python-format
@@ -9016,121 +8919,112 @@
msgstr "%(nickname)s: %(message)s"
#: ../src/notify.py:273
-#, fuzzy, python-format
+#, python-format
msgid "Messaged by %(nickname)s"
-msgstr "Nytt meddelande från %(nickname)s"
+msgstr "Skickat av %(nickname)s"
#: ../src/notify.py:279
#, python-format
msgid "New Message from %(nickname)s"
msgstr "Nytt meddelande från %(nickname)s"
+#: ../src/notify.py:534
+msgid "Ignore"
+msgstr "Ignorera"
+
#: ../src/osx/growler.py:10
-#, fuzzy
msgid "Generic"
-msgstr "Generellt"
+msgstr "Allmän"
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
msgid "Retrieving profile..."
msgstr "Hämtar profil..."
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
-#, fuzzy
+#: ../src/profile_window.py:108 ../src/roster_window.py:2758
msgid "File is empty"
-msgstr "Sökväg"
+msgstr "Filen är tom"
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
-#, fuzzy
+#: ../src/profile_window.py:111 ../src/roster_window.py:2761
msgid "File does not exist"
-msgstr "Det finns inget sådant rum."
+msgstr "Filen finns inte"
#. 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:2763 ../src/roster_window.py:2774
msgid "Could not load image"
-msgstr "Kunde inte ladda bild"
+msgstr "Kunde inte läsa in bild"
-#: ../src/profile_window.py:252
-#, fuzzy
+#: ../src/profile_window.py:251
msgid "Information received"
-msgstr "Inbjudan mottagen"
+msgstr "Information togs emot"
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
msgid "Without a connection you can not publish your contact information."
-msgstr "Utan en förbindelse kan du inte publicera din kontaktinformation."
+msgstr "Du kan inte publicera din kontaktinformation utan en anslutning."
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
msgid "Sending profile..."
msgstr "Skickar profil..."
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
msgid "Information NOT published"
msgstr "Informationen INTE publicerad"
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
msgid "vCard publication failed"
msgstr "publicering av vCard misslyckades"
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
msgid ""
"There was an error while publishing your personal information, try again "
"later."
msgstr ""
-"Det uppstod ett fel vid publiceringen av er personliga information, var "
-"vänlig försök igen senare."
+"Det uppstod ett fel vid publiceringen av er personliga information, försök "
+"igen senare."
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:285 ../src/roster_window.py:939
msgid "Merged accounts"
msgstr "Sammanfoga konton"
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1874
msgid "Authorization has been sent"
msgstr "Auktorisering har sänts"
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1875
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "Nu kommer \"%s\" veta din status."
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1895
msgid "Subscription request has been sent"
msgstr "Prenumerationsförfrågan har sänts"
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1896
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr ""
"Om \"%s\" accepterar din förfrågan kommer du att känna till hans eller "
"hennes status."
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1908
msgid "Authorization has been removed"
msgstr "Auktorisering har tagits bort"
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1909
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "Nu kommer \"%s\" alltid se dig som offline."
-#: ../src/roster_window.py:1920
-#, fuzzy
-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 ""
-"Gnomenyckelringen är installerad men inte startad (miljövariabeln är "
-"förmodligen inte korrekt satt)"
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1934
msgid "GPG is not usable"
-msgstr ""
+msgstr "GPG är inte användbar"
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2093 ../src/roster_window.py:3258
msgid "You are participating in one or more group chats"
msgstr "Du deltar i en eller flera guppchatter"
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../src/roster_window.py:2094 ../src/roster_window.py:3259
msgid ""
"Changing your status to invisible will result in disconnection from those "
"group chats. Are you sure you want to go invisible?"
@@ -9138,15 +9032,15 @@
"Om du byter status till osynlig kommer du att förlora anslutningen till "
"gruppchatterna. Är du säker på att du vill byta status till osynlig?"
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2120
msgid "desync'ed"
-msgstr ""
+msgstr "inte i synk"
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../src/roster_window.py:2258 ../src/roster_window.py:2495
msgid "You have unread messages"
msgstr "Du har olästa meddelanden"
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2259
#, fuzzy
msgid ""
"Messages will only be available for reading them later if you have history "
@@ -9155,17 +9049,16 @@
"Meddelanden kommer bara vara tillgängliga för läsning senare om du har "
"historik påslagen."
-#: ../src/roster_window.py:2522
-#, fuzzy
+#: ../src/roster_window.py:2496
msgid "You must read them before removing this transport."
-msgstr "Läs alla vändande händelser innan du tar bort detta konto."
+msgstr "Du måste läsa dem innan du tar bort denna transport."
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2499
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "Transporten \"%s\" kommer tas bort"
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2500
#, fuzzy
msgid ""
"You will no longer be able to send and receive messages from contacts using "
@@ -9174,70 +9067,72 @@
"Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
"från denna transport."
-#: ../src/roster_window.py:2529
-#, fuzzy
+#: ../src/roster_window.py:2503
msgid "Transports will be removed"
-msgstr "Transporten \"%s\" kommer tas bort"
+msgstr "Transporter kommer att tas bort"
-#: ../src/roster_window.py:2534
-#, fuzzy, python-format
+#: ../src/roster_window.py:2508
+#, python-format
msgid ""
"You will no longer be able to send and receive messages to contacts from "
"these transports: %s"
msgstr ""
-"Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
-"från denna transport."
+"Du kommer inte längre att kunna ta emot eller skicka meddelanden till "
+"kontakter från dessa transporter: %s"
#. it's jid
-#: ../src/roster_window.py:2668
-#, fuzzy
+#: ../src/roster_window.py:2639
msgid "Rename Contact"
-msgstr "Kontakter"
+msgstr "Byt namn på kontakt"
-#: ../src/roster_window.py:2669
-#, fuzzy, python-format
+#: ../src/roster_window.py:2640
+#, python-format
msgid "Enter a new nickname for contact %s"
-msgstr "Skriv in GPG-nyckelns lösenfras för konto %s."
+msgstr "Ange ett nytt smeknamn för kontakten %s"
-#: ../src/roster_window.py:2676
-#, fuzzy
+#: ../src/roster_window.py:2647
msgid "Rename Group"
-msgstr "Byt _namn"
+msgstr "Byt namn på grupp"
-#: ../src/roster_window.py:2677
-#, fuzzy, python-format
+#: ../src/roster_window.py:2648
+#, python-format
msgid "Enter a new name for group %s"
-msgstr "Skriv in GPG-nyckelns lösenfras för konto %s."
+msgstr "Ange ett nytt namn för gruppen %s"
-#: ../src/roster_window.py:2733
-#, fuzzy
+#: ../src/roster_window.py:2704
msgid "Remove Group"
-msgstr "Ta _bort"
+msgstr "Ta bort grupp"
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2705
#, python-format
msgid "Do you want to remove group %s from the roster?"
-msgstr "Vill du ta bort grupp %s från registret?"
+msgstr "Vill du ta bort gruppen %s från kontaktlistan?"
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2706
#, fuzzy
msgid "Also remove all contacts in this group from your roster"
msgstr "Ta bort en kontakt från register"
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2745
msgid "Assign OpenPGP Key"
msgstr "Tilldela OpenPGP-nyckel"
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2746
msgid "Select a key to apply to the contact"
msgstr "Välj en nyckel att tilldela kontakten"
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3099
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
-msgstr "Kontakt \"%s\" kommer bli borttagen från registret"
+msgstr "Kontakten \"%s\" kommer att tas bort från kontaktlistan"
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3101
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+"Du är på väg att ta bort \"%(name)s\" (%(jid)s) från din kontaktlista.\n"
+
+#: ../src/roster_window.py:3106
msgid ""
"By removing this contact you also remove authorization resulting in him or "
"her always seeing you as offline."
@@ -9246,12 +9141,11 @@
"vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
#. Contact is not in roster
-#: ../src/roster_window.py:3137
-#, fuzzy
+#: ../src/roster_window.py:3112
msgid "Do you want to continue?"
-msgstr "Vad vill du göra?"
+msgstr "Vill du fortsätta?"
-#: ../src/roster_window.py:3141
+#: ../src/roster_window.py:3115
msgid ""
"By removing this contact you also by default remove authorization resulting "
"in him or her always seeing you as offline."
@@ -9259,19 +9153,18 @@
"Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen. "
"Kontakten kommer alltid se dig som frånkopplad."
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3118
msgid "I want this contact to know my status after removal"
msgstr ""
"Jag vill att denna kontakten skall känna till min status även efter "
"borttagningen"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3148
-#, fuzzy
+#: ../src/roster_window.py:3122
msgid "Contacts will be removed from your roster"
-msgstr "Kontakt \"%s\" kommer bli borttagen från registret"
+msgstr "Kontakter kommer att tas bort från din kontaktlista"
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3127
#, fuzzy, python-format
msgid ""
"By removing these contacts:%s\n"
@@ -9280,34 +9173,33 @@
"Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen "
"vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3182
msgid "No account available"
msgstr "Inget konto tillgängligt"
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3183
msgid "You must create an account before you can chat with other contacts."
msgstr "Du måste skapa ett konto innan du kan chatta med andra kontakter."
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3733
msgid "Metacontacts storage not supported by your server"
msgstr "Metakontakter kan inte lagras på din server"
-#: ../src/roster_window.py:3710
-#, fuzzy
+#: ../src/roster_window.py:3735
msgid ""
"Your server does not support storing metacontacts information. So those "
"information will not be saved on next reconnection."
msgstr ""
-"Din server stödjer inte att lagra informationen för metakontakter. Så den "
-"informationen kommer inte att sparas vid nästa återanslutning."
+"Din server saknar stöd för att lagra information om metakontakter. Denna "
+"information kommer därför inte att sparas vid nästa återanslutning."
-#: ../src/roster_window.py:3784
-#, fuzzy
+#: ../src/roster_window.py:3820
msgid ""
"You are about to create a metacontact. Are you sure you want to continue?"
-msgstr "Du måste skapa ett konto innan du kan chatta med andra kontakter."
+msgstr ""
+"Du är på väg att skapa en metakontakt. Är du säker på att du vill fortsätta?"
-#: ../src/roster_window.py:3786
+#: ../src/roster_window.py:3822
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 "
@@ -9317,159 +9209,146 @@
"Normalt sätt används det när en person har flera Jabberkonton eller "
"transportkonton."
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:3935
#, fuzzy
msgid "Invalid file URI:"
msgstr "Ogiltig Fil"
-#: ../src/roster_window.py:3910
-#, fuzzy, python-format
+#: ../src/roster_window.py:3946
+#, 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 vill skicka en fil till dig:"
-msgstr[1] "%s vill skicka en fil till dig:"
+msgstr[0] "Vill du skicka denna fil till %s:"
+msgstr[1] "Vill du skicka dessa filer till %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:4623 ../src/roster_window.py:4694
+#: ../src/roster_window.py:4703 ../src/systray.py:215 ../src/systray.py:262
+#: ../src/systray.py:268
#, python-format
msgid "using account %s"
-msgstr "använder konto %s"
+msgstr "använder kontot %s"
#. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4710
#, python-format
msgid "to %s account"
msgstr "till %s konto"
#. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4715
#, python-format
msgid "using %s account"
-msgstr "använder %s konto"
+msgstr "använder %s-kontot"
-#: ../src/roster_window.py:4716 ../src/systray.py:303
-#, fuzzy
+#: ../src/roster_window.py:4752 ../src/systray.py:278
msgid "_Manage Bookmarks..."
-msgstr "Hantera bokmärken..."
+msgstr "_Hantera bokmärken..."
#. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4772
#, python-format
msgid "of account %s"
-msgstr "för konto %s"
+msgstr "för kontot %s"
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4812
#, python-format
msgid "for account %s"
-msgstr "för konto %s"
+msgstr "för kontot %s"
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4874 ../src/roster_window.py:4983
msgid "_Change Status Message"
-msgstr "Byt _Statusmeddelande"
+msgstr "_Ändra statusmeddelande"
-#: ../src/roster_window.py:4865
-#, fuzzy
+#: ../src/roster_window.py:4901
msgid "Publish Tune"
-msgstr "_Publicera"
+msgstr "Publicera låt"
-#: ../src/roster_window.py:4873
+#: ../src/roster_window.py:4908
msgid "Mood"
-msgstr ""
+msgstr "Humör"
-#: ../src/roster_window.py:4879
-#, fuzzy
+#: ../src/roster_window.py:4912
msgid "Activity"
-msgstr "Aktiv"
+msgstr "Aktivitet"
-#: ../src/roster_window.py:4884
-#, fuzzy
+#: ../src/roster_window.py:4917
msgid "Configure Services..."
-msgstr "_Upptäck tjänster..."
+msgstr "Konfigurera tjänster..."
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5071
msgid "_Maximize All"
-msgstr ""
+msgstr "_Maximera alla"
#. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
-#, fuzzy
+#: ../src/roster_window.py:5079 ../src/roster_window.py:5605
msgid "Send Group M_essage"
-msgstr "Nytt meddelande"
+msgstr "Skicka gruppm_eddelande"
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5087
msgid "To all users"
msgstr "Till alla användare"
-#: ../src/roster_window.py:5055
-#, fuzzy
+#: ../src/roster_window.py:5091
msgid "To all online users"
-msgstr "_Anslutna användare"
+msgstr "Till alla anslutna användare"
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5502
msgid "I would like to add you to my roster"
-msgstr "Jag skulle vilja lägga till dig i mitt register"
+msgstr "Jag skulle vilja lägga till dig i min kontaktlista"
#. Manage Transport submenu
-#: ../src/roster_window.py:5588
-#, fuzzy
+#: ../src/roster_window.py:5625
msgid "_Manage Contacts"
-msgstr "Kontakter"
+msgstr "_Hantera kontakter"
#. Send single message
-#: ../src/roster_window.py:5649
-#, fuzzy
+#: ../src/roster_window.py:5686
msgid "Send Single Message"
-msgstr "_Skicka enstaka meddelande"
+msgstr "Skicka ett meddelande"
#. Manage Transport submenu
-#: ../src/roster_window.py:5705
-#, fuzzy
+#: ../src/roster_window.py:5742
msgid "_Manage Transport"
-msgstr "Transporter"
+msgstr "_Hantera transport"
#. Modify Transport
-#: ../src/roster_window.py:5713
-#, fuzzy
+#: ../src/roster_window.py:5750
msgid "_Modify Transport"
-msgstr "Visa _transporter"
+msgstr "_Ändra transport"
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5824
msgid "_Maximize"
-msgstr ""
+msgstr "_Maximera"
-#: ../src/roster_window.py:5795
-#, fuzzy
+#: ../src/roster_window.py:5831
msgid "_Disconnect"
-msgstr "Kontakt loggade ut"
+msgstr "_Koppla från"
-#: ../src/roster_window.py:5875
-#, fuzzy
+#: ../src/roster_window.py:5911
msgid "_New Group Chat"
-msgstr "Ny gruppchatt"
+msgstr "_Ny gruppchatt"
#. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6024
msgid "History Manager"
-msgstr "Hantera Historik"
+msgstr "Historikhanterare"
-#: ../src/roster_window.py:5997 ../src/systray.py:341
-#, fuzzy
+#: ../src/roster_window.py:6033
msgid "_Join New Group Chat"
-msgstr "_Anslut till gruppchatt"
+msgstr "_Gå in i ny gruppchatt"
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6243
msgid "Change Status Message..."
-msgstr "Byt Statusmeddelande..."
+msgstr "Ändra statusmeddelande..."
#: ../src/search_window.py:93
msgid "Waiting for results"
-msgstr ""
+msgstr "Väntar på resultat"
#: ../src/search_window.py:133 ../src/search_window.py:211
msgid "Error in received dataform"
@@ -9480,20 +9359,20 @@
msgid "No result"
msgstr ""
-#: ../src/session.py:124
+#: ../src/session.py:123
msgid "Disk WriteError"
msgstr ""
#: ../src/session.py:238
-#, fuzzy, python-format
+#, python-format
msgid "Subject: %s"
-msgstr "Ämne: %s\n"
+msgstr "Ämne: %s"
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:403 ../src/session.py:438
msgid "Confirm these session options"
-msgstr ""
+msgstr "Bekräfta dessa sessionsalternativ"
-#: ../src/session.py:400
+#: ../src/session.py:405
#, python-format
msgid ""
"The remote client wants to negotiate an session with these features:\n"
@@ -9502,8 +9381,13 @@
"\n"
"\tAre these options acceptable?"
msgstr ""
+"Fjärrklienten vill förhandla en session med dessa funktioner:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tGodtar du dessa alternativ?"
-#: ../src/session.py:434
+#: ../src/session.py:439
#, python-format
msgid ""
"The remote client selected these options:\n"
@@ -9512,19 +9396,23 @@
"\n"
"Continue with the session?"
msgstr ""
+"Fjärrklienten har valt dessa alternativ:\n"
+"\n"
+"%s\n"
+"\n"
+"Vill du fortsätta med sessionen?"
-#: ../src/systray.py:188
+#: ../src/systray.py:176
msgid "_Change Status Message..."
msgstr "_Byt Statusmeddelande..."
-#: ../src/systray.py:322
+#: ../src/systray.py:293
msgid "Hide this menu"
-msgstr "Gömmer denna meny"
+msgstr "Dölj denna meny"
#: ../src/tooltips.py:327 ../src/tooltips.py:521
-#, fuzzy
msgid "Jabber ID: "
-msgstr "Jabber-ID:"
+msgstr "Jabber-ID: "
#: ../src/tooltips.py:330 ../src/tooltips.py:525
msgid "Resource: "
@@ -9537,35 +9425,33 @@
#: ../src/tooltips.py:432
msgid " [blocked]"
-msgstr ""
+msgstr " [blockerad]"
#: ../src/tooltips.py:436
msgid " [minimized]"
-msgstr ""
+msgstr " [minimerad]"
#: ../src/tooltips.py:451 ../src/tooltips.py:706
msgid "Status: "
msgstr "Status: "
#: ../src/tooltips.py:481
-#, fuzzy, python-format
+#, python-format
msgid "Last status: %s"
-msgstr "Senaste status på %s"
+msgstr "Senaste status: %s"
#: ../src/tooltips.py:483
-#, fuzzy, python-format
+#, python-format
msgid " since %s"
-msgstr "från %s"
+msgstr " sedan %s"
#: ../src/tooltips.py:501
-#, fuzzy
msgid "Connected"
-msgstr "Förbindelse"
+msgstr "Ansluten"
#: ../src/tooltips.py:503
-#, fuzzy
msgid "Disconnected"
-msgstr "Kontakt loggade ut"
+msgstr "Frånkopplad"
#. ('both' is the normal sub so we don't show it)
#: ../src/tooltips.py:532
@@ -9577,27 +9463,24 @@
msgstr "OpenPGP: "
#: ../src/tooltips.py:587
-#, fuzzy
msgid "Mood:"
-msgstr "Rum:"
+msgstr "Humör:"
#: ../src/tooltips.py:602
-#, fuzzy
msgid "Activity:"
-msgstr "Aktiverad"
+msgstr "Aktivitet:"
#: ../src/tooltips.py:638
-#, fuzzy
msgid "Tune:"
-msgstr "Typ:"
+msgstr "Låt:"
#: ../src/tooltips.py:664
msgid "Download"
-msgstr "Nerladdning"
+msgstr "Hämta"
#: ../src/tooltips.py:670
msgid "Upload"
-msgstr "Uppladdning"
+msgstr "Skicka upp"
#: ../src/tooltips.py:677
msgid "Type: "
@@ -9617,7 +9500,7 @@
#: ../src/tooltips.py:690 ../src/tooltips.py:693
msgid "Completed"
-msgstr "Färdig"
+msgstr "Färdigställd"
#: ../src/tooltips.py:697
msgid "?transfer status:Paused"
@@ -9644,25 +9527,28 @@
"Denna tjänst kunde inte svara med detaljerad information.\n"
"Tjänsten är antagligen föråldrad eller trasig."
-#: ../src/vcard.py:245
+#: ../src/vcard.py:246
msgid "?Client:Unknown"
msgstr "?Klient:Okänd"
-#: ../src/vcard.py:247
+#: ../src/vcard.py:248
msgid "?OS:Unknown"
msgstr "?OS:Okänt"
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:269
+msgid "?Time:Unknown"
+msgstr "?Tid:Okänd"
+
+#: ../src/vcard.py:293 ../src/vcard.py:303 ../src/vcard.py:524
#, python-format
msgid "since %s"
-msgstr "från %s"
+msgstr "sedan %s"
-#: ../src/vcard.py:311
-#, fuzzy
+#: ../src/vcard.py:332
msgid "<b>Affiliation:</b>"
-msgstr "<b>Program</b>"
+msgstr "<b>Tillhörighet:</b>"
-#: ../src/vcard.py:319
+#: ../src/vcard.py:340
msgid ""
"This contact is interested in your presence information, but you are not "
"interested in his/her presence"
@@ -9670,7 +9556,7 @@
"Denna kontakt är intresserad av din närvaroinformation, men du är inte "
"intresserad av hans/hennes"
-#: ../src/vcard.py:321
+#: ../src/vcard.py:342
msgid ""
"You are interested in the contact's presence information, but he/she is not "
"interested in yours"
@@ -9678,33 +9564,77 @@
"Du är intresserad av denna kontakts närvaroinformation, men han/hon är inte "
"intresserad av din"
-#: ../src/vcard.py:323
+#: ../src/vcard.py:344
msgid "You and the contact are interested in each other's presence information"
msgstr "Du och kontakten är intresserade av varandras närvaroinformation"
#. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:346
msgid ""
"You are not interested in the contact's presence, and neither he/she is "
"interested in yours"
msgstr ""
"Varken du eller kontakten är intresserad av varandras närvaroinformation"
-#: ../src/vcard.py:332
+#: ../src/vcard.py:353
msgid "You are waiting contact's answer about your subscription request"
msgstr "Du väntar på kontaktens svar på din förfrågan om prenumeration"
-#: ../src/vcard.py:334
+#: ../src/vcard.py:355
msgid "There is no pending subscription request."
-msgstr ""
+msgstr "Det finns inga väntande prenumerationsbegäran."
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:360 ../src/vcard.py:415 ../src/vcard.py:549
msgid " resource with priority "
msgstr " resurs med prioritet "
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "OpenPGP-kryptering"
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Kräver python-gnome2-extras eller byggnation av modulen gtkspell från "
+#~ "Gajims källkod."
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Klicka för att visa funktioner (som MSN, ICQ-transporter) på jabberservrar"
+
+#~ msgid "Servers Features"
+#~ msgstr "Serverfunktioner"
+
+#~ msgid "Name:"
+#~ msgstr "Namn:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Värd:"
+
+#~ msgid "Modify Account"
+#~ msgstr "Redigera konto"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Gajim-konto %s"
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenGPG"
+
+#~ msgid "gnome-keyring"
+#~ msgstr "gnome-keyring"
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Notification-daemon"
+
+#~ msgid "Idle"
+#~ msgstr "Overksam"
+
+#~ msgid "libsexy"
+#~ msgstr "libsexy"
+
#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
#~ msgstr ""
#~ "%s har inte sänt ut en OpenPGP-nyckel och du har inte heller tilldelat en"
@@ -9734,9 +9664,6 @@
#~ msgid "_Retype Password:"
#~ msgstr "Skriv om _lösenord:"
-#~ msgid "_Use proxy"
-#~ msgstr "_Använd proxy"
-
#~ 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 "
@@ -9901,9 +9828,6 @@
#~ msgid "_Advanced Notifications Control..."
#~ msgstr "_Avancerad notifieringskontroll..."
-#~ msgid "_Font:"
-#~ msgstr "_Teckensnitt:"
-
#~ msgid "_Never"
#~ msgstr "_Aldrig"
@@ -9916,9 +9840,6 @@
#~ msgid "_Pop it up"
#~ msgstr "_Öppna det"
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
-
#~ msgid "Address"
#~ msgstr "Adress"
@@ -10179,9 +10100,6 @@
#~ msgid "Invalid room or server name"
#~ msgstr "Ogiltigt rum- eller servernamn"
-#~ msgid "vCard publication succeeded"
-#~ msgstr "publicering av vCard lyckades"
-
#~ msgid "Your personal information has been published successfully."
#~ msgstr "Din personliga information har blivit publicerad"
@@ -10243,9 +10161,6 @@
#~ msgid "%s has sent you a new message."
#~ msgstr "%s har skickat dig ett nytt meddelande."
-#~ msgid "GUI Migration failed"
-#~ msgstr "GUI Migration misslyckades"
-
#~ msgid ""
#~ "Logs migration through graphical interface failed. The migration process "
#~ "will start in the background. Please wait a few minutes for Gajim to "
Modified: branches/osx_newbuildsys/po/uk.po
===================================================================
--- branches/osx_newbuildsys/po/uk.po 2009-03-06 05:55:50 UTC (rev 11143)
+++ branches/osx_newbuildsys/po/uk.po 2009-03-06 21:46:52 UTC (rev 11144)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: uk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-18 00:38+0100\n"
+"POT-Creation-Date: 2009-03-01 14:53+0100\n"
"PO-Revision-Date: 2008-12-28 13:38+0200\n"
"Last-Translator: Sergiy Yegorov <prapor(a)unixzone.org.ua>\n"
"Language-Team: Ukrainian <kde-i18n-doc(a)lists.kde.org>\n"
@@ -3084,8 +3084,8 @@
#: ../src/chat_control.py:1250 ../src/chat_control.py:2125
#: ../src/common/contacts.py:113 ../src/common/helpers.py:56
#: ../src/common/helpers.py:227 ../src/conversation_textview.py:858
-#: ../src/dialogs.py:900 ../src/dialogs.py:1648 ../src/gajim.py:990
-#: ../src/gajim.py:1706 ../src/normal_control.py:483
+#: ../src/dialogs.py:900 ../src/dialogs.py:1648 ../src/gajim.py:999
+#: ../src/gajim.py:1731 ../src/normal_control.py:483
#: ../src/roster_window.py:910 ../src/roster_window.py:1541
#: ../src/roster_window.py:1543 ../src/roster_window.py:1894
#: ../src/roster_window.py:3083 ../src/roster_window.py:3109
@@ -3287,10 +3287,10 @@
"Якщо ви закриєте вкладку, а журнал було вимкнено, це повідомлення буде "
"втрачено."
-#: ../src/chat_control.py:2462 ../src/common/connection_handlers.py:1955
-#: ../src/common/connection_handlers.py:2001
-#: ../src/common/connection_handlers.py:2189
-#: ../src/common/connection_handlers.py:2322 ../src/common/connection.py:1313
+#: ../src/chat_control.py:2462 ../src/common/connection_handlers.py:1961
+#: ../src/common/connection_handlers.py:2007
+#: ../src/common/connection_handlers.py:2195
+#: ../src/common/connection_handlers.py:2328 ../src/common/connection.py:1344
#: ../src/gajim.py:177
msgid "Database Error"
msgstr "Помилка бази даних"
@@ -3467,7 +3467,7 @@
#. sorted alphanum
#: ../src/common/config.py:113 ../src/common/config.py:464
#: ../src/common/optparser.py:221 ../src/common/optparser.py:439
-#: ../src/common/optparser.py:473 ../src/gajim.py:3234
+#: ../src/common/optparser.py:473 ../src/gajim.py:3263
msgid "default"
msgstr "типовий"
@@ -4007,9 +4007,10 @@
"значення відповідають більшим символам формул."
#: ../src/common/config.py:271
+#, fuzzy
msgid ""
"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled seperately)"
+"uri. (mailto and xmpp are handled separately)"
msgstr ""
"Чинні схеми uri. «Справжніми» uri вважатимуться лише схеми вказані у списку. "
"(mailto і xmpp обробляються окремо)"
@@ -4292,39 +4293,39 @@
msgstr ""
#: ../src/common/connection_handlers.py:968
-#: ../src/common/connection_handlers.py:1953
-#: ../src/common/connection_handlers.py:1999
-#: ../src/common/connection_handlers.py:2187
-#: ../src/common/connection_handlers.py:2320 ../src/common/connection.py:1311
+#: ../src/common/connection_handlers.py:1959
+#: ../src/common/connection_handlers.py:2005
+#: ../src/common/connection_handlers.py:2193
+#: ../src/common/connection_handlers.py:2326 ../src/common/connection.py:1342
#: ../src/gajim.py:400
msgid "Disk Write Error"
msgstr "Помилка під час спроби запису на диск"
-#: ../src/common/connection_handlers.py:1175 ../src/common/connection.py:907
+#: ../src/common/connection_handlers.py:1175 ../src/common/connection.py:917
msgid "Invisibility not supported"
msgstr "Невидимість не підтримується"
-#: ../src/common/connection_handlers.py:1176 ../src/common/connection.py:908
+#: ../src/common/connection_handlers.py:1176 ../src/common/connection.py:918
#, python-format
msgid "Account %s doesn't support invisibility."
msgstr "Обліковий запис %s не підтримує невидимості."
-#: ../src/common/connection_handlers.py:1781 ../src/common/connection.py:1142
+#: ../src/common/connection_handlers.py:1787 ../src/common/connection.py:1157
#: ../src/config.py:1829 ../src/config.py:1837 ../src/config.py:1880
#: ../src/config.py:3105 ../src/dataforms_widget.py:603 ../src/dialogs.py:2357
msgid "Invalid Jabber ID"
msgstr "Некоректний ідентифікатор Jabber"
-#: ../src/common/connection_handlers.py:1782
+#: ../src/common/connection_handlers.py:1788
msgid "A message from a non-valid JID arrived, it has been ignored."
msgstr ""
"Надійшло повідомлення від некоректного JID, це повідомлення було "
"проігноровано."
-#: ../src/common/connection_handlers.py:1956
-#: ../src/common/connection_handlers.py:2002
-#: ../src/common/connection_handlers.py:2190
-#: ../src/common/connection_handlers.py:2323 ../src/common/connection.py:1314
+#: ../src/common/connection_handlers.py:1962
+#: ../src/common/connection_handlers.py:2008
+#: ../src/common/connection_handlers.py:2196
+#: ../src/common/connection_handlers.py:2329 ../src/common/connection.py:1345
#: ../src/gajim.py:178
#, python-format
msgid ""
@@ -4335,7 +4336,7 @@
"http://trac.gajim.org/wiki/DatabaseBackup) або вилучити його (всі журнали "
"буде втрачено)."
-#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2080
#, python-format
msgid "Nickname not allowed: %s"
msgstr "Заборонений псевдонім: %s"
@@ -4343,72 +4344,72 @@
#. we are banned
#. group chat does not exist
#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2149
-#: ../src/common/connection_handlers.py:2152
#: ../src/common/connection_handlers.py:2155
#: ../src/common/connection_handlers.py:2158
-#: ../src/common/connection_handlers.py:2162 ../src/gajim.py:539
+#: ../src/common/connection_handlers.py:2161
+#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2168 ../src/gajim.py:548
msgid "Unable to join group chat"
msgstr "Не вдалося приєднатися до групової балачки"
-#: ../src/common/connection_handlers.py:2150
+#: ../src/common/connection_handlers.py:2156
#, python-format
msgid "You are banned from group chat %s."
msgstr "Вас заблокували у груповій балачці %s."
-#: ../src/common/connection_handlers.py:2153
+#: ../src/common/connection_handlers.py:2159
#, python-format
msgid "Group chat %s does not exist."
msgstr "Групової балачки %s не існує."
-#: ../src/common/connection_handlers.py:2156
+#: ../src/common/connection_handlers.py:2162
msgid "Group chat creation is restricted."
msgstr "Можливість створення групових балачок обмежено."
-#: ../src/common/connection_handlers.py:2159
+#: ../src/common/connection_handlers.py:2165
#, python-format
msgid "Your registered nickname must be used in group chat %s."
msgstr ""
"Для групової балачки %s слід використовувати псевдонім, під яким ви "
"зареєструвалися."
-#: ../src/common/connection_handlers.py:2163
+#: ../src/common/connection_handlers.py:2169
#, python-format
msgid "You are not in the members list in groupchat %s."
msgstr "Вас немає у списку постійних учасників групової балачки %s."
#. Room has been destroyed. see
#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2205
+#: ../src/common/connection_handlers.py:2211
msgid "Room has been destroyed"
msgstr "Кімнату було знищено"
-#: ../src/common/connection_handlers.py:2212
+#: ../src/common/connection_handlers.py:2218
#, python-format
msgid "You can join this room instead: %s"
msgstr "Ви можете приєднатися до цієї кімнати замість %s"
-#: ../src/common/connection_handlers.py:2239
+#: ../src/common/connection_handlers.py:2245
msgid "I would like to add you to my roster."
msgstr "Я хочу додати вас до свого реєстру."
#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2260
+#: ../src/common/connection_handlers.py:2266
#, python-format
msgid "we are now subscribed to %s"
msgstr "тепер ми підписані на %s"
-#: ../src/common/connection_handlers.py:2262
+#: ../src/common/connection_handlers.py:2268
#, python-format
msgid "unsubscribe request from %s"
msgstr "запит на скасування підписки від %s"
-#: ../src/common/connection_handlers.py:2264
+#: ../src/common/connection_handlers.py:2270
#, python-format
msgid "we are now unsubscribed from %s"
msgstr "підписку на %s скасовано"
-#: ../src/common/connection_handlers.py:2446
+#: ../src/common/connection_handlers.py:2453
#, python-format
msgid ""
"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4419,13 +4420,13 @@
"jabberstudio.org/ для його вилучення"
#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2471
+#: ../src/common/connection_handlers.py:2478
#: ../src/common/zeroconf/connection_zeroconf.py:173
msgid "OpenPGP passphrase was not given"
msgstr "Не було вказано пароля OpenPGP"
#. %s is the account name here
-#: ../src/common/connection_handlers.py:2473
+#: ../src/common/connection_handlers.py:2480
#: ../src/common/zeroconf/connection_zeroconf.py:175
#: ../src/roster_window.py:1935
#, python-format
@@ -4560,77 +4561,82 @@
msgid "Application verification failure"
msgstr "Помилка під час перевірки програми"
-#: ../src/common/connection.py:269
+#: ../src/common/connection.py:271
#: ../src/common/zeroconf/connection_zeroconf.py:215
#, python-format
msgid "Connection with account \"%s\" has been lost"
msgstr "З’єднання з обліковим записом «%s» було втрачено"
-#: ../src/common/connection.py:270
+#: ../src/common/connection.py:272
msgid "Reconnect manually."
msgstr "Виконати повторне з’єднання вручну."
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:283
#, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
msgstr ""
"Від сервера %(name)s було отримано помилкову відповідь на запит щодо "
"реєстрації: %(error)s"
-#: ../src/common/connection.py:315
+#: ../src/common/connection.py:317
#, python-format
msgid "Server %s provided a different registration form"
msgstr "На сервері %s передбачено іншу форму реєстрації"
-#: ../src/common/connection.py:328
+#: ../src/common/connection.py:330
#, python-format
msgid "Unknown SSL error: %d"
msgstr "Невідома помилка SSL: %d"
#. wrong answer
-#: ../src/common/connection.py:343
+#: ../src/common/connection.py:345
msgid "Invalid answer"
msgstr "Некоректна відповідь"
-#: ../src/common/connection.py:344
+#: ../src/common/connection.py:346
#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
msgstr ""
"Транспорт %(name)s надіслав помилкову відповідь на запит щодо реєстрації: %"
"(error)s"
-#: ../src/common/connection.py:628 ../src/common/connection.py:745
-#: ../src/common/connection.py:1447
+#: ../src/common/connection.py:629 ../src/common/connection.py:755
+#: ../src/common/connection.py:1478
#: ../src/common/zeroconf/connection_zeroconf.py:249
#, python-format
msgid "Could not connect to \"%s\""
msgstr "Не вдалося з’єднатися з «%s»"
-#: ../src/common/connection.py:629 ../src/gajim.py:1085
+#: ../src/common/connection.py:630 ../src/gajim.py:1094
msgid "Check your connection or try again later."
msgstr "Перевірте ваше з’єднання, а потім повторіть спробу."
-#: ../src/common/connection.py:638
+#: ../src/common/connection.py:635
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Збережено за адресою: %s"
+
+#: ../src/common/connection.py:648
msgid "Connection to proxy failed"
msgstr "Спроба встановити з'єднання з проксі-сервером завершилася невдало"
-#: ../src/common/connection.py:669 ../src/common/connection.py:725
+#: ../src/common/connection.py:679 ../src/common/connection.py:735
#, python-format
msgid "Could not connect to account %s"
msgstr "Не вдалося з’єднатися з обліковим записом %s"
-#: ../src/common/connection.py:670 ../src/common/connection.py:726
+#: ../src/common/connection.py:680 ../src/common/connection.py:736
#, python-format
msgid "Connection with account %s has been lost. Retry connecting."
msgstr ""
"З’єднання з обліковим записом було втрачено %s. Повторна спроба з’єднання."
-#: ../src/common/connection.py:692
+#: ../src/common/connection.py:702
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
msgstr "Достовірність сертифіката %s знаходиться під питанням."
-#: ../src/common/connection.py:695
+#: ../src/common/connection.py:705
#, python-format
msgid ""
"\n"
@@ -4639,7 +4645,7 @@
"\n"
"Помилка SSL: <b>%s</b>"
-#: ../src/common/connection.py:697
+#: ../src/common/connection.py:707
#, python-format
msgid ""
"\n"
@@ -4648,24 +4654,24 @@
"\n"
"Невідома помилка SSL: %d"
-#: ../src/common/connection.py:746
+#: ../src/common/connection.py:756
msgid "Check your connection or try again later"
msgstr "Перевірте ваше з’єднання або повторіть спробу пізніше"
-#: ../src/common/connection.py:771
+#: ../src/common/connection.py:781
#, python-format
msgid "Authentication failed with \"%s\""
msgstr "Спроба розпізнавання за допомогою «%s» завершилася невдало"
-#: ../src/common/connection.py:773
+#: ../src/common/connection.py:783
msgid "Please check your login and password for correctness."
msgstr "Будь ласка, перевірте, чи правильно вказано ім’я користувача і пароль."
-#: ../src/common/connection.py:834
+#: ../src/common/connection.py:844
msgid "Error while removing privacy list"
msgstr "Помилка під час вилучення списку конфіденційності"
-#: ../src/common/connection.py:835
+#: ../src/common/connection.py:845
#, python-format
msgid ""
"Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4675,17 +4681,17 @@
"у одному з ресурсів, з яким з’єднано ваш клієнт. Вимкніть цей ресурс і "
"повторіть спробу."
-#: ../src/common/connection.py:1143 ../src/dialogs.py:2358
+#: ../src/common/connection.py:1158 ../src/dialogs.py:2358
#, python-format
msgid "It is not possible to send a message to %s, this JID is not valid."
msgstr "Неможливо надіслати повідомлення до %s, вказаний JID не є коректним."
-#: ../src/common/connection.py:1165
+#: ../src/common/connection.py:1180
#: ../src/common/zeroconf/connection_zeroconf.py:389
msgid "Neither the remote presence is signed, nor a key was assigned."
msgstr "Не підписано повідомлення про присутність, ключа також не призначено."
-#: ../src/common/connection.py:1167
+#: ../src/common/connection.py:1182
#: ../src/common/zeroconf/connection_zeroconf.py:391
#, python-format
msgid "The contact's key (%s) does not match the key assigned in Gajim."
@@ -4694,11 +4700,11 @@
#. we're not english
#. one in locale and one en
-#: ../src/common/connection.py:1199
+#: ../src/common/connection.py:1230
msgid "[This message is *encrypted* (See :XEP:`27`]"
msgstr "[Це повідомлення *зашифровано* (див. :XEP:`27`]"
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1332
#: ../src/common/zeroconf/connection_zeroconf.py:468
#, python-format
msgid ""
@@ -4708,18 +4714,18 @@
"Тема: %(subject)s\n"
"%(message)s"
-#: ../src/common/connection.py:1480 ../src/common/connection.py:1501
+#: ../src/common/connection.py:1511 ../src/common/connection.py:1532
msgid "Not fetched because of invisible status"
msgstr "Не отримано через стан невидимості"
#: ../src/common/contacts.py:92 ../src/common/helpers.py:56
-#: ../src/gajim.py:990
+#: ../src/gajim.py:999
msgid "Observers"
msgstr "Спостерігачі"
#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
#: ../src/common/helpers.py:56 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1350 ../src/gajim.py:803 ../src/roster_window.py:814
+#: ../src/disco.py:1350 ../src/gajim.py:812 ../src/roster_window.py:814
#: ../src/roster_window.py:1468 ../src/roster_window.py:1537
#: ../src/roster_window.py:1539 ../src/roster_window.py:1688
msgid "Transports"
@@ -6205,13 +6211,14 @@
"\n"
#: ../src/config.py:2475
+#, fuzzy
msgid ""
"Can be one of the following:\n"
"1. user@domain/resource (only that resource matches).\n"
"2. user@domain (any resource matches).\n"
"3. domain/resource (only that resource matches).\n"
"4. domain (the domain itself matches, as does any user@domain,\n"
-"domain/resource, or address containing a subdomain."
+"domain/resource, or address containing a subdomain)."
msgstr ""
"Можна використовувати записи у такому форматі:\n"
"1. користувач@домен/ресурс (пошук лише вказаного ресурсу).\n"
@@ -6225,17 +6232,17 @@
msgid "Removing %s account"
msgstr "Вилучення облікового запису %s"
-#: ../src/config.py:2594 ../src/gajim.py:1473 ../src/gajim.py:1545
+#: ../src/config.py:2594 ../src/gajim.py:1482 ../src/gajim.py:1569
msgid "Password Required"
msgstr "Слід ввести пароль"
#. ('PASSWORD_REQUIRED', account, None)
-#: ../src/config.py:2595 ../src/gajim.py:1528
+#: ../src/config.py:2595 ../src/gajim.py:1552
#, python-format
msgid "Enter your password for account %s"
msgstr "Введіть ваш пароль для облікового запису %s"
-#: ../src/config.py:2596 ../src/gajim.py:1545
+#: ../src/config.py:2596 ../src/gajim.py:1569
msgid "Save password"
msgstr "Зберегти пароль"
@@ -6317,11 +6324,11 @@
msgstr ""
"Будь ласка, вкажіть назву сервера, на якому ви бажаєте зареєструватися."
-#: ../src/config.py:3205 ../src/gajim.py:2074
+#: ../src/config.py:3205 ../src/gajim.py:2102
msgid "Certificate Already in File"
msgstr "Сертифікат вже наявний у файлі"
-#: ../src/config.py:3206 ../src/gajim.py:2075
+#: ../src/config.py:3206 ../src/gajim.py:2103
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr ""
@@ -6342,7 +6349,7 @@
"Помилка SSL: %(error)s\n"
"Ви все ще бажаєте з’єднатися з цим сервером?"
-#: ../src/config.py:3280 ../src/gajim.py:2099
+#: ../src/config.py:3280 ../src/gajim.py:2127
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -6671,7 +6678,7 @@
msgid "Subscription request from %s"
msgstr "Запит на підписку від %s"
-#: ../src/dialogs.py:1668 ../src/gajim.py:2738
+#: ../src/dialogs.py:1668 ../src/gajim.py:2767
#, python-format
msgid "You are already in group chat %s"
msgstr "Ви вже берете участь у груповій балачці %s"
@@ -6827,32 +6834,32 @@
msgid "New Private Message"
msgstr "Нове конфіденційне повідомлення"
-#: ../src/dialogs.py:2060 ../src/gajim.py:1660 ../src/notify.py:487
+#: ../src/dialogs.py:2060 ../src/gajim.py:1685 ../src/notify.py:487
#: ../src/osx/growler.py:13
msgid "New E-mail"
msgstr "Нове повідомлення електронної пошти"
-#: ../src/dialogs.py:2062 ../src/gajim.py:1726 ../src/notify.py:480
+#: ../src/dialogs.py:2062 ../src/gajim.py:1751 ../src/notify.py:480
#: ../src/osx/growler.py:14
msgid "File Transfer Request"
msgstr "Запит на передавання файла"
-#: ../src/dialogs.py:2064 ../src/gajim.py:1626 ../src/gajim.py:1693
+#: ../src/dialogs.py:2064 ../src/gajim.py:1651 ../src/gajim.py:1718
#: ../src/notify.py:482 ../src/osx/growler.py:14
msgid "File Transfer Error"
msgstr "Помилка під час передавання файла"
-#: ../src/dialogs.py:2066 ../src/gajim.py:1768 ../src/gajim.py:1790
-#: ../src/gajim.py:1807 ../src/notify.py:484 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2066 ../src/gajim.py:1793 ../src/gajim.py:1815
+#: ../src/gajim.py:1832 ../src/notify.py:484 ../src/osx/growler.py:15
msgid "File Transfer Completed"
msgstr "Завершення передавання файла"
-#: ../src/dialogs.py:2067 ../src/gajim.py:1771 ../src/notify.py:485
+#: ../src/dialogs.py:2067 ../src/gajim.py:1796 ../src/notify.py:485
#: ../src/osx/growler.py:15
msgid "File Transfer Stopped"
msgstr "Зупинка передавання файла"
-#: ../src/dialogs.py:2069 ../src/gajim.py:1494 ../src/notify.py:489
+#: ../src/dialogs.py:2069 ../src/gajim.py:1503 ../src/notify.py:489
#: ../src/osx/growler.py:16
msgid "Groupchat Invitation"
msgstr "Запрошення до групової балачки"
@@ -7760,17 +7767,27 @@
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
msgstr "Введіть пароль ключа GPG для ключа %(keyid)s (account %(account)s)."
+#: ../src/gajim.py:475
+#, fuzzy
+msgid "GPG key expired"
+msgstr "Немає ключа GPG"
+
+#: ../src/gajim.py:476
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "З’єднання з %s буде встановлено без OpenPGP."
+
#. ask again
-#: ../src/gajim.py:476
+#: ../src/gajim.py:485
msgid "Wrong Passphrase"
msgstr "Вказано помилковий пароль"
-#: ../src/gajim.py:477
+#: ../src/gajim.py:486
msgid "Please retype your GPG passphrase or press Cancel."
msgstr ""
"Будь ласка, введіть ще раз свій пароль GPG або натисніть кнопку «Скасувати»."
-#: ../src/gajim.py:540
+#: ../src/gajim.py:549
#, python-format
msgid ""
"Your desired nickname in group chat %s is in use or registered by another "
@@ -7781,55 +7798,55 @@
"використовує інший учасник.\n"
"Будь ласка, вкажіть нижче інший псевдонім:"
-#: ../src/gajim.py:554
+#: ../src/gajim.py:563
msgid "Do you accept this request?"
msgstr "Чи приймаєте ви цей запит?"
-#: ../src/gajim.py:556
+#: ../src/gajim.py:565
#, python-format
msgid "Do you accept this request on account %s?"
msgstr "Чи приймаєте ви запит щодо облікового запису %s?"
-#: ../src/gajim.py:559
+#: ../src/gajim.py:568
#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
msgstr "HTTP (%(method)s) уповноваження для %(url)s (ідентифікатор: %(id)s)"
-#: ../src/gajim.py:610 ../src/notify.py:493 ../src/osx/growler.py:17
+#: ../src/gajim.py:619 ../src/notify.py:493 ../src/osx/growler.py:17
msgid "Connection Failed"
msgstr "Спроба з’єднання завершилася невдало"
-#: ../src/gajim.py:928 ../src/gajim.py:932
+#: ../src/gajim.py:937 ../src/gajim.py:941
#, python-format
msgid "Error %(code)s: %(msg)s"
msgstr "Помилка %(code)s: %(msg)s"
#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:942 ../src/gajim.py:956
+#: ../src/gajim.py:951 ../src/gajim.py:965
#, python-format
msgid "error while sending %(message)s ( %(error)s )"
msgstr "помилка під час надсилання %(message)s ( %(error)s )"
-#: ../src/gajim.py:979 ../src/notify.py:495
+#: ../src/gajim.py:988 ../src/notify.py:495
#, fuzzy
msgid "Subscription request"
msgstr "Запит на підписку"
-#: ../src/gajim.py:1004
+#: ../src/gajim.py:1013
msgid "Authorization accepted"
msgstr "Уповноваження прийнято"
-#: ../src/gajim.py:1005
+#: ../src/gajim.py:1014
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "Контакт «%s» уповноважив вас на перегляд свого стану."
-#: ../src/gajim.py:1017
+#: ../src/gajim.py:1026
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "Контакт «%s» вилучив вашу підписку"
-#: ../src/gajim.py:1018
+#: ../src/gajim.py:1027
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
@@ -7837,78 +7854,78 @@
"Цей контакт завжди буде показано зі станом «поза мережею».\n"
"Бажаєте вилучити контакт з вашого списку контактів?"
-#: ../src/gajim.py:1043 ../src/notify.py:497
+#: ../src/gajim.py:1052 ../src/notify.py:497
#, fuzzy
msgid "Unsubscribed"
msgstr "_Скасувати підписку"
-#: ../src/gajim.py:1084
+#: ../src/gajim.py:1093
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "Зв’язок з «%s» встановити не вдалося"
-#: ../src/gajim.py:1272 ../src/groupchat_control.py:1166
+#: ../src/gajim.py:1281 ../src/groupchat_control.py:1166
#, python-format
msgid "%(nick)s is now known as %(new_nick)s"
msgstr "%(nick)s тепер стає %(new_nick)s"
-#: ../src/gajim.py:1290 ../src/groupchat_control.py:1341
+#: ../src/gajim.py:1299 ../src/groupchat_control.py:1341
#: ../src/history_window.py:428 ../src/notify.py:232
#, python-format
msgid "%(nick)s is now %(status)s"
msgstr "%(nick)s тепер %(status)s"
-#: ../src/gajim.py:1357
+#: ../src/gajim.py:1366
#, 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:1421 ../src/groupchat_control.py:1126
+#: ../src/gajim.py:1430 ../src/groupchat_control.py:1126
msgid "Any occupant is allowed to see your full JID"
msgstr "Всі учасники можуть бачити ваш JID повністю"
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1433
msgid "Room now shows unavailable member"
msgstr "Тепер у кімнаті буде показано недоступних постійних учасників"
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1435
msgid "room now does not show unavailable members"
msgstr "тепер у кімнаті не можна буде бачити недоступних постійних учасників"
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1438
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:1432
+#: ../src/gajim.py:1441
msgid "Room logging is now enabled"
msgstr "Тепер увімкнено запис повідомлень кімнати"
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1443
msgid "Room logging is now disabled"
msgstr "Тепер запис кімнати вимкнено"
-#: ../src/gajim.py:1436
+#: ../src/gajim.py:1445
msgid "Room is now non-anonymous"
msgstr "Тепер у кімнаті вимкнено анонімність"
-#: ../src/gajim.py:1439
+#: ../src/gajim.py:1448
msgid "Room is now semi-anonymous"
msgstr "Тепер у кімнаті увімкнено напіванонімність"
-#: ../src/gajim.py:1442
+#: ../src/gajim.py:1451
msgid "Room is now fully-anonymous"
msgstr "Тепер у кімнаті увімкнено анонімність"
-#: ../src/gajim.py:1474
+#: ../src/gajim.py:1483
#, python-format
msgid "A Password is required to join the room %s. Please type it."
msgstr ""
"Для приєднання до кімнати %s потрібен пароль. Будь ласка, введіть його."
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1517
msgid ""
"You configured Gajim to use GPG agent, but there is no GPG agent running or "
"it returned a wrong passphrase.\n"
@@ -7916,29 +7933,48 @@
"Ви налаштували Gajim на використання агента GPG, але агент GPG не запущено "
"або цей агент повернув помилковий пароль.\n"
-#: ../src/gajim.py:1510
+#: ../src/gajim.py:1519
msgid "You are currently connected without your OpenPGP key."
msgstr "Ви виконали з’єднання без вашого ключа OpenPGP."
-#: ../src/gajim.py:1513
+#: ../src/gajim.py:1522
msgid "Your passphrase is incorrect"
msgstr "Ваш пароль не є коректним"
-#: ../src/gajim.py:1531
+#: ../src/gajim.py:1545
#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG непридатне для використання"
+
+#: ../src/gajim.py:1545
+#, fuzzy
msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
+"буде неможливим."
+
+#: ../src/gajim.py:1547 ../src/gajim.py:2185 ../src/gajim.py:2220
+#: ../src/groupchat_control.py:1849 ../src/roster_window.py:3826
+msgid "Do _not ask me again"
+msgstr "Більше _не питати мене"
+
+#: ../src/gajim.py:1555
+#, fuzzy
+msgid ""
"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
"variable probably not \t\t\t\tcorrectly set)"
msgstr ""
"Gnome Keyring встановлено, але не \t\t\t\t\t\t\tзапущено належним чином "
"(ймовірно, змінну середовища вказано \t\t\t\t\t\t\tнеправильно)"
-#: ../src/gajim.py:1637
+#: ../src/gajim.py:1662
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "Нові повідомлення у %(gmail_mail_address)s"
-#: ../src/gajim.py:1639
+#: ../src/gajim.py:1664
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
@@ -7946,7 +7982,7 @@
msgstr[1] "Отримано %d нових листи"
msgstr[2] "Отримано %d нових листів"
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1677
#, python-format
msgid ""
"\n"
@@ -7961,34 +7997,34 @@
"Тема: %(subject)s\n"
"%(snippet)s"
-#: ../src/gajim.py:1723
+#: ../src/gajim.py:1748
#, python-format
msgid "%s wants to send you a file."
msgstr "%s бажає надіслати вам файл."
-#: ../src/gajim.py:1791
+#: ../src/gajim.py:1816
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "Ви успішно отримали %(filename)s від %(name)s."
#. ft stopped
-#: ../src/gajim.py:1795
+#: ../src/gajim.py:1820
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "Передавання файлу·%(filename)s·від·%(name)s·зупинено."
-#: ../src/gajim.py:1808
+#: ../src/gajim.py:1833
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "Ви успішно надіслали %(filename)s до %(name)s."
#. ft stopped
-#: ../src/gajim.py:1812
+#: ../src/gajim.py:1837
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "Надсилання файлу %(filename)s до %(name)s зупинено"
-#: ../src/gajim.py:1900
+#: ../src/gajim.py:1925
#, python-format
msgid ""
"Unable to decrypt message from %s\n"
@@ -7997,38 +8033,38 @@
"Не вдалося розшифрувати повідомлення від %s\n"
"Можливо, хтось втрутився у ваше з’єднання."
-#: ../src/gajim.py:1907
+#: ../src/gajim.py:1932
msgid "Unable to decrypt message"
msgstr "Не вдалося розшифрувати повідомлення"
-#: ../src/gajim.py:1978
+#: ../src/gajim.py:2006
msgid "Username Conflict"
msgstr "Конфлікт імен користувачів"
-#: ../src/gajim.py:1979
+#: ../src/gajim.py:2007
msgid "Please type a new username for your local account"
msgstr ""
"Будь ласка, введіть нове ім'я користувача для вашого локального облікового "
"запису"
-#: ../src/gajim.py:1991
+#: ../src/gajim.py:2019
msgid "Ping?"
msgstr "Гу?"
-#: ../src/gajim.py:2004
+#: ../src/gajim.py:2032
#, python-format
msgid "Pong! (%s s.)"
msgstr "Га! (%s s.)"
-#: ../src/gajim.py:2015
+#: ../src/gajim.py:2043
msgid "Error."
msgstr "Помилка."
-#: ../src/gajim.py:2040
+#: ../src/gajim.py:2068
msgid "Resource Conflict"
msgstr "Конфлікт ресурсів"
-#: ../src/gajim.py:2041
+#: ../src/gajim.py:2069
msgid ""
"You are already connected to this account with the same resource. Please "
"type a new one"
@@ -8036,11 +8072,11 @@
"Ваш клієнт вже з’єднано з цим обліковим записом і тим самим ресурсом. Будь "
"ласка, вкажіть інший ресурс"
-#: ../src/gajim.py:2096
+#: ../src/gajim.py:2124
msgid "Error verifying SSL certificate"
msgstr "Помилка під час перевірки сертифіката SSL"
-#: ../src/gajim.py:2097
+#: ../src/gajim.py:2125
#, python-format
msgid ""
"There was an error verifying the SSL certificate of your jabber server: %"
@@ -8051,15 +8087,15 @@
"помилка: %(error)s\n"
"Ви все ще маєте намір з’єднатися з сервером?"
-#: ../src/gajim.py:2102
+#: ../src/gajim.py:2130
msgid "Ignore this error for this certificate."
msgstr "Ігнорувати цю помилку для цього сертифіката."
-#: ../src/gajim.py:2122
+#: ../src/gajim.py:2150
msgid "SSL certificate error"
msgstr "Помилка сертифіката SSL"
-#: ../src/gajim.py:2123
+#: ../src/gajim.py:2151
#, fuzzy, python-format
msgid ""
"It seems the SSL certificate of account %(account)s has changed or your "
@@ -8075,11 +8111,11 @@
"\n"
"Ви все ще маєте намір з’єднатися і оновити відбиток сертифіката?"
-#: ../src/gajim.py:2153 ../src/gajim.py:2188
+#: ../src/gajim.py:2181 ../src/gajim.py:2216
msgid "Insecure connection"
msgstr "Небезпечне з’єднання"
-#: ../src/gajim.py:2154
+#: ../src/gajim.py:2182
msgid ""
"You are about to send your password on an unencrypted connection. Are you "
"sure you want to do that?"
@@ -8087,16 +8123,11 @@
"Ви маєте намір надіслати ваш пароль нешифрованим з’єднанням. Виконати "
"надсилання пароля?"
-#: ../src/gajim.py:2156 ../src/gajim.py:2191
+#: ../src/gajim.py:2184 ../src/gajim.py:2219
msgid "Yes, I really want to connect insecurely"
msgstr "Так, я справді бажаю знехтувати безпекою"
-#: ../src/gajim.py:2157 ../src/gajim.py:2192 ../src/groupchat_control.py:1849
-#: ../src/roster_window.py:3826
-msgid "Do _not ask me again"
-msgstr "Більше _не питати мене"
-
-#: ../src/gajim.py:2189
+#: ../src/gajim.py:2217
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?"
@@ -8105,27 +8136,27 @@
"безпеку з’єднання, вам слід встановити PyOpenSSL. Виконати надсилання пароля "
"зараз?"
-#: ../src/gajim.py:2209
+#: ../src/gajim.py:2237
msgid "PEP node was not removed"
msgstr "Вузол повідомлення про стан було вилучено"
-#: ../src/gajim.py:2210
+#: ../src/gajim.py:2238
#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
msgstr "Вузол повідомлення про стан %(node)s було вилучено: %(message)s"
#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2695 ../src/gajim.py:2717
+#: ../src/gajim.py:2724 ../src/gajim.py:2746
msgid "Emoticons disabled"
msgstr "Емоційки вимкнено"
-#: ../src/gajim.py:2696
+#: ../src/gajim.py:2725
msgid ""
"Your configured emoticons theme has not been found, so emoticons have been "
"disabled."
msgstr "Вказаної вами теми емоційок не було знайдено, емоційки буде вимкнено."
-#: ../src/gajim.py:2718
+#: ../src/gajim.py:2747
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 "
@@ -8135,30 +8166,30 @@
"формат файла emoticons.py. Докладніше про новий формат можна дізнатися за "
"адресою http://trac.gajim.org/wiki/Emoticons."
-#: ../src/gajim.py:2744 ../src/roster_window.py:3314
+#: ../src/gajim.py:2773 ../src/roster_window.py:3314
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:3022
+#: ../src/gajim.py:3051
msgid "Could not save your settings and preferences"
msgstr "Не вдалося зберегти ваші налаштування і параметри"
-#: ../src/gajim.py:3119
+#: ../src/gajim.py:3148
msgid "Bookmark already set"
msgstr "Закладку вже встановлено"
-#: ../src/gajim.py:3120
+#: ../src/gajim.py:3149
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "Закладка на груповій балачці «%s» вже існує."
-#: ../src/gajim.py:3133
+#: ../src/gajim.py:3162
msgid "Bookmark has been added successfully"
msgstr "Закладку було успішно додано"
-#: ../src/gajim.py:3134
+#: ../src/gajim.py:3163
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr ""
"Керувати вашими закладками можна за допомогою меню дій у вашому реєстрі."
Modified: branches/osx_newbuildsys/scripts/gajim.in
===================================================================
--- branches/osx_newbuildsys/scripts/gajim.in 2009-03-06 05:55:50 UTC (rev 11143)
+++ branches/osx_newbuildsys/scripts/gajim.in 2009-03-06 21:46:52 UTC (rev 11144)
@@ -34,4 +34,4 @@
cd "$libdir/gajim"
export PYTHONPATH="$PYTHONPATH:$libdir/gajim"
export GAJIM_DATADIR="@DATADIR@/gajim"
-exec $PYTHON_EXEC $APP.pyc $@
+exec $PYTHON_EXEC $APP.pyc "$@"
Modified: branches/osx_newbuildsys/src/common/config.py
===================================================================
--- branches/osx_newbuildsys/src/common/config.py 2009-03-06 05:55:50 UTC (rev 11143)
+++ branches/osx_newbuildsys/src/common/config.py 2009-03-06 21:46:52 UTC (rev 11144)
@@ -268,7 +268,7 @@
'attach_notifications_to_systray': [opt_bool, False, _('If True, notification windows from notification-daemon will be attached to systray icon.')],
'check_idle_every_foo_seconds': [opt_int, 2, _('Choose interval between 2 checks of idleness.')],
'latex_png_dpi': [opt_str, '108',_('Change the value to change the size of latex formulas displayed. The higher is larger.') ],
- 'uri_schemes': [opt_str, 'aaa aaas acap cap cid crid data dav dict dns fax file ftp go gopher h323 http https icap im imap info ipp iris iris.beep iris.xpc iris.xpcs iris.lwz ldap mid modem msrp msrps mtqp mupdate news nfs nntp opaquelocktoken pop pres rtsp service shttp sip sips snmp soap.beep soap.beeps tag tel telnet tftp thismessage tip tv urn vemmi xmlrpc.beep xmlrpc.beeps z39.50r z39.50s about cvs daap ed2k feed fish git iax2 irc ircs ldaps magnet mms rsync ssh svn sftp smb webcal', _('Valid uri schemes. Only schemes in this list will be accepted as "real" uri. (mailto and xmpp are handled seperately)'), True],
+ 'uri_schemes': [opt_str, 'aaa aaas acap cap cid crid data dav dict dns fax file ftp go gopher h323 http https icap im imap info ipp iris iris.beep iris.xpc iris.xpcs iris.lwz ldap mid modem msrp msrps mtqp mupdate news nfs nntp opaquelocktoken pop pres rtsp service shttp sip sips snmp soap.beep soap.beeps tag tel telnet tftp thismessage tip tv urn vemmi xmlrpc.beep xmlrpc.beeps z39.50r z39.50s about cvs daap ed2k feed fish git iax2 irc ircs ldaps magnet mms rsync ssh svn sftp smb webcal', _('Valid uri schemes. Only schemes in this list will be accepted as "real" uri. (mailto and xmpp are handled separately)'), True],
}
__options_per_key = {
Modified: branches/osx_newbuildsys/src/config.py
===================================================================
--- branches/osx_newbuildsys/src/config.py 2009-03-06 05:55:50 UTC (rev 11143)
+++ branches/osx_newbuildsys/src/config.py 2009-03-06 21:46:52 UTC (rev 11144)
@@ -2477,7 +2477,7 @@
'2. user@domain (any resource matches).\n'
'3. domain/resource (only that resource matches).\n'
'4. domain (the domain itself matches, as does any user@domain,\n'
- 'domain/resource, or address containing a subdomain.')
+ 'domain/resource, or address containing a subdomain).')
def on_ok(jid):
if not jid:
@@ -3032,7 +3032,7 @@
# connection instance is saved in gajim.connections and we canceled the
# addition of the account
del gajim.connections[self.account]
- if self.account in gajim.config.del_per('accounts'):
+ if self.account in gajim.config.get_per('accounts'):
gajim.config.del_per('accounts', self.account)
del gajim.interface.instances['account_creation_wizard']
@@ -3339,7 +3339,7 @@
self.go_online_checkbutton.hide()
self.show_vcard_checkbutton.hide()
del gajim.connections[self.account]
- if self.account in gajim.config.del_per('accounts'):
+ if self.account in gajim.config.get_per('accounts'):
gajim.config.del_per('accounts', self.account)
img = self.xml.get_widget('finish_image')
img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG)
@@ -3369,12 +3369,6 @@
if go_online:
gajim.interface.roster.send_status(self.account, 'online', '')
- def on_username_entry_changed(self, widget):
- self.update_jid(widget)
-
- def on_server_comboboxentry_changed(self, widget):
- self.update_jid(widget)
-
def on_username_entry_key_press_event(self, widget, event):
# Check for pressed @ and jump to combobox if found
if event.keyval == gtk.keysyms.at:
@@ -3393,18 +3387,6 @@
username_entry.set_position(-1)
return True
- def update_jid(self,widget):
- username_entry = self.xml.get_widget('username_entry')
- name = username_entry.get_text().decode('utf-8')
- combobox = self.xml.get_widget('server_comboboxentry')
- server = combobox.get_active_text()
- jid_label = self.xml.get_widget('jid_label')
- if len(name) == 0 or len(server) == 0:
- jid_label.set_label('')
- else:
- string = '<b>%s@%s</b>' % (name, server)
- jid_label.set_label(string)
-
def get_config(self, login, server, savepass, password):
config = {}
config['name'] = login
Modified: branches/osx_newbuildsys/src/conversation_textview.py
===================================================================
--- branches/osx_newbuildsys/src/conversation_textview.py 2009-03-06 05:55:50 UTC (rev 11143)
+++ branches/osx_newbuildsys/src/conversation_textview.py 2009-03-06 21:46:52 UTC (rev 11144)
@@ -635,6 +635,10 @@
# Check if we should hide the line tooltip
if not over_line:
self.line_tooltip.hide_tooltip()
+ if self.xep0184_warning_tooltip.timeout != 0:
+ # Check if we should hide the XEP-184 warning tooltip
+ if not xep0184_warning:
+ self.xep0184_warning_tooltip.hide_tooltip()
if over_line and not self.line_tooltip.win:
self.line_tooltip.timeout = gobject.timeout_add(500,
self.show_line_tooltip)
Modified: branches/osx_newbuildsys/src/gajim.py
===================================================================
--- branches/osx_newbuildsys/src/gajim.py 2009-03-06 05:55:50 UTC (rev 11143)
+++ branches/osx_newbuildsys/src/gajim.py 2009-03-06 21:46:52 UTC (rev 11144)
@@ -156,6 +156,27 @@
common.configpaths.gajimpaths.init_profile(profile)
del profile
+if os.name == 'nt':
+ class MyStderr(object):
+ _file = None
+ _error = None
+ def write(self, text):
+ fname=os.path.join(common.configpaths.gajimpaths.root,
+ os.path.split(sys.executable)[1]+'.log')
+ if self._file is None and self._error is None:
+ try:
+ self._file = open(fname, 'a')
+ except Exception, details:
+ self._error = details
+ if self._file is not None:
+ self._file.write(text)
+ self._file.flush()
+ def flush(self):
+ if self._file is not None:
+ self._file.flush()
+
+ sys.stderr = MyStderr()
+
# PyGTK2.10+ only throws a warning
warnings.filterwarnings('error', module='gtk')
try:
Copied: branches/osx_newbuildsys/src/gtkspell.py (from rev 11143, trunk/src/gtkspell.py)
===================================================================
--- branches/osx_newbuildsys/src/gtkspell.py (rev 0)
+++ branches/osx_newbuildsys/src/gtkspell.py 2009-03-06 21:46:52 UTC (rev 11144)
@@ -0,0 +1,100 @@
+## src/gtkspell.py
+##
+## (C) 2008 Thorsten P. 'dGhvcnN0ZW5wIEFUIHltYWlsIGNvbQ==\n'.decode("base64")
+##
+## This file is part of Gajim.
+##
+## Gajim is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published
+## by the Free Software Foundation; version 3 only.
+##
+## Gajim is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
+
+import ctypes
+import ctypes.util
+
+import gtk
+
+
+gboolean = ctypes.c_int
+gchar_p = ctypes.c_char_p
+gerror_p = ctypes.c_void_p
+gobject_p = ctypes.c_void_p
+gtkspell_p = ctypes.c_void_p
+gtktextview_p = ctypes.c_void_p
+
+
+class PyGObject(ctypes.Structure):
+ _fields_ = [
+ ("PyObject_HEAD", ctypes.c_byte * object.__basicsize__),
+ ("obj", gobject_p)
+ ]
+
+
+libgtkspell_path = ctypes.util.find_library("gtkspell")
+if libgtkspell_path == None:
+ raise ImportError("libgtkspell not found")
+libgtkspell = ctypes.cdll.LoadLibrary(libgtkspell_path)
+libgtkspell.gtkspell_new_attach.restype = gtkspell_p
+libgtkspell.gtkspell_new_attach.argtypes = [gtktextview_p, gchar_p, gerror_p]
+libgtkspell.gtkspell_set_language.restype = gboolean
+libgtkspell.gtkspell_set_language.argtypes = [gtkspell_p, gchar_p, gerror_p]
+libgtkspell.gtkspell_recheck_all.argtypes = [gtkspell_p]
+libgtkspell.gtkspell_get_from_text_view.restype = gtkspell_p
+libgtkspell.gtkspell_get_from_text_view.argtypes = [gtktextview_p]
+libgtkspell.gtkspell_detach.argtypes = [gtkspell_p]
+
+
+def ensure_attached(func):
+ def f(self, *args, **kwargs):
+ if self.spell:
+ func(self, *args, **kwargs)
+ else:
+ raise RuntimeError("Spell object is already detached")
+ return f
+
+
+class Spell(object):
+
+ def __init__(self, textview, language=None, create=True):
+ if not isinstance(textview, gtk.TextView):
+ raise TypeError("Textview must be derived from gtk.TextView")
+ tv = PyGObject.from_address(id(textview)).obj
+ spell = libgtkspell.gtkspell_get_from_text_view(tv)
+ if create:
+ if spell:
+ raise RuntimeError("Textview has already a Spell obj attached")
+ self.spell = libgtkspell.gtkspell_new_attach(tv, language, None)
+ if not self.spell:
+ raise OSError("Unable to attach spell object. "
+ "Language: '%s'" % str(language))
+ else:
+ if spell:
+ self.spell = spell
+ else:
+ raise RuntimeError("Textview has no Spell object attached")
+
+ @ensure_attached
+ def set_language(self, language):
+ if libgtkspell.gtkspell_set_language(self.spell, language, None) == 0:
+ raise OSError("Unable to set language '%s'" % str(language))
+
+ @ensure_attached
+ def recheck_all(self):
+ libgtkspell.gtkspell_recheck_all(self.spell)
+
+ @ensure_attached
+ def detach(self):
+ libgtkspell.gtkspell_detach(self.spell)
+ self.spell = None
+
+
+def get_from_text_view(textview):
+ return Spell(textview, create=False)
+
Modified: branches/osx_newbuildsys/src/roster_window.py
===================================================================
--- branches/osx_newbuildsys/src/roster_window.py 2009-03-06 05:55:50 UTC (rev 11143)
+++ branches/osx_newbuildsys/src/roster_window.py 2009-03-06 21:46:52 UTC (rev 11144)
@@ -2100,15 +2100,20 @@
if sys.platform == 'darwin':
self.make_menu(force=True)
- def get_status_message(self, show, on_response):
+ def get_status_message(self, show, on_response, always_ask=False):
+ ''' get the status message by:
+ 1/ looking in default status message
+ 2/ asking to user if needed depending on ask_on(ff)line_status and
+ always_ask
+ '''
if show in gajim.config.get_per('defaultstatusmsg'):
if gajim.config.get_per('defaultstatusmsg', show, 'enabled'):
on_response(gajim.config.get_per('defaultstatusmsg', show,
'message'))
return
- if (show == 'online' and not gajim.config.get('ask_online_status')) or \
- (show in ('offline', 'invisible')
- and not gajim.config.get('ask_offline_status')):
+ if not always_ask and ((show == 'online' and not gajim.config.get(
+ 'ask_online_status')) or (show in ('offline', 'invisible') and not \
+ gajim.config.get('ask_offline_status'))):
on_response('')
return
@@ -3204,7 +3209,7 @@
jid += '/' + contact.resource
self.send_status(account, show, message, to=jid)
- self.get_status_message(show, on_response)
+ self.get_status_message(show, on_response, always_ask=True)
def on_status_combobox_changed(self, widget):
'''When we change our status via the combobox'''
1
0
Author: asterix
Date: 2009-03-06 06:55:50 +0100 (Fri, 06 Mar 2009)
New Revision: 11143
Modified:
trunk/data/glade/account_creation_wizard_window.glade
Log:
hide tabs in account creation wizard
Modified: trunk/data/glade/account_creation_wizard_window.glade
===================================================================
--- trunk/data/glade/account_creation_wizard_window.glade 2009-03-05 20:14:08 UTC (rev 11142)
+++ trunk/data/glade/account_creation_wizard_window.glade 2009-03-06 05:55:50 UTC (rev 11143)
@@ -14,6 +14,7 @@
<child>
<widget class="GtkNotebook" id="notebook">
<property name="visible">True</property>
+ <property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<widget class="GtkVBox" id="vbox78">
1
0