changeset 28485:93fac1b47fb5

merged with im.pidgin.pidgin
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sun, 30 Aug 2009 03:04:43 +0900
parents b4cbcb427e7d (current diff) a6ac330d4ec6 (diff)
children 06870444768d
files libpurple/util.c
diffstat 16 files changed, 1232 insertions(+), 1913 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Aug 29 04:49:46 2009 +0900
+++ b/ChangeLog	Sun Aug 30 03:04:43 2009 +0900
@@ -20,6 +20,8 @@
 
 	Pidgin:
 	* Fix the auto-personize functionality in the Buddy List.
+	* Set the window icon for the media window to an icon corresponding to
+	  the type of call (headphone or webcam).
 
 version 2.6.1 (08/18/2009):
 	* Fix a crash when some users send you a link in a Yahoo IM
--- a/ChangeLog.API	Sat Aug 29 04:49:46 2009 +0900
+++ b/ChangeLog.API	Sun Aug 30 03:04:43 2009 +0900
@@ -1,5 +1,14 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.6.2 (09/??/2009):
+	Perl:
+		Added:
+		* Purple::XMLNode::get_next(), which returns the next neighbor tag of
+		  the current node.
+		Changed:
+		* Purple::XMLNode::get_child() will return the first child node if
+		  passed "" or undef as the name of the node.
+
 version 2.6.1 (08/18/2009):
 	No changes
 
--- a/libpurple/account.c	Sat Aug 29 04:49:46 2009 +0900
+++ b/libpurple/account.c	Sun Aug 30 03:04:43 2009 +0900
@@ -2290,9 +2290,13 @@
 purple_account_add_buddy(PurpleAccount *account, PurpleBuddy *buddy)
 {
 	PurplePluginProtocolInfo *prpl_info = NULL;
-	PurpleConnection *gc = purple_account_get_connection(account);
+	PurpleConnection *gc;
 	PurplePlugin *prpl = NULL;
 
+	g_return_if_fail(account != NULL);
+	g_return_if_fail(buddy != NULL);
+
+	gc = purple_account_get_connection(account);
 	if (gc != NULL)
 	        prpl = purple_connection_get_prpl(gc);
 
--- a/libpurple/plugins/perl/common/XMLNode.xs	Sat Aug 29 04:49:46 2009 +0900
+++ b/libpurple/plugins/perl/common/XMLNode.xs	Sun Aug 30 03:04:43 2009 +0900
@@ -32,6 +32,18 @@
 xmlnode_get_child(parent, name)
 	Purple::XMLNode parent
 	const char *name
+PREINIT:
+	xmlnode *tmp;
+CODE:
+	if (!name || *name == '\0') {
+		tmp = parent->child;
+		while (tmp && tmp->type != XMLNODE_TYPE_TAG)
+			tmp = tmp->next;
+		RETVAL = tmp;
+	} else
+		RETVAL = xmlnode_get_child(parent, name);
+OUTPUT:
+	RETVAL
 
 Purple::XMLNode
 xmlnode_get_child_with_namespace(parent, name, xmlns)
@@ -44,6 +56,19 @@
 	Purple::XMLNode node
 
 Purple::XMLNode
+xmlnode_get_next(node)
+	Purple::XMLNode node
+PREINIT:
+	xmlnode *tmp;
+CODE:
+	tmp = node->next;
+	while (tmp && tmp->type != XMLNODE_TYPE_TAG)
+		tmp = tmp->next;
+	RETVAL = tmp;
+OUTPUT:
+	RETVAL
+
+Purple::XMLNode
 xmlnode_get_next_twin(node)
 	Purple::XMLNode node
 
--- a/libpurple/protocols/jabber/jutil.c	Sat Aug 29 04:49:46 2009 +0900
+++ b/libpurple/protocols/jabber/jutil.c	Sun Aug 30 03:04:43 2009 +0900
@@ -277,8 +277,8 @@
 #endif /* USE_IDN */
 }
 
-JabberID*
-jabber_id_new(const char *str)
+static JabberID*
+jabber_id_new_internal(const char *str, gboolean allow_terminating_slash)
 {
 	const char *at = NULL;
 	const char *slash = NULL;
@@ -323,7 +323,7 @@
 						/* JIDs cannot start with / */
 						return NULL;
 					}
-					if (c[1] == '\0') {
+					if (c[1] == '\0' && !allow_terminating_slash) {
 						/* JIDs cannot end with / */
 						return NULL;
 					}
@@ -386,14 +386,16 @@
 			jid->node = g_ascii_strdown(str, at - str);
 			if (slash) {
 				jid->domain = g_ascii_strdown(at + 1, slash - (at + 1));
-				jid->resource = g_strdup(slash + 1);
+				if (*(slash + 1))
+					jid->resource = g_strdup(slash + 1);
 			} else {
 				jid->domain = g_ascii_strdown(at + 1, -1);
 			}
 		} else {
 			if (slash) {
 				jid->domain = g_ascii_strdown(str, slash - str);
-				jid->resource = g_strdup(slash + 1);
+				if (*(slash + 1))
+					jid->resource = g_strdup(slash + 1);
 			} else {
 				jid->domain = g_ascii_strdown(str, -1);
 			}
@@ -421,14 +423,16 @@
 		node = g_utf8_casefold(str, at-str);
 		if(slash) {
 			domain = g_utf8_casefold(at+1, slash-(at+1));
-			jid->resource = g_utf8_normalize(slash+1, -1, G_NORMALIZE_NFKC);
+			if (*(slash + 1))
+				jid->resource = g_utf8_normalize(slash+1, -1, G_NORMALIZE_NFKC);
 		} else {
 			domain = g_utf8_casefold(at+1, -1);
 		}
 	} else {
 		if(slash) {
 			domain = g_utf8_casefold(str, slash-str);
-			jid->resource = g_utf8_normalize(slash+1, -1, G_NORMALIZE_NFKC);
+			if (*(slash + 1))
+				jid->resource = g_utf8_normalize(slash+1, -1, G_NORMALIZE_NFKC);
 		} else {
 			domain = g_utf8_casefold(str, -1);
 		}
@@ -500,30 +504,20 @@
 	return out;
 }
 
+JabberID *
+jabber_id_new(const char *str)
+{
+	return jabber_id_new_internal(str, FALSE);
+}
+
 const char *jabber_normalize(const PurpleAccount *account, const char *in)
 {
 	PurpleConnection *gc = account ? account->gc : NULL;
 	JabberStream *js = gc ? gc->proto_data : NULL;
 	static char buf[3072]; /* maximum legal length of a jabber jid */
 	JabberID *jid;
-	char *tmp;
-	size_t len = strlen(in);
 
-	/*
-	 * If the JID ends with a '/', jabber_id_new is going to throw it away as
-	 * invalid.  However, this is what the UI generates for a JID with no
-	 * resource. Deal with that by dropping away the '/'...
-	 */
-	if (in[len - 1] == '/')
-		tmp = g_strndup(in, len - 1);
-	else
-		tmp = (gchar *)in;
-
-	jid = jabber_id_new(tmp);
-
-	if (tmp != in)
-		g_free(tmp);
-
+	jid = jabber_id_new_internal(in, TRUE);
 	if(!jid)
 		return NULL;
 
--- a/libpurple/protocols/simple/Makefile.am	Sat Aug 29 04:49:46 2009 +0900
+++ b/libpurple/protocols/simple/Makefile.am	Sun Aug 30 03:04:43 2009 +0900
@@ -13,7 +13,7 @@
 
 libsimple_la_LDFLAGS = -module -avoid-version
 
-if STATIC_MSN
+if STATIC_SIMPLE
 
 st = -DPURPLE_STATIC_PRPL
 noinst_LTLIBRARIES   = libsimple.la
--- a/libpurple/tests/test_jabber_jutil.c	Sat Aug 29 04:49:46 2009 +0900
+++ b/libpurple/tests/test_jabber_jutil.c	Sun Aug 30 03:04:43 2009 +0900
@@ -153,6 +153,14 @@
 }
 END_TEST
 
+START_TEST(test_jabber_normalize)
+{
+	assert_string_equal("paul@darkrain42.org", jabber_normalize(NULL, "PaUL@DaRkRain42.org"));
+	assert_string_equal("paul@darkrain42.org", jabber_normalize(NULL, "PaUL@DaRkRain42.org/"));
+	assert_string_equal("paul@darkrain42.org", jabber_normalize(NULL, "PaUL@DaRkRain42.org/resource"));
+}
+END_TEST
+
 Suite *
 jabber_jutil_suite(void)
 {
@@ -172,6 +180,7 @@
 	tcase_add_test(tc, test_nodeprep_validate_illegal_chars);
 	tcase_add_test(tc, test_nodeprep_validate_too_long);
 	tcase_add_test(tc, test_jabber_id_new);
+	tcase_add_test(tc, test_jabber_normalize);
 	suite_add_tcase(s, tc);
 
 	return s;
--- a/libpurple/util.c	Sat Aug 29 04:49:46 2009 +0900
+++ b/libpurple/util.c	Sun Aug 30 03:04:43 2009 +0900
@@ -3172,6 +3172,9 @@
 	const char *ret = NULL;
 	static char buf[BUF_LEN];
 
+	/* This should prevent a crash if purple_normalize gets called with NULL str, see #10115 */
+	g_return_val_if_fail(str != NULL, "");
+
 	if (account != NULL)
 	{
 		PurplePlugin *prpl = purple_find_prpl(purple_account_get_protocol_id(account));
--- a/pidgin/gtkmedia.c	Sat Aug 29 04:49:46 2009 +0900
+++ b/pidgin/gtkmedia.c	Sun Aug 30 03:04:43 2009 +0900
@@ -34,6 +34,7 @@
 
 #include "gtkmedia.h"
 #include "gtkutils.h"
+#include "pidginstock.h"
 
 #ifdef USE_VV
 #include "media-gst.h"
@@ -610,6 +611,7 @@
 	GtkWidget *send_widget = NULL, *recv_widget = NULL, *button_widget = NULL;
 	PurpleMediaSessionType type =
 			purple_media_get_session_type(media, sid);
+	GdkPixbuf *icon = NULL;
 
 	if (gtkmedia->priv->recv_widget == NULL
 			&& type & (PURPLE_MEDIA_RECV_VIDEO |
@@ -743,6 +745,20 @@
 				gtkmedia);
 	}
 
+	/* set the window icon according to the type */
+	if (type & PURPLE_MEDIA_VIDEO) {
+		icon = gtk_widget_render_icon(gtkmedia, PIDGIN_STOCK_TOOLBAR_VIDEO_CALL,
+			gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_LARGE), NULL);
+	} else if (type & PURPLE_MEDIA_AUDIO) {
+		icon = gtk_widget_render_icon(gtkmedia, PIDGIN_STOCK_TOOLBAR_AUDIO_CALL,
+			gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_LARGE), NULL);
+	}
+
+	if (icon) {
+		gtk_window_set_icon(GTK_WINDOW(gtkmedia), icon);
+		g_object_unref(icon);
+	}
+	
 	gtk_widget_show(gtkmedia->priv->display);
 }
 
--- a/pidgin/plugins/Makefile.am	Sat Aug 29 04:49:46 2009 +0900
+++ b/pidgin/plugins/Makefile.am	Sun Aug 30 03:04:43 2009 +0900
@@ -93,7 +93,7 @@
 themeedit_la_SOURCES        = themeedit.c themeedit-icon.c themeedit-icon.h
 timestamp_la_SOURCES        = timestamp.c
 timestamp_format_la_SOURCES = timestamp_format.c
-vvconfig_SOURCES            = vvconfig.c
+vvconfig_la_SOURCES         = vvconfig.c
 xmppconsole_la_SOURCES      = xmppconsole.c
 
 convcolors_la_LIBADD        = $(GTK_LIBS)
--- a/pidgin/plugins/gevolution/gevo-util.c	Sat Aug 29 04:49:46 2009 +0900
+++ b/pidgin/plugins/gevolution/gevo-util.c	Sun Aug 30 03:04:43 2009 +0900
@@ -35,14 +35,16 @@
 
 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, buddy_name, account);
 
-	if ((group = purple_find_group(group_name)) == NULL)
+	group = purple_find_group(group_name);
+	if (group == NULL)
 	{
 		group = purple_group_new(group_name);
 		purple_blist_add_group(group, NULL);
 	}
 
-	if ((buddy = purple_find_buddy_in_group(account, buddy_name, group)))
-	{	
+	buddy = purple_find_buddy_in_group(account, buddy_name, group);
+	if (buddy == NULL)
+	{
 		buddy = purple_buddy_new(account, buddy_name, alias);
 		purple_blist_add_buddy(buddy, NULL, group, NULL);
 	}
--- a/po/ChangeLog	Sat Aug 29 04:49:46 2009 +0900
+++ b/po/ChangeLog	Sun Aug 30 03:04:43 2009 +0900
@@ -1,5 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.6.2
+	* German translation updated (Jochen Kemnade)
+	* Hungarian translation updated (Gabor Kelemen)
+	* Slovenian translation updated (Martin Srebotnjak)
+
 version 2.6.1
 	* No changes
 
--- a/po/fr.po	Sat Aug 29 04:49:46 2009 +0900
+++ b/po/fr.po	Sun Aug 30 03:04:43 2009 +0900
@@ -21,8 +21,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 22:15+0200\n"
-"PO-Revision-Date: 2009-07-19 22:15+0200\n"
+"POT-Creation-Date: 2009-08-29 09:41+0200\n"
+"PO-Revision-Date: 2009-08-29 09:40+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -884,8 +884,8 @@
 msgid "System Log"
 msgstr "Archives des messages système"
 
-msgid "Calling ... "
-msgstr "Appel... "
+msgid "Calling..."
+msgstr "Appel..."
 
 msgid "Hangup"
 msgstr "Raccrocher"
@@ -1523,6 +1523,31 @@
 "Quand une nouvelle conversation est ouverte, le plugin rajoute la dernière "
 "conversation avec l'interlocuteur dans la fenêtre."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Récupération TinyURL..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "Création de TinyURL seulement pour les liens de cette taille mini"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Préfixe d'adresse TinyURL (ou autre)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Plugin TinyURL"
+
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr ""
+"À la réception d'un message avec un ou plusieurs liens hypertextes, utilise "
+"TinyURL pour les copier plus facilement."
+
 msgid "Online"
 msgstr "En ligne"
 
@@ -1566,31 +1591,6 @@
 msgid "Lastlog plugin."
 msgstr "Dernière occurrence"
 
-#, c-format
-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-"\n"
-"Récupération TinyURL..."
-
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr "Création de TinyURL seulement pour les liens de cette taille mini"
-
-msgid "TinyURL (or other) address prefix"
-msgstr "Préfixe d'adresse TinyURL (ou autre)"
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "Plugin TinyURL"
-
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
-"À la réception d'un message avec un ou plusieurs liens hypertextes, utilise "
-"TinyURL pour les copier plus facilement."
-
 msgid "accounts"
 msgstr "Comptes"
 
@@ -1652,6 +1652,41 @@
 msgid "buddy list"
 msgstr "Liste de contacts"
 
+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr "Le certificat est auto-signé. Il ne peut être vérifié automatiquement."
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"Le certificat racine dont est prétendu issu ce certificat est inconnu de "
+"Pidgin."
+
+msgid "The certificate is not valid yet."
+msgstr "Le certificat n'est pas encore valide."
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr "Le certificat a expiré et ne devrait pas être considéré valide."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "Le certificat fournit ne correspond pas à ce domaine."
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Vous n'avez pas de base de certificats racines. Ce certificat ne peut être "
+"validé."
+
+msgid "The certificate chain presented is invalid."
+msgstr "La chaine de certificat fournie est non valide."
+
+msgid "The certificate has been revoked."
+msgstr "Le certificat a été révoqué."
+
+msgid "An unknown certificate error occurred."
+msgstr "Une erreur de certificat inconnue est survenue."
+
 msgid "(DOES NOT MATCH)"
 msgstr "(NE CORRESPOND PAS)"
 
@@ -1694,69 +1729,24 @@
 msgid "_View Certificate..."
 msgstr "_Voir le certificat..."
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"Le certificat fournit par « %s » prétend est auto-signé. Il ne peut être "
-"vérifié automatiquement."
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "La chaine de certificats fournie pour %s est non valide."
-
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr "Le certificat pour %s n'a pas pu être validé."
+
 #. TODO: Probably wrong.
-#. TODO: Probably wrong
 msgid "SSL Certificate Error"
 msgstr "Erreur de certificat SSL"
 
-msgid "Invalid certificate chain"
-msgstr "Chaine de certification non valide"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Vous n'avez pas de base de certificats racines. Ce certificat ne peut être "
-"validé."
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-"Le certificat racine dont est prétendu issu ce certificat est inconnu de "
-"Pidgin."
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"La chaine de certification fournie par %s n'a pas de signature numérique "
-"valide issue par l'autorité de certificats dont elle prétend l'origine. "
-
-msgid "Invalid certificate authority signature"
-msgstr "Signature d'autorité de certificats non valide"
-
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"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 ""
-"Le certificat fournit par « %s » prétend être de « %s ». Cela pourrait "
-"signifier que vous ne vous connectez pas au service que vous vouliez."
+msgid "Unable to validate certificate"
+msgstr "Impossible de valider le certificat"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"Le certificat fournit prétend être de « %s ». Cela pourrait signifier que "
+"vous ne vous connectez pas au service auquel vous croyez."
 
 #. Make messages
 #, c-format
@@ -1995,19 +1985,19 @@
 msgstr "Transfert de fichier terminé"
 
 #, c-format
-msgid "You canceled the transfer of %s"
-msgstr "Vous avez a annulé le transfert de « %s »"
+msgid "You cancelled the transfer of %s"
+msgstr "Vous avez annulé le transfert de « %s »"
 
 msgid "File transfer cancelled"
 msgstr "Transfert de fichier annulé"
 
 #, c-format
-msgid "%s canceled the transfer of %s"
+msgid "%s cancelled the transfer of %s"
 msgstr "%s a annulé le transfert de « %s »"
 
 #, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s a annulé le transfert du fichier"
+msgid "%s cancelled the file transfer"
+msgstr "%s a annulé le transfert de fichier"
 
 #, c-format
 msgid "File transfer to %s failed."
@@ -2203,6 +2193,35 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Réponse automatique> : %s\n"
 
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"Aucun codec n'a été trouvé. Veuillez installer des codecs GStreamer "
+"disponible avec les plugins pour GStreamer"
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"Il ne reste aucun codec. Vos préférences dans fs-codecs.conf sont trop "
+"strictes."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Une erreur insurmontable de Farsight2 est survenue."
+
+msgid "Conference error."
+msgstr "Erreur de conférence."
+
+msgid "Error with your microphone."
+msgstr "Problème avec votre micro."
+
+msgid "Error with your webcam."
+msgstr "Problème avec votre webcam."
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Erreur à la création de la session : %s"
+
 msgid "Error creating conference."
 msgstr "Erreur à la création de la conférence."
 
@@ -2399,7 +2418,7 @@
 msgstr "I'nactivat'eur"
 
 msgid "Set Account Idle Time"
-msgstr "Durée d'inactivité pour le compte"
+msgstr "Durée d'inactivité pour un compte"
 
 msgid "_Set"
 msgstr "_Changer"
@@ -2408,7 +2427,7 @@
 msgstr "Aucun de vos comptes n'est inactif."
 
 msgid "Unset Account Idle Time"
-msgstr "Désactiver le temps d'inactivité pour le compte"
+msgstr "Désactiver le temps d'inactivité pour un compte"
 
 msgid "_Unset"
 msgstr "_Désactiver"
@@ -2464,14 +2483,15 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Teste le support du serveur IPC. Enregistre les commandes IPC."
 
-msgid "Join/Part Hiding Configuration"
-msgstr "Configuration du masquage des Join/Part"
-
-msgid "Minimum Room Size"
-msgstr "Taille minimum du salon"
-
-msgid "User Inactivity Timeout (in minutes)"
-msgstr "Temps d'inactivité de déclenchement (en minutes)"
+msgid "Hide Joins/Parts"
+msgstr "Cacher les arrivées et départs"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "Pour les salons avec plus de tant de personnes"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "Si l'utilisateur n'a pas parlé pendant tant de minutes"
 
 msgid "Apply hiding rules to buddies"
 msgstr "Appliquer les règles de masquage aux contacts"
@@ -3006,12 +3026,12 @@
 msgstr "Erreur de communication avec le mDNSResponder local."
 
 msgid "Invalid proxy settings"
-msgstr "Paramètres du serveur mandataire incorrects"
+msgstr "Paramètres du proxy incorrects"
 
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
-msgstr "Le nom d'hôte ou le port pour le serveur mandataire est incorrect."
+msgstr "Le nom d'hôte ou le port pour le proxy est incorrect."
 
 msgid "Token Error"
 msgstr "Erreur de jeton"
@@ -3851,6 +3871,11 @@
 msgid "Street Address"
 msgstr "Adresse"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Adresse (suite)"
 
@@ -3933,20 +3958,24 @@
 msgid "Logo"
 msgstr "Logo"
 
+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr "%s ne pourra plus voir vos changements d'état. Voulez-vous continuer ?"
+
+msgid "Cancel Presence Notification"
+msgstr "Annuler la notification de présence"
+
 msgid "Un-hide From"
 msgstr "Se montrer à"
 
 msgid "Temporarily Hide From"
 msgstr "Se cacher de"
 
-#. && NOT ME
-msgid "Cancel Presence Notification"
-msgstr "Annuler la notification de présence"
-
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Demander autorisation"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4560,7 +4589,7 @@
 
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
-"users with an role or set users' role with the room."
+"users with a role or set users' role with the room."
 msgstr ""
 "role &lt;moderator|participant|visitor|none&gt; [pseudo1] [pseudo2] ... : "
 "Récupère les utilisateurs avec un certain rôle ou change le rôle "
@@ -4624,7 +4653,7 @@
 msgstr "Serveur de connexion"
 
 msgid "File transfer proxies"
-msgstr "Serveur mandataire de transfert de fichiers"
+msgstr "Proxy pour le transfert de fichiers"
 
 msgid "BOSH URL"
 msgstr "URL BOSH"
@@ -4708,9 +4737,6 @@
 msgid "Transfer was closed."
 msgstr "Le transfert a été interrompu."
 
-msgid "Failed to open the file"
-msgstr "Impossible d'ouvrir le fichier"
-
 msgid "Failed to open in-band bytestream"
 msgstr "Impossible d'ouvrir le flux de données in-band"
 
@@ -4990,9 +5016,8 @@
 msgid "Not expected"
 msgstr "Non attendu"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Le pseudonyme change trop rapidement"
+msgid "Friendly name is changing too rapidly"
+msgstr "L'alias change trop rapidement"
 
 #, c-format
 msgid "Server too busy"
@@ -5560,9 +5585,8 @@
 msgstr "%s demande à voir votre webcam, ce qui n'est pas encore supporté."
 
 #, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s vous a envoyé une invitation webcam, ce qui n'est pas encore supporté."
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr "%s vous invite à voir sa webcam, ce qui n'est pas encore supporté."
 
 msgid "Away From Computer"
 msgstr "Absent"
@@ -5615,6 +5639,10 @@
 msgid "The username specified is invalid."
 msgstr "Le nom d'utilisateur fourni est non valide."
 
+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "Le pseudonyme change trop rapidement"
+
 msgid "This Hotmail account may not be active."
 msgstr "Ce compte Hotmail ne semble pas être actif."
 
@@ -6292,8 +6320,10 @@
 msgid "Server port"
 msgstr "Port du serveur"
 
-msgid "Received unexpected response from "
-msgstr "Réception d'un message non attendu de "
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "Réception d'une réponse non attendue de %s"
 
 #. username connecting too frequently
 msgid ""
@@ -6304,9 +6334,11 @@
 "réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
 "longtemps."
 
-#, c-format
-msgid "Error requesting "
-msgstr "Erreur à la demande de "
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "Erreur à la demande de %s : %s"
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL n'autorise pas votre nom d'utilisateur pour authentification ici."
@@ -7101,6 +7133,9 @@
 msgid "C_onnect"
 msgstr "_Connecter"
 
+msgid "You closed the connection."
+msgstr "Vous avez fermé la connexion."
+
 msgid "Get AIM Info"
 msgstr "Récupérer les infos AIM"
 
@@ -7111,6 +7146,9 @@
 msgid "Get Status Msg"
 msgstr "Obtenir le message d'état"
 
+msgid "End Direct IM Session"
+msgstr "Terminer la connexion directe"
+
 msgid "Direct IM"
 msgstr "Connexion directe"
 
@@ -7203,7 +7241,7 @@
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
-"Toujours utiliser le serveur mandataire AIM/ICQ\n"
+"Toujours utiliser le proxy AIM/ICQ\n"
 "pour le transfert de fichiers\n"
 "(plus lent, mais ne révèle pas votre adresse IP)"
 
@@ -7219,7 +7257,7 @@
 msgstr "Tentative de connexion vers %s:%hu."
 
 msgid "Attempting to connect via proxy server."
-msgstr "Tentative de connexion au travers d'un serveur mandataire."
+msgstr "Tentative de connexion au travers d'un proxy."
 
 #, c-format
 msgid "%s has just asked to directly connect to %s"
@@ -7941,7 +7979,7 @@
 msgstr "Envoi de fichier"
 
 #, c-format
-msgid "%d canceled the transfer of %s"
+msgid "%d cancelled the transfer of %s"
 msgstr "%d a annulé le transfert de %s"
 
 #, c-format
@@ -9421,10 +9459,10 @@
 msgstr "Utiliser UDP"
 
 msgid "Use proxy"
-msgstr "Utiliser un serveur mandataire"
+msgstr "Utiliser un proxy"
 
 msgid "Proxy"
-msgstr "Serveur mandataire"
+msgstr "Proxy"
 
 msgid "Auth User"
 msgstr "Utilisateur d'authentification"
@@ -9475,6 +9513,9 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorer les invitations aux conférences et salons de discussions"
 
+msgid "Use account proxy for SSL connections"
+msgstr "Utiliser le proxy du compte pour les connexions SSL"
+
 msgid "Chat room list URL"
 msgstr "URL de liste des salons de discussions"
 
@@ -9500,6 +9541,11 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Plugin pour le protocole Yahoo Japon"
 
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s vous a envoyé une invitation webcam, ce qui n'est pas encore supporté."
+
 msgid "Your SMS was not delivered"
 msgstr "Votre SMS n'a pas été transmis"
 
@@ -9576,14 +9622,32 @@
 msgid "Ignore buddy?"
 msgstr "Ignorer ce contact ?"
 
-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr ""
-"Votre compte est bloqué. Veuillez vous connecter par le site web Yahoo!."
+msgid "Invalid username or password"
+msgstr "Nom d'utilisateur ou mot de passe incorrect"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"Votre compté a été bloqué à cause du nombre d'échecs de d'authentification "
+"de mot de passe. Veuillez vous connecter sur le site web Yahoo."
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "Erreur inconnue 52. Se reconnecter devrait corriger ce problème."
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"Erreur 1013 : le nom d'utilisateur que vous avez saisi n'est pas valide. La "
+"cause la plus courante est que vous avez saisi votre adresse de courrier "
+"électronique plutôt que votre identifiant Yahoo."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
-"Erreur inconnue n°%d. Se connecter sur le site web Yahoo! peut corriger le "
+"Erreur inconnue n°%d. Se connecter sur le site web Yahoo peut corriger le "
 "problème."
 
 #, c-format
@@ -9949,17 +10013,15 @@
 
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Impossible de reconnaître la réponse du serveur mandataire HTTP : %s"
+msgstr "Impossible de reconnaître la réponse du proxy HTTP : %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "Erreur de connexion au serveur mandataire HTTP %d."
+msgstr "Erreur de connexion au proxy HTTP %d."
 
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr ""
-"Accès interdit : le serveur mandataire n'autorise pas le passage par le port "
-"%d"
+msgstr "Accès interdit : le proxy n'autorise pas le passage par le port %d"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10257,13 +10319,13 @@
 msgstr "_Avancé"
 
 msgid "Use GNOME Proxy Settings"
-msgstr "Utiliser les paramètres mandataires de GNOME"
+msgstr "Utiliser les paramètres proxy de GNOME"
 
 msgid "Use Global Proxy Settings"
-msgstr "Utiliser les paramètres mandataires globaux"
+msgstr "Utiliser les paramètres proxy globaux"
 
 msgid "No Proxy"
-msgstr "Pas de serveur mandataire"
+msgstr "Pas de proxy"
 
 msgid "HTTP"
 msgstr "HTTP"
@@ -10317,7 +10379,7 @@
 msgstr "Créer ce _nouveau compte sur le serveur"
 
 msgid "P_roxy"
-msgstr "Serveur _mandataire"
+msgstr "_Proxy"
 
 msgid "Enabled"
 msgstr "Activé"
@@ -10348,6 +10410,124 @@
 "comptes, choisissez <b>Comptes->Gérer les comptes</b> dans la fenêtre de la "
 "liste de contacts."
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Couleur de fond"
+
+msgid "The background color for the buddy list"
+msgstr "La couleur de fond pour la liste de contacts"
+
+msgid "Layout"
+msgstr "Arrangement"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr "L'arrangement des icônes, noms et états dans la liste de contacts"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "Couleur de fond déplié"
+
+msgid "The background color of an expanded group"
+msgstr "La couleur de fond pour un groupe de contacts déplié"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "Texte déplié"
+
+msgid "The text information for when a group is expanded"
+msgstr "L'information textuelle pour un groupe de contacts déplié"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "Couleur de fond replié"
+
+msgid "The background color of a collapsed group"
+msgstr "La couleur de fond pour un groupe de contacts replié"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "Texte replié"
+
+msgid "The text information for when a group is collapsed"
+msgstr "L'information textuelle pour un groupe de contacts replié"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "Couleur du fond des contacts et salons"
+
+msgid "The background color of a contact or chat"
+msgstr "La couleur de fond pour un contact ou un salon de discussions"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "Texte des contacts"
+
+msgid "The text information for when a contact is expanded"
+msgstr "L'information textuelle pour un contact déplié"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "Texte des contacts connectés"
+
+msgid "The text information for when a buddy is online"
+msgstr "L'information textuelle pour un contact connecté"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "Texte des contacts absents"
+
+msgid "The text information for when a buddy is away"
+msgstr "L'information textuelle pour un contact absent"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "Texte des contacts déconnectés"
+
+msgid "The text information for when a buddy is offline"
+msgstr "L'information textuelle pour un contact déconnecté"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "Texte des contacts inactifs"
+
+msgid "The text information for when a buddy is idle"
+msgstr "L'information textuelle pour un contact inactif"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "Texte des messages non-lus"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "L'information textuelle pour les messages non-lus d'un contact"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "Texte des messages avec pseudo"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+"L'information textuelle pour les messages dans lesquels apparaissent votre "
+"pseudo"
+
+msgid "The text information for a buddy's status"
+msgstr "L'information textuelle pour l'état des contacts"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -10786,7 +10966,7 @@
 msgid "_Group:"
 msgstr "_Groupe :"
 
-msgid "Auto_join when account becomes online."
+msgid "Auto_join when account connects."
 msgstr "Rejoindre _automatiquement quand le compte est activé."
 
 msgid "_Remain in chat after window is closed."
@@ -10819,100 +10999,6 @@
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacts/Trier les contacts"
 
-#. Buddy List
-msgid "Background Color"
-msgstr "Couleur de fond"
-
-msgid "The background color for the buddy list"
-msgstr "La couleur de fond pour la liste de contacts"
-
-msgid "Layout"
-msgstr "Arrangement"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr "L'arrangement des icônes, noms et états dans la liste"
-
-#. Group
-msgid "Expanded Background Color"
-msgstr "Couleur de fond déplié"
-
-msgid "The background color of an expanded group"
-msgstr "La couleur de fond pour un groupe de contacts déplié"
-
-msgid "Expanded Text"
-msgstr "Texte déplié"
-
-msgid "The text information for when a group is expanded"
-msgstr "L'information textuelle pour un groupe de contacts déplié"
-
-msgid "Collapsed Background Color"
-msgstr "Couleur de fond replié"
-
-msgid "The background color of a collapsed group"
-msgstr "La couleur de fond pour un groupe de contacts replié"
-
-msgid "Collapsed Text"
-msgstr "Texte replié"
-
-msgid "The text information for when a group is collapsed"
-msgstr "L'information textuelle pour un groupe de contacts replié"
-
-#. Buddy
-msgid "Contact/Chat Background Color"
-msgstr "Couleur du fond des contacts et salons"
-
-msgid "The background color of a contact or chat"
-msgstr "La couleur de fond pour un contact ou un salon de discussions"
-
-msgid "Contact Text"
-msgstr "Texte des contacts"
-
-msgid "The text information for when a contact is expanded"
-msgstr "L'information textuelle pour un contact déplié"
-
-msgid "On-line Text"
-msgstr "Texte des contacts connectés"
-
-msgid "The text information for when a buddy is online"
-msgstr "L'information textuelle pour un contact connecté"
-
-msgid "Away Text"
-msgstr "Texte des contacts absents"
-
-msgid "The text information for when a buddy is away"
-msgstr "L'information textuelle pour un contact absent"
-
-msgid "Off-line Text"
-msgstr "Texte des contacts déconnectés"
-
-msgid "The text information for when a buddy is off-line"
-msgstr "L'information textuelle pour un contact déconnecté"
-
-msgid "Idle Text"
-msgstr "Texte des contacts inactifs"
-
-msgid "The text information for when a buddy is idle"
-msgstr "L'information textuelle pour un contact inactif"
-
-msgid "Message Text"
-msgstr "Texte des messages non-lus"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr "L'information textuelle pour les messages non-lus d'un contact"
-
-msgid "Message (Nick Said) Text"
-msgstr "Texte des messages avec pseudo"
-
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
-msgstr ""
-"L'information textuelle pour les messages dans lesquels apparaissent votre "
-"pseudo"
-
-msgid "The text information for a buddy's status"
-msgstr "L'information textuelle pour l'état des contacts"
-
 msgid "Type the host name for this certificate."
 msgstr "Saisissez le nom d'hôte correspondant à ce certificat."
 
@@ -10996,6 +11082,9 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/Envoyer un _message..."
 
+msgid "/Conversation/Join a _Chat..."
+msgstr "/Conversation/Re_joindre un salon..."
+
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Chercher..."
 
@@ -11379,7 +11468,7 @@
 msgid "Estonian"
 msgstr "Estonien"
 
-msgid "Euskera(Basque)"
+msgid "Basque"
 msgstr "Basque"
 
 msgid "Persian"
@@ -11583,11 +11672,20 @@
 
 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">Aide par courrier électronique :</FONT> <A HREF=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+"<font size=\"4\">Aide d'autres utilisateurs de Pidgin :</font> <a href="
+"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Ceci est une liste de "
+"messagerie <b>publique</b> ! (<a href=\"http://pidgin.im/pipermail/support/"
+"\">archives</a>)<br/>Nous ne pouvons pas vous aider pour les plugins ou "
+"protocoles fournis par des tiers.<br/> La langue principale de cette liste "
+"est l'<b>anglais</b>. Vous pouvez envoyer vos messages dans une autre langue "
+"mais les réponses seront probablement moins nombreuses ou utiles.<br/><br/>"
 
 #, c-format
 msgid ""
@@ -11823,14 +11921,6 @@
 msgid "File transfer _details"
 msgstr "_Détails du transfert"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Pause"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Reprise"
-
 msgid "Paste as Plain _Text"
 msgstr "Coller comme _texte seulement"
 
@@ -12156,71 +12246,45 @@
 
 #, c-format
 msgid ""
-"%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Usage : %s [option]...\n"
-"\n"
-"  -c, --config=DOS    lit les fichiers de configuration depuis le dossier "
-"DOS\n"
-"  -d, --debug         affiche les messages de debug sur la sortie standard\n"
-"  -f, --force-online  force online, quelque soit l'état du réseau\n"
-"  -h, --help          affiche ce texte d'aide\n"
-"  -m, --multiple      ne vérifie pas la présence d'une seule instance du "
-"programme\n"
-"  -n, --nologin       ne se connecte pas automatiquement au lancement\n"
-"  -l, --login[=NOM]   connexion automatique au lancement (l'argument NOM\n"
-"                      facultatif indique les comptes à activer séparés par\n"
-"                      des virgules, sinon seul le premier compte sera "
-"activé)\n"
-"  --display=DISPLAY   affichage X à utiliser\n"
-"  -v, --version       affiche le numéro de la version actuelle\n"
-
-#, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Usage : %s [option] ...\n"
-"\n"
-"  -c, --config=REP    lit les fichiers de configuration depuis le dossier "
-"REP\n"
-"  -d, --debug         affiche les messages de debug sur la sortie standard\n"
-"  -f, --force-online  force online, quelque soit l'état du réseau\n"
-"  -h, --help          affiche ce texte d'aide\n"
-"  -m, --multiple      ne vérifie pas la présence d'une seule instance du "
-"programme\n"
-"  -n, --nologin       ne se connecte pas automatiquement au lancement\n"
-"  -l, --login[=NOM]   connexion automatique au lancement (l'argument NOM\n"
-"                      facultatif indique les comptes à activer séparés par\n"
-"                      des virgules, sinon seul le premier compte sera "
-"activé)\n"
-"  -v, --version       affiche le numéro de la version actuelle\n"
+msgstr ""
+"Usage : %s [OPTION]...\n"
+"\n"
+
+msgid "use DIR for config files"
+msgstr "utilise le dossier DIR pour les fichiers de config"
+
+msgid "print debugging messages to stdout"
+msgstr "affiche les messages de debug sur la sortie standard"
+
+msgid "force online, regardless of network status"
+msgstr "force en ligne quelque soit l'état du réseau"
+
+msgid "display this help and exit"
+msgstr "affiche ce message et puis c'est tout"
+
+msgid "allow multiple instances"
+msgstr "autoriser plusieurs instances du logiciel"
+
+msgid "don't automatically login"
+msgstr "ne pas se connecter automatiquement"
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+"active certains comptes (l'argument facultatif NAME\n"
+"                      spécifie ces comptes, séparés par des virgules."
+
+msgid "Without this only the first account will be enabled)."
+msgstr "Sans cela, seul le premier compte sera activé.)"
+
+msgid "X display to use"
+msgstr "affichage X à utiliser"
+
+msgid "display the current version and exit"
+msgstr "affiche le numéro version et rend la main"
 
 #, c-format
 msgid ""
@@ -12266,9 +12330,6 @@
 msgid "/Media/_Hangup"
 msgstr "/Média/_Raccrocher"
 
-msgid "Calling..."
-msgstr "Appel..."
-
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "%s veut engager une session audio/vidéo."
@@ -12277,6 +12338,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s veut engager une session vidéo."
 
+msgid "Incoming Call"
+msgstr "Appel entrant"
+
+msgid "_Pause"
+msgstr "_Pause"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -12666,12 +12733,10 @@
 msgstr "Serveur relai (TURN)"
 
 msgid "Proxy Server &amp; Browser"
-msgstr "Serveur mandataire &amp; navigateur"
+msgstr "Serveur proxy &amp; navigateur"
 
 msgid "<b>Proxy configuration program was not found.</b>"
-msgstr ""
-"<b>Le programme de configuration de serveur mandataire n'a pas été trouvé.</"
-"b>"
+msgstr "<b>Le programme de configuration de proxy n'a pas été trouvé.</b>"
 
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Le programme de configuration du navigateur n'a pas été trouvé.</b>"
@@ -12680,17 +12745,17 @@
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""
-"Le choix du serveur mandataire & navigateur\n"
+"Le choix du serveur proxy & navigateur\n"
 "est géré par les options de GNOME"
 
 msgid "Configure _Proxy"
-msgstr "_Configurer le serveur mandataire"
+msgstr "_Configurer le proxy"
 
 msgid "Configure _Browser"
 msgstr "_Configurer le navigateur"
 
 msgid "Proxy Server"
-msgstr "Serveur mandataire"
+msgstr "Serveur proxy"
 
 msgid "No proxy"
 msgstr "Aucun"
@@ -13283,66 +13348,6 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Affiche des statistiques sur la disponibilité de vos contacts"
 
-msgid "Server name request"
-msgstr "Demande du nom du serveur"
-
-msgid "Enter an XMPP Server"
-msgstr "Saisissez l'adresse d'un serveur XMPP"
-
-msgid "Select an XMPP server to query"
-msgstr "Choisissez un serveur XMPP à consulter"
-
-msgid "Find Services"
-msgstr "Trouver des services"
-
-msgid "Add to Buddy List"
-msgstr "Ajouter à la liste de contacts"
-
-msgid "Gateway"
-msgstr "Portail"
-
-msgid "Directory"
-msgstr "Annuaire"
-
-msgid "PubSub Collection"
-msgstr "Ensemble PubSub"
-
-msgid "PubSub Leaf"
-msgstr "Feuillet PubSub"
-
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr ""
-"\n"
-"<b>Description :</b> "
-
-#. Create the window.
-msgid "Service Discovery"
-msgstr "Découverte de services"
-
-msgid "_Browse"
-msgstr "_Parcourir"
-
-msgid "Server does not exist"
-msgstr "Le serveur n'existe pas"
-
-msgid "Server does not support service discovery"
-msgstr "Le serveur ne supporte pas la découverte de services"
-
-msgid "XMPP Service Discovery"
-msgstr "Découverte de services XMPP"
-
-msgid "Allows browsing and registering services."
-msgstr "Permet la visualisation et l'enregistrement de services."
-
-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr ""
-"Ce plugin est utile pour s'abonner avec d'anciens transports ou d'autres "
-"services XMPP."
-
 msgid "Buddy is idle"
 msgstr "L'utilisateur est inactif"
 
@@ -13436,6 +13441,68 @@
 msgid "Apply in IMs"
 msgstr "Utiliser pour les messages"
 
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr "Demande du nom du serveur"
+
+msgid "Enter an XMPP Server"
+msgstr "Saisissez l'adresse d'un serveur XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Choisissez un serveur XMPP à consulter"
+
+msgid "Find Services"
+msgstr "Trouver des services"
+
+msgid "Add to Buddy List"
+msgstr "Ajouter à la liste de contacts"
+
+msgid "Gateway"
+msgstr "Portail"
+
+msgid "Directory"
+msgstr "Annuaire"
+
+msgid "PubSub Collection"
+msgstr "Ensemble PubSub"
+
+msgid "PubSub Leaf"
+msgstr "Feuillet PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Description :</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Découverte de services"
+
+msgid "_Browse"
+msgstr "_Parcourir"
+
+msgid "Server does not exist"
+msgstr "Le serveur n'existe pas"
+
+msgid "Server does not support service discovery"
+msgstr "Le serveur ne supporte pas la découverte de services"
+
+msgid "XMPP Service Discovery"
+msgstr "Découverte de services XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Permet la visualisation et l'enregistrement de services."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Ce plugin est utile pour s'abonner avec d'anciens transports ou d'autres "
+"services XMPP."
+
 msgid "By conversation count"
 msgstr "Par nombre de conversations"
 
@@ -14081,9 +14148,12 @@
 msgid "Founder"
 msgstr "Fondateur"
 
+#. A user in a chat room who has special privileges.
 msgid "Operator"
 msgstr "Opérateur"
 
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
 msgstr "Demi-opérateur"
 
@@ -14231,6 +14301,51 @@
 "Permet à l'utilisateur de personnaliser dans les conversions et les archives "
 "la manière dont est affiché l'horodatage."
 
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Video"
+msgstr " Vidéo"
+
+msgid "Output"
+msgstr "Sortie"
+
+msgid "_Plugin"
+msgstr "_Plugins"
+
+msgid "_Device"
+msgstr "_Appareil"
+
+msgid "Input"
+msgstr "Entrée"
+
+msgid "P_lugin"
+msgstr "P_lugins"
+
+msgid "D_evice"
+msgstr "Appa_reil"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Paramètres voix et vidéo"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "Configure votre micro et votre webcam."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr "Permet de configurer le matériel pour les messages avec voix et vidéo."
+
 msgid "Opacity:"
 msgstr "Opacité :"
 
@@ -14358,6 +14473,18 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 
+#~ msgid "Calling ... "
+#~ msgstr "Appel... "
+
+#~ msgid "Failed to open the file"
+#~ msgstr "Impossible d'ouvrir le fichier"
+
+#~ msgid "Euskera(Basque)"
+#~ msgstr "Basque"
+
+#~ msgid "_Resume"
+#~ msgstr "_Reprise"
+
 #~ msgid "Invitation Rejected"
 #~ msgstr "Invitation refusée"
 
@@ -14520,12 +14647,6 @@
 #~ msgid "Login failed (%s)."
 #~ msgstr "Échec à la connexion (%s)"
 
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr ""
-#~ "Vous venez d'être déconnecté à la suite d'une connexion depuis un autre "
-#~ "endroit."
-
 #~ msgid "Error. SSL support is not installed."
 #~ msgstr "Support SSL non installé"
 
@@ -14538,11 +14659,6 @@
 #~ msgid "Could Not Connect"
 #~ msgstr "Impossible de se connecter."
 
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr ""
-#~ "Vous risquez être déconnecté sous peu. Consultez %s pour plus "
-#~ "d'informations."
-
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "Impossible de déchiffrer la réponse du serveur"
 
@@ -14709,23 +14825,6 @@
 #~ msgid "The service is temporarily unavailable."
 #~ msgstr "Le service est temporairement indisponible."
 
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr ""
-#~ "Votre niveau d'avertissement est actuellement trop élevé pour que vous "
-#~ "puissiez vous connecter."
-
-#~ 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."
-#~ msgstr ""
-#~ "Vous vous êtes connecté et déconnecté trop rapidement. Attendez 10 "
-#~ "minutes et réessayez. Si vous persistez maintenant, il vous faudra "
-#~ "attendre encore plus longtemps."
-
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Une erreur inconnue est survenue à la connexion : %s"
-
 #~ msgid "An unknown error, %d, has occurred.  Info: %s"
 #~ msgstr "Une erreur inconnue (%d) s'est produite : %s"
 
@@ -14738,11 +14837,6 @@
 #~ msgid "Waiting for reply..."
 #~ msgstr "En attente de réponse..."
 
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr ""
-#~ "TOC est revenu de sa pause. Vous pouvez désormais envoyer des messages à "
-#~ "nouveau."
-
 #~ msgid "Password Change Successful"
 #~ msgstr "Changement de mot de passe effectué."
 
@@ -14769,11 +14863,6 @@
 #~ msgid "Save As..."
 #~ msgstr "Enregistrer sous..."
 
-#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-#~ msgstr[0] "%s demande à %s d'accepter %d fichier : %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s demande à %s d'accepter %d fichiers : %s (%.2f %s)%s%s"
-
 #~ msgid "%s requests you to send them a file"
 #~ msgstr "%s vous demande de leur envoyer un fichier"
 
--- a/po/hu.po	Sat Aug 29 04:49:46 2009 +0900
+++ b/po/hu.po	Sun Aug 30 03:04:43 2009 +0900
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: pidgin 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-21 17:54+0200\n"
-"PO-Revision-Date: 2009-08-21 17:54+0200\n"
+"POT-Creation-Date: 2009-08-29 01:02+0200\n"
+"PO-Revision-Date: 2009-08-29 00:59+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
 "MIME-Version: 1.0\n"
@@ -1637,6 +1637,39 @@
 msgid "buddy list"
 msgstr "partnerlista"
 
+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr "A tanúsítvány saját aláírású és nem ellenőrizhető automatikusan."
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "A tanúsítványt kiadó gyökértanúsítványt a Pidgin nem ismeri."
+
+msgid "The certificate is not valid yet."
+msgstr "A tanúsítvány még nem érvényes."
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr "A tanúsítvány lejárt és nem tekinthető érvényesnek."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "A bemutatott tanúsítvány nem ehhez a tartományhoz lett kiállítva."
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"A gyökértanúsítványok adatbázisa nem érhető el, így ez a tanúsítvány nem "
+"ellenőrizhető."
+
+msgid "The certificate chain presented is invalid."
+msgstr "A bemutatott tanúsítványlánc érvénytelen."
+
+msgid "The certificate has been revoked."
+msgstr "A tanúsítványt visszavonták."
+
+msgid "An unknown certificate error occurred."
+msgstr "Ismeretlen tanúsítványhiba történt."
+
 msgid "(DOES NOT MATCH)"
 msgstr "(NEM EGYEZIK)"
 
@@ -1680,87 +1713,23 @@
 msgstr "_Tanúsítvány megjelenítése…"
 
 #, c-format
-msgid ""
-"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 ""
-"A(z) „%s” által bemutatott tanúsítvány a következőtől származónak mondja "
-"magát: „%s”. Ez azt jelentheti, hogy a kívánttól eltérő szolgáltatáshoz "
-"kapcsolódik."
-
-#. Had no CA pool, so couldn't verify the chain *and*
-#. * the subject name isn't valid.
-#. * I think this is bad enough to warrant a fatal error. It's
-#. * not likely anyway...
-#.
-#. TODO: Probably wrong.
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
+msgid "The certificate for %s could not be validated."
+msgstr "A következő tanúsítványa nem ellenőrizhető: %s."
+
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL tanúsítványhiba"
 
-msgid "Invalid certificate chain"
-msgstr "Érvénytelen tanúsítványlánc"
-
-#. The subject name is correct, but we weren't able to verify the
-#. * chain because there was no pool of root CAs found. Prompt the user
-#. * to validate it.
-#.
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"A gyökértanúsítványok adatbázisa nem érhető el, így ez a tanúsítvány nem "
-"ellenőrizhető."
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"A(z) „%s” által bemutatott tanúsítvány saját aláírású. Nem ellenőrizhető "
-"automatikusan."
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "A következőhöz bemutatott tanúsítványlánc nem érvényes: %s."
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr "A tanúsítványt kiadó gyökértanúsítványt a Pidgin nem ismeri."
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"A(z) %s által bemutatott tanúsítványlánc nem rendelkezik érvényes digitális "
-"aláírással attól a hitelesítésszolgáltatótól, amely aláírásával állítása "
-"szerint rendelkezik."
-
-msgid "Invalid certificate authority signature"
-msgstr "A hitelesítésszolgáltató aláírása érvénytelen"
-
-#, c-format
-msgid "Failed to validate expiration time for %s"
-msgstr "Nem sikerült ellenőrizni a következő lejárati idejét: %s"
-
-#, c-format
-msgid "The certificate for %s is expired."
-msgstr "%s tanúsítványa lejárt."
-
-#, c-format
-msgid "The certificate for %s should not yet be in use."
-msgstr "A következő tanúsítványát még nem lenne szabad használni: %s."
+msgid "Unable to validate certificate"
+msgstr "A tanúsítvány nem ellenőrizhető"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"A tanúsítvány a következőtől származónak mondja magát: „%s”. Ez azt "
+"jelentheti, hogy a kívánttól eltérő szolgáltatáshoz kapcsolódik."
 
 #. Make messages
 #, c-format
@@ -2203,6 +2172,35 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATIKUS VÁLASZ>: %s\n"
 
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"Nem találhatók kodekek. Telepítsen néhány GStreamer kodeket, ezek a "
+"GStreamer bővítménycsomagokban találhatók."
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"Nincs több kodek. A fs-codecs.conf fájlban megadott kodekbeállítások túl "
+"szigorúak."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Helyrehozhatatlan Farsight2 hiba történt."
+
+msgid "Conference error."
+msgstr "Konferenciahiba"
+
+msgid "Error with your microphone."
+msgstr "Hiba történt a mikrofonnal."
+
+msgid "Error with your webcam."
+msgstr "Hiba történt a webkamerával."
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Hiba a munkamenet létrehozásakor: %s"
+
 msgid "Error creating conference."
 msgstr "Hiba a konferencia létrehozásakor."
 
@@ -9489,6 +9487,9 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferencia- és csevegőszoba-meghívások figyelmen kívül hagyása"
 
+msgid "Use account proxy for SSL connections"
+msgstr "Fiókproxy használata SSL kapcsolatokhoz"
+
 msgid "Chat room list URL"
 msgstr "Csevegőszobák listájának URL címe"
 
@@ -9610,7 +9611,7 @@
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
-"of this error is entering your e-mail address instead of your Yahoo! ID."
+"of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
 "1013-as hiba: A megadott felhasználónév érvénytelen. Ennek leggyakoribb oka, "
 "hogy az e-mail címét adta meg a Yahoo! azonosítója helyett."
@@ -11639,20 +11640,19 @@
 
 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A> (This is a <A HREF=\"http://pidgin.im/cgi-bin/"
-"mailman/listinfo/support\">mailing list</A>, and messages sent here are <A "
-"HREF=\"http://pidgin.im/pipermail/support/\">publicly archived!</A>  "
-"Furthermore, we do <I><B>not</B></I> support MXit, Facebook, Skype, or any "
-"other third-party plugins on this list.<BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">Segítség e-mailben:</FONT> <A HREF=\"mailto:support@pidgin."
-"im\">support@pidgin.im</A> (Ez egy angol nyelvű <A HREF=\"http://pidgin.im/"
-"cgi-bin/mailman/listinfo/support\">levelezőlista</A>, az ide küldött levelek "
-"<A HREF=\"http://pidgin.im/pipermail/support/\">nyilvánosan elérhetők "
-"lesznek!</A> Továbbá, ezen a listán <I><B>nem</B></I> támogatjuk az MXit, "
-"Facebook, Skype, vagy bármely más harmadik féltől származó bővítményt.<BR/"
-"><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+"<font size=\"4\">Segítség más Pidgin felhasználóktól:</font> <a href="
+"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Ez egy <b>nyilvános</"
+"b> levelezőlista! (<a href=\"http://pidgin.im/pipermail/support/\">archívum</"
+"a>)<br/>Nem tudunk segíteni külső protokollokkal vagy bővítményekkel "
+"kapcsolatban!<br/>Ez a lista <b>angol</b> nyelvű. Írhat más nyelven is, de a "
+"válaszok nem biztos, hogy túl hasznosak lesznek.<br/><br/>"
 
 #, c-format
 msgid ""
@@ -14254,6 +14254,51 @@
 "Ez a bővítmény lehetővé teszi a felhasználó számára a társalgási és "
 "naplóüzenetek időpecsét-formátumainak testreszabását."
 
+msgid "Audio"
+msgstr "Hang"
+
+msgid "Video"
+msgstr "Videó"
+
+msgid "Output"
+msgstr "Kimenet"
+
+msgid "_Plugin"
+msgstr "_Bővítmény"
+
+msgid "_Device"
+msgstr "_Eszköz"
+
+msgid "Input"
+msgstr "Bemenet"
+
+msgid "P_lugin"
+msgstr "Bő_vítmény"
+
+msgid "D_evice"
+msgstr "_Eszköz"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Hang/videobeállítások"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "Mikrofon és webkamera beállítása."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr "Mikrofon- és webkamera-beállítások megadása hang- és videohívásokhoz."
+
 msgid "Opacity:"
 msgstr "Átlátszatlanság:"
 
--- a/po/sl.po	Sat Aug 29 04:49:46 2009 +0900
+++ b/po/sl.po	Sun Aug 30 03:04:43 2009 +0900
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-03 10:04-0700\n"
-"PO-Revision-Date: 2009-07-30 12:54+0100\n"
+"POT-Creation-Date: 2009-08-28 20:00-0700\n"
+"PO-Revision-Date: 2009-08-28 18:51+0100\n"
 "Last-Translator: Martin Srebotnjak  <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n"
 "MIME-Version: 1.0\n"
@@ -876,7 +876,7 @@
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
-msgid "Calling ... "
+msgid "Calling..."
 msgstr "Klicanje ..."
 
 msgid "Hangup"
@@ -1516,6 +1516,29 @@
 msgstr ""
 "Ko je odprt nov pogovor, ta vtičnik vstavi zadnji pogovor v trenuten pogovor."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Pridobivanje TinyURL ..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "Ustvari TinyURL le za naslove URL te dolžina ali daljše"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Predpona naslova TinyURL (ali drugega)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Vtičnik TinyURL"
+
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr "Ob prejemu sporočil z URL-ji uporabi TinyURL za enostavnejše kopiranje"
+
 msgid "Online"
 msgstr "Prisoten"
 
@@ -1559,29 +1582,6 @@
 msgid "Lastlog plugin."
 msgstr "Vtičnik Lastlog."
 
-#, c-format
-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-"\n"
-"Pridobivanje TinyURL ..."
-
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr "Ustvari TinyURL le za naslove URL te dolžina ali daljše"
-
-msgid "TinyURL (or other) address prefix"
-msgstr "Predpona naslova TinyURL (ali drugega)"
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "Vtičnik TinyURL"
-
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr "Ob prejemu sporočil z URL-ji uporabi TinyURL za enostavnejše kopiranje"
-
 msgid "accounts"
 msgstr "Računi"
 
@@ -1643,6 +1643,44 @@
 msgid "buddy list"
 msgstr "Seznam prijateljev"
 
+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr ""
+"Predstavljeno digitalno potrdilo je samo-podpisano in ga samodejno ni mogoče "
+"preveriti."
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"Korensko digitalno potrdilo, za katerega ta trdi, da ga je izdalo, je "
+"Pidginu neznano."
+
+msgid "The certificate is not valid yet."
+msgstr "Digitalno potrdilo še ni veljavno."
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr ""
+"Digitalno potrdilo je poteklo in ga ni priporočljivo šteti za veljavnega."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "Ponujeno digitalno potrdilo ni izdano za to domeno."
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Nimate zbirke podatkov korenskih digitalnih potrdil, zato tega digitalnega "
+"potrdila ni mogoče preveriti."
+
+msgid "The certificate chain presented is invalid."
+msgstr "Ponujena veriga digitalnih potrdil ni veljavna."
+
+msgid "The certificate has been revoked."
+msgstr "Digitalno potrdilo je bilo preklicano."
+
+msgid "An unknown certificate error occurred."
+msgstr "Prišlo je do neznane napake digitalnega potrdila."
+
 msgid "(DOES NOT MATCH)"
 msgstr "(SE NE UJEMA)"
 
@@ -1686,76 +1724,24 @@
 msgstr "_Pokaži digitalno potrdilo ..."
 
 #, c-format
-msgid ""
-"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 ""
-"Predstavljeno digitalno potrdilo \"%s\" priča, da dejansko pripada \"%s\".  "
-"To pomeni, da se ne povezujete s storitvijo, kot ste mislili."
-
-#. Had no CA pool, so couldn't verify the chain *and*
-#. * the subject name isn't valid.
-#. * I think this is bad enough to warrant a fatal error. It's
-#. * not likely anyway...
-#.
-#. TODO: Probably wrong.
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
+msgid "The certificate for %s could not be validated."
+msgstr "Digitalnega potrdila za %s ni mogoče overiti."
+
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Napaka digitalnega potrdila SSL"
 
-msgid "Invalid certificate chain"
-msgstr "Neveljavna veriga digitalnih potrdil"
-
-#. The subject name is correct, but we weren't able to verify the
-#. * chain because there was no pool of root CAs found. Prompt the user
-#. * to validate it.
-#.
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Nimate zbirke podatkov korenskih digitalnih potrdil, zato tega digitalnega "
-"potrdila ni mogoče preveriti."
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"Predstavljeno digitalno potrdilo \"%s\" je samo-podpisano. Samodejno ga ni "
-"mogoče preveriti."
-
-#. FIXME 2.6.1
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "Ponujena veriga digitalnih potrdil za %s ni veljavna."
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-"Korensko digitalno potrdilo, za katerega ta trdi, da ga je izdalo, je "
-"Pidginu neznano."
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"Predstavljena veriga digitalnih potrdil %s nima veljavnega digitalnega "
-"podpisa izdajatelja digitalnih potrdil, katerega podpis naj bi imela."
-
-msgid "Invalid certificate authority signature"
-msgstr "Neveljaven podpis izdajatelja digitalnega potrdila"
+#  Data is assumed to be the destination sn
+msgid "Unable to validate certificate"
+msgstr "Ni možno overiti digitalnega potrdila"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"Predstavljeno digitalno potrdilo priča, da dejansko pripada \"%s\".  To "
+"pomeni, da se ne povezujete s storitvijo, s katero mislite, da se."
 
 #. Make messages
 #, c-format
@@ -1793,7 +1779,6 @@
 msgstr "+++ %s se je odjavil(a)"
 
 #. Unknown error
-#, c-format
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
@@ -1993,19 +1978,19 @@
 msgstr "Prenos datoteke je dokončan."
 
 #, c-format
-msgid "You canceled the transfer of %s"
-msgstr "Prekinili ste prenos %s"
+msgid "You cancelled the transfer of %s"
+msgstr "Preklicali ste prenos %s"
 
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke je preklican"
 
 #, c-format
-msgid "%s canceled the transfer of %s"
-msgstr "%s je prekinil prenos %s"
-
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s je prekinil prenos datoteke"
+msgid "%s cancelled the transfer of %s"
+msgstr "%s je preklical prenos %s"
+
+#, c-format
+msgid "%s cancelled the file transfer"
+msgstr "%s je preklical prenos datoteke"
 
 #, c-format
 msgid "File transfer to %s failed."
@@ -2197,6 +2182,34 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"Ni najdenih kodekov. Namestite nekaj kodekov GStreamer iz paketov vtičnikov "
+"GStreamer."
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"Ni preostalih kodekov. Vaše nastavitve kodekov v fs-codecs.conf so prestroge."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Prišlo je do napake Farsight2, od katere si ni mogoče opomoči."
+
+msgid "Conference error."
+msgstr "Konferenčna napaka."
+
+msgid "Error with your microphone."
+msgstr "Napaka na vašem mikrofonu."
+
+msgid "Error with your webcam."
+msgstr "Napaka na vaši spletni kameri."
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Napaka pri ustvarjanju seje: %s"
+
 msgid "Error creating conference."
 msgstr "Napaka pri ustvarjanju konference."
 
@@ -2477,14 +2490,15 @@
 msgstr ""
 "Preskusite vtičnik s podporo IPC, kot strežnik. Ukazi IPC bodo registrirani."
 
-msgid "Join/Part Hiding Configuration"
-msgstr "Prilagoditev skrivanja pridruženosti/zapustitve"
-
-msgid "Minimum Room Size"
-msgstr "Najmanjša velikost sobe"
-
-msgid "User Inactivity Timeout (in minutes)"
-msgstr "Časovni rok neaktivnosti uporabnika (v minutah)"
+msgid "Hide Joins/Parts"
+msgstr "Skrij spoje/dele"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "Za sobe z več kot toliko ljudmi"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "Če uporabnik ni govoril toliko minut"
 
 msgid "Apply hiding rules to buddies"
 msgstr "Uporabi pravila skrivanja za prijatelje"
@@ -3933,15 +3947,23 @@
 msgid "Logo"
 msgstr "Logotip"
 
+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr ""
+"Oseba %s ne bo več mogla videti posodobitev vašega stanja. Ali želite "
+"nadaljevati?"
+
+msgid "Cancel Presence Notification"
+msgstr "Prekliči obvestilo o prisotnosti"
+
 msgid "Un-hide From"
 msgstr "Ne skrij pred"
 
 msgid "Temporarily Hide From"
 msgstr "Začasno skrij pred"
 
-msgid "Cancel Presence Notification"
-msgstr "Prekliči obvestilo o prisotnosti"
-
 msgid "(Re-)Request authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
@@ -4547,7 +4569,7 @@
 
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
-"users with an role or set users' role with the room."
+"users with a role or set users' role with the room."
 msgstr ""
 "role &lt;moderator|participant|visitor|none&gt; [vzdevek1] [vzdevek2] ...: "
 "Pridobi uporabnike z vlogo ali nastavi vlogo uporabnikov v sobi."
@@ -4693,9 +4715,6 @@
 msgid "Transfer was closed."
 msgstr "Prenos je bil zaprt."
 
-msgid "Failed to open the file"
-msgstr "Datoteke ni mogoče odpreti"
-
 msgid "Failed to open in-band bytestream"
 msgstr "Znotraj pasovnega zlogovnega pretoka ni uspelo odpreti"
 
@@ -4972,9 +4991,8 @@
 msgid "Not expected"
 msgstr "Nepričakovano"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Prijateljsko ime se spreminja preveč pogosto"
+msgid "Friendly name is changing too rapidly"
+msgstr "Prijateljsko ime se spreminja prehitro"
 
 #, c-format
 msgid "Server too busy"
@@ -5551,8 +5569,10 @@
 msgstr "%s želi gledati vašo spletno kamero, kar še ni podprto."
 
 #, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s vam je poslal povabilo s spletno kamero, kar še ni podprto."
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+"%s vas je povabil(a), da gledati njegovo/njeno spletno kamero, kar pa še ni "
+"podprto."
 
 msgid "Away From Computer"
 msgstr "Stran od računalnika"
@@ -5603,6 +5623,10 @@
 msgid "The username specified is invalid."
 msgstr "Navedeno uporabniško ime ni veljavno."
 
+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "Prijateljsko ime se spreminja preveč pogosto"
+
 msgid "This Hotmail account may not be active."
 msgstr "Ta račun Hotmail morda ni aktiven."
 
@@ -6279,8 +6303,10 @@
 msgid "Server port"
 msgstr "Vrata strežnika"
 
-msgid "Received unexpected response from "
-msgstr "Prejet neveljaven odgovor - "
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "Prejet nepričakovan odgovor s strani osebe %s"
 
 #. username connecting too frequently
 msgid ""
@@ -6290,9 +6316,11 @@
 "Povezava ste prevečkrat vzpostavili in prekinili. Počakajte deset minut in "
 "poskusite ponovno. Če ne počakate sedaj, boste čakali še dalj."
 
-#, c-format
-msgid "Error requesting "
-msgstr "Napaka pri zahtevanju - "
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "Napaka pri zahtevanju %s: %s"
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
@@ -7108,6 +7136,9 @@
 msgid "C_onnect"
 msgstr "Po_veži se"
 
+msgid "You closed the connection."
+msgstr "Zaprli ste povezavo."
+
 msgid "Get AIM Info"
 msgstr "Dobi podatke AIM"
 
@@ -7118,6 +7149,9 @@
 msgid "Get Status Msg"
 msgstr "Poizvedi o stanju"
 
+msgid "End Direct IM Session"
+msgstr "Končaj sejo neposrednega sporočanja"
+
 msgid "Direct IM"
 msgstr "Neposredni pogovor"
 
@@ -7948,8 +7982,8 @@
 msgstr "Datoteka poslana"
 
 #, c-format
-msgid "%d canceled the transfer of %s"
-msgstr "Uporabnik %d je prekinil prenos %s"
+msgid "%d cancelled the transfer of %s"
+msgstr "Oseba %d je prekinila prenos %s"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -9466,6 +9500,9 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Prezri povabila na konference in v klepetalnice"
 
+msgid "Use account proxy for SSL connections"
+msgstr "Pri povezavah SSL uporabi posredovalni strežnik za račune"
+
 msgid "Chat room list URL"
 msgstr "URL seznama sob pomenkov"
 
@@ -9491,6 +9528,10 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Vtičnik za protokol Yahoo! JAPAN"
 
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s vam je poslal povabilo s spletno kamero, kar še ni podprto."
+
 msgid "Your SMS was not delivered"
 msgstr "Vaš SMS ni bil dostavljen"
 
@@ -9564,8 +9605,26 @@
 msgid "Ignore buddy?"
 msgstr "Prezrem prijatelja?"
 
-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Vaš račun je zaklenjen. Prijavite se na spletno stran Yahoo!"
+msgid "Invalid username or password"
+msgstr "Neveljavno uporabniško ime ali geslo"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"Račun je bil zaklenjen zaradi prevelikega števila neuspelih poskusov "
+"prijave.  Prijavite se na spletno stran Yahoo!."
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "Neznana napaka 52. Ponovno povezovanje jo bo najbrž odpravilo."
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"Napaka 1013: Uporabniško ime, ki ste ga vnesli, ni veljavno. Najpogostejši "
+"vzrok za to napako je vnos e-poštnega naslova namesto dejanskega Yahoo! ID."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10345,6 +10404,124 @@
 "Vedno se k temu oknu lahko vrnete in dodate, uredite ali odstranite račune z "
 "<b>Računi->Upravljaj z računi</b> v oknu seznama prijateljev."
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Barva ozadja"
+
+msgid "The background color for the buddy list"
+msgstr "Barva ozadja seznama prijateljev"
+
+msgid "Layout"
+msgstr "Postavitev"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr "Postavitev ikon, imen in stanj na seznamu prijateljev"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "Barva razširjenega ozadja"
+
+msgid "The background color of an expanded group"
+msgstr "Barva ozadja razpostrte skupine"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "Razširjeno besedilo"
+
+msgid "The text information for when a group is expanded"
+msgstr "Besedilna informacija, ko je skupina razpostrta"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "Barva strnjenega ozadja"
+
+msgid "The background color of a collapsed group"
+msgstr "Barva ozadja strnjene skupine"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "Strnjeno besedilo"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Besedilna informacija, ko je skupina strnjena"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "Barva ozadja stika/klepeta"
+
+msgid "The background color of a contact or chat"
+msgstr "Barva ozadja stika ali klepeta"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "Besedilo za stik"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Besedilna informacija, ko je stik razpostrt"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "Besedilo ob prisotnosti"
+
+msgid "The text information for when a buddy is online"
+msgstr "Besedilna informacija, ko je prijatelj povezan"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "Besedilo ob odsotnosti"
+
+msgid "The text information for when a buddy is away"
+msgstr "Besedilna informacija, ko je prijatelj nepovezan"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "Besedilo ob nepovezanosti"
+
+msgid "The text information for when a buddy is offline"
+msgstr "Besedilna informacija, ko je prijatelj nepovezan"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "Besedilo ob nedejavnosti"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Besedilna informacija, ko je prijatelj nedejaven"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "Besedilo sporočila"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Besedilna informacija, ko ima prijatelj neprebrano sporočilo"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "Besedilo sporočila (je rekel vzdevek)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+"Besedilna informacija, ko je v pomenku neprebrano sporočilo, ki omenja vaš "
+"vzdevek"
+
+msgid "The text information for a buddy's status"
+msgstr "Besedilni podatki o stanju uporabika"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -10785,8 +10962,8 @@
 msgid "_Group:"
 msgstr "_Skupina:"
 
-msgid "Auto_join when account becomes online."
-msgstr "Samo_dejno se pridruži, ko račun postane povezan."
+msgid "Auto_join when account connects."
+msgstr "Samode_jno se pridruži, ko račun postane povezan."
 
 msgid "_Remain in chat after window is closed."
 msgstr "_Nadaljuj klepet, ko je okno zaprto."
@@ -10818,100 +10995,6 @@
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Razvrsti prijatelje"
 
-#. Buddy List
-msgid "Background Color"
-msgstr "Barva ozadja"
-
-msgid "The background color for the buddy list"
-msgstr "Barva ozadja seznama prijateljev"
-
-msgid "Layout"
-msgstr "Postavitev"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr "Postavitev ikon, imen in stanj na seznamu prijateljev"
-
-#. Group
-msgid "Expanded Background Color"
-msgstr "Barva razširjenega ozadja"
-
-msgid "The background color of an expanded group"
-msgstr "Barva ozadja razpostrte skupine"
-
-msgid "Expanded Text"
-msgstr "Razširjeno besedilo"
-
-msgid "The text information for when a group is expanded"
-msgstr "Besedilna informacija, ko je skupina razpostrta"
-
-msgid "Collapsed Background Color"
-msgstr "Barva strnjenega ozadja"
-
-msgid "The background color of a collapsed group"
-msgstr "Barva ozadja strnjene skupine"
-
-msgid "Collapsed Text"
-msgstr "Strnjeno besedilo"
-
-msgid "The text information for when a group is collapsed"
-msgstr "Besedilna informacija, ko je skupina strnjena"
-
-#. Buddy
-msgid "Contact/Chat Background Color"
-msgstr "Barva ozadja stika/klepeta"
-
-msgid "The background color of a contact or chat"
-msgstr "Barva ozadja stika ali klepeta"
-
-msgid "Contact Text"
-msgstr "Besedilo za stik"
-
-msgid "The text information for when a contact is expanded"
-msgstr "Besedilna informacija, ko je stik razpostrt"
-
-msgid "On-line Text"
-msgstr "Besedilo ob prisotnosti"
-
-msgid "The text information for when a buddy is online"
-msgstr "Besedilna informacija, ko je prijatelj povezan"
-
-msgid "Away Text"
-msgstr "Besedilo ob odsotnosti"
-
-msgid "The text information for when a buddy is away"
-msgstr "Besedilna informacija, ko je prijatelj nepovezan"
-
-msgid "Off-line Text"
-msgstr "Besedilo ob nepovezanosti"
-
-msgid "The text information for when a buddy is off-line"
-msgstr "Besedilna informacija, ko je prijatelj nepovezan"
-
-msgid "Idle Text"
-msgstr "Besedilo ob nedejavnosti"
-
-msgid "The text information for when a buddy is idle"
-msgstr "Besedilna informacija, ko je prijatelj nedejaven"
-
-msgid "Message Text"
-msgstr "Besedilo sporočila"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr "Besedilna informacija, ko ima prijatelj neprebrano sporočilo"
-
-msgid "Message (Nick Said) Text"
-msgstr "Besedilo sporočila (je rekel vzdevek)"
-
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
-msgstr ""
-"Besedilna informacija, ko je v pomenku neprebrano sporočilo, ki omenja vaš "
-"vzdevek"
-
-msgid "The text information for a buddy's status"
-msgstr "Besedilni podatki o stanju uporabika"
-
 msgid "Type the host name for this certificate."
 msgstr "Vnesite ime gostitelja za to digitalno potrdilo."
 
@@ -10995,6 +11078,9 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pogovor/N_ovo neposredno sporočilo ..."
 
+msgid "/Conversation/Join a _Chat..."
+msgstr "/Pogovor/Pridruži se klepetu ..."
+
 msgid "/Conversation/_Find..."
 msgstr "/Pogovor/_Najdi ..."
 
@@ -11378,8 +11464,8 @@
 msgid "Estonian"
 msgstr "estonsko"
 
-msgid "Euskera(Basque)"
-msgstr "baskijsko"
+msgid "Basque"
+msgstr "baskovsko"
 
 msgid "Persian"
 msgstr "perzijsko"
@@ -11583,11 +11669,19 @@
 
 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">Pomoč prek e-pošte (ang.):</FONT> <A HREF=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+"<font size=\"4\">Pomoč drugih uporabnikov Pidgina:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>To je <b>javen</b> dopisni "
+"seznam! (<a href=\"http://pidgin.im/pipermail/support/\">arhiv</a>)<br/"
+">Glede protokolov in vtičnikov drugih ne moremo pomagati!<br/>Glavni jezik "
+"tega seznama je <b>angleščina</b>.  Vabimo vas, da objavite tudi v drugih "
+"jezikih, vendar bodo odgovori najbrž manj v pomoč.<br/><br/>"
 
 #, c-format
 msgid ""
@@ -12144,65 +12238,46 @@
 
 #, c-format
 msgid ""
-"%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Uporaba: %s [MOŽNOST] ...\n"
-"\n"
-"  -c, --config=DIR    uporabi DIR za nastavitvene datoteke\n"
-"  -d, --debug         izpiši sporočila za razhroščevanje na stdout\n"
-"  -f, --force-online  vsili povezanost ne glede na stanje omrežja\n"
-"  -h, --help          izpiši to pomoč in končaj program\n"
-"  -m, --multiple      ne dovoljuj le enega zagnanega programa\n"
-"  -n, --nologin       brez samodejne prijave\n"
-"  -l, --login[=NAME]  samodejna prijava (dodaten možen argument NAME\n"
-"                      določa račun(e) za prijavo, ločene z vejico.\n"
-"                      Brez tega bo omogočen le prvi račun).\n"
-"  --display=DISPLAY   zaslon X, ki naj bo uporabljen\n"
-"  -v, --version       izpiši trenutno različico in zapri program\n"
-
-#, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Uporaba: %s [MOŽNOST] ...\n"
-"\n"
-"  -c, --config=DIR    uporabi DIR za nastavitvene datoteke\n"
-"  -d, --debug         izpiši sporočila za razhroščevanje na stdout\n"
-"  -f, --force-online  vsili povezanost ne glede na stanje omrežja\n"
-"  -h, --help          izpiši to pomoč in končaj program\n"
-"  -m, --multiple      ne dovoljuj le enega zagnanega programa\n"
-"  -n, --nologin       brez samodejne prijave\n"
-"  -l, --login[=NAME]  samodejna prijava (dodaten možen argument NAME\n"
-"                      določa račun(e) za prijavo, ločene z vejico.\n"
-"                      Brez tega bo omogočen le prvi račun).\n"
-"  -v, --version       izpiši trenutno različico in zapri program\n"
+msgstr ""
+"Uporaba: %s [MOŽNOST]...\n"
+"\n"
+
+msgid "use DIR for config files"
+msgstr "uporabi DIR za prilagoditvene datoteke"
+
+msgid "print debugging messages to stdout"
+msgstr "natisni sporočila za razhroščevanje na stdout"
+
+msgid "force online, regardless of network status"
+msgstr "vsili povezanost, ne glede na stanje omrežja"
+
+msgid "display this help and exit"
+msgstr "prikaži to besedilo pomoči in ustavi program"
+
+msgid "allow multiple instances"
+msgstr "dovoli več hkratnih prijav"
+
+msgid "don't automatically login"
+msgstr "ne prijavi se samodejno"
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+"omogoči navedene račune (neobvezen argument IME\n"
+"                      določa račune, ki naj bodo uporabljeni, ločene z "
+"vejicami."
+
+msgid "Without this only the first account will be enabled)."
+msgstr "Prez tega bo omogočen le prvi račun)."
+
+msgid "X display to use"
+msgstr "Zaslon X, ki naj bo uporabljen"
+
+msgid "display the current version and exit"
+msgstr "Prikaži trenutno različico in zapri program"
 
 #, c-format
 msgid ""
@@ -12246,9 +12321,6 @@
 msgid "/Media/_Hangup"
 msgstr "/Mediji/_Odloži"
 
-msgid "Calling..."
-msgstr "Klicanje ..."
-
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "%s želi z vami začeti zvočno/video sejo."
@@ -12257,6 +12329,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s želi z vami začeti video sejo."
 
+msgid "Incoming Call"
+msgstr "Dohodni klic"
+
+msgid "_Pause"
+msgstr "_Premor"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13198,9 +13276,6 @@
 msgid "_Open Mail"
 msgstr "_Odpri pošto"
 
-msgid "_Pause"
-msgstr "_Premor"
-
 msgid "_Edit"
 msgstr "_Uredi"
 
@@ -13264,66 +13339,6 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Prikaže statistične podatke o dostopnosti vašega prijatelja"
 
-msgid "Server name request"
-msgstr "Zahteva po imenu strežnika"
-
-msgid "Enter an XMPP Server"
-msgstr "Vnesite strežnik XMPP"
-
-msgid "Select an XMPP server to query"
-msgstr "Izberite strežnik XMPP za poizvedbo"
-
-msgid "Find Services"
-msgstr "Najdi storitve"
-
-msgid "Add to Buddy List"
-msgstr "Dodaj na seznam prijateljev"
-
-msgid "Gateway"
-msgstr "Prehod"
-
-msgid "Directory"
-msgstr "Imenik"
-
-msgid "PubSub Collection"
-msgstr "Zbirka PubSub"
-
-msgid "PubSub Leaf"
-msgstr "List PubSub"
-
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr ""
-"\n"
-"<b>Opis:</b> "
-
-#. Create the window.
-msgid "Service Discovery"
-msgstr "Odkrivanje storitev"
-
-msgid "_Browse"
-msgstr "Pre_brskaj"
-
-msgid "Server does not exist"
-msgstr "Strežnik ne obstaja"
-
-msgid "Server does not support service discovery"
-msgstr "Strežnik ne podpira odkrivanja storitev"
-
-msgid "XMPP Service Discovery"
-msgstr "Odkrivanje storitev XMPP"
-
-msgid "Allows browsing and registering services."
-msgstr "Dovoljuje brskanje in registracijo storitev."
-
-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr ""
-"Ta vtičnik je uporaben za registriranje z opuščenimi prenosi ali drugimi "
-"storitvami XMPP."
-
 msgid "Buddy is idle"
 msgstr "Prijatelj je nedejaven"
 
@@ -13415,6 +13430,68 @@
 msgid "Apply in IMs"
 msgstr "Uporabi pri sporočilih"
 
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr "Zahteva po imenu strežnika"
+
+msgid "Enter an XMPP Server"
+msgstr "Vnesite strežnik XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Izberite strežnik XMPP za poizvedbo"
+
+msgid "Find Services"
+msgstr "Najdi storitve"
+
+msgid "Add to Buddy List"
+msgstr "Dodaj na seznam prijateljev"
+
+msgid "Gateway"
+msgstr "Prehod"
+
+msgid "Directory"
+msgstr "Imenik"
+
+msgid "PubSub Collection"
+msgstr "Zbirka PubSub"
+
+msgid "PubSub Leaf"
+msgstr "List PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Opis:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Odkrivanje storitev"
+
+msgid "_Browse"
+msgstr "Pre_brskaj"
+
+msgid "Server does not exist"
+msgstr "Strežnik ne obstaja"
+
+msgid "Server does not support service discovery"
+msgstr "Strežnik ne podpira odkrivanja storitev"
+
+msgid "XMPP Service Discovery"
+msgstr "Odkrivanje storitev XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Dovoljuje brskanje in registracijo storitev."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Ta vtičnik je uporaben za registriranje z opuščenimi prenosi ali drugimi "
+"storitvami XMPP."
+
 msgid "By conversation count"
 msgstr "Po številu pomenkov"
 
@@ -14205,6 +14282,53 @@
 "Ta vtičnik omogoča uporabniku prilagajati zapis časovnega žiga pogovorov in "
 "dnevniških sporočil."
 
+msgid "Audio"
+msgstr "Zvok"
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Output"
+msgstr "Izhod"
+
+msgid "_Plugin"
+msgstr "_Vtičnik"
+
+msgid "_Device"
+msgstr "_Naprava"
+
+msgid "Input"
+msgstr "Vhod"
+
+msgid "P_lugin"
+msgstr "V_tičnik"
+
+msgid "D_evice"
+msgstr "N_aprava"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Glasovne/video nastavitve"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "Prilagodite svoj mikrofon in spletno kamero."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""
+"Prilagodite nastavitve za mikrofon in spletno kamero za zvočne oz. video "
+"klice."
+
 msgid "Opacity:"
 msgstr "Neprosojnost:"
 
@@ -14332,1011 +14456,3 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
-
-#~ msgid "Malformed BOSH Connect Server"
-#~ msgstr "Nepravilno oblikovan povezovalni strežnik BOSH"
-
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr "Para ključev SILC ni mogoče naložiti"
-
-#~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr "%s je zavrnil vaše povabilo za pogovor v sobi \"%s\", ker \"%s\"."
-
-#~ msgid "Invitation Rejected"
-#~ msgstr "Povabilo zavrnjeno"
-
-#~ msgid "_Resume"
-#~ msgstr "_Nadaljuj"
-
-#~ msgid "Cannot open socket"
-#~ msgstr "Vtičnice ni mogoče odpreti"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "Poslušanje vtičnice ni možno"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "Ne morem brati vtičnice"
-
-#~ msgid "Connection failed."
-#~ msgstr "Povezava ni uspela."
-
-#~ msgid "Server has disconnected"
-#~ msgstr "Strežnik ni več povezan"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "Vtičnice ni bilo mogoče ustvariti"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "Povezava do gostitelja ni uspela"
-
-#~ msgid "Read error"
-#~ msgstr "Napaka pri branju"
-
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Povezave s strežnikom ni mogoče vzpostaviti:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "Napaka pri pisanju"
-
-#~ msgid "Read Error"
-#~ msgstr "Napaka pri branju"
-
-#~ msgid "Failed to connect to server."
-#~ msgstr "Povezava na strežnik neuspešna."
-
-#~ msgid "Read buffer full (2)"
-#~ msgstr "Bralni predpomnilnik je poln (2)"
-
-#~ msgid "Unparseable message"
-#~ msgstr "Sporočila ni mogoče razčleniti"
-
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "Povezava z gostiteljem ni uspela: %s (%d)"
-
-#~ msgid "Login failed (%s)."
-#~ msgstr "Prijava spodletela (%s)."
-
-#~ msgid "Unable to connect to server."
-#~ msgstr "Ni se bilo mogoče povezati na strežnik."
-
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni."
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "Napaka. Podpora SSL ni nameščena."
-
-#~ msgid "Incorrect password."
-#~ msgstr "Neveljavno geslo."
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Povezava na strežnik BOS ni uspela:\n"
-#~ "%s"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr ""
-#~ "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve."
-
-#~ msgid "Could Not Connect"
-#~ msgstr "Povezava ni uspela"
-
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "Odgovora strežnika ni mogoče dešifrirati"
-
-#~ msgid "Invalid username."
-#~ msgstr "Neveljavno uporabniško ime."
-
-#~ msgid "Connection lost"
-#~ msgstr "Povezava izgubljena"
-
-#~ msgid "Couldn't resolve host"
-#~ msgstr "Gostitelja ni mogoče razbrati"
-
-#~ msgid "Connection closed (writing)"
-#~ msgstr "Povezava zaprta (pisanje)"
-
-#~ msgid "Connection reset"
-#~ msgstr "Povezava ponovno nastavljena"
-
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "Napaka pri branju iz vtičnice: %s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "Ni se bilo mogoče povezati na strežnik."
-
-#~ msgid "Could not write"
-#~ msgstr "Ni mogoče pisati"
-
-#~ msgid "Could not connect"
-#~ msgstr "Povezava ni uspela"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "Vtičnice ni bilo mogoče ustvariti"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Imena strežnika ni mogoče razločiti"
-
-#~ msgid "Incorrect Password"
-#~ msgstr "Nepravilno geslo"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Povezave s strežnikom %s ni mogoče vzpostaviti:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japonska"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "Japonski strežnik pozivnika"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "Japonski strežnik prenosa datotek"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Izgubljena povezava s strežnikom\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "Imena strežnika ni možno razločiti"
-
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr ""
-#~ "Povezava z %s ni uspela: strežnik zahteva TLS/SSL za prijavo, vendar "
-#~ "podpore za TLS/SSL ni mogoče najti."
-
-#~ msgid "_Proxy"
-#~ msgstr "_Posredovalni strežnik"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "Skrivanje okna pogovora"
-
-#~ msgid "Last Activity"
-#~ msgstr "Zadnja dejavnost"
-
-#~ msgid "Service Discovery Items"
-#~ msgstr "Elementi razpoznave storitev"
-
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "Razširjeno naslavljanje kitic"
-
-#~ msgid "Multi-User Chat"
-#~ msgstr "Večuporabniški pomenek"
-
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "Podatki o prisotnosti pri večuporabniškem pomenku"
-
-#~ msgid "In-Band Bytestreams"
-#~ msgstr "Bitni tokovi v pasu"
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "Improvizirani ukazi"
-
-#~ msgid "SOCKS5 Bytestreams"
-#~ msgstr "Bajtni tokovi SOCKS5"
-
-#~ msgid "Out of Band Data"
-#~ msgstr "Zmanjkalo je pasovnih podatkov"
-
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
-
-#~ msgid "In-Band Registration"
-#~ msgstr "Prijava v pasu"
-
-#~ msgid "User Location"
-#~ msgstr "Lokacija uporabnika"
-
-#~ msgid "User Avatar"
-#~ msgstr "Avatar uporabnika"
-
-#~ msgid "Chat State Notifications"
-#~ msgstr "Obvestila o stanjih klepeta"
-
-#~ msgid "Software Version"
-#~ msgstr "Programska različica"
-
-#~ msgid "Stream Initiation"
-#~ msgstr "Vzpostavitev toka"
-
-#~ msgid "User Mood"
-#~ msgstr "Uporabnikovo počutje"
-
-#~ msgid "User Activity"
-#~ msgstr "Uporabnikova dejavnost"
-
-#~ msgid "Entity Capabilities"
-#~ msgstr "Zmožnosti entitete"
-
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "Pogajanja šifrirane seje"
-
-#~ msgid "User Tune"
-#~ msgstr "Uporabnikova skladba"
-
-#~ msgid "Roster Item Exchange"
-#~ msgstr "Izmenjava elementov seznama"
-
-#~ msgid "Reachability Address"
-#~ msgstr "Naslov dosegljivosti"
-
-#~ msgid "User Profile"
-#~ msgstr "Profil uporabnika"
-
-#~ msgid "Jingle"
-#~ msgstr "Jingle"
-
-#~ msgid "Jingle Audio"
-#~ msgstr "Jingle - zvok"
-
-#~ msgid "User Nickname"
-#~ msgstr "Vzdevek uporabnika"
-
-#~ msgid "Jingle ICE UDP"
-#~ msgstr "Jingle - ICE UDP"
-
-#~ msgid "Jingle ICE TCP"
-#~ msgstr "Jingle - ICE TCP"
-
-#~ msgid "Jingle Raw UDP"
-#~ msgstr "Jingle - surovi UDP"
-
-#~ msgid "Jingle Video"
-#~ msgstr "Jingle - video"
-
-#~ msgid "Jingle DTMF"
-#~ msgstr "Jingle - DTMF"
-
-#~ msgid "Message Receipts"
-#~ msgstr "Dokazila o prejemu sporočila"
-
-#~ msgid "Public Key Publishing"
-#~ msgstr "Objava javnega ključa"
-
-#~ msgid "User Chatting"
-#~ msgstr "Uporabnik klepeta"
-
-#~ msgid "User Browsing"
-#~ msgstr "Uporabnik brska"
-
-#~ msgid "User Gaming"
-#~ msgstr "Uporabnik igra"
-
-#~ msgid "User Viewing"
-#~ msgstr "Uporabnik gleda"
-
-#~ msgid "Stanza Encryption"
-#~ msgstr "Šifriranje kitic"
-
-#~ msgid "Entity Time"
-#~ msgstr "Čas entitete"
-
-#~ msgid "Delayed Delivery"
-#~ msgstr "Zakasnjena dostava"
-
-#~ msgid "Collaborative Data Objects"
-#~ msgstr "Podatkovni predmeti sodelovanja"
-
-#~ msgid "File Repository and Sharing"
-#~ msgstr "Hramba datotek in skupna raba"
-
-#~ msgid "STUN Service Discovery for Jingle"
-#~ msgstr "Razpoznava storitev STUN za Jingle"
-
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "Poenostavljeno pogajanje šifrirane seje"
-
-#~ msgid "Hop Check"
-#~ msgstr "Preveri hop"
-
-#~ msgid "Activate which ID?"
-#~ msgstr "Kateri ID naj bo aktiviran?"
-
-#~ msgid "More Data needed"
-#~ msgstr "Potrebnih je več podatkov"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "Podajte tipke za bližnjico, ki bodo povezane s smejčkom."
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "Izberite sliko smejčka."
-
-#~ msgid "Cursor Color"
-#~ msgstr "Barva kazalke"
-
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "Drugotna barva kazalke"
-
-#~ msgid "Interface colors"
-#~ msgstr "Barve vmesnika"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Velikosti gradnikov"
-
-#~ msgid "Invite message"
-#~ msgstr "Sporočilo povabila"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "Vnesite ime uporabnika, ki ga želite povabiti,\n"
-#~ "dodate lahko tudi sporočilo - povabilo."
-
-#~ msgid "Looking up %s"
-#~ msgstr "Poizvedujem za %s"
-
-#~ msgid "Connect to %s failed"
-#~ msgstr "Povezovanje na %s ni uspelo"
-
-#~ msgid "Signon: %s"
-#~ msgstr "Prijavljanje: %s"
-
-#~ msgid "Unable to write file %s."
-#~ msgstr "Datoteke %s ni bilo mogoče zapisati."
-
-#~ msgid "Unable to read file %s."
-#~ msgstr "Datoteke %s ni bilo mogoče prebrati."
-
-#~ msgid "Message too long, last %s bytes truncated."
-#~ msgstr "Sporočilo je predolgo, zato je bilo skrajšano za %s znakov."
-
-#~ msgid "%s not currently logged in."
-#~ msgstr "%s trenutno ni prijavljen."
-
-#~ msgid "Warning of %s not allowed."
-#~ msgstr "Opozarjanje %s ni dovoljeno."
-
-#~ msgid ""
-#~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr ""
-#~ "Sporočilo je bilo izpuščeno, ker presegate omejitev hitrosti strežnika."
-
-#~ msgid "Chat in %s is not available."
-#~ msgstr "Pomenek v %s ni dostopen."
-
-#~ msgid "You are sending messages too fast to %s."
-#~ msgstr "Prehitro pošiljate sporočila %s."
-
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr ""
-#~ "Ker je bilo preveliko, ste zgrešili sporočilo, ki vam ga je poslal %s."
-
-#~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr "Zgrešili ste sporočilo od %s, ker je bilo poslano prehitro."
-
-#~ msgid "Failure."
-#~ msgstr "Neuspeh."
-
-#~ msgid "Too many matches."
-#~ msgstr "Preveč zadetkov."
-
-#~ msgid "Need more qualifiers."
-#~ msgstr "Potrebujem več selekcije."
-
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "Imeniška storitev je trenutno nedosegljiva."
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "Poizvedba po e-poštnem naslovu je omejena."
-
-#~ msgid "Keyword ignored."
-#~ msgstr "Ključna beseda zanemarjena."
-
-#~ msgid "No keywords."
-#~ msgstr "Brez ključnih besed."
-
-#~ msgid "User has no directory information."
-#~ msgstr "Uporabnik nima imeniških informacij."
-
-#~ msgid "Country not supported."
-#~ msgstr "Država ni podprta."
-
-#~ msgid "Failure unknown: %s."
-#~ msgstr "Neznan vzrok neuspeha: %s."
-
-#~ msgid "Incorrect username or password."
-#~ msgstr "Neveljavno uporabniško ime ali geslo."
-
-#~ msgid "The service is temporarily unavailable."
-#~ msgstr "Storitev je trenutno nedostopna."
-
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr ""
-#~ "Vaša raven opozoril je trenutno previsoka, da bi se lahko prijavili."
-
-#~ 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."
-#~ msgstr ""
-#~ "Prijavljali in odjavljali ste se prepogosto.  Počakajte deset minut in "
-#~ "poskusite ponovno.  Če tega ne boste upoštevali, bo trajalo še dlje."
-
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Pri prijavljanju je prišlo do neznane napake: %s."
-
-#~ msgid "An unknown error, %d, has occurred.  Info: %s"
-#~ msgstr "Prišlo je do neznane napake %d. Info: %s"
-
-#~ msgid "Invalid Groupname"
-#~ msgstr "Neveljavno ime skupine"
-
-#~ msgid "Connection Closed"
-#~ msgstr "Povezava zaprta"
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "Čakanje odgovora ..."
-
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC je nazaj z odmora. Sedaj lahko spet pošiljate sporočila."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "Sprememba gesla uspešna"
-
-#~ msgid "Get Dir Info"
-#~ msgstr "Prikaži imeniške podatke"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "Nastavi imeniške podatke"
-
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "Ne morem odpreti %s za pisanje!"
-
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr ""
-#~ "Prenos datoteke ni bil uspešen; verjetno je prijatelj preklical prenos."
-
-#~ msgid "Could not connect for transfer."
-#~ msgstr "Ni se bilo mogoče povezati za prenos."
-
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr "Ni bilo mogoče zapisati glave datoteke. Datoteka ne bo prenešena."
-
-#~ msgid "Save As..."
-#~ msgstr "Shrani kot ..."
-
-#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-#~ msgstr[0] "%s zahteva od %s, da sprejme %d datotek: %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s zahteva od %s, da sprejme %d datoteko: %s (%.2f %s)%s%s"
-#~ msgstr[2] "%s zahteva od %s, da sprejme %d datoteki: %s (%.2f %s)%s%s"
-#~ msgstr[3] "%s zahteva od %s, da sprejme %d datoteke: %s (%.2f %s)%s%s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s zahteva, da jim pošljete datoteko"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "Vtičnik za protokol TOC"
-
-#~ msgid "%s Options"
-#~ msgstr "%s Možnosti"
-
-#~ msgid "Proxy Options"
-#~ msgstr "Možnosti posredovalnega strežnika"
-
-#~ msgid "By log size"
-#~ msgstr "po obsegu dnevnika"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "_Odpri povezavo v brskalniku"
-
-#~ msgid "ST_UN server:"
-#~ msgstr "Strežnik ST_UN:"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "Sli_ka smejčka"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "_Tipke za bližnjice smejčka"
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Adresarja MSN ni mogoče pridobiti."
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "Morda bo povezava v kratkem prekinjena. Morda boste želeli uporabiti TOC "
-#~ "dokler to ni popravljeno. Preverite %s za posodobitve."
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "Utrip_aj z oknom, ko prispejo nova sporočila"
-
-#~ msgid "Connection to server lost (no data received within %d second)"
-#~ msgid_plural ""
-#~ "Connection to server lost (no data received within %d seconds)"
-#~ msgstr[0] ""
-#~ "Povezava s strežnikom je izgubljena (v %d sekundah ni bilo prejetih "
-#~ "podatkov)"
-#~ msgstr[1] ""
-#~ "Povezava s strežnikom je izgubljena (v %d sekundi ni bilo prejetih "
-#~ "podatkov)"
-#~ msgstr[2] ""
-#~ "Povezava s strežnikom je izgubljena (v %d sekundah ni bilo prejetih "
-#~ "podatkov)"
-#~ msgstr[3] ""
-#~ "Povezava s strežnikom je izgubljena (v %d sekundah ni bilo prejetih "
-#~ "podatkov)"
-
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Dodaj prijatelja"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Odgovora na prijavo ni mogoče dešifrirati"
-
-#~ msgid "Keep alive error"
-#~ msgstr "Napaka pri ohranjanju živega"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "Izgubljena povezava s strežnikom:\n"
-#~ "%d, %s"
-
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "Poveži se na strežnik"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "Neposrednega sporočila ni bilo mogoče poslati."
-
-#, fuzzy
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Niste član(ica) skupine \"%s\"\n"
-
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Podatki o uporabniku %s niso dostopni"
-
-#~ msgid "Primary Information"
-#~ msgstr "Osnovni podatki"
-
-#~ msgid "Blood Type"
-#~ msgstr "Krvna skupina"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "Posodobi moje podatke"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Hitrost:"
-
-#~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr ""
-#~ "Nastaviti poskušate obraz po meri, kar zaenkrat še ni podprto. Prosimo, "
-#~ "izberite sliko iz %s."
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Neveljaven obraz QQ"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "Zahtevo uporabnika %d ste zavrnili."
-
-#~ msgid "Reject request"
-#~ msgstr "Zavrni zahtevo"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "Zahteva po dodajanju prijatelja s pooblastilom ni uspela"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Seznama prijateljev ni mogoče naložiti"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "Številka QQ"
-
-#~ msgid "Group Description"
-#~ msgstr "Opis skupine"
-
-#~ msgid "Auth"
-#~ msgstr "Pooblasti"
-
-#~ msgid "Approve"
-#~ msgstr "Odobri"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "Vašo zahtevo za pridružitev skupini %d je zavrnil administrator %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "Zapustili ste [%d] skupino \"%d\""
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "Dodani ste [%d] bili v skupino \"%d\""
-
-#~ msgid "I am a member"
-#~ msgstr "Sem član(ica)"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Napačna zahteva"
-
-#~ msgid "I am the admin"
-#~ msgstr "Jaz sem skrbnik"
-
-#~ msgid "Unknown status"
-#~ msgstr "Neznano stanje"
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Odstrani skupino"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "Vnesli ste ID skupine zunaj veljavnega obsega"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Ste prepričani, da želite zapustiti ta Qun?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Želite odobriti zahtevo?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Telefonska št."
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Informacije o kanalu"
-
-#~ msgid "System Message"
-#~ msgstr "Sistemsko sporočilo"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>IP zadnje prijave:</b> %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Čas zadnje prijave</b>: %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "Nastavi moje podatke"
-
-#, fuzzy
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "Zapusti ta QQ Qun"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Blokiraj uporabnika"
-
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "Neveljavna koda žetona odziva, "
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Napaka pri spreminjanju gesla"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Povezava na strežnik neuspešna"
-
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "Povezovanje s strežnikom %s, ponovni poskusi: %d"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Želite odobriti zahtevo?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Ali želite dodati tega prijatelja?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s vas [%s] je dodal(a) na svoj seznam prijateljev."
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Prijatelj"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s vas [%s] želi dodati kot prijatelja"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s ni na vašem seznamu prijateljev."
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "Ga želite dodati?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Vrata strežnika"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "Oddaljeno odjavljeni"
-
-#~ msgid "developer"
-#~ msgstr "razvijalec"
-
-#~ msgid "XMPP developer"
-#~ msgstr "Razvijalec XMPP"
-
-#~ msgid "Artists"
-#~ msgstr "Oblikovalci"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "Uporabljate %s različice %s.  Najnovejša dosegljiva različica je %s. "
-#~ "Prenesete jo lahko z naslova <a href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>Dnevnik sprememb:</b><br>%s"
-
-#~ msgid "A group with the name already exists."
-#~ msgstr "Skupina s tem imenom že obstaja."
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "EOF pri branju iz procesa razločevanja"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "Vaši podatki so bili posodobljeni"
-
-#~ msgid "Input your reason:"
-#~ msgstr "Vnesite svoj razlog:"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "Uspešno ste odstranili prijatelja"
-
-#~ msgid "You have successfully removed yourself from your friend's buddy list"
-#~ msgstr "Uspešno ste se odstranili s prijateljevega seznama prijateljev"
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "%d ste dodali na svoj seznam prijateljev"
-
-#~ msgid "Invalid QQid"
-#~ msgstr "Neveljaven QQid"
-
-#~ msgid "Please enter external group ID"
-#~ msgstr "Prosimo, vnesite ID zunanje skupine"
-
-#~ msgid "Reason: %s"
-#~ msgstr "Razlog: %s"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr "Vašo zahtevo za pridružitev skupini %d je odobril administrator %d"
-
-#~ msgid "I am applying to join"
-#~ msgstr "Prijavljam se za članstvo"
-
-#~ msgid "You have successfully left the group"
-#~ msgstr "Uspešno ste zapustili skupino"
-
-#~ msgid "QQ Group Auth"
-#~ msgstr "Pooblaščanje skupine QQ"
-
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr "Strežnik QQ je sprejel vašo zahtevo za pooblastitev."
-
-#~ msgid "Enter your reason:"
-#~ msgstr "Vnesite svoj razlog:"
-
-#~ msgid " Space"
-#~ msgstr " Prostor"
-
-#~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
-#~ msgstr "<b>Ime strežnika</b>: %s: %d<br>\n"
-
-#~ msgid "Show Login Information"
-#~ msgstr "Pokaži prijavne podatke"
-
-#~ msgid "resend interval(s)"
-#~ msgstr "Interval(i) ponovnega pošiljanja"
-
-#~ msgid "hostname is NULL or port is 0"
-#~ msgstr "ime gostitelja je NULL ali pa so vrata 0"
-
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr "Prijava ni uspela. Preverite zapisnik razhroščevanja."
-
-#~ msgid "Failed room reply"
-#~ msgstr "Spodleteli odgovor sobe"
-
-#~ msgid "User %s rejected your request"
-#~ msgstr "Uuporabnik %s je zavrnil vašo zahtevo."
-
-#~ msgid "User %s approved your request"
-#~ msgstr "Uporabnik %s je ugodil vaši zahtevi"
-
-#~ msgid "Notice from: %s"
-#~ msgstr "Oznanilo pošilja: %s"
-
-#~ msgid "Keep the status message when the status is changed"
-#~ msgstr "Ohrani sporočilo stanja, ko se stanje spremeni"
-
-#~ msgid "Error setting socket options"
-#~ msgstr "Napaka pri nastavljanju možnosti vtičnice"
-
-#~ msgid ""
-#~ "Windows Live ID authentication: cannot find authenticate token in server "
-#~ "response"
-#~ msgstr ""
-#~ "Overjanje Windows Live ID: Žetona overovitve v odzivu strežnika ni mogoče "
-#~ "najti"
-
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Overovitev Windows Live ID ni uspela"
-
-#~ msgid "Code [0x%02X]: %s"
-#~ msgstr "Koda [0x%02X]: %s"
-
-#~ msgid "Group Operation Error"
-#~ msgstr "Napaka skupinske operacije"
-
-#~ msgid "TCP Address"
-#~ msgstr "Naslov TCP"
-
-#~ msgid "UDP Address"
-#~ msgstr "Naslov UDP"
-
-#~ msgid "Too evil (sender)"
-#~ msgstr "Preveč zloben (pošiljatelj)"
-
-#~ msgid "Too evil (receiver)"
-#~ msgstr "Preveč zloben (prejemnik)"
-
-#~ msgid "Available Message"
-#~ msgstr "Sporočilo o dosegljivosti"
-
-#~ msgid "Away Message"
-#~ msgstr "Sporočilo o odsotnosti"
-
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr "<i>(pridobivanje ...)</i>"
-
-#~ msgid "Display Statistics"
-#~ msgstr "Pokaži statistiko"
-
-#~ msgid "Screen name:"
-#~ msgstr "Zaslonsko ime:"
-
-#~ msgid "Someone says your screen name in chat"
-#~ msgstr "Nekdo omeni vaše pojavno ime v sobi"
-
-#~ msgid "Invalid screen name"
-#~ msgstr "Neveljavno pojavno ime"
-
-#~ msgid "Invalid screen name."
-#~ msgstr "Neveljavno pojavno ime."
-
-#~ msgid "Screen _name:"
-#~ msgstr "Pojavno _ime:"
-
-#~ msgid ""
-#~ "This server requires plaintext authentication over an unencrypted "
-#~ "connection.  Allow this and continue authentication?"
-#~ msgstr ""
-#~ "Strežnik zahteva overovitev z navadnim besedilom preko nešifrirane "
-#~ "povezave. Se strinjate s tem in želite nadaljevati z overovitvijo?"
-
-#~ msgid "Use GSSAPI (Kerberos v5) for authentication"
-#~ msgstr "Uporabi avtentikacijo GSSAPI (Kerberos v5)"
-
-#~ msgid ""
-#~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Filename:</span>\t\t%s"
-#~ msgstr ""
-#~ "%s%s<span weight=\"bold\">Avtor:</span>\t%s\n"
-#~ "<span weight=\"bold\">Spletna stran:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Ime datoteke:</span>\t\t%s"
-
-#~ msgid ""
-#~ "The contact availability plugin (cap) is used to display statistical "
-#~ "information about buddies in a users contact list."
-#~ msgstr ""
-#~ "Vtičnik dosegljivosti stika (cap) se uporablja za prikaz statističnih "
-#~ "podatkov o prijateljih v seznamu stikov."
-
-#~ msgid "Screen name sent"
-#~ msgstr "Pojavno ime poslano"
-
-#~ msgid "Screen name"
-#~ msgstr "Pojavno ime"
-
-#~ msgid "_Merge"
-#~ msgstr "_Spoji"
-
-#~ 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. The alias will be displayed in place of the screen name whenever "
-#~ "possible.\n"
-#~ msgstr ""
-#~ "Prosim, vnesite pojavno ime osebe, ki jo želite dodati vašemu seznamu "
-#~ "prijateljev. Vnesete lahko tudi psevdonim ali vzdevek prijatelja. Kjer bo "
-#~ "izvedljivo, bo namesto pojavnega imena prikazan vzdevek.\n"
-
-#~ msgid "Pounce only when my status is not available"
-#~ msgstr "Opozori le tedaj, ko moje stanje ni na voljo"
-
-#~ msgid "There were errors unloading the plugin."
-#~ msgstr "Pri odlaganju vtičnika je prišlo do napake."
-
-#~ msgid "Couldn't open file"
-#~ msgstr "Ni mogoče odpreti datoteke"
-
-#~ msgid "Error initializing session"
-#~ msgstr "Napaka pri inicializaciji seje"
-
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Povezava s strežnikom stikov ni uspela."
-
-#~ msgid "Current media"
-#~ msgstr "Trenutni medij"
-
-#~ msgid ""
-#~ "Sorry, passwords over %d characters in length (yours is %d) are not "
-#~ "supported by MySpace."
-#~ msgstr ""
-#~ "Žal MySpace ne podpira gesel, daljših od %d znakov (vaše jih ima %d)."
-
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "Ni se bilo mogoče povezati na strežnik preko SSL."
-
-#~ msgid "Invalid chat name specified."
-#~ msgstr "Navedeno je neveljavno ime pomenka."
-
-#~ msgid "Use recent buddies group"
-#~ msgstr "Uporabi nedavno skupino prijateljev"
-
-#~ msgid "Show how long you have been idle"
-#~ msgstr "Prikaz časa vaše odsotnosti"
-
-#~ msgid "Cannot find/access ~/.silc directory"
-#~ msgstr "Mape ~/.silc ni mogoče najti/do nje dostopati."
-
-#~ msgid "%s changed status from %s to %s"
-#~ msgstr "%s je spremenil stanje iz %s v %s"
-
-#~ msgid "%s is now %s"
-#~ msgstr "%s je zdaj %s"
-
-#~ msgid "%s is no longer %s"
-#~ msgstr "%s ni nič več %s"
-
-#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
-#~ msgstr "<span color=\"red\">%s ni več povezan: %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s will not attempt to reconnect the account until you correct the error "
-#~ "and re-enable the account."
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in "
-#~ "ponovno omogočite povezovanje računa."
-
-#~ msgid "User has typed something and stopped"
-#~ msgstr "Uporabnik je napisal nekaj in se ustavil."
--- a/po/sv.po	Sat Aug 29 04:49:46 2009 +0900
+++ b/po/sv.po	Sun Aug 30 03:04:43 2009 +0900
@@ -2439,7 +2439,7 @@
 #. *< priority
 #. *< id
 msgid "Join/Part Hiding"
-msgstr " Dölj Går in/Lämnar"
+msgstr "Dölj Går in/Lämnar"
 
 #. *< name
 #. *< version