Mercurial > pidgin

changeset 27296:c0b4ab2f4b9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '8222e69d26359ab1a478cc42d25834120aee713b' and 'ee2ad24a7d051b291259bd2fc8ce8e57f24c0cbb'
author Paul Aurich <paul@darkrain42.org>
date Sat, 04 Jul 2009 17:19:00 +0000
parents d4c6d2c6fb03 (current diff) 18d5a70f6334 (diff)
children a22ef93d6aec 5744f6e81be6 120943c3f5a8
files
diffstat 16 files changed, 296 insertions(+), 446 deletions(-) [+]
line wrap: on
line diff
--- a/doc/connection-signals.dox	Sat Jul 04 17:17:59 2009 +0000
+++ b/doc/connection-signals.dox	Sat Jul 04 17:19:00 2009 +0000
@@ -54,8 +54,8 @@
   @endsignalproto
   @signaldesc
    Emitted when a connection error occurs, before @ref signed-off.
-   @param gc     The connection on which the error has occured
-   @param err    The error that occured
+   @param gc     The connection on which the error has occurred
+   @param err    The error that occurred
    @param desc   A description of the error, giving more information.
  @endsignaldef
 
--- a/libpurple/plugins/log_reader.c	Sat Jul 04 17:17:59 2009 +0000
+++ b/libpurple/plugins/log_reader.c	Sat Jul 04 17:19:00 2009 +0000
@@ -2941,7 +2941,8 @@
 	/** description */
 	N_("When viewing logs, this plugin will include "
 	   "logs from other IM clients. Currently, this "
-	   "includes Adium, MSN Messenger, and Trillian.\n\n"
+	   "includes Adium, MSN Messenger, aMSN, and "
+	   "Trillian.\n\n"
 	   "WARNING: This plugin is still alpha code and "
 	   "may crash frequently.  Use it at your own risk!"),
 
--- a/libpurple/plugins/offlinemsg.c	Sat Jul 04 17:17:59 2009 +0000
+++ b/libpurple/plugins/offlinemsg.c	Sat Jul 04 17:19:00 2009 +0000
@@ -93,7 +93,7 @@
 	conv = offline->conv;
 	if (!purple_conversation_get_data(conv, "plugin_pack:offlinemsg"))
 		purple_conversation_write(conv, NULL, _("The rest of the messages will be saved "
-							"as pounce. You can edit/delete the pounce from the `Buddy "
+							"as pounces. You can edit/delete the pounce from the `Buddy "
 							"Pounce' dialog."),
 							PURPLE_MESSAGE_SYSTEM, time(NULL));
 	purple_conversation_set_data(conv, "plugin_pack:offlinemsg",
--- a/libpurple/protocols/jabber/jabber.c	Sat Jul 04 17:17:59 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Jul 04 17:19:00 2009 +0000
@@ -907,7 +907,7 @@
 
 	if (type == JABBER_IQ_RESULT) {
 		if(js->registration) {
-		buf = g_strdup_printf(_("Registration of %s@%s successful"),
+			buf = g_strdup_printf(_("Registration of %s@%s successful"),
 				js->user->node, js->user->domain);
 			if(account->registration_cb)
 				(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
--- a/libpurple/protocols/jabber/si.c	Sat Jul 04 17:17:59 2009 +0000
+++ b/libpurple/protocols/jabber/si.c	Sat Jul 04 17:19:00 2009 +0000
@@ -976,10 +976,10 @@
 	PurpleConnection *gc = js->gc;
 	PurpleAccount *account = purple_connection_get_account(gc);
 
-	purple_debug_error("jabber", "an error occured during IBB file transfer\n");
+	purple_debug_error("jabber", "an error occurred during IBB file transfer\n");
 	purple_xfer_error(purple_xfer_get_type(xfer), account,
 		jabber_ibb_session_get_who(sess),
-			_("An error occured on the in-band bytestream transfer\n"));
+			_("An error occurred on the in-band bytestream transfer\n"));
 	purple_xfer_cancel_remote(xfer);
 }
 
--- a/libpurple/protocols/novell/novell.c	Sat Jul 04 17:17:59 2009 +0000
+++ b/libpurple/protocols/novell/novell.c	Sat Jul 04 17:19:00 2009 +0000
@@ -2187,7 +2187,7 @@
 		purple_connection_error_reason (gc,
 			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
 			_("Unable to connect to server. Please enter the "
-			  "address of the server you wish to connect to."));
+			  "address of the server to which you wish to connect."));
 		return;
 	}
 
--- a/libpurple/protocols/qq/send_file.c	Sat Jul 04 17:17:59 2009 +0000
+++ b/libpurple/protocols/qq/send_file.c	Sat Jul 04 17:19:00 2009 +0000
@@ -152,7 +152,7 @@
 	gint size;
 	/* FIXME: It seems that the transfer never use a packet
 	 * larger than 1500 bytes, so if it happened to be a
-	 * larger packet, either error occured or protocol should
+	 * larger packet, either error occurred or protocol should
 	 * be modified
 	 */
 	ft_info *info;
--- a/libpurple/protocols/yahoo/yahoo.c	Sat Jul 04 17:17:59 2009 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Sat Jul 04 17:19:00 2009 +0000
@@ -1792,7 +1792,7 @@
 				case 1212:
 					/* Password incorrect */
 					/* Set password to NULL. Avoids account locking. Brings dialog to enter password if clicked on Re-enable account */
-					if (purple_account_get_remember_password(purple_connection_get_account(gc)))
+					if (!purple_account_get_remember_password(purple_connection_get_account(gc)))
 						purple_account_set_password(purple_connection_get_account(gc), NULL);
 					error_reason = g_strdup(_("Incorrect Password"));
 					error = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
--- a/pidgin/gtkcertmgr.c	Sat Jul 04 17:17:59 2009 +0000
+++ b/pidgin/gtkcertmgr.c	Sat Jul 04 17:19:00 2009 +0000
@@ -187,7 +187,7 @@
 		purple_request_input(tpm_dat,
 				     _("Certificate Import"),
 				     _("Specify a hostname"),
-				     _("Type the host name this certificate is for."),
+				     _("Type the host name for this certificate."),
 				     default_hostname,
 				     FALSE, /* Not multiline */
 				     FALSE, /* Not masked? */
--- a/pidgin/gtkimhtml.c	Sat Jul 04 17:17:59 2009 +0000
+++ b/pidgin/gtkimhtml.c	Sat Jul 04 17:19:00 2009 +0000
@@ -1549,7 +1549,7 @@
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("hyperlink-visited-color",
 	                                        _("Hyperlink visited color"),
-	                                        _("Color to draw hyperlinks after it has been visited (or activated)."),
+	                                        _("Color to draw hyperlink after it has been visited (or activated)."),
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("hyperlink-prelight-color",
 	                                        _("Hyperlink prelight color"),
@@ -1573,11 +1573,11 @@
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("whisper-action-name-color",
 	                                        _("Action Message Name Color for Whispered Message"),
-	                                        _("Color to draw the name of an action message."),
+	                                        _("Color to draw the name of a whispered action message."),
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("whisper-name-color",
 	                                        _("Whisper Message Name Color"),
-	                                        _("Color to draw the name of an action message."),
+	                                        _("Color to draw the name of a whispered message."),
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 
 	/* Customizable typing notification ... sort of. Example:
@@ -1587,7 +1587,7 @@
 	 */
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("typing-notification-color",
 	                                        _("Typing notification color"),
-	                                        _("The color to use for the typing notification font"),
+	                                        _("The color to use for the typing notification"),
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_string("typing-notification-font",
 	                                        _("Typing notification font"),
--- a/pidgin/gtkutils.c	Sat Jul 04 17:17:59 2009 +0000
+++ b/pidgin/gtkutils.c	Sat Jul 04 17:19:00 2009 +0000
@@ -1677,9 +1677,11 @@
 				 * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 				 * Probably not.  I'll just give an error and return. */
 				/* The original patch sent the icon used by the launcher.  That's probably wrong */
-				purple_notify_error(NULL, NULL, _("Cannot send launcher"), _("You dragged a desktop launcher. "
-											   "Most likely you wanted to send whatever this launcher points to instead of this launcher"
-											   " itself."));
+				purple_notify_error(NULL, NULL, _("Cannot send launcher"),
+				                    _("You dragged a desktop launcher. Most "
+				                      "likely you wanted to send the target "
+				                      "of this launcher instead of this "
+				                      "launcher itself."));
 				break;
 			}
 			purple_desktop_item_unref(item);
--- a/pidgin/plugins/musicmessaging/musicmessaging.c	Sat Jul 04 17:17:59 2009 +0000
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c	Sat Jul 04 17:19:00 2009 +0000
@@ -684,7 +684,8 @@
     DISPLAY_VERSION,                                     /**< version        */
     N_("Music Messaging Plugin for collaborative composition."),
                                                          /**  summary        */
-    N_("The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."),
+    N_("The Music Messaging Plugin allows a number of users to simultaneously "
+       "work on a piece of music by editing a common score in real-time."),
 	                                                 /**  description    */
     "Christian Muise <christian.muise@gmail.com>",       /**< author         */
     PURPLE_WEBSITE,                                        /**< homepage       */
--- a/pidgin/plugins/sendbutton.c	Sat Jul 04 17:17:59 2009 +0000
+++ b/pidgin/plugins/sendbutton.c	Sat Jul 04 17:19:00 2009 +0000
@@ -177,8 +177,8 @@
 	DISPLAY_VERSION,                                /**< version */
 	N_("Conversation Window Send Button."),         /**< summary */
 	N_("Adds a Send button to the entry area of "
-	   "the conversation window. Intended for when "
-	   "no physical keyboard is present."),         /**< description */
+	   "the conversation window. Intended for use "
+	   "when no physical keyboard is present."),    /**< description */
 	"Etan Reisner <deryni@pidgin.im>",              /**< author */
 	PURPLE_WEBSITE,                                 /**< homepage */
 	plugin_load,                                    /**< load */
--- a/pidgin/plugins/win32/winprefs/winprefs.c	Sat Jul 04 17:17:59 2009 +0000
+++ b/pidgin/plugins/win32/winprefs/winprefs.c	Sat Jul 04 17:19:00 2009 +0000
@@ -350,7 +350,7 @@
 	N_("Windows Pidgin Options"),
 	DISPLAY_VERSION,
 	N_("Options specific to Pidgin for Windows."),
-	N_("Provides options specific to Pidgin for Windows , such as buddy list docking."),
+	N_("Provides options specific to Pidgin for Windows, such as buddy list docking."),
 	"Herman Bloggs <hermanator12002@yahoo.com>",
 	PURPLE_WEBSITE,
 	plugin_load,
--- a/po/ca.po	Sat Jul 04 17:17:59 2009 +0000
+++ b/po/ca.po	Sat Jul 04 17:19:00 2009 +0000
@@ -33,8 +33,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
-"PO-Revision-Date: 2009-06-29 08:37+0200\n"
+"POT-Creation-Date: 2009-07-04 10:23+0200\n"
+"PO-Revision-Date: 2009-07-04 10:30+0200\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
 "MIME-Version: 1.0\n"
@@ -2215,9 +2215,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA-AUTOMÀTICA>: %s\n"
 
-#, fuzzy
 msgid "Error creating conference."
-msgstr "S'ha produït un error en crear la connexió"
+msgstr "S'ha produït un error en crear la conferència."
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2624,14 +2623,14 @@
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "Quan es visualitzin els registres, aquest connector inclourà registres "
 "d'altres clients de MI. De moment, es poden incloure els d'Adium, MSN "
-"Messenger, i Trillian.\n"
+"Messenger, aMSN, i Trillian.\n"
 "\n"
 "Avís: aquest connector encara està en desenvolupament i pot ser que es pengi."
 
@@ -2680,7 +2679,7 @@
 "Desa els missatges que s'hagin enviat a un usuari fora de línia com a avís"
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "La resta de missatges es desaran com a un avís. Podeu editar o suprimir "
@@ -4840,7 +4839,7 @@
 msgid "Error in chat %s"
 msgstr "S'ha produït un error en el xat %s"
 
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
 msgid "Transfer was closed."
@@ -5175,11 +5174,11 @@
 msgid "Non-IM Contacts"
 msgstr "Contactes que no són de MI"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
-"%s us ha enviat una invitació a la seva càmera web, però això encara no està "
-"implementat."
+"%s us ha enviat una invitació per fer una conversa de veu, però això encara "
+"no està implementat."
 
 msgid "Nudge"
 msgstr "Donar un cop de colze"
@@ -5657,10 +5656,10 @@
 msgid "Retrieving buddy list"
 msgstr "S'està recuperant la llista d'amics"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr ""
-"%s us ha enviat una invitació a la seva càmera web, però això encara no està "
+"%s ha sol·licitat poder veure la vostra càmera web, però això encara no està "
 "implementat."
 
 #, c-format
@@ -6399,8 +6398,8 @@
 "acabeu d'enviar."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "No s'ha pogut connectar al servidor. Introduïu l'adreça del servidor al qual "
 "us vulgueu connectar."
@@ -6430,9 +6429,8 @@
 msgid "Server port"
 msgstr "Port en el servidor"
 
-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "S'ha rebut una resposta HTTP inesperada del servidor."
+msgstr "S'ha rebut una resposta inesperada de "
 
 #. username connecting too frequently
 msgid ""
@@ -6443,15 +6441,16 @@
 "deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
 "encara més temps."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "S'ha produït un error en resoldre %s"
+msgstr "S'ha produït en sol·licitar "
 
 msgid "Incorrect password."
 msgstr "La contrasenya no és correcta."
 
 msgid "AOL does not allow your screen name to authenticate via this site."
 msgstr ""
+"AOL no permet que autentiqueu aquest nom d'usuari a través d'aquest web."
 
 msgid "Could not join chat room"
 msgstr "No s'ha pogut entrar a la sala de xat"
@@ -6784,9 +6783,9 @@
 msgstr "S'ha rebut l'autorització"
 
 #. Unregistered username
-#. uid is not exist
-msgid "Invalid username."
-msgstr "El nom d'usuari no és vàlid"
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "L'usuari no existeix"
 
 #. Suspended account
 msgid "Your account is currently suspended."
@@ -8026,6 +8025,10 @@
 msgid "Enter the text from the image"
 msgstr "Introduïu el text de la imatge"
 
+#. uid is not exist
+msgid "Invalid username."
+msgstr "El nom d'usuari no és vàlid"
+
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
@@ -9670,7 +9673,6 @@
 msgid "Received invalid data"
 msgstr "S'han rebut dades invàlides"
 
-#. Password incorrect
 msgid "Incorrect Password"
 msgstr "La contrasenya no és correcta"
 
@@ -9682,10 +9684,6 @@
 "El compte està blocat perquè s'ha intentat entrar massa cops.\n"
 "Això es pot solucionar entrant al web de Yahoo!"
 
-#. the username does not exist
-msgid "Username does not exist"
-msgstr "L'usuari no existeix"
-
 #. indicates a lock of some description
 msgid ""
 "Account locked: Unknown reason.\n"
@@ -11063,112 +11061,98 @@
 msgstr "Color de fons"
 
 msgid "The background color for the buddy list"
-msgstr ""
-
-#, fuzzy
+msgstr "El color de fons de la llista d'amics"
+
 msgid "Layout"
-msgstr "Lasià"
+msgstr "Format"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
-
+msgstr "El format de les icones, el nom, i l'estat de la llista d'amics"
+
+# Color de fons quan la blist està expandida
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Color de fons"
-
-#, fuzzy
+msgstr "Color de fons expandit"
+
 msgid "The background color of an expanded group"
-msgstr "Nom del color de fons"
-
-#, fuzzy
+msgstr "El color de fons d'un grup expandit"
+
 msgid "Expanded Text"
-msgstr "Mida de l'expansor"
+msgstr "Text expandit"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Text informatiu d'un grup expandit"
+
 msgid "Collapsed Background Color"
-msgstr "Selecciona el color de fons"
-
-#, fuzzy
+msgstr "Color de fons col·lapsat"
+
 msgid "The background color of a collapsed group"
-msgstr "El color de fons com a GdkColor"
-
-#, fuzzy
+msgstr "El color de fons d'un grup col·lapsat"
+
 msgid "Collapsed Text"
-msgstr "_Redueix"
+msgstr "Text col·lapsat"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "Text informatiu d'un grup col·lapsat"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Selecciona el color de fons"
-
-#, fuzzy
+msgstr "Color de fons dels contactes i xats"
+
 msgid "The background color of a contact or chat"
-msgstr "El color de fons com a GdkColor"
-
-#, fuzzy
+msgstr "El color de fons d'un contacte o un xat"
+
 msgid "Contact Text"
-msgstr "Drecera"
+msgstr "Text del contacte"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Text informatiu quan un contacte s'expandeix"
+
 msgid "On-line Text"
-msgstr "En línia"
-
-#, fuzzy
+msgstr "Text en línia"
+
 msgid "The text information for when a buddy is online"
-msgstr "Aconsegueix dades sobre l'amic seleccionat"
-
-#, fuzzy
+msgstr "Text informatiu per quan un amic estigui en línia"
+
 msgid "Away Text"
-msgstr "Absent"
-
-#, fuzzy
+msgstr "Text d'absència"
+
 msgid "The text information for when a buddy is away"
-msgstr "Aconsegueix dades sobre l'amic seleccionat"
-
-#, fuzzy
+msgstr "Text informatiu per quan un amic estigui absent"
+
 msgid "Off-line Text"
-msgstr "Fora de línia"
-
-#, fuzzy
+msgstr "Text de fora de línia"
+
 msgid "The text information for when a buddy is off-line"
-msgstr "Aconsegueix dades sobre l'amic seleccionat"
-
-#, fuzzy
+msgstr "Text informatiu per quan un amic estigui fora de línia"
+
 msgid "Idle Text"
-msgstr "Text sobre l'estat d'ànim"
-
-#, fuzzy
+msgstr "Text d'inactivitat"
+
 msgid "The text information for when a buddy is idle"
-msgstr "Aconsegueix dades sobre l'amic seleccionat"
+msgstr "Text informatiu per quan un amic estigui inactiu"
 
 msgid "Message Text"
 msgstr "Text del missatge"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
-
-#, fuzzy
+msgstr "Text informatiu per quan un amic tingui un missatge per llegir"
+
 msgid "Message (Nick Said) Text"
-msgstr "Text del missatge"
+msgstr "Text del missatge (on s'hi ha dit el sobrenom)"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
 msgstr ""
-
-#, fuzzy
+"Text informatiu quan hi ha un missatge per llegir que conté el vostre "
+"sobrenom en un xat"
+
 msgid "The text information for a buddy's status"
-msgstr "Canvia la informació d'usuari de %s"
+msgstr "Text informatiu per l'estat d'un amic"
+
+msgid "Type the host name for this certificate."
+msgstr "Entreu el nom de l'ordinador al qual pertany aquest certificat."
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -12110,7 +12094,7 @@
 msgid "Hyperlink visited color"
 msgstr "Color dels enllaços visitats"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "El color amb el qual es pintaran els enllaços que ja s'hagin visitat (o "
 "activat)."
@@ -12152,15 +12136,21 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Color del nom del missatge d'acció per a missatges xiuxiuejats"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "Color amb el qual es pintaran els missatges d'acció xiuxiuejats."
+
 msgid "Whisper Message Name Color"
 msgstr "Color dels missatges xiuxiuejats enviats"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "Color amb el qual es pintaran els missatges xiuxiuejats."
+
 msgid "Typing notification color"
 msgstr "Color per a les notificacions de quan s'escriu"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
-"El color que s'emprarà per a les notificacions indicant que s'està escrivint"
+msgid "The color to use for the typing notification"
+msgstr ""
+"El color que s'emprarà per a les notificacions indicant que s'està teclejant"
 
 msgid "Typing notification font"
 msgstr "Tipus de lletra de les notificacions quan s'escriu"
@@ -12574,6 +12564,9 @@
 msgstr ""
 "S'ha triat l'ordre per al navegador «manualment», però no se n'ha indicat cap."
 
+msgid "No message"
+msgstr "Cap missatge"
+
 msgid "Open All Messages"
 msgstr "Obre tots els missatges"
 
@@ -12591,9 +12584,6 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Us han envestit!</span>"
 
-msgid "No message"
-msgstr "Cap missatge"
-
 msgid "The following plugins will be unloaded."
 msgstr "Es descarregaran els connectors següents."
 
@@ -12915,8 +12905,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemple: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "Detecta l'_adreça IP automàticament"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Empra l'_adreça IP detectada automàticament: %s"
 
 msgid "Public _IP:"
 msgstr "IP _pública:"
@@ -13286,33 +13277,18 @@
 msgid "Status for %s"
 msgstr "Estat per a %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Emoticona personalitzada"
-
-msgid "More Data needed"
-msgstr "Calen més dades"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Especifiqueu una drecera associada a l'emoticona."
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 "Ja hi ha una emoticona personalitzada per a «%s». Indiqueu-ne una de diferent."
 
+msgid "Custom Smiley"
+msgstr "Emoticona personalitzada"
+
 msgid "Duplicate Shortcut"
 msgstr "Drecera duplicada"
 
-msgid "Please select an image for the smiley."
-msgstr "Seleccioneu una imatge per a l'emoticona."
-
 msgid "Edit Smiley"
 msgstr "Edita l'emoticona"
 
@@ -13423,8 +13399,8 @@
 msgstr "No es pot enviar el llançador"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Heu arrossegat un llançador de l'escriptori. Segurament voleu enviar allò a "
 "què aquest llançador apunta i no pas el llançador."
@@ -13565,79 +13541,67 @@
 msgstr ""
 "Mostra informació estadística sobre la disponibilitat dels vostres amics"
 
-#, fuzzy
 msgid "Server name request"
-msgstr "Adreça del servidor"
-
-#, fuzzy
+msgstr "Sol·licitud del nom del servidor"
+
 msgid "Enter an XMPP Server"
-msgstr "Introduïu un servidor de conferències"
-
-#, fuzzy
+msgstr "Introduïu un servidor XMPP"
+
 msgid "Select an XMPP server to query"
-msgstr "Seleccioneu a quin servidor de conferències consultar"
-
-#, fuzzy
+msgstr "Seleccioneu el servidor XMPP a consultar"
+
 msgid "Find Services"
-msgstr "Serveis en línia"
-
-#, fuzzy
+msgstr "Cerca serveis"
+
 msgid "Add to Buddy List"
-msgstr "Envia la llista d'amics"
-
-#, fuzzy
+msgstr "Afegeix a la llista d'amics"
+
 msgid "Gateway"
-msgstr "Passi a absent"
-
-#, fuzzy
+msgstr "Passarel·la"
+
 msgid "Directory"
-msgstr "Directori dels registres"
-
-#, fuzzy
+msgstr "Directori"
+
 msgid "PubSub Collection"
-msgstr "Selecció de sons"
-
-#, fuzzy
+msgstr "Col·lecció PubSub"
+
+# Mes info a xep-0060
 msgid "PubSub Leaf"
-msgstr "Servei PubSub"
-
-#, fuzzy
+msgstr "Fulla PubSub"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
 msgstr ""
 "\n"
-"<b>Descripció:</b> Xerraire"
+"<b>Descripció:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Informació del servei de descoberta"
-
-#, fuzzy
+msgstr "Servei de descoberta"
+
 msgid "_Browse"
-msgstr "_Navegador:"
-
-#, fuzzy
+msgstr "_Navega"
+
 msgid "Server does not exist"
-msgstr "L'usuari no existeix."
-
-#, fuzzy
+msgstr "El servidor no existeix"
+
 msgid "Server does not support service discovery"
-msgstr "El servidor no permet blocar"
-
-#, fuzzy
+msgstr "El servidor no permet la descoberta de serveis"
+
+# xep-0060
 msgid "XMPP Service Discovery"
-msgstr "Informació del servei de descoberta"
+msgstr "Servei de descoberta XMPP"
 
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Permet navegar i registrar-se a serveis."
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
+msgstr ""
+"Aquest servei és útil per registrar-vos a transports antics o altres serveis "
+"XMPP."
 
 msgid "Buddy is idle"
 msgstr "L'amic està inactiu"
@@ -14034,7 +13998,7 @@
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "El connector per a missatgeria de música permet que diferents usuaris puguin "
 "treballar en una mateixa peça de música, editant la mateixa partitura en "
@@ -14292,7 +14256,7 @@
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Afegeix un botó d'Enviar a l'àrea d'entrada de la finestra de conversa. Està "
 "pensat per situacions en què no hi ha cap teclat."
@@ -14348,96 +14312,78 @@
 "Substitueix el text dels missatges que s'envien emprant les regles que hàgiu "
 "establert."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "No està connectat"
-
-#, fuzzy
+msgstr "Acabat de connectar"
+
 msgid "Just logged out"
-msgstr "%s ha sortit."
+msgstr "Acabat de desconnectar"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Icona per a un contacte/\n"
+"Icona per a una persona desconeguda"
+
 msgid "Icon for Chat"
-msgstr "Entra a un xat"
-
-#, fuzzy
+msgstr "Icona per un xat"
+
 msgid "Ignored"
-msgstr "Ignora"
-
-#, fuzzy
+msgstr "Ignorat"
+
 msgid "Founder"
-msgstr "Més alt"
-
-#, fuzzy
+msgstr "Fundador"
+
 msgid "Operator"
-msgstr "Opera"
+msgstr "Operador"
 
 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "Mig operador"
+
 msgid "Authorization dialog"
-msgstr "S'ha donat l'autorització"
-
-#, fuzzy
+msgstr "Diàleg d'autorització"
+
 msgid "Error dialog"
-msgstr "Error"
-
-#, fuzzy
+msgstr "Diàleg d'error"
+
 msgid "Information dialog"
-msgstr "Informació"
+msgstr "Diàleg d'informació"
 
 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "Diàleg del correu"
+
 msgid "Question dialog"
-msgstr "Diàleg de sol·licitud"
-
-#, fuzzy
+msgstr "Diàleg de pregunta"
+
 msgid "Warning dialog"
-msgstr "Nivell d'avís"
+msgstr "Diàleg d'avís"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Quin tipus de diàleg és aquest?"
+
 msgid "Status Icons"
-msgstr "Estat per a %s"
-
-# FIXME: no poso localització perquè l'usuari ho podria
-#        confondre amb "ubicació" (josep)
-#, fuzzy
+msgstr "Icona d'estat"
+
 msgid "Chatroom Emblems"
-msgstr "Característiques locals de la sala de xat"
-
-#, fuzzy
+msgstr "Distintius de les sales de xat"
+
 msgid "Dialog Icons"
-msgstr "Canvia la icona"
-
-#, fuzzy
+msgstr "Icones dels quadres de diàleg"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Control de temes GTK+ del Pidgin"
-
-#, fuzzy
+msgstr "Editor de temes d'icona del Pidgin"
+
 msgid "Contact"
-msgstr "Informació del contacte"
-
-#, fuzzy
+msgstr "Contacte"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Tema de la llista d'amics"
-
-#, fuzzy
+msgstr "Editor de temes per a la llista d'amics del Pidgin"
+
 msgid "Edit Buddylist Theme"
-msgstr "Tema de la llista d'amics"
+msgstr "Edita el tema de la llista d'amics"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Edita el tema d'icones"
 
 #. *< type
 #. *< ui_requirement
@@ -14446,16 +14392,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Control de temes GTK+ del Pidgin"
+msgstr "Editor de temes del Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Control de temes GTK+ del Pidgin"
+msgstr "Editor de temes del Pidgin"
 
 # FIXME (josep)
 #. *< type
@@ -14627,7 +14571,7 @@
 msgstr "Opcions específiques de la versió del Pidgin per al Windows"
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Proporciona opcions específiques per a la versió Windows del Pidgin, com ara "
 "l'acoblament de la llista d'amics."
@@ -14670,6 +14614,15 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 
+#~ msgid "More Data needed"
+#~ msgstr "Calen més dades"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Especifiqueu una drecera associada a l'emoticona."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Seleccioneu una imatge per a l'emoticona."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Quin ID voleu activar?"
 
--- a/po/de.po	Sat Jul 04 17:17:59 2009 +0000
+++ b/po/de.po	Sat Jul 04 17:19:00 2009 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
-"PO-Revision-Date: 2009-06-28 11:42+0200\n"
+"POT-Creation-Date: 2009-07-04 12:30+0200\n"
+"PO-Revision-Date: 2009-07-04 12:30+0200\n"
 "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1562,7 +1562,6 @@
 msgid "Lastlog plugin."
 msgstr "Verlauf-Plugin."
 
-#, c-format
 msgid ""
 "\n"
 "Fetching TinyURL..."
@@ -1892,7 +1891,6 @@
 "Fehler beim Lesen vom Auflösungsprozess:\n"
 "%s"
 
-#, c-format
 msgid "Resolver process exited without answering our request"
 msgstr "Auflösungsprozess hat sich beendet ohne die Anfrage zu beantworten"
 
@@ -2602,9 +2600,10 @@
 "Mitschnittsbetrachter an."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2658,8 +2657,9 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Sichert Nachrichten an einen Offline-Benutzer als Alarm."
 
-msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+#, fuzzy
+msgid ""
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Die folgenden Nachrichten werden als Alarm gesichert. Sie können den Alarm "
@@ -4215,7 +4215,6 @@
 msgid "Read Error"
 msgstr "Fehler beim Lesen"
 
-#, c-format
 msgid ""
 "Could not find alternative XMPP connection methods after failing to connect "
 "directly.\n"
@@ -4812,7 +4811,8 @@
 msgid "Error in chat %s"
 msgstr "Fehler im Chat %s"
 
-msgid "An error occured on the in-band bytestream transfer\n"
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Beim Übertragen der Datei trat ein Fehler auf\n"
 
 msgid "Transfer was closed."
@@ -4918,219 +4918,166 @@
 "%s ist auf der lokalen Liste, aber nicht auf der Serverliste. Möchten Sie, "
 "dass der Buddy hinzugefügt wird?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Kann die Nachricht nicht parsen"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaxfehler (wahrscheinlich ein Client-Bug)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Ungültige E-Mail-Adresse"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Benutzer existiert nicht"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Der Fully Qualified Domain Name fehlt"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Schon angemeldet"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Ungültiger Freundesname"
 
-#, c-format
 msgid "List full"
 msgstr "Liste voll"
 
-#, c-format
 msgid "Already there"
 msgstr "Schon da"
 
-#, c-format
 msgid "Not on list"
 msgstr "Nicht auf der Liste"
 
-#, c-format
 msgid "User is offline"
 msgstr "Benutzer ist offline"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Bereits in diesem Modus"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Bereits in der „Gegenteil-Liste“"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Zu viele Gruppen"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Ungültige Gruppe"
 
-#, c-format
 msgid "User not in group"
 msgstr "Benutzer ist nicht in der Gruppe"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Name der Gruppe ist zu lang"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kann die Gruppe „Null“ nicht entfernen"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr ""
 "Versuchte einen Benutzer zu einer nichtexistierenden Gruppe hinzuzufügen"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Vermittlung gescheitert"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Übertragung der Benachrichtigung gescheitert"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Notwendige Felder fehlen"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Zu viele Treffer zu einem FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Dienst momentan nicht verfügbar"
 
-#, c-format
 msgid "Database server error"
 msgstr "Fehler des Datenbank-Servers"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Kommando abgeschaltet"
 
-#, c-format
 msgid "File operation error"
 msgstr "Dateiverarbeitungsfehler"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Fehler bei der Speicheranforderung"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Falscher CHL-Wert zum Server gesendet"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server beschäftigt"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server unerreichbar"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Peer-Benachrichtigungsserver nicht erreichbar"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Datenbank-Verbindungsfehler"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server fährt runter (melden Sie sich ab)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Fehler beim Herstellen der Verbindung"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-Parameter sind entweder unbekannt oder nicht erlaubt"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Schreiben nicht möglich"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sitzung überlastet"
 
-#, c-format
 msgid "User is too active"
 msgstr "Benutzer ist zu aktiv"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Zu viele Sitzungen"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport (MSN Benutzerausweis) wurde nicht überprüft"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Falsche Friends-Datei"
 
-#, c-format
 msgid "Not expected"
 msgstr "Nicht erwartet"
 
-#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Benutzernamen werden zu oft geändert"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server ist zu beschäftigt"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Authentifizierung fehlgeschlagen"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Nicht erlaubt im Offline-Modus"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Akzeptiert keine neuen Benutzer"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kinder-Passwort ohne die Zustimmung der Eltern"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-Konto wurde noch nicht überprüft"
 
 msgid "Passport account suspended"
 msgstr "Passport-Konto gesperrt"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Falsches Ticket"
 
@@ -6370,9 +6317,10 @@
 "%s scheint offline zu sein und hat die Nachricht, die Sie gerade gesendet "
 "haben, nicht empfangen."
 
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+#, fuzzy
+msgid ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Kann keine Verbindung zum Server herstellen. Bitte geben Sie die Adresse des "
 "Servers ein, mit dem Sie sich verbinden wollen."
@@ -6417,7 +6365,7 @@
 "versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar "
 "noch länger warten."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Error requesting "
 msgstr "Fehler beim Auflösen von %s"
 
@@ -6757,9 +6705,9 @@
 msgstr "Autorisierung empfangen"
 
 #. Unregistered username
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Ungültiger Benutzername."
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Benutzername existiert nicht"
 
 #. Suspended account
 msgid "Your account is currently suspended."
@@ -8018,6 +7966,10 @@
 msgid "Enter the text from the image"
 msgstr "Bitte geben Sie den Text aus dem Bild ein"
 
+#. uid is not exist
+msgid "Invalid username."
+msgstr "Ungültiger Benutzername."
+
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
 msgstr "Unbekannte Antwort bei Überprüfungen des Passwortes (0x%02X)"
@@ -8725,7 +8677,6 @@
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Thema des Kanals:</b><br>%s"
 
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanal-Modi:</b> "
 
@@ -8750,7 +8701,6 @@
 msgid "Channel Public Keys List"
 msgstr "Liste der öffentlichen Schlüssel des Kanals"
 
-#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9152,7 +9102,6 @@
 msgid "Your Current Mood"
 msgstr "Ihre momentane Stimmung"
 
-#, c-format
 msgid "Normal"
 msgstr "Normal"
 
@@ -9538,47 +9487,37 @@
 msgid "No server statistics available"
 msgstr "Keine Serverstatistik verfügbar"
 
-#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fehler: Unterschiedliche Version, aktualisieren Sie Ihren Client"
 
-#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Fehler: Die entfernte Seite vertraut Ihrem öffentlichen Schlüssel nicht"
 
-#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 "Fehler: Entferntes Programm unterstützt nicht die vorgeschlagen KE-Gruppe"
 
-#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 "Fehler: Entferntes Programm unterstützt die vorgeschlagene Cipher nicht"
 
-#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fehler: Entferntes Programm unterstützt die vorgeschlagene PKCS nicht"
 
-#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 "Fehler: Entferntes Programm unterstützt die vorgeschlagen Hashfunktion nicht"
 
-#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fehler: Entferntes Programm unterstützt das vorgeschlagene HMAC nicht"
 
-#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Fehler: Falsche Signatur"
 
-#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Fehler: Ungültiger Cookie"
 
-#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Fehler: Authentifizierung fehlgeschlagen"
 
@@ -9677,7 +9616,6 @@
 msgid "Received invalid data"
 msgstr "Ungültige Daten empfangen"
 
-#. Password incorrect
 msgid "Incorrect Password"
 msgstr "Falsches Passwort"
 
@@ -9690,10 +9628,6 @@
 "Eventuell können Sie dies beheben, wenn Sie sich auf der Yahoo!-Webseite "
 "anmelden."
 
-#. the username does not exist
-msgid "Username does not exist"
-msgstr "Benutzername existiert nicht"
-
 #. indicates a lock of some description
 msgid ""
 "Account locked: Unknown reason.\n"
@@ -10423,29 +10357,24 @@
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 "Die Verbindung wurde von einer anderen Software auf ihrem Computer "
 "unterbrochen."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Der entfernte Host hat die Verbindung beendet."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Verbindungsabbruch wegen Zeitüberschreitung."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Verbindung abgelehnt."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adresse wird bereits benutzt."
 
@@ -11156,9 +11085,8 @@
 msgid "The text information for when a buddy is idle"
 msgstr ""
 
-#, fuzzy
 msgid "Message Text"
-msgstr "Nachricht gesendet"
+msgstr "Nachrichtentext"
 
 msgid "The text information for when a buddy has an unread message"
 msgstr ""
@@ -11175,6 +11103,9 @@
 msgid "The text information for a buddy's status"
 msgstr "Ändere die Benutzerinformation für %s"
 
+msgid "Type the host name for this certificate."
+msgstr "Geben Sie einen Hostnamen für dieses Zertifikat an."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-Server"
@@ -11832,7 +11763,6 @@
 "geschützt.  Die Datei 'COPYRIGHT' enthält die komplette Liste der "
 "Mitwirkenden.  Wir übernehmen keine Haftung für dieses Programm.<BR><BR>"
 
-#, c-format
 msgid ""
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
@@ -11840,7 +11770,6 @@
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
-#, c-format
 msgid ""
 "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
@@ -11848,13 +11777,11 @@
 "<FONT SIZE=\"4\">Hilfe per E-Mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
 
-#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC-Kanal:</FONT> #pidgin auf irc.freenode.net<BR><BR>"
 
-#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">XMPP-MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
@@ -12109,10 +12036,9 @@
 msgid "Hyperlink visited color"
 msgstr "Farbe für besuchte Hyperlinks"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
-msgstr ""
-"Farbe zum Darstellen von Hyperlinks, wenn sie besucht (oder aktiviert) "
-"wurden."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr ""
+"Farbe zum Darstellen von Hyperlinks, wenn sie besucht (oder aktiviert) wurden"
 
 msgid "Hyperlink prelight color"
 msgstr "Hyperlink-Farbe"
@@ -12152,13 +12078,23 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Farbe des Absendernamens für geflüsterte Aktions-Nachrichten"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+"Farbe, mit der der Name in einer geflüsterten Aktions-Nachricht dargestellt "
+"wird"
+
 msgid "Whisper Message Name Color"
 msgstr "Farbe des Absendernamens für Flüster-Nachrichten"
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+"Farbe, mit der der Name in einer geflüsterten Nachricht dargestellt wird"
+
 msgid "Typing notification color"
 msgstr "Farbe der Tipp-Benachrichtigung"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr ""
 "Die Farbe, die für die Tipp-Benachrichtigungsmeldung benutzt werden soll"
 
@@ -12512,7 +12448,6 @@
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Wird geschlossen, da bereits ein anderer libpurple-Client läuft\n"
 
@@ -12561,6 +12496,9 @@
 msgstr ""
 "Das benutzerdefinierte Browserkommando wurde ausgewählt, aber nicht gesetzt."
 
+msgid "No message"
+msgstr "Keine Nachricht"
+
 msgid "Open All Messages"
 msgstr "Alle Nachrichten öffnen"
 
@@ -12576,9 +12514,6 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sie haben geklopft!</span>"
 
-msgid "No message"
-msgstr "Keine Nachricht"
-
 msgid "The following plugins will be unloaded."
 msgstr "Die folgenden Plugins werden entladen."
 
@@ -12703,47 +12638,36 @@
 msgid "Pounce Target"
 msgstr "Alarm-Ziel"
 
-#, c-format
 msgid "Started typing"
 msgstr "Beginnt zu tippen"
 
-#, c-format
 msgid "Paused while typing"
 msgstr "Hat beim Tippen angehalten"
 
-#, c-format
 msgid "Signed on"
 msgstr "Hat sich anmeldet"
 
-#, c-format
 msgid "Returned from being idle"
 msgstr "Ist nicht mehr inaktiv"
 
-#, c-format
 msgid "Returned from being away"
 msgstr "Ist wieder anwesend"
 
-#, c-format
 msgid "Stopped typing"
 msgstr "Hat das Tippen gestoppt"
 
-#, c-format
 msgid "Signed off"
 msgstr "Hat sich abmeldet"
 
-#, c-format
 msgid "Became idle"
 msgstr "Wurde untätig"
 
-#, c-format
 msgid "Went away"
 msgstr "Ging hinaus"
 
-#, c-format
 msgid "Sent a message"
 msgstr "Eine Nachricht senden"
 
-#, c-format
 msgid "Unknown.... Please report this!"
 msgstr "Unbekannt.... Bitte berichten Sie dieses Problem!"
 
@@ -12753,9 +12677,8 @@
 msgid "Theme failed to load."
 msgstr "Thema konnte nicht geladen werden."
 
-#, fuzzy
 msgid "Theme failed to copy."
-msgstr "Thema konnte nicht geladen werden."
+msgstr "Thema konnte nicht kopiert werden."
 
 msgid "Install Theme"
 msgstr "Thema installieren"
@@ -12894,8 +12817,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Beispiel: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "IP-Adresse _automatisch erkennen"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Benutze _automatisch erkannte IP-Adresse: %s"
 
 msgid "Public _IP:"
 msgstr "Öffentliche _IP:"
@@ -13031,27 +12955,21 @@
 msgid "Sound Selection"
 msgstr "Klang-Auswahl"
 
-#, c-format
 msgid "Quietest"
 msgstr "Am leisesten"
 
-#, c-format
 msgid "Quieter"
 msgstr "Leiser"
 
-#, c-format
 msgid "Quiet"
 msgstr "Leise"
 
-#, c-format
 msgid "Loud"
 msgstr "Laut"
 
-#, c-format
 msgid "Louder"
 msgstr "Lauter"
 
-#, c-format
 msgid "Loudest"
 msgstr "Am lautesten"
 
@@ -13271,21 +13189,6 @@
 msgid "Status for %s"
 msgstr "Status für %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Benutzerdefinierter Smiley"
-
-msgid "More Data needed"
-msgstr "Weitere Daten benötigt"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Bitte geben Sie eine Tastenkombination für den Smiley an."
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13293,12 +13196,12 @@
 "Für '%s' existiert bereits ein benutzerdefinierter Smiley. Bitten wählen Sie "
 "eine andere Tastenkombination."
 
+msgid "Custom Smiley"
+msgstr "Benutzerdefinierter Smiley"
+
 msgid "Duplicate Shortcut"
 msgstr "Doppelte Tastenkombination"
 
-msgid "Please select an image for the smiley."
-msgstr "Bitte wählen Sie ein Bild für den Smiley."
-
 msgid "Edit Smiley"
 msgstr "Smiley bearbeiten"
 
@@ -13408,8 +13311,8 @@
 msgstr "Kann Verknüpfung nicht senden"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Sie haben eine Verknüpfung gewählt. Wahrscheinlich wollten sie das Ziel der "
 "Verknüpfung senden und nicht die Verknüpfung selbst."
@@ -13549,64 +13452,53 @@
 msgid "Server name request"
 msgstr "Server-Adresse"
 
-#, fuzzy
 msgid "Enter an XMPP Server"
-msgstr "Geben Sie einen Konferenzserver ein"
-
-#, fuzzy
+msgstr "Geben Sie einen XMPP-Server ein"
+
 msgid "Select an XMPP server to query"
-msgstr "Wählen Sie einen Konferenz-Server zur Abfrage"
-
-#, fuzzy
+msgstr "Wählen Sie einen XMPP-Server zur Abfrage"
+
 msgid "Find Services"
-msgstr "Online-Dienste"
-
-#, fuzzy
+msgstr "Dienste suchen"
+
 msgid "Add to Buddy List"
-msgstr "Buddy-Liste senden"
-
-#, fuzzy
+msgstr "Zur Buddy-Liste hinzufügen"
+
 msgid "Gateway"
-msgstr "hinausgeht"
-
-#, fuzzy
+msgstr "Gateway"
+
 msgid "Directory"
-msgstr "Mitschnittverzeichnis"
-
-#, fuzzy
+msgstr "Verzeichnis"
+
 msgid "PubSub Collection"
-msgstr "Klang-Auswahl"
-
-#, fuzzy
+msgstr "PubSub-Sammlung"
+
 msgid "PubSub Leaf"
-msgstr "PubSub-Dienst"
-
-#, fuzzy
+msgstr "PubSub-Blatt"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Beschreibung"
+msgstr ""
+"\n"
+"<b>Beschreibung:</b>"
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Information zur Dienstsuche"
+msgstr "Dienstsuche"
 
 #, fuzzy
 msgid "_Browse"
 msgstr "_Browser:"
 
-#, fuzzy
 msgid "Server does not exist"
-msgstr "Benutzer existiert nicht"
-
-#, fuzzy
+msgstr "Server existiert nicht"
+
 msgid "Server does not support service discovery"
-msgstr "Server unterstützt kein Blockieren"
-
-#, fuzzy
+msgstr "Server unterstützt keine Dienstsuche"
+
 msgid "XMPP Service Discovery"
-msgstr "Information zur Dienstsuche"
+msgstr "XMPP-Dienstsuche"
 
 msgid "Allows browsing and registering services."
 msgstr ""
@@ -14015,9 +13907,10 @@
 msgstr "Musik-Nachrichten-Plugin zum gemeinschaftlichen Komponieren."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Das Musik-Nachrichtenübermittlungsplugin erlaubt es einer Menge von "
 "Benutzern, simultan an einem Musikstück in Echtzeit zu arbeiten."
@@ -14161,7 +14054,6 @@
 msgid "Select Color"
 msgstr "Farbe auswählen"
 
-#, c-format
 msgid "Select Interface Font"
 msgstr "Schriftart wählen"
 
@@ -14274,9 +14166,10 @@
 msgstr "Senden-Knopf für das Gesprächsfenster."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Fügt einen Senden-Knopf zum Eingabefeld des Gesprächsfensters hinzu. Die ist "
 "für Fälle gedacht, wo keine Tastatur vorhanden ist."
@@ -14481,7 +14374,6 @@
 msgid "Timestamp Format Options"
 msgstr "Zeitstempelformat-Optionen"
 
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Erzwinge 24-Stunden Zeitformat"
 
@@ -14607,8 +14499,9 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Optionen für Pidgin unter Windows."
 
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+#, fuzzy
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Bietet spezielle Optionen für Windows-Pidgin, wie Buddy-Listen-Docking."