Mercurial > pidgin.yaz
changeset 21110:dead11aac1bc
merge_into_workspace of ad5838522d44d037dc333469f1ab6df844ca1875
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Tue, 30 Oct 2007 06:37:35 +0000 |
| parents | 741c3b5eac21 (diff) e64e6fbd1351 (current diff) |
| children | c5df2bf2bf8e |
| files | libpurple/protocols/msn/contact.c libpurple/protocols/msn/oim.c libpurple/protocols/msn/userlist.c |
| diffstat | 137 files changed, 3738 insertions(+), 2586 deletions(-) [+] |
line wrap: on
line diff
--- a/.mtn-ignore Tue Oct 30 06:29:13 2007 +0000 +++ b/.mtn-ignore Tue Oct 30 06:37:35 2007 +0000 @@ -21,7 +21,7 @@ config.status config.sub configure$ -finch/finch +finch/finch$ finch/libgnt/gntmarshal.c finch/libgnt/gntmarshal.h depcomp
--- a/COPYRIGHT Tue Oct 30 06:29:13 2007 +0000 +++ b/COPYRIGHT Tue Oct 30 06:37:35 2007 +0000 @@ -196,6 +196,7 @@ Akuke Kok Konstantin Korikov Cole Kowalski +Matt Kramer Gary Kramlich Jan Kratochvil Andrej Krivulčík
--- a/ChangeLog Tue Oct 30 06:29:13 2007 +0000 +++ b/ChangeLog Tue Oct 30 06:37:35 2007 +0000 @@ -31,6 +31,8 @@ * Pidgin's display is now saved with the command line for session restoration. (David Mohr) * ICQ Birthday notifications are shown as buddy list emblems. + * Plugin actions are now available from the docklet context menu + in addition to the Tool menu of the buddy list. version 2.2.1 (09/29/2007): http://developer.pidgin.im/query?status=closed&milestone=2.2.1
--- a/ChangeLog.API Tue Oct 30 06:29:13 2007 +0000 +++ b/ChangeLog.API Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,13 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -Version 2.2.0 (09/13/2007): +version 2.2.2 (??/??/????): + libpurple: + Changed: + * The size parameter of purple_util_write_data_to_file_absolute + has been changed to gssize instead of a size_t to correctly + indicate that -1 can be used for a nul-delimited string. + +version 2.2.0 (09/13/2007): libpurple: Added: * PURPLE_MESSAGE_INVISIBLE flag, which can be used by @@ -57,7 +64,7 @@ * gnt_util_parse_xhtml_to_textview to parse XHTML strings in a GntTextView (this works only if libxml2 is available) -Version 2.1.1 (08/20/2007): +version 2.1.1 (08/20/2007): libpurple: Changed: * PurpleAccountUiOps.request_authorize's authorize_cb and @@ -89,9 +96,6 @@ * purple_timeout_add_seconds Callers should prefer this to purple_timeout_add for timers longer than 1 second away. Be aware of the rounding, though. - * purple_timeout_add_seconds - Callers should prefer this to purple_timeout_add for timers - longer than 1 second away. Be aware of the rounding, though. * purple_xfer_get_remote_user * purple_pounces_get_all_for_ui * purple_prefs_get_children_names
--- a/Doxyfile.in Tue Oct 30 06:29:13 2007 +0000 +++ b/Doxyfile.in Tue Oct 30 06:37:35 2007 +0000 @@ -169,7 +169,8 @@ "endsignalproto=@endcode" \ "signaldesc=@par Description:" \ "signals=@b Signals:" \ - "endsignals=" + "endsignals=" \ + "constreturn=@note The return value of this function must not be modified or freed. @return" # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources # only. Doxygen will then generate output that is more tailored for C. @@ -457,7 +458,8 @@ # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = +EXCLUDE = libpurple/purple-client.h \ + libpurple/purple-client-bindings.h # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories # that are symbolic links (a Unix filesystem feature) are excluded from the input. @@ -857,7 +859,7 @@ # feature is still experimental and incomplete at the # moment. -GENERATE_XML = NO +GENERATE_XML = YES # The XML_OUTPUT tag is used to specify where the XML pages will be put. # If a relative path is entered the value of OUTPUT_DIRECTORY will be @@ -1160,7 +1162,7 @@ # not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). # If 0 is used for the depth value (the default), the graph is not depth-constrained. -MAX_DOT_GRAPH_DEPTH = 0 +MAX_DOT_GRAPH_DEPTH = 2 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent # background. This is disabled by default, which results in a white background.
--- a/Makefile.am Tue Oct 30 06:29:13 2007 +0000 +++ b/Makefile.am Tue Oct 30 06:37:35 2007 +0000 @@ -48,6 +48,13 @@ if HAVE_DOXYGEN @echo "Running doxygen..." @doxygen +if HAVE_XSLTPROC + @echo "Generating devhelp index..." + @xsltproc doxy2devhelp.xsl doc/xml/index.xml > doc/html/pidgin.devhelp + @echo "(Symlink doc/html to ~/.local/share/gtk-doc/html/pidgin to make devhelp see the documentation)" +else + @echo "Not generating devhelp index: xsltproc was not found by configure" +endif else @echo "doxygen was not found during configure. Aborting." @echo;
--- a/configure.ac Tue Oct 30 06:29:13 2007 +0000 +++ b/configure.ac Tue Oct 30 06:37:35 2007 +0000 @@ -142,13 +142,21 @@ dnl If we don't have msgfmt, then po/ is going to fail -- ensure that dnl AM_GLIB_GNU_GETTEXT found it. -if test x$MSGFMT = xno +if test x$MSGFMT = xno -o x$MSGFMT$GMSGFMT = x then AC_ERROR([ The msgfmt command is required to build libpurple. If it is installed on your system, ensure that it is in your path. If it is not, install GNU gettext to continue. + +If you have msgfmt installed, but for some reason this error message +is still displayed, you have encountered what appears to be a bug in +third-party configure macros. Try setting the MSGFMT environment +variable to the absolute path to your msgfmt binary and trying +configure again, like this: + +MSGFMT=/path/to/msgfmt ./configure ... ]) fi @@ -2093,6 +2101,10 @@ [AC_HELP_STRING([--enable-dot], [enable graphs in doxygen via 'dot'])], enable_dot="$enableval", enable_dot="yes") +AC_ARG_ENABLE(devhelp, + [AC_HELP_STRING([--enable-devhelp], + [enable building index for devhelp documentation browser])], + enable_devhelp="$enableval", enable_devhelp="yes") if test "x$enable_doxygen" = xyes; then AC_CHECK_PROG(DOXYGEN, doxygen, true, false) @@ -2112,14 +2124,28 @@ AC_DEFINE_UNQUOTED(HAVE_DOT, 1, [whether or not we have dot]) fi fi + + if test "x$enable_devhelp" = "xyes"; then + AC_CHECK_PROG(XSLTPROC, xsltproc, true, false) + + if test $XSLTPROC = false; then + enable_devhelp="no"; + AC_MSG_WARN([*** xsltproc not found; devhelp index will not be created]) + else + AC_DEFINE_UNQUOTED(HAVE_XSLTPROC, 1, [whether or not we have xsltproc for devhelp index]) + fi + fi fi else enable_dot="no" + enable_devhelp="no" fi AC_SUBST(enable_doxygen) AC_SUBST(enable_dot) +AC_SUBST(enable_devhelp) AM_CONDITIONAL(HAVE_DOXYGEN, test "x$enable_doxygen" = "xyes") +AM_CONDITIONAL(HAVE_XSLTPROC, test "x$enable_devhelp" = "xyes") AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [compile with debugging support])], , enable_debug=no) @@ -2247,6 +2273,7 @@ share/Makefile share/sounds/Makefile share/ca-certs/Makefile + finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc
--- a/doc/C-HOWTO.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/C-HOWTO.dox Tue Oct 30 06:37:35 2007 +0000 @@ -269,3 +269,4 @@ you may have guessed, this also gets read when libpurple is probing your plugin. If this is missing, the plugin will not load. */ +// vim: syntax=c.doxygen
--- a/doc/account-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/account-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -11,6 +11,8 @@ @signal account-status-changed @endsignals + @see account.h + <hr> @signaldef account-added @@ -101,4 +103,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/blist-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/blist-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -13,6 +13,8 @@ @signal blist-node-aliased @endsignals + @see blist.h + <hr> @signaldef buddy-status-changed @@ -105,4 +107,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/certificate-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/certificate-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -5,6 +5,8 @@ @signal certificate-deleted @endsignals + @see certificate.h + <hr> @signaldef certificate-stored @@ -28,4 +30,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/cipher-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/cipher-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -5,6 +5,8 @@ @signal cipher-removed @endsignals + @see cipher.h + <hr> @signaldef cipher-added @@ -26,4 +28,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/connection-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/connection-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -7,6 +7,8 @@ @signal signed-off @endsignals + @see connection.h + <hr> @signaldef signing-on @@ -46,4 +48,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/conversation-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/conversation-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -32,6 +32,8 @@ @signal conversation-extended-menu @endsignals + @see conversation.h + @signaldef writing-im-msg @signalproto gboolean (*writing_im_msg)(PurpleAccount *account, const char *who, @@ -427,6 +429,7 @@ conversation. @param conv The conversation. @param list A pointer to the list of actions. + @since 2.1.0 @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/core-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/core-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -4,6 +4,8 @@ @signal quitting @endsignals + @see core.h + <hr> @signaldef quitting @@ -15,4 +17,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/dbus-server-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/dbus-server-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -5,6 +5,8 @@ @signal dbus-introspect @endsignals + @see dbus-server.h + <hr> @signaldef dbus-method-called @@ -29,4 +31,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/gtkaccount-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/gtkaccount-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -4,6 +4,8 @@ @signal account-modified @endsignals + @see gtkaccount.h + <hr> @signaldef account-modified @@ -15,4 +17,4 @@ @param account The account that has been modified. @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/gtkblist-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/gtkblist-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -7,6 +7,8 @@ @signal drawing-tooltip @endsignals + @see gtkblist.h + <hr> @signaldef gtkblist-hiding @@ -52,4 +54,4 @@ a compact tooltip for a non-priority buddy. @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/gtkconv-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/gtkconv-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -12,6 +12,8 @@ @signal conversation-displayed @endsignals + @see gtkconv.h + <hr> @signaldef conversation-dragging @@ -125,6 +127,7 @@ @signaldesc Emitted immediately before an existing conversation is hidden. @param gtkconv The PidginConversation + @since 2.2.0 @endsignaldef @signaldef conversation-displayed @@ -132,9 +135,10 @@ void (*conversation_displayed)(PidginConversation *gtkconv); @endsignalproto @signaldesc - Emitted right after the Pidgin UI is reattached to a conversation. + Emitted right after the Pidgin UI is attached to a new or a hidden conversation. @param gtkconv The PidginConversation + @since 2.2.0 @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/gtkimhtml-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/gtkimhtml-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -8,6 +8,8 @@ @signal format_function_update @endsignals + @see gtkimhtml.h + <hr> @signaldef url_clicked @@ -57,4 +59,4 @@ @param data User defined data. @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/gtklog-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/gtklog-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -4,6 +4,8 @@ @signal log-displaying @endsignals + @see gtklog.h + <hr> @signaldef log-displaying @@ -17,4 +19,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/imgstore-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/imgstore-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -4,6 +4,8 @@ @signal image-deleting @endsignals + @see imgstore.h + <hr> @signaldef image-deleting @@ -11,7 +13,7 @@ char *(*image_deleting)(const PurpleStoredImage *img); @endsignalproto @signaldesc - Emitted when a PurpleStoredImage is about to be destroyed. This allows + Emitted when a #PurpleStoredImage is about to be destroyed. This allows for what amounts to weak references. Code can hold onto a pointer to the PurpleStoredImage without actually "holding" a reference. They can then use a signal handler to let them know when their img is about to @@ -21,4 +23,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/log-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/log-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -4,6 +4,8 @@ @signal log-timestamp @endsignals + @see log.h + <hr> @signaldef log-timestamp @@ -21,4 +23,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/notify-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/notify-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -6,6 +6,8 @@ @signal displaying-emails-notification @endsignals + @see notify.h + @signaldef displaying-userinfo @signalproto void (*displaying_userinfo)(PurpleAccount *account, const char *who, PurpleNotifyUserInfo *user_info); @@ -33,6 +35,7 @@ @param from Who the email is from. @param to Who the email is to. @param url A url to view the email. + @since 2.1.0 @endsignaldef @signaldef displaying-emails-notification @@ -50,7 +53,8 @@ @param tos Who the emails are to. @param urls The urls to view the emails. @param count Number of emails being notified of. + @since 2.1.0 @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/plugin-ids.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/plugin-ids.dox Tue Oct 30 06:37:35 2007 +0000 @@ -2,10 +2,10 @@ @section Introduction Every plugin contains a unique identifier to prevent duplicate plugin - loading and conflicts. This, which will be called a plugin ID from here - on, must follow a specific format. This format categorizes a plugin and - makes duplicate IDs unlikely. - + loading and conflicts. Third-party plugins (that is, plugins written by + anyone who is not a libpurple, Pidgin, or Finch developer) are expected + to use a plugin ID that follows a specific format. This format + categorizes plugins and makes duplicate IDs highly unlikely. @section Format The basic format of a plugin ID is as follows: @@ -15,27 +15,79 @@ The @em type indicator specifies the type of plugin. This must be one of the following: - - core - Core plugin, capable of being loaded in any program using - libpurple. It must not use any UI-specific code. - - prpl - Protocol plugin, providing additional protocols to - connect to. - - lopl - Loader plugin, which loads scripts as plugins (like Perl - or TCL). - - gtk - GTK+ 2.x plugin. It may use GTK+ code, but cannot use any - window toolkit code (such as X11 or Win32). - - gtk-x11 - GTK+ 2.x plugin using X11 code. - - gtk-win32 - GTK+ 2.x plugin using Win32 code. - - qpe - Gaim for Qtopia plugin. + - core - A core libpurple plugin, capable of being loaded in any + program using libpurple. Core plugins may not contain any + UI-specific code. + - prpl - A protocol plugin. This is a special type of core plugin, + which provides libpurple the ability to connect to + another IM or chat network. + - lopl - A loader plugin, which loads scripts as plugins. Perl and + Tcl plugins are made possible by loader plugins. + - gtk - A GTK+ 2.x (a.k.a. Pidgin) plugin. These plugins may use + GTK+ code, but may not use window toolkit code, such as + X11, Win32, Cocoa, or Carbon. + - gtk-x11 - A GTK+ 2.x plugin that uses X11 code. These plugins may + use both GTK+ code and X11 code, allowing to hook into + features specific to X11. + - gtk-win32 - A GTK+ plugin that uses Win32 code. These plugins may use + both GTK+ code and Win32 code, allowing to hook into + features available on Windows. + - gnt - A GNT (a.k.a. Finch) plugin. These plugins may use GNT code. + - qpe - A plugin for the (now-abandoned) Qutopia user interface. + + The @em username must be a unique identifier for you. It + @em should be your http://developer.pidgin.im Trac user ID. Failing that, you + could use your SourceForge user ID or your Freenode IRC nickname, if you + have either. The http://developer.pidgin.im Trac user ID is preferred. + Do @em not leave this field blank! + + The @em pluginname is the name of your plugin. It is usually all + lowercase letters and matches the static plugin ID (the first argument to + the PURPLE_INIT_PLUGIN() macro call), although it can be anything you + like. Do @em not include version information in the plugin ID--the + #PurplePluginInfo structure already has a field for this. + + @section nospaces One Last Rule for Plugin IDs + + The last rule of plugin IDs is the most important of all. Plugin IDs may + @em NOT contain spaces. If you need a space, use another hyphen (-). - The @em username must be a unique identifier for that person. It - @em should be your SourceForge ID. Do @em not leave this field - blank. + @section exceptions Exceptions to the Rule + + As with any rule there are exceptions. If you browse through the source + tree you will see that the plugins we distribute with the Pidgin source + do not contain a username field. This is because while one developer may + have written each specific plugin, the plugins are maintained + collectively by the entire development team. This lack of a username + field is also an indicator that the plugin is one of our plugins and not + a third-party plugin. + + Another exception to the rule is the <a + href="http://plugins.guifications.org/trac/wiki/PluginPack">Purple Plugin + Pack</a>. All plugins whose lives started in the Purple Plugin Pack use + <tt>"plugin_pack"</tt> for the username field to indicate origination in + the Purple Plugin Pack. - The @em pluginname is the name of your plugin. It can be whatever you like, - though it's common to keep it all lowercase. Do not use spaces! If you - want a space, use a '-'. Please do not put a version indicator in the ID. - The PurplePlugin structure already has a field for this. + These two exceptions are mentioned here for completeness. We don't + encourage breaking the conventions set forth by the rules outlined above. + + @section examples Examples of Well-Chosen Plugin IDs + + The following is a list of well-chosen Plugin IDs listing a few good examples. + - <tt>"gtk-amc_grim-guifications"</tt> - This is the plugin ID for the + Guifications 2.x plugin. + - <tt>"gtk-rlaager-album"</tt> - This is the plugin ID for the Album + plugin, which is now part of the + Purple Plugin Pack. Its ID follows the + rules because its life started prior + to its inclusion in the Plugin Pack. + - <tt>"core-rlaager-irchelper"</tt> - This is the plugin ID for the IRC + Helper plugin, which is now part + of the Purple Plugin Pack. Its ID + follows the rules because its + life started prior to its + inclusion in the Plugin Pack. @section plugin-db Plugin Database Although it doesn't exist yet, in time there will be a plugin database @@ -45,4 +97,4 @@ */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/plugin-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/plugin-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -5,6 +5,8 @@ @signal plugin-unload @endsignals + @see plugin.h + <hr> @signaldef plugin-load @@ -26,4 +28,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/savedstatus-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/savedstatus-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -4,6 +4,8 @@ @signal savedstatus-changed @endsignals + @see savedstatus.h + <hr> @signaldef savedstatus-changed @@ -15,4 +17,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/sound-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/sound-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -4,6 +4,8 @@ @signal playing-sound-event @endsignals + @see sound.h + <hr> @signaldef playing-sound-event @@ -18,4 +20,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- a/doc/xfer-signals.dox Tue Oct 30 06:29:13 2007 +0000 +++ b/doc/xfer-signals.dox Tue Oct 30 06:37:35 2007 +0000 @@ -12,6 +12,8 @@ @signal file-send-complete @endsignals + @see ft.h + <hr> @signaldef file-recv-accept @@ -109,4 +111,4 @@ @endsignaldef */ -// vim: syntax=c tw=75 et +// vim: syntax=c.doxygen tw=75 et
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doxy2devhelp.xsl Tue Oct 30 06:37:35 2007 +0000 @@ -0,0 +1,98 @@ +<xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format" + version="1.0"> + +<!-- Based on http://bur.st/~eleusis/devhelp/doxy2devhelp.xsl + (http://bur.st/~eleusis/devhelp/README) + which is based on http://bugzilla.gnome.org/show_bug.cgi?id=122450 +--> + +<xsl:output method="xml" version="1.0" indent="yes"/> + +<xsl:param name="reference_prefix"></xsl:param> + +<xsl:template match="/"> + <book title="Pidgin Documentation" + name="pidgin" + link="{$reference_prefix}main.html"> + <chapters> + <sub name="Modules" link="{$reference_prefix}modules.html"> + <xsl:apply-templates select="doxygenindex/compound[@kind='group']"> + <xsl:sort select="."/> + </xsl:apply-templates> + </sub> + <!-- annotated.html has the short descriptions beside each struct. is + that more useful than being grouped alphabetically? + --> + <sub name="Structs" link="{$reference_prefix}classes.html"> + <xsl:apply-templates select="doxygenindex/compound[@kind='struct']"> + <xsl:sort select="."/> + </xsl:apply-templates> + </sub> + <!-- This is redundant given Modules --> + <!-- + <sub name="Directories" link="{$reference_prefix}dirs.html"> + <xsl:apply-templates select="doxygenindex/compound[@kind='dir']"> + <xsl:sort select="."/> + </xsl:apply-templates> + </sub> + --> + <!-- FIXME: Some files show up here but are broken links; mostly + files that are under pages... + --> + <sub name="Files" link="{$reference_prefix}files.html"> + <xsl:apply-templates select="doxygenindex/compound[@kind='file']"> + <xsl:sort select="."/> + </xsl:apply-templates> + </sub> + <sub name="Signals, HOWTOs, Other" link="{$reference_prefix}pages.html"> + <xsl:apply-templates select="doxygenindex/compound[@kind='page']"> + <xsl:sort select="."/> + </xsl:apply-templates> + </sub> + </chapters> + + <functions> + <!-- @todo: maybe select only the real functions, ie those with kind=="function"? --> + <xsl:apply-templates select="doxygenindex/compound/member" mode="as-function"/> + </functions> + </book> +</xsl:template> + +<xsl:template match="compound"> + <xsl:param name="name"><xsl:value-of select="name"/></xsl:param> + <xsl:param name="link"><xsl:value-of select="@refid"/>.html</xsl:param> + <sub name="{$name}" link="{$reference_prefix}{$link}"> + <xsl:apply-templates select="member" mode="as-sub"> + <xsl:sort select="."/> + </xsl:apply-templates> + </sub> +</xsl:template> + +<xsl:template match="member" mode="as-function"> + <!-- + <function name="atk_set_value" link="atk-atkvalue.html#ATK-SET-VALUE"/> + --> + <xsl:param name="name"><xsl:value-of select="name"/></xsl:param> + <!-- Link is refid attribute of parent element + "#" + diff between refid of parent and own refid --> + <xsl:param name="refid_parent"><xsl:value-of select="parent::node()/@refid"/></xsl:param> + <xsl:param name="own_refid"><xsl:value-of select="@refid"/></xsl:param> + <xsl:param name="offset"><xsl:value-of select="string-length($refid_parent) + 3"/></xsl:param> + <xsl:param name="ref_diff"><xsl:value-of select="substring($own_refid, $offset, 33)"/></xsl:param> + <xsl:param name="link"><xsl:value-of select="$refid_parent"/>.html#<xsl:value-of select="$ref_diff"/></xsl:param> + <function name="{$name}" link="{$reference_prefix}{$link}"/> +</xsl:template> + +<xsl:template match="member" mode="as-sub"> + <xsl:param name="name"><xsl:value-of select="name"/></xsl:param> + <!-- Link is refid attribute of parent element + "#" + diff between refid of parent and own refid --> + <xsl:param name="refid_parent"><xsl:value-of select="parent::node()/@refid"/></xsl:param> + <xsl:param name="own_refid"><xsl:value-of select="@refid"/></xsl:param> + <xsl:param name="offset"><xsl:value-of select="string-length($refid_parent) + 3"/></xsl:param> + <xsl:param name="ref_diff"><xsl:value-of select="substring($own_refid, $offset, 33)"/></xsl:param> + <xsl:param name="link"><xsl:value-of select="$refid_parent"/>.html#<xsl:value-of select="$ref_diff"/></xsl:param> + <sub name="{$name}" link="{$reference_prefix}{$link}"/> +</xsl:template> + +</xsl:stylesheet>
--- a/finch/Makefile.am Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/Makefile.am Tue Oct 30 06:37:35 2007 +0000 @@ -1,7 +1,11 @@ EXTRA_DIST = \ getopt.c \ getopt.h \ - getopt1.c + getopt1.c \ + finch.pc.in + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = finch.pc SUBDIRS = libgnt plugins
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/finch/finch.pc.in Tue Oct 30 06:37:35 2007 +0000 @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +datadir=@datadir@ +sysconfdir=@sysconfdir@ + +Name: Finch +Description: Finch is an instant messenger application that uses libpurple for protocol support and ncurses (libgnt) for the UI. +Version: @VERSION@ +Requires: gnt purple +Cflags: -I${includedir}/finch +
--- a/finch/gntaccount.h Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/gntaccount.h Tue Oct 30 06:37:35 2007 +0000 @@ -59,6 +59,8 @@ * Show the edit dialog for an account. * * @param account The account to edit, or @c NULL to create a new account. + * + * @since 2.2.0 */ void finch_account_dialog_show(PurpleAccount *account);
--- a/finch/gntblist.h Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/gntblist.h Tue Oct 30 06:37:35 2007 +0000 @@ -98,6 +98,8 @@ * @param name The user to get information about. * * @return Returns the ui-handle for the userinfo notification. + * + * @since 2.1.0 */ gpointer finch_retrieve_user_info(PurpleConnection *conn, const char *name);
--- a/finch/gntnotify.c Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/gntnotify.c Tue Oct 30 06:37:35 2007 +0000 @@ -84,8 +84,8 @@ if (type == PURPLE_NOTIFY_FORMATTED) { int width = -1, height = -1; msg = gnt_text_view_new(); + gnt_text_view_set_flag(GNT_TEXT_VIEW(msg), GNT_TEXT_VIEW_TOP_ALIGN); gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(msg), secondary, sf); - gnt_text_view_scroll(GNT_TEXT_VIEW(msg), 0); gnt_text_view_attach_scroll_widget(GNT_TEXT_VIEW(msg), button); gnt_util_get_text_bound(secondary, &width, &height); gnt_widget_set_size(msg, width + 3, height + 1); @@ -194,6 +194,7 @@ PurpleAccount *account = purple_connection_get_account(gc); GString *message = g_string_new(NULL); void *ret; + static int key = 0; if (!detailed) { @@ -212,7 +213,7 @@ to = g_strdup_printf("%s (%s)", tos ? *tos : purple_account_get_username(account), purple_account_get_protocol_name(account)); - gnt_tree_add_row_after(GNT_TREE(emaildialog.tree), GINT_TO_POINTER(time(NULL)), + gnt_tree_add_row_after(GNT_TREE(emaildialog.tree), GINT_TO_POINTER(++key), gnt_tree_create_row(GNT_TREE(emaildialog.tree), to, froms ? *froms : "[Unknown sender]", *subjects), @@ -360,7 +361,8 @@ i = 0; for (iter = results->columns; iter; iter = iter->next) { - gnt_tree_set_column_title(GNT_TREE(tree), i, iter->data); + PurpleNotifySearchColumn *column = iter->data; + gnt_tree_set_column_title(GNT_TREE(tree), i, column->title); i++; }
--- a/finch/gntsound.h Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/gntsound.h Tue Oct 30 06:37:35 2007 +0000 @@ -37,6 +37,8 @@ * Get the name of the active sound profile. * * @return The name of the profile + * + * @since 2.1.0 */ const char *finch_sound_get_active_profile(void); @@ -44,6 +46,8 @@ * Set the active profile. If the profile doesn't exist, nothing is changed. * * @param name The name of the profile + * + * @since 2.1.0 */ void finch_sound_set_active_profile(const char *name); @@ -52,6 +56,8 @@ * * @return A list of strings denoting sound profile names. * Caller must free the list (but not the data). + * + * @since 2.1.0 */ GList *finch_sound_get_profiles(void); @@ -60,6 +66,8 @@ * * @return Returns FALSE if preference is set to 'No sound', or if volume is * set to zero. + * + * @since 2.2.0 */ gboolean finch_sound_is_enabled(void); @@ -67,11 +75,15 @@ * Gets GNT sound UI ops. * * @return The UI operations structure. + * + * @since 2.1.0 */ PurpleSoundUiOps *finch_sound_get_ui_ops(void); /** * Show the sound settings dialog. + * + * @since 2.1.0 */ void finch_sounds_show_all(void);
--- a/finch/libgnt/gnt.h Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/libgnt/gnt.h Tue Oct 30 06:37:35 2007 +0000 @@ -62,6 +62,14 @@ */ gboolean gnt_ascii_only(void); +/** + * Present a window. If the event was triggered because of user interaction, + * the window is moved to the foreground. Otherwise, the Urgent hint is set. + * + * @param window The window the present. + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) + */ void gnt_window_present(GntWidget *window); /** *
--- a/finch/libgnt/gntslider.h Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/libgnt/gntslider.h Tue Oct 30 06:37:35 2007 +0000 @@ -75,6 +75,8 @@ /** * @return The GType for GntSlider + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ GType gnt_slider_get_gtype(void); @@ -89,6 +91,8 @@ * @param min The minimum value for the slider * * @return The newly created slider + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ GntWidget * gnt_slider_new(gboolean orient, int max, int min); @@ -98,6 +102,8 @@ * @param slider The slider * @param max The maximum value * @param min The minimum value + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ void gnt_slider_set_range(GntSlider *slider, int max, int min); @@ -106,6 +112,8 @@ * * @param slider The slider * @param step The amount for each step + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ void gnt_slider_set_step(GntSlider *slider, int step); @@ -114,6 +122,8 @@ * * @param slider The slider * @param step The amount for a small step (for the slider) + * + * @since 2.2.0 */ void gnt_slider_set_small_step(GntSlider *slider, int step); @@ -122,6 +132,8 @@ * * @param slider The slider * @param step The amount for a large step (for the slider) + * + * @since 2.2.0 */ void gnt_slider_set_large_step(GntSlider *slider, int step); @@ -133,6 +145,8 @@ * forward, negative to change backward * * @return The value of the slider after the change + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ int gnt_slider_advance_step(GntSlider *slider, int steps); @@ -141,6 +155,8 @@ * * @param slider The slider * @param value The current value + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ void gnt_slider_set_value(GntSlider *slider, int value); @@ -149,6 +165,8 @@ * * @param slider The slider * + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ int gnt_slider_get_value(GntSlider *slider); @@ -157,6 +175,8 @@ * * @param slider The slider * @param label The label to update + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ void gnt_slider_reflect_label(GntSlider *slider, GntLabel *label);
--- a/finch/libgnt/gntstyle.h Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/libgnt/gntstyle.h Tue Oct 30 06:37:35 2007 +0000 @@ -53,6 +53,8 @@ * @param key The key * * @return The value of the setting as a string, or @c NULL + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ char *gnt_style_get_from_name(const char *group, const char *key); @@ -62,6 +64,8 @@ * * @param value The value of the boolean setting as a string * @return The boolean value + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ gboolean gnt_style_parse_bool(const char *value);
--- a/finch/libgnt/gnttextview.h Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/libgnt/gnttextview.h Tue Oct 30 06:37:35 2007 +0000 @@ -204,6 +204,8 @@ * * @param view The textview widget * @param flag The flag to set + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ void gnt_text_view_set_flag(GntTextView *view, GntTextViewFlag flag);
--- a/finch/libgnt/gnttree.h Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/libgnt/gnttree.h Tue Oct 30 06:37:35 2007 +0000 @@ -383,6 +383,8 @@ * * @see gnt_tree_set_column_titles * @see gnt_tree_set_show_title + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ void gnt_tree_set_column_title(GntTree *tree, int index, const char *title); @@ -486,6 +488,8 @@ * * @see gnt_tree_set_col_width * @see gnt_tree_set_column_width_ratio + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ void gnt_tree_set_column_resizable(GntTree *tree, int col, gboolean res); @@ -505,6 +509,8 @@ * @param tree The tree * @param col The index of the column * @param right @c TRUE if the text in the column should be right aligned + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ void gnt_tree_set_column_is_right_aligned(GntTree *tree, int col, gboolean right); @@ -519,6 +525,8 @@ * * @see gnt_tree_set_col_width * @see gnt_tree_set_column_resizable + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ void gnt_tree_set_column_width_ratio(GntTree *tree, int cols[]); @@ -527,6 +535,8 @@ * * @param tree The tree * @param col The index of the column + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ void gnt_tree_set_search_column(GntTree *tree, int col); @@ -535,6 +545,8 @@ * * @param tree The tree * @return @c TRUE if the user is searching, @c FALSE otherwise. + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ gboolean gnt_tree_is_searching(GntTree *tree); @@ -547,6 +559,8 @@ * string and the content of row in the search column. * If the function returns @c TRUE, the row is dislayed, * otherwise it's not. + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ void gnt_tree_set_search_function(GntTree *tree, gboolean (*func)(GntTree *tree, gpointer key, const char *search, const char *current));
--- a/finch/libgnt/gntutils.h Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/libgnt/gntutils.h Tue Oct 30 06:37:35 2007 +0000 @@ -139,6 +139,8 @@ * @param string The XHTML string * @param tv The GntTextView * @return @c TRUE if the string was added to the textview properly, @c FALSE otherwise. + * + * @since 2.2.0 */ gboolean gnt_util_parse_xhtml_to_textview(const char *string, GntTextView *tv); @@ -148,6 +150,8 @@ * @param widget The widget * @param key The key to trigger the button * @param button The button to trigger + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) */ void gnt_util_set_trigger_widget(GntWidget *wid, const char *text, GntWidget *button);
--- a/finch/libgnt/gntwm.c Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/libgnt/gntwm.c Tue Oct 30 06:37:35 2007 +0000 @@ -1717,12 +1717,11 @@ void gnt_wm_window_close(GntWM *wm, GntWidget *widget) { GntWS *s; - GntNode *node; int pos; s = gnt_wm_widget_find_workspace(wm, widget); - if ((node = g_hash_table_lookup(wm->nodes, widget)) == NULL) + if (g_hash_table_lookup(wm->nodes, widget) == NULL) return; g_signal_emit(wm, signals[SIG_CLOSE_WIN], 0, widget);
--- a/finch/libgnt/gntws.h Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/libgnt/gntws.h Tue Oct 30 06:37:35 2007 +0000 @@ -69,18 +69,112 @@ G_BEGIN_DECLS +/** + * @return The GType for GntWS. + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) + */ GType gnt_ws_get_gtype(void); +/** + * Create a new workspace with the specified name. + * + * @param name The desired name of the workspace, or @c NULL. + * + * @return The newly created workspace. + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) + */ GntWS *gnt_ws_new(const char *name); + +/** + * Set the name of a workspace. + * + * @param ws The workspace to rename. + * @param name The new name of the workspace. + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) + */ void gnt_ws_set_name(GntWS *ws, const gchar *name); + +/** + * Add a widget to a workspace. + * + * @param ws The workspace. + * @param widget The widget to add. + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) + */ void gnt_ws_add_widget(GntWS *ws, GntWidget *widget); + +/** + * Remove a widget from a workspace. + * + * @param ws The workspace + * @param widget The widget to remove from the workspace. + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) + */ void gnt_ws_remove_widget(GntWS *ws, GntWidget *widget); + +/** + * Hide a widget in a workspace. + * + * @param widget The widget to hide. + * @param nodes A hashtable containing information about the widgets. + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) + */ void gnt_ws_widget_hide(GntWidget *widget, GHashTable *nodes); + +/** + * Show a widget in a workspace. + * + * @param widget The widget to show. + * @param nodes A hashtable containing information about the widgets. + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) + */ void gnt_ws_widget_show(GntWidget *widget, GHashTable *nodes); + +/** + * Draw the taskbar in a workspace. + * + * @param ws The workspace. + * @param reposition Whether the workspace should reposition the taskbar. + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) + */ void gnt_ws_draw_taskbar(GntWS *ws, gboolean reposition); + +/** + * Hide a workspace. + * + * @param ws The workspace to hide. + * @param table A hashtable containing information about the widgets. + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) + */ void gnt_ws_hide(GntWS *ws, GHashTable *table); + +/** + * Show a workspace. + * + * @param ws The workspace to hide. + * @param table A hashtable containing information about the widgets. + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) + */ void gnt_ws_show(GntWS *ws, GHashTable *table); +/** + * Get the name of a workspace. + * + * @param ws The workspace. + * @return The name of the workspace (can be @c NULL). + * + * @since 2.0.0 (gnt), 2.1.0 (pidgin) + */ const char * gnt_ws_get_name(GntWS *ws); #endif
--- a/finch/libgnt/test/Makefile Tue Oct 30 06:29:13 2007 +0000 +++ b/finch/libgnt/test/Makefile Tue Oct 30 06:37:35 2007 +0000 @@ -1,5 +1,5 @@ CC=gcc -CFLAGS=`pkg-config --cflags gobject-2.0 gmodule-2.0` -g -I../ -DSTANDALONE +CFLAGS=`pkg-config --cflags gobject-2.0 gmodule-2.0` -g -I../ -DSTANDALONE -I/usr/inclue/ncursesw/ LDFLAGS=`pkg-config --libs gobject-2.0 gmodule-2.0 gnt` -pg EXAMPLES=combo focus tv multiwin keys menu parse
--- a/libpurple/account.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/account.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file account.h Account API * @ingroup core + * @see @ref account-signals */ /* purple @@ -22,8 +23,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref account-signals */ #ifndef _PURPLE_ACCOUNT_H_ #define _PURPLE_ACCOUNT_H_
--- a/libpurple/blist.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/blist.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file blist.h Buddy List API * @ingroup core + * @see @ref blist-signals */ /* purple @@ -22,8 +23,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref blist-signals */ #ifndef _PURPLE_BLIST_H_ #define _PURPLE_BLIST_H_
--- a/libpurple/certificate.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/certificate.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,8 @@ /** * @file certificate.h Public-Key Certificate API * @ingroup core + * @see @ref certificate-signals + * @since 2.2.0 */ /* @@ -433,7 +435,7 @@ * * @return TRUE if 'crt' has a valid signature made by 'issuer', * otherwise FALSE - * @TODO Find a way to give the reason (bad signature, not the issuer, etc.) + * @todo Find a way to give the reason (bad signature, not the issuer, etc.) */ gboolean purple_certificate_signed_by(PurpleCertificate *crt, PurpleCertificate *issuer); @@ -448,7 +450,7 @@ * @param chain List of PurpleCertificate instances comprising the chain, * in the order certificate, issuer, issuer's issuer, etc. * @return TRUE if the chain is valid. See description. - * @TODO Specify which certificate in the chain caused a failure + * @todo Specify which certificate in the chain caused a failure */ gboolean purple_certificate_check_signature_chain(GList *chain); @@ -779,7 +781,7 @@ * Displays a window showing X.509 certificate information * * @param crt Certificate under an "x509" Scheme - * @TODO Will break on CA certs, as they have no Common Name + * @todo Will break on CA certs, as they have no Common Name */ void purple_certificate_display_x509(PurpleCertificate *crt);
--- a/libpurple/cipher.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/cipher.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file cipher.h Purple Cipher API * @ingroup core + * @see @ref cipher-signals */ /* purple @@ -22,8 +23,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref cipher-signals */ #ifndef PURPLE_CIPHER_H #define PURPLE_CIPHER_H
--- a/libpurple/connection.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/connection.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file connection.h Connection API * @ingroup core + * @see @ref connection-signals */ /* purple @@ -22,8 +23,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref connection-signals */ #ifndef _PURPLE_CONNECTION_H_ #define _PURPLE_CONNECTION_H_
--- a/libpurple/conversation.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/conversation.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file conversation.h Conversation API * @ingroup core + * @see @ref conversation-signals */ /* purple @@ -22,8 +23,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref conversation-signals */ #ifndef _PURPLE_CONVERSATION_H_ #define _PURPLE_CONVERSATION_H_ @@ -286,6 +285,8 @@ /** * Description of a conversation message + * + * @since 2.2.0 */ struct _PurpleConvMessage { @@ -671,6 +672,8 @@ * @return A GList of PurpleConvMessage's. The must not modify the list or the data within. * The list contains the newest message at the beginning, and the oldest message at * the end. + * + * @since 2.2.0 */ GList *purple_conversation_get_message_history(PurpleConversation *conv); @@ -678,6 +681,8 @@ * Clear the message history of a conversation. * * @param conv The conversation + * + * @since 2.2.0 */ void purple_conversation_clear_message_history(PurpleConversation *conv); @@ -687,6 +692,8 @@ * @param msg A PurpleConvMessage * * @return The name of the sender of the message + * + * @since 2.2.0 */ const char *purple_conversation_message_get_sender(PurpleConvMessage *msg); @@ -696,6 +703,8 @@ * @param msg A PurpleConvMessage * * @return The name of the sender of the message + * + * @since 2.2.0 */ const char *purple_conversation_message_get_message(PurpleConvMessage *msg); @@ -705,6 +714,8 @@ * @param msg A PurpleConvMessage * * @return The name of the sender of the message + * + * @since 2.2.0 */ PurpleMessageFlags purple_conversation_message_get_flags(PurpleConvMessage *msg); @@ -714,6 +725,8 @@ * @param msg A PurpleConvMessage * * @return The name of the sender of the message + * + * @since 2.2.0 */ time_t purple_conversation_message_get_timestamp(PurpleConvMessage *msg); @@ -1319,6 +1332,8 @@ * @return A list of PurpleMenuAction items, harvested by the * chat-extended-menu signal. The list and the menuaction * items should be freed by the caller. + * + * @since 2.1.0 */ GList * purple_conversation_get_extended_menu(PurpleConversation *conv); @@ -1332,6 +1347,8 @@ * message, if not @c NULL. It must be freed by the caller with g_free(). * * @return @c TRUE if the command was executed successfully, @c FALSE otherwise. + * + * @since 2.1.0 */ gboolean purple_conversation_do_command(PurpleConversation *conv, const gchar *cmdline, const gchar *markup, gchar **error);
--- a/libpurple/core.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/core.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,5 +1,6 @@ /** * @defgroup core libpurple + * @see @ref core-signals */ /* purple @@ -21,8 +22,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref core-signals */ #ifndef _PURPLE_CORE_H_ #define _PURPLE_CORE_H_
--- a/libpurple/dbus-server.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/dbus-server.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file dbus-server.h Purple DBUS Server * @ingroup core + * @see @ref dbus-server-signals */ /* purple @@ -22,8 +23,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref dbus-server-signals */ #ifndef _PURPLE_DBUS_SERVER_H_
--- a/libpurple/dnsquery.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/dnsquery.c Tue Oct 30 06:37:35 2007 +0000 @@ -637,9 +637,10 @@ static gboolean dns_main_thread_cb(gpointer data) { - PurpleDnsQueryData *query_data; + PurpleDnsQueryData *query_data = data; - query_data = data; + /* We're done, so purple_dnsquery_destroy() shouldn't think it is canceling an in-progress lookup */ + query_data->resolver = NULL; if (query_data->error_message != NULL) purple_dnsquery_failed(query_data, query_data->error_message); @@ -713,7 +714,7 @@ #endif /* back to main thread */ - g_idle_add(dns_main_thread_cb, query_data); + purple_timeout_add(0, dns_main_thread_cb, query_data); return 0; } @@ -780,14 +781,12 @@ purple_debug_info("dnsquery", "Performing DNS lookup for %s\n", hostname); - query_data = g_new(PurpleDnsQueryData, 1); + query_data = g_new0(PurpleDnsQueryData, 1); query_data->hostname = g_strdup(hostname); g_strstrip(query_data->hostname); query_data->port = port; query_data->callback = callback; query_data->data = data; - query_data->error_message = NULL; - query_data->hosts = NULL; if (strlen(query_data->hostname) == 0) {
--- a/libpurple/dnsquery.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/dnsquery.h Tue Oct 30 06:37:35 2007 +0000 @@ -59,7 +59,7 @@ PurpleDnsQueryFailedCallback failed_cb); /** Called just before @a query_data is freed; this should cancel any - * further use of @q query_data the UI would make. Unneeded if + * further use of @a query_data the UI would make. Unneeded if * #resolve_host is not implemented. */ void (*destroy)(PurpleDnsQueryData *query_data);
--- a/libpurple/eventloop.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/eventloop.h Tue Oct 30 06:37:35 2007 +0000 @@ -138,6 +138,8 @@ * @param data data to pass to @a function. * @return A handle to the timer which can be passed to * purple_timeout_remove to remove the timer. + * + * @since 2.1.0 */ guint purple_timeout_add_seconds(guint interval, GSourceFunc function, gpointer data);
--- a/libpurple/ft.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/ft.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file ft.h File Transfer API * @ingroup core + * @see @ref xfer-signals */ /* purple @@ -22,8 +23,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref xfer-signals */ #ifndef _PURPLE_FT_H_ #define _PURPLE_FT_H_ @@ -243,6 +242,8 @@ * @param xfer The file transfer. * * @return The name of the remote user. + * + * @since 2.1.0 */ const char *purple_xfer_get_remote_user(const PurpleXfer *xfer);
--- a/libpurple/gaim-compat.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/gaim-compat.h Tue Oct 30 06:37:35 2007 +0000 @@ -22,8 +22,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref account-signals */ #ifndef _GAIM_COMPAT_H_ #define _GAIM_COMPAT_H_
--- a/libpurple/imgstore.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/imgstore.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file imgstore.h IM Image Store API * @ingroup core + * @see @ref imgstore-signals */ /* purple @@ -22,8 +23,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref imgstore-signals */ #ifndef _PURPLE_IMGSTORE_H_ #define _PURPLE_IMGSTORE_H_
--- a/libpurple/log.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/log.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file log.h Logging API * @ingroup core + * @see @ref log-signals */ /* purple @@ -22,8 +23,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref log-signals */ #ifndef _PURPLE_LOG_H_ #define _PURPLE_LOG_H_
--- a/libpurple/network.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/network.c Tue Oct 30 06:37:35 2007 +0000 @@ -263,6 +263,7 @@ purple_network_do_listen(unsigned short port, int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data) { int listenfd = -1; + int flags; const int on = 1; PurpleNetworkListenData *listen_data; unsigned short actual_port; @@ -340,7 +341,8 @@ close(listenfd); return NULL; } - fcntl(listenfd, F_SETFL, O_NONBLOCK); + flags = fcntl(listenfd, F_GETFL); + fcntl(listenfd, F_SETFL, flags | O_NONBLOCK); actual_port = purple_network_get_port_from_fd(listenfd);
--- a/libpurple/notify.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/notify.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file notify.h Notification API * @ingroup core + * @see @ref notify-signals */ /* purple @@ -22,8 +23,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref notify-signals */ #ifndef _PURPLE_NOTIFY_H_ #define _PURPLE_NOTIFY_H_
--- a/libpurple/plugin.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/plugin.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,9 @@ /** * @file plugin.h Plugin API * @ingroup core + * @see @ref plugin-signals + * @see @ref plugin-ids + * @see @ref plugin-i18n */ /* purple @@ -22,10 +25,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref plugin-signals - * @see @ref plugin-ids - * @see @ref plugin-i18n */ #ifndef _PURPLE_PLUGIN_H_ #define _PURPLE_PLUGIN_H_
--- a/libpurple/pluginpref.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/pluginpref.h Tue Oct 30 06:37:35 2007 +0000 @@ -35,16 +35,16 @@ */ typedef enum { - PURPLE_STRING_FORMAT_TYPE_NONE = 0, - PURPLE_STRING_FORMAT_TYPE_MULTILINE = 1 << 0, - PURPLE_STRING_FORMAT_TYPE_HTML = 1 << 1 + PURPLE_STRING_FORMAT_TYPE_NONE = 0, /**< The string is plain text. */ + PURPLE_STRING_FORMAT_TYPE_MULTILINE = 1 << 0, /**< The string can have newlines. */ + PURPLE_STRING_FORMAT_TYPE_HTML = 1 << 1 /**< The string can be in HTML. */ } PurpleStringFormatType; typedef enum { PURPLE_PLUGIN_PREF_NONE, PURPLE_PLUGIN_PREF_CHOICE, - PURPLE_PLUGIN_PREF_INFO, /**< no-value label */ - PURPLE_PLUGIN_PREF_STRING_FORMAT + PURPLE_PLUGIN_PREF_INFO, /**< no-value label */ + PURPLE_PLUGIN_PREF_STRING_FORMAT /**< The preference has a string value. */ } PurplePluginPrefType; #include <glib.h>
--- a/libpurple/plugins/log_reader.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/plugins/log_reader.c Tue Oct 30 06:37:35 2007 +0000 @@ -28,6 +28,19 @@ NAME_GUESS_THEM }; +/* Some common functions. */ +static int get_month(const char *month) +{ + int iter; + const char *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", NULL}; + for (iter = 0; months[iter]; iter++) { + if (strcmp(month, months[iter]) == 0) + break; + } + return iter; +} + /***************************************************************************** * Adium Logger * @@ -103,9 +116,10 @@ } else { char *filename = g_build_filename(path, file, NULL); FILE *handle = g_fopen(filename, "rb"); - char *contents; + char contents[57]; /* XXX: This is really inflexible. */ char *contents2; struct adium_logger_data *data; + size_t rd; PurpleLog *log; if (!handle) { @@ -113,11 +127,9 @@ continue; } - /* XXX: This is really inflexible. */ - contents = g_malloc(57); - fread(contents, 56, 1, handle); + rd = fread(contents, 1, 56, handle) == 0; fclose(handle); - contents[56] = '\0'; + contents[rd] = '\0'; /* XXX: This is fairly inflexible. */ contents2 = contents; @@ -135,11 +147,9 @@ purple_debug_error("Adium log parse", "Contents timestamp parsing error\n"); - g_free(contents); g_free(filename); continue; } - g_free(contents); data = g_new0(struct adium_logger_data, 1); data->path = filename; @@ -168,21 +178,20 @@ } else { char *filename = g_build_filename(path, file, NULL); FILE *handle = g_fopen(filename, "rb"); - char *contents; + char contents[14]; /* XXX: This is really inflexible. */ char *contents2; struct adium_logger_data *data; PurpleLog *log; + size_t rd; if (!handle) { g_free(filename); continue; } - /* XXX: This is really inflexible. */ - contents = g_malloc(14); - fread(contents, 13, 1, handle); + rd = fread(contents, 1, 13, handle); fclose(handle); - contents[13] = '\0'; + contents[rd] = '\0'; contents2 = contents; while (*contents2 && *contents2 != '(') @@ -195,13 +204,10 @@ purple_debug_error("Adium log parse", "Contents timestamp parsing error\n"); - g_free(contents); g_free(filename); continue; } - g_free(contents); - tm.tm_year -= 1900; tm.tm_mon -= 1; @@ -232,7 +238,6 @@ struct adium_logger_data *data; GError *error = NULL; gchar *read = NULL; - gsize length; /* XXX: TODO: We probably want to set PURPLE_LOG_READ_NO_NEWLINE * XXX: TODO: for HTML logs. */ @@ -246,8 +251,9 @@ g_return_val_if_fail(data->path != NULL, g_strdup("")); purple_debug_info("Adium log read", "Reading %s\n", data->path); - if (!g_file_get_contents(data->path, &read, &length, &error)) { - purple_debug_error("Adium log read", "Error reading log\n"); + if (!g_file_get_contents(data->path, &read, NULL, &error)) { + purple_debug_error("Adium log read", "Error reading log: %s\n", + (error && error->message) ? error->message : "Unknown error"); if (error) g_error_free(error); return g_strdup(""); @@ -1355,36 +1361,7 @@ * daylight savings time. */ tm.tm_isdst = -1; - - /* Ugly hack, in case current locale - * is not English. This code is taken - * from log.c. - */ - if (strcmp(month, "Jan") == 0) { - tm.tm_mon= 0; - } else if (strcmp(month, "Feb") == 0) { - tm.tm_mon = 1; - } else if (strcmp(month, "Mar") == 0) { - tm.tm_mon = 2; - } else if (strcmp(month, "Apr") == 0) { - tm.tm_mon = 3; - } else if (strcmp(month, "May") == 0) { - tm.tm_mon = 4; - } else if (strcmp(month, "Jun") == 0) { - tm.tm_mon = 5; - } else if (strcmp(month, "Jul") == 0) { - tm.tm_mon = 6; - } else if (strcmp(month, "Aug") == 0) { - tm.tm_mon = 7; - } else if (strcmp(month, "Sep") == 0) { - tm.tm_mon = 8; - } else if (strcmp(month, "Oct") == 0) { - tm.tm_mon = 9; - } else if (strcmp(month, "Nov") == 0) { - tm.tm_mon = 10; - } else if (strcmp(month, "Dec") == 0) { - tm.tm_mon = 11; - } + tm.tm_mon = get_month(month); data = g_new0( struct trillian_logger_data, 1); @@ -1446,7 +1423,7 @@ file = g_fopen(data->path, "rb"); fseek(file, data->offset, SEEK_SET); - fread(read, data->length, 1, file); + data->length = fread(read, 1, data->length, file); fclose(file); if (read[data->length-1] == '\n') { @@ -1808,8 +1785,10 @@ error = NULL; if (!g_file_get_contents(path, &contents, NULL, &error)) { purple_debug_error("QIP logger", - "Couldn't read file %s: %s \n", path, error->message); - g_error_free(error); + "Couldn't read file %s: %s \n", path, + (error && error->message) ? error->message : "Unknown error"); + if (error) + g_error_free(error); g_free(path); return list; } @@ -1937,15 +1916,13 @@ g_return_val_if_fail(data->path != NULL, g_strdup("")); g_return_val_if_fail(data->length > 0, g_strdup("")); - error = NULL; - - contents = g_malloc(data->length + 2); - file = g_fopen(data->path, "rb"); g_return_val_if_fail(file != NULL, g_strdup("")); - + + contents = g_malloc(data->length + 2); + fseek(file, data->offset, SEEK_SET); - fread(contents, data->length, 1, file); + data->length = fread(contents, 1, data->length, file); fclose(file); contents[data->length] = '\n'; @@ -1955,8 +1932,10 @@ error = NULL; if (!(utf8_string = g_convert(contents, -1, "UTF-8", "Cp1251", NULL, NULL, &error))) { purple_debug_error("QIP logger", - "Couldn't convert file %s to UTF-8: %s\n", data->path, error->message); - g_error_free(error); + "Couldn't convert file %s to UTF-8: %s\n", data->path, + (error && error->message) ? error->message : "Unknown error"); + if (error) + g_error_free(error); g_free(contents); return g_strdup(""); } @@ -2022,7 +2001,7 @@ g_string_append(formatted, "</font> "); if (is_in_message) { - if (buddy_name != NULL && buddy->alias) { + if (buddy_name != NULL && buddy != NULL && buddy->alias) { g_string_append_printf(formatted, "<span style=\"color: #A82F2F;\">" "<b>%s</b></span>: ", buddy->alias); @@ -2052,7 +2031,9 @@ g_string_append(formatted, line); g_string_append(formatted, "<br>"); } - line = ++c; + + if (c) + line = ++c; } } g_free(contents); @@ -2094,6 +2075,347 @@ g_free(data); } +/************************************************************************* + * aMSN Logger * + *************************************************************************/ + +/* The aMSN logger doesn't write logs, only reads them. This is to include + * aMSN logs in the log viewer transparently. + */ + +static PurpleLogLogger *amsn_logger; + +struct amsn_logger_data { + char *path; + int offset; + int length; +}; + +#define AMSN_LOG_CONV_START "|\"LRED[Conversation started on " +#define AMSN_LOG_CONV_END "|\"LRED[You have closed the window on " +#define AMSN_LOG_CONV_EXTRA "01 Aug 2001 00:00:00]" + +static GList *amsn_logger_parse_file(char *filename, const char *sn, PurpleAccount *account) +{ + GList *list = NULL; + GError *error; + char *contents; + struct amsn_logger_data *data; + PurpleLog *log; + + purple_debug_info("aMSN logger", "Reading %s\n", filename); + error = NULL; + if (!g_file_get_contents(filename, &contents, NULL, &error)) { + purple_debug_error("aMSN logger", + "Couldn't read file %s: %s \n", filename, + (error && error->message) ? + error->message : "Unknown error"); + if (error) + g_error_free(error); + } else { + char *c = contents; + gboolean found_start = FALSE; + char *start_log = c; + int offset = 0; + struct tm tm; + while (c && *c) { + if (purple_str_has_prefix(c, AMSN_LOG_CONV_START)) { + char month[4]; + if (sscanf(c + strlen(AMSN_LOG_CONV_START), + "%u %3s %u %u:%u:%u", + &tm.tm_mday, (char*)&month, &tm.tm_year, + &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) { + found_start = FALSE; + purple_debug_error("aMSN logger", + "Error parsing start date for %s\n", + filename); + } else { + tm.tm_year -= 1900; + + /* Let the C library deal with + * daylight savings time. + */ + tm.tm_isdst = -1; + tm.tm_mon = get_month(month); + + found_start = TRUE; + offset = c - contents; + start_log = c; + } + } else if (purple_str_has_prefix(c, AMSN_LOG_CONV_END) && found_start) { + data = g_new0(struct amsn_logger_data, 1); + data->path = g_strdup(filename); + data->offset = offset; + data->length = c - start_log + + strlen(AMSN_LOG_CONV_END) + + strlen(AMSN_LOG_CONV_EXTRA); + log = purple_log_new(PURPLE_LOG_IM, sn, account, NULL, mktime(&tm), NULL); + log->logger = amsn_logger; + log->logger_data = data; + list = g_list_prepend(list, log); + found_start = FALSE; + + purple_debug_info("aMSN logger", + "Found log for %s:" + " path = (%s)," + " offset = (%d)," + " length = (%d)\n", + sn, data->path, data->offset, data->length); + } + c = strstr(c, "\n"); + c++; + } + + /* I've seen the file end without the AMSN_LOG_CONV_END bit */ + if (found_start) { + data = g_new0(struct amsn_logger_data, 1); + data->path = g_strdup(filename); + data->offset = offset; + data->length = c - start_log + + strlen(AMSN_LOG_CONV_END) + + strlen(AMSN_LOG_CONV_EXTRA); + log = purple_log_new(PURPLE_LOG_IM, sn, account, NULL, mktime(&tm), NULL); + log->logger = amsn_logger; + log->logger_data = data; + list = g_list_prepend(list, log); + found_start = FALSE; + + purple_debug_info("aMSN logger", + "Found log for %s:" + " path = (%s)," + " offset = (%d)," + " length = (%d)\n", + sn, data->path, data->offset, data->length); + } + g_free(contents); + } + + return list; +} + +/* `log_dir`/username@hotmail.com/logs/buddyname@hotmail.com.log */ +/* `log_dir`/username@hotmail.com/logs/Month Year/buddyname@hotmail.com.log */ +static GList *amsn_logger_list(PurpleLogType type, const char *sn, PurpleAccount *account) +{ + GList *list = NULL; + const char *logdir; + char *username; + char *log_path; + char *buddy_log; + char *filename; + GDir *dir; + const char *name; + + logdir = purple_prefs_get_string("/plugins/core/log_reader/amsn/log_directory"); + + /* By clearing the log directory path, this logger can be (effectively) disabled. */ + if (!logdir || !*logdir) + return NULL; + + /* aMSN only works with MSN/WLM */ + if (strcmp(account->protocol_id, "prpl-msn")) + return NULL; + + username = g_strdup(purple_normalize(account, account->username)); + buddy_log = g_strdup_printf("%s.log", purple_normalize(account, sn)); + log_path = g_build_filename(logdir, username, "logs", NULL); + + /* First check in the top-level */ + filename = g_build_filename(log_path, buddy_log, NULL); + if (g_file_test(filename, G_FILE_TEST_EXISTS)) + list = amsn_logger_parse_file(filename, sn, account); + else + g_free(filename); + + /* Check in previous months */ + dir = g_dir_open(log_path, 0, NULL); + if (dir) { + while ((name = g_dir_read_name(dir)) != NULL) { + filename = g_build_filename(log_path, name, buddy_log, NULL); + if (g_file_test(filename, G_FILE_TEST_EXISTS)) + list = g_list_concat(list, amsn_logger_parse_file(filename, sn, account)); + g_free(filename); + } + g_dir_close(dir); + } + + g_free(log_path); + + /* New versions use 'friendlier' directory names */ + purple_util_chrreplace(username, '@', '_'); + purple_util_chrreplace(username, '.', '_'); + + log_path = g_build_filename(logdir, username, "logs", NULL); + + /* First check in the top-level */ + filename = g_build_filename(log_path, buddy_log, NULL); + if (g_file_test(filename, G_FILE_TEST_EXISTS)) + list = g_list_concat(list, amsn_logger_parse_file(filename, sn, account)); + g_free(filename); + + /* Check in previous months */ + dir = g_dir_open(log_path, 0, NULL); + if (dir) { + while ((name = g_dir_read_name(dir)) != NULL) { + filename = g_build_filename(log_path, name, buddy_log, NULL); + if (g_file_test(filename, G_FILE_TEST_EXISTS)) + list = g_list_concat(list, amsn_logger_parse_file(filename, sn, account)); + g_free(filename); + } + g_dir_close(dir); + } + + g_free(log_path); + g_free(username); + g_free(buddy_log); + + return list; +} + +/* Really it's |"L, but the string's been escaped */ +#define AMSN_LOG_FORMAT_TAG "|"L" + +static char *amsn_logger_read(PurpleLog *log, PurpleLogReadFlags *flags) +{ + struct amsn_logger_data *data; + FILE *file; + char *contents; + char *escaped; + GString *formatted; + char *start; + gboolean in_span = FALSE; + + if (flags != NULL) + *flags = PURPLE_LOG_READ_NO_NEWLINE; + + g_return_val_if_fail(log != NULL, g_strdup("")); + + data = log->logger_data; + + g_return_val_if_fail(data->path != NULL, g_strdup("")); + g_return_val_if_fail(data->length > 0, g_strdup("")); + + contents = g_malloc(data->length + 2); + + file = g_fopen(data->path, "rb"); + g_return_val_if_fail(file != NULL, g_strdup("")); + + fseek(file, data->offset, SEEK_SET); + data->length = fread(contents, 1, data->length, file); + fclose(file); + + contents[data->length] = '\n'; + contents[data->length + 1] = '\0'; + + escaped = g_markup_escape_text(contents, -1); + g_free(contents); + contents = escaped; + + formatted = g_string_sized_new(data->length + 2); + + start = contents; + while (start && *start) { + char *end; + char *old_tag; + char *tag; + end = strstr(start, "\n"); + if (!end) + break; + *end = '\0'; + if (purple_str_has_prefix(start, AMSN_LOG_FORMAT_TAG) && in_span) { + /* New format for this line */ + g_string_append(formatted, "</span><br>"); + in_span = FALSE; + } else if (start != contents) { + /* Continue format from previous line */ + g_string_append(formatted, "<br>"); + } + old_tag = start; + tag = strstr(start, AMSN_LOG_FORMAT_TAG); + while (tag) { + g_string_append_len(formatted, old_tag, tag - old_tag); + tag += strlen(AMSN_LOG_FORMAT_TAG); + if (in_span) { + g_string_append(formatted, "</span>"); + in_span = FALSE; + } + if (*tag == 'C') { + /* |"LCxxxxxx is a hex colour */ + char colour[7]; + strncpy(colour, tag + 1, 6); + colour[6] = '\0'; + g_string_append_printf(formatted, "<span style=\"color: #%s;\">", colour); + /* This doesn't appear to work? */ + /* g_string_append_printf(formatted, "<span style=\"color: #%6s;\">", tag + 1); */ + in_span = TRUE; + old_tag = tag + 7; /* C + xxxxxx */ + } else { + /* |"Lxxx is a 3-digit colour code */ + if (purple_str_has_prefix(tag, "RED")) { + g_string_append(formatted, "<span style=\"color: red;\">"); + in_span = TRUE; + } else if (purple_str_has_prefix(tag, "GRA")) { + g_string_append(formatted, "<span style=\"color: gray;\">"); + in_span = TRUE; + } else if (purple_str_has_prefix(tag, "NOR")) { + g_string_append(formatted, "<span style=\"color: black;\">"); + in_span = TRUE; + } else if (purple_str_has_prefix(tag, "ITA")) { + g_string_append(formatted, "<span style=\"color: blue;\">"); + in_span = TRUE; + } else if (purple_str_has_prefix(tag, "GRE")) { + g_string_append(formatted, "<span style=\"color: darkgreen;\">"); + in_span = TRUE; + } else { + purple_debug_info("aMSN logger", "Unknown colour format: %3s\n", tag); + } + old_tag = tag + 3; + } + tag = strstr(tag, AMSN_LOG_FORMAT_TAG); + } + g_string_append(formatted, old_tag); + start = end + 1; + } + if (in_span) + g_string_append(formatted, "</span>"); + + g_free(contents); + + return g_string_free(formatted, FALSE); +} + +static int amsn_logger_size(PurpleLog *log) +{ + struct amsn_logger_data *data; + char *text; + int size; + + g_return_val_if_fail(log != NULL, 0); + + data = log->logger_data; + + if (purple_prefs_get_bool("/plugins/core/log_reader/fast_sizes")) { + return data ? data->length : 0; + } + + text = amsn_logger_read(log, NULL); + size = strlen(text); + g_free(text); + + return size; +} + +static void amsn_logger_finalize(PurpleLog *log) +{ + struct amsn_logger_data *data; + + g_return_if_fail(log != NULL); + + data = log->logger_data; + g_free(data->path); + g_free(data); +} + /***************************************************************************** * Plugin Code * *****************************************************************************/ @@ -2101,14 +2423,16 @@ static void init_plugin(PurplePlugin *plugin) { + +} + +static void log_reader_init_prefs() { char *path; #ifdef _WIN32 char *folder; gboolean found = FALSE; #endif - g_return_if_fail(plugin != NULL); - purple_prefs_add_none("/plugins/core/log_reader"); @@ -2151,18 +2475,18 @@ /* Calculate default Messenger Plus! log directory. */ #ifdef _WIN32 + path = NULL; folder = wpurple_get_special_folder(CSIDL_PERSONAL); if (folder) { path = g_build_filename(folder, "My Chat Logs", NULL); g_free(folder); - } else - path = g_strdup(""); + } #else path = g_build_filename(PURPLE_LOG_READER_WINDOWS_MOUNT_POINT, "Documents and Settings", g_get_user_name(), "My Documents", "My Chat Logs", NULL); #endif - purple_prefs_add_string("/plugins/core/log_reader/messenger_plus/log_directory", path); + purple_prefs_add_string("/plugins/core/log_reader/messenger_plus/log_directory", path ? path : ""); g_free(path); @@ -2171,18 +2495,18 @@ /* Calculate default MSN message history directory. */ #ifdef _WIN32 + path = NULL; folder = wpurple_get_special_folder(CSIDL_PERSONAL); if (folder) { path = g_build_filename(folder, "My Received Files", NULL); g_free(folder); - } else - path = g_strdup(""); + } #else path = g_build_filename(PURPLE_LOG_READER_WINDOWS_MOUNT_POINT, "Documents and Settings", g_get_user_name(), "My Documents", "My Received Files", NULL); #endif - purple_prefs_add_string("/plugins/core/log_reader/msn/log_directory", path); + purple_prefs_add_string("/plugins/core/log_reader/msn/log_directory", path ? path : ""); g_free(path); @@ -2261,21 +2585,22 @@ g_key_file_free(key_file); } #else /* !GLIB_CHECK_VERSION(2,6,0) */ - gsize length; gchar *contents = NULL; purple_debug_info("Trillian talk.ini read", - "Reading %s\n", path); - if (!g_file_get_contents(path, &contents, &length, &error)) { + "Reading %s\n", path); + if (!g_file_get_contents(path, &contents, NULL, &error)) { purple_debug_error("Trillian talk.ini read", - "Error reading talk.ini\n"); + "Error reading talk.ini: %s\n", + (error && error->message) ? error->message : "Unknown error"); if (error) g_error_free(error); } else { - char *line = contents; - while (*contents) { - if (*contents == '\n') { - *contents = '\0'; + char *cursor, *line; + line = cursor = contents; + while (*cursor) { + if (*cursor == '\n') { + *cursor = '\0'; /* XXX: This assumes the first Directory key is under [Logging]. */ if (purple_str_has_prefix(line, "Directory=")) { @@ -2287,25 +2612,29 @@ found = TRUE; } - contents++; - line = contents; + cursor++; + line = cursor; } else - contents++; + cursor++; } - g_free(path); g_free(contents); } + g_free(path); #endif /* !GTK_CHECK_VERSION(2,6,0) */ } /* path */ if (!found) { + path = NULL; folder = wpurple_get_special_folder(CSIDL_PROGRAM_FILES); if (folder) { path = g_build_filename(folder, "Trillian", "users", "default", "logs", NULL); g_free(folder); - } else - path = g_strdup(""); + } + + purple_prefs_add_string( + "/plugins/core/log_reader/trillian/log_directory", path ? path : ""); + g_free(path); } #else /* !defined(_WIN32) */ /* TODO: At some point, this could attempt to parse talk.ini @@ -2316,25 +2645,44 @@ path = g_build_filename(PURPLE_LOG_READER_WINDOWS_MOUNT_POINT, "Program Files", "Trillian", "users", "default", "logs", NULL); + purple_prefs_add_string( + "/plugins/core/log_reader/trillian/log_directory", path); + g_free(path); #endif - /* Add QIP log directory preference. */ purple_prefs_add_none("/plugins/core/log_reader/qip"); /* Calculate default QIP log directory. */ #ifdef _WIN32 + path = NULL; folder = wpurple_get_special_folder(CSIDL_PROGRAM_FILES); if (folder) { path = g_build_filename(folder, "QIP", "Users", NULL); g_free(folder); - } else - path = g_strdup(""); + } #else path = g_build_filename(PURPLE_LOG_READER_WINDOWS_MOUNT_POINT, "Program Files", "QIP", "Users", NULL); #endif - purple_prefs_add_string("/plugins/core/log_reader/qip/log_directory", path); + purple_prefs_add_string("/plugins/core/log_reader/qip/log_directory", path ? path : ""); + g_free(path); + + /* Add aMSN Messenger log directory preference. */ + purple_prefs_add_none("/plugins/core/log_reader/amsn"); + + /* Calculate default aMSN log directory. */ +#ifdef _WIN32 + path = NULL; + folder = wpurple_get_special_folder(CSIDL_PROFILE); /* Silly aMSN, not using CSIDL_APPDATA */ + if (folder) { + path = g_build_filename(folder, "amsn", NULL); + g_free(folder); + } +#else + path = g_build_filename(purple_home_dir(), ".amsn", NULL); +#endif + purple_prefs_add_string("/plugins/core/log_reader/amsn/log_directory", path ? path : ""); g_free(path); } @@ -2343,6 +2691,8 @@ { g_return_val_if_fail(plugin != NULL, FALSE); + log_reader_init_prefs(); + /* The names of IM clients are marked for translation at the request of translators who wanted to transliterate them. Many translators choose to leave them alone. Choose what's best for your language. */ @@ -2418,6 +2768,18 @@ trillian_logger_size); purple_log_logger_add(trillian_logger); + /* The names of IM clients are marked for translation at the request of + translators who wanted to transliterate them. Many translators + choose to leave them alone. Choose what's best for your language. */ + amsn_logger = purple_log_logger_new("amsn", _("aMSN"), 6, + NULL, + NULL, + amsn_logger_finalize, + amsn_logger_list, + amsn_logger_read, + amsn_logger_size); + purple_log_logger_add(amsn_logger); + return TRUE; } @@ -2434,6 +2796,7 @@ purple_log_logger_remove(msn_logger); purple_log_logger_remove(trillian_logger); purple_log_logger_remove(qip_logger); + purple_log_logger_remove(amsn_logger); return TRUE; } @@ -2494,6 +2857,10 @@ "/plugins/core/log_reader/trillian/log_directory", _("Trillian")); purple_plugin_pref_frame_add(frame, ppref); + ppref = purple_plugin_pref_new_with_name_and_label( + "/plugins/core/log_reader/amsn/log_directory", _("aMSN")); + purple_plugin_pref_frame_add(frame, ppref); + return frame; }
--- a/libpurple/plugins/ssl/ssl-gnutls.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/plugins/ssl/ssl-gnutls.c Tue Oct 30 06:37:35 2007 +0000 @@ -884,7 +884,7 @@ gnutls_x509_crt crt_dat; /* GnuTLS time functions return this on error */ const time_t errval = (time_t) (-1); - + gboolean success = TRUE; g_return_val_if_fail(crt, FALSE); g_return_val_if_fail(crt->scheme == &x509_gnutls, FALSE); @@ -893,16 +893,16 @@ if (activation) { *activation = gnutls_x509_crt_get_activation_time(crt_dat); + if (*activation == errval) + success = FALSE; } if (expiration) { *expiration = gnutls_x509_crt_get_expiration_time(crt_dat); + if (*expiration == errval) + success = FALSE; } - if (*activation == errval || *expiration == errval) { - return FALSE; - } - - return TRUE; + return success; } /* X.509 certificate operations provided by this plugin */
--- a/libpurple/plugins/ssl/ssl-nss.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/plugins/ssl/ssl-nss.c Tue Oct 30 06:37:35 2007 +0000 @@ -386,6 +386,7 @@ static GList * ssl_nss_peer_certs(PurpleSslConnection *gsc) { +#if 0 PurpleSslNssData *nss_data = PURPLE_SSL_NSS_DATA(gsc); CERTCertificate *cert; /* @@ -397,6 +398,10 @@ /* TODO: this is a blind guess */ cert = SSL_PeerCertificate(nss_data->fd); + if (cert) + CERT_DestroyCertificate(cert); +#endif + return NULL; @@ -430,11 +435,12 @@ filename); /* Load the raw data up */ - g_return_val_if_fail( - g_file_get_contents(filename, - &rawcert, &len, - NULL ), - NULL); + if (!g_file_get_contents(filename, + &rawcert, &len, + NULL)) { + purple_debug_error("nss/x509", "Unable to read certificate file.\n"); + return NULL; + } /* Decode the certificate */ crt_dat = CERT_DecodeCertFromPackage(rawcert, len);
--- a/libpurple/prefs.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/prefs.h Tue Oct 30 06:37:35 2007 +0000 @@ -291,6 +291,8 @@ * @return A list of newly allocated strings denoting the names of the children. * Returns @c NULL if there are no children or if pref doesn't exist. * The caller must free all the strings and the list. + * + * @since 2.1.0 */ GList *purple_prefs_get_children_names(const char *name);
--- a/libpurple/protocols/bonjour/Makefile.mingw Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/bonjour/Makefile.mingw Tue Oct 30 06:37:35 2007 +0000 @@ -36,7 +36,6 @@ -I$(PIDGIN_TREE_TOP) LIB_PATHS += -L$(GTK_TOP)/lib \ - -L$(BONJOUR_TOP)/lib \ -L$(LIBXML2_TOP)/lib \ -L$(PURPLE_TOP) @@ -66,6 +65,7 @@ ifeq ($(LINK_DNS_SD_DIRECTLY), 1) CFLAGS += -DLINK_DNS_SD_DIRECTLY + LIB_PATHS += -L$(BONJOUR_TOP)/lib/win32 -L$(BONJOUR_TOP)/lib LIBS += -ldnssd endif
--- a/libpurple/protocols/bonjour/bonjour.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/bonjour/bonjour.c Tue Oct 30 06:37:35 2007 +0000 @@ -188,6 +188,8 @@ if (bonjour_group != NULL) purple_blist_remove_group(bonjour_group); + g_free(bd); + connection->proto_data = NULL; } static const char * @@ -581,7 +583,7 @@ fullname = g_utf16_to_utf8(username, -1, NULL, NULL, NULL); } - g_idle_add(_set_default_name_cb, fullname); + purple_timeout_add(0, _set_default_name_cb, fullname); return NULL; }
--- a/libpurple/protocols/bonjour/buddy.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/bonjour/buddy.c Tue Oct 30 06:37:35 2007 +0000 @@ -62,9 +62,11 @@ } void -set_bonjour_buddy_value(BonjourBuddy* buddy, const char *record_key, const char *value, uint32_t len){ +set_bonjour_buddy_value(BonjourBuddy* buddy, const char *record_key, const char *value, guint32 len){ gchar **fld = NULL; + g_return_if_fail(record_key != NULL); + if (!strcmp(record_key, "1st")) fld = &buddy->first; else if(!strcmp(record_key, "email"))
--- a/libpurple/protocols/bonjour/buddy.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/bonjour/buddy.h Tue Oct 30 06:37:35 2007 +0000 @@ -83,7 +83,7 @@ /** * Sets a value in the BonjourBuddy struct, destroying the old value */ -void set_bonjour_buddy_value(BonjourBuddy *buddy, const char *record_key, const char *value, uint32_t len); +void set_bonjour_buddy_value(BonjourBuddy *buddy, const char *record_key, const char *value, guint32 len); /** * Check if all the compulsory buddy data is present.
--- a/libpurple/protocols/bonjour/jabber.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/bonjour/jabber.c Tue Oct 30 06:37:35 2007 +0000 @@ -521,6 +521,7 @@ struct sockaddr_in their_addr; /* connector's address information */ socklen_t sin_size = sizeof(struct sockaddr); int client_socket; + int flags; BonjourBuddy *bb; char *address_text = NULL; PurpleBuddyList *bl = purple_get_blist(); @@ -533,7 +534,8 @@ if ((client_socket = accept(server_socket, (struct sockaddr *)&their_addr, &sin_size)) == -1) return; - fcntl(client_socket, F_SETFL, O_NONBLOCK); + flags = fcntl(client_socket, F_GETFL); + fcntl(client_socket, F_SETFL, flags | O_NONBLOCK); /* Look for the buddy that has opened the conversation and fill information */ address_text = inet_ntoa(their_addr.sin_addr);
--- a/libpurple/protocols/bonjour/parser.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/bonjour/parser.c Tue Oct 30 06:37:35 2007 +0000 @@ -64,7 +64,7 @@ char *attrib_ns = NULL; if (attributes[i+2]) { - attrib_ns = g_strdup((char*)attributes[i+2]);; + attrib_ns = g_strdup((char*)attributes[i+2]); } memcpy(attrib, attributes[i+3], attrib_len); @@ -101,7 +101,7 @@ if(!xmlStrcmp(element_name, (xmlChar*) "stream")) { /* Asynchronously close the conversation to prevent bonjour_parser_setup() * being called from within this context */ - g_idle_add(_async_bonjour_jabber_stream_ended_cb, pb); + purple_timeout_add(0, _async_bonjour_jabber_stream_ended_cb, pb); } return; }
--- a/libpurple/protocols/irc/irc.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/irc/irc.h Tue Oct 30 06:37:35 2007 +0000 @@ -99,6 +99,8 @@ int irc_send(struct irc_conn *irc, const char *buf); gboolean irc_blist_timeout(struct irc_conn *irc); +char *irc_escape_privmsg(const char *text, gssize length); + char *irc_mirc2html(const char *string); char *irc_mirc2txt(const char *string);
--- a/libpurple/protocols/irc/msgs.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/irc/msgs.c Tue Oct 30 06:37:35 2007 +0000 @@ -1066,7 +1066,7 @@ return; } - msg = g_markup_escape_text(tmp, -1); + msg = irc_escape_privmsg(tmp, -1); g_free(tmp); tmp = irc_mirc2html(msg);
--- a/libpurple/protocols/irc/parse.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/irc/parse.c Tue Oct 30 06:37:35 2007 +0000 @@ -281,6 +281,61 @@ return purple_utf8_salvage(string); } +/* This function is shamelessly stolen from glib--it is an old version of the + * private function append_escaped_text, used by g_markup_escape_text, whose + * behavior changed in glib 2.12. */ +static void irc_append_escaped_text(GString *str, const char *text, gssize length) +{ + const char *p = text; + const char *end = text + length; + const char *next = NULL; + + while(p != end) { + next = g_utf8_next_char(p); + + switch(*p) { + case '&': + g_string_append(str, "&"); + break; + case '<': + g_string_append(str, "<"); + break; + case '>': + g_string_append(str, ">"); + break; + case '\'': + g_string_append(str, "'"); + break; + case '"': + g_string_append(str, """); + break; + default: + g_string_append_len(str, p, next - p); + break; + } + + p = next; + } +} + +/* This function is shamelessly stolen from glib--it is an old version of the + * function g_markup_escape_text, whose behavior changed in glib 2.12. */ +char *irc_escape_privmsg(const char *text, gssize length) +{ + GString *str; + + g_return_val_if_fail(text != NULL, NULL); + + if(length < 0) + length = strlen(text); + + str = g_string_sized_new(length); + + irc_append_escaped_text(str, text, length); + + return g_string_free(str, FALSE); +} + /* XXX tag closings are not necessarily correctly nested here! If we * get a ^O or reach the end of the string and there are open * tags, they are closed in a fixed order ... this means, for
--- a/libpurple/protocols/jabber/chat.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/jabber/chat.c Tue Oct 30 06:37:35 2007 +0000 @@ -964,7 +964,7 @@ static void jabber_chat_disco_traffic_cb(JabberStream *js, xmlnode *packet, gpointer data) { JabberChat *chat; - xmlnode *query; + /*xmlnode *query;*/ int id = GPOINTER_TO_INT(data); if(!(chat = jabber_chat_find_by_id(js, id))) @@ -974,6 +974,8 @@ * support this request */ chat->xhtml = TRUE; + /* disabling this until more MUC servers support + * announcing this if(xmlnode_get_child(packet, "error")) { return; } @@ -981,8 +983,6 @@ if(!(query = xmlnode_get_child(packet, "query"))) return; - /* disabling this until more MUC servers support - * announcing this chat->xhtml = FALSE; for(x = xmlnode_get_child(query, "feature"); x; x = xmlnode_get_next_twin(x)) {
--- a/libpurple/protocols/jabber/google.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/jabber/google.c Tue Oct 30 06:37:35 2007 +0000 @@ -110,7 +110,7 @@ tos[i] = (to_name != NULL ? to_name : ""); froms[i] = (from != NULL ? from : ""); subjects[i] = (subject != NULL ? subject : g_strdup("")); - urls[i] = (url != NULL ? url : ""); + urls[i] = url; tid = xmlnode_get_attrib(message, "tid"); if (tid && @@ -231,7 +231,7 @@ const char *jid = xmlnode_get_attrib(item, "jid"); gboolean on_block_list = FALSE; - char *jid_norm = g_strdup(jabber_normalize(account, jid)); + char *jid_norm; const char *grt = xmlnode_get_attrib_with_namespace(item, "t", "google:roster"); const char *subscription = xmlnode_get_attrib(item, "subscription"); @@ -243,6 +243,8 @@ return FALSE; } + jid_norm = g_strdup(jabber_normalize(account, jid)); + while (list) { if (!strcmp(jid_norm, (char*)list->data)) { on_block_list = TRUE;
--- a/libpurple/protocols/jabber/iq.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/jabber/iq.c Tue Oct 30 06:37:35 2007 +0000 @@ -248,7 +248,6 @@ JabberIq *iq; const char *type, *from, *id; xmlnode *query; - char *os = NULL; type = xmlnode_get_attrib(packet, "type"); @@ -256,6 +255,7 @@ GHashTable *ui_info; const char *ui_name = NULL, *ui_version = NULL; #if 0 + char *os = NULL; if(!purple_prefs_get_bool("/plugins/prpl/jabber/hide_os")) { struct utsname osinfo; @@ -290,10 +290,12 @@ xmlnode_insert_data(xmlnode_new_child(query, "version"), VERSION, -1); } +#if 0 if(os) { xmlnode_insert_data(xmlnode_new_child(query, "os"), os, -1); g_free(os); } +#endif jabber_iq_send(iq); }
--- a/libpurple/protocols/jabber/jabber.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Tue Oct 30 06:37:35 2007 +0000 @@ -1914,7 +1914,7 @@ text = _("Authentication Failure"); } } else if(!strcmp(packet->name, "stream:error") || - (!strcmp(packet->name, "error") && + (!strcmp(packet->name, "error") && xmlns && !strcmp(xmlns, "http://etherx.jabber.org/streams"))) { if(xmlnode_get_child(packet, "bad-format")) { text = _("Bad Format"); @@ -2189,55 +2189,67 @@ return PURPLE_CMD_RET_OK; } +static gboolean _jabber_send_buzz(JabberStream *js, const char *username, char **error) { + + JabberBuddy *jb; + JabberBuddyResource *jbr; + GList *iter; + + if(!username) + return FALSE; + + jb = jabber_buddy_find(js, username, FALSE); + if(!jb) { + *error = g_strdup_printf(_("Unable to buzz, because there is nothing known about user %s."), username); + return FALSE; + } + + jbr = jabber_buddy_find_resource(jb, NULL); + if(!jbr) { + *error = g_strdup_printf(_("Unable to buzz, because user %s might be offline."), username); + return FALSE; + } + + if(!jbr->caps) { + *error = g_strdup_printf(_("Unable to buzz, because there is nothing known about user %s."), username); + return FALSE; + } + + for(iter = jbr->caps->features; iter; iter = g_list_next(iter)) { + if(!strcmp(iter->data, "http://www.xmpp.org/extensions/xep-0224.html#ns")) { + xmlnode *buzz, *msg = xmlnode_new("message"); + gchar *to; + + to = g_strdup_printf("%s/%s", username, jbr->name); + xmlnode_set_attrib(msg, "to", to); + g_free(to); + + /* avoid offline storage */ + xmlnode_set_attrib(msg, "type", "headline"); + + buzz = xmlnode_new_child(msg, "attention"); + xmlnode_set_namespace(buzz, "http://www.xmpp.org/extensions/xep-0224.html#ns"); + + jabber_send(js, msg); + xmlnode_free(msg); + + return TRUE; + } + } + + *error = g_strdup_printf(_("Unable to buzz, because the user %s does not support it."), username); + return FALSE; +} + static PurpleCmdRet jabber_cmd_buzz(PurpleConversation *conv, const char *cmd, char **args, char **error, void *data) { JabberStream *js = conv->account->gc->proto_data; - xmlnode *msg, *buzz; - JabberBuddy *jb; - JabberBuddyResource *jbr; - char *to; - GList *iter; if(!args || !args[0]) return PURPLE_CMD_RET_FAILED; - - jb = jabber_buddy_find(js, args[0], FALSE); - if(!jb) { - *error = g_strdup_printf(_("Unable to buzz, because there is nothing known about user %s."), args[0]); - return PURPLE_CMD_RET_FAILED; - } - - jbr = jabber_buddy_find_resource(jb, NULL); - if(!jbr) { - *error = g_strdup_printf(_("Unable to buzz, because user %s might be offline."), args[0]); - return PURPLE_CMD_RET_FAILED; - } - if(!jbr->caps) { - *error = g_strdup_printf(_("Unable to buzz, because there is nothing known about user %s."), args[0]); - return PURPLE_CMD_RET_FAILED; - } - for(iter = jbr->caps->features; iter; iter = g_list_next(iter)) { - if(!strcmp(iter->data, "http://www.xmpp.org/extensions/xep-0224.html#ns")) { - msg = xmlnode_new("message"); - to = g_strdup_printf("%s/%s", args[0], jbr->name); - xmlnode_set_attrib(msg,"to",to); - g_free(to); - - /* avoid offline storage */ - xmlnode_set_attrib(msg,"type","headline"); - - buzz = xmlnode_new_child(msg,"attention"); - xmlnode_set_namespace(buzz,"http://www.xmpp.org/extensions/xep-0224.html#ns"); - - jabber_send(js,msg); - xmlnode_free(msg); - - return PURPLE_CMD_RET_OK; - } - } - *error = g_strdup_printf(_("Unable to buzz, because the user %s does not support it."), args[0]); - return PURPLE_CMD_RET_FAILED; + + return _jabber_send_buzz(js, args[0], error) ? PURPLE_CMD_RET_OK : PURPLE_CMD_RET_FAILED; } GList *jabber_attention_types(PurpleAccount *account) @@ -2258,23 +2270,16 @@ gboolean jabber_send_attention(PurpleConnection *gc, const char *username, guint code) { - PurpleConversation *conv; - char *error; - char *args[1]; - PurpleCmdRet ret; - - conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, username, gc->account); - - args[0] = (char *)username; + JabberStream *js = gc->proto_data; + gchar *error = NULL; - ret = jabber_cmd_buzz(conv, "buzz", args, &error, NULL); - - if (ret == PURPLE_CMD_RET_FAILED) { + if (!_jabber_send_buzz(js, username, &error)) { purple_debug_error("jabber", "jabber_send_attention: jabber_cmd_buzz failed with error: %s\n", error ? error : "(NULL)"); + g_free(error); return FALSE; - } else { - return TRUE; } + + return TRUE; }
--- a/libpurple/protocols/jabber/parser.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/jabber/parser.c Tue Oct 30 06:37:35 2007 +0000 @@ -80,7 +80,7 @@ char *attrib_ns = NULL; if (attributes[i+2]) { - attrib_ns = g_strdup((char*)attributes[i+2]);; + attrib_ns = g_strdup((char*)attributes[i+2]); } memcpy(attrib, attributes[i+3], attrib_len);
--- a/libpurple/protocols/jabber/presence.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/jabber/presence.c Tue Oct 30 06:37:35 2007 +0000 @@ -378,7 +378,8 @@ break; } } - g_free(user_data); + g_free(userdata->from); + g_free(userdata); } void jabber_presence_parse(JabberStream *js, xmlnode *packet)
--- a/libpurple/protocols/jabber/roster.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/jabber/roster.c Tue Oct 30 06:37:35 2007 +0000 @@ -67,8 +67,10 @@ if(!groups) { if(!buddies) g2 = g_slist_append(g2, g_strdup(_("Buddies"))); - else + else { + g_slist_free(buddies); return; + } } my_bare_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain); @@ -229,6 +231,11 @@ remove_purple_buddies(js, jid); } else { GSList *groups = NULL; + + if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) + if (!jabber_google_roster_incoming(js, item)) + continue; + for(group = xmlnode_get_child(item, "group"); group; group = xmlnode_get_next_twin(group)) { char *group_name; @@ -237,10 +244,9 @@ if (g_slist_find_custom(groups, group_name, (GCompareFunc)purple_utf8_strcasecmp) == NULL) groups = g_slist_append(groups, group_name); + else + g_free(group_name); } - if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) - if (!jabber_google_roster_incoming(js, item)) - continue; add_purple_buddies_to_groups(js, jid, name, groups); } } @@ -263,6 +269,9 @@ JabberIq *iq; xmlnode *query, *item, *group; + if(!(b = purple_find_buddy(js->gc->account, name))) + return; + if(grps) { groups = grps; } else { @@ -277,9 +286,6 @@ } } - if(!(b = purple_find_buddy(js->gc->account, name))) - return; - iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster"); query = xmlnode_get_child(iq->node, "query"); @@ -397,12 +403,12 @@ void jabber_roster_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) { GSList *buddies = purple_find_buddies(gc->account, buddy->name); - GSList *groups = NULL; buddies = g_slist_remove(buddies, buddy); if(buddies != NULL) { PurpleBuddy *tmpbuddy; PurpleGroup *tmpgroup; + GSList *groups = NULL; while(buddies) { tmpbuddy = buddies->data; @@ -412,6 +418,7 @@ } jabber_roster_update(gc->proto_data, buddy->name, groups); + g_slist_free(groups); } else { JabberIq *iq = jabber_iq_new_query(gc->proto_data, JABBER_IQ_SET, "jabber:iq:roster"); @@ -423,9 +430,4 @@ jabber_iq_send(iq); } - - if(buddies) - g_slist_free(buddies); - if(groups) - g_slist_free(groups); }
--- a/libpurple/protocols/jabber/usermood.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/jabber/usermood.c Tue Oct 30 06:37:35 2007 +0000 @@ -26,6 +26,7 @@ #include <string.h> #include "internal.h" #include "request.h" +#include "debug.h" static const char *moodstrings[] = { "afraid", @@ -145,9 +146,26 @@ } static void do_mood_set_from_fields(PurpleConnection *gc, PurpleRequestFields *fields) { - JabberStream *js = gc->proto_data; - - jabber_mood_set(js, moodstrings[purple_request_fields_get_choice(fields, "mood")], purple_request_fields_get_string(fields, "text")); + JabberStream *js; + int max_mood_idx; + int selected_mood = purple_request_fields_get_choice(fields, "mood"); + + if (!PURPLE_CONNECTION_IS_VALID(gc)) { + purple_debug_error("jabber", "Unable to set mood; account offline.\n"); + return; + } + + js = gc->proto_data; + + /* This is ugly, but protects us from unexpected values. */ + for (max_mood_idx = 0; moodstrings[max_mood_idx]; max_mood_idx++); + + if (selected_mood < 0 || selected_mood >= max_mood_idx) { + purple_debug_error("jabber", "Invalid mood index (%d) selected.\n", selected_mood); + return; + } + + jabber_mood_set(js, moodstrings[selected_mood], purple_request_fields_get_string(fields, "text")); } static void do_mood_set_mood(PurplePluginAction *action) {
--- a/libpurple/protocols/msn/contact.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/msn/contact.c Tue Oct 30 06:37:35 2007 +0000 @@ -186,7 +186,7 @@ /*get MSN member role utility*/ static MsnListId -msn_get_memberrole(char *role) +msn_get_memberrole(const char *role) { g_return_val_if_fail(role != NULL, 0); @@ -373,6 +373,7 @@ service; service = xmlnode_get_next_twin(service)) { msn_parse_each_service(contact->session, service); } + g_free(typedata); } } @@ -910,7 +911,7 @@ return; /* guess this never happened! */ } - if (user->uid != NULL) { + if (user != NULL && user->uid != NULL) { contact_xml = g_strdup_printf(MSN_CONTACT_ID_XML, user->uid); } else { contact_xml = g_strdup_printf(MSN_CONTACT_XML, passport);
--- a/libpurple/protocols/msn/directconn.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/msn/directconn.c Tue Oct 30 06:37:35 2007 +0000 @@ -80,6 +80,7 @@ create_listener(int port) { int fd; + int flags; const int on = 1; #if 0 @@ -155,7 +156,8 @@ return -1; } - fcntl(fd, F_SETFL, O_NONBLOCK); + flags = fcntl(fd, F_GETFL); + fcntl(fd, F_SETFL, flags | O_NONBLOCK); return fd; }
--- a/libpurple/protocols/msn/msn.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Tue Oct 30 06:37:35 2007 +0000 @@ -943,7 +943,7 @@ imdata->msg = body_str; imdata->flags = flags; imdata->when = time(NULL); - g_idle_add(msn_send_me_im, imdata); + purple_timeout_add(0, msn_send_me_im, imdata); } msn_message_destroy(msg); @@ -1100,7 +1100,7 @@ userlist = session->userlist; who = msn_normalize(gc->account, buddy->name); - purple_debug_info("MSN","Add user:%s to group:%s\n", who, group->name); + purple_debug_info("MSN","Add user:%s to group:%s\n", who, (group && group->name) ? group->name : "(null)"); if (!session->logged_in) { #if 0 @@ -1982,7 +1982,7 @@ #if PHOTO_SUPPORT /* Find the URL to the photo; must be before the marshalling [Bug 994207] */ photo_url_text = msn_get_photo_url(url_text); - purple_debug_info("MSNP14","photo url:{%s}\n",photo_url_text); + purple_debug_info("MSNP14","photo url:{%s}\n", photo_url_text ? photo_url_text : "(null)"); /* Marshall the existing state */ info2_data = g_malloc0(sizeof(MsnGetInfoStepTwoData));
--- a/libpurple/protocols/msn/notification.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Tue Oct 30 06:37:35 2007 +0000 @@ -230,11 +230,9 @@ { MsnSession *session; PurpleAccount *account; - PurpleConnection *gc; session = cmdproc->session; account = session->account; - gc = purple_account_get_connection(account); if (!g_ascii_strcasecmp(cmd->params[1], "OK")) { @@ -448,7 +446,7 @@ const char *passport; const char *content_type; - purple_debug_info("MSNP14","Process UBM payload:%s\n",payload); + purple_debug_info("MSNP14","Process UBM payload:%.*s\n", len, payload); msg = msn_message_new_from_cmd(cmdproc->session, cmd); msn_message_parse_payload(msg, payload, len,MSG_LINE_DEM,MSG_BODY_DEM); @@ -531,7 +529,7 @@ }else{ g_return_if_fail(cmd->payload_cb != NULL); - purple_debug_info("MSNP14","UBM payload:{%s}\n",cmd->payload); + purple_debug_info("MSNP14","UBM payload:{%.*s}\n", cmd->payload_len, cmd->payload); ubm_cmd_post(cmdproc, cmd, cmd->payload, cmd->payload_len); } } @@ -1614,7 +1612,6 @@ { MsnSession *session; PurpleAccount *account; - PurpleConnection *gc; MsnUser *user; const char *passport; char *psm_str, *currentmedia_str, *str; @@ -1624,7 +1621,6 @@ session = cmdproc->session; account = session->account; - gc = purple_account_get_connection(account); passport = cmd->params[0]; user = msn_userlist_find_user(session->userlist, passport);
--- a/libpurple/protocols/msn/servconn.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/msn/servconn.c Tue Oct 30 06:37:35 2007 +0000 @@ -480,6 +480,7 @@ create_listener(int port) { int fd; + int flags; const int on = 1; #if 0 @@ -555,7 +556,8 @@ return -1; } - fcntl(fd, F_SETFL, O_NONBLOCK); + flags = fcntl(fd, F_GETFL); + fcntl(fd, F_SETFL, flags | O_NONBLOCK); return fd; }
--- a/libpurple/protocols/msn/soap.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/msn/soap.c Tue Oct 30 06:37:35 2007 +0000 @@ -131,6 +131,7 @@ MsnSoapSslErrorCbFunction error_cb) { purple_debug_misc("MSN SOAP","Initializing SOAP connection\n"); + g_free(soapconn->login_host); soapconn->login_host = g_strdup(host); soapconn->ssl_conn = ssl; soapconn->connect_cb = connect_cb; @@ -204,11 +205,9 @@ void msn_soap_destroy(MsnSoapConn *soapconn) { - if(soapconn->login_host) - g_free(soapconn->login_host); + g_free(soapconn->login_host); - if(soapconn->login_path) - g_free(soapconn->login_path); + g_free(soapconn->login_path); /*remove the write handler*/ if (soapconn->output_handler > 0){
--- a/libpurple/protocols/msn/userlist.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/msn/userlist.c Tue Oct 30 06:37:35 2007 +0000 @@ -227,11 +227,8 @@ } else if (list_id == MSN_LIST_RL) { - PurpleConnection *gc; PurpleConversation *convo; - gc = purple_account_get_connection(account); - purple_debug_info("msn", "%s has added you to his or her buddy list.\n", passport);
--- a/libpurple/protocols/myspace/markup.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/myspace/markup.c Tue Oct 30 06:37:35 2007 +0000 @@ -400,6 +400,8 @@ msim_markup_tag_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar **end) { + g_return_if_fail(root != NULL); + if (g_str_equal(root->name, "f")) { msim_markup_f_to_html(session, root, begin, end); } else if (g_str_equal(root->name, "a")) { @@ -415,7 +417,7 @@ } else { purple_debug_info("msim", "msim_markup_tag_to_html: " "unknown tag name=%s, ignoring", - (root && root->name) ? root->name : "(NULL)"); + root->name ? root->name : "(NULL)"); *begin = g_strdup(""); *end = g_strdup(""); }
--- a/libpurple/protocols/myspace/message.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/myspace/message.c Tue Oct 30 06:37:35 2007 +0000 @@ -314,7 +314,7 @@ MsimMessageElement *elem; MsimMessage **new; gpointer new_data; - + GString *gs; MsimMessage *dict; @@ -349,7 +349,7 @@ default: purple_debug_info("msim", "msim_msg_clone_element: unknown type %d\n", elem->type); - g_return_if_fail(NULL); + g_return_if_reached(); } /* Append cloned data. Note that the 'name' field is a static string, so it @@ -905,7 +905,7 @@ default: g_free(data_string); - g_return_if_fail(FALSE); + g_return_if_reached(); break; }
--- a/libpurple/protocols/myspace/myspace.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.c Tue Oct 30 06:37:35 2007 +0000 @@ -2035,18 +2035,14 @@ msim_do_postprocessing(MsimMessage *msg, const gchar *uid_before, const gchar *uid_field_name, guint uid) { + MsimMessageElement *elem; msim_msg_dump("msim_do_postprocessing msg: %s\n", msg); /* First, check - if the field already exists, replace <uid> within it */ - if (msim_msg_get(msg, uid_field_name)) { - MsimMessageElement *elem; + if ((elem = msim_msg_get(msg, uid_field_name)) != NULL) { gchar *fmt_string; gchar *uid_str, *new_str; - /* Warning: this is a delicate, but safe, operation */ - - elem = msim_msg_get(msg, uid_field_name); - /* Get the packed element, flattening it. This allows <uid> to be * replaced within nested data structures, since the replacement is done * on the linear, packed data, not on a complicated data structure.
--- a/libpurple/protocols/oscar/oscar.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue Oct 30 06:37:35 2007 +0000 @@ -1128,8 +1128,10 @@ aim_clientready(od, conn); chatcon = find_oscar_chat_by_conn(gc, conn); - chatcon->id = id; - chatcon->conv = serv_got_joined_chat(gc, id++, chatcon->show); + if (chatcon) { + chatcon->id = id; + chatcon->conv = serv_got_joined_chat(gc, id++, chatcon->show); + } } static void @@ -1721,7 +1723,6 @@ { PurpleConnection *gc; PurpleAccount *account; - PurplePresence *presence; struct buddyinfo *bi; time_t time_idle = 0, signon = 0; int type = 0; @@ -1734,7 +1735,6 @@ gc = od->gc; account = purple_connection_get_account(gc); - presence = purple_account_get_presence(account); va_start(ap, fr); info = va_arg(ap, aim_userinfo_t *); @@ -5006,6 +5006,7 @@ g = purple_group_new(gname_utf8); purple_blist_add_group(g, NULL); } + g_free(gname_utf8); } break; case 0x0002: { /* Permit buddy */
--- a/libpurple/protocols/oscar/peer.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/oscar/peer.c Tue Oct 30 06:37:35 2007 +0000 @@ -607,6 +607,7 @@ PurpleConnection *gc; struct sockaddr addr; socklen_t addrlen = sizeof(addr); + int flags; conn = data; od = conn->od; @@ -633,7 +634,8 @@ return; } - fcntl(conn->fd, F_SETFL, O_NONBLOCK); + flags = fcntl(conn->fd, F_GETFL); + fcntl(conn->fd, F_SETFL, flags | O_NONBLOCK); purple_input_remove(conn->watcher_incoming); peer_connection_finalize_connection(conn);
--- a/libpurple/protocols/qq/buddy_info.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/qq/buddy_info.c Tue Oct 30 06:37:35 2007 +0000 @@ -306,12 +306,10 @@ g_free(mid); } -static gchar *parse_field(GList **list, gboolean choice) +static gchar *parse_field(PurpleRequestField *field, gboolean choice) { gchar *value; - PurpleRequestField *field; - field = (PurpleRequestField *) (*list)->data; if (choice) { value = g_strdup_printf("%d", purple_request_field_choice_get_value(field)); } else { @@ -321,7 +319,6 @@ else value = utf8_to_qq(value, QQ_CHARSET_DEFAULT); } - *list = g_list_remove_link(*list, *list); return value; } @@ -331,7 +328,7 @@ { PurpleConnection *gc; qq_data *qd; - GList *list, *groups; + GList *groups; contact_info *info; gc = mid->gc; @@ -341,33 +338,76 @@ info = mid->info; groups = purple_request_fields_get_groups(fields); - list = purple_request_field_group_get_fields(groups->data); - info->uid = parse_field(&list, FALSE); - info->nick = parse_field(&list, FALSE); - info->name = parse_field(&list, FALSE); - info->age = parse_field(&list, FALSE); - info->gender = parse_field(&list, TRUE); - info->country = parse_field(&list, FALSE); - info->province = parse_field(&list, FALSE); - info->city = parse_field(&list, FALSE); - groups = g_list_remove_link(groups, groups); - list = purple_request_field_group_get_fields(groups->data); - info->horoscope = parse_field(&list, TRUE); - info->occupation = parse_field(&list, FALSE); - info->zodiac = parse_field(&list, TRUE); - info->blood = parse_field(&list, TRUE); - info->college = parse_field(&list, FALSE); - info->email = parse_field(&list, FALSE); - info->address = parse_field(&list, FALSE); - info->zipcode = parse_field(&list, FALSE); - info->hp_num = parse_field(&list, FALSE); - info->tel = parse_field(&list, FALSE); - info->homepage = parse_field(&list, FALSE); - groups = g_list_remove_link(groups, groups); - list = purple_request_field_group_get_fields(groups->data); - info->intro = parse_field(&list, FALSE); - groups = g_list_remove_link(groups, groups); + while (groups != NULL) { + PurpleRequestFieldGroup *group = groups->data; + const char *g_name = purple_request_field_group_get_title(group); + GList *fields = purple_request_field_group_get_fields(group); + + if (g_name == NULL) + continue; + + while (fields != NULL) { + PurpleRequestField *field = fields->data; + const char *f_id = purple_request_field_get_id(field); + + if (!strcmp(QQ_PRIMARY_INFORMATION, g_name)) { + + if (!strcmp(f_id, "uid")) + info->uid = parse_field(field, FALSE); + else if (!strcmp(f_id, "nick")) + info->nick = parse_field(field, FALSE); + else if (!strcmp(f_id, "name")) + info->name = parse_field(field, FALSE); + else if (!strcmp(f_id, "age")) + info->age = parse_field(field, FALSE); + else if (!strcmp(f_id, "gender")) + info->gender = parse_field(field, TRUE); + else if (!strcmp(f_id, "country")) + info->country = parse_field(field, FALSE); + else if (!strcmp(f_id, "province")) + info->province = parse_field(field, FALSE); + else if (!strcmp(f_id, "city")) + info->city = parse_field(field, FALSE); + + } else if (!strcmp(QQ_ADDITIONAL_INFORMATION, g_name)) { + if (!strcmp(f_id, "horoscope")) + info->horoscope = parse_field(field, TRUE); + else if (!strcmp(f_id, "occupation")) + info->occupation = parse_field(field, FALSE); + else if (!strcmp(f_id, "zodiac")) + info->zodiac = parse_field(field, TRUE); + else if (!strcmp(f_id, "blood")) + info->blood = parse_field(field, TRUE); + else if (!strcmp(f_id, "college")) + info->college = parse_field(field, FALSE); + else if (!strcmp(f_id, "email")) + info->email = parse_field(field, FALSE); + else if (!strcmp(f_id, "address")) + info->address = parse_field(field, FALSE); + else if (!strcmp(f_id, "zipcode")) + info->zipcode = parse_field(field, FALSE); + else if (!strcmp(f_id, "hp_num")) + info->hp_num = parse_field(field, FALSE); + else if (!strcmp(f_id, "tel")) + info->tel = parse_field(field, FALSE); + else if (!strcmp(f_id, "homepage")) + info->homepage = parse_field(field, FALSE); + + } else if (!strcmp(QQ_INTRO, g_name)) { + + if (!strcmp(f_id, "intro")) + info->intro = parse_field(field, FALSE); + + } + + fields = fields->next; + } + + groups = groups->next; + } + + /* This casting looks like a horrible idea to me -DAA */ qq_send_packet_modify_info(gc, (gchar **) info); g_strfreev((gchar **) mid->info); @@ -437,6 +477,7 @@ add_string_field_to_group(group, "country", QQ_COUNTRY, info->country); add_string_field_to_group(group, "province", QQ_PROVINCE, info->province); add_string_field_to_group(group, "city", QQ_CITY, info->city); + group = setup_field_group(fields, QQ_ADDITIONAL_INFORMATION); add_choice_field_to_group(group, "horoscope", QQ_HOROSCOPE, info->horoscope, horoscope_names, QQ_HOROSCOPE_SIZE); add_string_field_to_group(group, "occupation", QQ_OCCUPATION, info->occupation);
--- a/libpurple/protocols/qq/qq_proxy.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/qq/qq_proxy.c Tue Oct 30 06:37:35 2007 +0000 @@ -258,6 +258,7 @@ static gint _qq_proxy_none(struct PHB *phb, struct sockaddr *addr, socklen_t addrlen) { gint fd = -1; + int flags; purple_debug(PURPLE_DEBUG_INFO, "QQ", "Using UDP without proxy\n"); fd = socket(PF_INET, SOCK_DGRAM, 0); @@ -269,7 +270,8 @@ } /* we use non-blocking mode to speed up connection */ - fcntl(fd, F_SETFL, O_NONBLOCK); + flags = fcntl(fd, F_GETFL); + fcntl(fd, F_SETFL, flags | O_NONBLOCK); /* From Unix-socket-FAQ: http://www.faqs.org/faqs/unix-faq/socket/ * @@ -301,7 +303,8 @@ } /* if errno */ } else { /* connect returns 0 */ purple_debug(PURPLE_DEBUG_INFO, "QQ", "Connected.\n"); - fcntl(fd, F_SETFL, 0); + flags = fcntl(fd, F_GETFL); + fcntl(fd, F_SETFL, flags & ~O_NONBLOCK); phb->func(phb->data, fd, NULL); }
--- a/libpurple/protocols/qq/udp_proxy_s5.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/qq/udp_proxy_s5.c Tue Oct 30 06:37:35 2007 +0000 @@ -33,6 +33,7 @@ struct sockaddr_in sin; int len, error; socklen_t errlen; + int flags; purple_input_remove(phb->inpa); purple_debug(PURPLE_DEBUG_INFO, "socks5 proxy", "Able to read again.\n"); @@ -89,7 +90,8 @@ close(phb->udpsock); return; } - fcntl(phb->udpsock, F_SETFL, 0); + flags = fcntl(phb->udpsock, F_GETFL); + fcntl(phb->udpsock, F_SETFL, flags & ~O_NONBLOCK); if (phb->account == NULL || purple_account_get_connection(phb->account) != NULL) { phb->func(phb->data, phb->udpsock, NULL); @@ -106,6 +108,7 @@ struct sockaddr_in sin, ctlsin; int port; socklen_t ctllen; + int flags; purple_debug(PURPLE_DEBUG_INFO, "s5_sendconnect", "remote host is %s:%d\n", phb->host, phb->port); @@ -133,7 +136,8 @@ return; } - fcntl(phb->udpsock, F_SETFL, O_NONBLOCK); + flags = fcntl(phb->udpsock, F_GETFL); + fcntl(phb->udpsock, F_SETFL, flags | O_NONBLOCK); port = g_ntohs(ctlsin.sin_port) + 1; while (1) { @@ -287,6 +291,7 @@ struct PHB *phb = data; socklen_t len; int error = ETIMEDOUT; + int flags; purple_debug(PURPLE_DEBUG_INFO, "socks5 proxy", "Connected.\n"); @@ -306,7 +311,8 @@ g_free(phb); return; } - fcntl(source, F_SETFL, 0); + flags = fcntl(source, F_GETFL); + fcntl(source, F_SETFL, flags & ~O_NONBLOCK); i = 0; buf[0] = 0x05; /* SOCKS version 5 */ @@ -343,6 +349,8 @@ gint qq_proxy_socks5(struct PHB *phb, struct sockaddr *addr, socklen_t addrlen) { gint fd; + int flags; + purple_debug(PURPLE_DEBUG_INFO, "QQ", "Connecting to %s:%d via %s:%d using SOCKS5\n", phb->host, phb->port, purple_proxy_info_get_host(phb->gpi), purple_proxy_info_get_port(phb->gpi)); @@ -352,7 +360,8 @@ purple_debug(PURPLE_DEBUG_INFO, "QQ", "proxy_sock5 return fd=%d\n", fd); - fcntl(fd, F_SETFL, O_NONBLOCK); + flags = fcntl(fd, F_GETFL); + fcntl(fd, F_SETFL, flags | O_NONBLOCK); if (connect(fd, addr, addrlen) < 0) { if ((errno == EINPROGRESS) || (errno == EINTR)) { purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Connect in asynchronous mode.\n"); @@ -363,7 +372,8 @@ } } else { purple_debug(PURPLE_DEBUG_MISC, "QQ", "Connect in blocking mode.\n"); - fcntl(fd, F_SETFL, 0); + flags = fcntl(fd, F_GETFL); + fcntl(fd, F_SETFL, flags & ~O_NONBLOCK); _qq_s5_canwrite(phb, fd, PURPLE_INPUT_WRITE); }
--- a/libpurple/protocols/sametime/sametime.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/sametime/sametime.c Tue Oct 30 06:37:35 2007 +0000 @@ -5563,7 +5563,7 @@ msgA = _("No matches"); msgB = _("The identifier '%s' did not match any users in your" " Sametime community."); - msg = g_strdup_printf(msgB, NSTR(res->name)); + msg = g_strdup_printf(msgB, (res && res->name) ? NSTR(res->name) : ""); purple_notify_error(gc, _("No Matches"), msgA, msg);
--- a/libpurple/protocols/simple/simple.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/simple/simple.c Tue Oct 30 06:37:35 2007 +0000 @@ -80,14 +80,15 @@ static gboolean process_register_response(struct simple_account_data *sip, struct sipmsg *msg, struct transaction *tc); static void send_notify(struct simple_account_data *sip, struct simple_watcher *); -static void send_publish(struct simple_account_data *sip); +static void send_open_publish(struct simple_account_data *sip); +static void send_closed_publish(struct simple_account_data *sip); static void do_notifies(struct simple_account_data *sip) { GSList *tmp = sip->watcher; purple_debug_info("simple", "do_notifies()\n"); if((sip->republish != -1) || sip->republish < time(NULL)) { if(purple_account_get_bool(sip->account, "dopublish", TRUE)) { - send_publish(sip); + send_open_publish(sip); } } @@ -1020,7 +1021,7 @@ case 200: if(sip->registerstatus < SIMPLE_REGISTER_COMPLETE) { /* registered */ if(purple_account_get_bool(sip->account, "dopublish", TRUE)) { - send_publish(sip); + send_open_publish(sip); } } sip->registerstatus = SIMPLE_REGISTER_COMPLETE; @@ -1072,7 +1073,7 @@ static void process_incoming_notify(struct simple_account_data *sip, struct sipmsg *msg) { gchar *from; gchar *fromhdr; - gchar *tmp2; + gchar *basicstatus_data; xmlnode *pidf; xmlnode *basicstatus = NULL, *tuple, *status; gboolean isonline = FALSE; @@ -1085,8 +1086,9 @@ if(!pidf) { purple_debug_info("simple", "process_incoming_notify: no parseable pidf\n"); + purple_prpl_got_user_status(sip->account, from, "offline", NULL); + send_sip_response(sip->gc, msg, 200, "OK", NULL); g_free(from); - send_sip_response(sip->gc, msg, 200, "OK", NULL); return; } @@ -1101,27 +1103,28 @@ return; } - tmp2 = xmlnode_get_data(basicstatus); + basicstatus_data = xmlnode_get_data(basicstatus); - if(!tmp2) { + if(!basicstatus_data) { purple_debug_info("simple", "process_incoming_notify: no basic data found\n"); xmlnode_free(pidf); g_free(from); return; } - if(strstr(tmp2, "open")) { + if(strstr(basicstatus_data, "open")) isonline = TRUE; - } + - g_free(tmp2); - - if(isonline) purple_prpl_got_user_status(sip->account, from, "available", NULL); - else purple_prpl_got_user_status(sip->account, from, "offline", NULL); + if(isonline) + purple_prpl_got_user_status(sip->account, from, "available", NULL); + else + purple_prpl_got_user_status(sip->account, from, "offline", NULL); xmlnode_free(pidf); + g_free(from); + g_free(basicstatus_data); - g_free(from); send_sip_response(sip->gc, msg, 200, "OK", NULL); } @@ -1188,28 +1191,27 @@ return doc; } - - -static gchar* gen_pidf(struct simple_account_data *sip) { +static gchar* gen_pidf(struct simple_account_data *sip, gboolean open) { gchar *doc = g_strdup_printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" "<presence xmlns=\"urn:ietf:params:xml:ns:pidf\"\n" "xmlns:im=\"urn:ietf:params:xml:ns:pidf:im\"\n" "entity=\"sip:%s@%s\">\n" "<tuple id=\"bs35r9f\">\n" "<status>\n" - "<basic>open</basic>\n" + "<basic>%s</basic>\n" "</status>\n" "<note>%s</note>\n" "</tuple>\n" "</presence>", sip->username, sip->servername, - sip->status); + (open == TRUE) ? "open" : "closed", + (open == TRUE) ? sip->status : ""); return doc; } static void send_notify(struct simple_account_data *sip, struct simple_watcher *watcher) { - gchar *doc = watcher->needsxpidf ? gen_xpidf(sip) : gen_pidf(sip); + gchar *doc = watcher->needsxpidf ? gen_xpidf(sip) : gen_pidf(sip, TRUE); gchar *hdr = watcher->needsxpidf ? "Event: presence\r\nContent-Type: application/xpidf+xml\r\n" : "Event: presence\r\nContent-Type: application/pidf+xml\r\n"; send_sip_request(sip->gc, "NOTIFY", watcher->name, watcher->name, hdr, doc, &watcher->dialog, NULL); g_free(doc); @@ -1223,9 +1225,9 @@ return TRUE; } -static void send_publish(struct simple_account_data *sip) { +static void send_open_publish(struct simple_account_data *sip) { gchar *uri = g_strdup_printf("sip:%s@%s", sip->username, sip->servername); - gchar *doc = gen_pidf(sip); + gchar *doc = gen_pidf(sip, TRUE); send_sip_request(sip->gc, "PUBLISH", uri, uri, "Expires: 600\r\nEvent: presence\r\n" "Content-Type: application/pidf+xml\r\n", @@ -1235,6 +1237,18 @@ g_free(doc); } +static void send_closed_publish(struct simple_account_data *sip) { + gchar *uri = g_strdup_printf("sip:%s@%s", sip->username, sip->servername); + gchar *doc = gen_pidf(sip, FALSE); + send_sip_request(sip->gc, "PUBLISH", uri, uri, + "Expires: 600\r\nEvent: presence\r\n" + "Content-Type: application/pidf+xml\r\n", + doc, NULL, process_publish_response); + /*sip->republish = time(NULL) + 500;*/ + g_free(uri); + g_free(doc); +} + static void process_incoming_subscribe(struct simple_account_data *sip, struct sipmsg *msg) { const char *from_hdr = sipmsg_find_header(msg, "From"); gchar *from = parse_from(from_hdr); @@ -1738,7 +1752,14 @@ if(sip) { /* unregister */ if (sip->registerstatus == SIMPLE_REGISTER_COMPLETE) + { + if(purple_account_get_bool(sip->account, + "dopublish", + TRUE)) + send_closed_publish(sip); + do_register_exp(sip, 0); + } connection_free_all(sip); if (sip->query_data != NULL)
--- a/libpurple/protocols/yahoo/yahoo_aliases.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_aliases.c Tue Oct 30 06:37:35 2007 +0000 @@ -117,7 +117,7 @@ if (alias != NULL) { serv_got_alias(cb->gc, yid, alias); purple_debug_info("yahoo","Fetched alias '%s' (%s)\n",alias,id); - } else if (g_strcasecmp((alias!=NULL?alias:""),(b->alias!=NULL?b->alias:"")) != 0) { + } else if (b->alias != alias && strcmp(b->alias, "") != 0) { /* Or if we have an alias that Yahoo doesn't, send it up */ yahoo_update_alias(cb->gc, yid, b->alias); purple_debug_info("yahoo","Sent alias '%s'\n", b->alias); @@ -216,7 +216,7 @@ struct callback_data *cb; PurpleBuddy *buddy; PurpleUtilFetchUrlData *url_data; - + g_return_if_fail(alias!= NULL); g_return_if_fail(who!=NULL); g_return_if_fail(gc!=NULL); @@ -224,7 +224,7 @@ purple_debug_info("yahoo", "Sending '%s' as new alias for user '%s'.\n",alias, who); buddy = purple_find_buddy(gc->account, who); - if (buddy->proto_data == NULL) { + if (buddy == NULL || buddy->proto_data == NULL) { purple_debug_info("yahoo", "Missing proto_data (get_yahoo_aliases must have failed), bailing out\n"); return; }
--- a/libpurple/proxy.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/proxy.c Tue Oct 30 06:37:35 2007 +0000 @@ -449,6 +449,8 @@ static void proxy_connect_none(PurpleProxyConnectData *connect_data, struct sockaddr *addr, socklen_t addrlen) { + int flags; + purple_debug_info("proxy", "Connecting to %s:%d with no proxy\n", connect_data->host, connect_data->port); @@ -460,7 +462,8 @@ return; } - fcntl(connect_data->fd, F_SETFL, O_NONBLOCK); + flags = fcntl(connect_data->fd, F_GETFL); + fcntl(connect_data->fd, F_SETFL, flags | O_NONBLOCK); #ifndef _WIN32 fcntl(connect_data->fd, F_SETFD, FD_CLOEXEC); #endif @@ -881,6 +884,8 @@ static void proxy_connect_http(PurpleProxyConnectData *connect_data, struct sockaddr *addr, socklen_t addrlen) { + int flags; + purple_debug_info("proxy", "Connecting to %s:%d via %s:%d using HTTP\n", connect_data->host, connect_data->port, @@ -895,14 +900,16 @@ return; } - fcntl(connect_data->fd, F_SETFL, O_NONBLOCK); + flags = fcntl(connect_data->fd, F_GETFL); + fcntl(connect_data->fd, F_SETFL, flags | O_NONBLOCK); #ifndef _WIN32 fcntl(connect_data->fd, F_SETFD, FD_CLOEXEC); #endif if (connect(connect_data->fd, addr, addrlen) != 0) { - if ((errno == EINPROGRESS) || (errno == EINTR)) { + if ((errno == EINPROGRESS) || (errno == EINTR)) + { purple_debug_info("proxy", "Connection in progress\n"); if (connect_data->port != 80) @@ -1036,6 +1043,8 @@ static void proxy_connect_socks4(PurpleProxyConnectData *connect_data, struct sockaddr *addr, socklen_t addrlen) { + int flags; + purple_debug_info("proxy", "Connecting to %s:%d via %s:%d using SOCKS4\n", connect_data->host, connect_data->port, @@ -1050,7 +1059,8 @@ return; } - fcntl(connect_data->fd, F_SETFL, O_NONBLOCK); + flags = fcntl(connect_data->fd, F_GETFL); + fcntl(connect_data->fd, F_SETFL, flags | O_NONBLOCK); #ifndef _WIN32 fcntl(connect_data->fd, F_SETFD, FD_CLOEXEC); #endif @@ -1604,6 +1614,8 @@ static void proxy_connect_socks5(PurpleProxyConnectData *connect_data, struct sockaddr *addr, socklen_t addrlen) { + int flags; + purple_debug_info("proxy", "Connecting to %s:%d via %s:%d using SOCKS5\n", connect_data->host, connect_data->port, @@ -1618,7 +1630,8 @@ return; } - fcntl(connect_data->fd, F_SETFL, O_NONBLOCK); + flags = fcntl(connect_data->fd, F_GETFL); + fcntl(connect_data->fd, F_SETFL, flags | O_NONBLOCK); #ifndef _WIN32 fcntl(connect_data->fd, F_SETFD, FD_CLOEXEC); #endif
--- a/libpurple/prpl.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/prpl.h Tue Oct 30 06:37:35 2007 +0000 @@ -226,11 +226,17 @@ void (*tooltip_text)(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info, gboolean full); /** - * This must be implemented, and must add at least the offline - * and online states. + * Returns a list of #PurpleStatusType which exist for this account; + * this must be implemented, and must add at least the offline and + * online states. */ GList *(*status_types)(PurpleAccount *account); + /** + * Returns a list of #PurpleMenuAction structs, which represent extra + * actions to be shown in (for example) the right-click menu for @a + * node. + */ GList *(*blist_node_menu)(PurpleBlistNode *node); GList *(*chat_info)(PurpleConnection *); GHashTable *(*chat_info_defaults)(PurpleConnection *, const char *chat_name); @@ -258,6 +264,10 @@ void (*set_info)(PurpleConnection *, const char *info); unsigned int (*send_typing)(PurpleConnection *, const char *name, PurpleTypingState state); + /** + * Should arrange for purple_notify_userinfo() to be called with + * @a who's user info. + */ void (*get_info)(PurpleConnection *, const char *who); void (*set_status)(PurpleAccount *account, PurpleStatus *status); @@ -287,8 +297,14 @@ /** new user registration */ void (*register_user)(PurpleAccount *); - /* get "chat buddy" info and away message */ + /** + * @deprecated Use #PurplePluginProtocolInfo.get_info instead. + */ void (*get_cb_info)(PurpleConnection *, int, const char *who); + /** + * @deprecated Use #PurplePluginProtocolInfo.get_cb_real_name and + * #PurplePluginProtocolInfo.status_text instead. + */ void (*get_cb_away)(PurpleConnection *, int, const char *who); /** save/store buddy's alias on server list/roster */ @@ -348,9 +364,12 @@ /* room list serialize */ char *(*roomlist_room_serialize)(PurpleRoomlistRoom *room); - /* Remove the user from the server. (This is only at the bottom to keep binary compatibility.) - * The account can either be connected or disconnected. After the removal is finished, - * the connection will stay open and has to be closed! + /** Remove the user from the server. The account can either be + * connected or disconnected. After the removal is finished, the + * connection will stay open and has to be closed! + */ + /* This is here rather than next to register_user for API compatibility + * reasons. */ void (*unregister_user)(PurpleAccount *, PurpleAccountUnregistrationCb cb, void *user_data);
--- a/libpurple/savedstatuses.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/savedstatuses.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file savedstatuses.h Saved Status API * @ingroup core + * @see @ref savedstatus-signals */ /* purple @@ -22,8 +23,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref savedstatus-signals */ #ifndef _PURPLE_SAVEDSTATUSES_H_ #define _PURPLE_SAVEDSTATUSES_H_
--- a/libpurple/sound.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/sound.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file sound.h Sound API * @ingroup core + * @see @ref sound-signals */ /* purple @@ -22,8 +23,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - * @see @ref sound-signals */ #ifndef _PURPLE_SOUND_H_ #define _PURPLE_SOUND_H_
--- a/libpurple/sslconn.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/sslconn.h Tue Oct 30 06:37:35 2007 +0000 @@ -204,17 +204,19 @@ void *data); /** - * Makes a SSL connection using an already open file descriptor. - * - * @param account The account making the connection. - * @param fd The file descriptor. - * @param func The SSL input handler function. - * @param error_func The SSL error handler function. - * @param host The hostname of the other peer (to verify the CN) - * @param data User-defined data. - * - * @return The SSL connection handle. - */ + * Makes a SSL connection using an already open file descriptor. + * + * @param account The account making the connection. + * @param fd The file descriptor. + * @param func The SSL input handler function. + * @param error_func The SSL error handler function. + * @param host The hostname of the other peer (to verify the CN) + * @param data User-defined data. + * + * @return The SSL connection handle. + * + * @since 2.2.0 + */ PurpleSslConnection *purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd, PurpleSslInputFunction func, PurpleSslErrorFunction error_func, @@ -268,6 +270,8 @@ * * @return The peer certificate chain, in the order of certificate, issuer, * issuer's issuer, etc. @a NULL if no certificates have been provided, + * + * @since 2.2.0 */ GList * purple_ssl_get_peer_certificates(PurpleSslConnection *gsc);
--- a/libpurple/tests/test_cipher.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/tests/test_cipher.c Tue Oct 30 06:37:35 2007 +0000 @@ -8,7 +8,6 @@ #include "tests.h" #include "../cipher.h" -#include "../signal.h" /****************************************************************************** * MD4 Tests
--- a/libpurple/util.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/util.c Tue Oct 30 06:37:35 2007 +0000 @@ -2548,15 +2548,14 @@ filename_full = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", user_dir, filename); - ret = purple_util_write_data_to_file_absolute(filename_full, - data,size); + ret = purple_util_write_data_to_file_absolute(filename_full, data, size); g_free(filename_full); return ret; } gboolean -purple_util_write_data_to_file_absolute(const char *filename_full, const char *data, size_t size) +purple_util_write_data_to_file_absolute(const char *filename_full, const char *data, gssize size) { gchar *filename_temp; FILE *file; @@ -2566,6 +2565,8 @@ purple_debug_info("util", "Writing file %s\n", filename_full); + g_return_val_if_fail((size >= -1), FALSE); + filename_temp = g_strdup_printf("%s.save", filename_full); /* Remove an old temporary file, if one exists */ @@ -2591,7 +2592,7 @@ } /* Write to file */ - real_size = (size == -1) ? strlen(data) : size; + real_size = (size == -1) ? strlen(data) : (size_t) size; byteswritten = fwrite(data, 1, real_size, file); /* Close file */
--- a/libpurple/util.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/util.h Tue Oct 30 06:37:35 2007 +0000 @@ -607,7 +607,7 @@ * */ gboolean -purple_util_write_data_to_file_absolute(const char *filename_full, const char *data, size_t size); +purple_util_write_data_to_file_absolute(const char *filename_full, const char *data, gssize size); /** * Read the contents of a given file and parse the results into an
--- a/libpurple/win32/global.mak Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/win32/global.mak Tue Oct 30 06:37:35 2007 +0000 @@ -11,7 +11,7 @@ # Locations of our various dependencies WIN32_DEV_TOP ?= $(PIDGIN_TREE_TOP)/../win32-dev ASPELL_TOP ?= $(WIN32_DEV_TOP)/aspell-dev-0-50-3-3 -GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.11 +GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.11-daa1 GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0 GTK_BIN ?= $(GTK_TOP)/bin BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK @@ -22,6 +22,7 @@ PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl58 SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.2 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5 +GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13 # Where we installing this stuff to? PIDGIN_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
--- a/libpurple/win32/libc_interface.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/win32/libc_interface.c Tue Oct 30 06:37:35 2007 +0000 @@ -138,12 +138,22 @@ /* fcntl.h */ /* This is not a full implementation of fcntl. Update as needed.. */ -int wpurple_fcntl(int socket, int command, int val) { +int wpurple_fcntl(int socket, int command, ...) { + switch( command ) { + case F_GETFL: + return 0; + case F_SETFL: { + va_list args; + int val; int ret=0; + va_start(args, command); + val = va_arg(args, int); + va_end(args); + switch( val ) { case O_NONBLOCK: { @@ -152,7 +162,7 @@ break; } case 0: - { + { u_long imode=0; ret = ioctlsocket(socket, FIONBIO, &imode); break;
--- a/libpurple/win32/libc_interface.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/win32/libc_interface.h Tue Oct 30 06:37:35 2007 +0000 @@ -75,8 +75,8 @@ wpurple_ioctl( fd, command, val ) /* fcntl.h */ -#define fcntl( fd, command, val ) \ -wpurple_fcntl( fd, command, val ) +#define fcntl( fd, command, ... ) \ +wpurple_fcntl( fd, command, ##__VA_ARGS__ ) /* arpa/inet.h */ #define inet_aton( name, addr ) \
--- a/libpurple/win32/libc_internal.h Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/win32/libc_internal.h Tue Oct 30 06:37:35 2007 +0000 @@ -49,9 +49,10 @@ char* wpurple_strerror( int errornum ); /* fcntl.h */ -int wpurple_fcntl(int socket, int command, int val); -#define F_SETFL 1 -#define O_NONBLOCK 1 +int wpurple_fcntl(int socket, int command, ...); +#define F_GETFL 3 +#define F_SETFL 4 +#define O_NONBLOCK 04000 /* sys/ioctl.h */ #define SIOCGIFCONF 0x8912 /* get iface list */
--- a/libpurple/xmlnode.c Tue Oct 30 06:29:13 2007 +0000 +++ b/libpurple/xmlnode.c Tue Oct 30 06:37:35 2007 +0000 @@ -131,7 +131,7 @@ if(attr_node->type == XMLNODE_TYPE_ATTRIB && !strcmp(attr_node->name, attr)) { - if(node->child == attr_node) { + if(sibling == NULL) { node->child = attr_node->next; } else { sibling->next = attr_node->next; @@ -146,6 +146,19 @@ } } +/* Compare two nullable xmlns strings. + * They are considered equal if they're both NULL or the strings are equal + */ +static gboolean _xmlnode_compare_xmlns(const char *xmlns1, const char *xmlns2) { + gboolean equal = FALSE; + + if (xmlns1 == NULL && xmlns2 == NULL) + equal = TRUE; + else if (xmlns1 != NULL && xmlns2 != NULL && !strcmp(xmlns1, xmlns2)) + equal = TRUE; + + return equal; +} void xmlnode_remove_attrib_with_namespace(xmlnode *node, const char *attr, const char *xmlns) @@ -159,9 +172,9 @@ { if(attr_node->type == XMLNODE_TYPE_ATTRIB && !strcmp(attr_node->name, attr) && - !strcmp(attr_node->xmlns, xmlns)) + _xmlnode_compare_xmlns(xmlns, attr_node->xmlns)) { - if(node->child == attr_node) { + if(sibling == NULL) { node->child = attr_node->next; } else { sibling->next = attr_node->next; @@ -238,7 +251,8 @@ for(x = node->child; x; x = x->next) { if(x->type == XMLNODE_TYPE_ATTRIB && - !strcmp(attr, x->name) && !strcmp(x->xmlns, xmlns)) { + !strcmp(attr, x->name) && + _xmlnode_compare_xmlns(xmlns, x->xmlns)) { return x->data; } } @@ -326,6 +340,7 @@ child_name = names[1]; for(x = parent->child; x; x = x->next) { + /* XXX: Is it correct to ignore the namespace for the match if none was specified? */ const char *xmlns = NULL; if(ns) xmlns = xmlnode_get_namespace(x); @@ -673,6 +688,7 @@ g_return_val_if_fail(node->type == XMLNODE_TYPE_TAG, NULL); for(sibling = node->next; sibling; sibling = sibling->next) { + /* XXX: Is it correct to ignore the namespace for the match if none was specified? */ const char *xmlns = NULL; if(ns) xmlns = xmlnode_get_namespace(sibling);
--- a/pidgin/gtkaccount.c Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtkaccount.c Tue Oct 30 06:37:35 2007 +0000 @@ -1328,8 +1328,9 @@ break; case PURPLE_PREF_STRING_LIST: - gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter); - gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(widget)), &iter, 1, &value2, -1); + value2 = NULL; + if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter)) + gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(widget)), &iter, 1, &value2, -1); purple_account_set_string(account, setting, value2); break;
--- a/pidgin/gtkaccount.h Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtkaccount.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file gtkaccount.h GTK+ Account Editor UI * @ingroup pidgin + * @see @ref gtkaccount-signals */ /* pidgin
--- a/pidgin/gtkblist.c Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtkblist.c Tue Oct 30 06:37:35 2007 +0000 @@ -3070,7 +3070,7 @@ { N_("/Buddies/Get User _Info..."), "<CTL>I", pidgin_dialogs_info, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO }, { N_("/Buddies/View User _Log..."), "<CTL>L", pidgin_dialogs_log, 0, "<Item>", NULL }, { "/Buddies/sep1", NULL, NULL, 0, "<Separator>", NULL }, - { N_("/Buddies/Show"), NULL, NULL, 0, "<Branch>", NULL}, + { N_("/Buddies/Sh_ow"), NULL, NULL, 0, "<Branch>", NULL}, { N_("/Buddies/Show/_Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL }, { N_("/Buddies/Show/_Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL }, { N_("/Buddies/Show/Buddy _Details"), NULL, pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL }, @@ -3663,25 +3663,31 @@ else idletime = g_strdup(_("Idle")); - if (!selected) + if (!selected) { + g_free(text); text = g_strdup_printf("<span color='%s'>%s</span>\n" - "<span color='%s' size='smaller'>%s%s%s</span>", - dim_grey(), esc, dim_grey(), - idletime != NULL ? idletime : "", - (idletime != NULL && statustext != NULL) ? " - " : "", - statustext != NULL ? statustext : ""); + "<span color='%s' size='smaller'>%s%s%s</span>", + dim_grey(), esc, dim_grey(), + idletime != NULL ? idletime : "", + (idletime != NULL && statustext != NULL) ? " - " : "", + statustext != NULL ? statustext : ""); + } } - else if (!selected && !statustext) /* We handle selected text later */ + else if (!selected && !statustext) {/* We handle selected text later */ + g_free(text); text = g_strdup_printf("<span color='%s'>%s</span>", dim_grey(), esc); - else if (!selected && !text) + } else if (!selected && !text) { + g_free(text); text = g_strdup_printf("<span color='%s'>%s</span>\n" "<span color='%s' size='smaller'>%s</span>", dim_grey(), esc, dim_grey(), statustext != NULL ? statustext : ""); + } } else if (!PURPLE_BUDDY_IS_ONLINE(b)) { - if (!selected && !statustext) /* We handle selected text later */ + if (!selected && !statustext) {/* We handle selected text later */ + g_free(text); text = g_strdup_printf("<span color='%s'>%s</span>", dim_grey(), esc); - else if (!selected && !text) + } else if (!selected && !text) text = g_strdup_printf("<span color='%s'>%s</span>\n" "<span color='%s' size='smaller'>%s</span>", dim_grey(), esc, dim_grey(), @@ -3698,13 +3704,15 @@ } /* It is selected. */ - if ((selected && !text) || (selected && idletime)) + if ((selected && !text) || (selected && idletime)) { + g_free(text); text = g_strdup_printf("%s\n" "<span size='smaller'>%s%s%s</span>", esc, idletime != NULL ? idletime : "", (idletime != NULL && statustext != NULL) ? " - " : "", statustext != NULL ? statustext : ""); + } g_free(idletime); g_free(statustext); @@ -4339,7 +4347,6 @@ gpointer user_data) { PurpleAccount *account; - PurpleStatusType *status_type; gchar *escaped, *text; GtkWidget *button, *label, *image, *hbox; GdkPixbuf *pixbuf; @@ -4354,8 +4361,8 @@ hbox = gtk_hbox_new(FALSE, 6); /* Create the icon */ - if ((status_type = purple_account_get_status_type_with_primitive(account, - PURPLE_STATUS_OFFLINE))) { + if (purple_account_get_status_type_with_primitive(account, + PURPLE_STATUS_OFFLINE) != NULL) { pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL); if (pixbuf != NULL) { image = gtk_image_new_from_pixbuf(pixbuf); @@ -5293,7 +5300,7 @@ static void buddy_node(PurpleBuddy *buddy, GtkTreeIter *iter, PurpleBlistNode *node) { PurplePresence *presence; - GdkPixbuf *status, *avatar, *emblem; + GdkPixbuf *status, *avatar, *emblem, *prpl_icon; char *mark; char *idle = NULL; gboolean expanded = ((struct _pidgin_blist_node *)(node->parent->ui_data))->contact_expanded; @@ -5303,7 +5310,7 @@ if (editing_blist) return; - + status = pidgin_blist_get_status_icon((PurpleBlistNode*)buddy, PIDGIN_STATUS_ICON_SMALL); @@ -5350,6 +5357,8 @@ } } + prpl_icon = pidgin_create_prpl_icon(buddy->account, PIDGIN_PRPL_ICON_SMALL); + gtk_tree_store_set(gtkblist->treemodel, iter, STATUS_ICON_COLUMN, status, STATUS_ICON_VISIBLE_COLUMN, TRUE, @@ -5359,8 +5368,8 @@ BUDDY_ICON_COLUMN, avatar, BUDDY_ICON_VISIBLE_COLUMN, biglist, EMBLEM_COLUMN, emblem, - EMBLEM_VISIBLE_COLUMN, emblem, - PROTOCOL_ICON_COLUMN, pidgin_create_prpl_icon(buddy->account, PIDGIN_PRPL_ICON_SMALL), + EMBLEM_VISIBLE_COLUMN, (emblem != NULL), + PROTOCOL_ICON_COLUMN, prpl_icon, PROTOCOL_ICON_VISIBLE_COLUMN, purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"), BGCOLOR_COLUMN, NULL, CONTACT_EXPANDER_COLUMN, NULL, @@ -5370,10 +5379,14 @@ g_free(mark); g_free(idle); + if(emblem) + g_object_unref(emblem); if(status) g_object_unref(status); if(avatar) g_object_unref(avatar); + if(prpl_icon) + g_object_unref(prpl_icon); } /* This is a variation on the original gtk_blist_update_contact. Here we @@ -5494,9 +5507,7 @@ if(purple_account_is_connected(chat->account)) { GtkTreeIter iter; - GdkPixbuf *status; - GdkPixbuf *avatar; - GdkPixbuf *emblem; + GdkPixbuf *status, *avatar, *emblem, *prpl_icon; char *mark; gboolean showicons = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"); PidginBlistNode *ui; @@ -5527,6 +5538,8 @@ mark = bold; } + prpl_icon = pidgin_create_prpl_icon(chat->account, PIDGIN_PRPL_ICON_SMALL); + gtk_tree_store_set(gtkblist->treemodel, &iter, STATUS_ICON_COLUMN, status, STATUS_ICON_VISIBLE_COLUMN, TRUE, @@ -5534,17 +5547,21 @@ BUDDY_ICON_VISIBLE_COLUMN, purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"), EMBLEM_COLUMN, emblem, EMBLEM_VISIBLE_COLUMN, emblem != NULL, - PROTOCOL_ICON_COLUMN, pidgin_create_prpl_icon(chat->account, PIDGIN_PRPL_ICON_SMALL), + PROTOCOL_ICON_COLUMN, prpl_icon, PROTOCOL_ICON_VISIBLE_COLUMN, purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"), NAME_COLUMN, mark, GROUP_EXPANDER_VISIBLE_COLUMN, FALSE, -1); g_free(mark); + if(emblem) + g_object_unref(emblem); if(status) g_object_unref(status); if(avatar) g_object_unref(avatar); + if(prpl_icon) + g_object_unref(prpl_icon); } else { pidgin_blist_hide_node(list, node, TRUE); }
--- a/pidgin/gtkblist.h Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtkblist.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file gtkblist.h GTK+ Buddy List API * @ingroup pidgin + * @see @ref gtkblist-signals */ /* pidgin @@ -370,6 +371,8 @@ * @param selected Whether this buddy is selected. If TRUE, the markup will not change the color. * @param aliased TRUE to return the appropriate alias of this buddy, FALSE to return its screenname and status information * @return The markup for this buddy + * + * @since 2.1.0 */ gchar *pidgin_blist_get_name_markup(PurpleBuddy *buddy, gboolean selected, gboolean aliased); @@ -381,11 +384,15 @@ * * @param node The buddy list node to show a tooltip for * @param widget The widget to draw the tooltip on + * + * @since 2.1.0 */ void pidgin_blist_draw_tooltip(PurpleBlistNode *node, GtkWidget *widget); /** * Destroys the current (if any) Buddy List tooltip + * + * @since 2.1.0 */ void pidgin_blist_tooltip_destroy(void);
--- a/pidgin/gtkconv.c Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtkconv.c Tue Oct 30 06:37:35 2007 +0000 @@ -2498,11 +2498,16 @@ gtk_list_store_set(GTK_LIST_STORE(gtkconv->infopane_model), &(gtkconv->infopane_iter), CONV_EMBLEM_COLUMN, emblem, -1); + if (emblem) + g_object_unref(emblem); if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons")) { + emblem = pidgin_create_prpl_icon(gtkconv->active_conv->account, PIDGIN_PRPL_ICON_SMALL); gtk_list_store_set(GTK_LIST_STORE(gtkconv->infopane_model), &(gtkconv->infopane_iter), - CONV_PROTOCOL_ICON_COLUMN, pidgin_create_prpl_icon(gtkconv->active_conv->account, PIDGIN_PRPL_ICON_SMALL), -1); + CONV_PROTOCOL_ICON_COLUMN, emblem, -1); + if (emblem) + g_object_unref(emblem); } /* XXX seanegan Why do I have to do this? */ @@ -4358,45 +4363,54 @@ gtk_menu_shell_insert(GTK_MENU_SHELL(menu), menuitem, 1); } - static void resize_imhtml_cb(PidginConversation *gtkconv) { GtkTextBuffer *buffer; GtkTextIter iter; - int wrapped_lines; - int lines; - GdkRectangle oneline; + int wrapped_lines; + int lines; + GdkRectangle oneline; GtkRequisition sr; - int height; - int pad_top, pad_inside, pad_bottom; + int height, diff; + int pad_top, pad_inside, pad_bottom; buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry)); - wrapped_lines = 1; - gtk_text_buffer_get_start_iter(buffer, &iter); - gtk_text_view_get_iter_location(GTK_TEXT_VIEW(gtkconv->entry), &iter, &oneline); - while (gtk_text_view_forward_display_line(GTK_TEXT_VIEW(gtkconv->entry), &iter)) - wrapped_lines++; - - lines = gtk_text_buffer_get_line_count(buffer); - - /* Show a maximum of 4 lines */ - lines = MIN(lines, 4); - wrapped_lines = MIN(wrapped_lines, 4); - - pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry)); - pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry)); - pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry)); - - height = (oneline.height + pad_top + pad_bottom) * lines; - height += (oneline.height + pad_inside) * (wrapped_lines - lines); + wrapped_lines = 1; + gtk_text_buffer_get_start_iter(buffer, &iter); + gtk_text_view_get_iter_location(GTK_TEXT_VIEW(gtkconv->entry), &iter, &oneline); + while (gtk_text_view_forward_display_line(GTK_TEXT_VIEW(gtkconv->entry), &iter)) + wrapped_lines++; + + lines = gtk_text_buffer_get_line_count(buffer); + + /* Show a maximum of 4 lines */ + lines = MIN(lines, 4); + wrapped_lines = MIN(wrapped_lines, 4); + + pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry)); + pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry)); + pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry)); + + height = (oneline.height + pad_top + pad_bottom) * lines; + height += (oneline.height + pad_inside) * (wrapped_lines - lines); gtkconv->auto_resize = TRUE; - g_idle_add(reset_auto_resize_cb, gtkconv); - gtk_widget_size_request(gtkconv->lower_hbox, &sr); - if (sr.height < height + PIDGIN_HIG_BOX_SPACE) { + g_idle_add(reset_auto_resize_cb, gtkconv); + + diff = height - gtkconv->entry->allocation.height; + + if (diff > 0) { + gtk_widget_size_request(gtkconv->lower_hbox, &sr); gtkconv->entry_growing = TRUE; - gtk_widget_set_size_request(gtkconv->lower_hbox, -1, height + PIDGIN_HIG_BOX_SPACE); + + /* uncomment this to auto resize even after the user manually + resizes + gtk_paned_set_position(GTK_PANED(gtkconv->lower_hbox->parent->parent), + -1); + */ + gtk_widget_set_size_request(gtkconv->lower_hbox, -1, + diff + gtkconv->lower_hbox->allocation.height); } } @@ -4728,7 +4742,6 @@ g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); #endif - rend = gtk_cell_renderer_pixbuf_new(); gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(gtkconv->infopane), rend, FALSE); gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(gtkconv->infopane), rend, "pixbuf", CONV_PROTOCOL_ICON_COLUMN, NULL); @@ -5128,6 +5141,9 @@ pidgin_conv_new(PurpleConversation *conv) { private_gtkconv_new(conv, FALSE); + if (PIDGIN_IS_PIDGIN_CONVERSATION(conv)) + purple_signal_emit(pidgin_conversations_get_handle(), + "conversation-displayed", PIDGIN_CONVERSATION(conv)); } static void @@ -6503,6 +6519,7 @@ AtkObject *accessibility_obj; /* I think this is a little longer than it needs to be but I'm lazy. */ char *style; + gboolean bold = FALSE; if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) im = PURPLE_CONV_IM(conv); @@ -6536,7 +6553,7 @@ gtk_list_store_set(gtkconv->infopane_model, &(gtkconv->infopane_iter), CONV_TEXT_COLUMN, markup, -1); /* XXX seanegan Why do I have to do this? */ - gtk_widget_queue_draw(gtkconv->infopane); + gtk_widget_queue_draw(gtkconv->infopane); if (title != markup) g_free(markup); @@ -6555,31 +6572,41 @@ style = "color=\"#c4a000\""; } else if (gtkconv->unseen_state == PIDGIN_UNSEEN_NICK) { atk_object_set_description(accessibility_obj, _("Nick Said")); - style = "color=\"#204a87\" weight=\"bold\""; + style = "color=\"#cc0000\""; } else if (gtkconv->unseen_state == PIDGIN_UNSEEN_TEXT) { atk_object_set_description(accessibility_obj, _("Unread Messages")); - style = "color=\"#cc0000\" weight=\"bold\""; + if (gtkconv->active_conv->type == PURPLE_CONV_TYPE_CHAT) + style = "color=\"#204a87\" weight=\"bold\""; + else + style = "color=\"#cc0000\" weight=\"bold\""; } else if (gtkconv->unseen_state == PIDGIN_UNSEEN_EVENT) { atk_object_set_description(accessibility_obj, _("New Event")); - style = "color=\"#888a85\" weight=\"bold\""; + style = "color=\"#888a85\""; } else { - style = ""; + style = NULL; } + + if (gtkconv->unseen_state == PIDGIN_UNSEEN_TEXT || + gtkconv->unseen_state == PIDGIN_UNSEEN_NICK || + gtkconv->unseen_state == PIDGIN_UNSEEN_EVENT) + bold = TRUE; - if (*style != '\0') + if (style || bold) { char *html_title,*label; html_title = g_markup_escape_text(title, -1); - label = g_strdup_printf("<span %s>%s</span>", - style, html_title); + label = g_strdup_printf("<span %s %s>%s</span>", + style ? style : "", + bold ? "weight=\"bold\"" : "", + html_title); g_free(html_title); gtk_label_set_markup(GTK_LABEL(gtkconv->tab_label), label); g_free(label); } else gtk_label_set_text(GTK_LABEL(gtkconv->tab_label), title); - + if (pidgin_conv_window_is_active_conversation(conv)) update_typing_icon(gtkconv);
--- a/pidgin/gtkconv.h Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtkconv.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file gtkconv.h GTK+ Conversation API * @ingroup pidgin + * @see @ref gtkconv-signals */ /* pidgin @@ -252,6 +253,8 @@ * @param conv The conversation. * * @return Wheter Pidgin UI was successfully attached. + * + * @since 2.2.0 */ gboolean pidgin_conv_attach_to_conversation(PurpleConversation *conv);
--- a/pidgin/gtkdocklet.c Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtkdocklet.c Tue Oct 30 06:37:35 2007 +0000 @@ -407,7 +407,7 @@ GdkPixbuf *pixbuf; GtkWidget *image; - menuitem = gtk_image_menu_item_new_with_mnemonic(str); + menuitem = gtk_image_menu_item_new_with_label(str); if (menu) gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); @@ -473,6 +473,87 @@ return menuitem; } + + +static void +plugin_act(GtkObject *obj, PurplePluginAction *pam) +{ + if (pam && pam->callback) + pam->callback(pam); +} + +static void +build_plugin_actions(GtkWidget *menu, PurplePlugin *plugin, + gpointer context) +{ + GtkWidget *menuitem; + PurplePluginAction *action = NULL; + GList *actions, *l; + + actions = PURPLE_PLUGIN_ACTIONS(plugin, context); + + for (l = actions; l != NULL; l = l->next) + { + if (l->data) + { + action = (PurplePluginAction *) l->data; + action->plugin = plugin; + action->context = context; + + menuitem = gtk_menu_item_new_with_label(action->label); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + + g_signal_connect(G_OBJECT(menuitem), "activate", + G_CALLBACK(plugin_act), action); + g_object_set_data_full(G_OBJECT(menuitem), "plugin_action", + action, + (GDestroyNotify)purple_plugin_action_free); + gtk_widget_show(menuitem); + } + else + pidgin_separator(menu); + } + + g_list_free(actions); +} + + +static void +docklet_plugin_actions(GtkWidget *menu) +{ + GtkWidget *menuitem, *submenu; + PurplePlugin *plugin = NULL; + GList *l; + int c = 0; + + g_return_if_fail(menu != NULL); + + /* Add a submenu for each plugin with custom actions */ + for (l = purple_plugins_get_loaded(); l; l = l->next) { + plugin = (PurplePlugin *) l->data; + + if (PURPLE_IS_PROTOCOL_PLUGIN(plugin)) + continue; + + if (!PURPLE_PLUGIN_HAS_ACTIONS(plugin)) + continue; + + menuitem = gtk_image_menu_item_new_with_label(_(plugin->info->name)); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + gtk_widget_show(menuitem); + + submenu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu); + gtk_widget_show(submenu); + + build_plugin_actions(submenu, plugin, NULL); + + c++; + } + if(c>0) + pidgin_separator(menu); +} + static void docklet_menu() { static GtkWidget *menu = NULL; @@ -539,6 +620,9 @@ pidgin_separator(menu); + /* add plugin actions */ + docklet_plugin_actions(menu); + pidgin_new_item_from_stock(menu, _("Quit"), GTK_STOCK_QUIT, G_CALLBACK(purple_core_quit), NULL, 0, 0, NULL); #ifdef _WIN32
--- a/pidgin/gtkimhtml.h Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtkimhtml.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file gtkimhtml.h GTK+ IM/HTML rendering component * @ingroup pidgin + * @see @ref gtkimhtml-signals */ /* Pidgin is the legal property of its developers, whose names are too numerous @@ -440,6 +441,8 @@ * @param id The id to associate with the image. * * @return A new IM/HTML Scalable object with an image. + * + * @since 2.1.0 */ /* * TODO: All this animation code could be combined much better with @@ -836,6 +839,8 @@ * * @param imhtml The GTK+ IM/HTML. * @param flags The connection flag which describes the allowed types of formatting. + * + * @since 2.1.0 */ void gtk_imhtml_setup_entry(GtkIMHtml *imhtml, PurpleConnectionFlags flags);
--- a/pidgin/gtklog.c Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtklog.c Tue Oct 30 06:37:35 2007 +0000 @@ -680,6 +680,7 @@ PidginLogViewer *lv = NULL; const char *name = screenname; char *title; + GdkPixbuf *prpl_icon; g_return_if_fail(account != NULL); g_return_if_fail(screenname != NULL); @@ -717,9 +718,14 @@ title = g_strdup_printf(_("Conversations with %s"), name); } + prpl_icon = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); + display_log_viewer(ht, purple_log_get_logs(type, screenname, account), - title, gtk_image_new_from_pixbuf(pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM)), + title, gtk_image_new_from_pixbuf(prpl_icon), purple_log_get_total_size(type, screenname, account)); + + if (prpl_icon) + g_object_unref(prpl_icon); g_free(title); }
--- a/pidgin/gtklog.h Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtklog.h Tue Oct 30 06:37:35 2007 +0000 @@ -1,6 +1,7 @@ /** * @file gtklog.h GTK+ Log viewer * @ingroup pidgin + * @see @ref gtklog-signals */ /* pidgin
--- a/pidgin/gtknotify.c Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtknotify.c Tue Oct 30 06:37:35 2007 +0000 @@ -740,7 +740,7 @@ GtkListStore *model; GtkCellRenderer *renderer; guint col_num; - GList *column; + GList *columniter; guint i; GtkWidget *vbox; @@ -824,11 +824,12 @@ -1, "", renderer, "pixbuf", 0, NULL); i = 1; - for (column = results->columns; column != NULL; column = column->next) { + for (columniter = results->columns; columniter != NULL; columniter = columniter->next) { + PurpleNotifySearchColumn *column = columniter->data; renderer = gtk_cell_renderer_text_new(); gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), -1, - column->data, renderer, "text", i, NULL); + column->title, renderer, "text", i, NULL); i++; }
--- a/pidgin/gtksound.c Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtksound.c Tue Oct 30 06:37:35 2007 +0000 @@ -118,12 +118,9 @@ if (conv != NULL && PIDGIN_IS_PIDGIN_CONVERSATION(conv)) { PidginConversation *gtkconv; - PidginWindow *win; gboolean has_focus; gtkconv = PIDGIN_CONVERSATION(conv); - win = gtkconv->win; - has_focus = purple_conversation_has_focus(conv); if (!gtkconv->make_sound ||
--- a/pidgin/gtkstatusbox.c Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtkstatusbox.c Tue Oct 30 06:37:35 2007 +0000 @@ -1395,7 +1395,7 @@ return; } gtk_grab_add (box->popup_window); -// box->popup_in_progress = TRUE; + /*box->popup_in_progress = TRUE;*/ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (box->toggle_button), TRUE); @@ -1407,7 +1407,8 @@ } static void -pidgin_status_box_popdown(PidginStatusBox *box) { +pidgin_status_box_popdown(PidginStatusBox *box) +{ gtk_widget_hide(box->popup_window); box->popup_in_progress = FALSE; gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (box->toggle_button), @@ -1415,16 +1416,34 @@ gtk_grab_remove (box->popup_window); } +static gboolean +toggle_key_press_cb(GtkWidget *widget, GdkEventKey *event, PidginStatusBox *box) +{ + switch (event->keyval) { + case GDK_Return: + case GDK_KP_Enter: + case GDK_KP_Space: + case GDK_space: + if (!box->popup_in_progress) { + pidgin_status_box_popup (box); + box->popup_in_progress = TRUE; + } else { + pidgin_status_box_popdown(box); + } + return TRUE; + default: + return TRUE; + } +} -static -gboolean +static gboolean toggled_cb(GtkWidget *widget, GdkEventButton *event, PidginStatusBox *box) { - if (!box->popup_in_progress) - pidgin_status_box_popup (box); - else - pidgin_status_box_popdown(box); -return TRUE; + if (!box->popup_in_progress) + pidgin_status_box_popup (box); + else + pidgin_status_box_popdown(box); + return TRUE; } static void @@ -1775,6 +1794,8 @@ g_signal_connect(G_OBJECT(status_box->toggle_button), "button-release-event", G_CALLBACK(button_released_cb), status_box); #endif + g_signal_connect(G_OBJECT(status_box->toggle_button), "key-press-event", + G_CALLBACK(toggle_key_press_cb), status_box); g_signal_connect(G_OBJECT(status_box->toggle_button), "button-press-event", G_CALLBACK(toggled_cb), status_box); g_signal_connect(G_OBJECT(buffer), "changed", G_CALLBACK(imhtml_changed_cb), status_box);
--- a/pidgin/gtkutils.c Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtkutils.c Tue Oct 30 06:37:35 2007 +0000 @@ -111,19 +111,20 @@ desc = pango_font_description_from_string(font); } else if (purple_running_gnome()) { /* Use the GNOME "document" font, if applicable */ - char *path, *font; + char *path; if ((path = g_find_program_in_path("gconftool-2"))) { + char *font = NULL; g_free(path); - if (!g_spawn_command_line_sync( + if (g_spawn_command_line_sync( "gconftool-2 -g /desktop/gnome/interface/document_font_name", - &font, NULL, NULL, NULL)) - return; + &font, NULL, NULL, NULL)) { + desc = pango_font_description_from_string(font); + } + g_free(font); } - desc = pango_font_description_from_string(font); - g_free(font); } - + if (desc) { gtk_widget_modify_font(imhtml, desc); pango_font_description_free(desc); @@ -1525,6 +1526,8 @@ if (prpl_info && prpl_info->can_receive_file) ft = prpl_info->can_receive_file(gc, who); + else if (prpl_info && prpl_info->send_file) + ft = TRUE; if (im && ft) purple_request_choice(NULL, NULL, @@ -1558,6 +1561,7 @@ _("Set as buddy icon"), DND_BUDDY_ICON, (ft ? _("Send image file") : _("Insert in message")), (ft ? DND_FILE_TRANSFER : DND_IM_IMAGE), NULL); + gdk_pixbuf_unref(pb); return; }
--- a/pidgin/gtkutils.h Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/gtkutils.h Tue Oct 30 06:37:35 2007 +0000 @@ -376,6 +376,8 @@ * * @param conn The connection to get information from. * @param name The user to get information about. + * + * @since 2.1.0 */ void pidgin_retrieve_user_info(PurpleConnection *conn, const char *name); @@ -385,6 +387,8 @@ * @param conn The connection to get information from. * @param name The user to get information about. * @param chatid The chat id. + * + * @since 2.1.0 */ void pidgin_retrieve_user_info_in_chat(PurpleConnection *conn, const char *name, int chatid); @@ -423,6 +427,8 @@ * * @param w The widget that we want to label. * @param l A GtkLabel that we want to use as the label for the widget. + * + * @since 2.2.0 */ void pidgin_set_accessible_relations(GtkWidget *w, GtkWidget *l); @@ -437,6 +443,8 @@ * where the menu shall be drawn. This is an output parameter. * @param push_in This is an output parameter? * @param data Not used by this particular position function. + * + * @since 2.1.0 */ void pidgin_menu_position_func_helper(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data); @@ -671,6 +679,8 @@ * * @return A newly created text GtkComboBox containing a GtkEntry * child. + * + * @since 2.2.0 */ GtkWidget *pidgin_text_combo_box_entry_new(const char *default_item, GList *items); @@ -680,6 +690,8 @@ * @param widget The simple text GtkComboBoxEntry equivalent widget * * @return The text in the widget's entry. It must not be freed + * + * @since 2.2.0 */ const char *pidgin_text_combo_box_entry_get_text(GtkWidget *widget); @@ -688,6 +700,8 @@ * * @param widget The simple text GtkComboBoxEntry equivalent widget * @param text The text to set + * + * @since 2.2.0 */ void pidgin_text_combo_box_entry_set_text(GtkWidget *widget, const char *text);
--- a/pidgin/plugins/history.c Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/plugins/history.c Tue Oct 30 06:37:35 2007 +0000 @@ -42,6 +42,7 @@ GtkIMHtmlOptions options = GTK_IMHTML_NO_COLOURS; char *header; char *protocol; + char *escaped_alias; convtype = purple_conversation_get_type(c); gtkconv = PIDGIN_CONVERSATION(c); @@ -120,10 +121,12 @@ if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml)))) gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", options); - header = g_strdup_printf(_("<b>Conversation with %s on %s:</b><br>"), alias, + escaped_alias = g_markup_escape_text(alias, -1); + header = g_strdup_printf(_("<b>Conversation with %s on %s:</b><br>"), escaped_alias, purple_date_format_full(localtime(&((PurpleLog *)logs->data)->time))); gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), header, options); g_free(header); + g_free(escaped_alias); g_strchomp(history); gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), history, options);
--- a/pidgin/plugins/ticker/ticker.c Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/plugins/ticker/ticker.c Tue Oct 30 06:37:35 2007 +0000 @@ -124,8 +124,10 @@ static gboolean buddy_ticker_set_pixmap_cb(gpointer data) { TickerData *td = data; - buddy_ticker_update_contact(td->contact); - td->timeout = 0; + if (g_list_find(tickerbuds, td) != NULL) { + buddy_ticker_update_contact(td->contact); + td->timeout = 0; + } return FALSE; }
--- a/pidgin/plugins/win32/transparency/win2ktrans.c Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/plugins/win32/transparency/win2ktrans.c Tue Oct 30 06:37:35 2007 +0000 @@ -229,7 +229,7 @@ conversation_delete_cb(PurpleConversation *conv) { PidginWindow *win = pidgin_conv_get_window(PIDGIN_CONVERSATION(conv)); /* If it is the last conversation in the window, cleanup */ - if (pidgin_conv_window_get_gtkconv_count(win) == 1) + if (win != NULL && pidgin_conv_window_get_gtkconv_count(win) == 1) cleanup_conv_window(win); }
--- a/pidgin/win32/winpidgin.c Tue Oct 30 06:29:13 2007 +0000 +++ b/pidgin/win32/winpidgin.c Tue Oct 30 06:37:35 2007 +0000 @@ -545,7 +545,7 @@ if (strstr(lpszCmdLine, "-d") || strstr(lpszCmdLine, "-h") || strstr(lpszCmdLine, "-v")) { /* If stdout hasn't been redirected to a file, alloc a console * (_istty() doesn't work for stuff using the GUI subsystem) */ - if (_fileno(stdout) == -1) { + if (_fileno(stdout) == -1 || _fileno(stdout) == -2) { LPFNATTACHCONSOLE MyAttachConsole = NULL; if ((hmod = GetModuleHandle("kernel32.dll"))) { MyAttachConsole =
--- a/po/ChangeLog Tue Oct 30 06:29:13 2007 +0000 +++ b/po/ChangeLog Tue Oct 30 06:37:35 2007 +0000 @@ -2,6 +2,7 @@ version 2.2.2 * German translation updated (Bjoern Voigt) + * Slovak translation updated (loptosko) version 2.2.1 * Arabic translation updated (Khaled Hosny)
--- a/po/sk.po Tue Oct 30 06:29:13 2007 +0000 +++ b/po/sk.po Tue Oct 30 06:37:35 2007 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: pidgin-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-28 15:32-0500\n" +"POT-Creation-Date: 2007-10-02 04:01-0400\n" "PO-Revision-Date: 2007-09-10 17:31+0000\n" "Last-Translator: helix84 <helix84@centrum.sk>\n" "Language-Team: Slovak <kde-sk@linux.sk>\n" @@ -51,7 +51,7 @@ " -n, --nologin neprihlasovať automaticky\n" " -v, --version zobrazí verziu programu a skončí\n" -#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711 +#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718 #, c-format msgid "" "%s encountered errors migrating your settings from %s to %s. Please " @@ -63,11 +63,11 @@ "http://developer.pidgin.im" #: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300 -#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186 -#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310 +#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:187 +#: ../finch/gntplugin.c:235 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121 #: ../finch/plugins/gntclipboard.c:128 -#: ../libpurple/protocols/jabber/buddy.c:2029 +#: ../libpurple/protocols/jabber/buddy.c:2032 #: ../libpurple/protocols/jabber/chat.c:677 #: ../libpurple/protocols/jabber/chat.c:688 #: ../libpurple/protocols/jabber/jabber.c:1515 @@ -102,8 +102,8 @@ msgid "(You probably forgot to 'make install'.)" msgstr "(Pravdepodobne ste zabudli na „make install“.)" -#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136 -#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040 +#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137 +#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4322 msgid "Modify Account" msgstr "Upraviť účet" @@ -133,18 +133,18 @@ #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005 -#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91 -#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667 -#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145 -#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610 +#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntblist.c:2287 +#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:472 ../finch/gntpounce.c:459 +#: ../finch/gntpounce.c:667 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 +#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610 #: ../libpurple/account.c:1013 ../libpurple/account.c:1263 #: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803 #: ../libpurple/protocols/gg/gg.c:884 #: ../libpurple/protocols/jabber/buddy.c:728 -#: ../libpurple/protocols/jabber/buddy.c:2413 -#: ../libpurple/protocols/jabber/buddy.c:2449 +#: ../libpurple/protocols/jabber/buddy.c:2416 +#: ../libpurple/protocols/jabber/buddy.c:2452 #: ../libpurple/protocols/jabber/chat.c:786 #: ../libpurple/protocols/jabber/jabber.c:1008 #: ../libpurple/protocols/jabber/jabber.c:1017 @@ -153,10 +153,10 @@ #: ../libpurple/protocols/jabber/usermood.c:184 #: ../libpurple/protocols/jabber/usernick.c:78 #: ../libpurple/protocols/jabber/xdata.c:400 -#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304 -#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338 -#: ../libpurple/protocols/msn/msn.c:359 -#: ../libpurple/protocols/oscar/oscar.c:6094 +#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307 +#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341 +#: ../libpurple/protocols/msn/msn.c:362 +#: ../libpurple/protocols/oscar/oscar.c:6146 #: ../libpurple/protocols/oscar/peer.c:1046 #: ../libpurple/protocols/qq/buddy_info.c:484 #: ../libpurple/protocols/qq/buddy_opt.c:214 @@ -191,10 +191,10 @@ #: ../libpurple/protocols/silc10/ops.c:1904 #: ../libpurple/protocols/silc10/silc.c:736 #: ../libpurple/protocols/silc10/silc.c:942 -#: ../libpurple/protocols/yahoo/yahoo.c:1032 -#: ../libpurple/protocols/yahoo/yahoo.c:3498 -#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908 -#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967 +#: ../libpurple/protocols/yahoo/yahoo.c:1034 +#: ../libpurple/protocols/yahoo/yahoo.c:3500 +#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1908 +#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:6267 #: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773 #: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004 #: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048 @@ -202,7 +202,7 @@ #: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215 #: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281 #: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328 -#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101 +#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1108 #: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579 #: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618 #: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345 @@ -212,8 +212,8 @@ #. Save button #. Save -#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 -#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265 +#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297 +#: ../finch/gntplugin.c:472 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265 #: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598 #: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50 #: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749 @@ -236,12 +236,12 @@ #: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210 #: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327 -#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274 +#: ../pidgin/gtkpounce.c:1107 ../pidgin/gtkrequest.c:274 #: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573 msgid "Delete" msgstr "Odstrániť" -#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82 +#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82 #: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522 msgid "Accounts" msgstr "Účty" @@ -252,15 +252,16 @@ #. Add button #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343 -#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306 -#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199 -#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114 +#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2372 +#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:383 ../finch/gntpounce.c:713 +#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883 +#: ../libpurple/protocols/qq/sys_msg.c:114 #: ../libpurple/protocols/qq/sys_msg.c:173 #: ../libpurple/protocols/qq/sys_msg.c:267 #: ../libpurple/protocols/sametime/sametime.c:5486 #: ../libpurple/protocols/silc/chat.c:615 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494 -#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659 +#: ../pidgin/gtkblist.c:6266 ../pidgin/gtkconv.c:1712 #: ../pidgin/gtkrequest.c:275 msgid "Add" msgstr "Pridať" @@ -322,13 +323,13 @@ msgid "Error adding buddy" msgstr "Chyba počas pridávania priateľa" -#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888 +#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2902 #: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980 msgid "Screen Name" msgstr "Používateľské meno" #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250 -#: ../libpurple/protocols/msn/msn.c:1395 +#: ../libpurple/protocols/msn/msn.c:1507 #: ../libpurple/protocols/silc/chat.c:606 #: ../libpurple/protocols/silc10/chat.c:590 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704 @@ -344,10 +345,11 @@ msgstr "Skupina" #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305 -#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576 -#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190 -#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506 -#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445 +#: ../finch/gntblist.c:2210 ../finch/gntblist.c:2274 ../finch/gntnotify.c:174 +#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153 +#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3206 +#: ../pidgin/gtknotify.c:511 ../pidgin/gtkpounce.c:1275 +#: ../pidgin/plugins/gevolution/gevolution.c:445 msgid "Account" msgstr "Účet" @@ -360,7 +362,7 @@ #: ../libpurple/protocols/silc10/buddy.c:1033 #: ../libpurple/protocols/silc10/buddy.c:1080 #: ../libpurple/protocols/silc10/buddy.c:1180 -#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483 +#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5772 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445 msgid "Add Buddy" msgstr "Pridať priateľa" @@ -369,15 +371,16 @@ msgid "Please enter buddy information." msgstr "Zadajte, prosím, informáciu o priateľovi." -#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209 +#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210 msgid "Chats" msgstr "Chaty" #. Extract their Name and put it in -#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924 +#: ../finch/gntblist.c:407 ../finch/gntblist.c:2205 +#: ../libpurple/protocols/jabber/jabber.c:924 #: ../libpurple/protocols/jabber/jabber.c:927 -#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649 -#: ../libpurple/protocols/msn/msn.c:1676 +#: ../libpurple/protocols/msn/msn.c:1694 ../libpurple/protocols/msn/msn.c:1759 +#: ../libpurple/protocols/msn/msn.c:1786 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582 #: ../pidgin/gtkroomlist.c:618 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132 @@ -389,7 +392,7 @@ msgid "Auto-join" msgstr "Prihlásiť automaticky" -#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859 +#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6154 msgid "Add Chat" msgstr "Pridať chat" @@ -411,7 +414,7 @@ #: ../finch/gntblist.c:454 ../finch/gntblist.c:856 #: ../libpurple/protocols/sametime/sametime.c:5396 -#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963 +#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6263 msgid "Add Group" msgstr "Pridať skupinu" @@ -443,7 +446,7 @@ msgid "Retrieving..." msgstr "Prijíma sa..." -#: ../finch/gntblist.c:904 ../finch/gntconv.c:507 +#: ../finch/gntblist.c:904 ../finch/gntconv.c:534 #: ../libpurple/protocols/silc/chat.c:899 #: ../libpurple/protocols/silc10/chat.c:883 msgid "Get Info" @@ -454,10 +457,10 @@ msgstr "Pridať sledovanie priateľa" #. if (q_bud && is_online(q_bud->status)) { -#: ../finch/gntblist.c:915 ../finch/gntconv.c:519 +#: ../finch/gntblist.c:915 ../finch/gntconv.c:546 #: ../libpurple/protocols/jabber/si.c:874 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587 -#: ../pidgin/gtkconv.c:1607 +#: ../pidgin/gtkconv.c:1660 msgid "Send File" msgstr "Odoslať súbor" @@ -503,14 +506,14 @@ msgstr "Potvrdiť odstránenie" #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227 -#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276 +#: ../pidgin/gtkconv.c:1709 ../pidgin/gtkrequest.c:276 #: ../pidgin/gtkstatusbox.c:264 msgid "Remove" msgstr "Odstrániť" #. Buddy List -#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258 -#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284 +#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2422 ../finch/gntprefs.c:258 +#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4566 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326 msgid "Buddy List" msgstr "Zoznam priateľov" @@ -529,15 +532,15 @@ #: ../libpurple/protocols/gg/gg.c:2207 #: ../libpurple/protocols/jabber/buddy.c:286 #: ../libpurple/protocols/jabber/buddy.c:1247 -#: ../libpurple/protocols/jabber/buddy.c:2214 -#: ../libpurple/protocols/jabber/buddy.c:2396 +#: ../libpurple/protocols/jabber/buddy.c:2217 +#: ../libpurple/protocols/jabber/buddy.c:2399 #: ../libpurple/protocols/jabber/jabber.c:937 #: ../libpurple/protocols/jabber/jabber.c:1544 #: ../libpurple/protocols/jabber/jabber.c:1567 #: ../libpurple/protocols/jabber/jabber.c:1590 #: ../libpurple/protocols/jabber/jabber.c:1613 #: ../libpurple/protocols/jabber/jabber.c:1636 -#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587 +#: ../libpurple/protocols/msn/msn.c:1515 ../libpurple/protocols/msn/msn.c:1697 #: ../libpurple/protocols/qq/buddy_info.c:43 #: ../libpurple/protocols/silc/buddy.c:1535 #: ../libpurple/protocols/silc/ops.c:1002 @@ -547,7 +550,7 @@ #: ../libpurple/protocols/silc10/ops.c:1036 #: ../libpurple/protocols/silc10/ops.c:1179 #: ../libpurple/protocols/silc10/ops.c:1328 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3230 msgid "Nickname" msgstr "Prezývka" @@ -556,12 +559,12 @@ #: ../libpurple/protocols/bonjour/bonjour.c:340 #: ../libpurple/protocols/jabber/buddy.c:787 #: ../libpurple/protocols/jabber/buddy.c:951 -#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32 -#: ../libpurple/protocols/novell/novell.c:2825 -#: ../libpurple/protocols/oscar/oscar.c:2912 -#: ../libpurple/protocols/yahoo/yahoo.c:3097 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060 -#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925 +#: ../libpurple/protocols/msn/state.c:32 +#: ../libpurple/protocols/novell/novell.c:2830 +#: ../libpurple/protocols/oscar/oscar.c:2926 +#: ../libpurple/protocols/yahoo/yahoo.c:3099 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258 +#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927 msgid "Idle" msgstr "Nečinný" @@ -592,36 +595,26 @@ "\n" "Naposledy pripojený: %s dozadu" -#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470 +#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:470 #: ../pidgin/gtkstatusbox.c:1072 msgid "New..." msgstr "Nový..." -#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471 +#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:471 #: ../pidgin/gtkstatusbox.c:1073 msgid "Saved..." msgstr "Uložený..." -#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88 +#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:343 ../finch/gntui.c:88 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531 msgid "Plugins" msgstr "Moduly" -#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754 -#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974 -msgid "_Name" -msgstr "_Meno" - -#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759 -#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979 -msgid "_Account" -msgstr "Úč_et" - -#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767 +#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:767 msgid "New Instant Message" msgstr "Nová správa" -#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769 +#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:769 msgid "" "Please enter the screen name or alias of the person you would like to IM." msgstr "" @@ -631,15 +624,15 @@ #. Not multiline #. Not masked? #. No hints? -#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135 +#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136 #: ../finch/gntnotify.c:80 ../libpurple/account.c:1012 #: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506 #: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802 #: ../libpurple/protocols/jabber/jabber.c:1736 #: ../libpurple/protocols/jabber/xdata.c:399 -#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303 -#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337 -#: ../libpurple/protocols/oscar/oscar.c:6093 +#: ../libpurple/protocols/msn/msn.c:289 ../libpurple/protocols/msn/msn.c:306 +#: ../libpurple/protocols/msn/msn.c:323 ../libpurple/protocols/msn/msn.c:340 +#: ../libpurple/protocols/oscar/oscar.c:6145 #: ../libpurple/protocols/silc/buddy.c:454 #: ../libpurple/protocols/silc/buddy.c:1190 #: ../libpurple/protocols/silc/chat.c:447 @@ -656,58 +649,83 @@ #: ../libpurple/protocols/silc10/ops.c:1297 #: ../libpurple/protocols/silc10/ops.c:1903 #: ../libpurple/protocols/silc10/silc.c:735 -#: ../libpurple/protocols/yahoo/yahoo.c:1031 -#: ../libpurple/protocols/yahoo/yahoo.c:3497 -#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039 +#: ../libpurple/protocols/yahoo/yahoo.c:1033 +#: ../libpurple/protocols/yahoo/yahoo.c:3499 +#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4321 #: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772 #: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003 #: ../pidgin/gtkrequest.c:270 msgid "OK" msgstr "OK" +#: ../finch/gntblist.c:2270 +msgid "Channel" +msgstr "Kanál" + +#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:924 +msgid "Join a Chat" +msgstr "Pripojiť sa k chatu" + +#: ../finch/gntblist.c:2284 +msgid "Please enter the name of the chat you want to join." +msgstr "Prosím, zadajte názov chatu na ktorý sa chcete pripojiť." + +#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:392 +msgid "Join" +msgstr "Pripojiť" + #. Create the "Options" frame. -#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790 +#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:797 msgid "Options" msgstr "Voľby" -#: ../finch/gntblist.c:2247 +#: ../finch/gntblist.c:2330 msgid "Send IM..." msgstr "Odoslať správu..." -#: ../finch/gntblist.c:2251 -#, fuzzy -msgid "Show empty groups" -msgstr "Zobraziť prázdne skupiny" - -#: ../finch/gntblist.c:2257 -#, fuzzy -msgid "Show offline buddies" -msgstr "Zobraziť odpojených priateľov" - -#: ../finch/gntblist.c:2263 -msgid "Sort by status" -msgstr "Zoradiť podľa stavu" - -#: ../finch/gntblist.c:2267 -msgid "Sort alphabetically" -msgstr "Zoradiť podľa abecedy" - -#: ../finch/gntblist.c:2271 -msgid "Sort by log size" -msgstr "Zoradiť podľa veľkosti záznamu" +#: ../finch/gntblist.c:2334 +msgid "Join Chat..." +msgstr "Pripojiť sa na chat..." + +#: ../finch/gntblist.c:2338 +msgid "Show" +msgstr "Zobraziť" + +#: ../finch/gntblist.c:2343 +msgid "Empty groups" +msgstr "Prázdne skupiny" + +#: ../finch/gntblist.c:2349 +msgid "Offline buddies" +msgstr "Odpojených priateľov" + +#: ../finch/gntblist.c:2355 +msgid "Sort" +msgstr "Zoradiť" + +#: ../finch/gntblist.c:2360 +msgid "By Status" +msgstr "Podľa stavu" + +#: ../finch/gntblist.c:2364 ../pidgin/gtkblist.c:4106 +msgid "Alphabetically" +msgstr "Podľa abecedy" + +#: ../finch/gntblist.c:2368 +msgid "By Log Size" +msgstr "Podľa veľkosti záznamu" #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188 -#, fuzzy msgid "Certificate Import" -msgstr "Certifikáty" +msgstr "Import certifikátu" #: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189 msgid "Specify a hostname" -msgstr "" +msgstr "Zadajte názov hostiteľa" #: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190 msgid "Type the host name this certificate is for." -msgstr "" +msgstr "Zadajte názov hostiteľa, komu je určený tento certifikát." #: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210 #, c-format @@ -715,21 +733,20 @@ "File %s could not be imported.\n" "Make sure that the file is readable and in PEM format.\n" msgstr "" +"Nie je možné importovať súbor %s.\n" +"Skontrolujte, či je ho možné čítať a či je vo formáte PEM.\n" #: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212 -#, fuzzy msgid "Certificate Import Error" -msgstr "Certifikáty" +msgstr "Chyba pri importe certifikátu" #: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213 -#, fuzzy msgid "X.509 certificate import failed" -msgstr "X.509 certifikáty" +msgstr "Import X.509 certifikátu zlyhal" #: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224 -#, fuzzy msgid "Select a PEM certificate" -msgstr "Vyberte súbor" +msgstr "Vyberte PEM certifikát" #: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245 #, c-format @@ -737,26 +754,25 @@ "Export to file %s failed.\n" "Check that you have write permission to the target path\n" msgstr "" +"Export do súboru %s zlyhal.\n" +"Skontrolujte, či máte právo na zápis do cieľového umiestnenia\n" #: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247 -#, fuzzy msgid "Certificate Export Error" -msgstr "Certifikáty" +msgstr "Chyba exportu certifikátu" #: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248 -#, fuzzy msgid "X.509 certificate export failed" -msgstr "X.509 certifikáty" +msgstr "Export X.509 certifikátu zlyhal" #: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299 -#, fuzzy msgid "PEM X.509 Certificate Export" -msgstr "X.509 certifikáty" +msgstr "Export PEM X.509 certifikátu" #: ../finch/gntcertmgr.c:188 -#, fuzzy, c-format +#, c-format msgid "Certificate for %s" -msgstr "Certifikáty" +msgstr "Certifikát pre %s" #: ../finch/gntcertmgr.c:195 #, c-format @@ -766,25 +782,27 @@ "SHA1 fingerprint:\n" "%s" msgstr "" +"Bežný názov: %s\n" +"\n" +"SHA1 odtlačok:\n" +"%s" #: ../finch/gntcertmgr.c:198 -#, fuzzy msgid "SSL Host Certificate" -msgstr "Certifikáty" +msgstr "SSL certifikát hostiteľa" #: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372 #, c-format msgid "Really delete certificate for %s?" -msgstr "" +msgstr "Naozaj chcete odstrániť certifikát pre %s?" #: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374 msgid "Confirm certificate delete" -msgstr "" +msgstr "Potvrdiť odstránenie certifikátu" #: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602 -#, fuzzy msgid "Certificate Manager" -msgstr "Certifikáty" +msgstr "Manažér certifikátov" #. Creating the user splits #: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652 @@ -793,32 +811,32 @@ msgid "Hostname" msgstr "Názov hostiteľa" -#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635 +#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1688 #: ../pidgin/gtkdebug.c:835 msgid "Info" msgstr "Podrobnosti" #. Close button #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182 -#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738 -#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403 +#: ../finch/gntplugin.c:211 ../finch/gntplugin.c:403 ../finch/gntpounce.c:738 +#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:406 #: ../libpurple/protocols/silc/util.c:382 #: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468 #: ../pidgin/gtkrequest.c:273 msgid "Close" msgstr "Zavrieť" -#: ../finch/gntconn.c:124 +#: ../finch/gntconn.c:125 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../finch/gntconn.c:127 +#: ../finch/gntconn.c:128 #, c-format msgid "%s disconnected." msgstr "%s je odpojený." -#: ../finch/gntconn.c:128 +#: ../finch/gntconn.c:129 #, c-format msgid "" "%s\n" @@ -831,7 +849,7 @@ "Finch sa nebude pokúšať znovu pripojiť na tento účet, dokým neopravíte chybu " "a znovu nepovolíte tento účet." -#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041 +#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4323 msgid "Re-enable Account" msgstr "Znovu povoliť účet" @@ -839,23 +857,23 @@ msgid "No such command." msgstr "Tento príkaz neexistuje." -#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489 +#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:530 msgid "Syntax Error: You typed the wrong number of arguments to that command." msgstr "Chyba syntaxi: V príkaze ste zadali nesprávny počet argumentov." -#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495 +#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:536 msgid "Your command failed for an unknown reason." msgstr "Váš príkaz zlyhal z neznámeho dôvodu." -#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502 +#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:543 msgid "That command only works in chats, not IMs." msgstr "Tento príkaz funguje len v chatoch, nie v IM." -#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505 +#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:546 msgid "That command only works in IMs, not chats." msgstr "Tento príkaz funguje len v IM, nie v chatoch." -#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510 +#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:551 msgid "That command doesn't work on this protocol." msgstr "Tento príkaz nefunguje v tomto protokole." @@ -873,7 +891,7 @@ msgid "%s [%s]" msgstr "%s [%s]" -#: ../finch/gntconv.c:279 ../finch/gntconv.c:773 +#: ../finch/gntconv.c:279 ../finch/gntconv.c:801 #, c-format msgid "" "\n" @@ -886,65 +904,65 @@ msgid "You have left this chat." msgstr "Opustili ste tento chat." -#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362 +#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1415 msgid "Logging started. Future messages in this conversation will be logged." msgstr "" "Zaznamenávanie bolo spustené. Nasledujúce správy v rozhovore budú " "zaznamenané." -#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370 +#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1423 msgid "" "Logging stopped. Future messages in this conversation will not be logged." msgstr "" "Zaznamenávanie bolo zastavené. Nasledujúce správy v rozhovore už nebudú " "zaznamenané." -#: ../finch/gntconv.c:442 +#: ../finch/gntconv.c:469 msgid "Send To" msgstr "Odoslať do" -#: ../finch/gntconv.c:486 +#: ../finch/gntconv.c:513 msgid "Conversation" msgstr "Rozhovor" -#: ../finch/gntconv.c:492 +#: ../finch/gntconv.c:519 msgid "Clear Scrollback" msgstr "Vymazať záznam" -#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191 +#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191 msgid "Show Timestamps" msgstr "Zobrazovať časové značky" -#: ../finch/gntconv.c:512 +#: ../finch/gntconv.c:539 msgid "Add Buddy Pounce..." msgstr "Pridať sledovanie priateľa..." -#: ../finch/gntconv.c:527 +#: ../finch/gntconv.c:554 msgid "Enable Logging" msgstr "Zapnúť zaznamenávanie" -#: ../finch/gntconv.c:533 +#: ../finch/gntconv.c:560 msgid "Enable Sounds" msgstr "Zapnúť zvuky" -#: ../finch/gntconv.c:739 +#: ../finch/gntconv.c:766 msgid "<AUTO-REPLY> " msgstr "<AUTOMATICKÁ ODPOVEĎ> " #. Print the list of users in the room -#: ../finch/gntconv.c:861 +#: ../finch/gntconv.c:889 msgid "List of users:\n" msgstr "Zoznam používateľov:\n" -#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331 +#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:370 msgid "Supported debug options are: version" msgstr "Podporované ladiace voľby sú: version" -#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381 +#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:422 msgid "No such command (in this context)." msgstr "Tento príkaz neexistuje (v tejto situácii)." -#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384 +#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:425 msgid "" "Use \"/help <command>\" for help on a specific command.\n" "The following commands are available in this context:\n" @@ -952,60 +970,65 @@ "Pomocníka ku zadanému príkazu zobrazíte zadaním „/help <príkaz>“.\n" "V tomto kontexte sú dostupné nasledujúce príkazy:\n" -#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560 +#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7644 msgid "" "say <message>: Send a message normally as if you weren't using a " "command." msgstr "say <správa>: Odošle správu rovnako, ako bez použitia príkazu." -#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563 +#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7647 msgid "me <action>: Send an IRC style action to a buddy or chat." msgstr "me <akcia>: Odošle priateľovi alebo na chat akciu v štýle IRC." -#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566 +#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7650 msgid "" "debug <option>: Send various debug information to the current " "conversation." msgstr "" "debug <voľby>: Do aktuálneho rozhovoru vloží rôzne ladiace informácie." -#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569 +#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7653 msgid "clear: Clears the conversation scrollback." msgstr "clear: Vyčistí okno rozhovoru." -#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575 +#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7659 msgid "help <command>: Help on a specific command." msgstr "help <príkaz>: Zobrazí pomocníka ku zadanému príkazu." -#: ../finch/gntconv.c:1135 +#: ../finch/gntconv.c:1163 msgid "users: Show the list of users in the chat." msgstr "users: Zobrazí zoznam používateľov na chate." -#: ../finch/gntconv.c:1140 +#: ../finch/gntconv.c:1168 msgid "plugins: Show the plugins window." msgstr "plugins: Zobrazí okno modulov." -#: ../finch/gntconv.c:1143 +#: ../finch/gntconv.c:1171 msgid "buddylist: Show the buddylist." msgstr "zoznam kamarátov: Zobraziť zoznam." -#: ../finch/gntconv.c:1146 +#: ../finch/gntconv.c:1174 msgid "accounts: Show the accounts window." msgstr "účty: Zobraziť okno s účtami." -#: ../finch/gntconv.c:1149 +#: ../finch/gntconv.c:1177 msgid "debugwin: Show the debug window." msgstr "ladiace okno: Zobraziť ladiace okno" -#: ../finch/gntconv.c:1152 +#: ../finch/gntconv.c:1180 msgid "prefs: Show the preference window." msgstr "vlastnosti: Zobraziť okno vlastností" -#: ../finch/gntconv.c:1155 +#: ../finch/gntconv.c:1183 msgid "statuses: Show the savedstatuses window." msgstr "stavy: Zobraziť okno stavov." -#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695 +#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:988 ../pidgin/gtkconv.c:2657 +#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543 +msgid "Unable to open file." +msgstr "Nepodarilo sa otvoriť súbor." + +#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695 msgid "Debug Window" msgstr "Ladiace okno" @@ -1013,15 +1036,15 @@ #. * it's necessary to make the width of the debug window resizable ... like I said, #. * it doesn't make sense. The bug is likely in the packing in gntbox.c. #. -#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754 +#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:754 msgid "Clear" msgstr "Vyčistiť" -#: ../finch/gntdebug.c:262 -msgid "Filter: " +#: ../finch/gntdebug.c:303 +msgid "Filter:" msgstr "Filter: " -#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763 +#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:763 msgid "Pause" msgstr "Pozastaviť" @@ -1065,17 +1088,17 @@ #: ../libpurple/protocols/jabber/buddy.c:782 #: ../libpurple/protocols/jabber/buddy.c:941 #: ../libpurple/protocols/jabber/jabber.c:1500 -#: ../libpurple/protocols/msn/msn.c:543 -#: ../libpurple/protocols/novell/novell.c:2835 +#: ../libpurple/protocols/msn/msn.c:596 ../libpurple/protocols/msn/msn.c:603 +#: ../libpurple/protocols/novell/novell.c:2840 #: ../libpurple/protocols/oscar/oscar.c:821 #: ../libpurple/protocols/oscar/oscar.c:826 #: ../libpurple/protocols/oscar/oscar.c:828 -#: ../libpurple/protocols/oscar/oscar.c:2700 -#: ../libpurple/protocols/oscar/oscar.c:3780 +#: ../libpurple/protocols/oscar/oscar.c:2714 +#: ../libpurple/protocols/oscar/oscar.c:3794 #: ../libpurple/protocols/sametime/sametime.c:3263 #: ../libpurple/protocols/sametime/sametime.c:4150 -#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104 -#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120 +#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3302 +#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318 #: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144 msgid "Status" msgstr "Stav" @@ -1119,7 +1142,7 @@ msgid "Finished" msgstr "Dokončené" -#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347 +#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:386 msgid "Transferring" msgstr "Prenáša sa" @@ -1131,11 +1154,11 @@ msgid "You have mail!" msgstr "Máte poštu!" -#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513 +#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:518 msgid "Sender" msgstr "Odosielateľ" -#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520 +#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:525 msgid "Subject" msgstr "Predmet" @@ -1151,49 +1174,45 @@ msgid "New Mail" msgstr "Nová pošta" -#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940 +#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:947 #, c-format msgid "Info for %s" -msgstr "Podrobnosti o %s" +msgstr "Podrobnosti o priateľovi %s" #: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476 -#: ../pidgin/gtknotify.c:941 +#: ../pidgin/gtknotify.c:948 msgid "Buddy Information" msgstr "Podrobnosti o priateľovi" -#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367 +#: ../finch/gntnotify.c:380 ../libpurple/protocols/qq/group_join.c:367 msgid "Continue" msgstr "Pokračovať" -#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596 +#: ../finch/gntnotify.c:389 ../pidgin/gtkconv.c:1649 msgid "IM" msgstr "Napísať správu" -#: ../finch/gntnotify.c:389 -msgid "Join" -msgstr "Pripojiť" - -#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473 +#: ../finch/gntnotify.c:395 ../libpurple/protocols/sametime/sametime.c:3473 msgid "Invite" msgstr "Pozvať" -#: ../finch/gntnotify.c:395 +#: ../finch/gntnotify.c:398 msgid "(none)" msgstr "(žiadne)" -#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84 +#: ../finch/gntplugin.c:76 ../finch/gntplugin.c:85 msgid "ERROR" msgstr "CHYBA" -#: ../finch/gntplugin.c:75 +#: ../finch/gntplugin.c:76 msgid "loading plugin failed" msgstr "načítavanie modulu zlyhalo" -#: ../finch/gntplugin.c:84 +#: ../finch/gntplugin.c:85 msgid "unloading plugin failed" msgstr "ukončenie modulu zlyhalo" -#: ../finch/gntplugin.c:129 +#: ../finch/gntplugin.c:130 #, c-format msgid "" "Name: %s\n" @@ -1210,19 +1229,41 @@ "Domovská stránka: %s\n" "Názov súboru: %s\n" -#: ../finch/gntplugin.c:187 +#: ../finch/gntplugin.c:188 msgid "Plugin need to be loaded before you can configure it." msgstr "Prosím, zapnite tento modul, ak ho chcete konfigurovať." -#: ../finch/gntplugin.c:235 +#: ../finch/gntplugin.c:236 msgid "No configuration options for this plugin." msgstr "Tento modul sa nedá konfigurovať." -#: ../finch/gntplugin.c:260 +#: ../finch/gntplugin.c:257 +msgid "Error loading plugin" +msgstr "Chyba pri načítavaní modulu" + +#: ../finch/gntplugin.c:258 +msgid "The selected file is not a valid plugin." +msgstr "Vybraný súbor nie je správny modul." + +#: ../finch/gntplugin.c:259 +msgid "" +"Please open the debug window and try again to see the exact error message." +msgstr "" +"Prosím, otvorte ladiace okno a skúste to znovu. Mala by sa vám zobraziť presná chybová správa." + +#: ../finch/gntplugin.c:322 +msgid "Select plugin to install" +msgstr "Vyberte modul, ktorý chcete nainštalovať" + +#: ../finch/gntplugin.c:348 msgid "You can (un)load plugins from the following list." msgstr "V nasledujúcom zozname je možné zapínať a vypínať moduly." -#: ../finch/gntplugin.c:315 +#: ../finch/gntplugin.c:399 +msgid "Install Plugin..." +msgstr "Inštalovať modul..." + +#: ../finch/gntplugin.c:408 msgid "Configure Plugin" msgstr "Konfigurovať modul" @@ -1231,8 +1272,8 @@ #. (that should have been "effect," right?) #. Back to instant-apply! I win! BU-HAHAHA! #. Create the window -#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264 -#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067 +#: ../finch/gntplugin.c:464 ../finch/gntplugin.c:471 ../finch/gntprefs.c:264 +#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2069 msgid "Preferences" msgstr "Nastavenia" @@ -1240,11 +1281,11 @@ msgid "Please enter a buddy to pounce." msgstr "Zadajte, prosím, priateľa, ktorého chcete sledovať." -#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517 +#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524 msgid "New Buddy Pounce" msgstr "Nové sledovanie priateľa" -#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517 +#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524 msgid "Edit Buddy Pounce" msgstr "Upraviť sledovanie priateľa" @@ -1262,7 +1303,7 @@ msgstr "Meno priateľa:" #. Create the "Pounce When Buddy..." frame. -#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585 +#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:592 msgid "Pounce When Buddy..." msgstr "Sledovať keď priateľ..." @@ -1307,7 +1348,7 @@ msgstr "Pošle správu" #. Create the "Action" frame. -#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646 +#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:653 msgid "Action" msgstr "Akcia" @@ -1335,7 +1376,7 @@ msgid "Pounce only when my status is not available" msgstr "Sledovať, len ak som nedostupný" -#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281 +#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1288 msgid "Recurring" msgstr "Opakujúci sa" @@ -1351,67 +1392,66 @@ msgid "You must create an account first before you can create a pounce." msgstr "Pred tým než spustíte sledovanie si musíte pridať účet." -#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096 +#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1103 #, c-format msgid "Are you sure you want to delete the pounce on %s for %s?" -msgstr "Ste si istý, že chcete odstrániť sledovanie na %s pre %s?" - -#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325 +msgstr "Ste si istý, že chcete odstrániť sledovanie priateľa %s v účte %s?" + +#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1332 msgid "Buddy Pounces" msgstr "Sledovanie priateľov" -#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452 +#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1459 #, c-format msgid "%s has started typing to you (%s)" msgstr "používateľ %s vám začal písať (%s)" -#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454 +#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1461 #, c-format msgid "%s has paused while typing to you (%s)" msgstr "používteľ %s vám prestal písať (%s)" -#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456 +#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1463 #, c-format msgid "%s has signed on (%s)" msgstr "používateľ %s sa prihlásil (%s)" -#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458 +#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1465 #, c-format msgid "%s has returned from being idle (%s)" msgstr "používateľ %s prestal byť nečinný (%s)" -#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460 +#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1467 #, c-format msgid "%s has returned from being away (%s)" msgstr "používateľ %s sa vrátil (%s)" -#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462 +#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1469 #, c-format msgid "%s has stopped typing to you (%s)" msgstr "používateľ %s vám nenapísal (%s)" -#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464 +#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1471 #, c-format msgid "%s has signed off (%s)" msgstr "používateľ %s sa odhlásil (%s)" -#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466 +#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1473 #, c-format msgid "%s has become idle (%s)" msgstr "používateľ %s sa stal nečinným (%s)" -#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468 +#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1475 #, c-format msgid "%s has gone away. (%s)" msgstr "používateľ %s sa stal neprítomným (%s)" -#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470 +#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1477 #, c-format msgid "%s has sent you a message. (%s)" msgstr "používateľ %s vám poslal správu. (%s)" -#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471 -#, c-format +#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1478 msgid "Unknown pounce event. Please report this!" msgstr "Neznáma udalosť sledovania. Oznámte to, prosím!" @@ -1419,12 +1459,12 @@ msgid "Based on keyboard use" msgstr "Podľa využitia klávesnice" -#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930 +#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932 msgid "From last sent message" msgstr "Podľa naposledy odoslanej správy" #: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907 -#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943 +#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333 msgid "Never" msgstr "Nikdy" @@ -1474,25 +1514,25 @@ msgstr "Zmeniť stav na:" #. Conversations -#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033 +#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340 msgid "Conversations" msgstr "Rozhovory" -#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044 +#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046 msgid "Logging" msgstr "Zaznamenávanie" -#: ../finch/gntrequest.c:583 +#: ../finch/gntrequest.c:585 msgid "Not implemented yet." msgstr "Zatiaľ nie je implementované." -#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555 +#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1555 #: ../pidgin/gtkrequest.c:1601 msgid "Save File..." msgstr "Uložiť súbor..." -#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556 +#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1556 #: ../pidgin/gtkrequest.c:1602 msgid "Open File..." msgstr "Otvoriť súbor..." @@ -1545,8 +1585,8 @@ msgid "GStreamer failed to initialize." msgstr "Nepodarilo sa inicializovať rozhranie GStreamer" -#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587 -#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872 +#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589 +#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874 msgid "(default)" msgstr "(štandardné)" @@ -1562,7 +1602,7 @@ msgid "Profiles" msgstr "Profily" -#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717 +#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719 msgid "Automatic" msgstr "Automaticky" @@ -1570,7 +1610,7 @@ msgid "Console Beep" msgstr "Pípnutie konzoly" -#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721 +#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723 msgid "Command" msgstr "Príkaz" @@ -1578,7 +1618,7 @@ msgid "No Sound" msgstr "Žiadne zvuky" -#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712 +#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714 msgid "Sound Method" msgstr "Metóda zvukov" @@ -1596,7 +1636,7 @@ "(%s pre názov súboru)" #. Sound options -#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756 +#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758 msgid "Sound Options" msgstr "Možnosti zvuku" @@ -1605,17 +1645,17 @@ msgstr "Prehrávať zvuky, keď je okno koverzácie aktívne" #: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909 -#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42 +#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42 #: ../pidgin/plugins/timestamp_format.c:51 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334 msgid "Always" msgstr "Vždy" -#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761 +#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763 msgid "Only when available" msgstr "Len ak sú dostupné" -#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762 +#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764 msgid "Only when not available" msgstr "Len ak sú nedostupné" @@ -1624,11 +1664,11 @@ msgstr "Hlasitosť(0-100):" #. Sound events -#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798 +#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800 msgid "Sound Events" msgstr "Zvukové udalosti" -#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857 +#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859 msgid "Event" msgstr "Udalosť" @@ -1636,15 +1676,15 @@ msgid "File" msgstr "Súbor" -#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876 +#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878 msgid "Test" msgstr "Ukážka" -#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880 +#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882 msgid "Reset" msgstr "Obnoviť" -#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884 +#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886 msgid "Choose..." msgstr "Vybrať..." @@ -1664,7 +1704,7 @@ #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539 #: ../libpurple/protocols/jabber/buddy.c:298 #: ../libpurple/protocols/jabber/buddy.c:1359 -#: ../libpurple/protocols/novell/novell.c:1484 +#: ../libpurple/protocols/novell/novell.c:1486 #: ../pidgin/gtksavedstatuses.c:500 msgid "Title" msgstr "Nadpis" @@ -1695,17 +1735,20 @@ #: ../libpurple/protocols/jabber/jabber.c:1601 #: ../libpurple/protocols/jabber/jabber.c:1624 #: ../libpurple/protocols/jabber/jabber.c:1649 +#: ../libpurple/protocols/msn/msn.c:634 ../libpurple/protocols/msn/msn.c:641 +#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/msn.c:655 +#: ../libpurple/protocols/msn/msn.c:661 ../libpurple/protocols/msn/msn.c:667 #: ../libpurple/protocols/myspace/myspace.c:148 -#: ../libpurple/protocols/novell/novell.c:2838 -#: ../libpurple/protocols/novell/novell.c:2941 -#: ../libpurple/protocols/novell/novell.c:2947 -#: ../libpurple/protocols/novell/novell.c:2953 -#: ../libpurple/protocols/oscar/oscar.c:5554 -#: ../libpurple/protocols/oscar/oscar.c:5772 -#: ../libpurple/protocols/oscar/oscar.c:5786 -#: ../libpurple/protocols/oscar/oscar.c:5802 -#: ../libpurple/protocols/oscar/oscar.c:5809 -#: ../libpurple/protocols/oscar/oscar.c:5816 +#: ../libpurple/protocols/novell/novell.c:2843 +#: ../libpurple/protocols/novell/novell.c:2946 +#: ../libpurple/protocols/novell/novell.c:2952 +#: ../libpurple/protocols/novell/novell.c:2958 +#: ../libpurple/protocols/oscar/oscar.c:5606 +#: ../libpurple/protocols/oscar/oscar.c:5824 +#: ../libpurple/protocols/oscar/oscar.c:5838 +#: ../libpurple/protocols/oscar/oscar.c:5854 +#: ../libpurple/protocols/oscar/oscar.c:5861 +#: ../libpurple/protocols/oscar/oscar.c:5868 #: ../libpurple/protocols/sametime/sametime.c:3286 #: ../libpurple/protocols/sametime/sametime.c:3292 #: ../libpurple/protocols/sametime/sametime.c:3298 @@ -1713,8 +1756,8 @@ #: ../libpurple/protocols/silc/buddy.c:1551 #: ../libpurple/protocols/silc10/buddy.c:1551 #: ../libpurple/protocols/simple/simple.c:246 -#: ../libpurple/protocols/yahoo/yahoo.c:3751 -#: ../libpurple/protocols/yahoo/yahoo.c:3757 +#: ../libpurple/protocols/yahoo/yahoo.c:3753 +#: ../libpurple/protocols/yahoo/yahoo.c:3759 #: ../libpurple/protocols/zephyr/zephyr.c:2337 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010 msgid "Message" @@ -1770,7 +1813,7 @@ msgid "Certificates" msgstr "Certifikáty" -#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035 +#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037 msgid "Sounds" msgstr "Zvuky" @@ -1780,23 +1823,20 @@ #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121 #: ../finch/plugins/gntclipboard.c:128 -#, fuzzy msgid "Error loading the plugin." -msgstr "Počas zatvárania modulu sa vyskytli chyby." +msgstr "Počas načítavania modulu sa vyskytli chyby." #: ../finch/plugins/gntclipboard.c:116 -#, fuzzy msgid "Couldn't find X display" -msgstr "Nepodarilo sa otvoriť súbor" +msgstr "Nebola nájdená X obrazovka" #: ../finch/plugins/gntclipboard.c:122 -#, fuzzy msgid "Couldn't find window" -msgstr "Nepodarilo sa otvoriť súbor" +msgstr "Nebolo nájdené okno" #: ../finch/plugins/gntclipboard.c:129 msgid "This plugin cannot be loaded because it was not built with X11 support." -msgstr "" +msgstr "Tento modul nebol načítaný, pretože neobsahuje podporu pre X11." #: ../finch/plugins/gntclipboard.c:158 msgid "GntClipboard" @@ -1874,16 +1914,16 @@ msgid "Toaster plugin" msgstr "Modul vysúvaceho okna" -#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120 +#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:123 #, c-format msgid "<b>Conversation with %s on %s:</b><br>" msgstr "<b>Rozhovor s %s, %s:</b><br>" -#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147 +#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:150 msgid "History Plugin Requires Logging" msgstr "Modul História vyžaduje zaznamenávanie" -#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148 +#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:151 msgid "" "Logging can be enabled from Tools -> Preferences -> Logging.\n" "\n" @@ -1899,11 +1939,11 @@ msgid "GntHistory" msgstr "GntHistory" -#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190 +#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:194 msgid "Shows recently logged conversations in new conversations." msgstr "Zobrazuje nedávno zaznamenanú konverzáciu v novom okne konverzácie." -#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191 +#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:195 msgid "" "When a new conversation is opened this plugin will insert the last " "conversation into the current conversation." @@ -1939,7 +1979,7 @@ #: ../libpurple/account.c:992 #, c-format msgid "Enter password for %s (%s)" -msgstr "Zadajte heslo pre %s (%s)" +msgstr "Zadajte heslo používateľa %s (%s)" #: ../libpurple/account.c:999 msgid "Enter Password" @@ -1956,7 +1996,7 @@ msgstr "Chýba modul protokolu pre protokol %s" #: ../libpurple/account.c:1041 ../libpurple/connection.c:108 -#: ../pidgin/gtkblist.c:4036 +#: ../pidgin/gtkblist.c:4318 msgid "Connection Error" msgstr "Chyba pripojenia" @@ -1984,7 +2024,7 @@ #: ../libpurple/account.c:1251 #, c-format msgid "Change password for %s" -msgstr "Zmeniť heslo %s" +msgstr "Zmeniť heslo používateľa %s" #: ../libpurple/account.c:1259 msgid "Please enter your current password and your new password." @@ -2001,16 +2041,16 @@ #: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017 #: ../libpurple/protocols/jabber/buddy.c:782 -#: ../libpurple/protocols/jabber/buddy.c:2027 -#: ../libpurple/protocols/jabber/buddy.c:2044 -#: ../libpurple/protocols/novell/novell.c:2831 +#: ../libpurple/protocols/jabber/buddy.c:2030 +#: ../libpurple/protocols/jabber/buddy.c:2047 +#: ../libpurple/protocols/novell/novell.c:2836 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160 msgid "Unknown" msgstr "Neznáma" -#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320 -#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69 -#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373 +#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321 +#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69 +#: ../libpurple/protocols/myspace/myspace.c:3250 ../pidgin/gtkblist.c:5662 #: ../pidgin/plugins/gevolution/gevo-util.c:67 #: ../pidgin/plugins/gevolution/gevolution.c:96 msgid "Buddies" @@ -2022,13 +2062,13 @@ #: ../libpurple/certificate.c:545 msgid "(DOES NOT MATCH)" -msgstr "" +msgstr "(NEVYHOVUJE)" #. Make messages #: ../libpurple/certificate.c:549 #, c-format msgid "%s has presented the following certificate for just-this-once use:" -msgstr "" +msgstr "%s vytvoril nasledujúci certifikát iba na jedno použitie:" #: ../libpurple/certificate.c:550 #, c-format @@ -2036,41 +2076,41 @@ "Common name: %s %s\n" "Fingerprint (SHA1): %s" msgstr "" +"Bežný názov: %s %s\n" +"Odtlačok (SHA1): %s" #. TODO: Find what the handle ought to be #: ../libpurple/certificate.c:555 msgid "Single-use Certificate Verification" -msgstr "" +msgstr "Overenie certifikátu na jedno použitie" #. Scheme name #. Pool name #: ../libpurple/certificate.c:872 -#, fuzzy msgid "Certificate Authorities" -msgstr "Certifikáty" +msgstr "Autority certifikátov" #. Scheme name #. Pool name #: ../libpurple/certificate.c:1040 msgid "SSL Peers Cache" -msgstr "" +msgstr "Vyrovnávacia pamäť SSL peerov" #. Make messages #: ../libpurple/certificate.c:1171 -#, fuzzy, c-format +#, c-format msgid "Accept certificate for %s?" -msgstr "Prijať pozvanie na chat?" +msgstr "Prijať certifikát pre %s?" #. TODO: Find what the handle ought to be #: ../libpurple/certificate.c:1177 msgid "SSL Certificate Verification" -msgstr "" +msgstr "Overenie SSL certifikátu" #. Number of actions #: ../libpurple/certificate.c:1186 -#, fuzzy msgid "Accept" -msgstr "Použiť" +msgstr "Prijať" #: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214 #: ../libpurple/protocols/qq/group_im.c:144 @@ -2081,9 +2121,8 @@ msgstr "Odmietnuť" #: ../libpurple/certificate.c:1188 -#, fuzzy msgid "_View Certificate..." -msgstr "Certifikáty" +msgstr "_Prezrieť certifikát..." #. Prompt the user to authenticate the certificate #. TODO: Provide the user with more guidance about why he is @@ -2095,6 +2134,9 @@ "The certificate presented by \"%s\" claims to be from \"%s\" instead. This " "could mean that you are not connecting to the service you believe you are." msgstr "" +"Certifikát od používateľa \"%s\" tvrdí, že pochádza od používateľa \"%s\". " +"To môže znamenať, že sa nepripájate na tú službu, na ktorú sa chcete " +"pripojiť. " #. Prompt the user to authenticate the certificate #. vrq will be completed by user_auth @@ -2104,11 +2146,13 @@ "The certificate presented by \"%s\" is self-signed. It cannot be " "automatically checked." msgstr "" +"Certifikát od používateľa \"%s\" je podpísaný samým sebou. Nie je možné ho " +"automaticky overiť." #: ../libpurple/certificate.c:1331 #, c-format msgid "The certificate chain presented for %s is not valid." -msgstr "" +msgstr "Reťaz certifikátu od používateľa %s nie je správna." #. TODO: Make this error either block the ensuing SSL #. connection error until the user dismisses this one, or @@ -2116,14 +2160,12 @@ #. TODO: Probably wrong. #. TODO: Probably wrong #: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416 -#, fuzzy msgid "SSL Certificate Error" -msgstr "Certifikáty" +msgstr "Chyba SSL Certifikátu" #: ../libpurple/certificate.c:1340 -#, fuzzy msgid "Invalid certificate chain" -msgstr "Chybný titulok" +msgstr "Chybná reťaz certifikátu" #. vrq will be completed by user_auth #: ../libpurple/certificate.c:1360 @@ -2131,12 +2173,14 @@ "You have no database of root certificates, so this certificate cannot be " "validated." msgstr "" +"Nemáte databázu koreňových certifikátov, takže tento certifikát nie je možné " +"overiť." #. vrq will be completed by user_auth #: ../libpurple/certificate.c:1382 msgid "" "The root certificate this one claims to be issued by is unknown to Pidgin." -msgstr "" +msgstr "Certifikát, ktorým je tento certifikát vydaný, je pre Pidgin neznámy." #: ../libpurple/certificate.c:1408 #, c-format @@ -2145,10 +2189,12 @@ "signature from the Certificate Authority from which it claims to have a " "signature." msgstr "" +"Reťaz certifikátu od používateľa %s nemá správny digitálny podpis od " +"autority, ktorá je na ňom uvedená." #: ../libpurple/certificate.c:1417 msgid "Invalid certificate authority signature" -msgstr "" +msgstr "Chybný podpis autority" #. Make messages #: ../libpurple/certificate.c:1881 @@ -2161,21 +2207,25 @@ "Activation date: %s\n" "Expiration date: %s\n" msgstr "" +"Bežný názov: %s\n" +"\n" +"Odtlačok (SHA1): %s\n" +"\n" +"Dátum aktivácie: %s\n" +"Dátum vypršania: %s\n" #. TODO: Find what the handle ought to be #: ../libpurple/certificate.c:1890 -#, fuzzy msgid "Certificate Information" -msgstr "Podrobnosti o serveri" +msgstr "Podrobnosti o certifikáte" #: ../libpurple/connection.c:107 msgid "Registration Error" msgstr "Chyba pri registrácii" #: ../libpurple/connection.c:180 -#, fuzzy msgid "Unregistration Error" -msgstr "Chyba pri registrácii" +msgstr "Chyba pri rušení registrácie" #: ../libpurple/connection.c:350 #, c-format @@ -2188,9 +2238,9 @@ msgstr "+++ používateľ %s sa odhlásil" #: ../libpurple/connection.c:497 ../libpurple/plugin.c:282 -#: ../libpurple/protocols/jabber/buddy.c:2337 +#: ../libpurple/protocols/jabber/buddy.c:2340 #: ../libpurple/protocols/msn/servconn.c:141 -#: ../libpurple/protocols/msn/session.c:322 +#: ../libpurple/protocols/msn/session.c:361 msgid "Unknown error" msgstr "Neznáma chyba" @@ -2306,7 +2356,6 @@ "%s" #: ../libpurple/dnsquery.c:578 -#, c-format msgid "EOF while reading from resolver process" msgstr "Počas čítania z procesu resolveru sa vyskytlo EOF" @@ -2415,7 +2464,6 @@ msgstr "Prenos súboru %s bol dokončený" #: ../libpurple/ft.c:685 -#, c-format msgid "File transfer complete" msgstr "Prenos súboru je dokončený" @@ -2425,7 +2473,6 @@ msgstr "Zrušili ste prenos %s" #: ../libpurple/ft.c:1108 -#, c-format msgid "File transfer cancelled" msgstr "Prenos súboru zrušený" @@ -2675,7 +2722,6 @@ msgstr "Používate %s, ale tento modul vyžaduje %s." #: ../libpurple/plugin.c:380 -#, c-format msgid "This plugin has not defined an ID." msgstr "Tento modul nemá definované ID." @@ -2759,13 +2805,13 @@ #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230 #: ../libpurple/protocols/oscar/oscar.c:1453 -#: ../libpurple/protocols/oscar/oscar.c:2233 -#: ../libpurple/protocols/oscar/oscar.c:2282 -#: ../libpurple/protocols/oscar/oscar.c:5886 -#: ../libpurple/protocols/oscar/oscar.c:5941 -#: ../libpurple/protocols/oscar/oscar.c:6167 -#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388 -#: ../libpurple/request.h:1398 +#: ../libpurple/protocols/oscar/oscar.c:2247 +#: ../libpurple/protocols/oscar/oscar.c:2296 +#: ../libpurple/protocols/oscar/oscar.c:5938 +#: ../libpurple/protocols/oscar/oscar.c:5993 +#: ../libpurple/protocols/oscar/oscar.c:6219 +#: ../libpurple/protocols/oscar/oscar.c:6289 ../libpurple/request.h:1388 +#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527 msgid "_Cancel" msgstr "_Zrušiť" @@ -2807,8 +2853,8 @@ "súboru\n" "(len ak neexistuje konverzácia s odosielateľom)" -#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660 -#: ../libpurple/protocols/msn/msn.c:1690 +#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1770 +#: ../libpurple/protocols/msn/msn.c:1800 msgid "Notes" msgstr "Poznámky" @@ -3246,9 +3292,9 @@ msgstr "Sledovanie môžete pridať/odstrániť v dialógu „Sledovanie priateľov“" #: ../libpurple/plugins/offlinemsg.c:165 -#: ../libpurple/protocols/msn/dialog.c:133 -#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560 -#: ../libpurple/protocols/novell/novell.c:1917 +#: ../libpurple/protocols/msn/dialog.c:141 +#: ../libpurple/protocols/msn/msn.c:622 +#: ../libpurple/protocols/novell/novell.c:1919 #: ../libpurple/protocols/silc/buddy.c:317 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304 #: ../libpurple/protocols/silc10/buddy.c:314 @@ -3258,9 +3304,9 @@ msgstr "Áno" #: ../libpurple/plugins/offlinemsg.c:166 -#: ../libpurple/protocols/msn/dialog.c:134 -#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560 -#: ../libpurple/protocols/novell/novell.c:1918 +#: ../libpurple/protocols/msn/dialog.c:142 +#: ../libpurple/protocols/msn/msn.c:622 +#: ../libpurple/protocols/novell/novell.c:1920 #: ../libpurple/protocols/silc/buddy.c:318 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305 #: ../libpurple/protocols/silc10/buddy.c:315 @@ -3369,7 +3415,7 @@ msgstr "Test pre zistenie, či väčšina vecí funguje." #. Scheme name -#: ../libpurple/plugins/ssl/ssl-gnutls.c:902 +#: ../libpurple/plugins/ssl/ssl-gnutls.c:911 #: ../libpurple/plugins/ssl/ssl-nss.c:725 msgid "X.509 Certificates" msgstr "X.509 certifikáty" @@ -3380,7 +3426,7 @@ #. *< dependencies #. *< priority #. *< id -#: ../libpurple/plugins/ssl/ssl-gnutls.c:986 +#: ../libpurple/plugins/ssl/ssl-gnutls.c:995 msgid "GNUTLS" msgstr "GNUTLS" @@ -3388,8 +3434,8 @@ #. *< version #. * summary #. * description -#: ../libpurple/plugins/ssl/ssl-gnutls.c:989 -#: ../libpurple/plugins/ssl/ssl-gnutls.c:991 +#: ../libpurple/plugins/ssl/ssl-gnutls.c:998 +#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000 msgid "Provides SSL support through GNUTLS." msgstr "Poskytuje podporu SSL pomocou GNUTLS." @@ -3494,15 +3540,15 @@ "Upozorní v okne konverzácie, keď priateľ je alebo prestane byť neprítomný " "alebo nečinný." -#: ../libpurple/plugins/tcl/tcl.c:421 +#: ../libpurple/plugins/tcl/tcl.c:423 msgid "Tcl Plugin Loader" msgstr "Načítač Tcl modulov" -#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424 +#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426 msgid "Provides support for loading Tcl plugins" msgstr "Umožňuje spúšťať Tcl moduly." -#: ../libpurple/plugins/tcl/tcl.c:507 +#: ../libpurple/plugins/tcl/tcl.c:509 msgid "" "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, " "install ActiveTCL from http://www.activestate.com\n" @@ -3539,7 +3585,7 @@ #: ../libpurple/protocols/jabber/buddy.c:295 #: ../libpurple/protocols/jabber/buddy.c:1325 #: ../libpurple/protocols/jabber/buddy.c:1335 -#: ../libpurple/protocols/jabber/buddy.c:2216 +#: ../libpurple/protocols/jabber/buddy.c:2219 #: ../libpurple/protocols/silc/ops.c:1041 #: ../libpurple/protocols/silc/util.c:555 #: ../libpurple/protocols/silc10/ops.c:1075 @@ -3720,8 +3766,8 @@ #: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054 #: ../libpurple/protocols/gg/gg.c:1126 #: ../libpurple/protocols/jabber/jabber.c:957 -#: ../libpurple/protocols/oscar/oscar.c:3789 -#: ../libpurple/protocols/oscar/oscar.c:3802 +#: ../libpurple/protocols/oscar/oscar.c:3803 +#: ../libpurple/protocols/oscar/oscar.c:3816 #: ../libpurple/protocols/qq/buddy_info.c:49 msgid "City" msgstr "Mesto" @@ -3730,9 +3776,9 @@ msgid "Year of birth" msgstr "Rok narodenia" -#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589 -#: ../libpurple/protocols/myspace/user.c:115 -#: ../libpurple/protocols/oscar/oscar.c:3732 +#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1699 +#: ../libpurple/protocols/myspace/user.c:117 +#: ../libpurple/protocols/oscar/oscar.c:3746 #: ../libpurple/protocols/qq/buddy_info.c:46 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236 @@ -3745,14 +3791,14 @@ msgstr "Muž alebo žena" #: ../libpurple/protocols/gg/gg.c:652 -#: ../libpurple/protocols/oscar/oscar.c:3732 +#: ../libpurple/protocols/oscar/oscar.c:3746 #: ../libpurple/protocols/qq/buddy_info.c:83 #: ../libpurple/protocols/qq/qq.c:226 msgid "Male" msgstr "Muž" #: ../libpurple/protocols/gg/gg.c:653 -#: ../libpurple/protocols/oscar/oscar.c:3732 +#: ../libpurple/protocols/oscar/oscar.c:3746 #: ../libpurple/protocols/qq/buddy_info.c:84 #: ../libpurple/protocols/qq/qq.c:229 msgid "Female" @@ -3812,25 +3858,25 @@ msgstr "Pridať na chat..." #: ../libpurple/protocols/gg/gg.c:1008 -#: ../libpurple/protocols/jabber/buddy.c:2031 -#: ../libpurple/protocols/novell/novell.c:2828 +#: ../libpurple/protocols/jabber/buddy.c:2034 +#: ../libpurple/protocols/novell/novell.c:2833 #: ../libpurple/protocols/oscar/oscar.c:828 -#: ../libpurple/protocols/oscar/oscar.c:5604 +#: ../libpurple/protocols/oscar/oscar.c:5656 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177 #: ../libpurple/protocols/qq/qq.c:292 -#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154 -#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436 +#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:154 +#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061 msgid "Offline" msgstr "Odpojený" #: ../libpurple/protocols/gg/gg.c:1011 -#: ../libpurple/protocols/jabber/buddy.c:2033 +#: ../libpurple/protocols/jabber/buddy.c:2036 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38 -#: ../libpurple/protocols/novell/novell.c:2816 +#: ../libpurple/protocols/novell/novell.c:2821 #: ../libpurple/protocols/qq/qq.c:280 -#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155 +#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:155 #: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057 msgid "Available" msgstr "Pripojený" @@ -3840,32 +3886,31 @@ #. Away stuff #: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528 #: ../libpurple/protocols/irc/msgs.c:310 -#: ../libpurple/protocols/jabber/buddy.c:2037 -#: ../libpurple/protocols/novell/novell.c:2819 +#: ../libpurple/protocols/jabber/buddy.c:2040 +#: ../libpurple/protocols/novell/novell.c:2824 #: ../libpurple/protocols/oscar/oscar.c:733 -#: ../libpurple/protocols/oscar/oscar.c:4547 -#: ../libpurple/protocols/oscar/oscar.c:5632 +#: ../libpurple/protocols/oscar/oscar.c:4561 +#: ../libpurple/protocols/oscar/oscar.c:5684 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284 #: ../libpurple/protocols/silc/buddy.c:1476 #: ../libpurple/protocols/silc10/buddy.c:1476 -#: ../libpurple/protocols/yahoo/yahoo.c:3653 -#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158 -#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939 +#: ../libpurple/protocols/yahoo/yahoo.c:3655 +#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:158 +#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1941 #: ../pidgin/gtkstatusbox.c:1058 -#, c-format msgid "Away" msgstr "Neprítomný" #: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117 -#: ../libpurple/protocols/oscar/oscar.c:2699 -#: ../libpurple/protocols/oscar/oscar.c:3699 +#: ../libpurple/protocols/oscar/oscar.c:2713 +#: ../libpurple/protocols/oscar/oscar.c:3713 msgid "UIN" msgstr "UIN" #: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120 -#: ../libpurple/protocols/jabber/buddy.c:2210 -#: ../libpurple/protocols/jabber/buddy.c:2386 -#: ../libpurple/protocols/oscar/oscar.c:3710 +#: ../libpurple/protocols/jabber/buddy.c:2213 +#: ../libpurple/protocols/jabber/buddy.c:2389 +#: ../libpurple/protocols/oscar/oscar.c:3724 #: ../libpurple/protocols/silc/ops.c:990 #: ../libpurple/protocols/silc10/ops.c:1024 msgid "First Name" @@ -3876,7 +3921,7 @@ msgstr "Rok narodenia" #: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180 -#: ../libpurple/protocols/oscar/oscar.c:3911 +#: ../libpurple/protocols/oscar/oscar.c:3925 msgid "Unable to display the search results." msgstr "Nebolo možné zobraziť výsledky vyhľadávania." @@ -3920,7 +3965,7 @@ msgid "Connection failed." msgstr "Pripojenie zlyhalo" -#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559 +#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:621 msgid "Blocked" msgstr "Blokovaný" @@ -4058,7 +4103,7 @@ #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637 -#: ../libpurple/protocols/myspace/myspace.c:2356 +#: ../libpurple/protocols/myspace/myspace.c:2361 msgid "Server has disconnected" msgstr "Server bol odpojený" @@ -4084,14 +4129,14 @@ #. connect to the server #: ../libpurple/protocols/irc/irc.c:319 #: ../libpurple/protocols/jabber/jabber.c:1280 -#: ../libpurple/protocols/msn/session.c:345 -#: ../libpurple/protocols/myspace/myspace.c:301 -#: ../libpurple/protocols/novell/novell.c:2182 +#: ../libpurple/protocols/msn/session.c:384 +#: ../libpurple/protocols/myspace/myspace.c:302 +#: ../libpurple/protocols/novell/novell.c:2187 #: ../libpurple/protocols/oscar/oscar.c:1287 #: ../libpurple/protocols/qq/qq.c:136 #: ../libpurple/protocols/sametime/sametime.c:3723 -#: ../libpurple/protocols/simple/simple.c:1716 -#: ../libpurple/protocols/yahoo/yahoo.c:2939 +#: ../libpurple/protocols/simple/simple.c:1718 +#: ../libpurple/protocols/yahoo/yahoo.c:2941 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662 msgid "Connecting" msgstr "Pripája sa" @@ -4105,20 +4150,20 @@ #. TODO: try other ports if in auto mode, then save #. * working port and try that first next time. #: ../libpurple/protocols/irc/irc.c:338 -#: ../libpurple/protocols/myspace/myspace.c:317 +#: ../libpurple/protocols/myspace/myspace.c:318 #: ../libpurple/protocols/simple/simple.c:464 -#: ../libpurple/protocols/simple/simple.c:1631 +#: ../libpurple/protocols/simple/simple.c:1633 msgid "Couldn't create socket" msgstr "Nepodarilo sa vytvoriť socket" #: ../libpurple/protocols/irc/irc.c:421 -#: ../libpurple/protocols/myspace/myspace.c:2469 +#: ../libpurple/protocols/myspace/myspace.c:2474 #: ../libpurple/protocols/oscar/oscar.c:1283 msgid "Couldn't connect to host" msgstr "Nepodarilo sa pripojiť ku hostiteľovi" #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634 -#: ../libpurple/protocols/myspace/myspace.c:2352 +#: ../libpurple/protocols/myspace/myspace.c:2357 msgid "Read error" msgstr "Chyba čítania" @@ -4158,22 +4203,22 @@ #. host to connect to #: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323 -#: ../libpurple/protocols/msn/msn.c:2185 -#: ../libpurple/protocols/oscar/oscar.c:6671 +#: ../libpurple/protocols/msn/msn.c:2297 +#: ../libpurple/protocols/oscar/oscar.c:6723 #: ../libpurple/protocols/qq/qq.c:755 #: ../libpurple/protocols/sametime/sametime.c:5727 #: ../libpurple/protocols/silc/ops.c:1249 #: ../libpurple/protocols/silc/ops.c:1341 #: ../libpurple/protocols/silc10/ops.c:1244 #: ../libpurple/protocols/silc10/ops.c:1347 -#: ../libpurple/protocols/simple/simple.c:1896 +#: ../libpurple/protocols/simple/simple.c:1898 #: ../libpurple/protocols/toc/toc.c:2327 msgid "Server" msgstr "Server" #. port to connect to -#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190 -#: ../libpurple/protocols/oscar/oscar.c:6674 +#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2302 +#: ../libpurple/protocols/oscar/oscar.c:6726 #: ../libpurple/protocols/qq/qq.c:758 #: ../libpurple/protocols/sametime/sametime.c:5732 #: ../libpurple/protocols/silc/silc.c:1918 @@ -4245,7 +4290,7 @@ msgstr " <i>(identifikovaný)</i>" #: ../libpurple/protocols/irc/msgs.c:303 -#: ../libpurple/protocols/oscar/oscar.c:3700 +#: ../libpurple/protocols/oscar/oscar.c:3714 #: ../libpurple/protocols/silc/ops.c:1418 #: ../libpurple/protocols/silc10/ops.c:1414 msgid "Nick" @@ -4344,79 +4389,79 @@ msgid "Invitation only" msgstr "Len pre pozvaných" -#: ../libpurple/protocols/irc/msgs.c:795 +#: ../libpurple/protocols/irc/msgs.c:798 #, c-format msgid "You have been kicked by %s: (%s)" msgstr "Používateľ %s vás vykopol: (%s)" #. Remove user from channel -#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699 +#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699 #: ../libpurple/protocols/silc10/ops.c:720 #, c-format msgid "Kicked by %s (%s)" msgstr "Vykopnutý používateľom %s (%s)" -#: ../libpurple/protocols/irc/msgs.c:823 +#: ../libpurple/protocols/irc/msgs.c:826 #, c-format msgid "mode (%s %s) by %s" msgstr "režim (%s %s) od %s" -#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909 +#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912 msgid "Invalid nickname" msgstr "Neplatná prezývka" -#: ../libpurple/protocols/irc/msgs.c:910 +#: ../libpurple/protocols/irc/msgs.c:913 msgid "" "Your selected nickname was rejected by the server. It probably contains " "invalid characters." msgstr "" "Server neuznal vami vybranú prezývku. Zrejme obsahuje nedovolené znaky." -#: ../libpurple/protocols/irc/msgs.c:915 +#: ../libpurple/protocols/irc/msgs.c:918 msgid "" "Your selected account name was rejected by the server. It probably contains " "invalid characters." msgstr "" "Server neuznal vami vybraný názov účtu. Zrejme obsahuje nedovolené znaky." -#: ../libpurple/protocols/irc/msgs.c:954 +#: ../libpurple/protocols/irc/msgs.c:957 msgid "Cannot change nick" msgstr "Nepodarilo sa zmeniť prezývku" -#: ../libpurple/protocols/irc/msgs.c:954 +#: ../libpurple/protocols/irc/msgs.c:957 msgid "Could not change nick" msgstr "Nebolo možné zmeniť prezývku" -#: ../libpurple/protocols/irc/msgs.c:975 +#: ../libpurple/protocols/irc/msgs.c:978 #, c-format msgid "You have parted the channel%s%s" msgstr "Opustili ste kanál %s%s" -#: ../libpurple/protocols/irc/msgs.c:1017 +#: ../libpurple/protocols/irc/msgs.c:1020 msgid "Error: invalid PONG from server" msgstr "Chyba: neplatný PONG od servera" -#: ../libpurple/protocols/irc/msgs.c:1019 +#: ../libpurple/protocols/irc/msgs.c:1022 #, c-format msgid "PING reply -- Lag: %lu seconds" msgstr "Odpoveď na PING -- Oneskorenie: %lu sekúnd" -#: ../libpurple/protocols/irc/msgs.c:1110 +#: ../libpurple/protocols/irc/msgs.c:1113 #, c-format msgid "Cannot join %s: Registration is required." msgstr "Nedá sa pripojiť do %s: Je potrebné sa zaregistrovať." -#: ../libpurple/protocols/irc/msgs.c:1111 +#: ../libpurple/protocols/irc/msgs.c:1114 #: ../libpurple/protocols/silc/ops.c:1093 #: ../libpurple/protocols/silc10/ops.c:1128 msgid "Cannot join channel" msgstr "Nepodarilo sa pripojiť na kanál" -#: ../libpurple/protocols/irc/msgs.c:1145 +#: ../libpurple/protocols/irc/msgs.c:1148 msgid "Nick or channel is temporarily unavailable." msgstr "Prezývka alebo kanál je dočasne nedostupný." -#: ../libpurple/protocols/irc/msgs.c:1157 +#: ../libpurple/protocols/irc/msgs.c:1160 #, c-format msgid "Wallops from %s" msgstr "Operátori %s" @@ -4528,7 +4573,7 @@ "names [kanál]: Zobrazí názvy používateľov nachádzajúcich sa na kanáli." #: ../libpurple/protocols/irc/parse.c:137 -#: ../libpurple/protocols/jabber/jabber.c:2261 +#: ../libpurple/protocols/jabber/jabber.c:2299 msgid "nick <new nickname>: Change your nickname." msgstr "nick <nová prezývka>: Zmení vašu prezývku." @@ -4667,14 +4712,12 @@ #: ../libpurple/protocols/jabber/adhoccommands.c:139 #: ../libpurple/protocols/jabber/adhoccommands.c:140 -#, fuzzy msgid "Ad-Hoc Command Failed" -msgstr "príkaz blocklist zlyhal" - -#: ../libpurple/protocols/jabber/adhoccommands.c:173 -#, fuzzy +msgstr "príkaz Ad-Hoc zlyhal" + +#: ../libpurple/protocols/jabber/adhoccommands.c:176 msgid "execute" -msgstr "Neočakávané" +msgstr "vykonať" #: ../libpurple/protocols/jabber/auth.c:53 msgid "Server requires TLS/SSL for login. No TLS/SSL support found." @@ -4819,15 +4862,15 @@ #: ../libpurple/protocols/jabber/buddy.c:300 #: ../libpurple/protocols/jabber/buddy.c:1250 -#: ../libpurple/protocols/msn/msn.c:1658 -#: ../libpurple/protocols/oscar/oscar.c:3749 +#: ../libpurple/protocols/msn/msn.c:1768 +#: ../libpurple/protocols/oscar/oscar.c:3763 msgid "Birthday" msgstr "Dátum narodenia" #: ../libpurple/protocols/jabber/buddy.c:301 #: ../libpurple/protocols/jabber/buddy.c:1365 #: ../libpurple/protocols/jabber/chat.c:775 -#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116 +#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3314 #: ../pidgin/gtkprefs.c:739 msgid "Description" msgstr "Popis" @@ -4858,104 +4901,92 @@ #: ../libpurple/protocols/jabber/buddy.c:815 #: ../libpurple/protocols/jabber/buddy.c:975 msgid "Last Activity" -msgstr "" +msgstr "Posledná aktivita" #: ../libpurple/protocols/jabber/buddy.c:817 #: ../libpurple/protocols/jabber/buddy.c:977 -#, fuzzy msgid "Service Discovery Info" -msgstr "Nastaviť informácie o priečinku" +msgstr "Prieskum služieb" #: ../libpurple/protocols/jabber/buddy.c:819 #: ../libpurple/protocols/jabber/buddy.c:979 msgid "Service Discovery Items" -msgstr "" +msgstr "Položky prieskumu služieb" #: ../libpurple/protocols/jabber/buddy.c:821 #: ../libpurple/protocols/jabber/buddy.c:981 -#, fuzzy msgid "Extended Stanza Addressing" -msgstr "Rozšírená adresa" +msgstr "Rozšírené adresovanie slôh" #: ../libpurple/protocols/jabber/buddy.c:823 #: ../libpurple/protocols/jabber/buddy.c:983 -#, fuzzy msgid "Multi-User Chat" -msgstr "Prezývka pre chat" +msgstr "Skupinový chat" #: ../libpurple/protocols/jabber/buddy.c:825 #: ../libpurple/protocols/jabber/buddy.c:985 -#, fuzzy msgid "Multi-User Chat Extended Presence Information" -msgstr "Používateľ nemá žiadne podrobnosti v adresári." +msgstr "Rozšírené informácie o prítomnosti v skupinovom chate." #: ../libpurple/protocols/jabber/buddy.c:827 #: ../libpurple/protocols/jabber/buddy.c:987 msgid "In-Band Bytestreams" -msgstr "" +msgstr "In-Band Bajtstreamy" #: ../libpurple/protocols/jabber/buddy.c:829 #: ../libpurple/protocols/jabber/buddy.c:989 -#, fuzzy msgid "Ad-Hoc Commands" -msgstr "Príkaz" +msgstr "Príkaz Ad-Hoc" #: ../libpurple/protocols/jabber/buddy.c:831 #: ../libpurple/protocols/jabber/buddy.c:991 msgid "PubSub Service" -msgstr "" +msgstr "PubSub služba" #: ../libpurple/protocols/jabber/buddy.c:833 #: ../libpurple/protocols/jabber/buddy.c:993 msgid "SOCKS5 Bytestreams" -msgstr "" +msgstr "SOCKS5 Bajtstreamy" #: ../libpurple/protocols/jabber/buddy.c:835 #: ../libpurple/protocols/jabber/buddy.c:995 msgid "Out of Band Data" -msgstr "" +msgstr "Mimo skupinových dát" #: ../libpurple/protocols/jabber/buddy.c:837 #: ../libpurple/protocols/jabber/buddy.c:997 -#, fuzzy msgid "XHTML-IM" -msgstr "HTML" +msgstr "XHTML-IM" #: ../libpurple/protocols/jabber/buddy.c:839 #: ../libpurple/protocols/jabber/buddy.c:999 -#, fuzzy msgid "In-Band Registration" -msgstr "Chyba pri registrácii" +msgstr "In-Band Registrácia" #: ../libpurple/protocols/jabber/buddy.c:841 #: ../libpurple/protocols/jabber/buddy.c:1001 -#, fuzzy msgid "User Location" msgstr "Lokalita" #: ../libpurple/protocols/jabber/buddy.c:843 #: ../libpurple/protocols/jabber/buddy.c:1003 -#, fuzzy msgid "User Avatar" -msgstr "Hľadanie používateľov" +msgstr "Avatar používateľa" #: ../libpurple/protocols/jabber/buddy.c:845 #: ../libpurple/protocols/jabber/buddy.c:1005 -#, fuzzy msgid "Chat State Notifications" -msgstr "Upozornenie na stav priateľa" +msgstr "Upozornenie na stav v chate" #: ../libpurple/protocols/jabber/buddy.c:847 #: ../libpurple/protocols/jabber/buddy.c:1007 -#, fuzzy msgid "Software Version" -msgstr "Nepodporovaná verzia" +msgstr "Verzia softvéru" #: ../libpurple/protocols/jabber/buddy.c:849 #: ../libpurple/protocols/jabber/buddy.c:1009 -#, fuzzy msgid "Stream Initiation" -msgstr "Orientácia" +msgstr "Iniciácia streamu" #: ../libpurple/protocols/jabber/buddy.c:851 #: ../libpurple/protocols/jabber/buddy.c:1011 @@ -4965,129 +4996,113 @@ #: ../libpurple/protocols/jabber/buddy.c:853 #: ../libpurple/protocols/jabber/buddy.c:1013 -#, fuzzy msgid "User Mood" -msgstr "Režimy používateľa" +msgstr "Nálada používateľa" #: ../libpurple/protocols/jabber/buddy.c:855 #: ../libpurple/protocols/jabber/buddy.c:1015 -#, fuzzy msgid "User Activity" -msgstr "Limit používateľov" +msgstr "Aktivita používateľa" #: ../libpurple/protocols/jabber/buddy.c:857 #: ../libpurple/protocols/jabber/buddy.c:1017 -#, fuzzy msgid "Entity Capabilities" msgstr "Schopnosti" #: ../libpurple/protocols/jabber/buddy.c:859 #: ../libpurple/protocols/jabber/buddy.c:1019 msgid "Encrypted Session Negotiations" -msgstr "" +msgstr "Požadovanie šifrovaného spojenia" #: ../libpurple/protocols/jabber/buddy.c:861 #: ../libpurple/protocols/jabber/buddy.c:1021 -#, fuzzy msgid "User Tune" -msgstr "Prihlasovacie meno" +msgstr "Používateľ Tune" #: ../libpurple/protocols/jabber/buddy.c:863 #: ../libpurple/protocols/jabber/buddy.c:1023 -#, fuzzy msgid "Roster Item Exchange" -msgstr "IM s výmenou kľúčov" +msgstr "Výmena kontaktov" #: ../libpurple/protocols/jabber/buddy.c:865 #: ../libpurple/protocols/jabber/buddy.c:1025 -#, fuzzy msgid "Reachability Address" -msgstr "E-mailová adresa" +msgstr "Dostupná adresa" #: ../libpurple/protocols/jabber/buddy.c:867 #: ../libpurple/protocols/jabber/buddy.c:1027 -#, fuzzy msgid "User Profile" -msgstr "Profil" +msgstr "Profil používateľa" #: ../libpurple/protocols/jabber/buddy.c:869 #: ../libpurple/protocols/jabber/buddy.c:1029 -#, fuzzy msgid "Jingle" -msgstr "Pripojiť" +msgstr "Jingle" #: ../libpurple/protocols/jabber/buddy.c:871 #: ../libpurple/protocols/jabber/buddy.c:1031 msgid "Jingle Audio" -msgstr "" +msgstr "Zvuk Jingle" #: ../libpurple/protocols/jabber/buddy.c:873 #: ../libpurple/protocols/jabber/buddy.c:1033 -#, fuzzy msgid "User Nickname" -msgstr "Meno používateľa" +msgstr "Prezývka používateľa" #: ../libpurple/protocols/jabber/buddy.c:875 #: ../libpurple/protocols/jabber/buddy.c:1035 msgid "Jingle ICE UDP" -msgstr "" +msgstr "Jingle ICE UDP" #: ../libpurple/protocols/jabber/buddy.c:877 #: ../libpurple/protocols/jabber/buddy.c:1037 msgid "Jingle ICE TCP" -msgstr "" +msgstr "Jingle ICE UDP" #: ../libpurple/protocols/jabber/buddy.c:879 #: ../libpurple/protocols/jabber/buddy.c:1039 msgid "Jingle Raw UDP" -msgstr "" +msgstr "Jingle ICE UDP" #: ../libpurple/protocols/jabber/buddy.c:881 #: ../libpurple/protocols/jabber/buddy.c:1041 -#, fuzzy msgid "Jingle Video" -msgstr "Živé video" +msgstr "Jingle Video" #: ../libpurple/protocols/jabber/buddy.c:883 #: ../libpurple/protocols/jabber/buddy.c:1043 msgid "Jingle DTMF" -msgstr "" +msgstr "Jingle DTMF" #: ../libpurple/protocols/jabber/buddy.c:885 #: ../libpurple/protocols/jabber/buddy.c:1045 -#, fuzzy msgid "Message Receipts" -msgstr "Prijatá správa" +msgstr "Príjem správ" #: ../libpurple/protocols/jabber/buddy.c:887 #: ../libpurple/protocols/jabber/buddy.c:1047 -#, fuzzy msgid "Public Key Publishing" -msgstr "Babbleprint verejného kľúča" +msgstr "Zverejnenie verejného kľúča" #: ../libpurple/protocols/jabber/buddy.c:889 #: ../libpurple/protocols/jabber/buddy.c:1049 -#, fuzzy msgid "User Chatting" -msgstr "Možnosti používateľa" +msgstr "Používateľ chatuje" #: ../libpurple/protocols/jabber/buddy.c:891 #: ../libpurple/protocols/jabber/buddy.c:1051 -#, fuzzy msgid "User Browsing" -msgstr "Režimy používateľa" +msgstr "Používateľ surfuje" #: ../libpurple/protocols/jabber/buddy.c:893 #: ../libpurple/protocols/jabber/buddy.c:1053 -#, fuzzy msgid "User Gaming" -msgstr "Meno používateľa" +msgstr "Používateľ hrá" #: ../libpurple/protocols/jabber/buddy.c:895 #: ../libpurple/protocols/jabber/buddy.c:1055 -#, fuzzy msgid "User Viewing" -msgstr "Limit používateľov" +msgstr "Používateľ prezerá" #: ../libpurple/protocols/jabber/buddy.c:897 #: ../libpurple/protocols/jabber/buddy.c:1057 @@ -5100,48 +5115,47 @@ #: ../libpurple/protocols/jabber/buddy.c:899 #: ../libpurple/protocols/jabber/buddy.c:1059 -#, fuzzy msgid "Stanza Encryption" -msgstr "Šifrovanie Trillian" +msgstr "Šifrovanie slôh" #: ../libpurple/protocols/jabber/buddy.c:901 #: ../libpurple/protocols/jabber/buddy.c:1061 msgid "Entity Time" -msgstr "" +msgstr "Čas entity" #: ../libpurple/protocols/jabber/buddy.c:903 #: ../libpurple/protocols/jabber/buddy.c:1063 msgid "Delayed Delivery" -msgstr "" +msgstr "Odložené doručenie" #: ../libpurple/protocols/jabber/buddy.c:905 #: ../libpurple/protocols/jabber/buddy.c:1065 msgid "Collaborative Data Objects" -msgstr "" +msgstr "Spolupracujúce dátové objekty" #: ../libpurple/protocols/jabber/buddy.c:907 #: ../libpurple/protocols/jabber/buddy.c:1067 msgid "File Repository and Sharing" -msgstr "" +msgstr "Ukladanie a zdieľanie súborov" #: ../libpurple/protocols/jabber/buddy.c:909 #: ../libpurple/protocols/jabber/buddy.c:1069 msgid "STUN Service Discovery for Jingle" -msgstr "" +msgstr "Objavenie STUN služieb pre Jingle" #: ../libpurple/protocols/jabber/buddy.c:911 #: ../libpurple/protocols/jabber/buddy.c:1071 msgid "Simplified Encrypted Session Negotiation" -msgstr "" +msgstr "Požadovanie zjednodušeného šiforvaného spojenia" #: ../libpurple/protocols/jabber/buddy.c:913 #: ../libpurple/protocols/jabber/buddy.c:1073 msgid "Hop Check" -msgstr "" +msgstr "Kontrola skoku" #: ../libpurple/protocols/jabber/buddy.c:921 #: ../libpurple/protocols/jabber/buddy.c:1081 -#: ../libpurple/protocols/oscar/oscar.c:2906 +#: ../libpurple/protocols/oscar/oscar.c:2920 msgid "Capabilities" msgstr "Schopnosti" @@ -5168,8 +5182,8 @@ #: ../libpurple/protocols/jabber/buddy.c:1270 #: ../libpurple/protocols/jabber/jabber.c:952 -#: ../libpurple/protocols/oscar/oscar.c:3788 -#: ../libpurple/protocols/oscar/oscar.c:3801 +#: ../libpurple/protocols/oscar/oscar.c:3802 +#: ../libpurple/protocols/oscar/oscar.c:3815 #: ../libpurple/protocols/qq/buddy_info.c:56 #: ../libpurple/protocols/silc/ops.c:1030 #: ../libpurple/protocols/silc10/ops.c:1064 @@ -5178,7 +5192,7 @@ #: ../libpurple/protocols/jabber/buddy.c:1276 msgid "P.O. Box" -msgstr "P.O. Box" +msgstr "P.O.Box" #: ../libpurple/protocols/jabber/buddy.c:1386 msgid "Photo" @@ -5188,74 +5202,71 @@ msgid "Logo" msgstr "Logo" -#: ../libpurple/protocols/jabber/buddy.c:1942 +#: ../libpurple/protocols/jabber/buddy.c:1945 msgid "Un-hide From" msgstr "Zviditeľniť pred" -#: ../libpurple/protocols/jabber/buddy.c:1946 +#: ../libpurple/protocols/jabber/buddy.c:1949 msgid "Temporarily Hide From" msgstr "Dočasne skryť pred" #. && NOT ME -#: ../libpurple/protocols/jabber/buddy.c:1954 +#: ../libpurple/protocols/jabber/buddy.c:1957 msgid "Cancel Presence Notification" msgstr "Zrušiť upozornenie prítomnosti" -#: ../libpurple/protocols/jabber/buddy.c:1961 +#: ../libpurple/protocols/jabber/buddy.c:1964 msgid "(Re-)Request authorization" msgstr "Znovu požiadať o autorizáciu" #. if(NOT ME) #. shouldn't this just happen automatically when the buddy is #. removed? -#: ../libpurple/protocols/jabber/buddy.c:1970 +#: ../libpurple/protocols/jabber/buddy.c:1973 msgid "Unsubscribe" msgstr "Odhlásiť sa" -#: ../libpurple/protocols/jabber/buddy.c:1985 -#, fuzzy +#: ../libpurple/protocols/jabber/buddy.c:1988 msgid "Log In" -msgstr "Prihlásený" - -#: ../libpurple/protocols/jabber/buddy.c:1989 -#, fuzzy +msgstr "Prihlásiť" + +#: ../libpurple/protocols/jabber/buddy.c:1992 msgid "Log Out" -msgstr "Ukladať rozhovory" - -#: ../libpurple/protocols/jabber/buddy.c:2035 +msgstr "Odhlásiť" + +#: ../libpurple/protocols/jabber/buddy.c:2038 #: ../libpurple/protocols/jabber/jabber.c:1553 msgid "Chatty" msgstr "Chatty" -#: ../libpurple/protocols/jabber/buddy.c:2039 +#: ../libpurple/protocols/jabber/buddy.c:2042 msgid "Extended Away" msgstr "Dlhšie neprítomný" -#: ../libpurple/protocols/jabber/buddy.c:2041 +#: ../libpurple/protocols/jabber/buddy.c:2044 #: ../libpurple/protocols/jabber/jabber.c:1622 #: ../libpurple/protocols/oscar/oscar.c:727 -#: ../libpurple/protocols/oscar/oscar.c:5808 +#: ../libpurple/protocols/oscar/oscar.c:5860 #: ../libpurple/protocols/sametime/sametime.c:3297 -#, c-format msgid "Do Not Disturb" msgstr "Nerušiť" -#: ../libpurple/protocols/jabber/buddy.c:2208 +#: ../libpurple/protocols/jabber/buddy.c:2211 msgid "JID" msgstr "JID" -#: ../libpurple/protocols/jabber/buddy.c:2212 -#: ../libpurple/protocols/jabber/buddy.c:2391 -#: ../libpurple/protocols/oscar/oscar.c:3711 +#: ../libpurple/protocols/jabber/buddy.c:2215 +#: ../libpurple/protocols/jabber/buddy.c:2394 +#: ../libpurple/protocols/oscar/oscar.c:3725 msgid "Last Name" msgstr "Priezvisko" -#: ../libpurple/protocols/jabber/buddy.c:2244 +#: ../libpurple/protocols/jabber/buddy.c:2247 msgid "The following are the results of your search" msgstr "Nižšie sú výsledky vášho vyhľadávania" #. current comment from Jabber User Directory users.jabber.org -#: ../libpurple/protocols/jabber/buddy.c:2319 +#: ../libpurple/protocols/jabber/buddy.c:2322 msgid "" "Find a contact by entering the search criteria in the given fields. Note: " "Each field supports wild card searches (%)" @@ -5263,40 +5274,40 @@ "Nájdite kontakt zadávaním vyhľadávaích kritérií v daných poliach. Poznámka: " "Každé pole podporuje hľadanie pomocou nahradzajúcich znakov (%)" -#: ../libpurple/protocols/jabber/buddy.c:2339 +#: ../libpurple/protocols/jabber/buddy.c:2342 msgid "Directory Query Failed" msgstr "Požiadavka na priečinok zlyhala" -#: ../libpurple/protocols/jabber/buddy.c:2340 +#: ../libpurple/protocols/jabber/buddy.c:2343 msgid "Could not query the directory server." msgstr "Nedá sa poslať požiadavka na priečinkový server." #. Try to translate the message (see static message #. list in jabber_user_dir_comments[]) -#: ../libpurple/protocols/jabber/buddy.c:2374 +#: ../libpurple/protocols/jabber/buddy.c:2377 #, c-format msgid "Server Instructions: %s" msgstr "Inštrukcie servera: %s" -#: ../libpurple/protocols/jabber/buddy.c:2381 +#: ../libpurple/protocols/jabber/buddy.c:2384 msgid "Fill in one or more fields to search for any matching XMPP users." msgstr "" "Vyplňte jedno alebo viac políčok na hľadanie vyhovujúcich XMPP používateľov." -#: ../libpurple/protocols/jabber/buddy.c:2401 -#: ../libpurple/protocols/novell/novell.c:1488 -#: ../libpurple/protocols/oscar/oscar.c:3714 -#: ../libpurple/protocols/oscar/oscar.c:3723 +#: ../libpurple/protocols/jabber/buddy.c:2404 +#: ../libpurple/protocols/novell/novell.c:1490 +#: ../libpurple/protocols/oscar/oscar.c:3728 +#: ../libpurple/protocols/oscar/oscar.c:3737 msgid "E-Mail Address" msgstr "E-mailová adresa" -#: ../libpurple/protocols/jabber/buddy.c:2410 -#: ../libpurple/protocols/jabber/buddy.c:2411 +#: ../libpurple/protocols/jabber/buddy.c:2413 +#: ../libpurple/protocols/jabber/buddy.c:2414 msgid "Search for XMPP users" msgstr "Vyhľadávanie používateľov XMPP" #. "Search" -#: ../libpurple/protocols/jabber/buddy.c:2412 +#: ../libpurple/protocols/jabber/buddy.c:2415 #: ../libpurple/protocols/qq/group.c:123 #: ../libpurple/protocols/qq/group_im.c:147 #: ../libpurple/protocols/qq/sys_msg.c:174 @@ -5308,24 +5319,24 @@ msgid "Search" msgstr "Hľadať" -#: ../libpurple/protocols/jabber/buddy.c:2427 +#: ../libpurple/protocols/jabber/buddy.c:2430 msgid "Invalid Directory" msgstr "Neplatný priečinok" -#: ../libpurple/protocols/jabber/buddy.c:2444 +#: ../libpurple/protocols/jabber/buddy.c:2447 msgid "Enter a User Directory" msgstr "Zadajte používateľský priečinok" -#: ../libpurple/protocols/jabber/buddy.c:2445 +#: ../libpurple/protocols/jabber/buddy.c:2448 msgid "Select a user directory to search" msgstr "Vyberte používateľský priečinok pre hľadanie" -#: ../libpurple/protocols/jabber/buddy.c:2448 +#: ../libpurple/protocols/jabber/buddy.c:2451 msgid "Search Directory" msgstr "Prehľadávať priečinok" #: ../libpurple/protocols/jabber/chat.c:41 -#: ../libpurple/protocols/oscar/oscar.c:5294 +#: ../libpurple/protocols/oscar/oscar.c:5344 #: ../libpurple/protocols/yahoo/yahoochat.c:1048 msgid "_Room:" msgstr "_Miestnosť:" @@ -5423,7 +5434,7 @@ #: ../libpurple/protocols/jabber/jabber.c:145 msgid "You require encryption, but it is not available on this server." -msgstr "" +msgstr "Požadovali ste šifrovanie, ale na tomto serveri nie je dostupné." #: ../libpurple/protocols/jabber/jabber.c:259 #: ../libpurple/protocols/jabber/jabber.c:312 @@ -5437,9 +5448,9 @@ msgstr "Chyba čítania" #: ../libpurple/protocols/jabber/jabber.c:482 -#: ../libpurple/protocols/oscar/flap_connection.c:394 -#: ../libpurple/protocols/yahoo/yahoo.c:2558 -#: ../libpurple/protocols/yahoo/yahoo.c:2590 +#: ../libpurple/protocols/oscar/flap_connection.c:396 +#: ../libpurple/protocols/yahoo/yahoo.c:2560 +#: ../libpurple/protocols/yahoo/yahoo.c:2592 #, c-format msgid "" "Could not establish a connection with the server:\n" @@ -5467,9 +5478,9 @@ msgstr "Registrácia %s@%s bola úspešná" #: ../libpurple/protocols/jabber/jabber.c:662 -#, fuzzy, c-format +#, c-format msgid "Registration to %s successful" -msgstr "Registrácia %s@%s bola úspešná" +msgstr "Registrácia na %s bola úspešná" #: ../libpurple/protocols/jabber/jabber.c:664 #: ../libpurple/protocols/jabber/jabber.c:665 @@ -5482,21 +5493,19 @@ msgstr "Registrácia zlyhala" #: ../libpurple/protocols/jabber/jabber.c:692 -#, fuzzy, c-format +#, c-format msgid "Registration from %s successfully removed" -msgstr "Registrácia %s@%s bola úspešná" +msgstr "Registrácia z %s bola úspešne odstránená" #: ../libpurple/protocols/jabber/jabber.c:694 #: ../libpurple/protocols/jabber/jabber.c:695 -#, fuzzy msgid "Unregistration Successful" -msgstr "Registrácia úspešná" +msgstr "Zrušenie registrácie úspešné" #: ../libpurple/protocols/jabber/jabber.c:703 #: ../libpurple/protocols/jabber/jabber.c:704 -#, fuzzy msgid "Unregistration Failed" -msgstr "Registrácia zlyhala" +msgstr "Zrušenie registrácie zlyhalo" #: ../libpurple/protocols/jabber/jabber.c:864 #: ../libpurple/protocols/jabber/jabber.c:865 @@ -5504,8 +5513,8 @@ msgstr "Už zaregistrovaný" #: ../libpurple/protocols/jabber/jabber.c:962 -#: ../libpurple/protocols/oscar/oscar.c:3790 -#: ../libpurple/protocols/oscar/oscar.c:3803 +#: ../libpurple/protocols/oscar/oscar.c:3804 +#: ../libpurple/protocols/oscar/oscar.c:3817 msgid "State" msgstr "Štát" @@ -5528,22 +5537,19 @@ msgstr "Dátum" #: ../libpurple/protocols/jabber/jabber.c:987 -#, fuzzy msgid "Unregister" -msgstr "Registrovať" +msgstr "Zrušiť registráciu" #: ../libpurple/protocols/jabber/jabber.c:994 -#, fuzzy msgid "" "Please fill out the information below to change your account registration." msgstr "" -"Pre zaregistrovanie vášho nového konta, vyplňte prosím nižšie uvedené " -"informácie." +"Pre zmenu registrácie vašeho účtu, vyplňte prosím nižšie uvedené informácie." #: ../libpurple/protocols/jabber/jabber.c:997 msgid "Please fill out the information below to register your new account." msgstr "" -"Pre zaregistrovanie vášho nového konta, vyplňte prosím nižšie uvedené " +"Pre zaregistrovanie vášho nového účtu, vyplňte prosím nižšie uvedené " "informácie." #: ../libpurple/protocols/jabber/jabber.c:1005 @@ -5557,43 +5563,39 @@ msgstr "Registrovať" #: ../libpurple/protocols/jabber/jabber.c:1012 -#, fuzzy, c-format +#, c-format msgid "Change Account Registration at %s" -msgstr "Zmeniť podrobnosti o používateľovi %s" +msgstr "Zmeniť registráciu účtu na %s" #: ../libpurple/protocols/jabber/jabber.c:1013 -#, fuzzy, c-format +#, c-format msgid "Register New Account at %s" -msgstr "Registrovať nový XMPP účet" +msgstr "Registrovať nový účet na %s" #: ../libpurple/protocols/jabber/jabber.c:1016 -#, fuzzy msgid "Change Registration" -msgstr "Zmeniť stav na:" +msgstr "Zmeniť registráciu" #: ../libpurple/protocols/jabber/jabber.c:1120 #: ../libpurple/protocols/jabber/jabber.c:1121 -#, fuzzy msgid "Error unregistering account" -msgstr "Chyba pri zmene podrobností účtu" +msgstr "Chyba pri rušení účtu" #: ../libpurple/protocols/jabber/jabber.c:1126 #: ../libpurple/protocols/jabber/jabber.c:1127 -#, fuzzy msgid "Account successfully unregistered" -msgstr "Úspešne ste vytvroili Qun" +msgstr "Registrácia úspešne zrušená" #: ../libpurple/protocols/jabber/jabber.c:1284 msgid "Initializing Stream" msgstr "Spúšťa sa dátový prúd" #: ../libpurple/protocols/jabber/jabber.c:1289 -#, fuzzy msgid "Initializing SSL/TLS" -msgstr "Spúšťa sa dátový prúd" +msgstr "Spúšťa sa SSL/TLS" #: ../libpurple/protocols/jabber/jabber.c:1293 -#: ../libpurple/protocols/msn/session.c:351 +#: ../libpurple/protocols/msn/session.c:390 msgid "Authenticating" msgstr "Autentifikácia" @@ -5606,7 +5608,7 @@ #: ../libpurple/protocols/jabber/jabber.c:1909 #: ../libpurple/protocols/jabber/jabber.c:1945 #: ../libpurple/protocols/oscar/oscar.c:826 -#: ../libpurple/protocols/oscar/oscar.c:5602 +#: ../libpurple/protocols/oscar/oscar.c:5654 msgid "Not Authorized" msgstr "Neautorizovaný" @@ -5660,27 +5662,24 @@ #: ../libpurple/protocols/jabber/jabber.c:1580 #: ../libpurple/protocols/jabber/jabber.c:1603 #: ../libpurple/protocols/jabber/jabber.c:1626 -#, fuzzy msgid "Mood Text" -msgstr "Krvná skupina" +msgstr "Popis nálady" #: ../libpurple/protocols/jabber/jabber.c:1535 #: ../libpurple/protocols/jabber/jabber.c:1558 #: ../libpurple/protocols/jabber/jabber.c:1581 #: ../libpurple/protocols/jabber/jabber.c:1604 #: ../libpurple/protocols/jabber/jabber.c:1627 -#, fuzzy msgid "Tune Artist" -msgstr "Umelci" +msgstr "Tune interpret" #: ../libpurple/protocols/jabber/jabber.c:1536 #: ../libpurple/protocols/jabber/jabber.c:1559 #: ../libpurple/protocols/jabber/jabber.c:1582 #: ../libpurple/protocols/jabber/jabber.c:1605 #: ../libpurple/protocols/jabber/jabber.c:1628 -#, fuzzy msgid "Tune Title" -msgstr "Nadpis" +msgstr "Tune titulok" #: ../libpurple/protocols/jabber/jabber.c:1537 #: ../libpurple/protocols/jabber/jabber.c:1560 @@ -5688,7 +5687,7 @@ #: ../libpurple/protocols/jabber/jabber.c:1606 #: ../libpurple/protocols/jabber/jabber.c:1629 msgid "Tune Album" -msgstr "" +msgstr "Tune album" #: ../libpurple/protocols/jabber/jabber.c:1538 #: ../libpurple/protocols/jabber/jabber.c:1561 @@ -5696,16 +5695,15 @@ #: ../libpurple/protocols/jabber/jabber.c:1607 #: ../libpurple/protocols/jabber/jabber.c:1630 msgid "Tune Genre" -msgstr "" +msgstr "Tune žáner" #: ../libpurple/protocols/jabber/jabber.c:1539 #: ../libpurple/protocols/jabber/jabber.c:1562 #: ../libpurple/protocols/jabber/jabber.c:1585 #: ../libpurple/protocols/jabber/jabber.c:1608 #: ../libpurple/protocols/jabber/jabber.c:1631 -#, fuzzy msgid "Tune Comment" -msgstr "Komentár priateľa" +msgstr "Tune komentár" #: ../libpurple/protocols/jabber/jabber.c:1540 #: ../libpurple/protocols/jabber/jabber.c:1563 @@ -5713,7 +5711,7 @@ #: ../libpurple/protocols/jabber/jabber.c:1609 #: ../libpurple/protocols/jabber/jabber.c:1632 msgid "Tune Track" -msgstr "" +msgstr "Tune stopa" #: ../libpurple/protocols/jabber/jabber.c:1541 #: ../libpurple/protocols/jabber/jabber.c:1564 @@ -5721,7 +5719,7 @@ #: ../libpurple/protocols/jabber/jabber.c:1610 #: ../libpurple/protocols/jabber/jabber.c:1633 msgid "Tune Time" -msgstr "" +msgstr "Tune čas" #: ../libpurple/protocols/jabber/jabber.c:1542 #: ../libpurple/protocols/jabber/jabber.c:1565 @@ -5729,7 +5727,7 @@ #: ../libpurple/protocols/jabber/jabber.c:1611 #: ../libpurple/protocols/jabber/jabber.c:1634 msgid "Tune Year" -msgstr "" +msgstr "Tune rok" #: ../libpurple/protocols/jabber/jabber.c:1543 #: ../libpurple/protocols/jabber/jabber.c:1566 @@ -5737,16 +5735,15 @@ #: ../libpurple/protocols/jabber/jabber.c:1612 #: ../libpurple/protocols/jabber/jabber.c:1635 msgid "Tune URL" -msgstr "" +msgstr "Tune URL" #: ../libpurple/protocols/jabber/jabber.c:1545 #: ../libpurple/protocols/jabber/jabber.c:1568 #: ../libpurple/protocols/jabber/jabber.c:1591 #: ../libpurple/protocols/jabber/jabber.c:1614 #: ../libpurple/protocols/jabber/jabber.c:1637 -#, fuzzy msgid "Allow Buzz" -msgstr "Povoliť" +msgstr "Povoliť Bzzz" #: ../libpurple/protocols/jabber/jabber.c:1665 msgid "Password Changed" @@ -5775,7 +5772,7 @@ msgstr "Zadajte, prosím, vaše nové heslo" #: ../libpurple/protocols/jabber/jabber.c:1749 -#: ../libpurple/protocols/oscar/oscar.c:6388 +#: ../libpurple/protocols/oscar/oscar.c:6440 #: ../libpurple/protocols/silc/silc.c:1093 #: ../libpurple/protocols/silc10/silc.c:1004 msgid "Set User Info..." @@ -5783,7 +5780,7 @@ #. if (js->protocol_options & CHANGE_PASSWORD) { #: ../libpurple/protocols/jabber/jabber.c:1754 -#: ../libpurple/protocols/oscar/oscar.c:6399 +#: ../libpurple/protocols/oscar/oscar.c:6451 #: ../libpurple/protocols/silc/silc.c:1089 #: ../libpurple/protocols/silc10/silc.c:1000 msgid "Change Password..." @@ -5979,7 +5976,7 @@ #: ../libpurple/protocols/jabber/jabber.c:1963 msgid "Unsupported Stanza Type" -msgstr "Nepodporovaný Stanza typ" +msgstr "Nepodporovaný typ slohy" #: ../libpurple/protocols/jabber/jabber.c:1965 msgid "Unsupported Version" @@ -6024,51 +6021,69 @@ msgstr "Nepodarilo sa vykopnúť používateľa %s" #: ../libpurple/protocols/jabber/jabber.c:2185 -#, fuzzy, c-format +#, c-format msgid "Unable to ping user %s" -msgstr "Nedá sa udeliť zákaz pre používateľa %s" +msgstr "Nepodarilo sa pingnúť používateľa %s" #: ../libpurple/protocols/jabber/jabber.c:2207 #: ../libpurple/protocols/jabber/jabber.c:2217 #, c-format msgid "Unable to buzz, because there is nothing known about user %s." -msgstr "" +msgstr "Nepodarilo sa poslať bzzz, pretože o používateľovi %s nič nevieme." #: ../libpurple/protocols/jabber/jabber.c:2213 #, c-format msgid "Unable to buzz, because user %s might be offline." -msgstr "" +msgstr "Nepodarilo sa poslať bzzz, pretože používateľ %s môže byť odpojený." #: ../libpurple/protocols/jabber/jabber.c:2239 -#, fuzzy, c-format +#, c-format msgid "Unable to buzz, because the user %s does not support it." -msgstr "Nedá sa odoslať súbor používateľovi %s, nepodporuje prenosy súborov" - -#: ../libpurple/protocols/jabber/jabber.c:2253 +msgstr "Nepodarilo sa poslať bzzz, pretože používateľ %s to nepodporuje." + +#: ../libpurple/protocols/jabber/jabber.c:2250 +#: ../libpurple/protocols/yahoo/yahoo.c:4121 +msgid "Buzz" +msgstr "Bzzz" + +#: ../libpurple/protocols/jabber/jabber.c:2251 +#: ../libpurple/protocols/jabber/message.c:307 +#: ../libpurple/protocols/yahoo/yahoo.c:4122 +#, c-format +msgid "%s has buzzed you!" +msgstr "Používateľ %s vám poslal bzzz!" + +#: ../libpurple/protocols/jabber/jabber.c:2252 +#: ../libpurple/protocols/yahoo/yahoo.c:4123 +#, c-format +msgid "Buzzing %s..." +msgstr "Posielam bzzz používateľovi %s..." + +#: ../libpurple/protocols/jabber/jabber.c:2291 msgid "config: Configure a chat room." msgstr "config: Nastavenie miestnosti chatu." -#: ../libpurple/protocols/jabber/jabber.c:2257 +#: ../libpurple/protocols/jabber/jabber.c:2295 msgid "configure: Configure a chat room." msgstr "configure: Nastavenie miestnosti chatu." -#: ../libpurple/protocols/jabber/jabber.c:2266 +#: ../libpurple/protocols/jabber/jabber.c:2304 msgid "part [room]: Leave the room." msgstr "part [miestnosť]: Opustí miestnosť." -#: ../libpurple/protocols/jabber/jabber.c:2271 +#: ../libpurple/protocols/jabber/jabber.c:2309 msgid "register: Register with a chat room." msgstr "register: Zaregistrovať sa v chatovacej miestnosti." -#: ../libpurple/protocols/jabber/jabber.c:2277 +#: ../libpurple/protocols/jabber/jabber.c:2315 msgid "topic [new topic]: View or change the topic." msgstr "topic [nová téma]: Zobrazí alebo zmení tému." -#: ../libpurple/protocols/jabber/jabber.c:2283 +#: ../libpurple/protocols/jabber/jabber.c:2321 msgid "ban <user> [room]: Ban a user from the room." msgstr "ban <používateľ> [miestnosť]: Vykázať používateľa z miestnosti." -#: ../libpurple/protocols/jabber/jabber.c:2289 +#: ../libpurple/protocols/jabber/jabber.c:2327 msgid "" "affiliate <user> <owner|admin|member|outcast|none>: Set a user's " "affiliation with the room." @@ -6076,7 +6091,7 @@ "affiliate <používateľ> <owner|admin|member|outcast|none>: " "Nastaví používateľové pričlenenie v miestnosti." -#: ../libpurple/protocols/jabber/jabber.c:2295 +#: ../libpurple/protocols/jabber/jabber.c:2333 msgid "" "role <user> <moderator|participant|visitor|none>: Set a user's " "role in the room." @@ -6084,32 +6099,32 @@ "role <používateľ> <moderator|participant|visitor|none>: Nastaví " "postavenie používateľa v miestnosti." -#: ../libpurple/protocols/jabber/jabber.c:2301 +#: ../libpurple/protocols/jabber/jabber.c:2339 msgid "invite <user> [message]: Invite a user to the room." msgstr "invite <user> [správa]: Pozve používateľa do miestnosti." -#: ../libpurple/protocols/jabber/jabber.c:2307 +#: ../libpurple/protocols/jabber/jabber.c:2345 msgid "join: <room> [server]: Join a chat on this server." msgstr "join: <room> [server]: Pripojí sa na chat na tomto serveri." -#: ../libpurple/protocols/jabber/jabber.c:2313 +#: ../libpurple/protocols/jabber/jabber.c:2351 msgid "kick <user> [room]: Kick a user from the room." msgstr "" "kick <používateľ> [miestnosť]: Vykopne používateľa z miestnosti." -#: ../libpurple/protocols/jabber/jabber.c:2318 +#: ../libpurple/protocols/jabber/jabber.c:2356 msgid "" "msg <user> <message>: Send a private message to another user." msgstr "" -"msg <používateľ> <správa>: Odosle súkromnú správu inému " +"msg <používateľ> <správa>: Odošle súkromnú správu inému " "používateľovi." -#: ../libpurple/protocols/jabber/jabber.c:2324 +#: ../libpurple/protocols/jabber/jabber.c:2362 msgid "ping <jid>:\tPing a user/component/server." -msgstr "" - -#: ../libpurple/protocols/jabber/jabber.c:2329 -#: ../libpurple/protocols/yahoo/yahoo.c:4145 +msgstr "ping <jid>:\tPingne používateľa, súčasť alebo server." + +#: ../libpurple/protocols/jabber/jabber.c:2367 +#: ../libpurple/protocols/yahoo/yahoo.c:4147 msgid "buzz: Buzz a user to get their attention" msgstr "buzz: Pošlite používateľovi „bzzz“ a tým si získajte jeho pozornosť" @@ -6135,7 +6150,7 @@ #: ../libpurple/protocols/jabber/libxmpp.c:210 msgid "Require SSL/TLS" -msgstr "" +msgstr "Vyžadovať SSL/TLS" #: ../libpurple/protocols/jabber/libxmpp.c:214 msgid "Force old (port 5223) SSL" @@ -6146,8 +6161,8 @@ msgstr "Povoliť plaintextovú autentifikáciu cez nezašifrované spojenia" #: ../libpurple/protocols/jabber/libxmpp.c:224 -#: ../libpurple/protocols/myspace/myspace.c:3277 -#: ../libpurple/protocols/simple/simple.c:1902 +#: ../libpurple/protocols/myspace/myspace.c:3283 +#: ../libpurple/protocols/simple/simple.c:1904 msgid "Connect port" msgstr "Port pripojenia" @@ -6155,7 +6170,7 @@ #. * able to set the first port to try (like LastConnectedPort in Windows client). #. Account options #: ../libpurple/protocols/jabber/libxmpp.c:228 -#: ../libpurple/protocols/myspace/myspace.c:3274 +#: ../libpurple/protocols/myspace/myspace.c:3280 #: ../libpurple/protocols/silc/silc.c:1914 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837 msgid "Connect server" @@ -6190,12 +6205,6 @@ msgid "XMPP Message Error" msgstr "Chyba správy XMPP" -#: ../libpurple/protocols/jabber/message.c:307 -#: ../libpurple/protocols/yahoo/yahoo.c:4120 -#, fuzzy, c-format -msgid "%s has buzzed you!" -msgstr "Používateľ %s sa prihlásil." - #: ../libpurple/protocols/jabber/message.c:407 #, c-format msgid " (Code %s)" @@ -6205,16 +6214,16 @@ msgid "XML Parse error" msgstr "Chyba pri spracovaní XML" -#: ../libpurple/protocols/jabber/presence.c:427 +#: ../libpurple/protocols/jabber/presence.c:422 msgid "Unknown Error in presence" msgstr "Prítomná neznáma chyba" -#: ../libpurple/protocols/jabber/presence.c:508 -#: ../libpurple/protocols/jabber/presence.c:509 +#: ../libpurple/protocols/jabber/presence.c:503 +#: ../libpurple/protocols/jabber/presence.c:504 msgid "Create New Room" msgstr "Vytvoriť novú miestnosť" -#: ../libpurple/protocols/jabber/presence.c:510 +#: ../libpurple/protocols/jabber/presence.c:505 msgid "" "You are creating a new room. Would you like to configure it, or accept the " "default settings?" @@ -6222,20 +6231,20 @@ "Vytvárate novú miestnosť. Chceli by ste ju nastaviť, alebo prijmete " "štandardné nastavenia?" -#: ../libpurple/protocols/jabber/presence.c:516 +#: ../libpurple/protocols/jabber/presence.c:511 msgid "_Configure Room" msgstr "Konfigurovať miestnosť" -#: ../libpurple/protocols/jabber/presence.c:517 +#: ../libpurple/protocols/jabber/presence.c:512 msgid "_Accept Defaults" msgstr "_Prijať štandardné" -#: ../libpurple/protocols/jabber/presence.c:559 +#: ../libpurple/protocols/jabber/presence.c:554 #, c-format msgid "Error in chat %s" msgstr "Chyba v chate %s" -#: ../libpurple/protocols/jabber/presence.c:563 +#: ../libpurple/protocols/jabber/presence.c:558 #, c-format msgid "Error joining chat %s" msgstr "Chyba pripojenia na chat %s" @@ -6279,62 +6288,64 @@ #: ../libpurple/protocols/jabber/usermood.c:179 #: ../libpurple/protocols/jabber/usermood.c:180 -#, fuzzy msgid "Edit User Mood" -msgstr "Režimy používateľa" +msgstr "Zmeniť náladu používateľa" #: ../libpurple/protocols/jabber/usermood.c:181 msgid "Please select your mood from the list." -msgstr "" +msgstr "Prosím, vyberte vašu náladu zo zoznamu." #: ../libpurple/protocols/jabber/usermood.c:183 #: ../libpurple/protocols/jabber/usernick.c:78 -#, fuzzy msgid "Set" -msgstr "_Nastaviť" +msgstr "Nastaviť" #: ../libpurple/protocols/jabber/usermood.c:191 -#, fuzzy msgid "Set Mood..." -msgstr "Odoslať správu..." +msgstr "Nastaviť náladu..." #: ../libpurple/protocols/jabber/usernick.c:76 -#, fuzzy msgid "Set User Nickname" -msgstr "Nastaviť limit používateľov" +msgstr "Nastaviť prezývku používateľa" #: ../libpurple/protocols/jabber/usernick.c:76 -#, fuzzy msgid "Please specify a new nickname for you." -msgstr "Zadajte, prosím, nový názov pre %s" +msgstr "Prosím, zadajte svoju novú prezývku." #: ../libpurple/protocols/jabber/usernick.c:77 msgid "" "This information is visible to all contacts on your contact list, so choose " "something appropriate." msgstr "" - -#: ../libpurple/protocols/jabber/usernick.c:99 -#, fuzzy +"Táto prezývka sa zobrazí všetkým osobám vo vašom zozname kontaktov, preto " +"vyberte niečo vhodné." + +#: ../libpurple/protocols/jabber/usernick.c:100 msgid "Set Nickname..." -msgstr "Prezývka" +msgstr "Nastaviť prezývku..." #: ../libpurple/protocols/jabber/xdata.c:378 -#, fuzzy msgid "Actions" -msgstr "Akcia" +msgstr "Akcie" #: ../libpurple/protocols/jabber/xdata.c:380 -#, fuzzy msgid "Select an action" -msgstr "Vyberte súbor" - -#: ../libpurple/protocols/msn/dialog.c:110 +msgstr "Vyberte autora" + +#: ../libpurple/protocols/msn/contact.c:188 +msgid "Unable to connect to contact server" +msgstr "Nepodarilo sa pripojiť na server kontaktov." + +#: ../libpurple/protocols/msn/contact.c:948 +msgid "Unable to retrieve MSN Address Book" +msgstr "Nebolo možné prevzať zoznam adries MSN" + +#: ../libpurple/protocols/msn/dialog.c:118 #, c-format msgid "Buddy list synchronization issue in %s (%s)" msgstr "Problém synchronizácie zoznamu kamarátov v %s (%s)" -#: ../libpurple/protocols/msn/dialog.c:116 +#: ../libpurple/protocols/msn/dialog.c:124 #, c-format msgid "" "%s on the local list is inside the group \"%s\" but not on the server list. " @@ -6343,7 +6354,7 @@ "%s v miestnom zozname je v skupine „%s“, ale nie je v zozname servera. " "Chcete tohto kamaráta pridať?" -#: ../libpurple/protocols/msn/dialog.c:124 +#: ../libpurple/protocols/msn/dialog.c:132 #, c-format msgid "" "%s is on the local list but not on the server list. Do you want this buddy " @@ -6353,241 +6364,194 @@ "kamaráta pridať?" #: ../libpurple/protocols/msn/error.c:36 -#, c-format msgid "Unable to parse message" msgstr "Správa sa nedá spracovať" #: ../libpurple/protocols/msn/error.c:41 -#, c-format msgid "Syntax Error (probably a client bug)" msgstr "Chyba syntaxe (pravdepodobne chyba v klientovi)" #: ../libpurple/protocols/msn/error.c:46 -#, c-format msgid "Invalid e-mail address" msgstr "Chybná e-mailová adresa" #: ../libpurple/protocols/msn/error.c:49 -#, c-format msgid "User does not exist" msgstr "Používateľ neexistuje" #: ../libpurple/protocols/msn/error.c:53 -#, c-format msgid "Fully qualified domain name missing" msgstr "Chýba plne kvalifikované doménové meno" #: ../libpurple/protocols/msn/error.c:56 -#, c-format msgid "Already logged in" msgstr "Už je prihlásený" #: ../libpurple/protocols/msn/error.c:59 -#, c-format msgid "Invalid screen name" msgstr "Používateľské meno je chybné" #: ../libpurple/protocols/msn/error.c:62 -#, c-format msgid "Invalid friendly name" msgstr "Priateľské meno je chybné" #: ../libpurple/protocols/msn/error.c:65 -#, c-format msgid "List full" msgstr "Zoznam je plný" #: ../libpurple/protocols/msn/error.c:68 -#, c-format msgid "Already there" msgstr "Už sa tam nachádza" #: ../libpurple/protocols/msn/error.c:72 -#, c-format msgid "Not on list" msgstr "Nie je v zozname" #: ../libpurple/protocols/msn/error.c:75 #: ../libpurple/protocols/zephyr/zephyr.c:756 -#, c-format msgid "User is offline" msgstr "Používateľ je odpojený" #: ../libpurple/protocols/msn/error.c:78 -#, c-format msgid "Already in the mode" msgstr "Už v režime" #: ../libpurple/protocols/msn/error.c:82 -#, c-format msgid "Already in opposite list" msgstr "Už v opačnom zozname" #: ../libpurple/protocols/msn/error.c:86 -#, c-format msgid "Too many groups" msgstr "Príliš veľa skupín" #: ../libpurple/protocols/msn/error.c:89 -#, c-format msgid "Invalid group" msgstr "Chybná skupina" #: ../libpurple/protocols/msn/error.c:92 -#, c-format msgid "User not in group" msgstr "Používateľ nie je v skupine" #: ../libpurple/protocols/msn/error.c:95 -#, c-format msgid "Group name too long" msgstr "Názov skupiny príliš dlhý" #: ../libpurple/protocols/msn/error.c:98 -#, c-format msgid "Cannot remove group zero" msgstr "Nie je možné odstrániť nultú skupinu" #: ../libpurple/protocols/msn/error.c:103 -#, c-format msgid "Tried to add a user to a group that doesn't exist" msgstr "Pokúšate sa pridať používateľa do skupiny, ktorá neexistuje" #: ../libpurple/protocols/msn/error.c:107 -#, c-format msgid "Switchboard failed" msgstr "Prepojenie zlyhalo" #: ../libpurple/protocols/msn/error.c:111 -#, c-format msgid "Notify transfer failed" msgstr "Upozornenie prenosu zlyhalo" #: ../libpurple/protocols/msn/error.c:116 -#, c-format msgid "Required fields missing" msgstr "Chýbajú požadované polia" #: ../libpurple/protocols/msn/error.c:120 -#, c-format msgid "Too many hits to a FND" msgstr "Priveľa úderov pre FND" #: ../libpurple/protocols/msn/error.c:124 #: ../libpurple/protocols/oscar/oscar.c:120 -#, c-format msgid "Not logged in" msgstr "Neprihlásený" #: ../libpurple/protocols/msn/error.c:128 -#, c-format msgid "Service temporarily unavailable" msgstr "Služba je dočasne nedostupná" #: ../libpurple/protocols/msn/error.c:131 -#, c-format msgid "Database server error" msgstr "Chyba databázového servera" #: ../libpurple/protocols/msn/error.c:135 -#, c-format msgid "Command disabled" msgstr "Príkaz vypnutý" #: ../libpurple/protocols/msn/error.c:139 -#, c-format msgid "File operation error" msgstr "Chyba súborového operátora" #: ../libpurple/protocols/msn/error.c:143 -#, c-format msgid "Memory allocation error" msgstr "Chyba vyhradenie pamäte" #: ../libpurple/protocols/msn/error.c:147 -#, c-format msgid "Wrong CHL value sent to server" msgstr "Nesprávna CHL hodnota zaslaná servera" #: ../libpurple/protocols/msn/error.c:152 -#, c-format msgid "Server busy" msgstr "Server zaneprázdnený" #: ../libpurple/protocols/msn/error.c:155 #: ../libpurple/protocols/msn/error.c:170 #: ../libpurple/protocols/msn/error.c:230 -#, c-format msgid "Server unavailable" msgstr "Server je nedostupný" #: ../libpurple/protocols/msn/error.c:158 -#, c-format msgid "Peer notification server down" msgstr "Server upozornenia na partnera je vypnutý" #: ../libpurple/protocols/msn/error.c:162 -#, c-format msgid "Database connect error" msgstr "Chyba pripojenia k databáze" #: ../libpurple/protocols/msn/error.c:167 -#, c-format msgid "Server is going down (abandon ship)" msgstr "Server sa vypína (opustite ľoď)" #: ../libpurple/protocols/msn/error.c:174 -#, c-format msgid "Error creating connection" msgstr "Chyba pri vytváraní spojenia" #: ../libpurple/protocols/msn/error.c:179 -#, c-format msgid "CVR parameters are either unknown or not allowed" msgstr "CVR parametre sú buď neznáme alebo nedovolené" #: ../libpurple/protocols/msn/error.c:183 -#, c-format msgid "Unable to write" msgstr "Nepodarilo sa zapisovať" #: ../libpurple/protocols/msn/error.c:186 -#, c-format msgid "Session overload" msgstr "Relácia preťažená" #: ../libpurple/protocols/msn/error.c:190 -#, c-format msgid "User is too active" msgstr "Používateľ je príliš aktívny" #: ../libpurple/protocols/msn/error.c:193 -#, c-format msgid "Too many sessions" msgstr "Príliš veľa relácií" #: ../libpurple/protocols/msn/error.c:196 -#, c-format msgid "Passport not verified" msgstr "Heslo nebolo overené" #: ../libpurple/protocols/msn/error.c:199 -#, c-format msgid "Bad friend file" msgstr "Nesprávny súbor priateľa" #: ../libpurple/protocols/msn/error.c:203 -#, c-format msgid "Not expected" msgstr "Neočakávané" #: ../libpurple/protocols/msn/error.c:209 -#, c-format msgid "Friendly name changes too rapidly" msgstr "Priateľské meno sa mení príliš rýchlo" #: ../libpurple/protocols/msn/error.c:218 -#, c-format msgid "Server too busy" msgstr "Server je príliš zaneprázdnený" @@ -6596,32 +6560,26 @@ #: ../libpurple/protocols/silc/silc.c:233 #: ../libpurple/protocols/silc10/ops.c:1709 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380 -#, c-format msgid "Authentication failed" msgstr "Autentifikácia zlyhala" #: ../libpurple/protocols/msn/error.c:225 -#, c-format msgid "Not allowed when offline" msgstr "Nepovolené v odpojenom stave" #: ../libpurple/protocols/msn/error.c:233 -#, c-format msgid "Not accepting new users" msgstr "Neprijímame nových používateľov" #: ../libpurple/protocols/msn/error.c:237 -#, c-format msgid "Kids Passport without parental consent" msgstr "Detský pas bez súhlasu rodičov" #: ../libpurple/protocols/msn/error.c:241 -#, c-format msgid "Passport account not yet verified" msgstr "Účet pasu nebol ešte overený" #: ../libpurple/protocols/msn/error.c:244 -#, c-format msgid "Bad ticket" msgstr "Nesprávny lístok" @@ -6636,49 +6594,48 @@ msgstr "Chyba MSN: %s\n" #: ../libpurple/protocols/msn/msn.c:130 -#, fuzzy msgid "Nudge" -msgstr "štuchanec" +msgstr "Štuchanec" #: ../libpurple/protocols/msn/msn.c:131 -#, fuzzy, c-format +#, c-format msgid "%s has nudged you!" -msgstr "Používateľ %s sa prihlásil." +msgstr "Používateľ %s vás štuchol!" #: ../libpurple/protocols/msn/msn.c:132 -#, fuzzy, c-format +#, c-format msgid "Nudging %s..." -msgstr "Štuchanec" +msgstr "Štucháte používateľa %s..." #: ../libpurple/protocols/msn/msn.c:174 msgid "Your new MSN friendly name is too long." msgstr "Vaše nové MSN priateľské meno je príliš dlhé." -#: ../libpurple/protocols/msn/msn.c:282 +#: ../libpurple/protocols/msn/msn.c:285 msgid "Set your friendly name." msgstr "Vyplňte vaše priateľské meno." -#: ../libpurple/protocols/msn/msn.c:283 +#: ../libpurple/protocols/msn/msn.c:286 msgid "This is the name that other MSN buddies will see you as." msgstr "Toto je názov, pod ktorým vás budú vidieť ostatní priatelia z MSN." -#: ../libpurple/protocols/msn/msn.c:301 +#: ../libpurple/protocols/msn/msn.c:304 msgid "Set your home phone number." msgstr "Vyplňte vaše telefónne čislo domov" -#: ../libpurple/protocols/msn/msn.c:318 +#: ../libpurple/protocols/msn/msn.c:321 msgid "Set your work phone number." msgstr "Vyplňte vaše telefónne čislo do práce" -#: ../libpurple/protocols/msn/msn.c:335 +#: ../libpurple/protocols/msn/msn.c:338 msgid "Set your mobile phone number." msgstr "Vyplňte vaše telefónne čislo na mobil" -#: ../libpurple/protocols/msn/msn.c:350 +#: ../libpurple/protocols/msn/msn.c:353 msgid "Allow MSN Mobile pages?" msgstr "Povoliť mobilné stránky MSN?" -#: ../libpurple/protocols/msn/msn.c:351 +#: ../libpurple/protocols/msn/msn.c:354 msgid "" "Do you want to allow or disallow people on your buddy list to send you MSN " "Mobile pages to your cell phone or other mobile device?" @@ -6686,323 +6643,326 @@ "Chcete povoliť alebo zakázať osobám vo vašom zozname priateľov posielať vám " "na váš mobilný telefón stránky MSN?" -#: ../libpurple/protocols/msn/msn.c:357 +#: ../libpurple/protocols/msn/msn.c:360 msgid "Allow" msgstr "Povoliť" -#: ../libpurple/protocols/msn/msn.c:358 +#: ../libpurple/protocols/msn/msn.c:361 msgid "Disallow" msgstr "Nepovoliť" -#: ../libpurple/protocols/msn/msn.c:374 +#: ../libpurple/protocols/msn/msn.c:377 msgid "This Hotmail account may not be active." msgstr "Tento účet služby Hotmail nemusí byť aktívny." -#: ../libpurple/protocols/msn/msn.c:400 +#: ../libpurple/protocols/msn/msn.c:403 msgid "Send a mobile message." msgstr "Odoslať správu na mobil." -#: ../libpurple/protocols/msn/msn.c:402 +#: ../libpurple/protocols/msn/msn.c:405 msgid "Page" msgstr "Strana" -#: ../libpurple/protocols/msn/msn.c:549 -msgid "Has you" -msgstr "Vás má" - -#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33 -#: ../libpurple/protocols/yahoo/yahoo.c:3077 -#: ../libpurple/protocols/yahoo/yahoo.c:3761 +#: ../libpurple/protocols/msn/msn.c:610 ../libpurple/protocols/msn/msn.c:635 +#: ../libpurple/protocols/msn/msn.c:642 ../libpurple/protocols/msn/msn.c:649 +#: ../libpurple/protocols/msn/msn.c:656 ../libpurple/protocols/msn/msn.c:662 +#: ../libpurple/protocols/msn/msn.c:668 +msgid "Current media" +msgstr "Aktuálne médium" + +#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:33 +#: ../libpurple/protocols/yahoo/yahoo.c:3079 +#: ../libpurple/protocols/yahoo/yahoo.c:3763 msgid "Be Right Back" msgstr "Hneď som späť" -#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31 -#: ../libpurple/protocols/novell/novell.c:2822 -#: ../libpurple/protocols/novell/novell.c:2952 +#: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/state.c:31 +#: ../libpurple/protocols/novell/novell.c:2827 +#: ../libpurple/protocols/novell/novell.c:2957 #: ../libpurple/protocols/silc/buddy.c:1480 #: ../libpurple/protocols/silc/silc.c:56 #: ../libpurple/protocols/silc10/buddy.c:1480 #: ../libpurple/protocols/silc10/silc.c:47 -#: ../libpurple/protocols/yahoo/yahoo.c:3079 -#: ../libpurple/protocols/yahoo/yahoo.c:3764 +#: ../libpurple/protocols/yahoo/yahoo.c:3081 +#: ../libpurple/protocols/yahoo/yahoo.c:3766 msgid "Busy" msgstr "Zaneprázdnený" -#: ../libpurple/protocols/msn/msn.c:587 -#: ../libpurple/protocols/yahoo/yahoo.c:3087 -#: ../libpurple/protocols/yahoo/yahoo.c:3776 +#: ../libpurple/protocols/msn/msn.c:660 +#: ../libpurple/protocols/yahoo/yahoo.c:3089 +#: ../libpurple/protocols/yahoo/yahoo.c:3778 msgid "On the Phone" msgstr "Telefonujem" -#: ../libpurple/protocols/msn/msn.c:591 -#: ../libpurple/protocols/yahoo/yahoo.c:3091 -#: ../libpurple/protocols/yahoo/yahoo.c:3782 +#: ../libpurple/protocols/msn/msn.c:666 +#: ../libpurple/protocols/yahoo/yahoo.c:3093 +#: ../libpurple/protocols/yahoo/yahoo.c:3784 msgid "Out to Lunch" msgstr "Na obede" -#: ../libpurple/protocols/msn/msn.c:619 +#: ../libpurple/protocols/msn/msn.c:697 msgid "Set Friendly Name..." msgstr "Nastaviť priateľské meno..." -#: ../libpurple/protocols/msn/msn.c:624 +#: ../libpurple/protocols/msn/msn.c:702 msgid "Set Home Phone Number..." msgstr "Nastaviť číslo telefónu domov..." -#: ../libpurple/protocols/msn/msn.c:628 +#: ../libpurple/protocols/msn/msn.c:706 msgid "Set Work Phone Number..." msgstr "Nastaviť číslo telefónu do práce..." -#: ../libpurple/protocols/msn/msn.c:632 +#: ../libpurple/protocols/msn/msn.c:710 msgid "Set Mobile Phone Number..." msgstr "Nastaviť číslo mobilného telefónu..." -#: ../libpurple/protocols/msn/msn.c:638 +#: ../libpurple/protocols/msn/msn.c:716 msgid "Enable/Disable Mobile Devices..." msgstr "Povoliť/Zakázať mobilné zariadenia..." -#: ../libpurple/protocols/msn/msn.c:643 +#: ../libpurple/protocols/msn/msn.c:721 msgid "Allow/Disallow Mobile Pages..." msgstr "Povoliť/Zakázať mobilné stránky..." -#: ../libpurple/protocols/msn/msn.c:654 +#: ../libpurple/protocols/msn/msn.c:732 msgid "Open Hotmail Inbox" msgstr "Otvoriť poštovú schránku Hotmail" -#: ../libpurple/protocols/msn/msn.c:678 +#: ../libpurple/protocols/msn/msn.c:756 msgid "Send to Mobile" msgstr "Odoslať na mobil" -#: ../libpurple/protocols/msn/msn.c:688 -#: ../libpurple/protocols/novell/novell.c:3408 +#: ../libpurple/protocols/msn/msn.c:766 +#: ../libpurple/protocols/novell/novell.c:3413 msgid "Initiate _Chat" msgstr "Začať _chat" -#: ../libpurple/protocols/msn/msn.c:726 +#: ../libpurple/protocols/msn/msn.c:804 msgid "SSL support is needed for MSN. Please install a supported SSL library." msgstr "" "Pre MSN je potrebná podpora SSL. Nainštalujte, prosím, podporovanú SSL " "knižnicu." -#: ../libpurple/protocols/msn/msn.c:754 +#: ../libpurple/protocols/msn/msn.c:832 msgid "Failed to connect to server." msgstr "Nepodarilo sa spojiť so serverom." -#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858 +#: ../libpurple/protocols/msn/msn.c:1620 ../libpurple/protocols/msn/msn.c:1968 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808 msgid "Error retrieving profile" msgstr "Chyba pri získavaní profilu" -#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309 -#: ../pidgin/plugins/pidginrc.c:366 +#: ../libpurple/protocols/msn/msn.c:1691 ../pidgin/plugins/convcolors.c:309 +#: ../pidgin/plugins/pidginrc.c:360 msgid "General" msgstr "Všeobecné" -#: ../libpurple/protocols/msn/msn.c:1588 -#: ../libpurple/protocols/myspace/user.c:110 -#: ../libpurple/protocols/oscar/oscar.c:3755 +#: ../libpurple/protocols/msn/msn.c:1698 +#: ../libpurple/protocols/myspace/user.c:113 +#: ../libpurple/protocols/oscar/oscar.c:3769 #: ../libpurple/protocols/qq/buddy_info.c:45 #: ../libpurple/protocols/qq/qq.c:221 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081 msgid "Age" msgstr "Vek" -#: ../libpurple/protocols/msn/msn.c:1590 +#: ../libpurple/protocols/msn/msn.c:1700 #: ../libpurple/protocols/qq/buddy_info.c:51 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096 msgid "Occupation" msgstr "Povolanie" -#: ../libpurple/protocols/msn/msn.c:1591 -#: ../libpurple/protocols/myspace/user.c:119 -#: ../libpurple/protocols/novell/novell.c:1478 +#: ../libpurple/protocols/msn/msn.c:1701 +#: ../libpurple/protocols/myspace/user.c:121 +#: ../libpurple/protocols/novell/novell.c:1480 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076 #: ../libpurple/protocols/zephyr/zephyr.c:798 #: ../libpurple/protocols/zephyr/zephyr.c:1215 msgid "Location" msgstr "Lokalita" -#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788 -#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801 +#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1898 +#: ../libpurple/protocols/msn/msn.c:1904 ../libpurple/protocols/msn/msn.c:1911 msgid "Hobbies and Interests" msgstr "Záľuby a záujmy" -#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722 -#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735 -#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750 +#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1832 +#: ../libpurple/protocols/msn/msn.c:1838 ../libpurple/protocols/msn/msn.c:1845 +#: ../libpurple/protocols/msn/msn.c:1853 ../libpurple/protocols/msn/msn.c:1860 msgid "A Little About Me" msgstr "Niečo o mne" -#: ../libpurple/protocols/msn/msn.c:1619 +#: ../libpurple/protocols/msn/msn.c:1729 msgid "Social" msgstr "Sociálne" -#: ../libpurple/protocols/msn/msn.c:1621 +#: ../libpurple/protocols/msn/msn.c:1731 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086 msgid "Marital Status" msgstr "Manželský stav" -#: ../libpurple/protocols/msn/msn.c:1622 +#: ../libpurple/protocols/msn/msn.c:1732 msgid "Interests" msgstr "Záujmy" -#: ../libpurple/protocols/msn/msn.c:1623 +#: ../libpurple/protocols/msn/msn.c:1733 msgid "Pets" msgstr "Domáce zvieratá" -#: ../libpurple/protocols/msn/msn.c:1624 +#: ../libpurple/protocols/msn/msn.c:1734 msgid "Hometown" msgstr "Mesto v ktorom bývate" -#: ../libpurple/protocols/msn/msn.c:1625 +#: ../libpurple/protocols/msn/msn.c:1735 msgid "Places Lived" msgstr "Miesta, kde ste bývali" -#: ../libpurple/protocols/msn/msn.c:1626 +#: ../libpurple/protocols/msn/msn.c:1736 msgid "Fashion" msgstr "Móda" -#: ../libpurple/protocols/msn/msn.c:1627 +#: ../libpurple/protocols/msn/msn.c:1737 msgid "Humor" msgstr "Humor" -#: ../libpurple/protocols/msn/msn.c:1628 +#: ../libpurple/protocols/msn/msn.c:1738 msgid "Music" msgstr "Hudba" -#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810 -#: ../libpurple/protocols/msn/msn.c:1816 +#: ../libpurple/protocols/msn/msn.c:1739 ../libpurple/protocols/msn/msn.c:1920 +#: ../libpurple/protocols/msn/msn.c:1926 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138 msgid "Favorite Quote" msgstr "Obľúbený citát" -#: ../libpurple/protocols/msn/msn.c:1646 +#: ../libpurple/protocols/msn/msn.c:1756 msgid "Contact Info" msgstr "Kontaktné informácie" -#: ../libpurple/protocols/msn/msn.c:1647 +#: ../libpurple/protocols/msn/msn.c:1757 msgid "Personal" msgstr "Osobné" -#: ../libpurple/protocols/msn/msn.c:1650 +#: ../libpurple/protocols/msn/msn.c:1760 msgid "Significant Other" msgstr "Ďalšie významné" -#: ../libpurple/protocols/msn/msn.c:1651 +#: ../libpurple/protocols/msn/msn.c:1761 msgid "Home Phone" msgstr "Telefón domov" -#: ../libpurple/protocols/msn/msn.c:1652 +#: ../libpurple/protocols/msn/msn.c:1762 msgid "Home Phone 2" msgstr "Telefón domov 2" -#: ../libpurple/protocols/msn/msn.c:1653 -#: ../libpurple/protocols/oscar/oscar.c:3793 +#: ../libpurple/protocols/msn/msn.c:1763 +#: ../libpurple/protocols/oscar/oscar.c:3807 msgid "Home Address" msgstr "Adresa domov" -#: ../libpurple/protocols/msn/msn.c:1654 +#: ../libpurple/protocols/msn/msn.c:1764 msgid "Personal Mobile" msgstr "Osobný mobil" -#: ../libpurple/protocols/msn/msn.c:1655 +#: ../libpurple/protocols/msn/msn.c:1765 msgid "Home Fax" msgstr "Fax domov" -#: ../libpurple/protocols/msn/msn.c:1656 +#: ../libpurple/protocols/msn/msn.c:1766 msgid "Personal E-Mail" msgstr "Osobný e-mail" -#: ../libpurple/protocols/msn/msn.c:1657 +#: ../libpurple/protocols/msn/msn.c:1767 msgid "Personal IM" msgstr "Osobné IM" -#: ../libpurple/protocols/msn/msn.c:1659 +#: ../libpurple/protocols/msn/msn.c:1769 msgid "Anniversary" msgstr "Výročie" #. Business -#: ../libpurple/protocols/msn/msn.c:1675 +#: ../libpurple/protocols/msn/msn.c:1785 msgid "Work" msgstr "Práca" -#: ../libpurple/protocols/msn/msn.c:1677 +#: ../libpurple/protocols/msn/msn.c:1787 #: ../libpurple/protocols/silc/ops.c:1010 #: ../libpurple/protocols/silc10/ops.c:1044 msgid "Job Title" msgstr "Názov zamestnania" -#: ../libpurple/protocols/msn/msn.c:1678 -#: ../libpurple/protocols/oscar/oscar.c:3814 +#: ../libpurple/protocols/msn/msn.c:1788 +#: ../libpurple/protocols/oscar/oscar.c:3828 msgid "Company" msgstr "Spoločnosť" -#: ../libpurple/protocols/msn/msn.c:1679 -#: ../libpurple/protocols/novell/novell.c:1480 +#: ../libpurple/protocols/msn/msn.c:1789 +#: ../libpurple/protocols/novell/novell.c:1482 msgid "Department" msgstr "Oddelenie" -#: ../libpurple/protocols/msn/msn.c:1680 +#: ../libpurple/protocols/msn/msn.c:1790 msgid "Profession" msgstr "Profesia" -#: ../libpurple/protocols/msn/msn.c:1681 +#: ../libpurple/protocols/msn/msn.c:1791 msgid "Work Phone" msgstr "Telefón do práce" -#: ../libpurple/protocols/msn/msn.c:1682 +#: ../libpurple/protocols/msn/msn.c:1792 msgid "Work Phone 2" msgstr "Telefón do práce 2" -#: ../libpurple/protocols/msn/msn.c:1683 -#: ../libpurple/protocols/oscar/oscar.c:3806 +#: ../libpurple/protocols/msn/msn.c:1793 +#: ../libpurple/protocols/oscar/oscar.c:3820 msgid "Work Address" msgstr "Adresa pracoviska" -#: ../libpurple/protocols/msn/msn.c:1684 +#: ../libpurple/protocols/msn/msn.c:1794 msgid "Work Mobile" msgstr "Služobný mobil" -#: ../libpurple/protocols/msn/msn.c:1685 +#: ../libpurple/protocols/msn/msn.c:1795 msgid "Work Pager" msgstr "Služobný pager" -#: ../libpurple/protocols/msn/msn.c:1686 +#: ../libpurple/protocols/msn/msn.c:1796 msgid "Work Fax" msgstr "Služobný fax" -#: ../libpurple/protocols/msn/msn.c:1687 +#: ../libpurple/protocols/msn/msn.c:1797 msgid "Work E-Mail" msgstr "Pracovný e-mail" -#: ../libpurple/protocols/msn/msn.c:1688 +#: ../libpurple/protocols/msn/msn.c:1798 msgid "Work IM" msgstr "Pracovné IM" -#: ../libpurple/protocols/msn/msn.c:1689 +#: ../libpurple/protocols/msn/msn.c:1799 msgid "Start Date" msgstr "Dátum začiatku" -#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765 -#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779 +#: ../libpurple/protocols/msn/msn.c:1869 ../libpurple/protocols/msn/msn.c:1875 +#: ../libpurple/protocols/msn/msn.c:1882 ../libpurple/protocols/msn/msn.c:1889 msgid "Favorite Things" msgstr "Obľúbené veci" -#: ../libpurple/protocols/msn/msn.c:1824 +#: ../libpurple/protocols/msn/msn.c:1934 msgid "Last Updated" msgstr "Naposledy aktualizované" -#: ../libpurple/protocols/msn/msn.c:1835 +#: ../libpurple/protocols/msn/msn.c:1945 #: ../libpurple/protocols/qq/buddy_info.c:60 #: ../libpurple/protocols/silc/ops.c:1026 #: ../libpurple/protocols/silc10/ops.c:1060 msgid "Homepage" msgstr "Domovská stránka" -#: ../libpurple/protocols/msn/msn.c:1859 +#: ../libpurple/protocols/msn/msn.c:1969 msgid "The user has not created a public profile." msgstr "Používateľ nemá vytvorený verejný profil." -#: ../libpurple/protocols/msn/msn.c:1860 +#: ../libpurple/protocols/msn/msn.c:1970 msgid "" "MSN reported not being able to find the user's profile. This either means " "that the user does not exist, or that the user exists but has not created a " @@ -7011,7 +6971,7 @@ "MSN ohlásilo, že nie je schopné nájsť používateľov profil. To znamená, že " "používateľ buď neexistuje alebo existuje, ale nemá vytvorený verejný profil." -#: ../libpurple/protocols/msn/msn.c:1864 +#: ../libpurple/protocols/msn/msn.c:1974 msgid "" "Could not find any information in the user's profile. The user most likely " "does not exist." @@ -7019,7 +6979,7 @@ "Nebolo možné nájsť žiadnu informáciu v používateľovom profile. Používateľ " "pravdepodobne neexistuje." -#: ../libpurple/protocols/msn/msn.c:1872 +#: ../libpurple/protocols/msn/msn.c:1982 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240 msgid "Profile URL" msgstr "Adresa profilu" @@ -7034,101 +6994,103 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160 -msgid "MSN Protocol Plugin" -msgstr "Modul protokolu HTTP" - -#: ../libpurple/protocols/msn/msn.c:2194 +#: ../libpurple/protocols/msn/msn.c:2269 ../libpurple/protocols/msn/msn.c:2271 +msgid "Windows Live Messenger Protocol Plugin" +msgstr "Modul protokolu Windows Live Messenger" + +#: ../libpurple/protocols/msn/msn.c:2306 msgid "Use HTTP Method" msgstr "Používať HTTP" -#: ../libpurple/protocols/msn/msn.c:2199 -#, fuzzy +#: ../libpurple/protocols/msn/msn.c:2311 msgid "HTTP Method Server" -msgstr "Server testu IPC" - -#: ../libpurple/protocols/msn/msn.c:2204 +msgstr "Server HTTP" + +#: ../libpurple/protocols/msn/msn.c:2316 msgid "Show custom smileys" msgstr "Zobraziť vlastných smajlíkov" -#: ../libpurple/protocols/msn/msn.c:2212 +#: ../libpurple/protocols/msn/msn.c:2324 msgid "nudge: nudge a user to get their attention" msgstr "nudge: postrčte používateľa pre získanie ich pozornosti" -#: ../libpurple/protocols/msn/nexus.c:146 -#: ../libpurple/protocols/msn/servconn.c:135 -#: ../libpurple/protocols/qq/qq_proxy.c:242 -#: ../libpurple/protocols/qq/qq_proxy.c:321 -#: ../libpurple/protocols/qq/qq_proxy.c:366 -#: ../libpurple/protocols/qq/qq_proxy.c:399 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:63 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:163 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:187 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:200 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:229 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:243 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:268 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:302 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:332 -#: ../libpurple/protocols/yahoo/yahoochat.c:1416 -#: ../libpurple/protocols/yahoo/yahoochat.c:1442 -msgid "Unable to connect" -msgstr "Nepodarilo sa pripojiť" - -#: ../libpurple/protocols/msn/notification.c:178 +#: ../libpurple/protocols/msn/nexus.c:137 +msgid "Windows Live ID authentication:Unable to connect" +msgstr "Antentifikácia Windows Live ID: nebolo možné pripojiť sa" + +#: ../libpurple/protocols/msn/nexus.c:275 +msgid "Windows Live ID authentication Failed" +msgstr "Zlyhala antentifikácia Windows Live ID" + +#: ../libpurple/protocols/msn/notification.c:185 #, c-format msgid "%s is not a valid group." msgstr "%s nie je správna skupina." -#: ../libpurple/protocols/msn/notification.c:184 -#: ../libpurple/protocols/msn/notification.c:532 -#: ../libpurple/protocols/msn/session.c:330 +#: ../libpurple/protocols/msn/notification.c:191 +#: ../libpurple/protocols/msn/notification.c:934 +#: ../libpurple/protocols/msn/session.c:369 msgid "Unknown error." msgstr "Neznáma chyba." -#: ../libpurple/protocols/msn/notification.c:187 +#: ../libpurple/protocols/msn/notification.c:194 #, c-format msgid "%s on %s (%s)" msgstr "%s na %s (%s)" -#: ../libpurple/protocols/msn/notification.c:498 +#: ../libpurple/protocols/msn/notification.c:512 +#, c-format +msgid "%s just sent you a Nudge!" +msgstr "%s vám práve poslal Nudge!" + +#: ../libpurple/protocols/msn/notification.c:839 +#, c-format +msgid "Unknown error (%d)" +msgstr "Neznáma chyba (%d)" + +#: ../libpurple/protocols/msn/notification.c:840 +#: ../libpurple/protocols/sametime/sametime.c:4425 +msgid "Unable to add user" +msgstr "Nebolo možné priadať používateľa" + +#: ../libpurple/protocols/msn/notification.c:900 #, c-format msgid "Unable to add user on %s (%s)" msgstr "Nebolo možné pridať používateľa %s (%s)" -#: ../libpurple/protocols/msn/notification.c:502 +#: ../libpurple/protocols/msn/notification.c:904 #, c-format msgid "Unable to block user on %s (%s)" msgstr "Nebolo možné blokovať používateľa %s (%s)" -#: ../libpurple/protocols/msn/notification.c:506 +#: ../libpurple/protocols/msn/notification.c:908 #, c-format msgid "Unable to permit user on %s (%s)" msgstr "Nebolo možné povoliť používateľa %s (%s)" -#: ../libpurple/protocols/msn/notification.c:514 +#: ../libpurple/protocols/msn/notification.c:916 #, c-format msgid "%s could not be added because your buddy list is full." msgstr "%s sa nepridal, pretože váš zoznam priateľov je plný." -#: ../libpurple/protocols/msn/notification.c:523 +#: ../libpurple/protocols/msn/notification.c:925 #, c-format msgid "%s is not a valid passport account." msgstr "%s nie je platný účet pasu." -#: ../libpurple/protocols/msn/notification.c:528 +#: ../libpurple/protocols/msn/notification.c:930 msgid "Service Temporarily Unavailable." msgstr "Služba je dočasne nedostupná." -#: ../libpurple/protocols/msn/notification.c:851 +#: ../libpurple/protocols/msn/notification.c:1268 msgid "Unable to rename group" msgstr "Nepodarilo sa premenovať skupinu" -#: ../libpurple/protocols/msn/notification.c:906 +#: ../libpurple/protocols/msn/notification.c:1323 msgid "Unable to delete group" msgstr "Nepodarilo sa odstrániť skupinu" -#: ../libpurple/protocols/msn/notification.c:1325 +#: ../libpurple/protocols/msn/notification.c:1939 #, c-format msgid "" "The MSN server will shut down for maintenance in %d minute. You will " @@ -7160,6 +7122,29 @@ "\n" "Keď bude údržba dokončená, budete sa môcť znovu prihlásiť." +#: ../libpurple/protocols/msn/oim.c:141 +msgid "Unable to connect to OIM server" +msgstr "Nepodarilo sa pripojiť na OIM server." + +#: ../libpurple/protocols/msn/servconn.c:135 +#: ../libpurple/protocols/qq/qq_proxy.c:242 +#: ../libpurple/protocols/qq/qq_proxy.c:321 +#: ../libpurple/protocols/qq/qq_proxy.c:366 +#: ../libpurple/protocols/qq/qq_proxy.c:399 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:63 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:163 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:187 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:200 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:229 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:243 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:268 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:302 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:332 +#: ../libpurple/protocols/yahoo/yahoochat.c:1416 +#: ../libpurple/protocols/yahoo/yahoochat.c:1442 +msgid "Unable to connect" +msgstr "Nepodarilo sa pripojiť" + #: ../libpurple/protocols/msn/servconn.c:137 msgid "Writing error" msgstr "Chyba pri zápise" @@ -7177,58 +7162,58 @@ "Chyba pripojenia %s servera:\n" "%s" -#: ../libpurple/protocols/msn/session.c:299 +#: ../libpurple/protocols/msn/session.c:336 msgid "Our protocol is not supported by the server." msgstr "Server nepodporuje náš protokol." -#: ../libpurple/protocols/msn/session.c:303 +#: ../libpurple/protocols/msn/session.c:340 msgid "Error parsing HTTP." msgstr "Chyba pri spracovávaní HTTP." -#: ../libpurple/protocols/msn/session.c:307 +#: ../libpurple/protocols/msn/session.c:344 #: ../libpurple/protocols/oscar/flap_connection.c:384 -#: ../libpurple/protocols/yahoo/yahoo.c:205 +#: ../libpurple/protocols/yahoo/yahoo.c:207 msgid "You have signed on from another location." msgstr "Prihlásili ste sa z iného miesta." -#: ../libpurple/protocols/msn/session.c:310 +#: ../libpurple/protocols/msn/session.c:349 msgid "The MSN servers are temporarily unavailable. Please wait and try again." msgstr "" "MSN servery sú dočasne nedostupné. Počkajte, prosím, a skúste to znovu." -#: ../libpurple/protocols/msn/session.c:315 +#: ../libpurple/protocols/msn/session.c:354 msgid "The MSN servers are going down temporarily." msgstr "MSN servery sa dočasne vypínajú." -#: ../libpurple/protocols/msn/session.c:320 +#: ../libpurple/protocols/msn/session.c:359 #, c-format msgid "Unable to authenticate: %s" msgstr "Nepodarilo sa autentifikovať: %s" -#: ../libpurple/protocols/msn/session.c:325 +#: ../libpurple/protocols/msn/session.c:364 msgid "" "Your MSN buddy list is temporarily unavailable. Please wait and try again." msgstr "" "Váš zoznam priateľov MSN je dočasne nedostupný. Skúste to, prosím, neskôr." -#: ../libpurple/protocols/msn/session.c:346 -#: ../libpurple/protocols/msn/session.c:348 +#: ../libpurple/protocols/msn/session.c:385 +#: ../libpurple/protocols/msn/session.c:387 msgid "Handshaking" msgstr "Prevzatie" -#: ../libpurple/protocols/msn/session.c:349 +#: ../libpurple/protocols/msn/session.c:388 msgid "Starting authentication" msgstr "Začína sa autentifikácia" -#: ../libpurple/protocols/msn/session.c:350 +#: ../libpurple/protocols/msn/session.c:389 msgid "Getting cookie" msgstr "Prijímajú sa cookies" -#: ../libpurple/protocols/msn/session.c:352 +#: ../libpurple/protocols/msn/session.c:391 msgid "Sending cookie" msgstr "Odosielajú sa cookies" -#: ../libpurple/protocols/msn/session.c:353 +#: ../libpurple/protocols/msn/session.c:392 msgid "Retrieving buddy list" msgstr "Prijíma sa zoznam priateľov" @@ -7281,22 +7266,25 @@ msgid "Message may have not been sent because an unknown error occurred:" msgstr "Správu sa nepodarilo odoslať, pretože sa vyskytla neznáma chyba:" -#: ../libpurple/protocols/msn/userlist.c:252 +#: ../libpurple/protocols/msn/userlist.c:249 #, c-format msgid "%s has added you to his or her buddy list." msgstr "Používateľ %s si vás pridal do svojho zoznamu priateľov." -#: ../libpurple/protocols/msn/userlist.c:321 +#: ../libpurple/protocols/msn/userlist.c:318 #, c-format msgid "%s has removed you from his or her buddy list." msgstr "Používateľ %s vás odstránil zo svojho zoznamu priateľov." -#: ../libpurple/protocols/msn/userlist.c:643 +#. only notify the user about problems adding to the friends list +#. * maybe we should do something else for other lists, but it probably +#. * won't cause too many problems if we just ignore it +#: ../libpurple/protocols/msn/userlist.c:699 #, c-format msgid "Unable to add \"%s\"." msgstr "Nepodarilo sa pridať „%s“." -#: ../libpurple/protocols/msn/userlist.c:645 +#: ../libpurple/protocols/msn/userlist.c:702 msgid "The screen name specified is invalid." msgstr "Zadané používateľské meno je chybné." @@ -7327,198 +7315,202 @@ #. Notify an error message also, because this is important! #: ../libpurple/protocols/myspace/myspace.c:292 -#: ../libpurple/protocols/myspace/myspace.c:1801 +#: ../libpurple/protocols/myspace/myspace.c:1806 msgid "MySpaceIM Error" msgstr "Chyba MySpaceIM" -#: ../libpurple/protocols/myspace/myspace.c:349 +#: ../libpurple/protocols/myspace/myspace.c:350 msgid "Reading challenge" msgstr "Číta sa výzva" -#: ../libpurple/protocols/myspace/myspace.c:355 +#: ../libpurple/protocols/myspace/myspace.c:356 msgid "Unexpected challenge length from server" msgstr "Neočakávaná dĺžka výzvy zo servera" -#: ../libpurple/protocols/myspace/myspace.c:359 +#: ../libpurple/protocols/myspace/myspace.c:360 msgid "Logging in" msgstr "Prihlasuje sa" -#: ../libpurple/protocols/myspace/myspace.c:1286 +#: ../libpurple/protocols/myspace/myspace.c:1289 #, c-format msgid "Connection to server lost (no data received within %d seconds)" msgstr "" "Pripojenie ku serveru prerušené (neboli prijaté žiadné údaje počas %d sekúnd)" #. Can't write _()'d strings in array initializers. Workaround. -#: ../libpurple/protocols/myspace/myspace.c:1328 +#: ../libpurple/protocols/myspace/myspace.c:1331 msgid "New mail messages" msgstr "Nové poštové správy" -#: ../libpurple/protocols/myspace/myspace.c:1329 +#: ../libpurple/protocols/myspace/myspace.c:1332 msgid "New blog comments" msgstr "Nové komentáre na blogu" -#: ../libpurple/protocols/myspace/myspace.c:1330 +#: ../libpurple/protocols/myspace/myspace.c:1333 msgid "New profile comments" msgstr "Nové komentáre v profile" -#: ../libpurple/protocols/myspace/myspace.c:1331 +#: ../libpurple/protocols/myspace/myspace.c:1334 msgid "New friend requests!" msgstr "Nové pozvánky priateľov!" -#: ../libpurple/protocols/myspace/myspace.c:1332 +#: ../libpurple/protocols/myspace/myspace.c:1335 msgid "New picture comments" msgstr "Nové komentáre ku obrázkom" -#: ../libpurple/protocols/myspace/myspace.c:1360 +#: ../libpurple/protocols/myspace/myspace.c:1363 msgid "MySpace" msgstr "MySpace" #. The session is now set up, ready to be connected. This emits the #. * signedOn signal, so clients can now do anything with msimprpl, and #. * we're ready for it (session key, userid, username all setup). -#: ../libpurple/protocols/myspace/myspace.c:1543 +#: ../libpurple/protocols/myspace/myspace.c:1546 #: ../libpurple/protocols/sametime/sametime.c:1544 msgid "Connected" msgstr "Pripojený" -#: ../libpurple/protocols/myspace/myspace.c:1554 -#: ../libpurple/protocols/myspace/myspace.c:1556 -#, fuzzy +#: ../libpurple/protocols/myspace/myspace.c:1557 +#: ../libpurple/protocols/myspace/myspace.c:1559 msgid "No username set" -msgstr "Bez názvu" - -#: ../libpurple/protocols/myspace/myspace.c:1555 +msgstr "Nenastavené používateľské meno" + +#: ../libpurple/protocols/myspace/myspace.c:1558 msgid "" "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile." "username and choose a username and try to login again." msgstr "" - -#: ../libpurple/protocols/myspace/myspace.c:1782 +"Prosím, choďte na http://editprofile.myspace.com/index.cfm?" +"fuseaction=profile.username a vyberte si používateľské meno a skúste sa " +"prihlásiť znovu." + +#: ../libpurple/protocols/myspace/myspace.c:1785 #, c-format msgid "Protocol error, code %d: %s" msgstr "Chyba protokolu, kód %d: %s" -#: ../libpurple/protocols/myspace/myspace.c:1972 -#: ../libpurple/protocols/myspace/myspace.c:2006 +#: ../libpurple/protocols/myspace/myspace.c:1977 +#: ../libpurple/protocols/myspace/myspace.c:2011 msgid "Failed to add buddy" msgstr "Nebolo možné pridať priateľa." -#: ../libpurple/protocols/myspace/myspace.c:1972 +#: ../libpurple/protocols/myspace/myspace.c:1977 msgid "'addbuddy' command failed." msgstr "príkaz 'addbuddy' zlyhal." -#: ../libpurple/protocols/myspace/myspace.c:2006 -#: ../libpurple/protocols/myspace/myspace.c:2247 +#: ../libpurple/protocols/myspace/myspace.c:2011 +#: ../libpurple/protocols/myspace/myspace.c:2252 msgid "persist command failed" msgstr "príkaz persist zlyhal" -#: ../libpurple/protocols/myspace/myspace.c:2115 +#: ../libpurple/protocols/myspace/myspace.c:2120 #, c-format msgid "No such user: %s" msgstr "Neexistujúci používateľ: %s" -#: ../libpurple/protocols/myspace/myspace.c:2116 +#: ../libpurple/protocols/myspace/myspace.c:2121 msgid "User lookup" msgstr "Vyhľadanie používateľov" -#: ../libpurple/protocols/myspace/myspace.c:2228 -#: ../libpurple/protocols/myspace/myspace.c:2247 -#: ../libpurple/protocols/myspace/myspace.c:2269 +#: ../libpurple/protocols/myspace/myspace.c:2233 +#: ../libpurple/protocols/myspace/myspace.c:2252 +#: ../libpurple/protocols/myspace/myspace.c:2274 msgid "Failed to remove buddy" msgstr "Odstránenie priateľa zlyhalo" -#: ../libpurple/protocols/myspace/myspace.c:2228 +#: ../libpurple/protocols/myspace/myspace.c:2233 msgid "'delbuddy' command failed" msgstr "príkaz 'delbuddy' zlyhal" -#: ../libpurple/protocols/myspace/myspace.c:2269 +#: ../libpurple/protocols/myspace/myspace.c:2274 msgid "blocklist command failed" msgstr "príkaz blocklist zlyhal" -#: ../libpurple/protocols/myspace/myspace.c:2315 +#: ../libpurple/protocols/myspace/myspace.c:2320 msgid "Invalid input condition" msgstr "Chybná podmienka vstupu" #. TODO: g_realloc like msn, yahoo, irc, jabber? -#: ../libpurple/protocols/myspace/myspace.c:2333 -#: ../libpurple/protocols/myspace/myspace.c:2364 +#: ../libpurple/protocols/myspace/myspace.c:2338 +#: ../libpurple/protocols/myspace/myspace.c:2369 msgid "Read buffer full" msgstr "Zásobník čítania plný" -#: ../libpurple/protocols/myspace/myspace.c:2402 +#: ../libpurple/protocols/myspace/myspace.c:2407 msgid "Unparseable message" msgstr "Nespracovateľná správa" -#: ../libpurple/protocols/myspace/myspace.c:2471 +#: ../libpurple/protocols/myspace/myspace.c:2476 #, c-format msgid "Couldn't connect to host: %s (%d)" msgstr "Nebolo možné sa pripojiť ku hostiteľovi: %s (%d)" -#: ../libpurple/protocols/myspace/myspace.c:2642 +#: ../libpurple/protocols/myspace/myspace.c:2647 msgid "IM Friends" msgstr "IM Priateľov" -#: ../libpurple/protocols/myspace/myspace.c:2741 +#: ../libpurple/protocols/myspace/myspace.c:2747 #, c-format msgid "" "%d buddies were added or updated from the server (including buddies already " "on the server-side list)" msgstr "" - -#: ../libpurple/protocols/myspace/myspace.c:2742 +"%d priateľov bolo pridaných alebo aktualizovaných zo serveru (vrátane " +"priateľov ktorí sa už nachádzali na serverovom zozname)" + +#: ../libpurple/protocols/myspace/myspace.c:2748 msgid "Add contacts from server" msgstr "Pridať kontakty zo serveru" -#: ../libpurple/protocols/myspace/myspace.c:2794 -#: ../libpurple/protocols/myspace/myspace.c:2859 +#: ../libpurple/protocols/myspace/myspace.c:2800 +#: ../libpurple/protocols/myspace/myspace.c:2865 msgid "Add friends from MySpace.com" msgstr "Pridať priateľov z MySpace.com" -#: ../libpurple/protocols/myspace/myspace.c:2795 +#: ../libpurple/protocols/myspace/myspace.c:2801 msgid "Importing friends failed" msgstr "Importovanie priateľov zlyhalo" #. TODO: find out how -#: ../libpurple/protocols/myspace/myspace.c:2851 +#: ../libpurple/protocols/myspace/myspace.c:2857 msgid "Find people..." msgstr "Hľadať ľudí..." -#: ../libpurple/protocols/myspace/myspace.c:2854 +#: ../libpurple/protocols/myspace/myspace.c:2860 msgid "Change IM name..." msgstr "Zmeniť IM meno..." -#: ../libpurple/protocols/myspace/myspace.c:3156 +#: ../libpurple/protocols/myspace/myspace.c:3162 msgid "myim URL handler" msgstr "myim URL handler" -#: ../libpurple/protocols/myspace/myspace.c:3157 +#: ../libpurple/protocols/myspace/myspace.c:3163 msgid "No suitable MySpaceIM account could be found to open this myim URL." msgstr "" "Nebol nájdený žiadny vyhovujúci MySpaceIM účet na otvorenie tejto myim " "adresy." -#: ../libpurple/protocols/myspace/myspace.c:3158 +#: ../libpurple/protocols/myspace/myspace.c:3164 msgid "Enable the proper MySpaceIM account and try again." msgstr "Povoľte správny MySpaceIM účet a skúste znovu." -#: ../libpurple/protocols/myspace/myspace.c:3281 +#: ../libpurple/protocols/myspace/myspace.c:3287 msgid "Show display name in status text" msgstr "Zobraziť používateľské meno v texte stavu" -#: ../libpurple/protocols/myspace/myspace.c:3284 +#: ../libpurple/protocols/myspace/myspace.c:3290 msgid "Show headline in status text" msgstr "Zobraziť nadpis v texte stavu" -#: ../libpurple/protocols/myspace/myspace.c:3289 +#: ../libpurple/protocols/myspace/myspace.c:3295 msgid "Send emoticons" msgstr "Poslať emotikony" -#: ../libpurple/protocols/myspace/myspace.c:3294 +#: ../libpurple/protocols/myspace/myspace.c:3300 msgid "Screen resolution (dots per inch)" msgstr "Rozlíšenie obrazovky (bodov na palec)" -#: ../libpurple/protocols/myspace/myspace.c:3297 +#: ../libpurple/protocols/myspace/myspace.c:3303 msgid "Base font size (points)" msgstr "Základná veľkosť písma (body)" @@ -7528,178 +7520,194 @@ msgid "User" msgstr "Používateľ" -#. TODO: link to username, if available -#: ../libpurple/protocols/myspace/user.c:102 -#: ../libpurple/protocols/oscar/oscar.c:2964 +#: ../libpurple/protocols/myspace/user.c:104 +#: ../libpurple/protocols/oscar/oscar.c:2978 msgid "Profile" msgstr "Profil" -#: ../libpurple/protocols/myspace/user.c:124 -#, fuzzy +#: ../libpurple/protocols/myspace/user.c:126 msgid "Headline" -msgstr "_Prezývka:" - -#: ../libpurple/protocols/myspace/user.c:129 -#, fuzzy +msgstr "Nadpis" + +#: ../libpurple/protocols/myspace/user.c:131 msgid "Song" -msgstr "Zvuky" - -#: ../libpurple/protocols/myspace/user.c:134 -#, fuzzy +msgstr "Pesnička" + +#: ../libpurple/protocols/myspace/user.c:139 msgid "Total Friends" -msgstr "IM Priateľov" - -#: ../libpurple/protocols/myspace/user.c:145 -#: ../libpurple/protocols/myspace/user.c:148 -#: ../libpurple/protocols/myspace/user.c:151 -#, fuzzy +msgstr "Spolu priateľov" + +#: ../libpurple/protocols/myspace/user.c:157 msgid "Client Version" -msgstr "Zavrieť rozhovor" +msgstr "Verzia klienta" #. TODO: icons for each zap -#: ../libpurple/protocols/myspace/zap.c:44 -#: ../libpurple/protocols/myspace/zap.c:177 +#. Lots of comments for translators: +#. Zap means "to strike suddenly and forcefully as if with a +#. * projectile or weapon." This term often has an electrical +#. * connotation, for example, "he was zapped by electricity when +#. * he put a fork in the toaster." +#: ../libpurple/protocols/myspace/zap.c:51 +#: ../libpurple/protocols/myspace/zap.c:214 msgid "Zap" -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:44 -#, fuzzy, c-format +msgstr "Elektrizovať" + +#: ../libpurple/protocols/myspace/zap.c:51 +#, c-format msgid "%s has zapped you!" -msgstr "Používateľ %s sa prihlásil." - -#: ../libpurple/protocols/myspace/zap.c:44 +msgstr "Používateľ %s vás zelektrizoval!" + +#: ../libpurple/protocols/myspace/zap.c:51 #, c-format msgid "Zapping %s..." -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:45 +msgstr "Zelektrizovali ste %s..." + +#. Whack means "to hit or strike someone with a sharp blow" +#: ../libpurple/protocols/myspace/zap.c:54 msgid "Whack" -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:45 -#, fuzzy, c-format +msgstr "Buchnúť" + +#: ../libpurple/protocols/myspace/zap.c:54 +#, c-format msgid "%s has whacked you!" -msgstr "Používateľ vás zablokoval" - -#: ../libpurple/protocols/myspace/zap.c:45 +msgstr "Používateľ %s vás buchol!" + +#: ../libpurple/protocols/myspace/zap.c:54 #, c-format msgid "Whacking %s..." -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:46 -#, fuzzy +msgstr "Buchli ste používateľa %s..." + +#. Torch means "to set on fire." Don't worry, this doesn't +#. * make a whole lot of sense in English, either. Feel free +#. * to translate it literally. +#: ../libpurple/protocols/myspace/zap.c:59 msgid "Torch" -msgstr "Téma" - -#: ../libpurple/protocols/myspace/zap.c:46 -#, fuzzy, c-format +msgstr "Zapáliť" + +#: ../libpurple/protocols/myspace/zap.c:59 +#, c-format msgid "%s has torched you!" -msgstr "Používateľ vás zablokoval" - -#: ../libpurple/protocols/myspace/zap.c:46 +msgstr "Používateľ %s vás zapálil!" + +#: ../libpurple/protocols/myspace/zap.c:59 #, c-format msgid "Torching %s..." -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:47 +msgstr "Zapálili ste používateľa %s..." + +#. Smooch means "to kiss someone, often enthusiastically" +#: ../libpurple/protocols/myspace/zap.c:62 msgid "Smooch" -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:47 -#, fuzzy, c-format +msgstr "Pobozkať" + +#: ../libpurple/protocols/myspace/zap.c:62 +#, c-format msgid "%s has smooched you!" -msgstr "Používateľ %s sa prihlásil." - -#: ../libpurple/protocols/myspace/zap.c:47 +msgstr "Používateľ %s vás pobozkal!" + +#: ../libpurple/protocols/myspace/zap.c:62 #, c-format msgid "Smooching %s..." -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:48 +msgstr "Pobozkali ste používateľa %s..." + +#. A hug is a display of affection; wrapping your arms around someone +#: ../libpurple/protocols/myspace/zap.c:65 msgid "Hug" -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:48 -#, fuzzy, c-format +msgstr "Objať" + +#: ../libpurple/protocols/myspace/zap.c:65 +#, c-format msgid "%s has hugged you!" -msgstr "Používateľ %s sa prihlásil." - -#: ../libpurple/protocols/myspace/zap.c:48 +msgstr "Používateľ %s vás objal!" + +#: ../libpurple/protocols/myspace/zap.c:65 #, c-format msgid "Hugging %s..." -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:49 -#, fuzzy +msgstr "Objali ste používateľa %s..." + +#. Slap means "to hit someone with an open/flat hand" +#: ../libpurple/protocols/myspace/zap.c:68 msgid "Slap" -msgstr "Ospalý" - -#: ../libpurple/protocols/myspace/zap.c:49 -#, fuzzy, c-format +msgstr "Dať facku" + +#: ../libpurple/protocols/myspace/zap.c:68 +#, c-format msgid "%s has slapped you!" -msgstr "Používateľ %s sa prihlásil." - -#: ../libpurple/protocols/myspace/zap.c:49 +msgstr "Používateľ %s vám dal facku!" + +#: ../libpurple/protocols/myspace/zap.c:68 #, c-format msgid "Slapping %s..." -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:50 -#, fuzzy +msgstr "Dali ste facku používateľovi %s..." + +#. Goose means "to pinch someone on their butt" +#: ../libpurple/protocols/myspace/zap.c:71 msgid "Goose" -msgstr "Preč" - -#: ../libpurple/protocols/myspace/zap.c:50 -#, fuzzy, c-format +msgstr "Uťahovať si z" + +#: ../libpurple/protocols/myspace/zap.c:71 +#, c-format msgid "%s has goosed you!" -msgstr "Používateľ %s odišiel preč." - -#: ../libpurple/protocols/myspace/zap.c:50 -#, fuzzy, c-format +msgstr "Používateľ %s si z vás uťahuje!" + +#: ../libpurple/protocols/myspace/zap.c:71 +#, c-format msgid "Goosing %s..." -msgstr "Vyhľadáva sa %s" - -#: ../libpurple/protocols/myspace/zap.c:51 +msgstr "Uťahujete si z %s..." + +#. A high-five is when two people's hands slap each other +#. * in the air above their heads. It is done to celebrate +#. * something, often a victory, or to congratulate someone. +#: ../libpurple/protocols/myspace/zap.c:76 msgid "High-five" -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:51 -#, fuzzy, c-format +msgstr "Tľapnúť si" + +#: ../libpurple/protocols/myspace/zap.c:76 +#, c-format msgid "%s has high-fived you!" -msgstr "Používateľ %s sa prihlásil." - -#: ../libpurple/protocols/myspace/zap.c:51 +msgstr "Používateľ %s si s vami tľapol!" + +#: ../libpurple/protocols/myspace/zap.c:76 #, c-format msgid "High-fiving %s..." -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:52 +msgstr "Tľapli ste si s používateľom %s..." + +#. We're not entirely sure what the MySpace people mean by +#. * this... but we think it's the equivalent of "prank." Or, for +#. * someone to perform a mischievous trick or practical joke. +#: ../libpurple/protocols/myspace/zap.c:81 msgid "Punk" -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:52 -#, fuzzy, c-format +msgstr "Nachytať" + +#: ../libpurple/protocols/myspace/zap.c:81 +#, c-format msgid "%s has punk'd you!" -msgstr "Používateľ %s sa prihlásil." - -#: ../libpurple/protocols/myspace/zap.c:52 +msgstr "Používateľ %s vás nachytal!" + +#: ../libpurple/protocols/myspace/zap.c:81 #, c-format msgid "Punking %s..." -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:53 +msgstr "Nachytali ste používateľa %s..." + +#. Raspberry is a slang term for the vibrating sound made +#. * when you stick your tongue out of your mouth with your +#. * lips closed and blow. It is typically done when +#. * gloating or bragging. Nowadays it's a pretty silly +#. * gesture, so it does not carry a harsh negative +#. * connotation. It is generally used in a playful tone +#. * with friends. +#: ../libpurple/protocols/myspace/zap.c:90 msgid "Raspberry" -msgstr "" - -#: ../libpurple/protocols/myspace/zap.c:53 -#, fuzzy, c-format +msgstr "Vzdychnúť si na" + +#: ../libpurple/protocols/myspace/zap.c:90 +#, c-format msgid "%s has raspberried you!" -msgstr "Používateľ %s sa prihlásil." - -#: ../libpurple/protocols/myspace/zap.c:53 +msgstr "Používateľ %s si vzdychol!" + +#: ../libpurple/protocols/myspace/zap.c:90 #, c-format msgid "Raspberrying %s..." -msgstr "" +msgstr "Vzdychli ste si na používateľa %s..." #: ../libpurple/protocols/novell/nmuser.c:1864 msgid "Required parameters not passed in" @@ -7834,42 +7842,42 @@ msgid "Login failed (%s)." msgstr "Prihlásenie zlyhalo (%s)." -#: ../libpurple/protocols/novell/novell.c:247 +#: ../libpurple/protocols/novell/novell.c:249 #, c-format msgid "Unable to send message. Could not get details for user (%s)." msgstr "" "Nepodarilo sa odoslať správu. Nepodarilo sa zobraziť podrobnosti o " "používateľovi (%s)." -#: ../libpurple/protocols/novell/novell.c:396 +#: ../libpurple/protocols/novell/novell.c:398 #, c-format msgid "Unable to add %s to your buddy list (%s)." msgstr "Nepodarilo sa pridať používateľa %s do vášho zoznamu priateľov (%s)." #. TODO: Improve this! message to who or for what conference? -#: ../libpurple/protocols/novell/novell.c:422 +#: ../libpurple/protocols/novell/novell.c:424 #, c-format msgid "Unable to send message (%s)." msgstr "Nepodarilo sa odoslať správu (%s)." -#: ../libpurple/protocols/novell/novell.c:493 -#: ../libpurple/protocols/novell/novell.c:985 +#: ../libpurple/protocols/novell/novell.c:495 +#: ../libpurple/protocols/novell/novell.c:987 #, c-format msgid "Unable to invite user (%s)." msgstr "Nepodarilo sa pozvať používateľa (%s)." -#: ../libpurple/protocols/novell/novell.c:532 +#: ../libpurple/protocols/novell/novell.c:534 #, c-format msgid "Unable to send message to %s. Could not create the conference (%s)." msgstr "" "Nepodarilo sa odoslať správu pre %s. Nepodarilo sa vytvoriť konferenciu (%s)." -#: ../libpurple/protocols/novell/novell.c:537 +#: ../libpurple/protocols/novell/novell.c:539 #, c-format msgid "Unable to send message. Could not create the conference (%s)." msgstr "Nepodarilo sa odoslať správu. Nepodarilo sa vytvoriť konferenciu (%s)." -#: ../libpurple/protocols/novell/novell.c:584 +#: ../libpurple/protocols/novell/novell.c:586 #, c-format msgid "" "Unable to move user %s to folder %s in the server side list. Error while " @@ -7878,7 +7886,7 @@ "Nepodarilo sa presunúť používateľa %s do priečinka %s v serverovom zozname. " "Chyba počas vytvárania priečinku (%s)." -#: ../libpurple/protocols/novell/novell.c:632 +#: ../libpurple/protocols/novell/novell.c:634 #, c-format msgid "" "Unable to add %s to your buddy list. Error creating folder in server side " @@ -7887,61 +7895,61 @@ "Nebolo možné pridať %s do vášho zoznamu priateľov. Chyba počas vytvárania " "priečinku v serverovom zozname (%s)." -#: ../libpurple/protocols/novell/novell.c:705 +#: ../libpurple/protocols/novell/novell.c:707 #, c-format msgid "Could not get details for user %s (%s)." msgstr "Nepodarilo sa zobraziť podrobnosti o používateľovi %s (%s)." -#: ../libpurple/protocols/novell/novell.c:751 -#: ../libpurple/protocols/novell/novell.c:897 +#: ../libpurple/protocols/novell/novell.c:753 +#: ../libpurple/protocols/novell/novell.c:899 #, c-format msgid "Unable to add user to privacy list (%s)." msgstr "Nepodarilo sa pridať do zoznamu súkromných (%s)" -#: ../libpurple/protocols/novell/novell.c:798 +#: ../libpurple/protocols/novell/novell.c:800 #, c-format msgid "Unable to add %s to deny list (%s)." msgstr "Nepodarilo sa pridať %s do zoznamu blokovaných (%s)" -#: ../libpurple/protocols/novell/novell.c:851 +#: ../libpurple/protocols/novell/novell.c:853 #, c-format msgid "Unable to add %s to permit list (%s)." msgstr "Nepodarilo sa pridať %s do zoznamu povolených (%s)" -#: ../libpurple/protocols/novell/novell.c:919 +#: ../libpurple/protocols/novell/novell.c:921 #, c-format msgid "Unable to remove %s from privacy list (%s)." msgstr "Nepodarilo sa odstrániť %s zo zoznamu súkromných (%s)" -#: ../libpurple/protocols/novell/novell.c:942 -#: ../libpurple/protocols/novell/novell.c:1647 +#: ../libpurple/protocols/novell/novell.c:944 +#: ../libpurple/protocols/novell/novell.c:1649 #, c-format msgid "Unable to change server side privacy settings (%s)." msgstr "Nepodarilo sa zmeniť nastavenia súkromných na strane servera (%s)." -#: ../libpurple/protocols/novell/novell.c:1012 +#: ../libpurple/protocols/novell/novell.c:1014 #, c-format msgid "Unable to create conference (%s)." msgstr "Nepodarilo sa vytvoriť konferenciu (%s)." -#: ../libpurple/protocols/novell/novell.c:1121 -#: ../libpurple/protocols/novell/novell.c:1692 +#: ../libpurple/protocols/novell/novell.c:1123 +#: ../libpurple/protocols/novell/novell.c:1694 msgid "Error communicating with server. Closing connection." msgstr "Chyba počas komunikácie so serverom. Uzatvára sa pripojenie." -#: ../libpurple/protocols/novell/novell.c:1476 +#: ../libpurple/protocols/novell/novell.c:1478 msgid "Telephone Number" msgstr "Telefónne číslo" -#: ../libpurple/protocols/novell/novell.c:1482 +#: ../libpurple/protocols/novell/novell.c:1484 msgid "Personal Title" msgstr "Osobný titul" -#: ../libpurple/protocols/novell/novell.c:1486 +#: ../libpurple/protocols/novell/novell.c:1488 msgid "Mailstop" msgstr "Pošta" -#: ../libpurple/protocols/novell/novell.c:1502 +#: ../libpurple/protocols/novell/novell.c:1504 #: ../libpurple/protocols/sametime/sametime.c:4122 msgid "User ID" msgstr "ID používateľa" @@ -7952,41 +7960,41 @@ #. purple_notify_user_info_add_pair(user_info, tag, value); #. } #. -#: ../libpurple/protocols/novell/novell.c:1515 +#: ../libpurple/protocols/novell/novell.c:1517 msgid "Full name" msgstr "Celé meno" -#: ../libpurple/protocols/novell/novell.c:1637 +#: ../libpurple/protocols/novell/novell.c:1639 #, c-format msgid "GroupWise Conference %d" msgstr "GroupWise konferencia %d" -#: ../libpurple/protocols/novell/novell.c:1668 +#: ../libpurple/protocols/novell/novell.c:1670 msgid "Unable to make SSL connection to server." msgstr "Nepodarilo sa vytvoriť SSL pripojenie na server." -#: ../libpurple/protocols/novell/novell.c:1720 +#: ../libpurple/protocols/novell/novell.c:1722 msgid "Authenticating..." msgstr "Overuje sa..." -#: ../libpurple/protocols/novell/novell.c:1732 +#: ../libpurple/protocols/novell/novell.c:1734 msgid "Unable to connect to server." msgstr "Nepodarilo sa pripojiť na server." -#: ../libpurple/protocols/novell/novell.c:1735 +#: ../libpurple/protocols/novell/novell.c:1737 msgid "Waiting for response..." msgstr "Čaká sa na odpoveď..." -#: ../libpurple/protocols/novell/novell.c:1870 +#: ../libpurple/protocols/novell/novell.c:1872 #, c-format msgid "%s has been invited to this conversation." msgstr "Používateľ %s bol pozvaný na konferenciu." -#: ../libpurple/protocols/novell/novell.c:1898 +#: ../libpurple/protocols/novell/novell.c:1900 msgid "Invitation to Conversation" msgstr "Prozvánka na konferenciu" -#: ../libpurple/protocols/novell/novell.c:1899 +#: ../libpurple/protocols/novell/novell.c:1901 #, c-format msgid "" "Invitation from: %s\n" @@ -7997,17 +8005,16 @@ "\n" "Odoslal: %s" -#: ../libpurple/protocols/novell/novell.c:1901 +#: ../libpurple/protocols/novell/novell.c:1903 msgid "Would you like to join the conversation?" msgstr "Chcete sa pripojiť do tejto konverzácie?" -#. we don't want to reconnect in this case -#: ../libpurple/protocols/novell/novell.c:2012 +#: ../libpurple/protocols/novell/novell.c:2017 msgid "You have been logged out because you logged in at another workstation." msgstr "" "Boli ste odhlásený, pretože ste sa prihlásili na inej pracovnej stanici." -#: ../libpurple/protocols/novell/novell.c:2069 +#: ../libpurple/protocols/novell/novell.c:2074 #, c-format msgid "" "%s appears to be offline and did not receive the message that you just sent." @@ -8018,7 +8025,7 @@ #. * purple_request_fields(gc, _("Server Address"),...); #. #. ...but for now just error out with a nice message. -#: ../libpurple/protocols/novell/novell.c:2167 +#: ../libpurple/protocols/novell/novell.c:2172 msgid "" "Unable to connect to server. Please enter the address of the server you wish " "to connect to." @@ -8026,12 +8033,11 @@ "Nedá sa pripojiť na server. Zadajte, prosím, adresu servera, na ktorý sa " "chcete pripojiť." -#: ../libpurple/protocols/novell/novell.c:2195 +#: ../libpurple/protocols/novell/novell.c:2200 msgid "Error. SSL support is not installed." msgstr "Chyba. SSL podpora nie je nainštalovaná." -#: ../libpurple/protocols/novell/novell.c:2504 -#, c-format +#: ../libpurple/protocols/novell/novell.c:2509 msgid "This conference has been closed. No more messages can be sent." msgstr "" "Táto konferencia bola uzavretá. Nie je možné do nej odosielať ďalšie správy." @@ -8046,31 +8052,31 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/novell/novell.c:3518 -#: ../libpurple/protocols/novell/novell.c:3520 +#: ../libpurple/protocols/novell/novell.c:3523 +#: ../libpurple/protocols/novell/novell.c:3525 msgid "Novell GroupWise Messenger Protocol Plugin" msgstr "Modul protokolu Novell GroupWise Messenger" -#: ../libpurple/protocols/novell/novell.c:3545 +#: ../libpurple/protocols/novell/novell.c:3550 msgid "Server address" msgstr "Adresa servera" -#: ../libpurple/protocols/novell/novell.c:3549 +#: ../libpurple/protocols/novell/novell.c:3554 msgid "Server port" msgstr "Port servera" -#: ../libpurple/protocols/oscar/flap_connection.c:387 -#: ../libpurple/protocols/yahoo/yahoo.c:2469 -#: ../libpurple/protocols/yahoo/yahoo.c:2636 +#: ../libpurple/protocols/oscar/flap_connection.c:389 +#: ../libpurple/protocols/yahoo/yahoo.c:2471 +#: ../libpurple/protocols/yahoo/yahoo.c:2638 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581 #: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225 #: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453 msgid "Server closed the connection." msgstr "Server zrušil pripojenie." -#: ../libpurple/protocols/oscar/flap_connection.c:389 -#: ../libpurple/protocols/yahoo/yahoo.c:2463 -#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593 +#: ../libpurple/protocols/oscar/flap_connection.c:391 +#: ../libpurple/protocols/yahoo/yahoo.c:2465 +#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:593 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237 #: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465 #, c-format @@ -8081,7 +8087,7 @@ "Pripojenie k servera bolo prerušené:\n" "%s" -#: ../libpurple/protocols/oscar/flap_connection.c:392 +#: ../libpurple/protocols/oscar/flap_connection.c:394 #: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250 #: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421 #: ../libpurple/proxy.c:1478 @@ -8119,36 +8125,44 @@ msgstr "Modul protokolu ICQ" #: ../libpurple/protocols/oscar/libicq.c:147 -#: ../libpurple/protocols/yahoo/yahoo.c:4410 +#: ../libpurple/protocols/yahoo/yahoo.c:4412 #: ../libpurple/protocols/zephyr/zephyr.c:2997 msgid "Encoding" msgstr "Kódovanie" -#: ../libpurple/protocols/oscar/odc.c:40 +#: ../libpurple/protocols/oscar/odc.c:42 msgid "The remote user has closed the connection." msgstr "Vzdialený používateľ zrušil pripojenie." -#: ../libpurple/protocols/oscar/odc.c:42 +#: ../libpurple/protocols/oscar/odc.c:44 msgid "The remote user has declined your request." msgstr "Vzdialený použivateľ odmietol vašu požiadavku." -#: ../libpurple/protocols/oscar/odc.c:44 +#: ../libpurple/protocols/oscar/odc.c:46 #, c-format msgid "Lost connection with the remote user:<br>%s" msgstr "Pripojenie so vzidaleným použivateľom je prerušené:<br>%s" -#: ../libpurple/protocols/oscar/odc.c:47 +#: ../libpurple/protocols/oscar/odc.c:49 msgid "Received invalid data on connection with remote user." msgstr "Prijaté neplatné dáta pri spojení so vzdialeným používateľom." -#: ../libpurple/protocols/oscar/odc.c:49 +#: ../libpurple/protocols/oscar/odc.c:51 msgid "Could not establish a connection with the remote user." msgstr "Nepodarilo sa založiť pripojenie so vzdialeným používateľom." -#: ../libpurple/protocols/oscar/odc.c:560 +#: ../libpurple/protocols/oscar/odc.c:562 msgid "Direct IM established" msgstr "Bola založená priama komunikácia" +#: ../libpurple/protocols/oscar/odc.c:600 +#, c-format +msgid "" +"%s tried to send you a %s file, but we only allow files up to %s over Direct " +"IM. Try using file transfer instead.\n" +msgstr "" +"Používateľ %s vám chcel poslať súbor %s, ale cez priame IM sú povolené súbory len do %s. Skúste namiesto toho použiť prenos súborov.\n" + #: ../libpurple/protocols/oscar/oft.c:656 #, c-format msgid "File %s is %s, which is larger than the maximum size of %s." @@ -8294,7 +8308,7 @@ msgstr "Chat" #: ../libpurple/protocols/oscar/oscar.c:651 -#: ../libpurple/protocols/oscar/oscar.c:6010 +#: ../libpurple/protocols/oscar/oscar.c:6062 msgid "Get File" msgstr "Získať súbor" @@ -8367,49 +8381,43 @@ msgstr "Kamera" #: ../libpurple/protocols/oscar/oscar.c:725 -#: ../libpurple/protocols/oscar/oscar.c:5780 -#, c-format +#: ../libpurple/protocols/oscar/oscar.c:5832 msgid "Free For Chat" msgstr "Voľný pre rozhovor" #: ../libpurple/protocols/oscar/oscar.c:729 -#: ../libpurple/protocols/oscar/oscar.c:5815 -#, c-format +#: ../libpurple/protocols/oscar/oscar.c:5867 msgid "Not Available" msgstr "Nedostupný" #: ../libpurple/protocols/oscar/oscar.c:731 -#: ../libpurple/protocols/oscar/oscar.c:5801 -#, c-format +#: ../libpurple/protocols/oscar/oscar.c:5853 msgid "Occupied" msgstr "Zaneprázdnený" #: ../libpurple/protocols/oscar/oscar.c:735 -#, c-format msgid "Web Aware" msgstr "Web aware" #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183 #: ../libpurple/protocols/qq/qq.c:288 -#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157 +#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:157 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060 -#, c-format msgid "Invisible" msgstr "Neviditeľný" #: ../libpurple/protocols/oscar/oscar.c:739 -#, c-format msgid "Online" msgstr "Pripojený" #: ../libpurple/protocols/oscar/oscar.c:838 -#: ../libpurple/protocols/oscar/oscar.c:3707 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126 +#: ../libpurple/protocols/oscar/oscar.c:3721 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128 msgid "IP Address" msgstr "IP adresa" #: ../libpurple/protocols/oscar/oscar.c:845 -#: ../libpurple/protocols/oscar/oscar.c:2891 +#: ../libpurple/protocols/oscar/oscar.c:2905 msgid "Warning Level" msgstr "Úroveň upozornenia" @@ -8461,14 +8469,14 @@ "písmená, čísla a medzery." #: ../libpurple/protocols/oscar/oscar.c:1345 -#: ../libpurple/protocols/yahoo/yahoo.c:2105 +#: ../libpurple/protocols/yahoo/yahoo.c:2107 msgid "Invalid screen name." msgstr "Chybné používateľské meno." #: ../libpurple/protocols/oscar/oscar.c:1352 -#: ../libpurple/protocols/qq/login_logout.c:483 -#: ../libpurple/protocols/simple/simple.c:1045 -#: ../libpurple/protocols/yahoo/yahoo.c:2126 +#: ../libpurple/protocols/qq/login_logout.c:485 +#: ../libpurple/protocols/simple/simple.c:1047 +#: ../libpurple/protocols/yahoo/yahoo.c:2128 msgid "Incorrect password." msgstr "Nesprávne heslo." @@ -8521,10 +8529,10 @@ #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. #. #: ../libpurple/protocols/oscar/oscar.c:1452 -#: ../libpurple/protocols/oscar/oscar.c:2232 -#: ../libpurple/protocols/oscar/oscar.c:2281 -#: ../libpurple/protocols/oscar/oscar.c:5885 -#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388 +#: ../libpurple/protocols/oscar/oscar.c:2246 +#: ../libpurple/protocols/oscar/oscar.c:2295 +#: ../libpurple/protocols/oscar/oscar.c:5937 +#: ../libpurple/protocols/oscar/oscar.c:6218 ../libpurple/request.h:1388 msgid "_OK" msgstr "_OK" @@ -8560,33 +8568,33 @@ msgid "Unable to initialize connection" msgstr "Spojenie sa nedá inicializovať" -#: ../libpurple/protocols/oscar/oscar.c:2202 +#: ../libpurple/protocols/oscar/oscar.c:2204 msgid "Please authorize me so I can add you to my buddy list." msgstr "" "Prosím, autorizujte ma, aby som si vás mohol pridať do svojho zoznamu " "priateľov." -#: ../libpurple/protocols/oscar/oscar.c:2230 +#: ../libpurple/protocols/oscar/oscar.c:2244 msgid "Authorization Request Message:" msgstr "Žiadosť o autorizáciu:" -#: ../libpurple/protocols/oscar/oscar.c:2231 +#: ../libpurple/protocols/oscar/oscar.c:2245 msgid "Please authorize me!" msgstr "Autorizujte ma, prosím!" -#: ../libpurple/protocols/oscar/oscar.c:2272 -#: ../libpurple/protocols/oscar/oscar.c:2280 -#: ../libpurple/protocols/oscar/oscar.c:2407 -#: ../libpurple/protocols/oscar/oscar.c:5263 -#: ../libpurple/protocols/yahoo/yahoo.c:1030 +#: ../libpurple/protocols/oscar/oscar.c:2286 +#: ../libpurple/protocols/oscar/oscar.c:2294 +#: ../libpurple/protocols/oscar/oscar.c:2421 +#: ../libpurple/protocols/oscar/oscar.c:5313 +#: ../libpurple/protocols/yahoo/yahoo.c:1032 msgid "No reason given." msgstr "Nebol uvedený dôvod." -#: ../libpurple/protocols/oscar/oscar.c:2279 +#: ../libpurple/protocols/oscar/oscar.c:2293 msgid "Authorization Denied Message:" msgstr "Správa zamietnutia autorizácie:" -#: ../libpurple/protocols/oscar/oscar.c:2407 +#: ../libpurple/protocols/oscar/oscar.c:2421 #, c-format msgid "" "The user %u has denied your request to add them to your buddy list for the " @@ -8597,18 +8605,18 @@ "nasledujúcich dôvodov:\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2408 +#: ../libpurple/protocols/oscar/oscar.c:2422 msgid "ICQ authorization denied." msgstr "ICQ autorizácia zamietnutá." #. Someone has granted you authorization -#: ../libpurple/protocols/oscar/oscar.c:2415 +#: ../libpurple/protocols/oscar/oscar.c:2429 #, c-format msgid "The user %u has granted your request to add them to your buddy list." msgstr "" "Používateľ %u prijal vašu požiadavku o pridanie do vášho zoznamu priateľov." -#: ../libpurple/protocols/oscar/oscar.c:2423 +#: ../libpurple/protocols/oscar/oscar.c:2437 #, c-format msgid "" "You have received a special message\n" @@ -8621,7 +8629,7 @@ "od: %s [%s]\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2431 +#: ../libpurple/protocols/oscar/oscar.c:2445 #, c-format msgid "" "You have received an ICQ page\n" @@ -8634,7 +8642,7 @@ "od: %s [%s]\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2439 +#: ../libpurple/protocols/oscar/oscar.c:2453 #, c-format msgid "" "You have received an ICQ e-mail from %s [%s]\n" @@ -8647,24 +8655,24 @@ "Správa je:\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2460 +#: ../libpurple/protocols/oscar/oscar.c:2474 #, c-format msgid "ICQ user %u has sent you a buddy: %s (%s)" msgstr "Používateľ protokolu ICQ, %u, vám poslal priateľa: %s (%s)" -#: ../libpurple/protocols/oscar/oscar.c:2466 +#: ../libpurple/protocols/oscar/oscar.c:2480 msgid "Do you want to add this buddy to your buddy list?" msgstr "Chcete pridať tohoto priateľa do svojho zoznamu priateľov?" -#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309 +#: ../libpurple/protocols/oscar/oscar.c:2485 ../pidgin/gtkroomlist.c:309 msgid "_Add" msgstr "_Pridať" -#: ../libpurple/protocols/oscar/oscar.c:2472 +#: ../libpurple/protocols/oscar/oscar.c:2486 msgid "_Decline" msgstr "Odmietnuť" -#: ../libpurple/protocols/oscar/oscar.c:2596 +#: ../libpurple/protocols/oscar/oscar.c:2610 #, c-format msgid "You missed %hu message from %s because it was invalid." msgid_plural "You missed %hu messages from %s because they were invalid." @@ -8672,7 +8680,7 @@ msgstr[1] "Prišli ste o %hu správu od používateľa %s, pretože bola chybná." msgstr[2] "Prišli ste o %hu správy od používateľa %s, pretože boli chybné." -#: ../libpurple/protocols/oscar/oscar.c:2605 +#: ../libpurple/protocols/oscar/oscar.c:2619 #, c-format msgid "You missed %hu message from %s because it was too large." msgid_plural "You missed %hu messages from %s because they were too large." @@ -8680,7 +8688,7 @@ msgstr[1] "%hu správy od %s neboli prijaté, pretože boli príliš veľké." msgstr[2] "%hu správ od %s nebolo prijatých, pretože boli príliš veľké." -#: ../libpurple/protocols/oscar/oscar.c:2614 +#: ../libpurple/protocols/oscar/oscar.c:2628 #, c-format msgid "" "You missed %hu message from %s because the rate limit has been exceeded." @@ -8696,7 +8704,7 @@ "Prišli ste o %hu správy od používateľa %s, pretože bol prekročený limit " "hodnotenia." -#: ../libpurple/protocols/oscar/oscar.c:2623 +#: ../libpurple/protocols/oscar/oscar.c:2637 #, c-format msgid "You missed %hu message from %s because he/she was too evil." msgid_plural "You missed %hu messages from %s because he/she was too evil." @@ -8704,7 +8712,7 @@ msgstr[1] "Prišli ste o %hu správu od používateľa %s, pretože je príliš zlý." msgstr[2] "Prišli ste o %hu správy od používateľa %s, pretože je príliš zlý." -#: ../libpurple/protocols/oscar/oscar.c:2632 +#: ../libpurple/protocols/oscar/oscar.c:2646 #, c-format msgid "You missed %hu message from %s because you are too evil." msgid_plural "You missed %hu messages from %s because you are too evil." @@ -8712,7 +8720,7 @@ msgstr[1] "Prišli ste o %hu správu od používateľa %s, pretože ste príliš zlý." msgstr[2] "Prišli ste o %hu správy od používateľa %s, pretože ste príliš zlý." -#: ../libpurple/protocols/oscar/oscar.c:2641 +#: ../libpurple/protocols/oscar/oscar.c:2655 #, c-format msgid "You missed %hu message from %s for an unknown reason." msgid_plural "You missed %hu messages from %s for an unknown reason." @@ -8721,47 +8729,47 @@ msgstr[2] "Z neznámeho dôvodu ste prišli o %hu správy od používateľa %s." #. Data is assumed to be the destination sn -#: ../libpurple/protocols/oscar/oscar.c:2796 +#: ../libpurple/protocols/oscar/oscar.c:2810 #, c-format msgid "Unable to send message: %s" msgstr "Nemôžem odoslať správu: %s" -#: ../libpurple/protocols/oscar/oscar.c:2796 -#: ../libpurple/protocols/oscar/oscar.c:2801 -#: ../libpurple/protocols/oscar/oscar.c:2865 +#: ../libpurple/protocols/oscar/oscar.c:2810 +#: ../libpurple/protocols/oscar/oscar.c:2815 +#: ../libpurple/protocols/oscar/oscar.c:2879 msgid "Unknown reason." msgstr "Neznámy dôvod." -#: ../libpurple/protocols/oscar/oscar.c:2799 +#: ../libpurple/protocols/oscar/oscar.c:2813 #: ../libpurple/protocols/sametime/sametime.c:2409 #, c-format msgid "Unable to send message to %s:" msgstr "Nemôžem poslať správu k %s:" -#: ../libpurple/protocols/oscar/oscar.c:2865 +#: ../libpurple/protocols/oscar/oscar.c:2879 #, c-format msgid "User information not available: %s" msgstr "Informácie o používateľovi sú nedostupné: %s" -#: ../libpurple/protocols/oscar/oscar.c:2896 +#: ../libpurple/protocols/oscar/oscar.c:2910 msgid "Online Since" msgstr "Pripojený od" -#: ../libpurple/protocols/oscar/oscar.c:2901 +#: ../libpurple/protocols/oscar/oscar.c:2915 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185 msgid "Member Since" msgstr "Člen od" -#: ../libpurple/protocols/oscar/oscar.c:2936 +#: ../libpurple/protocols/oscar/oscar.c:2950 msgid "Available Message" msgstr "Dostupná správa" -#: ../libpurple/protocols/oscar/oscar.c:3044 +#: ../libpurple/protocols/oscar/oscar.c:3058 msgid "Your AIM connection may be lost." msgstr "Vaše AIM spojenie je zrejme prerušené." #. The conversion failed! -#: ../libpurple/protocols/oscar/oscar.c:3232 +#: ../libpurple/protocols/oscar/oscar.c:3246 msgid "" "[Unable to display a message from this user because it contained invalid " "characters.]" @@ -8769,7 +8777,7 @@ "[Správa od používateľa obsahovala nesprávne znaky, preto ju nebolo možné " "zobraziť.]" -#: ../libpurple/protocols/oscar/oscar.c:3396 +#: ../libpurple/protocols/oscar/oscar.c:3410 msgid "" "The last action you attempted could not be performed because you are over " "the rate limit. Please wait 10 seconds and try again." @@ -8777,53 +8785,53 @@ "Akciu nebolo možné vykonať, pretože ste prekročili limit hodnotenia. Prosím, " "počkajte 10 sekúnd a skúste to znovu." -#: ../libpurple/protocols/oscar/oscar.c:3479 +#: ../libpurple/protocols/oscar/oscar.c:3493 #: ../libpurple/protocols/toc/toc.c:977 #, c-format msgid "You have been disconnected from chat room %s." msgstr "Boli ste odpojení z miestnosti %s." -#: ../libpurple/protocols/oscar/oscar.c:3729 +#: ../libpurple/protocols/oscar/oscar.c:3743 #: ../libpurple/protocols/silc/util.c:585 #: ../libpurple/protocols/silc10/util.c:581 msgid "Mobile Phone" msgstr "Mobilný telefón" -#: ../libpurple/protocols/oscar/oscar.c:3759 +#: ../libpurple/protocols/oscar/oscar.c:3773 msgid "Personal Web Page" msgstr "Osobná webová stránka" -#: ../libpurple/protocols/oscar/oscar.c:3783 +#: ../libpurple/protocols/oscar/oscar.c:3797 #: ../libpurple/protocols/qq/buddy_info.c:40 msgid "Additional Information" msgstr "Ďoplňujúce informácie" -#: ../libpurple/protocols/oscar/oscar.c:3791 -#: ../libpurple/protocols/oscar/oscar.c:3804 +#: ../libpurple/protocols/oscar/oscar.c:3805 +#: ../libpurple/protocols/oscar/oscar.c:3818 msgid "Zip Code" msgstr "PSČ" -#: ../libpurple/protocols/oscar/oscar.c:3815 +#: ../libpurple/protocols/oscar/oscar.c:3829 msgid "Division" msgstr "Oddelenie" -#: ../libpurple/protocols/oscar/oscar.c:3816 +#: ../libpurple/protocols/oscar/oscar.c:3830 msgid "Position" msgstr "Pozícia" -#: ../libpurple/protocols/oscar/oscar.c:3818 +#: ../libpurple/protocols/oscar/oscar.c:3832 msgid "Web Page" msgstr "Webstránka" -#: ../libpurple/protocols/oscar/oscar.c:3821 +#: ../libpurple/protocols/oscar/oscar.c:3835 msgid "Work Information" msgstr "Pracovné informácie" -#: ../libpurple/protocols/oscar/oscar.c:3877 +#: ../libpurple/protocols/oscar/oscar.c:3891 msgid "Pop-Up Message" msgstr "Vyskakovacia správa" -#: ../libpurple/protocols/oscar/oscar.c:3917 +#: ../libpurple/protocols/oscar/oscar.c:3931 #, c-format msgid "The following screen name is associated with %s" msgid_plural "The following screen names are associated with %s" @@ -8831,30 +8839,29 @@ msgstr[1] "S %s je asociované nasledujúce používateľské meno" msgstr[2] "S %s sú asociované nasledujúce používateľské mená" -#: ../libpurple/protocols/oscar/oscar.c:3922 +#: ../libpurple/protocols/oscar/oscar.c:3936 msgid "Screen name" msgstr "Používateľské meno" -#: ../libpurple/protocols/oscar/oscar.c:3948 +#: ../libpurple/protocols/oscar/oscar.c:3962 #, c-format msgid "No results found for e-mail address %s" msgstr "Pre e-mailovú %s adresu neboli nájdené žiadne výsledky" -#: ../libpurple/protocols/oscar/oscar.c:3969 +#: ../libpurple/protocols/oscar/oscar.c:3983 #, c-format msgid "You should receive an e-mail asking to confirm %s." msgstr "Mali by ste prijať e-mail so žiadosťou o potvrdenie %s." -#: ../libpurple/protocols/oscar/oscar.c:3971 +#: ../libpurple/protocols/oscar/oscar.c:3985 msgid "Account Confirmation Requested" msgstr "Podvrdenie účtu bolo vyžiadané" -#: ../libpurple/protocols/oscar/oscar.c:4002 -#, c-format +#: ../libpurple/protocols/oscar/oscar.c:4016 msgid "Error Changing Account Info" msgstr "Chyba pri zmene podrobností účtu" -#: ../libpurple/protocols/oscar/oscar.c:4005 +#: ../libpurple/protocols/oscar/oscar.c:4019 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " @@ -8863,13 +8870,13 @@ "Chyba 0x%04x: Nepodarilo sa formátovať používateľské meno, pretože " "požadované používateľské meno sa líši od pôvodného." -#: ../libpurple/protocols/oscar/oscar.c:4008 +#: ../libpurple/protocols/oscar/oscar.c:4022 #, c-format msgid "Error 0x%04x: Unable to format screen name because it is invalid." msgstr "" "Chyba 0x%04x: Nepodarilo sa formátovať používateľské meno, pretože je chybné." -#: ../libpurple/protocols/oscar/oscar.c:4011 +#: ../libpurple/protocols/oscar/oscar.c:4025 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " @@ -8878,7 +8885,7 @@ "Chyba 0x%04x: Nepodarilo sa formátovať používateľské meno, pretože " "požadované používateľské meno je príliš dlhé." -#: ../libpurple/protocols/oscar/oscar.c:4014 +#: ../libpurple/protocols/oscar/oscar.c:4028 #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because there is already a " @@ -8887,7 +8894,7 @@ "Chyba 0x%04x: Nepodarilo sa zmeniť e-mailovú adresu, pretože toto " "používateľské meno už má požiadavku." -#: ../libpurple/protocols/oscar/oscar.c:4017 +#: ../libpurple/protocols/oscar/oscar.c:4031 #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because the given address has " @@ -8896,7 +8903,7 @@ "Chyba 0x%04x: e-mailová adresa sa nedá zmeniť, pretože daná adresa má so " "sebou asociovaných veľmi veľa zobrazovaných mien." -#: ../libpurple/protocols/oscar/oscar.c:4020 +#: ../libpurple/protocols/oscar/oscar.c:4034 #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because the given address is " @@ -8905,32 +8912,32 @@ "Chyba 0x%04x: Nepodarilo sa zmeniť e-mailovú adresu, pretože zadaná adresa " "je chybná." -#: ../libpurple/protocols/oscar/oscar.c:4023 +#: ../libpurple/protocols/oscar/oscar.c:4037 #, c-format msgid "Error 0x%04x: Unknown error." msgstr "Chyba 0x%04x: Neznáma chyba." -#: ../libpurple/protocols/oscar/oscar.c:4033 +#: ../libpurple/protocols/oscar/oscar.c:4047 #, c-format msgid "The e-mail address for %s is %s" msgstr "E-mailová adresa používateľa %s je %s" -#: ../libpurple/protocols/oscar/oscar.c:4035 +#: ../libpurple/protocols/oscar/oscar.c:4049 msgid "Account Info" msgstr "Podrobnosti o účte" -#: ../libpurple/protocols/oscar/oscar.c:4218 +#: ../libpurple/protocols/oscar/oscar.c:4232 msgid "" "Your IM Image was not sent. You must be Direct Connected to send IM Images." msgstr "" "Váš obrázok nebol odoslaný. Na odosielanie obrázkov v správach musíte byť " "priamo pripojený." -#: ../libpurple/protocols/oscar/oscar.c:4489 +#: ../libpurple/protocols/oscar/oscar.c:4503 msgid "Unable to set AIM profile." msgstr "Nepodarilo sa odoslať AIM profil." -#: ../libpurple/protocols/oscar/oscar.c:4490 +#: ../libpurple/protocols/oscar/oscar.c:4504 msgid "" "You have probably requested to set your profile before the login procedure " "completed. Your profile remains unset; try setting it again when you are " @@ -8940,7 +8947,7 @@ "procedúry prihlásenia. Váš profil zostáva nenastavený, skúste ho nastaviť " "znovu, keď budete plne pripojený." -#: ../libpurple/protocols/oscar/oscar.c:4504 +#: ../libpurple/protocols/oscar/oscar.c:4518 #, c-format msgid "" "The maximum profile length of %d byte has been exceeded. It has been " @@ -8958,11 +8965,11 @@ "Maximálna dĺžka profilu, %d bajty, bola prekročená. Profil bol automaticky " "skrátený." -#: ../libpurple/protocols/oscar/oscar.c:4509 +#: ../libpurple/protocols/oscar/oscar.c:4523 msgid "Profile too long." msgstr "Profil je príliš dlhý." -#: ../libpurple/protocols/oscar/oscar.c:4554 +#: ../libpurple/protocols/oscar/oscar.c:4568 #, c-format msgid "" "The maximum away message length of %d byte has been exceeded. It has been " @@ -8980,11 +8987,11 @@ "Maximálna dĺžka správy neprítomnosti, %d bajty, bola prekročená. Správa " "bola automaticky skrátená." -#: ../libpurple/protocols/oscar/oscar.c:4559 +#: ../libpurple/protocols/oscar/oscar.c:4573 msgid "Away message too long." msgstr "Správa neprítomnosti je príliš dlhá." -#: ../libpurple/protocols/oscar/oscar.c:4628 +#: ../libpurple/protocols/oscar/oscar.c:4646 #, c-format msgid "" "Could not add the buddy %s because the screen name is invalid. Screen names " @@ -8995,17 +9002,17 @@ "Používateľské mená musia byť v tvare e-mailovej adresy, čísla, alebo musí " "byť prvý znak písmeno a ostatné znaky sú písmená, čísla a medzery." -#: ../libpurple/protocols/oscar/oscar.c:4630 -#: ../libpurple/protocols/oscar/oscar.c:5060 -#: ../libpurple/protocols/oscar/oscar.c:5075 +#: ../libpurple/protocols/oscar/oscar.c:4648 +#: ../libpurple/protocols/oscar/oscar.c:5099 +#: ../libpurple/protocols/oscar/oscar.c:5114 msgid "Unable To Add" msgstr "Nepodarilo sa pridať" -#: ../libpurple/protocols/oscar/oscar.c:4739 +#: ../libpurple/protocols/oscar/oscar.c:4767 msgid "Unable To Retrieve Buddy List" msgstr "Nepodarilo sa získať zoznam priateľov" -#: ../libpurple/protocols/oscar/oscar.c:4740 +#: ../libpurple/protocols/oscar/oscar.c:4768 msgid "" "The AIM servers were temporarily unable to send your buddy list. Your buddy " "list is not lost, and will probably become available in a few hours." @@ -9013,15 +9020,15 @@ "AIM servery vám dočasne neposlali váš zoznam priateľov. Váš zoznam " "priateľov nie je stratený, a mal by byť znovu dostupný o pár hodín." -#: ../libpurple/protocols/oscar/oscar.c:4922 -#: ../libpurple/protocols/oscar/oscar.c:4924 -#: ../libpurple/protocols/oscar/oscar.c:5140 -#: ../libpurple/protocols/oscar/oscar.c:5141 -#: ../libpurple/protocols/oscar/oscar.c:5146 +#: ../libpurple/protocols/oscar/oscar.c:4950 +#: ../libpurple/protocols/oscar/oscar.c:4952 +#: ../libpurple/protocols/oscar/oscar.c:5179 +#: ../libpurple/protocols/oscar/oscar.c:5180 +#: ../libpurple/protocols/oscar/oscar.c:5185 msgid "Orphans" msgstr "Siroty" -#: ../libpurple/protocols/oscar/oscar.c:5058 +#: ../libpurple/protocols/oscar/oscar.c:5097 #, c-format msgid "" "Could not add the buddy %s because you have too many buddies in your buddy " @@ -9030,17 +9037,17 @@ "Nepodarilo sa pridať priateľa %s, pretože vo vašom zozname priateľov máte " "príliš veľa priateľov. Odstránte, prosím, jedného a skúste to znovu" -#: ../libpurple/protocols/oscar/oscar.c:5058 -#: ../libpurple/protocols/oscar/oscar.c:5073 +#: ../libpurple/protocols/oscar/oscar.c:5097 +#: ../libpurple/protocols/oscar/oscar.c:5112 msgid "(no name)" msgstr "(bez názvu)" -#: ../libpurple/protocols/oscar/oscar.c:5072 +#: ../libpurple/protocols/oscar/oscar.c:5111 #, c-format msgid "Could not add the buddy %s for an unknown reason." msgstr "Nebolo možné pridať priateľa %s z neznámeho dôvodu." -#: ../libpurple/protocols/oscar/oscar.c:5178 +#: ../libpurple/protocols/oscar/oscar.c:5228 #, c-format msgid "" "The user %s has given you permission to add you to their buddy list. Do you " @@ -9049,22 +9056,22 @@ "Používateľ %s vám udelil oprávnenie, aby si vás mohol pridať do svojho " "zoznamu kamarátov. Chcete pridať jeho do svojho?" -#: ../libpurple/protocols/oscar/oscar.c:5186 +#: ../libpurple/protocols/oscar/oscar.c:5236 msgid "Authorization Given" msgstr "Autorizácia udelená" #. Granted -#: ../libpurple/protocols/oscar/oscar.c:5259 +#: ../libpurple/protocols/oscar/oscar.c:5309 #, c-format msgid "The user %s has granted your request to add them to your buddy list." msgstr "Používateľ %s vám dovolil pridať ho do vášho zoznamu priateľov." -#: ../libpurple/protocols/oscar/oscar.c:5260 +#: ../libpurple/protocols/oscar/oscar.c:5310 msgid "Authorization Granted" msgstr "Udelená autorizácia" #. Denied -#: ../libpurple/protocols/oscar/oscar.c:5263 +#: ../libpurple/protocols/oscar/oscar.c:5313 #, c-format msgid "" "The user %s has denied your request to add them to your buddy list for the " @@ -9075,52 +9082,52 @@ "nasledujúceho dôvodu:\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:5264 +#: ../libpurple/protocols/oscar/oscar.c:5314 msgid "Authorization Denied" msgstr "Autorizácia zamietnutá" -#: ../libpurple/protocols/oscar/oscar.c:5300 +#: ../libpurple/protocols/oscar/oscar.c:5350 #: ../libpurple/protocols/toc/toc.c:1371 msgid "_Exchange:" msgstr "_Výmena:" -#: ../libpurple/protocols/oscar/oscar.c:5340 +#: ../libpurple/protocols/oscar/oscar.c:5390 msgid "Invalid chat name specified." msgstr "Bol zadaný chybný názov chatu." -#: ../libpurple/protocols/oscar/oscar.c:5409 +#: ../libpurple/protocols/oscar/oscar.c:5459 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats." msgstr "" "Váš obrázok nebol odoslaný. V AIM chatoch nie je možné odosielať obrázky." -#: ../libpurple/protocols/oscar/oscar.c:5569 -#: ../libpurple/protocols/oscar/oscar.c:5574 +#: ../libpurple/protocols/oscar/oscar.c:5621 +#: ../libpurple/protocols/oscar/oscar.c:5626 msgid "Away Message" msgstr "Správa o neprítomnosti" -#: ../libpurple/protocols/oscar/oscar.c:5574 +#: ../libpurple/protocols/oscar/oscar.c:5626 msgid "<i>(retrieving)</i>" msgstr "<i>(prijíma sa)</i>" -#: ../libpurple/protocols/oscar/oscar.c:5774 +#: ../libpurple/protocols/oscar/oscar.c:5826 msgid "iTunes Music Store Link" msgstr "Odkaz na hudobný obchod iTunes" -#: ../libpurple/protocols/oscar/oscar.c:5882 +#: ../libpurple/protocols/oscar/oscar.c:5934 #, c-format msgid "Buddy Comment for %s" msgstr "Komentár priateľa %s" -#: ../libpurple/protocols/oscar/oscar.c:5883 +#: ../libpurple/protocols/oscar/oscar.c:5935 msgid "Buddy Comment:" msgstr "Komentár priateľa:" -#: ../libpurple/protocols/oscar/oscar.c:5930 +#: ../libpurple/protocols/oscar/oscar.c:5982 #, c-format msgid "You have selected to open a Direct IM connection with %s." msgstr "Rozhodli ste sa otvoriť Priame IM pripojenie s používateľom %s." -#: ../libpurple/protocols/oscar/oscar.c:5934 +#: ../libpurple/protocols/oscar/oscar.c:5986 msgid "" "Because this reveals your IP address, it may be considered a security risk. " "Do you wish to continue?" @@ -9128,65 +9135,65 @@ "Táto akcia odhalí vašu IP adresu, a preto môže byť hodnotená ako " "bezpečnostné riziko. Chcete pokračovať?" -#: ../libpurple/protocols/oscar/oscar.c:5940 +#: ../libpurple/protocols/oscar/oscar.c:5992 #: ../libpurple/protocols/oscar/peer.c:1045 msgid "C_onnect" msgstr "Prip_ojiť" -#: ../libpurple/protocols/oscar/oscar.c:5975 +#: ../libpurple/protocols/oscar/oscar.c:6027 msgid "Get AIM Info" msgstr "Získať info AIM" -#: ../libpurple/protocols/oscar/oscar.c:5981 +#: ../libpurple/protocols/oscar/oscar.c:6033 msgid "Edit Buddy Comment" msgstr "Upraviť komentár priateľa" -#: ../libpurple/protocols/oscar/oscar.c:5989 +#: ../libpurple/protocols/oscar/oscar.c:6041 msgid "Get Status Msg" msgstr "Získať správu o stave" -#: ../libpurple/protocols/oscar/oscar.c:6002 +#: ../libpurple/protocols/oscar/oscar.c:6054 msgid "Direct IM" msgstr "Priama rýchla správa" -#: ../libpurple/protocols/oscar/oscar.c:6024 +#: ../libpurple/protocols/oscar/oscar.c:6076 msgid "Re-request Authorization" msgstr "Znovu požiadať o autorizáciu" -#: ../libpurple/protocols/oscar/oscar.c:6083 +#: ../libpurple/protocols/oscar/oscar.c:6135 msgid "Require authorization" msgstr "Vyžadovať autorizáciu" -#: ../libpurple/protocols/oscar/oscar.c:6086 +#: ../libpurple/protocols/oscar/oscar.c:6138 msgid "Web aware (enabling this will cause you to receive SPAM!)" msgstr "Web aware (zapnutie tejto možnosti spôsobí, že budete dostávať SPAM!)" -#: ../libpurple/protocols/oscar/oscar.c:6091 +#: ../libpurple/protocols/oscar/oscar.c:6143 msgid "ICQ Privacy Options" msgstr "Nastavenie súkromia ICQ" -#: ../libpurple/protocols/oscar/oscar.c:6110 +#: ../libpurple/protocols/oscar/oscar.c:6162 msgid "The new formatting is invalid." msgstr "Nové formátovanie je chybné." -#: ../libpurple/protocols/oscar/oscar.c:6111 +#: ../libpurple/protocols/oscar/oscar.c:6163 msgid "Screen name formatting can change only capitalization and whitespace." msgstr "" "Formátovanie používateľského mena smie obsahovať len písmená a medzery." -#: ../libpurple/protocols/oscar/oscar.c:6164 +#: ../libpurple/protocols/oscar/oscar.c:6216 msgid "Change Address To:" msgstr "Zmeniť adresu na:" -#: ../libpurple/protocols/oscar/oscar.c:6210 +#: ../libpurple/protocols/oscar/oscar.c:6262 msgid "<i>you are not waiting for authorization</i>" msgstr "<i>nečakáte na autorizáciu</i>" -#: ../libpurple/protocols/oscar/oscar.c:6213 +#: ../libpurple/protocols/oscar/oscar.c:6265 msgid "You are awaiting authorization from the following buddies" msgstr "Očakávate autorizáciu od nasledujúcich priateľov" -#: ../libpurple/protocols/oscar/oscar.c:6214 +#: ../libpurple/protocols/oscar/oscar.c:6266 msgid "" "You can re-request authorization from these buddies by right-clicking on " "them and selecting \"Re-request Authorization.\"" @@ -9194,73 +9201,73 @@ "Týchto priateľov môžete znovu požiadať o autorizáciu, keď na nich kliknete " "pravým tlačidlom a vyberiete možnosť „Znovu požiadať o autorizáciu“." -#: ../libpurple/protocols/oscar/oscar.c:6231 +#: ../libpurple/protocols/oscar/oscar.c:6283 msgid "Find Buddy by E-Mail" msgstr "Nájsť priateľa podľa E-mailu" -#: ../libpurple/protocols/oscar/oscar.c:6232 +#: ../libpurple/protocols/oscar/oscar.c:6284 msgid "Search for a buddy by e-mail address" msgstr "Vyhľadávať priateľov podľa e-mailovej adresy" -#: ../libpurple/protocols/oscar/oscar.c:6233 +#: ../libpurple/protocols/oscar/oscar.c:6285 msgid "Type the e-mail address of the buddy you are searching for." msgstr "Zadajte e-mailovú adresu priateľa, ktorého hľadáte." -#: ../libpurple/protocols/oscar/oscar.c:6236 +#: ../libpurple/protocols/oscar/oscar.c:6288 msgid "_Search" msgstr "_Hľadať" -#: ../libpurple/protocols/oscar/oscar.c:6394 +#: ../libpurple/protocols/oscar/oscar.c:6446 msgid "Set User Info (URL)..." msgstr "Nastaviť podrobnosti používateľa (URL)..." -#: ../libpurple/protocols/oscar/oscar.c:6405 +#: ../libpurple/protocols/oscar/oscar.c:6457 msgid "Change Password (URL)" msgstr "Zmeniť heslo (URL)" -#: ../libpurple/protocols/oscar/oscar.c:6409 +#: ../libpurple/protocols/oscar/oscar.c:6461 msgid "Configure IM Forwarding (URL)" msgstr "Konfiguravať preposielanie správ (URL)" #. ICQ actions -#: ../libpurple/protocols/oscar/oscar.c:6419 +#: ../libpurple/protocols/oscar/oscar.c:6471 msgid "Set Privacy Options..." msgstr "Nastaviť možnosti súkromia..." #. AIM actions -#: ../libpurple/protocols/oscar/oscar.c:6426 +#: ../libpurple/protocols/oscar/oscar.c:6478 msgid "Confirm Account" msgstr "Potvrdiť účet" -#: ../libpurple/protocols/oscar/oscar.c:6430 +#: ../libpurple/protocols/oscar/oscar.c:6482 msgid "Display Currently Registered E-Mail Address" msgstr "Zobraziť momentálne registrovanú e-maiovú adresu" -#: ../libpurple/protocols/oscar/oscar.c:6434 +#: ../libpurple/protocols/oscar/oscar.c:6486 msgid "Change Currently Registered E-Mail Address..." msgstr "Zmeniť momentálne registrovanú e-maiovú adresu..." -#: ../libpurple/protocols/oscar/oscar.c:6441 +#: ../libpurple/protocols/oscar/oscar.c:6493 msgid "Show Buddies Awaiting Authorization" msgstr "Zobraziť priateľov, ktorí čakajú na autorizáciu" -#: ../libpurple/protocols/oscar/oscar.c:6447 +#: ../libpurple/protocols/oscar/oscar.c:6499 msgid "Search for Buddy by E-Mail Address..." msgstr "Hľadať priateľa podľa e-maiovej adresy..." -#: ../libpurple/protocols/oscar/oscar.c:6452 +#: ../libpurple/protocols/oscar/oscar.c:6504 msgid "Search for Buddy by Information" msgstr "Hľadať priateľa podľa podrobností" -#: ../libpurple/protocols/oscar/oscar.c:6520 +#: ../libpurple/protocols/oscar/oscar.c:6572 msgid "Use recent buddies group" msgstr "Použiť naposledy použitú skupinu kamarátov" -#: ../libpurple/protocols/oscar/oscar.c:6523 +#: ../libpurple/protocols/oscar/oscar.c:6575 msgid "Show how long you have been idle" msgstr "Zobrazí ako dlho ste boli nečinní" -#: ../libpurple/protocols/oscar/oscar.c:6678 +#: ../libpurple/protocols/oscar/oscar.c:6730 msgid "" "Always use ICQ proxy server for file transfers\n" "(slower, but does not reveal your IP address)" @@ -9279,7 +9286,6 @@ msgstr "Pokúšame sa pripojiť ku %s:%hu." #: ../libpurple/protocols/oscar/peer.c:856 -#, c-format msgid "Attempting to connect via proxy server." msgstr "Pokúšame sa pripojiť cez proxy server." @@ -9745,7 +9751,7 @@ msgid "Error requesting login token" msgstr "Chyba pri požadovaní prihlasovacieho tokenu" -#: ../libpurple/protocols/qq/login_logout.c:486 +#: ../libpurple/protocols/qq/login_logout.c:488 msgid "Unable to login, check debug log" msgstr "Nepodarilo sa pripojiť, skontrolujte ladiaci záznam" @@ -10121,7 +10127,7 @@ msgid "Send TEST Announcement" msgstr "Poslať ohlásenie TEST" -#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354 +#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4417 msgid "Topic:" msgstr "Téma:" @@ -10146,7 +10152,7 @@ msgid "No Sametime Community Server Specified" msgstr "Nebol určený žiadny server komunity rovnakého času" -#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041 +#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4323 msgid "Connect" msgstr "Pripojiť" @@ -10200,10 +10206,6 @@ "Identifikátoru „%s“ nevyhovujú žiadni používatelia vo vašej Sametime " "komunite. Tento záznam bol odstránený z vášho zoznamu priateľov." -#: ../libpurple/protocols/sametime/sametime.c:4425 -msgid "Unable to add user" -msgstr "Nebolo možné priadať používateľa" - #: ../libpurple/protocols/sametime/sametime.c:5011 #, c-format msgid "" @@ -10325,7 +10327,7 @@ "ho pridať do vášho zoznamu priateľov, alebo mu odoslať správu pomocou " "tlačidiel, ktoré sú nižšie." -#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756 +#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:762 msgid "Search Results" msgstr "Výsledky vyhľadávania" @@ -10902,7 +10904,6 @@ #: ../libpurple/protocols/silc/chat.c:153 #: ../libpurple/protocols/silc10/chat.c:152 -#, c-format msgid "<br><b>Channel Modes:</b> " msgstr "<br><b>Režimy kanála:</b> " @@ -10941,7 +10942,6 @@ #: ../libpurple/protocols/silc/chat.c:435 #: ../libpurple/protocols/silc10/chat.c:413 -#, c-format msgid "" "Channel authentication is used to secure the channel from unauthorized " "access. The authentication may be based on passphrase and digital " @@ -11563,7 +11563,6 @@ msgstr "Pripája sa na SILC server" #: ../libpurple/protocols/silc/silc.c:352 -#, c-format msgid "Could not load SILC key pair" msgstr "Nedá sa načítať pár kľúčov SILC" @@ -11592,8 +11591,7 @@ msgstr "Vaša aktuálna nálada" #: ../libpurple/protocols/silc/silc.c:741 -#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641 -#, c-format +#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643 msgid "Normal" msgstr "Normálna" @@ -11988,7 +11986,7 @@ msgstr "Protokol Secure Internet Live Conferencing (SILC)" #: ../libpurple/protocols/silc/silc.c:1910 -#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036 +#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038 msgid "Network" msgstr "Sieť" @@ -12166,7 +12164,7 @@ #: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284 #, c-format msgid "%s sent message to whiteboard. Would you like to open the whiteboard?" -msgstr "Používateľ %s odoslal správu na tabuľu. Želáte si otvoriť tabuľu?" +msgstr "Používateľ %s odoslal správu na tabuľu. Chcete otvoriť tabuľu?" #: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288 #, c-format @@ -12174,7 +12172,7 @@ "%s sent message to whiteboard on %s channel. Would you like to open the " "whiteboard?" msgstr "" -"Používateľ %s odoslal správu na tabuľu na kanáli %s. Želáte si otvoriť " +"Používateľ %s odoslal správu na tabuľu na kanáli %s. Chcete otvoriť " "tabuľu?" #: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302 @@ -12186,53 +12184,43 @@ msgstr "Nie sú dostupné žiadne štatistiky" #: ../libpurple/protocols/silc10/ops.c:1931 -#, c-format msgid "Failure: Version mismatch, upgrade your client" msgstr "Zlyhanie: Nezhoda verzií, aktualizujte vášho klienta" #: ../libpurple/protocols/silc10/ops.c:1934 -#, c-format msgid "Failure: Remote does not trust/support your public key" msgstr "" "Zlyhanie: Druhá strana nepodroruje alebo nedôveruje vášmu verejnému kľúču" #: ../libpurple/protocols/silc10/ops.c:1937 -#, c-format msgid "Failure: Remote does not support proposed KE group" msgstr "Zlyhanie: Druhá strana nepodroruje vyžiadanú KE skupinu" #: ../libpurple/protocols/silc10/ops.c:1940 -#, c-format msgid "Failure: Remote does not support proposed cipher" msgstr "Zlyhanie: Druhá strana nepodroruje vyžiadanú šifru" #: ../libpurple/protocols/silc10/ops.c:1943 -#, c-format msgid "Failure: Remote does not support proposed PKCS" msgstr "Zlyhanie: Druhá strana nepodroruje vyžiadané PKCS" #: ../libpurple/protocols/silc10/ops.c:1946 -#, c-format msgid "Failure: Remote does not support proposed hash function" msgstr "Chyba: Vzdialený nepodporuje ponúknutú hašovaciu funkciu" #: ../libpurple/protocols/silc10/ops.c:1949 -#, c-format msgid "Failure: Remote does not support proposed HMAC" msgstr "Chyba: Vzdialený nepodporuje ponúknutú HMAC" #: ../libpurple/protocols/silc10/ops.c:1951 -#, c-format msgid "Failure: Incorrect signature" msgstr "Chyba: Nesprávny podpis" #: ../libpurple/protocols/silc10/ops.c:1953 -#, c-format msgid "Failure: Invalid cookie" msgstr "Chyba: Neplatný koláčik (cookie)" #: ../libpurple/protocols/silc10/ops.c:1964 -#, c-format msgid "Failure: Authentication failed" msgstr "Chyba: Zlyhala antentifikácia" @@ -12259,31 +12247,30 @@ msgstr "Nepodarilo sa zapisovať" #: ../libpurple/protocols/simple/simple.c:438 -#: ../libpurple/protocols/simple/simple.c:1529 +#: ../libpurple/protocols/simple/simple.c:1531 msgid "Could not connect" msgstr "Nepodarilo sa pripojiť" -#: ../libpurple/protocols/simple/simple.c:1059 -#, fuzzy +#: ../libpurple/protocols/simple/simple.c:1061 msgid "Unknown server response." -msgstr "Neznámy dôvod." - -#: ../libpurple/protocols/simple/simple.c:1563 -#: ../libpurple/protocols/simple/simple.c:1605 -#: ../libpurple/protocols/simple/simple.c:1618 -#: ../libpurple/protocols/simple/simple.c:1669 +msgstr "Neznáma odpoveď serveru." + +#: ../libpurple/protocols/simple/simple.c:1565 +#: ../libpurple/protocols/simple/simple.c:1607 +#: ../libpurple/protocols/simple/simple.c:1620 +#: ../libpurple/protocols/simple/simple.c:1671 msgid "Could not create listen socket" msgstr "Nepodarilo sa vytvoriť socket pre príjem" -#: ../libpurple/protocols/simple/simple.c:1586 +#: ../libpurple/protocols/simple/simple.c:1588 msgid "Couldn't resolve host" msgstr "Nebolo možné preložiť názov hostiteľa" -#: ../libpurple/protocols/simple/simple.c:1677 +#: ../libpurple/protocols/simple/simple.c:1679 msgid "Could not resolve hostname" msgstr "Nebolo možné previesť názov hostiteľa na IP" -#: ../libpurple/protocols/simple/simple.c:1694 +#: ../libpurple/protocols/simple/simple.c:1696 msgid "SIP screen names may not contain whitespaces or @ symbols" msgstr "Používateľské mená SIP nemôžu obsahovať medzery alebo znaky @" @@ -12295,36 +12282,36 @@ #. *< id #. *< name #. *< version -#: ../libpurple/protocols/simple/simple.c:1870 +#: ../libpurple/protocols/simple/simple.c:1872 msgid "SIP/SIMPLE Protocol Plugin" msgstr "Modul protokolu SIP/SIMPLE" #. * summary -#: ../libpurple/protocols/simple/simple.c:1871 +#: ../libpurple/protocols/simple/simple.c:1873 msgid "The SIP/SIMPLE Protocol Plugin" msgstr "Modul pre protokol SIP/SIMPLE" -#: ../libpurple/protocols/simple/simple.c:1899 +#: ../libpurple/protocols/simple/simple.c:1901 msgid "Publish status (note: everyone may watch you)" msgstr "Zverejniť stav (poznámka: ktokoľvek vás môže sledovať)" -#: ../libpurple/protocols/simple/simple.c:1905 -msgid "Use UDP" -msgstr "Používať UDP" - #: ../libpurple/protocols/simple/simple.c:1907 +msgid "Use UDP" +msgstr "Používať UDP" + +#: ../libpurple/protocols/simple/simple.c:1909 msgid "Use proxy" msgstr "Používať proxy" -#: ../libpurple/protocols/simple/simple.c:1909 +#: ../libpurple/protocols/simple/simple.c:1911 msgid "Proxy" msgstr "Proxy" -#: ../libpurple/protocols/simple/simple.c:1911 +#: ../libpurple/protocols/simple/simple.c:1913 msgid "Auth User" msgstr "Autentifikačný používateľ" -#: ../libpurple/protocols/simple/simple.c:1913 +#: ../libpurple/protocols/simple/simple.c:1915 msgid "Auth Domain" msgstr "Autentifikačná doména" @@ -12369,7 +12356,6 @@ msgstr "Varovanie na %s nie je dovolené." #: ../libpurple/protocols/toc/toc.c:503 -#, c-format msgid "A message has been dropped, you are exceeding the server speed limit." msgstr "Správa bola zrušená, prekračujete rýchlostný limit servera" @@ -12395,47 +12381,38 @@ "Prišli ste o správu od používateľa %s, pretože bola odoslaná príliš rýchlo." #: ../libpurple/protocols/toc/toc.c:518 -#, c-format msgid "Failure." msgstr "Zlyhanie." #: ../libpurple/protocols/toc/toc.c:521 -#, c-format msgid "Too many matches." msgstr "Príliš veľa výskytov." #: ../libpurple/protocols/toc/toc.c:524 -#, c-format msgid "Need more qualifiers." msgstr "Vyžaduje viac parametrov." #: ../libpurple/protocols/toc/toc.c:527 -#, c-format msgid "Dir service temporarily unavailable." msgstr "Služba dir je dočasne nedostupná" #: ../libpurple/protocols/toc/toc.c:530 -#, c-format msgid "E-mail lookup restricted." msgstr "Vyhľadávanie e-mailu obmedzené." #: ../libpurple/protocols/toc/toc.c:533 -#, c-format msgid "Keyword ignored." msgstr "Kľúčové slovo bolo ignorované." #: ../libpurple/protocols/toc/toc.c:536 -#, c-format msgid "No keywords." msgstr "Žiadne kľúče." #: ../libpurple/protocols/toc/toc.c:539 -#, c-format msgid "User has no directory information." msgstr "Používateľ nemá žiadne podrobnosti v adresári." #: ../libpurple/protocols/toc/toc.c:543 -#, c-format msgid "Country not supported." msgstr "Krajina nie je podporovaná." @@ -12445,24 +12422,20 @@ msgstr "Neznáme zlyhanie: %s." #: ../libpurple/protocols/toc/toc.c:549 -#, c-format msgid "Incorrect screen name or password." msgstr "Nesprávne používateľské meno alebo heslo." #: ../libpurple/protocols/toc/toc.c:552 -#, c-format msgid "The service is temporarily unavailable." msgstr "Služba je dočasne nedostupná." #: ../libpurple/protocols/toc/toc.c:555 -#, c-format msgid "Your warning level is currently too high to log in." msgstr "" "Vaša úroveň upozornenia je momentálne príliš vysoká na to, aby ste sa mohli " "prihlásiť." #: ../libpurple/protocols/toc/toc.c:558 -#, c-format msgid "" "You have been connecting and disconnecting too frequently. Wait ten minutes " "and try again. If you continue to try, you will need to wait even longer." @@ -12500,8 +12473,8 @@ msgid "Password Change Successful" msgstr "Heslo bolo úspešne zmenené" -#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582 -#: ../pidgin/gtkblist.c:5932 +#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5871 +#: ../pidgin/gtkblist.c:6227 msgid "_Group:" msgstr "_Skupina:" @@ -12568,25 +12541,25 @@ msgid "TOC Protocol Plugin" msgstr "Modul protokolu TOC" -#: ../libpurple/protocols/yahoo/yahoo.c:782 +#: ../libpurple/protocols/yahoo/yahoo.c:784 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." msgstr "%s vám poslal pozvánku na webkameru, ktorá zatiaľ nie je podporovaná." -#: ../libpurple/protocols/yahoo/yahoo.c:838 +#: ../libpurple/protocols/yahoo/yahoo.c:840 msgid "Your Yahoo! message did not get sent." msgstr "Vaša Yahoo! správa nebola odoslaná." -#: ../libpurple/protocols/yahoo/yahoo.c:960 +#: ../libpurple/protocols/yahoo/yahoo.c:962 #, c-format msgid "Yahoo! system message for %s:" msgstr "Systémová správa Yahoo! pre %s:" -#: ../libpurple/protocols/yahoo/yahoo.c:1029 +#: ../libpurple/protocols/yahoo/yahoo.c:1031 msgid "Authorization denied message:" msgstr "Správa odmietnutia autorizácie" -#: ../libpurple/protocols/yahoo/yahoo.c:1047 +#: ../libpurple/protocols/yahoo/yahoo.c:1049 #, c-format msgid "" "%s has (retroactively) denied your request to add them to your list for the " @@ -12595,18 +12568,18 @@ "Používateľ %s (retroaktívne) zamietol vašu žiadosť o jeho pridanie do vášho " "zoznamu z nasledujúceho dôvodu: %s." -#: ../libpurple/protocols/yahoo/yahoo.c:1050 +#: ../libpurple/protocols/yahoo/yahoo.c:1052 #, c-format msgid "%s has (retroactively) denied your request to add them to your list." msgstr "" "Používateľ %s (retroaktívne) zamietol vašu žiadosť o jeho pridanie do vášho " "zoznamu." -#: ../libpurple/protocols/yahoo/yahoo.c:1052 +#: ../libpurple/protocols/yahoo/yahoo.c:1054 msgid "Add buddy rejected" msgstr "Pridanie kamaráta bolo odmietnuté" -#: ../libpurple/protocols/yahoo/yahoo.c:1994 +#: ../libpurple/protocols/yahoo/yahoo.c:1996 #, c-format msgid "" "The Yahoo server has requested the use of an unrecognized authentication " @@ -12616,11 +12589,11 @@ "Yahoo server vyžaduje neznámy spôsob autentifikácie. Zrejme sa nebude dať " "úspešne prihlásiť na Yahoo. Na adrese %s skontrolujte možnosť aktualizácie." -#: ../libpurple/protocols/yahoo/yahoo.c:1997 +#: ../libpurple/protocols/yahoo/yahoo.c:1999 msgid "Failed Yahoo! Authentication" msgstr "Zlyhala Yahoo! autentifikácia" -#: ../libpurple/protocols/yahoo/yahoo.c:2063 +#: ../libpurple/protocols/yahoo/yahoo.c:2065 #, c-format msgid "" "You have tried to ignore %s, but the user is on your buddy list. Clicking " @@ -12630,51 +12603,51 @@ "vašom zozname priateľov. Kliknutím „Áno“ odstránite používateľa zo zoznamu " "priateľov a ignorujete ho." -#: ../libpurple/protocols/yahoo/yahoo.c:2066 +#: ../libpurple/protocols/yahoo/yahoo.c:2068 msgid "Ignore buddy?" msgstr "Ignorovať priateľa?" -#: ../libpurple/protocols/yahoo/yahoo.c:2129 +#: ../libpurple/protocols/yahoo/yahoo.c:2131 msgid "Your account is locked, please log in to the Yahoo! website." msgstr "Váš účet je uzamknutý, prihláste sa, prosím, na webstránke Yahoo!." -#: ../libpurple/protocols/yahoo/yahoo.c:2132 +#: ../libpurple/protocols/yahoo/yahoo.c:2134 #, c-format msgid "Unknown error number %d. Logging into the Yahoo! website may fix this." msgstr "" "Neznáme číslo chyby %d. Prihlásenie sa na stránke Yahoo! to môže napraviť." -#: ../libpurple/protocols/yahoo/yahoo.c:2186 +#: ../libpurple/protocols/yahoo/yahoo.c:2188 #, c-format msgid "Could not add buddy %s to group %s to the server list on account %s." msgstr "" "Nepodarilo sa pridať kamaráta %s do skupiny %s do zoznamu na serveri na účte " "%s." -#: ../libpurple/protocols/yahoo/yahoo.c:2189 +#: ../libpurple/protocols/yahoo/yahoo.c:2191 msgid "Could not add buddy to server list" msgstr "Nepodarilo sa pridať priateľa do serverového zoznamu" -#: ../libpurple/protocols/yahoo/yahoo.c:2308 +#: ../libpurple/protocols/yahoo/yahoo.c:2310 #, c-format msgid "[ Audible %s/%s/%s.swf ] %s" msgstr "[ Počúvateľné %s/%s/%s.swf ] %s" -#: ../libpurple/protocols/yahoo/yahoo.c:2651 +#: ../libpurple/protocols/yahoo/yahoo.c:2653 msgid "Received unexpected HTTP response from server." msgstr "Zo servera bola prijatá neočakávaná HTTP odpoveď." -#: ../libpurple/protocols/yahoo/yahoo.c:2675 -#: ../libpurple/protocols/yahoo/yahoo.c:2861 -#: ../libpurple/protocols/yahoo/yahoo.c:2964 -#: ../libpurple/protocols/yahoo/yahoo.c:2974 +#: ../libpurple/protocols/yahoo/yahoo.c:2677 +#: ../libpurple/protocols/yahoo/yahoo.c:2863 +#: ../libpurple/protocols/yahoo/yahoo.c:2966 +#: ../libpurple/protocols/yahoo/yahoo.c:2976 #: ../libpurple/protocols/yahoo/yahoochat.c:1514 #: ../libpurple/protocols/yahoo/yahoochat.c:1584 #: ../libpurple/protocols/yahoo/ycht.c:585 msgid "Connection problem" msgstr "Problém s pripojením" -#: ../libpurple/protocols/yahoo/yahoo.c:2701 +#: ../libpurple/protocols/yahoo/yahoo.c:2703 #, c-format msgid "" "Lost connection with %s:\n" @@ -12683,7 +12656,7 @@ "Prerušené pripojenie ku %s:\n" "%s" -#: ../libpurple/protocols/yahoo/yahoo.c:2726 +#: ../libpurple/protocols/yahoo/yahoo.c:2728 #, c-format msgid "" "Could not establish a connection with %s:\n" @@ -12692,115 +12665,104 @@ "Nebolo možné nadviazať spojenie s %s:\n" "%s" -#: ../libpurple/protocols/yahoo/yahoo.c:3081 -#: ../libpurple/protocols/yahoo/yahoo.c:3767 +#: ../libpurple/protocols/yahoo/yahoo.c:3083 +#: ../libpurple/protocols/yahoo/yahoo.c:3769 msgid "Not at Home" msgstr "Nie som doma" -#: ../libpurple/protocols/yahoo/yahoo.c:3083 -#: ../libpurple/protocols/yahoo/yahoo.c:3770 +#: ../libpurple/protocols/yahoo/yahoo.c:3085 +#: ../libpurple/protocols/yahoo/yahoo.c:3772 msgid "Not at Desk" msgstr "Nie som pri stole" -#: ../libpurple/protocols/yahoo/yahoo.c:3085 -#: ../libpurple/protocols/yahoo/yahoo.c:3773 +#: ../libpurple/protocols/yahoo/yahoo.c:3087 +#: ../libpurple/protocols/yahoo/yahoo.c:3775 msgid "Not in Office" msgstr "Nie som v kancelárii" -#: ../libpurple/protocols/yahoo/yahoo.c:3089 -#: ../libpurple/protocols/yahoo/yahoo.c:3779 +#: ../libpurple/protocols/yahoo/yahoo.c:3091 +#: ../libpurple/protocols/yahoo/yahoo.c:3781 msgid "On Vacation" msgstr "Na dovolenke" -#: ../libpurple/protocols/yahoo/yahoo.c:3093 -#: ../libpurple/protocols/yahoo/yahoo.c:3785 +#: ../libpurple/protocols/yahoo/yahoo.c:3095 +#: ../libpurple/protocols/yahoo/yahoo.c:3787 msgid "Stepped Out" msgstr "Vyrazil si von" -#: ../libpurple/protocols/yahoo/yahoo.c:3186 -#: ../libpurple/protocols/yahoo/yahoo.c:3216 +#: ../libpurple/protocols/yahoo/yahoo.c:3188 +#: ../libpurple/protocols/yahoo/yahoo.c:3218 msgid "Not on server list" msgstr "Nie je na zozname serverov" -#: ../libpurple/protocols/yahoo/yahoo.c:3233 -#: ../libpurple/protocols/yahoo/yahoo.c:3291 +#: ../libpurple/protocols/yahoo/yahoo.c:3235 +#: ../libpurple/protocols/yahoo/yahoo.c:3293 msgid "Appear Online" msgstr "Javí sa pripojený" -#: ../libpurple/protocols/yahoo/yahoo.c:3236 -#: ../libpurple/protocols/yahoo/yahoo.c:3312 +#: ../libpurple/protocols/yahoo/yahoo.c:3238 +#: ../libpurple/protocols/yahoo/yahoo.c:3314 msgid "Appear Permanently Offline" msgstr "Javí sa trvale odpojený" -#: ../libpurple/protocols/yahoo/yahoo.c:3254 +#: ../libpurple/protocols/yahoo/yahoo.c:3256 msgid "Presence" msgstr "Prítomnosť" -#: ../libpurple/protocols/yahoo/yahoo.c:3297 +#: ../libpurple/protocols/yahoo/yahoo.c:3299 msgid "Appear Offline" msgstr "Vyzerať odpojený" -#: ../libpurple/protocols/yahoo/yahoo.c:3306 +#: ../libpurple/protocols/yahoo/yahoo.c:3308 msgid "Don't Appear Permanently Offline" msgstr "Nevyzerať sa trvale odpojený" -#: ../libpurple/protocols/yahoo/yahoo.c:3354 +#: ../libpurple/protocols/yahoo/yahoo.c:3356 msgid "Join in Chat" msgstr "Pripojiť sa k rozhovoru" -#: ../libpurple/protocols/yahoo/yahoo.c:3360 +#: ../libpurple/protocols/yahoo/yahoo.c:3362 msgid "Initiate Conference" msgstr "Založiť konferenciu" -#: ../libpurple/protocols/yahoo/yahoo.c:3388 +#: ../libpurple/protocols/yahoo/yahoo.c:3390 msgid "Presence Settings" msgstr "Nastavenie prítomnosti" -#: ../libpurple/protocols/yahoo/yahoo.c:3394 +#: ../libpurple/protocols/yahoo/yahoo.c:3396 msgid "Start Doodling" msgstr "Začať Čmárať" -#: ../libpurple/protocols/yahoo/yahoo.c:3495 +#: ../libpurple/protocols/yahoo/yahoo.c:3497 msgid "Activate which ID?" msgstr "Aktivovať s ID?" -#: ../libpurple/protocols/yahoo/yahoo.c:3506 -#, fuzzy +#: ../libpurple/protocols/yahoo/yahoo.c:3508 msgid "Join whom in chat?" msgstr "S kým sa spojiť v chate?" -#: ../libpurple/protocols/yahoo/yahoo.c:3518 +#: ../libpurple/protocols/yahoo/yahoo.c:3520 msgid "Activate ID..." msgstr "Aktivovať ID..." -#: ../libpurple/protocols/yahoo/yahoo.c:3522 +#: ../libpurple/protocols/yahoo/yahoo.c:3524 msgid "Join User in Chat..." msgstr "Spojiť sa s používateľom v chate..." -#: ../libpurple/protocols/yahoo/yahoo.c:3527 +#: ../libpurple/protocols/yahoo/yahoo.c:3529 msgid "Open Inbox" msgstr "Otvoriť schránku Inbox" -#: ../libpurple/protocols/yahoo/yahoo.c:4119 -#, fuzzy -msgid "Buzz" -msgstr "bzzz" - -#: ../libpurple/protocols/yahoo/yahoo.c:4121 -#, fuzzy, c-format -msgid "Buzzing %s..." -msgstr "Poslané bzzz" - -#: ../libpurple/protocols/yahoo/yahoo.c:4136 +#: ../libpurple/protocols/yahoo/yahoo.c:4138 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "" "join <miestnosť>: Vstúpiť do chatovacej miestnosti na sieti Yahoo" -#: ../libpurple/protocols/yahoo/yahoo.c:4141 +#: ../libpurple/protocols/yahoo/yahoo.c:4143 msgid "list: List rooms on the Yahoo network" msgstr "list: Vypísať zoznam miestností na sieti Yahoo" -#: ../libpurple/protocols/yahoo/yahoo.c:4149 +#: ../libpurple/protocols/yahoo/yahoo.c:4151 msgid "doodle: Request user to start a Doodle session" msgstr "Čmáranie: Požiadať používateľa o reláciu Čmáranie" @@ -12814,56 +12776,56 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/yahoo/yahoo.c:4358 #: ../libpurple/protocols/yahoo/yahoo.c:4360 +#: ../libpurple/protocols/yahoo/yahoo.c:4362 msgid "Yahoo Protocol Plugin" msgstr "Modul protokolu Yahoo" -#: ../libpurple/protocols/yahoo/yahoo.c:4383 +#: ../libpurple/protocols/yahoo/yahoo.c:4385 msgid "Yahoo Japan" msgstr "Yahoo Japonsko" -#: ../libpurple/protocols/yahoo/yahoo.c:4386 +#: ../libpurple/protocols/yahoo/yahoo.c:4388 msgid "Pager server" msgstr "Pager server" -#: ../libpurple/protocols/yahoo/yahoo.c:4389 +#: ../libpurple/protocols/yahoo/yahoo.c:4391 msgid "Japan Pager server" msgstr "Pager server pre Japonsko" -#: ../libpurple/protocols/yahoo/yahoo.c:4392 +#: ../libpurple/protocols/yahoo/yahoo.c:4394 msgid "Pager port" msgstr "Port pagera" -#: ../libpurple/protocols/yahoo/yahoo.c:4395 +#: ../libpurple/protocols/yahoo/yahoo.c:4397 msgid "File transfer server" msgstr "Server prenosu súborov" -#: ../libpurple/protocols/yahoo/yahoo.c:4398 +#: ../libpurple/protocols/yahoo/yahoo.c:4400 msgid "Japan file transfer server" msgstr "Japonský server prenosu súborov" -#: ../libpurple/protocols/yahoo/yahoo.c:4401 +#: ../libpurple/protocols/yahoo/yahoo.c:4403 msgid "File transfer port" msgstr "Port prenosu súborov" -#: ../libpurple/protocols/yahoo/yahoo.c:4404 +#: ../libpurple/protocols/yahoo/yahoo.c:4406 msgid "Chat room locale" msgstr "Jazyk chatovacej miestnosti" -#: ../libpurple/protocols/yahoo/yahoo.c:4407 +#: ../libpurple/protocols/yahoo/yahoo.c:4409 msgid "Ignore conference and chatroom invitations" msgstr "Ignorovať pozvánky na konferencie a chatovacie miestnosti" -#: ../libpurple/protocols/yahoo/yahoo.c:4415 +#: ../libpurple/protocols/yahoo/yahoo.c:4417 msgid "Chat room list URL" msgstr "URL zoznamu miestností chatu" -#: ../libpurple/protocols/yahoo/yahoo.c:4418 +#: ../libpurple/protocols/yahoo/yahoo.c:4420 msgid "Yahoo Chat server" msgstr "Server Yahoo chatu" -#: ../libpurple/protocols/yahoo/yahoo.c:4421 +#: ../libpurple/protocols/yahoo/yahoo.c:4423 msgid "Yahoo Chat port" msgstr "Port Yahoo chatu" @@ -12906,7 +12868,7 @@ "If you wish to view this profile, you will need to visit this link in your " "web browser:" msgstr "" -"Ak si želáte vidieť tento profil, budete musieť navštíviť tento odkaz vo " +"Ak chcete zobraziť tento profil, budete musieť navštíviť tento odkaz vo " "vašom webovom prehliadači." #: ../libpurple/protocols/yahoo/yahoo_profile.c:1034 @@ -13301,14 +13263,14 @@ #: ../libpurple/server.c:302 #, c-format msgid "Requesting %s's attention..." -msgstr "" +msgstr "Poprosili ste o pozornosť používateľa %s..." #: ../libpurple/server.c:347 #, c-format msgid "%s has requested your attention!" -msgstr "" - -#: ../libpurple/server.c:796 +msgstr "Používateľ %s vás poprosil o pozornosť!" + +#: ../libpurple/server.c:793 #, c-format msgid "" "%s has invited %s to the chat room %s:\n" @@ -13317,19 +13279,18 @@ "Používateľ %s pozval používateľa %s do miestnosti %s:\n" "%s" -#: ../libpurple/server.c:801 +#: ../libpurple/server.c:798 #, c-format msgid "%s has invited %s to the chat room %s\n" msgstr "Používateľ %s pozval používateľa %s do miestnosti %s\n" -#: ../libpurple/server.c:805 +#: ../libpurple/server.c:802 msgid "Accept chat invitation?" msgstr "Prijať pozvanie na chat?" #: ../libpurple/sslconn.c:164 -#, fuzzy msgid "SSL Connection Failed" -msgstr "Spojenie zlyhalo" +msgstr "SSL spojenie zlyhalo" #: ../libpurple/sslconn.c:166 msgid "SSL Handshake Failed" @@ -13337,12 +13298,11 @@ #: ../libpurple/sslconn.c:168 msgid "SSL peer presented an invalid certificate" -msgstr "" +msgstr "SSL peer ponúkol neplatný certifikát" #: ../libpurple/sslconn.c:171 -#, fuzzy msgid "Unknown SSL error" -msgstr "Neznáma chyba" +msgstr "Neznáma chyba SSL" #: ../libpurple/status.c:153 msgid "Unset" @@ -13365,47 +13325,62 @@ msgid "%s changed status from %s to %s" msgstr "Používateľ %s zmenil stav z %s na %s" -#: ../libpurple/status.c:619 +#: ../libpurple/status.c:612 +#, c-format +msgid "%s (%s) changed status from %s to %s" +msgstr "Používateľ %s (%s) zmenil stav z %s na %s" + +#: ../libpurple/status.c:623 #, c-format msgid "%s is now %s" msgstr "Používateľ %s je teraz %s" -#: ../libpurple/status.c:624 +#: ../libpurple/status.c:625 +#, c-format +msgid "%s (%s) is now %s" +msgstr "Používateľ %s (%s) je teraz %s" + +#: ../libpurple/status.c:631 #, c-format msgid "%s is no longer %s" msgstr "Používateľ %s už nie je %s" -#: ../libpurple/status.c:1234 +#: ../libpurple/status.c:633 +#, c-format +msgid "%s (%s) is no longer %s" +msgstr "Používateľ %s (%s) už nie je %s" + +#: ../libpurple/status.c:1244 #, c-format msgid "%s became idle" msgstr "Používateľ %s sa stal nečinným" -#: ../libpurple/status.c:1251 +#: ../libpurple/status.c:1261 #, c-format msgid "%s became unidle" msgstr "Používateľ %s prestal byť nečinný" -#: ../libpurple/status.c:1314 +#: ../libpurple/status.c:1324 #, c-format msgid "+++ %s became idle" msgstr "+++ Používateľ %s sa stal nečinným" -#: ../libpurple/status.c:1316 +#: ../libpurple/status.c:1326 #, c-format msgid "+++ %s became unidle" msgstr "+++ Používateľ %s prestal byť nečinný" -#: ../libpurple/util.c:718 +#: ../libpurple/util.c:701 #, c-format msgid "%x %X" msgstr "%x %X" -#: ../libpurple/util.c:2722 +#: ../libpurple/util.c:2705 #, c-format msgid "Error Reading %s" msgstr "Chyba počas čítania %s" -#: ../libpurple/util.c:2723 +#: ../libpurple/util.c:2706 #, c-format msgid "" "An error was encountered reading your %s. They have not been loaded, and " @@ -13414,15 +13389,15 @@ "Počas načítavania vášho %s sa vyskytla chyba. Zoznam nebol načítaný a starý " "súbor bol premenovaný na %s~." -#: ../libpurple/util.c:3223 +#: ../libpurple/util.c:3206 msgid "Calculating..." msgstr "Počíta sa..." -#: ../libpurple/util.c:3226 +#: ../libpurple/util.c:3209 msgid "Unknown." msgstr "Neznáme." -#: ../libpurple/util.c:3252 +#: ../libpurple/util.c:3235 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -13430,7 +13405,7 @@ msgstr[1] "%d sekunda" msgstr[2] "%d sekundy" -#: ../libpurple/util.c:3264 +#: ../libpurple/util.c:3247 #, c-format msgid "%d day" msgid_plural "%d days" @@ -13438,7 +13413,7 @@ msgstr[1] "%d deň" msgstr[2] "%d dni" -#: ../libpurple/util.c:3272 +#: ../libpurple/util.c:3255 #, c-format msgid "%s, %d hour" msgid_plural "%s, %d hours" @@ -13446,7 +13421,7 @@ msgstr[1] "%s, %d hodina" msgstr[2] "%s, %d hodiny" -#: ../libpurple/util.c:3278 +#: ../libpurple/util.c:3261 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -13454,7 +13429,7 @@ msgstr[1] "%d hodina" msgstr[2] "%d hodiny" -#: ../libpurple/util.c:3286 +#: ../libpurple/util.c:3269 #, c-format msgid "%s, %d minute" msgid_plural "%s, %d minutes" @@ -13462,7 +13437,7 @@ msgstr[1] "%s, %d minúta" msgstr[2] "%s, %d minúty" -#: ../libpurple/util.c:3292 +#: ../libpurple/util.c:3275 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -13470,17 +13445,17 @@ msgstr[1] "%d minúta" msgstr[2] "%d minúty" -#: ../libpurple/util.c:3552 +#: ../libpurple/util.c:3535 #, c-format msgid "Could not open %s: Redirected too many times" msgstr "Nepodarilo sa otvoriť %s: Presmerovaný príliš veľa kráť" -#: ../libpurple/util.c:3589 ../libpurple/util.c:3885 +#: ../libpurple/util.c:3572 ../libpurple/util.c:3868 #, c-format msgid "Unable to connect to %s" msgstr "Nepodarilo sa pripojiť na %s" -#: ../libpurple/util.c:3712 +#: ../libpurple/util.c:3695 #, c-format msgid "" "Unable to allocate enough memory to hold the contents from %s. The web " @@ -13489,17 +13464,17 @@ "Nebolo možné rezervovať dostatok pamäťového priestoru pre údaje z %s. " "Webový server sa možno pokúša o niečo nebezpečné." -#: ../libpurple/util.c:3747 +#: ../libpurple/util.c:3730 #, c-format msgid "Error reading from %s: %s" msgstr "Chyba pri čítaní z %s: %s" -#: ../libpurple/util.c:3778 +#: ../libpurple/util.c:3761 #, c-format msgid "Error writing to %s: %s" msgstr "Chyba pri zápise do %s: %s" -#: ../libpurple/util.c:3803 +#: ../libpurple/util.c:3786 #, c-format msgid "Unable to connect to %s: %s" msgstr "Nepodarilo sa pripojiť ku %s: %s" @@ -13517,11 +13492,11 @@ msgstr "" "Program na odosielanie okamžitých správ, ktorý podporuje viacero protokolov" -#: ../pidgin/eggtrayicon.c:129 +#: ../pidgin/eggtrayicon.c:128 msgid "Orientation" msgstr "Orientácia" -#: ../pidgin/eggtrayicon.c:130 +#: ../pidgin/eggtrayicon.c:129 msgid "The orientation of the tray." msgstr "Orientácia oznamovacej oblasti." @@ -13590,7 +13565,7 @@ msgid "SOCKS 5" msgstr "SOCKS 5" -#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211 +#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213 msgid "Use Environmental Settings" msgstr "Použiť nastavenie prostredia" @@ -13612,15 +13587,15 @@ msgid "Proxy Options" msgstr "Možnosti proxy" -#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205 +#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207 msgid "Proxy _type:" msgstr "_Typ proxy:" -#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226 +#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228 msgid "_Host:" msgstr "_Hostiteľ:" -#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244 +#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246 msgid "_Port:" msgstr "_Port:" @@ -13628,7 +13603,7 @@ msgid "_Username:" msgstr "Po_užívateľské meno:" -#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281 +#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283 msgid "Pa_ssword:" msgstr "He_slo:" @@ -13688,11 +13663,30 @@ "toto okno otvoríte v ponuke <b>Účty->Pridať/Upraviťt</b> v okne Zoznam " "priateľov" -#: ../pidgin/gtkblist.c:767 -msgid "Join a Chat" -msgstr "Pripojiť sa k chatu" - -#: ../pidgin/gtkblist.c:788 +#: ../pidgin/gtkblist.c:524 +#, c-format +msgid "You have %d contact named %s. Would you like to merge them?" +msgid_plural "" +"You currently have %d contacts named %s. Would you like to merge them?" +msgstr[0] "Máte %d kontaktov pomenovaných %s. Chceli by ste ich spojiť?" +msgstr[1] "Máte %d kontakt pomenovaný %s. Chceli by ste ich spojiť?" +msgstr[2] "Máte %d kontakty pomenované %s. Chceli by ste ich spojiť?" + +#: ../pidgin/gtkblist.c:525 +msgid "" +"Merging these contacts will cause them to share a single entry on the buddy " +"list and use a single conversation window. You can separate them again by " +"choosing 'Expand' from the contact's context menu" +msgstr "" +"Po spojení budú zaberať jedno miesto v zozname kontaktov a budú využívať " +"rovnaké okno konverzácie. Môžete ich znovu oddeliť tak, že vyberiete možnosť " +"'Rozbaliť' z kontextovej ponuky" + +#: ../pidgin/gtkblist.c:527 +msgid "_Merge" +msgstr "Spojiť" + +#: ../pidgin/gtkblist.c:945 msgid "" "Please enter the appropriate information about the chat you would like to " "join.\n" @@ -13700,95 +13694,108 @@ "Prosím, zadajte zodpovedajúce informácie o chate, ku ktorému sa chcete " "pripojiť.\n" -#. Set up stuff for the account box -#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530 -#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539 -#: ../pidgin/gtkroomlist.c:396 +#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6188 +#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:396 msgid "_Account:" msgstr "_Účet:" -#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603 +#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603 #: ../pidgin/gtkprivacy.c:617 msgid "_Block" msgstr "_Blokovať" -#: ../pidgin/gtkblist.c:1088 +#: ../pidgin/gtkblist.c:1245 msgid "Un_block" msgstr "Od_blokovať" -#: ../pidgin/gtkblist.c:1139 +#: ../pidgin/gtkblist.c:1288 +msgid "Move to" +msgstr "Presunúť do" + +#: ../pidgin/gtkblist.c:1328 msgid "Get _Info" -msgstr "Zobraziťo podrobnosti" - -#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90 +msgstr "Zobraziť podrobnosti" + +#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90 msgid "I_M" msgstr "I_M" -#: ../pidgin/gtkblist.c:1148 -#, fuzzy -msgid "_Send File" -msgstr "Odoslať súbor" - -#: ../pidgin/gtkblist.c:1155 -msgid "Add Buddy _Pounce" -msgstr "Pridať _sledovanie priatela" - -#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164 -#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292 +#: ../pidgin/gtkblist.c:1337 +msgid "_Send File..." +msgstr "Poslať _súbor..." + +#: ../pidgin/gtkblist.c:1344 +msgid "Add Buddy _Pounce..." +msgstr "Pridať sledovanie _priateľa..." + +#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353 +#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491 msgid "View _Log" msgstr "Zobraziť _záznam" -#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186 -#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298 +#: ../pidgin/gtkblist.c:1359 +msgid "Hide when offline" +msgstr "Skryť v odpojenom stave" + +#: ../pidgin/gtkblist.c:1359 +msgid "Show when offline" +msgstr "Zobaziť v odpojenom stave" + +#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382 +#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497 msgid "_Alias..." msgstr "_Prezývka..." -#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188 -#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300 +#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384 +#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499 msgid "_Remove" msgstr "Odst_rániť" -#: ../pidgin/gtkblist.c:1238 -msgid "Add a _Buddy" -msgstr "Pridať priateľa" - -#: ../pidgin/gtkblist.c:1241 -msgid "Add a C_hat" -msgstr "Pridať chat" - -#: ../pidgin/gtkblist.c:1244 +#: ../pidgin/gtkblist.c:1434 +msgid "Add _Buddy..." +msgstr "Pridať _priateľa..." + +#: ../pidgin/gtkblist.c:1437 +msgid "Add C_hat..." +msgstr "Pridať c_hat..." + +#: ../pidgin/gtkblist.c:1440 msgid "_Delete Group" msgstr "Odstrániť skupinu" -#: ../pidgin/gtkblist.c:1246 +#: ../pidgin/gtkblist.c:1442 msgid "_Rename" msgstr "Premenovať" #. join button -#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307 +#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307 #: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88 msgid "_Join" msgstr "Pripo_jiť" -#: ../pidgin/gtkblist.c:1267 +#: ../pidgin/gtkblist.c:1464 msgid "Auto-Join" msgstr "Automatické prihlasovanie" -#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329 +#: ../pidgin/gtkblist.c:1466 +msgid "Persistent" +msgstr "Trvalé" + +#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527 msgid "_Collapse" msgstr "_Zbaliť" -#: ../pidgin/gtkblist.c:1334 +#: ../pidgin/gtkblist.c:1532 msgid "_Expand" msgstr "_Rozbaliť" -#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597 -#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616 +#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795 +#: ../pidgin/gtkblist.c:4885 ../pidgin/gtkblist.c:4898 msgid "/Tools/Mute Sounds" msgstr "/Nástroje/Vypnúť zvuky" -#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840 -#: ../pidgin/gtkpounce.c:430 +#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4903 +#: ../pidgin/gtkpounce.c:437 msgid "" "You are not currently signed on with an account that can add that buddy." msgstr "" @@ -13796,143 +13803,138 @@ "priateľa." #. Buddies menu -#: ../pidgin/gtkblist.c:2869 +#: ../pidgin/gtkblist.c:3067 msgid "/_Buddies" msgstr "/_Priatelia" -#: ../pidgin/gtkblist.c:2870 +#: ../pidgin/gtkblist.c:3068 msgid "/Buddies/New Instant _Message..." msgstr "/Priatelia/Nová _správa..." -#: ../pidgin/gtkblist.c:2871 +#: ../pidgin/gtkblist.c:3069 msgid "/Buddies/Join a _Chat..." msgstr "/Priatelia/Pripojiť sa k _chatu..." -#: ../pidgin/gtkblist.c:2872 +#: ../pidgin/gtkblist.c:3070 msgid "/Buddies/Get User _Info..." msgstr "/Priatelia/_Podrobnosti o používateľovi..." -#: ../pidgin/gtkblist.c:2873 +#: ../pidgin/gtkblist.c:3071 msgid "/Buddies/View User _Log..." msgstr "/Priatelia/_Záznam používateľa..." -#: ../pidgin/gtkblist.c:2875 +#: ../pidgin/gtkblist.c:3073 msgid "/Buddies/Show" msgstr "/Priatelia/Zobraziť" -#: ../pidgin/gtkblist.c:2876 -#, fuzzy +#: ../pidgin/gtkblist.c:3074 msgid "/Buddies/Show/_Offline Buddies" -msgstr "/Priatelia/Zobraziť _nepripojených priateľov" - -#: ../pidgin/gtkblist.c:2877 -#, fuzzy +msgstr "/Priatelia/Zobraziť/_Odpojených priateľov" + +#: ../pidgin/gtkblist.c:3075 msgid "/Buddies/Show/_Empty Groups" -msgstr "/Priateliai/Zobraziť prázdne s_kupiny" - -#: ../pidgin/gtkblist.c:2878 -#, fuzzy +msgstr "/Priatelia/Zobraziť/_Prázdne skupiny" + +#: ../pidgin/gtkblist.c:3076 msgid "/Buddies/Show/Buddy _Details" -msgstr "/Priatelia/Zobraziť _detaily priateľov" - -#: ../pidgin/gtkblist.c:2879 -#, fuzzy +msgstr "/Priatelia/Zobraziť/_Detaily priateľov" + +#: ../pidgin/gtkblist.c:3077 msgid "/Buddies/Show/Idle _Times" -msgstr "/Priatelia/Zobraziť č_asy nečinnosti" - -#: ../pidgin/gtkblist.c:2880 -#, fuzzy +msgstr "/Priatelia/Zobraziť/Časy _nečinnosti" + +#: ../pidgin/gtkblist.c:3078 msgid "/Buddies/Show/_Protocol Icons" msgstr "/Priatelia/Zobraziť/_Ikony protokolov" -#: ../pidgin/gtkblist.c:2881 +#: ../pidgin/gtkblist.c:3079 msgid "/Buddies/_Sort Buddies" msgstr "/Priatelia/Zo_radiť priateľov" -#: ../pidgin/gtkblist.c:2883 +#: ../pidgin/gtkblist.c:3081 msgid "/Buddies/_Add Buddy..." msgstr "/Priatelia/Pridať priat_eľa..." -#: ../pidgin/gtkblist.c:2884 +#: ../pidgin/gtkblist.c:3082 msgid "/Buddies/Add C_hat..." msgstr "/Priatelia/Pridať cha_t..." -#: ../pidgin/gtkblist.c:2885 +#: ../pidgin/gtkblist.c:3083 msgid "/Buddies/Add _Group..." msgstr "/Priatelia/Pridať sk_upinu..." -#: ../pidgin/gtkblist.c:2887 +#: ../pidgin/gtkblist.c:3085 msgid "/Buddies/_Quit" msgstr "/Priatelia/_Ukončiť" #. Accounts menu -#: ../pidgin/gtkblist.c:2890 +#: ../pidgin/gtkblist.c:3088 msgid "/_Accounts" msgstr "/Úč_ty" -#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589 -msgid "/Accounts/Add\\/Edit" -msgstr "/Účty/Pri_dať a upraviť" +#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6889 +msgid "/Accounts/Manage" +msgstr "/Účty/Organizovať" #. Tools -#: ../pidgin/gtkblist.c:2894 +#: ../pidgin/gtkblist.c:3092 msgid "/_Tools" msgstr "/_Nástroje" -#: ../pidgin/gtkblist.c:2895 +#: ../pidgin/gtkblist.c:3093 msgid "/Tools/Buddy _Pounces" msgstr "/Nástroje/_Sledovanie priateľov" -#: ../pidgin/gtkblist.c:2896 +#: ../pidgin/gtkblist.c:3094 msgid "/Tools/_Certificates" msgstr "/Nástroje/_Certifikáty" -#: ../pidgin/gtkblist.c:2897 +#: ../pidgin/gtkblist.c:3095 msgid "/Tools/Plu_gins" msgstr "/Nástroje/_Moduly" -#: ../pidgin/gtkblist.c:2898 +#: ../pidgin/gtkblist.c:3096 msgid "/Tools/Pr_eferences" msgstr "/Nástroje/_Nastavenia" -#: ../pidgin/gtkblist.c:2899 +#: ../pidgin/gtkblist.c:3097 msgid "/Tools/Pr_ivacy" msgstr "/Nástroje/_Súkromie" -#: ../pidgin/gtkblist.c:2901 +#: ../pidgin/gtkblist.c:3099 msgid "/Tools/_File Transfers" msgstr "/Nástroje/_Prenosy súborov" -#: ../pidgin/gtkblist.c:2902 +#: ../pidgin/gtkblist.c:3100 msgid "/Tools/R_oom List" msgstr "/Nástroje/Zoznam _miestností" -#: ../pidgin/gtkblist.c:2903 +#: ../pidgin/gtkblist.c:3101 msgid "/Tools/System _Log" msgstr "/Nástroje/Systémový _záznam" -#: ../pidgin/gtkblist.c:2905 +#: ../pidgin/gtkblist.c:3103 msgid "/Tools/Mute _Sounds" msgstr "/Nástroje/Vypnúť _zvuky" #. Help -#: ../pidgin/gtkblist.c:2907 +#: ../pidgin/gtkblist.c:3105 msgid "/_Help" msgstr "/_Pomocník" -#: ../pidgin/gtkblist.c:2908 +#: ../pidgin/gtkblist.c:3106 msgid "/Help/Online _Help" msgstr "/Pomoc/Online _pomocník" -#: ../pidgin/gtkblist.c:2909 +#: ../pidgin/gtkblist.c:3107 msgid "/Help/_Debug Window" msgstr "/Pomoc/_Ladiace okno" -#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913 +#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111 msgid "/Help/_About" msgstr "/Pomoc/O _programe" -#: ../pidgin/gtkblist.c:2942 +#: ../pidgin/gtkblist.c:3140 #, c-format msgid "" "\n" @@ -13941,78 +13943,78 @@ "\n" "<b>Účet:</b> %s" -#: ../pidgin/gtkblist.c:3020 +#: ../pidgin/gtkblist.c:3218 msgid "Buddy Alias" msgstr "Prezývka priateľa" -#: ../pidgin/gtkblist.c:3049 +#: ../pidgin/gtkblist.c:3247 msgid "Logged In" msgstr "Prihlásený" -#: ../pidgin/gtkblist.c:3095 +#: ../pidgin/gtkblist.c:3293 msgid "Last Seen" msgstr "Naposledy videný" -#: ../pidgin/gtkblist.c:3116 +#: ../pidgin/gtkblist.c:3314 msgid "Spooky" msgstr "Strašidelné" -#: ../pidgin/gtkblist.c:3118 +#: ../pidgin/gtkblist.c:3316 msgid "Awesome" msgstr "Hrozné" -#: ../pidgin/gtkblist.c:3120 +#: ../pidgin/gtkblist.c:3318 msgid "Rockin'" msgstr "Super" -#: ../pidgin/gtkblist.c:3453 +#: ../pidgin/gtkblist.c:3657 #, c-format msgid "Idle %dd %dh %02dm" msgstr "Nečinný %dd %dh %02dm" -#: ../pidgin/gtkblist.c:3455 +#: ../pidgin/gtkblist.c:3659 #, c-format msgid "Idle %dh %02dm" msgstr "Nečinný %dh %02dm" -#: ../pidgin/gtkblist.c:3457 +#: ../pidgin/gtkblist.c:3661 #, c-format msgid "Idle %dm" msgstr "Nečinný %dm" -#: ../pidgin/gtkblist.c:3602 +#: ../pidgin/gtkblist.c:3806 msgid "/Buddies/New Instant Message..." msgstr "/Priatelia/Nová _správa..." -#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636 +#: ../pidgin/gtkblist.c:3807 ../pidgin/gtkblist.c:3840 msgid "/Buddies/Join a Chat..." msgstr "/Priatelia/Pripojiť sa k _chatu..." -#: ../pidgin/gtkblist.c:3604 +#: ../pidgin/gtkblist.c:3808 msgid "/Buddies/Get User Info..." msgstr "/Priatelia/Zobraziť podrobnosti..." -#: ../pidgin/gtkblist.c:3605 +#: ../pidgin/gtkblist.c:3809 msgid "/Buddies/Add Buddy..." msgstr "/Priatelia/Pridať priateľa..." -#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639 +#: ../pidgin/gtkblist.c:3810 ../pidgin/gtkblist.c:3843 msgid "/Buddies/Add Chat..." msgstr "/Priatelia/Pridať chat..." -#: ../pidgin/gtkblist.c:3607 +#: ../pidgin/gtkblist.c:3811 msgid "/Buddies/Add Group..." msgstr "/Priatelia/Pridať skupinu..." -#: ../pidgin/gtkblist.c:3642 +#: ../pidgin/gtkblist.c:3846 msgid "/Tools/Privacy" msgstr "/Nástroje/_Súkromie" -#: ../pidgin/gtkblist.c:3645 +#: ../pidgin/gtkblist.c:3849 msgid "/Tools/Room List" msgstr "/Nástroje/Zoznam _miestností" -#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153 +#: ../pidgin/gtkblist.c:3944 ../pidgin/gtkdocklet.c:153 #, c-format msgid "%d unread message from %s\n" msgid_plural "%d unread messages from %s\n" @@ -14020,94 +14022,86 @@ msgstr[1] "%d neprečítaná správa od používateľa %s\n" msgstr[2] "%d neprečítané správy od používateľa %s\n" -#: ../pidgin/gtkblist.c:3822 +#: ../pidgin/gtkblist.c:4104 msgid "Manually" msgstr "Ručne" -#: ../pidgin/gtkblist.c:3824 -msgid "Alphabetically" -msgstr "Podľa abecedy" - -#: ../pidgin/gtkblist.c:3825 +#: ../pidgin/gtkblist.c:4107 msgid "By status" msgstr "Podľa stavu" -#: ../pidgin/gtkblist.c:3826 +#: ../pidgin/gtkblist.c:4108 msgid "By log size" msgstr "Podľa veľkosti záznamu" -#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179 +#: ../pidgin/gtkblist.c:4313 ../pidgin/gtkconn.c:180 #, c-format msgid "%s disconnected" msgstr "%s bol odpojený" -#: ../pidgin/gtkblist.c:4067 +#: ../pidgin/gtkblist.c:4349 #, c-format msgid "<span color=\"red\">%s disconnected: %s</span>" msgstr "<span color=\"red\">%s bol odpojený: %s</span>" -#: ../pidgin/gtkblist.c:4219 +#: ../pidgin/gtkblist.c:4501 msgid "<b>Username:</b>" msgstr "<b>Prihlasovacie meno:</b>" -#: ../pidgin/gtkblist.c:4226 +#: ../pidgin/gtkblist.c:4508 msgid "<b>Password:</b>" msgstr "<b>Heslo:</b>" -#: ../pidgin/gtkblist.c:4237 +#: ../pidgin/gtkblist.c:4519 msgid "_Login" msgstr "Prihlásiť" -#: ../pidgin/gtkblist.c:4320 +#: ../pidgin/gtkblist.c:4602 msgid "/Accounts" msgstr "/Účty" #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy -#: ../pidgin/gtkblist.c:4334 -#, fuzzy, c-format +#: ../pidgin/gtkblist.c:4616 +#, c-format msgid "" "<span weight='bold' size='larger'>Welcome to %s!</span>\n" "\n" "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</" -"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be " +"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be " "able to sign on, set your status, and talk to your friends." msgstr "" "<span weight='bold' size='larger'>Vitajte v programe %s!</span>\n" "\n" -"Zatiaľ nemáte pridané žiadne IM účty. Môžete ich pridať v okne <b>Účty</b> " -"ktoré nájdete v ponuke <b>Účty->Pridať a upraviť</b>. Po tom, ako pridáte " +"Zatiaľ nemáte adtivované žiadne IM účty. Môžete ich pridať v okne <b>Účty</" +"b> ktoré nájdete v ponuke <b>Účty->Organizovať</b>. Po tom, ako aktivujete " "váš účet, budete sa môcť prihlásiť, zmeniť svoj stav a písať si s vašimi " "priateľmi." +# SPRAVNE #. set the Show Offline Buddies option. must be done #. * after the treeview or faceprint gets mad. -Robot101 #. -#: ../pidgin/gtkblist.c:4597 -#, fuzzy +#: ../pidgin/gtkblist.c:4879 msgid "/Buddies/Show/Offline Buddies" -msgstr "/Priatelia/Zobraziť _nepripojených priateľov" - -#: ../pidgin/gtkblist.c:4600 -#, fuzzy +msgstr "/Priatelia/Zobraziť/Odpojených priateľov" + +#: ../pidgin/gtkblist.c:4882 msgid "/Buddies/Show/Empty Groups" -msgstr "/Priatelia/Zobraziť prázdne s_kupiny" - -#: ../pidgin/gtkblist.c:4606 -#, fuzzy +msgstr "/Priatelia/Zobraziť/Prázdne skupiny" + +#: ../pidgin/gtkblist.c:4888 msgid "/Buddies/Show/Buddy Details" -msgstr "/Nástroje/Zobraziť _detaily priateľov" - -#: ../pidgin/gtkblist.c:4609 -#, fuzzy +msgstr "/Priatelia/Zobraziť/Detaily priateľov" + +#: ../pidgin/gtkblist.c:4891 msgid "/Buddies/Show/Idle Times" -msgstr "/Priatelia/Zobraziť č_asy nečinnosti" - -#: ../pidgin/gtkblist.c:4612 -#, fuzzy +msgstr "/Priatelia/Zobraziť/Časy nečinnosti" + +#: ../pidgin/gtkblist.c:4894 msgid "/Buddies/Show/Protocol Icons" msgstr "/Priatelia/Zobraziť/Ikony protokolov" -#: ../pidgin/gtkblist.c:5507 +#: ../pidgin/gtkblist.c:5796 msgid "" "Please enter the screen name of the person you would like to add to your " "buddy list. You may optionally enter an alias, or nickname, for the buddy. " @@ -14117,26 +14111,31 @@ "priateľov. Môžete vyplniť aj prezývku priateľa. Prezývka sa bude zobrazovať " "v zozname priateľov namiesto mena používateľa vždy, keď to bude možné.\n" +#. Set up stuff for the account box +#: ../pidgin/gtkblist.c:5819 +msgid "A_ccount:" +msgstr "Úče_t:" + #. End of account box -#: ../pidgin/gtkblist.c:5542 +#: ../pidgin/gtkblist.c:5831 msgid "_Screen name:" msgstr "_Používateľské meno:" -#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914 +#: ../pidgin/gtkblist.c:5853 ../pidgin/gtkblist.c:6209 msgid "A_lias:" msgstr "P_rezývka:" -#: ../pidgin/gtkblist.c:5826 +#: ../pidgin/gtkblist.c:6121 msgid "This protocol does not support chat rooms." msgstr "Tento protokol nepodporuje miestnosti chatu." -#: ../pidgin/gtkblist.c:5842 +#: ../pidgin/gtkblist.c:6137 msgid "" "You are not currently signed on with any protocols that have the ability to " "chat." msgstr "Momentálne nie ste pripojený na protokole, ktorý by podporoval chat." -#: ../pidgin/gtkblist.c:5883 +#: ../pidgin/gtkblist.c:6178 msgid "" "Please enter an alias, and the appropriate information about the chat you " "would like to add to your buddy list.\n" @@ -14144,49 +14143,56 @@ "Prosím, zadajte prezývku a príslušné informácie o chate, ktorý chcete pridať " "do vášho zoznamu priateľov.\n" -#: ../pidgin/gtkblist.c:5964 +#: ../pidgin/gtkblist.c:6237 +msgid "Autojoin when account becomes online." +msgstr "Znovu pripojiť keď sa prihlásite." + +#: ../pidgin/gtkblist.c:6238 +msgid "Hide chat when the window is closed." +msgstr "Skryť chat keď je okno zatvorené." + +#: ../pidgin/gtkblist.c:6264 msgid "Please enter the name of the group to be added." msgstr "Prosím, zadajte názov skupiny ktorú chcete pridať." -#: ../pidgin/gtkblist.c:6609 +#: ../pidgin/gtkblist.c:6909 msgid "<PurpleMain>/Accounts/" msgstr "<PurpleMain>/Účty/" -#: ../pidgin/gtkblist.c:6633 +#: ../pidgin/gtkblist.c:6933 msgid "_Edit Account" msgstr "_Upraviť účet" -#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073 +#: ../pidgin/gtkblist.c:6946 ../pidgin/gtkconv.c:3136 msgid "No actions available" msgstr "Nie sú dostupné žiadne akcie" -#: ../pidgin/gtkblist.c:6654 +#: ../pidgin/gtkblist.c:6954 msgid "_Disable" msgstr "_Vypnúť" -#: ../pidgin/gtkblist.c:6666 +#: ../pidgin/gtkblist.c:6966 msgid "Enable Account" msgstr "Povoliť účet" -#: ../pidgin/gtkblist.c:6672 +#: ../pidgin/gtkblist.c:6972 msgid "<PurpleMain>/Accounts/Enable Account" msgstr "<PurpleMain>/Účty/Povoliť účet" -#: ../pidgin/gtkblist.c:6721 +#: ../pidgin/gtkblist.c:7021 msgid "/Tools" msgstr "/Nástroje" -#: ../pidgin/gtkblist.c:6791 +#: ../pidgin/gtkblist.c:7091 msgid "/Buddies/Sort Buddies" msgstr "/Priatelia/Zoradiť priateľov" #. Widget creation function #: ../pidgin/gtkcertmgr.c:530 -#, fuzzy msgid "SSL Servers" -msgstr "Server" - -#: ../pidgin/gtkconn.c:180 +msgstr "SSL servery" + +#: ../pidgin/gtkconn.c:181 #, c-format msgid "" "%s\n" @@ -14199,26 +14205,26 @@ "%s sa nebude znovu pokúšať pripojiť na tento účet, kým neopravíte chybu a " "znovu nepovolíte tento účet." -#: ../pidgin/gtkconv.c:482 +#: ../pidgin/gtkconv.c:523 msgid "Unknown command." msgstr "Neznámy príkaz." -#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780 +#: ../pidgin/gtkconv.c:795 ../pidgin/gtkconv.c:821 msgid "That buddy is not on the same protocol as this chat." msgstr "Priateľ nie je na tom istom protokole ako tento chat" -#: ../pidgin/gtkconv.c:774 +#: ../pidgin/gtkconv.c:815 msgid "" "You are not currently signed on with an account that can invite that buddy." msgstr "" "Momentálne nie ste prihlásený v účte, ktorý dokáže pozvať tohoto priateľa." -#: ../pidgin/gtkconv.c:827 +#: ../pidgin/gtkconv.c:868 msgid "Invite Buddy Into Chat Room" msgstr "Pozvať priateľa do miestnosti chatu" #. Put our happy label in it. -#: ../pidgin/gtkconv.c:857 +#: ../pidgin/gtkconv.c:898 msgid "" "Please enter the name of the user you wish to invite, along with an optional " "invite message." @@ -14226,188 +14232,183 @@ "Zadajte, prosím, meno používateľa, ktorého chcete pozvať, spolu s nepovinnou " "pozývacou správou." -#: ../pidgin/gtkconv.c:878 +#: ../pidgin/gtkconv.c:919 msgid "_Buddy:" msgstr "_Priateľ:" -#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194 +#: ../pidgin/gtkconv.c:930 ../pidgin/gtksavedstatuses.c:1194 #: ../pidgin/gtksavedstatuses.c:1528 msgid "_Message:" msgstr "_Správa:" -#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219 -#: ../pidgin/gtkft.c:543 -msgid "Unable to open file." -msgstr "Nepodarilo sa otvoriť súbor." - -#: ../pidgin/gtkconv.c:953 +#: ../pidgin/gtkconv.c:994 #, c-format msgid "<h1>Conversation with %s</h1>\n" msgstr "<h1>Rozhovor s %s</h1>\n" -#: ../pidgin/gtkconv.c:991 +#: ../pidgin/gtkconv.c:1032 msgid "Save Conversation" msgstr "Uložiť konverzáciu" -#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743 +#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743 msgid "Find" msgstr "Nájsť" -#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195 +#: ../pidgin/gtkconv.c:1204 ../pidgin/gtkdebug.c:195 msgid "_Search for:" msgstr "Hľadať:" -#: ../pidgin/gtkconv.c:1622 +#: ../pidgin/gtkconv.c:1675 msgid "Un-Ignore" msgstr "Neignorovať" -#: ../pidgin/gtkconv.c:1625 +#: ../pidgin/gtkconv.c:1678 msgid "Ignore" msgstr "Ignorovať" -#: ../pidgin/gtkconv.c:1645 +#: ../pidgin/gtkconv.c:1698 msgid "Get Away Message" msgstr "Získať správu o neprítomnosti" -#: ../pidgin/gtkconv.c:1668 +#: ../pidgin/gtkconv.c:1721 msgid "Last said" msgstr "Naposledy povedal" -#: ../pidgin/gtkconv.c:2606 +#: ../pidgin/gtkconv.c:2665 msgid "Unable to save icon file to disk." msgstr "Nepodarilo sa uložiť súbor ikony na disk." -#: ../pidgin/gtkconv.c:2657 +#: ../pidgin/gtkconv.c:2716 msgid "Save Icon" msgstr "Uložiť ikonu" -#: ../pidgin/gtkconv.c:2709 +#: ../pidgin/gtkconv.c:2768 msgid "Animate" msgstr "Animovať" -#: ../pidgin/gtkconv.c:2714 +#: ../pidgin/gtkconv.c:2773 msgid "Hide Icon" msgstr "Skryť ikonu" -#: ../pidgin/gtkconv.c:2717 +#: ../pidgin/gtkconv.c:2776 msgid "Save Icon As..." msgstr "Uložiť ikonu ako..." -#: ../pidgin/gtkconv.c:2721 +#: ../pidgin/gtkconv.c:2780 msgid "Set Custom Icon..." msgstr "Nastaviť vlastnú ikonu..." -#: ../pidgin/gtkconv.c:2734 +#: ../pidgin/gtkconv.c:2793 msgid "Remove Custom Icon" msgstr "Odstrániť vlastnú ikonu" -#: ../pidgin/gtkconv.c:2861 +#: ../pidgin/gtkconv.c:2924 msgid "Show All" -msgstr "" +msgstr "Zobraziť všetko" #. Conversation menu -#: ../pidgin/gtkconv.c:2880 +#: ../pidgin/gtkconv.c:2943 msgid "/_Conversation" msgstr "/_Rozhovor" -#: ../pidgin/gtkconv.c:2882 +#: ../pidgin/gtkconv.c:2945 msgid "/Conversation/New Instant _Message..." msgstr "/Rozhovor/Nová správa..." -#: ../pidgin/gtkconv.c:2887 +#: ../pidgin/gtkconv.c:2950 msgid "/Conversation/_Find..." msgstr "/Rozhovor/_Hľadať..." -#: ../pidgin/gtkconv.c:2889 +#: ../pidgin/gtkconv.c:2952 msgid "/Conversation/View _Log" msgstr "/Rozhovor/Zobraziť _záznam" -#: ../pidgin/gtkconv.c:2890 +#: ../pidgin/gtkconv.c:2953 msgid "/Conversation/_Save As..." msgstr "/Rozhovor/_Uložiť ako..." -#: ../pidgin/gtkconv.c:2892 +#: ../pidgin/gtkconv.c:2955 msgid "/Conversation/Clea_r Scrollback" msgstr "/Rozhovor/Vymazať" -#: ../pidgin/gtkconv.c:2896 +#: ../pidgin/gtkconv.c:2959 msgid "/Conversation/Se_nd File..." msgstr "/Rozhovor/Odos_lať súbor..." -#: ../pidgin/gtkconv.c:2897 +#: ../pidgin/gtkconv.c:2960 msgid "/Conversation/Add Buddy _Pounce..." msgstr "/Rozhovor/Pridať _sledovanie priateľa..." -#: ../pidgin/gtkconv.c:2899 +#: ../pidgin/gtkconv.c:2962 msgid "/Conversation/_Get Info" msgstr "/Rozhovor/_Zobraziť podrobnosti" -#: ../pidgin/gtkconv.c:2901 +#: ../pidgin/gtkconv.c:2964 msgid "/Conversation/In_vite..." msgstr "/Rozhovor/Poz_vať..." -#: ../pidgin/gtkconv.c:2903 +#: ../pidgin/gtkconv.c:2966 msgid "/Conversation/M_ore" msgstr "/Conversation/Via_c" -#: ../pidgin/gtkconv.c:2907 +#: ../pidgin/gtkconv.c:2970 msgid "/Conversation/Al_ias..." msgstr "/Rozhovor/Pre_zývka..." -#: ../pidgin/gtkconv.c:2909 +#: ../pidgin/gtkconv.c:2972 msgid "/Conversation/_Block..." msgstr "/Rozhovor/_Blokovať..." -#: ../pidgin/gtkconv.c:2911 +#: ../pidgin/gtkconv.c:2974 msgid "/Conversation/_Unblock..." msgstr "/Rozhovor/_Odblokovať..." -#: ../pidgin/gtkconv.c:2913 +#: ../pidgin/gtkconv.c:2976 msgid "/Conversation/_Add..." msgstr "/Rozhovor/_Pridať..." -#: ../pidgin/gtkconv.c:2915 +#: ../pidgin/gtkconv.c:2978 msgid "/Conversation/_Remove..." msgstr "/Rozhovor/_Odstrániť..." -#: ../pidgin/gtkconv.c:2920 +#: ../pidgin/gtkconv.c:2983 msgid "/Conversation/Insert Lin_k..." msgstr "/Rozhovor/Vložiť od_kaz..." -#: ../pidgin/gtkconv.c:2922 +#: ../pidgin/gtkconv.c:2985 msgid "/Conversation/Insert Imag_e..." msgstr "/Rozhovor/Vložiť _obrázok..." -#: ../pidgin/gtkconv.c:2928 +#: ../pidgin/gtkconv.c:2991 msgid "/Conversation/_Close" msgstr "/Rozhovor/_Zavrieť" #. Options -#: ../pidgin/gtkconv.c:2932 +#: ../pidgin/gtkconv.c:2995 msgid "/_Options" msgstr "/_Možnosti" -#: ../pidgin/gtkconv.c:2933 +#: ../pidgin/gtkconv.c:2996 msgid "/Options/Enable _Logging" msgstr "/Možnosti/Povoliť zaz_namenávanie" -#: ../pidgin/gtkconv.c:2934 +#: ../pidgin/gtkconv.c:2997 msgid "/Options/Enable _Sounds" msgstr "/Možnosti/Povoliť _zvuky" -#: ../pidgin/gtkconv.c:2936 +#: ../pidgin/gtkconv.c:2999 msgid "/Options/Show Formatting _Toolbars" msgstr "/Možnosti/Zobraziť panely formá_tovania" -#: ../pidgin/gtkconv.c:2937 +#: ../pidgin/gtkconv.c:3000 msgid "/Options/Show Ti_mestamps" msgstr "/Možnosti/Zobrazovať ča_sové značky" -#: ../pidgin/gtkconv.c:3061 +#: ../pidgin/gtkconv.c:3124 msgid "/Conversation/More" msgstr "/Rozhovor/Viac" -#: ../pidgin/gtkconv.c:3117 +#: ../pidgin/gtkconv.c:3180 msgid "/Options" msgstr "/_Možnosti" @@ -14416,97 +14417,97 @@ #. Make sure the 'Conversation -> More' menuitems are regenerated whenever #. * the 'Conversation' menu pops up because the entries can change after the #. * conversation is created. -#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184 +#: ../pidgin/gtkconv.c:3215 ../pidgin/gtkconv.c:3247 msgid "/Conversation" msgstr "/Rozhovor" -#: ../pidgin/gtkconv.c:3192 +#: ../pidgin/gtkconv.c:3255 msgid "/Conversation/View Log" msgstr "/Rozhovor/Zobraziť _záznam" -#: ../pidgin/gtkconv.c:3198 +#: ../pidgin/gtkconv.c:3261 msgid "/Conversation/Send File..." msgstr "/Rozhovor/Odos_lať súbor..." -#: ../pidgin/gtkconv.c:3202 +#: ../pidgin/gtkconv.c:3265 msgid "/Conversation/Add Buddy Pounce..." msgstr "/Rozhovor/Pridať _sledovanie priateľa..." -#: ../pidgin/gtkconv.c:3208 +#: ../pidgin/gtkconv.c:3271 msgid "/Conversation/Get Info" msgstr "/Rozhovor/_Zobraziť podrobnosti" -#: ../pidgin/gtkconv.c:3212 +#: ../pidgin/gtkconv.c:3275 msgid "/Conversation/Invite..." msgstr "/Rozhovor/Poz_vať..." -#: ../pidgin/gtkconv.c:3218 +#: ../pidgin/gtkconv.c:3281 msgid "/Conversation/Alias..." msgstr "/Rozhovor/Pre_zývka..." -#: ../pidgin/gtkconv.c:3222 +#: ../pidgin/gtkconv.c:3285 msgid "/Conversation/Block..." msgstr "/Rozhovor/_Blokovať..." -#: ../pidgin/gtkconv.c:3226 +#: ../pidgin/gtkconv.c:3289 msgid "/Conversation/Unblock..." msgstr "/Rozhovor/_Odblokovať..." -#: ../pidgin/gtkconv.c:3230 +#: ../pidgin/gtkconv.c:3293 msgid "/Conversation/Add..." msgstr "/Rozhovor/_Pridať..." -#: ../pidgin/gtkconv.c:3234 +#: ../pidgin/gtkconv.c:3297 msgid "/Conversation/Remove..." msgstr "/Rozhovor/Odstrániť..." -#: ../pidgin/gtkconv.c:3240 +#: ../pidgin/gtkconv.c:3303 msgid "/Conversation/Insert Link..." msgstr "/Rozhovor/Vložiť odkaz..." -#: ../pidgin/gtkconv.c:3244 +#: ../pidgin/gtkconv.c:3307 msgid "/Conversation/Insert Image..." msgstr "/Rozhovor/Vložiť obrázok..." -#: ../pidgin/gtkconv.c:3250 +#: ../pidgin/gtkconv.c:3313 msgid "/Options/Enable Logging" msgstr "/Možnosti/Povoliť zaz_namenávanie" -#: ../pidgin/gtkconv.c:3253 +#: ../pidgin/gtkconv.c:3316 msgid "/Options/Enable Sounds" msgstr "/Možnosti/Povoliť _zvuky" -#: ../pidgin/gtkconv.c:3266 +#: ../pidgin/gtkconv.c:3329 msgid "/Options/Show Formatting Toolbars" msgstr "/Možnosti/Zobraziť panely formá_tovania" -#: ../pidgin/gtkconv.c:3269 +#: ../pidgin/gtkconv.c:3332 msgid "/Options/Show Timestamps" msgstr "/Možnosti/Zobrazovať ča_sové značky" -#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388 +#: ../pidgin/gtkconv.c:3409 ../pidgin/gtkconv.c:3451 msgid "User is typing..." msgstr "Používateľ píše..." -#: ../pidgin/gtkconv.c:3391 +#: ../pidgin/gtkconv.c:3454 msgid "User has typed something and stopped" msgstr "Používateľ niečo napísal a prestal" #. Build the Send To menu -#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022 -msgid "_Send To" -msgstr "Po_slať cez" - -#: ../pidgin/gtkconv.c:4286 +#: ../pidgin/gtkconv.c:3637 ../pidgin/gtkconv.c:8105 +msgid "S_end To" +msgstr "Odoslať do" + +#: ../pidgin/gtkconv.c:4349 msgid "_Send" msgstr "Odo_slať" #. Setup the label telling how many people are in the room. -#: ../pidgin/gtkconv.c:4390 +#: ../pidgin/gtkconv.c:4453 msgid "0 people in room" msgstr "V miestnosti je 0 osôb" -#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880 +#: ../pidgin/gtkconv.c:5823 ../pidgin/gtkconv.c:5944 #, c-format msgid "%d person in room" msgid_plural "%d people in room" @@ -14514,75 +14515,75 @@ msgstr[1] "V miestnosti je %d osoba" msgstr[2] "V miestnosti sú %d osoby" -#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660 +#: ../pidgin/gtkconv.c:6550 ../pidgin/gtkstatusbox.c:660 msgid "Typing" msgstr "Píše" -#: ../pidgin/gtkconv.c:6490 +#: ../pidgin/gtkconv.c:6554 msgid "Stopped Typing" msgstr "Prestal písať" -#: ../pidgin/gtkconv.c:6493 +#: ../pidgin/gtkconv.c:6557 msgid "Nick Said" msgstr "Používateľ napísal" -#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492 +#: ../pidgin/gtkconv.c:6560 ../pidgin/gtkdocklet.c:492 msgid "Unread Messages" msgstr "Neprečítané správy" -#: ../pidgin/gtkconv.c:6499 +#: ../pidgin/gtkconv.c:6563 msgid "New Event" msgstr "Nová udalosť" -#: ../pidgin/gtkconv.c:7572 +#: ../pidgin/gtkconv.c:7656 msgid "clear: Clears all conversation scrollbacks." msgstr "clear: Vyčistí všetky záznamy konverzácie." -#: ../pidgin/gtkconv.c:7736 +#: ../pidgin/gtkconv.c:7819 msgid "Confirm close" msgstr "Potvrdenie uzavrenia" -#: ../pidgin/gtkconv.c:7768 +#: ../pidgin/gtkconv.c:7851 msgid "You have unread messages. Are you sure you want to close the window?" msgstr "Máte neprečítané správy. Naozaj chcete zavrieť toto okno?" -#: ../pidgin/gtkconv.c:8355 +#: ../pidgin/gtkconv.c:8438 msgid "Close other tabs" msgstr "Zavrieť ostatné karty" -#: ../pidgin/gtkconv.c:8361 +#: ../pidgin/gtkconv.c:8444 msgid "Close all tabs" msgstr "Zavrieť všetky karty" -#: ../pidgin/gtkconv.c:8369 +#: ../pidgin/gtkconv.c:8452 msgid "Detach this tab" msgstr "Odpojiť túto kartu" -#: ../pidgin/gtkconv.c:8375 +#: ../pidgin/gtkconv.c:8458 msgid "Close this tab" msgstr "Zavrieť túto kartu" -#: ../pidgin/gtkconv.c:8875 +#: ../pidgin/gtkconv.c:8955 msgid "Close conversation" msgstr "Zavrieť rozhovor" -#: ../pidgin/gtkconv.c:9477 +#: ../pidgin/gtkconv.c:9557 msgid "Last created window" msgstr "Naposledy otvorené okno" -#: ../pidgin/gtkconv.c:9479 +#: ../pidgin/gtkconv.c:9559 msgid "Separate IM and Chat windows" msgstr "Oddeľovať okná správ a chatov" -#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415 +#: ../pidgin/gtkconv.c:9561 ../pidgin/gtkprefs.c:1417 msgid "New window" msgstr "V novom okne" -#: ../pidgin/gtkconv.c:9483 +#: ../pidgin/gtkconv.c:9563 msgid "By group" msgstr "Podľa skupiny" -#: ../pidgin/gtkconv.c:9485 +#: ../pidgin/gtkconv.c:9565 msgid "By account" msgstr "Podľa účtu" @@ -14713,7 +14714,7 @@ #: ../pidgin/gtkdialogs.c:135 msgid "Belarusian Latin" -msgstr "" +msgstr "bieloruština, latinka" #: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137 #: ../pidgin/gtkdialogs.c:227 @@ -14736,7 +14737,7 @@ #: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145 msgid "Valencian-Catalan" -msgstr "katalánčina (Valencia)" +msgstr "katalánčina, valencijčina" #: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230 msgid "Czech" @@ -14809,15 +14810,15 @@ #: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170 #: ../pidgin/gtkdialogs.c:242 msgid "Galician" -msgstr "Galícky" +msgstr "galícijčina" #: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172 msgid "Gujarati" -msgstr "Gudžarati" +msgstr "gudžarátčina" #: ../pidgin/gtkdialogs.c:172 msgid "Gujarati Language Team" -msgstr "gudžarátsky jazykový tím" +msgstr "gudžarátsky jazykový tým" #: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243 msgid "Hebrew" @@ -14850,7 +14851,7 @@ #: ../pidgin/gtkdialogs.c:179 msgid "Ubuntu Georgian Translators" -msgstr "Ubuntu gruzínsky prekladatelia" +msgstr "Ubuntu gruzínski prekladatelia" #: ../pidgin/gtkdialogs.c:180 msgid "Kannada" @@ -14858,7 +14859,7 @@ #: ../pidgin/gtkdialogs.c:180 msgid "Kannada Translation team" -msgstr "kanaadsky prekladateľký tím" +msgstr "kannádsky prekladateľský tím" #: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250 #: ../pidgin/gtkdialogs.c:251 @@ -14871,9 +14872,8 @@ msgstr "kurdčina" #: ../pidgin/gtkdialogs.c:185 -#, fuzzy msgid "Lao" -msgstr "Lev" +msgstr "laoština" #: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252 #: ../pidgin/gtkdialogs.c:253 @@ -15023,7 +15023,6 @@ "„COPYRIGHT“. Na tento program vám neposkytujeme žiadnu záruku.<BR><BR>" #: ../pidgin/gtkdialogs.c:418 -#, c-format msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>" msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>" @@ -15059,6 +15058,16 @@ msgid "Debugging Information" msgstr "Ladiace informácie" +#: ../pidgin/gtkdialogs.c:754 ../pidgin/gtkdialogs.c:893 +#: ../pidgin/gtkdialogs.c:974 +msgid "_Name" +msgstr "_Meno" + +#: ../pidgin/gtkdialogs.c:759 ../pidgin/gtkdialogs.c:898 +#: ../pidgin/gtkdialogs.c:979 +msgid "_Account" +msgstr "Úč_et" + #: ../pidgin/gtkdialogs.c:906 msgid "Get User Info" msgstr "Zobraziť podrobnosti o používateľovi" @@ -15219,8 +15228,7 @@ msgstr "Vypnúť zvuky" #: ../pidgin/gtkdocklet.c:535 -#, fuzzy -msgid "Blink on new message" +msgid "Blink on New Message" msgstr "Blikať pri novej správe" #: ../pidgin/gtkdocklet.c:542 @@ -15317,7 +15325,7 @@ msgid "Paste as Plain _Text" msgstr "_Vložiť ako čistý text" -#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194 +#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1195 msgid "_Reset formatting" msgstr "Vymazať formátovanie" @@ -15396,7 +15404,6 @@ msgstr "Uložiť obrázok" #: ../pidgin/gtkimhtml.c:3522 -#, c-format msgid "_Save Image..." msgstr "_Uložiť obrázok..." @@ -15434,7 +15441,7 @@ msgid "Insert Link" msgstr "Vložiť odkaz" -#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262 +#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1263 msgid "_Insert" msgstr "_Vložiť" @@ -15456,18 +15463,17 @@ msgid "Smile!" msgstr "Smajlík!" -#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219 +#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1220 msgid "_Font" msgstr "_Písmo" #: ../pidgin/gtkimhtmltoolbar.c:1054 -#, fuzzy msgid "Group Items" -msgstr "ID skupiny" +msgstr "Zoskupiť položky" #: ../pidgin/gtkimhtmltoolbar.c:1054 msgid "Ungroup Items" -msgstr "" +msgstr "Nezoskupiť položky" #: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287 msgid "Bold" @@ -15483,105 +15489,99 @@ #: ../pidgin/gtkimhtmltoolbar.c:1091 msgid "Strikethrough" -msgstr "" +msgstr "Prečiarknuté" #: ../pidgin/gtkimhtmltoolbar.c:1093 msgid "Increase Font Size" -msgstr "" +msgstr "Zväčšiť velkosť písma" #: ../pidgin/gtkimhtmltoolbar.c:1094 msgid "Decrease Font Size" -msgstr "" +msgstr "Zmenšiť velkosť písma" #: ../pidgin/gtkimhtmltoolbar.c:1096 -#, fuzzy msgid "Font Face" -msgstr "_Rez písma" +msgstr "Rez písma" #: ../pidgin/gtkimhtmltoolbar.c:1097 -#, fuzzy msgid "Background Color" -msgstr "Farba po_zadia" +msgstr "Farba pozadia" #: ../pidgin/gtkimhtmltoolbar.c:1098 -#, fuzzy msgid "Foreground Color" -msgstr "Farba _popredia" +msgstr "Farba popredia" #: ../pidgin/gtkimhtmltoolbar.c:1100 -#, fuzzy msgid "Reset Formatting" msgstr "Vymazať formátovanie" #: ../pidgin/gtkimhtmltoolbar.c:1103 -#, fuzzy msgid "Insert IM Image" msgstr "Vložiť obrázok" #: ../pidgin/gtkimhtmltoolbar.c:1104 -#, fuzzy msgid "Insert Smiley" -msgstr "Vložiť obrázok" - -#: ../pidgin/gtkimhtmltoolbar.c:1179 +msgstr "Vložiť smajlíka" + +#: ../pidgin/gtkimhtmltoolbar.c:1180 msgid "<b>_Bold</b>" msgstr "<b>_Tučné:</b>" -#: ../pidgin/gtkimhtmltoolbar.c:1180 +#: ../pidgin/gtkimhtmltoolbar.c:1181 msgid "<i>_Italic</i>" msgstr "<i>_Kurzíva</i>" -#: ../pidgin/gtkimhtmltoolbar.c:1181 +#: ../pidgin/gtkimhtmltoolbar.c:1182 msgid "<u>_Underline</u>" msgstr "<u>_Podčiarknuté</u>" -#: ../pidgin/gtkimhtmltoolbar.c:1182 +#: ../pidgin/gtkimhtmltoolbar.c:1183 msgid "<span strikethrough='true'>Strikethrough</span>" msgstr "<span size='larger'>Preškrtnuté</span>" -#: ../pidgin/gtkimhtmltoolbar.c:1183 +#: ../pidgin/gtkimhtmltoolbar.c:1184 msgid "<span size='larger'>_Larger</span>" msgstr "<span size='larger'>_Väčšie</span>" -#: ../pidgin/gtkimhtmltoolbar.c:1185 +#: ../pidgin/gtkimhtmltoolbar.c:1186 msgid "_Normal" msgstr "_Normálne" -#: ../pidgin/gtkimhtmltoolbar.c:1187 +#: ../pidgin/gtkimhtmltoolbar.c:1188 msgid "<span size='smaller'>_Smaller</span>" msgstr "<span size='smaller'>_Menšie</span>" #. If we want to show the formatting for the following items, we would #. * need to update them when formatting changes. The above items don't need #. * no updating nor nothin' -#: ../pidgin/gtkimhtmltoolbar.c:1191 +#: ../pidgin/gtkimhtmltoolbar.c:1192 msgid "_Font face" msgstr "_Rez písma" -#: ../pidgin/gtkimhtmltoolbar.c:1192 +#: ../pidgin/gtkimhtmltoolbar.c:1193 msgid "Foreground _color" msgstr "Farba _popredia" -#: ../pidgin/gtkimhtmltoolbar.c:1193 +#: ../pidgin/gtkimhtmltoolbar.c:1194 msgid "Bac_kground color" msgstr "Farba po_zadia" -#: ../pidgin/gtkimhtmltoolbar.c:1270 -msgid "_Smiley" -msgstr "_Smajlík" - -#: ../pidgin/gtkimhtmltoolbar.c:1276 +#: ../pidgin/gtkimhtmltoolbar.c:1271 msgid "_Image" msgstr "O_brázok" -#: ../pidgin/gtkimhtmltoolbar.c:1282 +#: ../pidgin/gtkimhtmltoolbar.c:1277 msgid "_Link" msgstr "_Odkaz" -#: ../pidgin/gtkimhtmltoolbar.c:1288 +#: ../pidgin/gtkimhtmltoolbar.c:1283 msgid "_Horizontal rule" msgstr "_Vodorovná čiara" +#: ../pidgin/gtkimhtmltoolbar.c:1305 +msgid "_Smile!" +msgstr "_Smajlík!" + #: ../pidgin/gtklog.c:293 #, c-format msgid "" @@ -15676,7 +15676,7 @@ msgstr "%s %s. „%s -h“ zobrazí viac informácií.\n" #: ../pidgin/gtkmain.c:388 -#, fuzzy, c-format +#, c-format msgid "" "%s %s\n" "Usage: %s [OPTION]...\n" @@ -15688,6 +15688,7 @@ " -n, --nologin don't automatically login\n" " -l, --login[=NAME] automatically login (optional argument NAME specifies\n" " account(s) to use, separated by commas)\n" +" --display=DISPLAY X display to use\n" " -v, --version display the current version and exit\n" msgstr "" "%s %s\n" @@ -15696,16 +15697,18 @@ " -c, --config=DIR pre konfiguračné súbory použije DIR\n" " -d, --debug vkladá ladiace informácie do stdout\n" " -h, --help zobrazí túto pomoc a skončí\n" +" -m, --multiple neobmedzí počet inštancií na jednu\n" " -n, --nologin neprihlasovať automaticky\n" " -l, --login[=MENO] automatické prihlásenie (voliteľný argument MENO " "určuje\n" " účty oddeľované čiarkami)\n" +" --display=DISPLAY X obrazovka, ktoru použiť\n" " -v, --version zobrazí verziu programu a skončí\n" -#: ../pidgin/gtkmain.c:512 -#, fuzzy, c-format -msgid "" -"%s has segfaulted and attempted to dump a core file.\n" +#: ../pidgin/gtkmain.c:516 +#, c-format +msgid "" +"%s %s has segfaulted and attempted to dump a core file.\n" "This is a bug in the software and has happened through\n" "no fault of your own.\n" "\n" @@ -15723,16 +15726,17 @@ "on other protocols is at\n" "%swiki/DeveloperPages\n" msgstr "" -"Program %s vrátil chybu segmentácie a pokúsil o výpis pamäte súboru jadra.\n" -"Je to spôsobené chybou v programe, a stalo sa tak bez vášho zavinenia.\n" +"Program %s %s vrátil chybu segmentácie a pokúsil o výpis pamäte súboru " +"jadra.\n" +"Je to spôsobené chybou v programe, a stalo sa to aj bez vášho zavinenia.\n" "\n" "Ak dokážete túto chybu zopakovať, kontaktujte, prosím, vývojárov programu\n" "tak, že nahlásite chybu na:\n" "%ssimpleticket/\n" "\n" "V hlásení nezabudnite tiež napísať čo presne ste robili, a\n" -"vložte aj backtrace zo súboru jadra. Ak neviete, ako získať\n" -"backtrace, prečítajte si, prosím, návod na adrese:\n" +"vložte aj spätný výpis zo súboru jadra. Ak neviete, ako získať\n" +"spätný výpis, prečítajte si, prosím, návod na adrese:\n" "%swiki/GetABacktrace\n" "\n" "Ak potrebujete ďalšiu pomoc, napíšte buď SeanEgnovi alebo \n" @@ -15742,7 +15746,7 @@ #. Translators may want to transliterate the name. #. It is not to be translated. -#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51 +#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51 msgid "Pidgin" msgstr "Pidgin" @@ -15754,7 +15758,7 @@ msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>" msgstr "<span weight=\"bold\" size=\"larger\">Máte poštu!</span>" -#: ../pidgin/gtknotify.c:540 +#: ../pidgin/gtknotify.c:545 #, c-format msgid "%s has %d new message." msgid_plural "%s has %d new messages." @@ -15762,30 +15766,30 @@ msgstr[1] "Používateľ %s má %d novú správu." msgstr[2] "Používateľ %s má %d nové správy." -#: ../pidgin/gtknotify.c:564 -#, fuzzy, c-format -msgid "<b>You have %d new e-mail.</b>" -msgid_plural "<b>You have %d new e-mails.</b>" -msgstr[0] "<b>Máte %d nových e-mailov.</b>" -msgstr[1] "<b>Máte %d nový e-mail.</b>" -msgstr[2] "<b>Máte %d nové e-maily.</b>" - -#: ../pidgin/gtknotify.c:989 +#: ../pidgin/gtknotify.c:569 +#, c-format +msgid "<b>%d new e-mail.</b>" +msgid_plural "<b>%d new e-mails.</b>" +msgstr[0] "<b>%d nových e-mailov.</b>" +msgstr[1] "<b>%d nový e-mail.</b>" +msgstr[2] "<b>%d nové e-maily.</b>" + +#: ../pidgin/gtknotify.c:996 #, c-format msgid "The browser command \"%s\" is invalid." msgstr "Príkaz prehliadača „%s“ je chybný." -#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003 -#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144 +#: ../pidgin/gtknotify.c:998 ../pidgin/gtknotify.c:1010 +#: ../pidgin/gtknotify.c:1023 ../pidgin/gtknotify.c:1151 msgid "Unable to open URL" msgstr "Nepodarilo sa otvoriť URL" -#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014 +#: ../pidgin/gtknotify.c:1008 ../pidgin/gtknotify.c:1021 #, c-format msgid "Error launching \"%s\": %s" msgstr "Chyba počas spúšťania „%s“: %s" -#: ../pidgin/gtknotify.c:1145 +#: ../pidgin/gtknotify.c:1152 msgid "" "The 'Manual' browser command has been chosen, but no command has been set." msgstr "Vybrali ste možnosť „Ručne“, ale nenastavili ste príkaz prehliadača." @@ -15837,95 +15841,95 @@ msgstr "Vyberte súbor" #. Create the "Pounce on Whom" frame. -#: ../pidgin/gtkpounce.c:532 +#: ../pidgin/gtkpounce.c:539 msgid "Pounce on Whom" msgstr "Koho sledovať" -#: ../pidgin/gtkpounce.c:559 +#: ../pidgin/gtkpounce.c:566 msgid "_Buddy name:" msgstr "_Meno priateľa:" -#: ../pidgin/gtkpounce.c:593 +#: ../pidgin/gtkpounce.c:600 msgid "Si_gns on" msgstr "_Prihlási sa" -#: ../pidgin/gtkpounce.c:595 +#: ../pidgin/gtkpounce.c:602 msgid "Signs o_ff" msgstr "_Odhlási sa" -#: ../pidgin/gtkpounce.c:597 +#: ../pidgin/gtkpounce.c:604 msgid "Goes a_way" msgstr "Stane sa neprítomný" -#: ../pidgin/gtkpounce.c:599 +#: ../pidgin/gtkpounce.c:606 msgid "Ret_urns from away" msgstr "Prestane byť neprítomný" -#: ../pidgin/gtkpounce.c:601 +#: ../pidgin/gtkpounce.c:608 msgid "Becomes _idle" msgstr "Stane sa _nečinným" -#: ../pidgin/gtkpounce.c:603 +#: ../pidgin/gtkpounce.c:610 msgid "Is no longer i_dle" msgstr "Prestane byť n_ečinný" -#: ../pidgin/gtkpounce.c:605 +#: ../pidgin/gtkpounce.c:612 msgid "Starts _typing" msgstr "Začne _písať" -#: ../pidgin/gtkpounce.c:607 +#: ../pidgin/gtkpounce.c:614 msgid "P_auses while typing" msgstr "Preruší pís_anie" -#: ../pidgin/gtkpounce.c:609 +#: ../pidgin/gtkpounce.c:616 msgid "Stops t_yping" msgstr "Prestane pí_sať" -#: ../pidgin/gtkpounce.c:611 +#: ../pidgin/gtkpounce.c:618 msgid "Sends a _message" msgstr "Pošle _správu" -#: ../pidgin/gtkpounce.c:654 +#: ../pidgin/gtkpounce.c:661 msgid "Ope_n an IM window" msgstr "Ot_voriť okno správ" -#: ../pidgin/gtkpounce.c:656 +#: ../pidgin/gtkpounce.c:663 msgid "_Pop up a notification" msgstr "_Zobraziť upozornenie" -#: ../pidgin/gtkpounce.c:658 +#: ../pidgin/gtkpounce.c:665 msgid "Send a _message" msgstr "Odoslať _správu" -#: ../pidgin/gtkpounce.c:660 +#: ../pidgin/gtkpounce.c:667 msgid "E_xecute a command" msgstr "Spustiť _príkaz" -#: ../pidgin/gtkpounce.c:662 +#: ../pidgin/gtkpounce.c:669 msgid "P_lay a sound" msgstr "Prehrať _zvuk" -#: ../pidgin/gtkpounce.c:668 +#: ../pidgin/gtkpounce.c:675 msgid "Brows_e..." msgstr "P_rehľadávať..." -#: ../pidgin/gtkpounce.c:670 +#: ../pidgin/gtkpounce.c:677 msgid "Br_owse..." msgstr "Prehľadávať..." -#: ../pidgin/gtkpounce.c:671 +#: ../pidgin/gtkpounce.c:678 msgid "Pre_view" msgstr "_Náhľad" -#: ../pidgin/gtkpounce.c:798 +#: ../pidgin/gtkpounce.c:805 msgid "P_ounce only when my status is not Available" msgstr "Sledovať, len ak som neprítomný" -#: ../pidgin/gtkpounce.c:803 +#: ../pidgin/gtkpounce.c:810 msgid "_Recurring" msgstr "_Opakujúce sa" -#: ../pidgin/gtkpounce.c:1246 +#: ../pidgin/gtkpounce.c:1253 msgid "Pounce Target" msgstr "Cieľ sledovania" @@ -15975,7 +15979,7 @@ msgid "_Hide new IM conversations:" msgstr "_Skrývať nové rozhovory:" -#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944 +#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946 msgid "When away" msgstr "Pri neprítomnosti" @@ -16028,55 +16032,59 @@ msgid "Show _formatting on incoming messages" msgstr "Zobrazovať _formátovanie v prichádzajúcich správach" -#: ../pidgin/gtkprefs.c:998 -msgid "Show _detailed information" -msgstr "Zobraziť detailné informácie" +#: ../pidgin/gtkprefs.c:997 +msgid "Close IMs immediately when the tab is closed" +msgstr "Zavrieť rozhovory v momente, keď zavriete kartu" #: ../pidgin/gtkprefs.c:1000 +msgid "Show _detailed information" +msgstr "Zobraziť detailné informácie" + +#: ../pidgin/gtkprefs.c:1002 msgid "Enable buddy ic_on animation" msgstr "Povoliť _animované obrázky priateľov" -#: ../pidgin/gtkprefs.c:1007 +#: ../pidgin/gtkprefs.c:1009 msgid "_Notify buddies that you are typing to them" msgstr "_Zobrazovať priateľom, že im píšete" -#: ../pidgin/gtkprefs.c:1010 +#: ../pidgin/gtkprefs.c:1012 msgid "Highlight _misspelled words" msgstr "Zvýrazňovať _nesprávne napísané slová" -#: ../pidgin/gtkprefs.c:1014 +#: ../pidgin/gtkprefs.c:1016 msgid "Use smooth-scrolling" msgstr "Používať hladké posúvanie" -#: ../pidgin/gtkprefs.c:1017 -msgid "F_lash window when IMs are received" -msgstr "Blikanie okna po prijatí správy" - #: ../pidgin/gtkprefs.c:1019 +msgid "F_lash window when IMs are received" +msgstr "Blikanie okna po prijatí správy" + +#: ../pidgin/gtkprefs.c:1021 msgid "Minimi_ze new conversation windows" msgstr "Minimali_zovať nové konverzácie" -#: ../pidgin/gtkprefs.c:1023 +#: ../pidgin/gtkprefs.c:1025 msgid "Font" msgstr "Písmo" -#: ../pidgin/gtkprefs.c:1025 -msgid "Use document font from _theme" -msgstr "Použiť písmo dokumentov _témy" - #: ../pidgin/gtkprefs.c:1027 +msgid "Use document font from _theme" +msgstr "Použiť písmo dokumentov _témy" + +#: ../pidgin/gtkprefs.c:1029 msgid "Use font from _theme" msgstr "Použiť písmo _témy" -#: ../pidgin/gtkprefs.c:1029 +#: ../pidgin/gtkprefs.c:1031 msgid "Conversation _font:" msgstr "Písmo konverzácie:" -#: ../pidgin/gtkprefs.c:1043 +#: ../pidgin/gtkprefs.c:1045 msgid "Default Formatting" msgstr "Štandardné formátovanie" -#: ../pidgin/gtkprefs.c:1062 +#: ../pidgin/gtkprefs.c:1064 msgid "" "This is how your outgoing message text will appear when you use protocols " "that support formatting." @@ -16084,119 +16092,119 @@ "Takto bude vyzerať text odchádzajúcich správ pri použití protokolu, ktorý " "podporuje formátovanie." -#: ../pidgin/gtkprefs.c:1128 +#: ../pidgin/gtkprefs.c:1130 msgid "ST_UN server:" msgstr "ST_UN server:" -#: ../pidgin/gtkprefs.c:1140 +#: ../pidgin/gtkprefs.c:1142 msgid "<span style=\"italic\">Example: stunserver.org</span>" msgstr "<span style=\"italic\">Príklad: stunserver.org</span>" -#: ../pidgin/gtkprefs.c:1144 +#: ../pidgin/gtkprefs.c:1146 msgid "_Autodetect IP address" msgstr "_Automaticky zistiť IP adresu" -#: ../pidgin/gtkprefs.c:1153 +#: ../pidgin/gtkprefs.c:1155 msgid "Public _IP:" msgstr "Verejná _IP adresa:" -#: ../pidgin/gtkprefs.c:1182 +#: ../pidgin/gtkprefs.c:1184 msgid "Ports" msgstr "Porty" -#: ../pidgin/gtkprefs.c:1185 +#: ../pidgin/gtkprefs.c:1187 msgid "_Manually specify range of ports to listen on" msgstr "_Ručne určiť rozsah portov, na ktorých počúvať" -#: ../pidgin/gtkprefs.c:1188 +#: ../pidgin/gtkprefs.c:1190 msgid "_Start port:" msgstr "_Počiatočný port:" -#: ../pidgin/gtkprefs.c:1195 +#: ../pidgin/gtkprefs.c:1197 msgid "_End port:" -msgstr "_Konečný port:" - -#: ../pidgin/gtkprefs.c:1203 +msgstr "_Koncový port:" + +#: ../pidgin/gtkprefs.c:1205 msgid "Proxy Server" msgstr "Proxy server" -#: ../pidgin/gtkprefs.c:1207 +#: ../pidgin/gtkprefs.c:1209 msgid "No proxy" msgstr "Bez proxy" -#: ../pidgin/gtkprefs.c:1263 +#: ../pidgin/gtkprefs.c:1265 msgid "_User:" -msgstr "Používateľ:" - -#: ../pidgin/gtkprefs.c:1328 +msgstr "Po_užívateľ:" + +#: ../pidgin/gtkprefs.c:1330 msgid "Seamonkey" msgstr "Seamonkey" -#: ../pidgin/gtkprefs.c:1329 -msgid "Opera" -msgstr "Opera" - -#: ../pidgin/gtkprefs.c:1330 -msgid "Netscape" -msgstr "Netscape" - #: ../pidgin/gtkprefs.c:1331 -msgid "Mozilla" -msgstr "Mozilla" +msgid "Opera" +msgstr "Opera" #: ../pidgin/gtkprefs.c:1332 -msgid "Konqueror" -msgstr "Konqueror" +msgid "Netscape" +msgstr "Netscape" #: ../pidgin/gtkprefs.c:1333 -msgid "GNOME Default" -msgstr "GNOME štandard" +msgid "Mozilla" +msgstr "Mozilla" #: ../pidgin/gtkprefs.c:1334 +msgid "Konqueror" +msgstr "Konqueror" + +#: ../pidgin/gtkprefs.c:1335 +msgid "GNOME Default" +msgstr "GNOME štandard" + +#: ../pidgin/gtkprefs.c:1336 msgid "Galeon" msgstr "Galeon" -#: ../pidgin/gtkprefs.c:1335 +#: ../pidgin/gtkprefs.c:1337 msgid "Firefox" msgstr "Firefox" -#: ../pidgin/gtkprefs.c:1336 +#: ../pidgin/gtkprefs.c:1338 msgid "Firebird" msgstr "Firebird" -#: ../pidgin/gtkprefs.c:1337 +#: ../pidgin/gtkprefs.c:1339 msgid "Epiphany" msgstr "Epiphany" -#: ../pidgin/gtkprefs.c:1346 +#: ../pidgin/gtkprefs.c:1348 msgid "Manual" msgstr "Ručné" -#: ../pidgin/gtkprefs.c:1399 +#: ../pidgin/gtkprefs.c:1401 msgid "Browser Selection" msgstr "Výber prehliadača" -#: ../pidgin/gtkprefs.c:1403 +#: ../pidgin/gtkprefs.c:1405 msgid "_Browser:" msgstr "_Prehliadač:" -#: ../pidgin/gtkprefs.c:1411 +#: ../pidgin/gtkprefs.c:1413 msgid "_Open link in:" msgstr "_Otvoriť odkaz:" -#: ../pidgin/gtkprefs.c:1413 +#: ../pidgin/gtkprefs.c:1415 msgid "Browser default" msgstr "Podľa prehliadača" -#: ../pidgin/gtkprefs.c:1414 +#: ../pidgin/gtkprefs.c:1416 msgid "Existing window" msgstr "V otvorenom okne" -#: ../pidgin/gtkprefs.c:1416 +#: ../pidgin/gtkprefs.c:1418 msgid "New tab" msgstr "Na novej karte" -#: ../pidgin/gtkprefs.c:1430 +#: ../pidgin/gtkprefs.c:1432 #, c-format msgid "" "_Manual:\n" @@ -16205,69 +16213,63 @@ "_Ručne:\n" "(%s for URL)" -#: ../pidgin/gtkprefs.c:1470 +#: ../pidgin/gtkprefs.c:1472 msgid "Log _format:" msgstr "_Formát záznamu:" -#: ../pidgin/gtkprefs.c:1475 +#: ../pidgin/gtkprefs.c:1477 msgid "Log all _instant messages" msgstr "Zaznamenávať všetky _správy" -#: ../pidgin/gtkprefs.c:1477 +#: ../pidgin/gtkprefs.c:1479 msgid "Log all c_hats" msgstr "Zaznamenávať všetky c_haty" -#: ../pidgin/gtkprefs.c:1479 +#: ../pidgin/gtkprefs.c:1481 msgid "Log all _status changes to system log" msgstr "Zaznamenávať do systémového záznamu všetky zmeny _stavu" -#: ../pidgin/gtkprefs.c:1625 +#: ../pidgin/gtkprefs.c:1627 msgid "Sound Selection" msgstr "Výber zvuku" -#: ../pidgin/gtkprefs.c:1635 -#, c-format +#: ../pidgin/gtkprefs.c:1637 msgid "Quietest" msgstr "Najtichšia" -#: ../pidgin/gtkprefs.c:1637 -#, c-format -msgid "Quieter" -msgstr "Tichšia" - #: ../pidgin/gtkprefs.c:1639 -#, c-format +msgid "Quieter" +msgstr "Tichšia" + +#: ../pidgin/gtkprefs.c:1641 msgid "Quiet" msgstr "Tichá" -#: ../pidgin/gtkprefs.c:1643 -#, c-format +#: ../pidgin/gtkprefs.c:1645 msgid "Loud" msgstr "Hlasná" -#: ../pidgin/gtkprefs.c:1645 -#, c-format -msgid "Louder" -msgstr "Hlasnejšia" - #: ../pidgin/gtkprefs.c:1647 -#, c-format +msgid "Louder" +msgstr "Hlasnejšia" + +#: ../pidgin/gtkprefs.c:1649 msgid "Loudest" msgstr "Najhlasnejšia" -#: ../pidgin/gtkprefs.c:1713 -msgid "_Method:" -msgstr "_Spôsob:" - #: ../pidgin/gtkprefs.c:1715 +msgid "_Method:" +msgstr "_Spôsob:" + +#: ../pidgin/gtkprefs.c:1717 msgid "Console beep" msgstr "Pípnutie konzoly" -#: ../pidgin/gtkprefs.c:1722 +#: ../pidgin/gtkprefs.c:1724 msgid "No sounds" msgstr "Žiadne zvuky" -#: ../pidgin/gtkprefs.c:1730 +#: ../pidgin/gtkprefs.c:1732 #, c-format msgid "" "Sound c_ommand:\n" @@ -16276,81 +16278,81 @@ "Príkaz zvuku:\n" "(%s pre názov súboru)" -#: ../pidgin/gtkprefs.c:1757 +#: ../pidgin/gtkprefs.c:1759 msgid "Sounds when conversation has _focus" msgstr "Prehrávať zvuky, keď je okno koverzácie _aktívne" -#: ../pidgin/gtkprefs.c:1759 +#: ../pidgin/gtkprefs.c:1761 msgid "Enable sounds:" msgstr "Povoliť zvuky:" -#: ../pidgin/gtkprefs.c:1770 +#: ../pidgin/gtkprefs.c:1772 msgid "Volume:" msgstr "Hlasitosť:" -#: ../pidgin/gtkprefs.c:1850 +#: ../pidgin/gtkprefs.c:1852 msgid "Play" msgstr "Prehrať" -#: ../pidgin/gtkprefs.c:1927 +#: ../pidgin/gtkprefs.c:1929 msgid "_Report idle time:" msgstr "_Oznamovať čas nečinnosti:" -#: ../pidgin/gtkprefs.c:1932 +#: ../pidgin/gtkprefs.c:1934 msgid "Based on keyboard or mouse use" msgstr "Podľa využitia klávesnice alebo myši" -#: ../pidgin/gtkprefs.c:1941 +#: ../pidgin/gtkprefs.c:1943 msgid "_Auto-reply:" msgstr "_Automatická odpoveď:" -#: ../pidgin/gtkprefs.c:1945 +#: ../pidgin/gtkprefs.c:1947 msgid "When both away and idle" msgstr "Pri neprítomnosti a nečinnosti" #. Auto-away stuff -#: ../pidgin/gtkprefs.c:1951 +#: ../pidgin/gtkprefs.c:1953 msgid "Auto-away" msgstr "Automatická neprítomnosť" -#: ../pidgin/gtkprefs.c:1953 +#: ../pidgin/gtkprefs.c:1955 msgid "Change status when _idle" msgstr "Zmeniť stav pri _nečinnosti" -#: ../pidgin/gtkprefs.c:1957 +#: ../pidgin/gtkprefs.c:1959 msgid "_Minutes before becoming idle:" msgstr "_Počet minút pred nečinnosťou:" -#: ../pidgin/gtkprefs.c:1965 +#: ../pidgin/gtkprefs.c:1967 msgid "Change _status to:" msgstr "Zmeniť _stav na:" #. Signon status stuff -#: ../pidgin/gtkprefs.c:1986 +#: ../pidgin/gtkprefs.c:1988 msgid "Status at Startup" msgstr "Stav pri spustení" -#: ../pidgin/gtkprefs.c:1988 +#: ../pidgin/gtkprefs.c:1990 msgid "Use status from last _exit at startup" msgstr "Po spustení použiť stav ako pred odhlásením" -#: ../pidgin/gtkprefs.c:1994 +#: ../pidgin/gtkprefs.c:1996 msgid "Status to a_pply at startup:" msgstr "Po spustení použiť stav:" -#: ../pidgin/gtkprefs.c:2032 +#: ../pidgin/gtkprefs.c:2034 msgid "Interface" msgstr "Rozhranie" -#: ../pidgin/gtkprefs.c:2034 +#: ../pidgin/gtkprefs.c:2036 msgid "Smiley Themes" msgstr "Témy smajlíkov" -#: ../pidgin/gtkprefs.c:2041 +#: ../pidgin/gtkprefs.c:2043 msgid "Browser" msgstr "Prehliadač" -#: ../pidgin/gtkprefs.c:2045 +#: ../pidgin/gtkprefs.c:2047 msgid "Status / Idle" msgstr "Stav / nečinný" @@ -16424,7 +16426,7 @@ #: ../pidgin/gtkprivacy.c:601 msgid "Please enter the name of the user you wish to block." -msgstr "Zadajte, prosím, meno používateľa, ktorého si želáte blokovať." +msgstr "Zadajte, prosím, meno používateľa, ktorého chcete blokovať." #: ../pidgin/gtkprivacy.c:609 #, c-format @@ -16846,7 +16848,7 @@ msgid "Received Messages" msgstr "Prijaté správy" -#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251 +#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245 #, c-format msgid "Select Color for %s" msgstr "Vyberte farbu pre %s" @@ -17119,7 +17121,7 @@ "\n" "<b>Poznámka priateľa:</b> %s" -#: ../pidgin/plugins/history.c:188 +#: ../pidgin/plugins/history.c:192 msgid "History" msgstr "História" @@ -17374,45 +17376,36 @@ msgid "GtkTreeView Horizontal Separation" msgstr "Vodorovná medzera v GtkTreeView" -#: ../pidgin/plugins/pidginrc.c:73 +#: ../pidgin/plugins/pidginrc.c:69 msgid "Conversation Entry" msgstr "Položka rozhovoru" -#: ../pidgin/plugins/pidginrc.c:74 -msgid "Conversation History" -msgstr "História rozhovoru" - -#: ../pidgin/plugins/pidginrc.c:75 -msgid "Log Viewer" -msgstr "Zobrazovač záznamov" - -#: ../pidgin/plugins/pidginrc.c:76 +#: ../pidgin/plugins/pidginrc.c:70 msgid "Request Dialog" msgstr "Dialóg požiadavku" -#: ../pidgin/plugins/pidginrc.c:77 +#: ../pidgin/plugins/pidginrc.c:71 msgid "Notify Dialog" msgstr "Dialóg upozornenia" -#: ../pidgin/plugins/pidginrc.c:253 +#: ../pidgin/plugins/pidginrc.c:247 msgid "Select Color" msgstr "Vyberte farbu" -#: ../pidgin/plugins/pidginrc.c:300 -#, c-format +#: ../pidgin/plugins/pidginrc.c:294 msgid "Select Interface Font" msgstr "Vyberte písmo rozhrania" -#: ../pidgin/plugins/pidginrc.c:303 +#: ../pidgin/plugins/pidginrc.c:297 #, c-format msgid "Select Font for %s" msgstr "Vyberte písmo pre %s" -#: ../pidgin/plugins/pidginrc.c:371 +#: ../pidgin/plugins/pidginrc.c:365 msgid "GTK+ Interface Font" msgstr "Písmo rozhrania GTK+" -#: ../pidgin/plugins/pidginrc.c:391 +#: ../pidgin/plugins/pidginrc.c:385 msgid "GTK+ Text Shortcut Theme" msgstr "Textová téma odkazov GTK+" @@ -17436,36 +17429,36 @@ #. widget_bool_widgets[i]); #. } #. -#: ../pidgin/plugins/pidginrc.c:428 +#: ../pidgin/plugins/pidginrc.c:422 msgid "Interface colors" msgstr "Farby rozhrania" -#: ../pidgin/plugins/pidginrc.c:452 +#: ../pidgin/plugins/pidginrc.c:446 msgid "Widget Sizes" msgstr "Veľkosti ovládacích prvkov" -#: ../pidgin/plugins/pidginrc.c:473 +#: ../pidgin/plugins/pidginrc.c:467 msgid "Fonts" msgstr "Písma" -#: ../pidgin/plugins/pidginrc.c:497 +#: ../pidgin/plugins/pidginrc.c:491 msgid "Gtkrc File Tools" msgstr "Nástroje súboru Gtkrc" -#: ../pidgin/plugins/pidginrc.c:502 +#: ../pidgin/plugins/pidginrc.c:496 #, c-format msgid "Write settings to %s%sgtkrc-2.0" msgstr "Uložiť nastavenia do %s%sgtkrc-2.0" -#: ../pidgin/plugins/pidginrc.c:511 +#: ../pidgin/plugins/pidginrc.c:505 msgid "Re-read gtkrc files" msgstr "Znovu načítať súbory gtkrc" -#: ../pidgin/plugins/pidginrc.c:544 +#: ../pidgin/plugins/pidginrc.c:538 msgid "Pidgin GTK+ Theme Control" msgstr "Ovládánie témy GTK+ programu Pidgin" -#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547 +#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541 msgid "Provides access to commonly used gtkrc settings." msgstr "Umožňuje prístup ku najčastejšie používaným nastaveniam GTKrc." @@ -17647,7 +17640,6 @@ msgstr "Voľby formátu časovej značky" #: ../pidgin/plugins/timestamp_format.c:26 -#, c-format msgid "_Force 24-hour time format" msgstr "_Vynútiť 24-hodinový formát času" @@ -17842,138 +17834,46 @@ #: ../pidgin/plugins/xmppconsole.c:790 msgid "Insert an <iq/> stanza." -msgstr "Vložiť <iq/> stanza." +msgstr "Vložiť <iq/> slohu." #: ../pidgin/plugins/xmppconsole.c:799 msgid "Insert a <presence/> stanza." -msgstr "Vložiť <presence/> stanza." +msgstr "Vložiť <presence/> slohu." #: ../pidgin/plugins/xmppconsole.c:808 msgid "Insert a <message/> stanza." -msgstr "Vložiť <message/> stanza." +msgstr "Vložiť <message/> slohu." #. *< name #. *< version #. * summary #: ../pidgin/plugins/xmppconsole.c:863 msgid "Send and receive raw XMPP stanzas." -msgstr "Odosielať a prijímať nespracované XMPP stanzy." +msgstr "Odosielať a prijímať nespracované XMPP slohy." #. * description #: ../pidgin/plugins/xmppconsole.c:865 msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "Tento plugin je vhodný pre ladenie XMPP serverov alebo klientov." -#, fuzzy -#~ msgid "Offline buddies" -#~ msgstr "Zobraziť odpojených priateľov" - -#, fuzzy -#~ msgid "Sort" -#~ msgstr "Port" - -#, fuzzy -#~ msgid "By Status" -#~ msgstr "Podľa stavu" - -#, fuzzy -#~ msgid "By Log Size" -#~ msgstr "Podľa veľkosti záznamu" - -#, fuzzy -#~ msgid "Unable to connect to contact server" -#~ msgstr "Nepodarilo sa pripojiť na server." - -#, fuzzy -#~ msgid "Unable to retrieve MSN Address Book" -#~ msgstr "Vyberte Notes zoznam adries" - -#, fuzzy -#~ msgid "Current media" -#~ msgstr "Aktuálny token" - -#, fuzzy -#~ msgid "Windows Live Messenger Protocol Plugin" -#~ msgstr "Modul protokolu Novell GroupWise Messenger" - -#, fuzzy -#~ msgid "Windows Live ID authentication Failed" -#~ msgstr "Chyba: Zlyhala antentifikácia" - -#~ msgid "%s just sent you a Nudge!" -#~ msgstr "%s vám práve poslal Nudge!" - -#, fuzzy -#~ msgid "Unknown error (%d)" -#~ msgstr "Neznáma chyba" - -#, fuzzy -#~ msgid "Unable to connect to OIM server" -#~ msgstr "Nepodarilo sa pripojiť na server." - -#, fuzzy -#~ msgid "%s (%s) changed status from %s to %s" -#~ msgstr "Používateľ %s zmenil stav z %s na %s" - -#, fuzzy -#~ msgid "%s (%s) is now %s" -#~ msgstr "Používateľ %s je teraz %s" - -#, fuzzy -#~ msgid "%s (%s) is no longer %s" -#~ msgstr "Používateľ %s už nie je %s" - -#, fuzzy -#~ msgid "_Merge" -#~ msgstr "_Správa:" - -#, fuzzy -#~ msgid "_Send File..." -#~ msgstr "Odoslať _súbor" - -#, fuzzy -#~ msgid "Add Buddy _Pounce..." -#~ msgstr "Pridať sledovanie priateľa..." - -#, fuzzy -#~ msgid "Hide when offline" -#~ msgstr "Nepovolené v odpojenom stave" - -#, fuzzy -#~ msgid "Show when offline" -#~ msgstr "Nepovolené v odpojenom stave" - -#, fuzzy -#~ msgid "Add _Buddy..." -#~ msgstr "Pridať priateľa" - -#, fuzzy -#~ msgid "Add C_hat..." -#~ msgstr "Pridať chat" - -#, fuzzy -#~ msgid "Persistent" -#~ msgstr "perzština" - -#, fuzzy -#~ msgid "/Accounts/Manage" -#~ msgstr "/Účty" - -#, fuzzy -#~ msgid "A_ccount:" -#~ msgstr "Účet:" - -#, fuzzy -#~ msgid "S_end To" -#~ msgstr "Odoslať do" - -#, fuzzy -#~ msgid "_Smile!" -#~ msgstr "Smajlík!" +#~ msgid "Sort by status" +#~ msgstr "Zoradiť podľa stavu" + +#~ msgid "Sort alphabetically" +#~ msgstr "Zoradiť podľa abecedy" + +#~ msgid "Sort by log size" +#~ msgstr "Zoradiť podľa veľkosti záznamu" #~ msgid "You have just sent a Nudge!" #~ msgstr "Práve ste odoslali štuchanec!" +#~ msgid "Has you" +#~ msgstr "Vás má" + +#~ msgid "MSN Protocol Plugin" +#~ msgstr "Modul protokolu HTTP" + #~ msgid "Would like to add him?" #~ msgstr "Chcete ho pridať?" @@ -17983,6 +17883,18 @@ #~ msgid "You have just sent a Buzz!" #~ msgstr "Práve ste odoslali bzzz!" +#~ msgid "Add Buddy _Pounce" +#~ msgstr "Pridať _sledovanie priatela" + +#~ msgid "Add a _Buddy" +#~ msgstr "Pridať priateľa" + +#~ msgid "Add a C_hat" +#~ msgstr "Pridať chat" + +#~ msgid "/Accounts/Add\\/Edit" +#~ msgstr "/Účty/Pri_dať a upraviť" + #~ msgid "/Help" #~ msgstr "/_Pomocník" @@ -17992,6 +17904,9 @@ #~ msgid "/Options/Show Buddy Icon" #~ msgstr "/Možnosti/Zobraziť ikonu priateľa" +#~ msgid "_Send To" +#~ msgstr "Po_slať cez" + #~ msgid "" #~ "%s is a graphical modular messaging client based on libpurple which is " #~ "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/" @@ -18014,6 +17929,15 @@ #~ "súbore 'COPYRIGHT'. Na tento program vám neposkytujeme žiadnu záruku." #~ "<BR><BR>" +#~ msgid "_Smiley" +#~ msgstr "_Smajlík" + +#~ msgid "Conversation History" +#~ msgstr "História rozhovoru" + +#~ msgid "Log Viewer" +#~ msgstr "Zobrazovač záznamov" + #~ msgid "nudged" #~ msgstr "štuchnutý"