changeset 5116:c081a81ee013

[gaim-migrate @ 5479] Bjoern Voigt writes: "I have prepared some updates and patches: 1) File i18n5-de.patch - updated German translation 2) File i18n5.patch - new files in po/POTFILES.in - new strings marked for translation 3) File i18n5-accelgroup.patch - keyboard accelerators for conversation window 4) File i18n5-gaim-remote.patch - i18n support for gaim-remote.c - correct handling of "--help" option" committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sat, 12 Apr 2003 23:31:41 +0000
parents 5ec912df7a18
children be43e51c523c
files plugins/chkmail.c po/POTFILES.in po/de.po src/buddy.c src/gaim-remote.c src/gtkconv.c
diffstat 6 files changed, 1628 insertions(+), 1326 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/chkmail.c	Sat Apr 12 01:53:54 2003 +0000
+++ b/plugins/chkmail.c	Sat Apr 12 23:31:41 2003 +0000
@@ -86,7 +86,7 @@
 
         while (list) {
                 w = (GtkWidget *)list->data;
-                if (!strcmp(GTK_LABEL(GTK_BIN(w)->child)->label, "Mail Server")) {
+                if (!strcmp(GTK_LABEL(GTK_BIN(w)->child)->label, _("Mail Server"))) {
                         gtk_tree_remove_items(GTK_TREE(buddies), list);
 			list = GTK_TREE(buddies)->children;
                         if (!list)
@@ -109,7 +109,7 @@
 
 	while (list) {
 		w = (GtkWidget *)list->data;
-		if (!strcmp(GTK_LABEL(GTK_BIN(w)->child)->label, "Mail Server")) {
+		if (!strcmp(GTK_LABEL(GTK_BIN(w)->child)->label, _("Mail Server"))) {
 			gtk_tree_remove_items(GTK_TREE(buddies), list);
 			list = GTK_TREE(buddies)->children;
 			if (!list)
@@ -118,7 +118,7 @@
 		list = list->next;
 	}
 
-	item = gtk_tree_item_new_with_label("Mail Server");
+	item = gtk_tree_item_new_with_label(_("Mail Server"));
 	tree = gtk_tree_new();
 	gtk_widget_show(item);
 	gtk_widget_show(tree);
@@ -128,7 +128,7 @@
 
 	buf = g_malloc(BUF_LONG);
 
-	g_snprintf(buf, BUF_LONG, "%s (%d new/%d total)", mailhost, lastnum - orig, lastnum);
+	g_snprintf(buf, BUF_LONG, _("%s (%d new/%d total)"), mailhost, lastnum - orig, lastnum);
 	item = gtk_tree_item_new_with_label(buf);
 	g_free(buf);
 
@@ -200,9 +200,9 @@
 }
 
 char *name() {
-	return "Check Mail";
+	return _("Check Mail");
 }
 
 char *description() {
-	return "Check email every X seconds.\n";
+	return _("Check email every X seconds.\n");
 }
--- a/po/POTFILES.in	Sat Apr 12 01:53:54 2003 +0000
+++ b/po/POTFILES.in	Sat Apr 12 23:31:41 2003 +0000
@@ -42,6 +42,7 @@
 plugins/win32/transparency/win2ktrans.c
 plugins/win32/winprefs/winprefs.c
 src/protocols/gg/common.c
+plugins/chkmail.c
 src/protocols/gg/gg.c
 src/protocols/gg/libgg.c
 src/protocols/icq/chatsession.c
@@ -239,3 +240,6 @@
 src/win32/untar.c
 src/win32/win32dep.c
 src/win32/wspell.c
+src/pounce.c
+src/win_gaim.c
+src/gtkpounce.c
--- a/po/de.po	Sat Apr 12 01:53:54 2003 +0000
+++ b/po/de.po	Sat Apr 12 23:31:41 2003 +0000
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2003-03-19 22:07+0100\n"
-"PO-Revision-Date: 2003-03-19 22:08+0100\n"
+"POT-Creation-Date: 2003-04-12 20:34+0200\n"
+"PO-Revision-Date: 2003-04-07 22:17+0200\n"
 "Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: de <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,59 +24,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plugins/docklet/docklet.c:97 src/multi.c:279 src/win32/systray.c:295
+#: plugins/docklet/docklet.c:95 src/multi.c:284 src/win32/systray.c:296
 msgid "Auto-login"
 msgstr "Auto-Login"
 
-#: plugins/docklet/docklet.c:102
+#: plugins/docklet/docklet.c:98
 msgid "New Message.."
 msgstr "Neue Nachricht.."
 
 # vgl. "Join Chat"
-#: plugins/docklet/docklet.c:103
+#: plugins/docklet/docklet.c:99
 msgid "Join A Chat..."
 msgstr "Einen Chat betreten..."
 
-#: plugins/docklet/docklet.c:134
+#: plugins/docklet/docklet.c:130
 msgid "New..."
 msgstr "Neu..."
 
-#: plugins/docklet/docklet.c:138 src/protocols/gg/gg.c:71
-#: src/protocols/jabber/jabber.c:1147 src/protocols/oscar/oscar.c:2689
-#: src/protocols/oscar/oscar.c:4353 src/protocols/oscar/oscar.c:5462
-#: src/buddy.c:1053 src/prefs.c:1044
+#: plugins/docklet/docklet.c:134 src/protocols/gg/gg.c:71
+#: src/protocols/jabber/jabber.c:1159 src/protocols/jabber/jabber.c:3348
+#: src/protocols/jabber/jabber.c:3395 src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:4394 src/protocols/oscar/oscar.c:5489
+#: src/buddy.c:1281 src/gtkpounce.c:500 src/prefs.c:1057
 msgid "Away"
 msgstr "Abwesend"
 
-#: plugins/docklet/docklet.c:144 src/away.c:511
+#: plugins/docklet/docklet.c:140 src/away.c:511
 msgid "Back"
 msgstr "Zurück"
 
-#: plugins/docklet/docklet.c:152
+#: plugins/docklet/docklet.c:148
 msgid "Mute Sounds"
 msgstr "Klänge"
 
-#: plugins/docklet/docklet.c:157
+#: plugins/docklet/docklet.c:153
 msgid "File Transfers..."
 msgstr "Dateitransfers..."
 
-#: plugins/docklet/docklet.c:158
+#: plugins/docklet/docklet.c:154
 msgid "Accounts..."
 msgstr "Konten..."
 
-#: plugins/docklet/docklet.c:159
+#: plugins/docklet/docklet.c:155
 msgid "Preferences..."
 msgstr "Einstellungen..."
 
-#: plugins/docklet/docklet.c:168 src/win32/systray.c:118
+#: plugins/docklet/docklet.c:164 src/win32/systray.c:119
 msgid "Signoff"
 msgstr "Abmelden"
 
-#: plugins/docklet/docklet.c:174
+#: plugins/docklet/docklet.c:168
 msgid "Quit"
 msgstr "Beenden"
 
-#: plugins/docklet/docklet.c:481
+#: plugins/docklet/docklet.c:443
 msgid "Tray Icon Configuration"
 msgstr "Tray-Icon Konfiguration"
 
@@ -84,15 +85,15 @@
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
 #. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
 #. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
-#: plugins/docklet/docklet.c:490
+#: plugins/docklet/docklet.c:452
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "Verstecke neue Nachrichten bis das Docklet-Icon angeklickt wurde"
 
-#: plugins/docklet/docklet.c:502 plugins/docklet/docklet.c:511
+#: plugins/docklet/docklet.c:464 plugins/docklet/docklet.c:473
 msgid "System Tray Icon"
 msgstr "System-Tray Icon"
 
-#: plugins/docklet/docklet.c:504 plugins/docklet/docklet.c:515
+#: plugins/docklet/docklet.c:466 plugins/docklet/docklet.c:477
 msgid ""
 "Interacts with a Notification Area applet (in GNOME or KDE, for example) to "
 "display the current status of Gaim, allow fast access to commonly used "
@@ -105,18 +106,6 @@
 "Anmeldefensters aufzurufen. Außerdem erlaubt es, neue Nachrichten "
 "zwischenzuspeichern, bis das Icon angeklickt wurde, ähnlich wie bei ICQ."
 
-#: plugins/ticker/ticker.c:95
-msgid "Gaim - Buddy Ticker"
-msgstr "Gaim - Buddy-Ticker"
-
-#: plugins/ticker/ticker.c:389 plugins/ticker/ticker.c:415
-msgid "Buddy Ticker"
-msgstr "Buddy-Ticker"
-
-#: plugins/ticker/ticker.c:393 plugins/ticker/ticker.c:417
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "Eine horizontal scrollende Version der Buddy-Liste."
-
 #: plugins/autorecon.c:58
 msgid "Autoreconnect"
 msgstr "Automatisch Neuverbinden"
@@ -129,51 +118,51 @@
 msgid "Auto Reconnect"
 msgstr "Automatisch Neuverbinden"
 
-#: plugins/chatlist.c:78 src/buddy_chat.c:264
+#: plugins/chatlist.c:74 src/buddy_chat.c:268
 msgid "Buddy Chat"
 msgstr "Buddy-Chat"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:358
-#: plugins/chatlist.c:360
+#: plugins/chatlist.c:162 plugins/chatlist.c:164 plugins/chatlist.c:347
+#: plugins/chatlist.c:349
 msgid "Gaim Chat"
 msgstr "Gaim - Chat"
 
-#: plugins/chatlist.c:309
+#: plugins/chatlist.c:305
 msgid "Chat Rooms"
 msgstr "Chaträume"
 
-#: plugins/chatlist.c:321
+#: plugins/chatlist.c:316
 msgid "Refresh"
 msgstr "Erneuern"
 
-#: plugins/chatlist.c:322 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2532 src/dialogs.c:2192 src/gtkconv.c:772
-#: src/gtkconv.c:2604 src/gtkconv.c:3717 src/prpl.c:733
+#: plugins/chatlist.c:317 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/oscar/oscar.c:2556 src/dialogs.c:2163 src/gtkconv.c:794
+#: src/gtkconv.c:2631 src/gtkconv.c:3766 src/prpl.c:737
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: plugins/chatlist.c:323 src/gtkconv.c:770 src/gtkconv.c:2610
-#: src/gtkconv.c:3708
+#: plugins/chatlist.c:318 src/gtkconv.c:792 src/gtkconv.c:2637
+#: src/gtkconv.c:3757
 msgid "Remove"
 msgstr "Entfernen"
 
-#: plugins/chatlist.c:339
+#: plugins/chatlist.c:330
 msgid "List of available chats"
 msgstr "Liste der verfügbaren Chaträume"
 
-#: plugins/chatlist.c:349
+#: plugins/chatlist.c:339
 msgid "List of subscribed chats"
 msgstr "Liste der abbonierten Chaträume"
 
-#: plugins/chatlist.c:413 plugins/chatlist.c:423
+#: plugins/chatlist.c:400 plugins/chatlist.c:410
 msgid "Chat List"
 msgstr "Chat-Liste"
 
-#: plugins/chatlist.c:415
+#: plugins/chatlist.c:402
 msgid "Allows you to add chat rooms to your buddy list."
 msgstr "Erlaubt Ihren, Chat-Räume in die Buddy-Liste einzufügen."
 
-#: plugins/chatlist.c:428
+#: plugins/chatlist.c:415
 msgid ""
 "Allows you to add chat rooms to your buddy list. Click the configure button "
 "to choose which rooms."
@@ -181,6 +170,23 @@
 "Erlaubt Ihnen, Chat-Räume zu Ihrer Buddy-Liste hinzuzufügen. Klicken Sie auf "
 "den Button \"Chat-Liste\", um die Räume auszuwählen."
 
+#: plugins/chkmail.c:89 plugins/chkmail.c:112 plugins/chkmail.c:121
+msgid "Mail Server"
+msgstr "Mailserver"
+
+#: plugins/chkmail.c:131
+#, c-format
+msgid "%s (%d new/%d total)"
+msgstr "%s (%d neu/%d insgesamt)"
+
+#: plugins/chkmail.c:203
+msgid "Check Mail"
+msgstr "Prüfe Mail"
+
+#: plugins/chkmail.c:207
+msgid "Check email every X seconds.\n"
+msgstr "Prüfe Mail alle X Sekunden.\n"
+
 #: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr "Eigenschaften der Gnome Börsentickers"
@@ -240,7 +246,7 @@
 msgid "Idle Time"
 msgstr "Leerlaufzeit"
 
-#: plugins/idle.c:107 src/prefs.c:909
+#: plugins/idle.c:107
 msgid "Set"
 msgstr "Setzen"
 
@@ -256,81 +262,81 @@
 msgid "_Set"
 msgstr "_Setzen"
 
-#: plugins/notify.c:428
+#: plugins/notify.c:440
 msgid "Unable to write to config file"
 msgstr "Kann Konfigurationsdatei nicht schreiben"
 
-#: plugins/notify.c:428
+#: plugins/notify.c:440
 msgid "Notify plugin"
 msgstr "Benachrichtigungs-Plugin"
 
-#: plugins/notify.c:586 plugins/notify.c:595
+#: plugins/notify.c:598 plugins/notify.c:607
 msgid "Message Notification"
 msgstr "Benachrichtigung über Nachrichten"
 
-#: plugins/notify.c:588 plugins/notify.c:599
+#: plugins/notify.c:600 plugins/notify.c:611
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Gibt Ihnen eine Reihe von Möglichkeiten, über ungelesene Nachrichten "
 "benachrichtigt zu werden."
 
-#: plugins/notify.c:609
+#: plugins/notify.c:621
 msgid "Notify For"
 msgstr "Benachrichtigung für"
 
-#: plugins/notify.c:610
+#: plugins/notify.c:622
 msgid "_IM windows"
 msgstr "_IM-Fenster"
 
-#: plugins/notify.c:615
+#: plugins/notify.c:627
 msgid "_Chat windows"
 msgstr "_Chat-Fenster"
 
 #. --------------
-#: plugins/notify.c:621
+#: plugins/notify.c:633
 msgid "Notification Methods"
 msgstr "Benachrichtigungsmethoden"
 
-#: plugins/notify.c:624
+#: plugins/notify.c:636
 msgid "Prepend _string into window title (hit enter to save):"
 msgstr ""
 "Stellen Sie den _String an den Fenstertitel vor (Drücken Sie ENTER, um "
 "abzuspeichern):"
 
-#: plugins/notify.c:635
+#: plugins/notify.c:647
 msgid "_Quote window title"
 msgstr "Fentertitel in _Anführungsstrichen"
 
-#: plugins/notify.c:640
+#: plugins/notify.c:652
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "Setze den Fenstermanager \"_URGENT\"-Hinweis"
 
-#: plugins/notify.c:645
+#: plugins/notify.c:657
 msgid "Insert c_ount of new messages into window title"
 msgstr "Füge _Anzahl der neuen Nachrichten in den Fenstertitel ein"
 
-#: plugins/notify.c:650
+#: plugins/notify.c:662
 msgid "_Notify even if conversation is in focus"
 msgstr "_Benachrichtige auch dann, wenn das Gespräch im Focus ist"
 
 #. --------------
-#: plugins/notify.c:656
+#: plugins/notify.c:668
 msgid "Notification Removal"
 msgstr "Entfernung von Benachrichtigungen"
 
-#: plugins/notify.c:657
+#: plugins/notify.c:669
 msgid "Remove when conversation window gains _focus"
 msgstr "Entferne, wenn das Gesprächsfenster den _Focus verliert"
 
-#: plugins/notify.c:662
+#: plugins/notify.c:674
 msgid "Remove when conversation window _receives click"
 msgstr "Entfe_rne, wenn das Gesprächsfenster geklickt wird"
 
-#: plugins/notify.c:667
+#: plugins/notify.c:679
 msgid "Remove when _typing in conversation window"
 msgstr "Entferne, wenn im Gesprächsfenster ge_tippt wird"
 
-#: plugins/notify.c:672
+#: plugins/notify.c:684
 msgid "Appl_y"
 msgstr "_Anwenden"
 
@@ -388,41 +394,55 @@
 msgstr "Fügt iChat-ähnliche Zeitstempel alle N Minuten in die Gespräche ein"
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:212
+#: plugins/gestures/gestures.c:213
 msgid "Mouse Gestures Configuration"
 msgstr "Maus-Gestik Konfiguration"
 
-#: plugins/gestures/gestures.c:219
+#: plugins/gestures/gestures.c:220
 msgid "Middle mouse button"
 msgstr "Mittlerer Mausbutton"
 
-#: plugins/gestures/gestures.c:224
+#: plugins/gestures/gestures.c:225
 msgid "Right mouse button"
 msgstr "Rechter Mausbutton"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:236
+#: plugins/gestures/gestures.c:237
 msgid "_Visual gesture display"
 msgstr "_Visuelle Gestik-Anzeige"
 
-#: plugins/gestures/gestures.c:252 plugins/gestures/gestures.c:270
+#: plugins/gestures/gestures.c:253 plugins/gestures/gestures.c:272
 msgid "Mouse Gestures"
 msgstr "Maus-Gestiken"
 
-#: plugins/gestures/gestures.c:255 plugins/gestures/gestures.c:276
+#: plugins/gestures/gestures.c:256 plugins/gestures/gestures.c:278
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
 "\n"
 "Drag down and then to the right to close a conversation.\n"
 "Drag up and then to the left to switch to the previous conversation.\n"
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
 "Erlaubt die Unterstützung von Maus-Gestiken im Gesprächsfenster.\n"
+"Ziehen Sie den mittleren Maus-Button für bestimmte Aktionen:\n"
 "\n"
 "Herunterziehen und dann nach rechts, um ein Gespräch zu beenden.\n"
 "Hochziehen und dann links, um auf ein voriges Gespräch zu wechseln.\n"
 "Hochziehen und dann rechts, um zum nächsten Gespräche zu wechseln."
 
+#: plugins/ticker/ticker.c:95
+msgid "Gaim - Buddy Ticker"
+msgstr "Gaim - Buddy-Ticker"
+
+#: plugins/ticker/ticker.c:411 plugins/ticker/ticker.c:437
+msgid "Buddy Ticker"
+msgstr "Buddy-Ticker"
+
+#: plugins/ticker/ticker.c:415 plugins/ticker/ticker.c:439
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "Eine horizontal scrollende Version der Buddy-Liste."
+
 #: plugins/win32/transparency/win2ktrans.c:123
 #: plugins/win32/transparency/win2ktrans.c:432
 #: plugins/win32/transparency/win2ktrans.c:466
@@ -459,7 +479,7 @@
 msgstr "Zeige _Schiebebalken im IM-Fenster"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:449 src/prefs.c:546
+#: plugins/win32/transparency/win2ktrans.c:449 src/prefs.c:572
 msgid "Buddy List Window"
 msgstr "Buddy-Listen-Fenster"
 
@@ -488,9 +508,9 @@
 msgid "_Start Gaim on Windows startup"
 msgstr "Starte Gaim beim Windows-Start"
 
-#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1155
-#: src/protocols/msn/msn.c:1515 src/protocols/msn/msn.c:1621
-#: src/protocols/yahoo/yahoo.c:1233 src/protocols/yahoo/yahoo.c:1312
+#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1167
+#: src/protocols/msn/msn.c:1515 src/protocols/msn/msn.c:1620
+#: src/protocols/yahoo/yahoo.c:1245 src/protocols/yahoo/yahoo.c:1324
 msgid "Available"
 msgstr "Erreichbar"
 
@@ -502,10 +522,11 @@
 msgid "Away for friends only"
 msgstr "Nur für Freunde abwesend"
 
-#: src/protocols/gg/gg.c:73 src/protocols/oscar/oscar.c:2693
-#: src/protocols/oscar/oscar.c:4340 src/protocols/oscar/oscar.c:4368
-#: src/protocols/oscar/oscar.c:5467 src/protocols/yahoo/yahoo.c:1050
-#: src/protocols/yahoo/yahoo.c:1255 src/protocols/yahoo/yahoo.c:1322
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3351
+#: src/protocols/jabber/jabber.c:3407 src/protocols/oscar/oscar.c:2717
+#: src/protocols/oscar/oscar.c:4382 src/protocols/oscar/oscar.c:4409
+#: src/protocols/oscar/oscar.c:5494 src/protocols/yahoo/yahoo.c:1062
+#: src/protocols/yahoo/yahoo.c:1267 src/protocols/yahoo/yahoo.c:1334
 msgid "Invisible"
 msgstr "Unsichtbar"
 
@@ -621,11 +642,11 @@
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4840 src/gtkft.c:1003
+#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4886 src/gtkft.c:1004
 msgid "Yes"
 msgstr "Ja"
 
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4840 src/gtkft.c:1004
+#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4886 src/gtkft.c:1005
 msgid "No"
 msgstr "Nein"
 
@@ -655,7 +676,7 @@
 msgstr "Geschlecht"
 
 #. Line 5
-#: src/protocols/gg/gg.c:726 src/dialogs.c:1772 src/dialogs.c:2442
+#: src/protocols/gg/gg.c:726 src/dialogs.c:1762 src/dialogs.c:2396
 msgid "City"
 msgstr "Stadt"
 
@@ -759,9 +780,9 @@
 msgid "Directory Search"
 msgstr "Verzeichnissuche"
 
-#: src/protocols/gg/gg.c:1185 src/protocols/jabber/jabber.c:4169
-#: src/protocols/oscar/oscar.c:5680 src/protocols/toc/toc.c:1437
-#: src/dialogs.c:1878 src/dialogs.c:1888
+#: src/protocols/gg/gg.c:1185 src/protocols/jabber/jabber.c:4223
+#: src/protocols/oscar/oscar.c:5682 src/protocols/toc/toc.c:1446
+#: src/dialogs.c:1869 src/dialogs.c:1878
 msgid "Change Password"
 msgstr "Paßwort ändern"
 
@@ -790,12 +811,12 @@
 "Verbindungsfehlers zum Verzeichnis-Server nicht lesen. Bitte versuchten Sie "
 "es später nochmal."
 
-#: src/protocols/gg/gg.c:1319 src/protocols/icq/gaim_icq.c:497
-#: src/protocols/oscar/oscar.c:3780
+#: src/protocols/gg/gg.c:1323 src/protocols/icq/gaim_icq.c:497
+#: src/protocols/oscar/oscar.c:3820
 msgid "Nick:"
 msgstr "Spitzname:"
 
-#: src/protocols/gg/gg.c:1320
+#: src/protocols/gg/gg.c:1324
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Benutzer"
 
@@ -805,14 +826,14 @@
 "Gaim stellte einen Fehler bei der Kommunikation mit dem ICQ-Server fest."
 
 #. Cancel button.
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1355
-#: src/protocols/oscar/oscar.c:2298 src/protocols/oscar/oscar.c:2358
-#: src/protocols/oscar/oscar.c:5316 src/protocols/toc/toc.c:2031
-#: src/buddy_chat.c:303 src/dialogs.c:452 src/dialogs.c:1830
-#: src/dialogs.c:1953 src/dialogs.c:2018 src/dialogs.c:2181 src/dialogs.c:2376
-#: src/dialogs.c:2553 src/dialogs.c:3210 src/dialogs.c:3409 src/dialogs.c:3575
-#: src/dialogs.c:4076 src/dialogs.c:4749 src/gtkft.c:1097 src/multi.c:1364
-#: src/multi.c:1714 src/prpl.c:313 src/prpl.c:733 src/server.c:1065
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1362
+#: src/protocols/oscar/oscar.c:2322 src/protocols/oscar/oscar.c:2382
+#: src/protocols/oscar/oscar.c:5369 src/protocols/toc/toc.c:2041
+#: src/buddy_chat.c:307 src/dialogs.c:458 src/dialogs.c:466 src/dialogs.c:1819
+#: src/dialogs.c:1930 src/dialogs.c:1990 src/dialogs.c:2152 src/dialogs.c:2338
+#: src/dialogs.c:2487 src/dialogs.c:3130 src/dialogs.c:3529 src/dialogs.c:4033
+#: src/dialogs.c:4605 src/gtkft.c:1098 src/multi.c:1468 src/multi.c:1850
+#: src/prpl.c:320 src/prpl.c:737 src/server.c:1064
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -821,15 +842,15 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "Der Benutzer %s (%s%s%s%s%s) möchte von Ihnen authorisiert werden."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1644
-#: src/protocols/msn/msn.c:514 src/protocols/oscar/oscar.c:2470
-#: src/protocols/oscar/oscar.c:4874
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1655
+#: src/protocols/msn/msn.c:514 src/protocols/oscar/oscar.c:2494
+#: src/protocols/oscar/oscar.c:4920
 msgid "Authorize"
 msgstr "Authorisieren"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1644
-#: src/protocols/msn/msn.c:514 src/protocols/oscar/oscar.c:2470
-#: src/protocols/oscar/oscar.c:4874 src/dialogs.c:2180
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1655
+#: src/protocols/msn/msn.c:514 src/protocols/oscar/oscar.c:2494
+#: src/protocols/oscar/oscar.c:4920 src/dialogs.c:2151
 msgid "Deny"
 msgstr "Sperren"
 
@@ -837,9 +858,9 @@
 msgid "Send message through server"
 msgstr "Nachricht mittels Server senden"
 
-#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2248
-#: src/protocols/jabber/jabber.c:2280 src/protocols/jabber/jabber.c:4087
-#: src/protocols/jabber/jabber.c:4133 src/protocols/msn/msn.c:1178
+#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2273
+#: src/protocols/jabber/jabber.c:2305 src/protocols/jabber/jabber.c:4141
+#: src/protocols/jabber/jabber.c:4187 src/protocols/msn/msn.c:1178
 #: src/protocols/msn/msn.c:1208
 msgid "Unable to connect"
 msgstr "Verbindung kann nicht hergestellt werden"
@@ -852,7 +873,7 @@
 msgid "Gaim User"
 msgstr "Gaim-Benutzer"
 
-#: src/protocols/irc/irc.c:196
+#: src/protocols/irc/irc.c:200
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -861,82 +882,84 @@
 "Kodierungs-Option im Acount-Editor"
 
 # Direct IM erwähnen?
-#: src/protocols/irc/irc.c:496 src/protocols/irc/irc.c:2475
+#: src/protocols/irc/irc.c:500 src/protocols/irc/irc.c:2504
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "DCC-Chat mit %s geschlossen"
 
 # Direct IM erwähnen?
-#: src/protocols/irc/irc.c:549 src/protocols/irc/irc.c:2484
+#: src/protocols/irc/irc.c:553 src/protocols/irc/irc.c:2513
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr "DCC-Chat mit %s hergestellt"
 
-#: src/protocols/irc/irc.c:683
+#: src/protocols/irc/irc.c:687
 msgid "No topic is set"
 msgstr "Kein Thema gesetzt"
 
-#: src/protocols/irc/irc.c:704 src/protocols/irc/irc.c:1638
+#: src/protocols/irc/irc.c:708 src/protocols/irc/irc.c:1645
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s hat das Thema abgeändert auf: %s</B>"
 
-#: src/protocols/irc/irc.c:749
+#: src/protocols/irc/irc.c:753
 #, c-format
 msgid "-:- mode/%s [%c%c %s] by %s"
 msgstr "-:- Modus/%s [%c%c %s] von %s"
 
 #. RPL_REHASHING
-#: src/protocols/irc/irc.c:1082
+#: src/protocols/irc/irc.c:1086
 msgid "Rehashing server"
 msgstr "Sortiere Server neu"
 
-#: src/protocols/irc/irc.c:1082 src/protocols/irc/irc.c:1531
+#: src/protocols/irc/irc.c:1086 src/protocols/irc/irc.c:1538
 msgid "IRC Operator"
 msgstr "IRC-Operator"
 
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1085
+#: src/protocols/irc/irc.c:1089
 msgid "No such nick/channel"
 msgstr "Es gibt keinen solchen Spitznamen/Kanal"
 
-#: src/protocols/irc/irc.c:1085 src/protocols/irc/irc.c:1088
-#: src/protocols/irc/irc.c:1090 src/protocols/irc/irc.c:1093
-#: src/protocols/irc/irc.c:1489
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1092
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1496
 msgid "IRC Error"
 msgstr "Chat-Fehler"
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1088
+#: src/protocols/irc/irc.c:1092
 msgid "No such server"
 msgstr "Dieser Server existiert nicht"
 
+#. ERR_NOMOTD
+#. drop it - bringing up dialog for NOMOTD is annoying
 #. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1090
+#: src/protocols/irc/irc.c:1097
 msgid "No nickname given"
 msgstr "Kein Spitzname angegeben"
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1093
+#: src/protocols/irc/irc.c:1100
 msgid "You're not an IRC operator!"
 msgstr "Sie sind kein ICQ-Operator"
 
-#: src/protocols/irc/irc.c:1096
+#: src/protocols/irc/irc.c:1103
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr ""
 "Dieser Nickname wird schon benutzt. Bitte geben Sie einen neuen Nicknamen ein"
 
-#: src/protocols/irc/irc.c:1318 src/protocols/irc/irc.c:1324
-#: src/protocols/irc/irc.c:1330 src/protocols/irc/irc.c:1344
+#: src/protocols/irc/irc.c:1325 src/protocols/irc/irc.c:1331
+#: src/protocols/irc/irc.c:1337 src/protocols/irc/irc.c:1351
 msgid "IRC CTCP info"
 msgstr "ICC CTCP Information"
 
-#: src/protocols/irc/irc.c:1354
+#: src/protocols/irc/irc.c:1361
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr "%s möchte einen DCC-Chat einrichten"
 
-#: src/protocols/irc/irc.c:1355
+#: src/protocols/irc/irc.c:1362
 msgid ""
 "This requires a direct connection to be established between the two "
 "computers.  Messages sent will not pass through the IRC server"
@@ -944,71 +967,71 @@
 "Dies erfordert eine direkte Verbindung zwischen den beiden Computern. "
 "Gesendete Nachrichten werden nicht durch den IRC-Server geschleust."
 
-#: src/protocols/irc/irc.c:1355 src/protocols/oscar/oscar.c:2298
-#: src/protocols/oscar/oscar.c:5316
+#: src/protocols/irc/irc.c:1362 src/protocols/oscar/oscar.c:2322
+#: src/protocols/oscar/oscar.c:5369
 msgid "Connect"
 msgstr "Verbunden"
 
-#: src/protocols/irc/irc.c:1428 src/protocols/msn/msn.c:151
+#: src/protocols/irc/irc.c:1435 src/protocols/msn/msn.c:151
 #: src/protocols/msn/msn.c:523 src/protocols/msn/msn.c:1029
 msgid "Unable to write"
 msgstr "Schreiben nicht möglich"
 
-#: src/protocols/irc/irc.c:1487
+#: src/protocols/irc/irc.c:1494
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "Sie wurden hinausgeworfen von %s: %s"
 
-#: src/protocols/irc/irc.c:1492
+#: src/protocols/irc/irc.c:1499
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "Hinausgeworfen durch %s: %s"
 
-#: src/protocols/irc/irc.c:1548 src/protocols/irc/irc.c:2781
+#: src/protocols/irc/irc.c:1555 src/protocols/irc/irc.c:2810
 msgid "CTCP ClientInfo"
 msgstr "CTCP Client-Information"
 
-#: src/protocols/irc/irc.c:1554 src/protocols/irc/irc.c:2787
+#: src/protocols/irc/irc.c:1561 src/protocols/irc/irc.c:2816
 msgid "CTCP UserInfo"
 msgstr "CTCP Benutzer-Info"
 
-#: src/protocols/irc/irc.c:1560 src/protocols/irc/irc.c:2793
+#: src/protocols/irc/irc.c:1567 src/protocols/irc/irc.c:2822
 msgid "CTCP Version"
 msgstr "CTCP-Version"
 
-#: src/protocols/irc/irc.c:1587 src/protocols/irc/irc.c:2799
+#: src/protocols/irc/irc.c:1594 src/protocols/irc/irc.c:2828
 msgid "CTCP Ping"
 msgstr "CTCP-Ping"
 
-#: src/protocols/irc/irc.c:1824 src/protocols/oscar/oscar.c:595
+#: src/protocols/irc/irc.c:1847 src/protocols/oscar/oscar.c:596
 #: src/protocols/toc/toc.c:255
 #, c-format
 msgid "Signon: %s"
 msgstr "Anmeldung: %s"
 
-#: src/protocols/irc/irc.c:2080
+#: src/protocols/irc/irc.c:2103
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "Das Thema für %s ist %s"
 
-#: src/protocols/irc/irc.c:2177
+#: src/protocols/irc/irc.c:2200
 #, c-format
 msgid "You have left %s"
 msgstr "Sie haben %s verlassen"
 
-#: src/protocols/irc/irc.c:2178
+#: src/protocols/irc/irc.c:2201
 msgid "IRC Part"
 msgstr "IRC Part"
 
-#: src/protocols/irc/irc.c:2233
+#: src/protocols/irc/irc.c:2256
 msgid "<I>Requesting DCC CHAT</I>"
 msgstr "<I>Anfrage nach DCC Chat</I>"
 
-#: src/protocols/irc/irc.c:2250
+#: src/protocols/irc/irc.c:2273
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr "<B>Operator-Kommandos:<BR>Starte das Neusortieren</B>"
 
-#: src/protocols/irc/irc.c:2255
+#: src/protocols/irc/irc.c:2278
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
@@ -1016,11 +1039,11 @@
 "<B>CTCP Kommandos:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION \n"
 "<nick><BR>PING <nick></B><BR>"
 
-#: src/protocols/irc/irc.c:2263
+#: src/protocols/irc/irc.c:2286
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr "<B>DCC Kommandos:<BR>CHAT <nick></B>"
 
-#: src/protocols/irc/irc.c:2268
+#: src/protocols/irc/irc.c:2291
 msgid ""
 "<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
 "TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
@@ -1033,42 +1056,43 @@
 "W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP CTCP for \n"
 "CTCP commands<BR>Geben Sie /HELP DCC für DCC Kommandos ein"
 
-#: src/protocols/irc/irc.c:2291
+#: src/protocols/irc/irc.c:2314
 msgid "<B>Unknown command</B>"
 msgstr "<B>Unbekanntes Kommando</B>"
 
-#: src/protocols/irc/irc.c:2351
+#: src/protocols/irc/irc.c:2374
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/protocols/irc/irc.c:2355 src/main.c:349 src/multi.c:689
+#: src/protocols/irc/irc.c:2378 src/main.c:340 src/multi.c:766
 msgid "Password:"
 msgstr "Paßwort:"
 
-#: src/protocols/irc/irc.c:2768
+#: src/protocols/irc/irc.c:2797
 msgid "DCC Chat"
 msgstr "DCC-Chat"
 
-#: src/protocols/irc/irc.c:2839 src/protocols/jabber/jabber.c:2825
-#: src/protocols/msn/msn.c:2042 src/protocols/napster/napster.c:610
+#: src/protocols/irc/irc.c:2871 src/protocols/jabber/jabber.c:2897
+#: src/protocols/jabber/jabber.c:4285 src/protocols/msn/msn.c:2047
+#: src/protocols/napster/napster.c:617
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/irc/irc.c:2845 src/protocols/jabber/jabber.c:4229
-#: src/protocols/msn/msn.c:2048 src/protocols/napster/napster.c:616
-#: src/multi.c:986
+#: src/protocols/irc/irc.c:2876 src/protocols/jabber/jabber.c:4296
+#: src/protocols/msn/msn.c:2059 src/protocols/napster/napster.c:623
+#: src/multi.c:1081
 msgid "Port:"
 msgstr "Port:"
 
-#: src/protocols/irc/irc.c:2851
+#: src/protocols/irc/irc.c:2882
 msgid "Encoding:"
 msgstr "Kodierung:"
 
-#: src/protocols/jabber/jabber.c:973
+#: src/protocols/jabber/jabber.c:986
 msgid "Unable to change password."
 msgstr "Kann das Paßwort nicht ändern"
 
-#: src/protocols/jabber/jabber.c:974
+#: src/protocols/jabber/jabber.c:987
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
@@ -1076,11 +1100,11 @@
 "Das aktuelle Paßwort, welchen Sie eingegeben haben, stimmt nicht. Ihr "
 "Paßwort wurde geändert."
 
-#: src/protocols/jabber/jabber.c:979
+#: src/protocols/jabber/jabber.c:992
 msgid "Unable to change password"
 msgstr "Kann das Paßwort nicht ändern."
 
-#: src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:993
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
@@ -1088,43 +1112,47 @@
 "Das neue Paßwort, welches Sie eingebene haben, ist dasselbe wie das aktuelle "
 "Paßwort. Ihr Paßwort bleibt gleich."
 
-#: src/protocols/jabber/jabber.c:1140 src/list.c:362 src/pounce.c:338
+#: src/protocols/jabber/jabber.c:1152 src/gtkpounce.c:234 src/list.c:440
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/protocols/jabber/jabber.c:1149
+#. once again, we don't have to put anything here
+#: src/protocols/jabber/jabber.c:1161 src/protocols/jabber/jabber.c:3347
+#: src/protocols/jabber/jabber.c:3391
 msgid "Chatty"
 msgstr "Gesprächig"
 
-#: src/protocols/jabber/jabber.c:1151
+#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/jabber.c:3349
+#: src/protocols/jabber/jabber.c:3399
 msgid "Extended Away"
 msgstr "Abwesend (erweitert)"
 
-#: src/protocols/jabber/jabber.c:1153 src/protocols/oscar/oscar.c:2683
-#: src/protocols/oscar/oscar.c:4356 src/protocols/oscar/oscar.c:5463
+#: src/protocols/jabber/jabber.c:1165 src/protocols/jabber/jabber.c:3350
+#: src/protocols/jabber/jabber.c:3403 src/protocols/oscar/oscar.c:2707
+#: src/protocols/oscar/oscar.c:4397 src/protocols/oscar/oscar.c:5490
 msgid "Do Not Disturb"
 msgstr "Nicht stören"
 
-#: src/protocols/jabber/jabber.c:1350
+#: src/protocols/jabber/jabber.c:1364
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber-Fehler %s"
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1470
 #, c-format
 msgid "Error %s: %s"
 msgstr "Fehlen %s: %s"
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1473
 msgid "Unknown Error in presence"
 msgstr "Unbekannter Fehlercode."
 
-#: src/protocols/jabber/jabber.c:1639
+#: src/protocols/jabber/jabber.c:1650
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "Der Benutzer %s möchte Sie zu seiner Buddy-Liste hinzufügen."
 
-#: src/protocols/jabber/jabber.c:1664
+#: src/protocols/jabber/jabber.c:1675
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
@@ -1132,184 +1160,182 @@
 "Der Jabber-Benutzer %s existiert nicht und wurde deshalb nicht zu Ihrem "
 "Roster hinzugefügt."
 
-#: src/protocols/jabber/jabber.c:1667
+#: src/protocols/jabber/jabber.c:1678
 msgid "No such user."
 msgstr "Kein entsprechender Benutzer"
 
-#: src/protocols/jabber/jabber.c:1757 src/protocols/msn/msn.c:541
-#: src/protocols/msn/msn.c:543 src/dialogs.c:942 src/list.c:206
+#: src/protocols/jabber/jabber.c:1769 src/protocols/msn/msn.c:541
+#: src/protocols/msn/msn.c:543 src/dialogs.c:940 src/list.c:245
 msgid "Buddies"
 msgstr "Buddies"
 
-#: src/protocols/jabber/jabber.c:1821
+#: src/protocols/jabber/jabber.c:1846
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
-#: src/protocols/jabber/jabber.c:1855
+#: src/protocols/jabber/jabber.c:1880
 msgid "Unknown login error"
 msgstr "Unbekannter Anmeldefehler"
 
-#: src/protocols/jabber/jabber.c:2202
+#: src/protocols/jabber/jabber.c:2227
 msgid "Password successfully changed."
 msgstr "Das Paßwort wurde erfolgreich geändert"
 
-#: src/protocols/jabber/jabber.c:2246 src/protocols/jabber/jabber.c:4085
+#: src/protocols/jabber/jabber.c:2271 src/protocols/jabber/jabber.c:4139
 msgid "Connection lost"
 msgstr "Verbindung abgebrochen"
 
-#: src/protocols/jabber/jabber.c:2254
+#: src/protocols/jabber/jabber.c:2279
 msgid "Connected"
 msgstr "Verbunden"
 
-#: src/protocols/jabber/jabber.c:2257
+#: src/protocols/jabber/jabber.c:2282
 msgid "Requesting Authentication Method"
 msgstr "Anfrage der Authentifizierungsmethode fehlgeschlagen"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2275 src/protocols/msn/msn.c:1199
-#: src/protocols/yahoo/yahoo.c:963
+#: src/protocols/jabber/jabber.c:2300 src/protocols/msn/msn.c:1199
+#: src/protocols/yahoo/yahoo.c:965
 msgid "Connecting"
 msgstr "Verbindungsaufbau"
 
-#: src/protocols/jabber/jabber.c:2581
+#: src/protocols/jabber/jabber.c:2625
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 "Der Benutzer %s hat eine falsche Jabber ID and wurde deshalb nicht "
 "hinzugefügt."
 
-#: src/protocols/jabber/jabber.c:2583
+#: src/protocols/jabber/jabber.c:2627
 msgid "Jabber Error"
 msgstr "Jabber-Fehler"
 
-#: src/protocols/jabber/jabber.c:2821
+#: src/protocols/jabber/jabber.c:2893
 msgid "Room:"
 msgstr "Raum:"
 
-#: src/protocols/jabber/jabber.c:2830
+#: src/protocols/jabber/jabber.c:2902
 msgid "Handle:"
 msgstr "Kürzel:"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:2926
 msgid "Unable to join chat"
 msgstr "Der Chat kann nicht betreten werden"
 
-#: src/protocols/jabber/jabber.c:3197
+#: src/protocols/jabber/jabber.c:3266
 #, c-format
 msgid "<b>Status:</b> %s%s%s"
 msgstr "<b>Status:</b> %s%s%s"
 
-#: src/protocols/jabber/jabber.c:3236
+#: src/protocols/jabber/jabber.c:3305
 msgid "View Error Msg"
 msgstr "Betrachte Fehlermeldung"
 
-#: src/protocols/jabber/jabber.c:3248 src/protocols/oscar/oscar.c:5490
-#: src/gtkconv.c:759
+#: src/protocols/jabber/jabber.c:3317 src/gtkconv.c:781
 msgid "Get Away Msg"
 msgstr "Abwesenheits-Mitteilung holen"
 
-#: src/protocols/jabber/jabber.c:3255
+#: src/protocols/jabber/jabber.c:3324
 msgid "Un-hide From"
 msgstr "Sichtbar von"
 
-#: src/protocols/jabber/jabber.c:3258
+#: src/protocols/jabber/jabber.c:3327
 msgid "Temporarily Hide From"
 msgstr "Temporär versteckt von"
 
-#: src/protocols/jabber/jabber.c:3276 src/protocols/oscar/oscar.c:5530
-#: src/buddy.c:1040
-msgid "Get Info"
-msgstr "Benutzer-Info"
-
-#: src/protocols/jabber/jabber.c:3281
-msgid "Remove From Roster"
-msgstr "Entferne vom Roster"
-
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3334
 msgid "Cancel Presence Notification"
 msgstr "Abbrechen der Anwesenheits-Benachrichtigun"
 
-#: src/protocols/jabber/jabber.c:3479
+#. state is one of our own strings. it won't be NULL.
+#: src/protocols/jabber/jabber.c:3346 src/protocols/jabber/jabber.c:3389
+#: src/protocols/oscar/oscar.c:2719 src/protocols/oscar/oscar.c:4392
+#: src/protocols/oscar/oscar.c:5488 src/protocols/yahoo/yahoo.c:1066
+#: src/multi.c:274
+msgid "Online"
+msgstr "Online"
+
+#: src/protocols/jabber/jabber.c:3528
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
-#: src/protocols/jabber/jabber.c:3480
+#: src/protocols/jabber/jabber.c:3529
 msgid "Family Name"
 msgstr "Nachname"
 
-#: src/protocols/jabber/jabber.c:3481
+#: src/protocols/jabber/jabber.c:3530
 msgid "Given Name"
 msgstr "Vorname"
 
-#: src/protocols/jabber/jabber.c:3482
+#: src/protocols/jabber/jabber.c:3531
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: src/protocols/jabber/jabber.c:3483 src/dialogs.c:2678
+#: src/protocols/jabber/jabber.c:3532 src/dialogs.c:2608
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3484
+#: src/protocols/jabber/jabber.c:3533
 msgid "Street Address"
 msgstr "Straße"
 
-#: src/protocols/jabber/jabber.c:3485
+#: src/protocols/jabber/jabber.c:3534
 msgid "Extended Address"
 msgstr "Erweiterte Adresse"
 
 # ???
-#: src/protocols/jabber/jabber.c:3486
+#: src/protocols/jabber/jabber.c:3535
 msgid "Locality"
 msgstr "Örtlichkeit"
 
-#: src/protocols/jabber/jabber.c:3487
+#: src/protocols/jabber/jabber.c:3536
 msgid "Region"
 msgstr "Bezirk"
 
-#: src/protocols/jabber/jabber.c:3488
+#: src/protocols/jabber/jabber.c:3537
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3489 src/dialogs.c:1794 src/dialogs.c:2464
+#: src/protocols/jabber/jabber.c:3538 src/dialogs.c:1784 src/dialogs.c:2414
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:3490
+#: src/protocols/jabber/jabber.c:3539
 msgid "Telephone"
 msgstr "Telefon"
 
 # Die offizielle GNOME-Übersetzung
-#: src/protocols/jabber/jabber.c:3491 src/dialogs.c:2538
+#: src/protocols/jabber/jabber.c:3540 src/dialogs.c:2472
 msgid "Email"
 msgstr "E-Mail"
 
-#: src/protocols/jabber/jabber.c:3492
+#: src/protocols/jabber/jabber.c:3541
 msgid "Organization Name"
 msgstr "Name der Organisation"
 
-#: src/protocols/jabber/jabber.c:3493
+#: src/protocols/jabber/jabber.c:3542
 msgid "Organization Unit"
 msgstr "Organisationseinheit"
 
-#: src/protocols/jabber/jabber.c:3494
+#: src/protocols/jabber/jabber.c:3543
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3495
+#: src/protocols/jabber/jabber.c:3544
 msgid "Role"
 msgstr "Funktion"
 
-#: src/protocols/jabber/jabber.c:3496
+#: src/protocols/jabber/jabber.c:3545
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: src/protocols/jabber/jabber.c:3497 src/dialogs.c:2688 src/prefs.c:392
-#: src/prefs.c:1300
+#: src/protocols/jabber/jabber.c:3546 src/dialogs.c:2618 src/prefs.c:414
+#: src/prefs.c:1312
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/protocols/jabber/jabber.c:3522
+#: src/protocols/jabber/jabber.c:3571
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -1317,28 +1343,32 @@
 "Die folgenden Punkte sind optional. Geben Sie nur die Informationen an, die "
 "Sie angeben möchten."
 
-#: src/protocols/jabber/jabber.c:3523
+#: src/protocols/jabber/jabber.c:3572
 msgid "User Identity"
 msgstr "Benutzer Identität"
 
-#: src/protocols/jabber/jabber.c:3942
+#: src/protocols/jabber/jabber.c:3996
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Jabber vCard bearbeiten"
 
-#: src/protocols/jabber/jabber.c:4015
+#: src/protocols/jabber/jabber.c:4069
 msgid "Server Registration successful!"
 msgstr "Server-Anmeldung erfolgreich!"
 
-#: src/protocols/jabber/jabber.c:4042
+#: src/protocols/jabber/jabber.c:4096
 msgid "Unknown registration error"
 msgstr "Unbekannter Fehler bei der Anmeldung"
 
-#: src/protocols/jabber/jabber.c:4155 src/protocols/oscar/oscar.c:5673
-#: src/protocols/toc/toc.c:1425 src/dialogs.c:1977
+#: src/protocols/jabber/jabber.c:4209 src/protocols/oscar/oscar.c:5675
+#: src/protocols/toc/toc.c:1434 src/dialogs.c:1954
 msgid "Set User Info"
 msgstr "Benutzer-Info setzen"
 
-#: src/protocols/jabber/jabber.c:4235
+#: src/protocols/jabber/jabber.c:4291
+msgid "Resource:"
+msgstr "Ressource"
+
+#: src/protocols/jabber/jabber.c:4302
 msgid "Connect Server:"
 msgstr "Verbindungsserver:"
 
@@ -1406,7 +1436,7 @@
 msgid "Required fields missing"
 msgstr "Notwendige Felder fehlen"
 
-#: src/protocols/msn/msn.c:115 src/protocols/oscar/oscar.c:363
+#: src/protocols/msn/msn.c:115 src/protocols/oscar/oscar.c:364
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
 
@@ -1492,14 +1522,14 @@
 
 #: src/protocols/msn/msn.c:291 src/protocols/msn/msn.c:313
 #: src/protocols/msn/msn.c:1445 src/protocols/msn/msn.c:1567
-#: src/protocols/msn/msn.c:1583 src/protocols/msn/msn.c:1699
-#: src/protocols/msn/msn.c:1712 src/protocols/msn/msn.c:1738
-#: src/protocols/msn/msn.c:1785 src/protocols/msn/msn.c:1803
-#: src/protocols/msn/msn.c:1837 src/protocols/msn/msn.c:1868
-#: src/protocols/msn/msn.c:1904 src/protocols/msn/msn.c:1911
-#: src/protocols/msn/msn.c:1924 src/protocols/msn/msn.c:1932
-#: src/protocols/msn/msn.c:1958 src/protocols/msn/msn.c:1967
-#: src/protocols/msn/msn.c:1980 src/protocols/msn/msn.c:1988
+#: src/protocols/msn/msn.c:1583 src/protocols/msn/msn.c:1701
+#: src/protocols/msn/msn.c:1714 src/protocols/msn/msn.c:1740
+#: src/protocols/msn/msn.c:1787 src/protocols/msn/msn.c:1805
+#: src/protocols/msn/msn.c:1839 src/protocols/msn/msn.c:1870
+#: src/protocols/msn/msn.c:1906 src/protocols/msn/msn.c:1913
+#: src/protocols/msn/msn.c:1926 src/protocols/msn/msn.c:1934
+#: src/protocols/msn/msn.c:1960 src/protocols/msn/msn.c:1969
+#: src/protocols/msn/msn.c:1982 src/protocols/msn/msn.c:1990
 msgid "Write error"
 msgstr "Schreibfehler"
 
@@ -1585,31 +1615,31 @@
 msgstr "Synchronisiere mit dem Server"
 
 #: src/protocols/msn/msn.c:1516 src/protocols/msn/msn.c:1543
-#: src/protocols/msn/msn.c:1613
+#: src/protocols/msn/msn.c:1612
 msgid "Away From Computer"
 msgstr "Weg vom Computer"
 
 #: src/protocols/msn/msn.c:1517 src/protocols/msn/msn.c:1545
-#: src/protocols/msn/msn.c:1611 src/protocols/yahoo/yahoo.c:1032
-#: src/protocols/yahoo/yahoo.c:1237 src/protocols/yahoo/yahoo.c:1313
+#: src/protocols/msn/msn.c:1610 src/protocols/yahoo/yahoo.c:1044
+#: src/protocols/yahoo/yahoo.c:1249 src/protocols/yahoo/yahoo.c:1325
 msgid "Be Right Back"
 msgstr "Komme gleich wieder"
 
 #: src/protocols/msn/msn.c:1518 src/protocols/msn/msn.c:1547
-#: src/protocols/msn/msn.c:1609 src/protocols/yahoo/yahoo.c:1034
-#: src/protocols/yahoo/yahoo.c:1239 src/protocols/yahoo/yahoo.c:1314
+#: src/protocols/msn/msn.c:1608 src/protocols/yahoo/yahoo.c:1046
+#: src/protocols/yahoo/yahoo.c:1251 src/protocols/yahoo/yahoo.c:1326
 msgid "Busy"
 msgstr "Beschäftigt"
 
 #: src/protocols/msn/msn.c:1519 src/protocols/msn/msn.c:1549
-#: src/protocols/msn/msn.c:1615 src/protocols/yahoo/yahoo.c:1042
-#: src/protocols/yahoo/yahoo.c:1247 src/protocols/yahoo/yahoo.c:1318
+#: src/protocols/msn/msn.c:1614 src/protocols/yahoo/yahoo.c:1054
+#: src/protocols/yahoo/yahoo.c:1259 src/protocols/yahoo/yahoo.c:1330
 msgid "On The Phone"
 msgstr "Am Telefon"
 
 #: src/protocols/msn/msn.c:1520 src/protocols/msn/msn.c:1551
-#: src/protocols/msn/msn.c:1617 src/protocols/yahoo/yahoo.c:1046
-#: src/protocols/yahoo/yahoo.c:1251 src/protocols/yahoo/yahoo.c:1320
+#: src/protocols/msn/msn.c:1616 src/protocols/yahoo/yahoo.c:1058
+#: src/protocols/yahoo/yahoo.c:1263 src/protocols/yahoo/yahoo.c:1332
 msgid "Out To Lunch"
 msgstr "Beim Essen"
 
@@ -1617,34 +1647,34 @@
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: src/protocols/msn/msn.c:1619 src/protocols/yahoo/yahoo.c:1052
-#: src/prefs.c:1061
+#: src/protocols/msn/msn.c:1618 src/protocols/yahoo/yahoo.c:1064
+#: src/gtkpounce.c:504 src/prefs.c:1073
 msgid "Idle"
 msgstr "Inaktiv"
 
-#: src/protocols/msn/msn.c:1647 src/protocols/yahoo/yahoo.c:1105
+#: src/protocols/msn/msn.c:1647 src/protocols/yahoo/yahoo.c:1117
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Status:</b> %s"
 
-#: src/protocols/msn/msn.c:1659 src/protocols/oscar/oscar.c:2939
-#: src/protocols/oscar/oscar.c:5504
+#: src/protocols/msn/msn.c:1661 src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:5523
 msgid "Send File"
 msgstr "Datei versenden"
 
-#: src/protocols/msn/msn.c:1731
+#: src/protocols/msn/msn.c:1733
 msgid "New MSN friendly name too long."
 msgstr "Neuer MSN-Benutzername zu lang"
 
-#: src/protocols/msn/msn.c:1746
+#: src/protocols/msn/msn.c:1748
 msgid "Set Friendly Name:"
 msgstr "Setze Benutzername:"
 
-#: src/protocols/msn/msn.c:1755
+#: src/protocols/msn/msn.c:1757
 msgid "Set Friendly Name"
 msgstr "Setze Name"
 
-#: src/protocols/msn/msn.c:1891
+#: src/protocols/msn/msn.c:1893
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1654,11 +1684,11 @@
 "Vielleicht meinten Sie %s@hotmail.com. An Ihrer Liste der erlaubten Benutzer "
 "wurden keine Änderungen vorgenommen."
 
-#: src/protocols/msn/msn.c:1894 src/protocols/msn/msn.c:1948
+#: src/protocols/msn/msn.c:1896 src/protocols/msn/msn.c:1950
 msgid "Invalid MSN screenname"
 msgstr "Ungültiger MSN-Screenname"
 
-#: src/protocols/msn/msn.c:1945
+#: src/protocols/msn/msn.c:1947
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1668,6 +1698,10 @@
 "Vielleicht meinten Sie %s@hotmail.com. An Ihrer Liste der blockierten "
 "Benutzer wurden keine Änderungen vorgenommen."
 
+#: src/protocols/msn/msn.c:2053
+msgid "Login Server:"
+msgstr "Anmeldeserver:"
+
 #: src/protocols/msn/switchboard.c:104
 #, c-format
 msgid "%s has closed the conversation window"
@@ -1689,183 +1723,183 @@
 "Gaim stellte einen Fehler bei der Kommunikation mit dem MSN-Zentralserver "
 "fest.< Bitte versuchen Sie es später nochmal."
 
-#: src/protocols/napster/napster.c:459 src/protocols/oscar/oscar.c:4942
+#: src/protocols/napster/napster.c:459 src/protocols/oscar/oscar.c:4988
 #: src/protocols/toc/toc.c:1187
 msgid "Join what group:"
 msgstr "An welcher Gruppe teilnehmen:"
 
-#: src/protocols/oscar/oscar.c:359
+#: src/protocols/oscar/oscar.c:360
 msgid "Invalid error"
 msgstr "Ungültiger Name"
 
-#: src/protocols/oscar/oscar.c:360
+#: src/protocols/oscar/oscar.c:361
 msgid "Invalid SNAC"
 msgstr "Ungültiger SNAC"
 
-#: src/protocols/oscar/oscar.c:361
+#: src/protocols/oscar/oscar.c:362
 msgid "Rate to host"
 msgstr "Bewertung zum Host"
 
-#: src/protocols/oscar/oscar.c:362
+#: src/protocols/oscar/oscar.c:363
 msgid "Rate to client"
 msgstr "Bewertung zum Client"
 
-#: src/protocols/oscar/oscar.c:364
+#: src/protocols/oscar/oscar.c:365
 msgid "Service unavailable"
 msgstr "Server unerreichbar"
 
-#: src/protocols/oscar/oscar.c:365
+#: src/protocols/oscar/oscar.c:366
 msgid "Service not defined"
 msgstr "Dienst nicht definiert"
 
-#: src/protocols/oscar/oscar.c:366
+#: src/protocols/oscar/oscar.c:367
 msgid "Obsolete SNAC"
 msgstr "Obsoleteter SNAC"
 
-#: src/protocols/oscar/oscar.c:367
+#: src/protocols/oscar/oscar.c:368
 msgid "Not supported by host"
 msgstr "Nicht unterstützt vom Host"
 
-#: src/protocols/oscar/oscar.c:368
+#: src/protocols/oscar/oscar.c:369
 msgid "Not supported by client"
 msgstr "Nicht unterstützt vom Client"
 
-#: src/protocols/oscar/oscar.c:369
+#: src/protocols/oscar/oscar.c:370
 msgid "Refused by client"
 msgstr "Abgelehnt vom Client"
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:371
 msgid "Reply too big"
 msgstr "Ergebnis zu groß"
 
-#: src/protocols/oscar/oscar.c:371
+#: src/protocols/oscar/oscar.c:372
 msgid "Responses lost"
 msgstr "Antwort verloren"
 
-#: src/protocols/oscar/oscar.c:372
+#: src/protocols/oscar/oscar.c:373
 msgid "Request denied"
 msgstr "Anfrage verweigert"
 
-#: src/protocols/oscar/oscar.c:373
+#: src/protocols/oscar/oscar.c:374
 msgid "Busted SNAC payload"
 msgstr "Ruinierte SNAC-Ladung"
 
-#: src/protocols/oscar/oscar.c:374
+#: src/protocols/oscar/oscar.c:375
 msgid "Insufficient rights"
 msgstr "Ungenügende Rechte"
 
-#: src/protocols/oscar/oscar.c:375
+#: src/protocols/oscar/oscar.c:376
 msgid "In local permit/deny"
 msgstr "lokal erlaubt/verboten"
 
-#: src/protocols/oscar/oscar.c:376
+#: src/protocols/oscar/oscar.c:377
 msgid "Too evil (sender)"
 msgstr "Zu boshaft (Sender)"
 
-#: src/protocols/oscar/oscar.c:377
+#: src/protocols/oscar/oscar.c:378
 msgid "Too evil (receiver)"
 msgstr "Zu boshaft (Empfänger)"
 
-#: src/protocols/oscar/oscar.c:378
+#: src/protocols/oscar/oscar.c:379
 msgid "User temporarily unavailable"
 msgstr "Benutzer ist temporär nicht verfügbar"
 
-#: src/protocols/oscar/oscar.c:379
+#: src/protocols/oscar/oscar.c:380
 msgid "No match"
 msgstr "Keine Übereinstimmung"
 
-#: src/protocols/oscar/oscar.c:380
+#: src/protocols/oscar/oscar.c:381
 msgid "List overflow"
 msgstr "Listenüberlauf"
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:382
 msgid "Request ambiguous"
 msgstr "Anfrage ist nicht eindeutig"
 
-#: src/protocols/oscar/oscar.c:382
+#: src/protocols/oscar/oscar.c:383
 msgid "Queue full"
 msgstr "Warteschlange voll"
 
-#: src/protocols/oscar/oscar.c:383
+#: src/protocols/oscar/oscar.c:384
 msgid "Not while on AOL"
 msgstr "Nicht während in AOL"
 
 # Direct IM erwähnen?
-#: src/protocols/oscar/oscar.c:404
+#: src/protocols/oscar/oscar.c:405
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direkte Verbindung zu %s geschlossen"
 
 # Direct IM erwähnen?
-#: src/protocols/oscar/oscar.c:406
+#: src/protocols/oscar/oscar.c:407
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direkte Verbindung mit %s fehlgeschlagen"
 
-#: src/protocols/oscar/oscar.c:456 src/protocols/toc/toc.c:602
+#: src/protocols/oscar/oscar.c:457 src/protocols/toc/toc.c:602
 #: src/protocols/toc/toc.c:615 src/protocols/toc/toc.c:678
 msgid "Disconnected."
 msgstr "Verbindung unterbrochen"
 
-#: src/protocols/oscar/oscar.c:468 src/protocols/toc/toc.c:850
+#: src/protocols/oscar/oscar.c:469 src/protocols/toc/toc.c:850
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Die Verbindung zum Raum %s wurde unterbrochen"
 
-#: src/protocols/oscar/oscar.c:481
+#: src/protocols/oscar/oscar.c:482
 msgid "Chat is currently unavailable"
 msgstr "Chat ist momentan nicht möglich."
 
-#: src/protocols/oscar/oscar.c:550 src/protocols/oscar/oscar.c:608
+#: src/protocols/oscar/oscar.c:551 src/protocols/oscar/oscar.c:609
 msgid "Couldn't connect to host"
 msgstr "Keine Verbindung zum Host"
 
-#: src/protocols/oscar/oscar.c:590
+#: src/protocols/oscar/oscar.c:591
 msgid "Unable to login to AIM"
 msgstr "Anmeldung nicht möglich"
 
-#: src/protocols/oscar/oscar.c:697 src/protocols/oscar/oscar.c:1148
+#: src/protocols/oscar/oscar.c:702 src/protocols/oscar/oscar.c:1156
 msgid "Could Not Connect"
 msgstr "Verbinden nicht möglich"
 
-#: src/protocols/oscar/oscar.c:704
+#: src/protocols/oscar/oscar.c:709
 msgid "Connection established, cookie sent"
 msgstr "Verbindung hergestellt. Cookie gesendet"
 
-#: src/protocols/oscar/oscar.c:787 src/protocols/oscar/oscar.c:798
-#: src/protocols/oscar/oscar.c:802
+#: src/protocols/oscar/oscar.c:792 src/protocols/oscar/oscar.c:803
+#: src/protocols/oscar/oscar.c:807
 msgid "File Transfer Aborted"
 msgstr "Dateitransfer wurde abgebrochen"
 
-#: src/protocols/oscar/oscar.c:787
+#: src/protocols/oscar/oscar.c:792
 msgid "Unable to establish listener socket."
 msgstr "Lese-Socket kann nicht erstellt werden."
 
-#: src/protocols/oscar/oscar.c:798
+#: src/protocols/oscar/oscar.c:803
 msgid "Unable to establish file descriptor."
 msgstr "Konnte Datei-Deskriptor nicht erstellen."
 
-#: src/protocols/oscar/oscar.c:802
+#: src/protocols/oscar/oscar.c:807
 msgid "Unable to create new connection."
 msgstr "Kann neue Verbindung nicht erstellen."
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1044 src/protocols/toc/toc.c:551
+#: src/protocols/oscar/oscar.c:1052 src/protocols/toc/toc.c:551
 msgid "Incorrect nickname or password."
 msgstr "Ungültiger Benutzername oder Paßwort."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1048
+#: src/protocols/oscar/oscar.c:1056
 msgid "Your account is currently suspended."
 msgstr "Ihr Benutzerkonto ist momentan gesperrt."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1052
+#: src/protocols/oscar/oscar.c:1060
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Der AOL-Instant Messenger Dienst ist zur Zeit nicht erreichbar."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1056
+#: src/protocols/oscar/oscar.c:1064
 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."
@@ -1875,22 +1909,22 @@
 "noch länger warten"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1060
+#: src/protocols/oscar/oscar.c:1068
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Die Client-Version, die Sie nutzen ist zu alt. Bitte updaten Sie unter %s"
 
-#: src/protocols/oscar/oscar.c:1064 src/protocols/toc/toc.c:633
+#: src/protocols/oscar/oscar.c:1072 src/protocols/toc/toc.c:633
 msgid "Authentication Failed"
 msgstr "Legitimation fehlgeschlagen"
 
-#: src/protocols/oscar/oscar.c:1086
+#: src/protocols/oscar/oscar.c:1094
 msgid "Internal Error"
 msgstr "Interner Fehler"
 
-#: src/protocols/oscar/oscar.c:1187 src/protocols/oscar/oscar.c:1216
-#: src/protocols/oscar/oscar.c:1298
+#: src/protocols/oscar/oscar.c:1195 src/protocols/oscar/oscar.c:1224
+#: src/protocols/oscar/oscar.c:1306
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -1899,29 +1933,29 @@
 "Die Verbindung kann schnell unterbrochen werden. Vielleicht wollen Sie TOC "
 "benutzen bis dieser Fehler behoben wurde. Prüfen Sie %s für Updates."
 
-#: src/protocols/oscar/oscar.c:1189 src/protocols/oscar/oscar.c:1218
+#: src/protocols/oscar/oscar.c:1197 src/protocols/oscar/oscar.c:1226
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim konnte keinen gültigen AIM Login-Hash bekommen"
 
-#: src/protocols/oscar/oscar.c:1300
+#: src/protocols/oscar/oscar.c:1308
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim konnte keinen gültigen Login-Hash bekommen."
 
-#: src/protocols/oscar/oscar.c:1820 src/protocols/oscar/oscar.c:5174
+#: src/protocols/oscar/oscar.c:1842 src/protocols/oscar/oscar.c:5220
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte Verbindung mit %s hergestellt"
 
-#: src/protocols/oscar/oscar.c:2138 src/protocols/oscar/oscar.c:2158
+#: src/protocols/oscar/oscar.c:2160 src/protocols/oscar/oscar.c:2180
 msgid "(There was an error receiving this message)"
 msgstr "(Es gab einen Fehler beim Erhalten dieser Nachricht)"
 
-#: src/protocols/oscar/oscar.c:2297
+#: src/protocols/oscar/oscar.c:2321
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s hat nach einer direkten Verbindung zu %s gefragt"
 
-#: src/protocols/oscar/oscar.c:2298
+#: src/protocols/oscar/oscar.c:2322
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -1931,21 +1965,21 @@
 "notwendig für IM-Bilder. Da Ihre IP-Adresse verwendet wird, kann dies eine "
 "Verletzung der Privatsphäre bedeuten."
 
-#: src/protocols/oscar/oscar.c:2321
+#: src/protocols/oscar/oscar.c:2345
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Bitte authorisieren Sie mich, sodaß ich Sie in meine Buddy-Liste aufnehmen "
 "kann."
 
-#: src/protocols/oscar/oscar.c:2329
+#: src/protocols/oscar/oscar.c:2353
 msgid "Authorization Request Message:"
 msgstr "Nachricht der Authorisierungsanfrage"
 
-#: src/protocols/oscar/oscar.c:2329
+#: src/protocols/oscar/oscar.c:2353
 msgid "Please authorize me!"
 msgstr "Bitte authorisiere mich!"
 
-#: src/protocols/oscar/oscar.c:2354
+#: src/protocols/oscar/oscar.c:2378
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -1954,23 +1988,23 @@
 "Der Benutzer %s verlangt eine Authorisierung vor dem Hinzufügen zur Buddy-"
 "Liste.  Möchten Sie die Authorsierungsanfrage senden?"
 
-#: src/protocols/oscar/oscar.c:2358
+#: src/protocols/oscar/oscar.c:2382
 msgid "Request Authorization"
 msgstr "Frage nach Authorisierung"
 
-#: src/protocols/oscar/oscar.c:2392 src/protocols/oscar/oscar.c:2394
-#: src/protocols/oscar/oscar.c:2400 src/protocols/oscar/oscar.c:2465
-#: src/protocols/oscar/oscar.c:2477 src/protocols/oscar/oscar.c:2842
-#: src/protocols/oscar/oscar.c:2893 src/protocols/oscar/oscar.c:4869
-#: src/protocols/oscar/oscar.c:4910
+#: src/protocols/oscar/oscar.c:2416 src/protocols/oscar/oscar.c:2418
+#: src/protocols/oscar/oscar.c:2424 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2501 src/protocols/oscar/oscar.c:2866
+#: src/protocols/oscar/oscar.c:2917 src/protocols/oscar/oscar.c:4915
+#: src/protocols/oscar/oscar.c:4956
 msgid "No reason given."
 msgstr "Kein Grund angegeben."
 
-#: src/protocols/oscar/oscar.c:2400
+#: src/protocols/oscar/oscar.c:2424
 msgid "Authorization Denied Message:"
 msgstr "Nachricht für die Ablehnung der Authorisierung:"
 
-#: src/protocols/oscar/oscar.c:2465
+#: src/protocols/oscar/oscar.c:2489
 #, c-format
 msgid ""
 "The user %lu wants to add you to their buddy list for the following reason:\n"
@@ -1979,11 +2013,11 @@
 "Der Benutzer %lu möchte Sie zu seiner Buddy-Liste aus folgendem Grund "
 "hinzufügen: %s"
 
-#: src/protocols/oscar/oscar.c:2470 src/protocols/oscar/oscar.c:4874
+#: src/protocols/oscar/oscar.c:2494 src/protocols/oscar/oscar.c:4920
 msgid "Authorization Request"
 msgstr "Authorisierungsanfrage"
 
-#: src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:2501
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1994,19 +2028,19 @@
 "wegen dem folgenden Grund abgelehnt:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2478
+#: src/protocols/oscar/oscar.c:2502
 msgid "ICQ authorization denied."
 msgstr "ICQ-Authentifizierung notwendig"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2484
+#: src/protocols/oscar/oscar.c:2508
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "Der Benutzer %lu hat Ihnen erlaubt, daß Sie ihn zu Ihrer Kontaktliste "
 "hinzufügen"
 
-#: src/protocols/oscar/oscar.c:2491
+#: src/protocols/oscar/oscar.c:2515
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2019,7 +2053,7 @@
 "Von: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2499
+#: src/protocols/oscar/oscar.c:2523
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2032,7 +2066,7 @@
 "Von: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2507
+#: src/protocols/oscar/oscar.c:2531
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2045,34 +2079,34 @@
 "Nachricht:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
 msgstr "Der ICQ-Benutzer %lu hat Ihnen einen Kontakt geschickt: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2532
+#: src/protocols/oscar/oscar.c:2556
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "Möchten Sie diesen Kontakt zu Ihrer Buddy-List hinzufügen?"
 
-#: src/protocols/oscar/oscar.c:2532
+#: src/protocols/oscar/oscar.c:2556
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: src/protocols/oscar/oscar.c:2612
+#: src/protocols/oscar/oscar.c:2636
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Sie haben %hu Nachricht von %s verpasst, da sie ungültig war."
 msgstr[1] "Sie haben %hu Nachrichten von %s verpasst, da sie ungültig waren."
 
-#: src/protocols/oscar/oscar.c:2623
+#: src/protocols/oscar/oscar.c:2647
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Sie haben %hu Nachricht von %s verpasst, da sie zu groß war."
 msgstr[1] "Sie haben %hu Nachricht von %s verpasst, da sie zu groß waren."
 
-#: src/protocols/oscar/oscar.c:2634
+#: src/protocols/oscar/oscar.c:2658
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2085,7 +2119,7 @@
 "Sie haben %hu Nachrichten von %s verpasst, da die Senderate überschritten "
 "wurde."
 
-#: src/protocols/oscar/oscar.c:2645
+#: src/protocols/oscar/oscar.c:2669
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -2094,145 +2128,139 @@
 "Sie haben %hu Nachrichten von %s verpasst, da er/sie zu boshaft war."
 
 # ???
-#: src/protocols/oscar/oscar.c:2656
+#: src/protocols/oscar/oscar.c:2680
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Sie haben %hu Nachricht von %s verpasst, da Sie zu boshaft sind."
 msgstr[1] "Sie haben %hu Nachrichten von %s verpasst, da Sie zu boshaft sind."
 
-#: src/protocols/oscar/oscar.c:2666
+#: src/protocols/oscar/oscar.c:2690
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Sie haben %hu Nachricht von %s aus unbekannten Gründen verpasst."
 msgstr[1] "Sie haben %hu Nachrichten von %s aus unbekannten Gründen verpasst."
 
-#: src/protocols/oscar/oscar.c:2681 src/protocols/oscar/oscar.c:4365
-#: src/protocols/oscar/oscar.c:5466
+#: src/protocols/oscar/oscar.c:2705 src/protocols/oscar/oscar.c:4406
+#: src/protocols/oscar/oscar.c:5493
 msgid "Free For Chat"
 msgstr "Frei zum Chatten"
 
-#: src/protocols/oscar/oscar.c:2685 src/protocols/oscar/oscar.c:4359
-#: src/protocols/oscar/oscar.c:5464
+#: src/protocols/oscar/oscar.c:2709 src/protocols/oscar/oscar.c:4400
+#: src/protocols/oscar/oscar.c:5491
 msgid "Not Available"
 msgstr "Nicht erreichbar"
 
-#: src/protocols/oscar/oscar.c:2687 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:5465
+#: src/protocols/oscar/oscar.c:2711 src/protocols/oscar/oscar.c:4403
+#: src/protocols/oscar/oscar.c:5492
 msgid "Occupied"
 msgstr "Besetzt"
 
-#: src/protocols/oscar/oscar.c:2691
+#: src/protocols/oscar/oscar.c:2715
 msgid "Web Aware"
 msgstr "In Web"
 
-#: src/protocols/oscar/oscar.c:2695 src/protocols/oscar/oscar.c:4351
-#: src/protocols/oscar/oscar.c:5461 src/protocols/yahoo/yahoo.c:1054
-#: src/multi.c:269
-msgid "Online"
-msgstr "Online"
-
-#: src/protocols/oscar/oscar.c:2748
+#: src/protocols/oscar/oscar.c:2772
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2750
+#: src/protocols/oscar/oscar.c:2774
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>Status:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2806
+#: src/protocols/oscar/oscar.c:2830
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC hat den Fehler: %s\n"
 
-#: src/protocols/oscar/oscar.c:2807
+#: src/protocols/oscar/oscar.c:2831
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2841
+#: src/protocols/oscar/oscar.c:2865
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Ihre Nachricht zu %s wurde nicht gesendet:"
 
-#: src/protocols/oscar/oscar.c:2892
+#: src/protocols/oscar/oscar.c:2916
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Benutzerinformationen für %s sind nicht verfügbar:"
 
-#: src/protocols/oscar/oscar.c:2924
+#: src/protocols/oscar/oscar.c:2949
 msgid "Buddy Icon"
 msgstr "Buddy-Icon"
 
-#: src/protocols/oscar/oscar.c:2927
-msgid "Voice"
-msgstr "Stimme"
-
-#: src/protocols/oscar/oscar.c:2930
-msgid "IM Image"
-msgstr "IM Bild"
-
-#: src/protocols/oscar/oscar.c:2933 src/buddy.c:1047
-msgid "Chat"
-msgstr "Chat"
-
-#: src/protocols/oscar/oscar.c:2936 src/protocols/oscar/oscar.c:5511
-msgid "Get File"
-msgstr "Datei holen"
-
-#: src/protocols/oscar/oscar.c:2943
-msgid "Games"
-msgstr "Spiele"
-
-#: src/protocols/oscar/oscar.c:2946
-msgid "Stocks"
-msgstr "Aktienkurse"
-
-#: src/protocols/oscar/oscar.c:2949
-msgid "Send Buddy List"
-msgstr "Buddy-Liste senden"
-
 #: src/protocols/oscar/oscar.c:2952
+msgid "Voice"
+msgstr "Stimme"
+
+#: src/protocols/oscar/oscar.c:2955 src/protocols/oscar/oscar.c:5517
+msgid "Direct IM"
+msgstr "Direkte Nachricht"
+
+#: src/protocols/oscar/oscar.c:2958 src/buddy.c:1273
+msgid "Chat"
+msgstr "Chat"
+
+#: src/protocols/oscar/oscar.c:2961 src/protocols/oscar/oscar.c:5529
+msgid "Get File"
+msgstr "Datei holen"
+
+#: src/protocols/oscar/oscar.c:2968
+msgid "Games"
+msgstr "Spiele"
+
+#: src/protocols/oscar/oscar.c:2971
+msgid "Add-Ins"
+msgstr "Zusätze"
+
+#: src/protocols/oscar/oscar.c:2974
+msgid "Send Buddy List"
+msgstr "Buddy-Liste senden"
+
+#: src/protocols/oscar/oscar.c:2977
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy Bug"
 
-#: src/protocols/oscar/oscar.c:2955
+#: src/protocols/oscar/oscar.c:2980
 msgid "AP User"
 msgstr "AP Benutzer"
 
-#: src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:2983
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:2961
+#: src/protocols/oscar/oscar.c:2986
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:2989
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:2967
+#: src/protocols/oscar/oscar.c:2992
 msgid "ICQ Unknown"
 msgstr "ICQ Unbekannt"
 
-#: src/protocols/oscar/oscar.c:2970
+#: src/protocols/oscar/oscar.c:2995
 msgid "Trillian Encryption"
 msgstr "Trillian Verschlüsselung"
 
-#: src/protocols/oscar/oscar.c:2973
+#: src/protocols/oscar/oscar.c:2998
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:2998
+#: src/protocols/oscar/oscar.c:3024
 #, c-format
 msgid "<b>Logged In:</b> %s%s%s"
 msgstr "<b>Angemeldet seit:</b> %s%s%s"
 
-#: src/protocols/oscar/oscar.c:2999
+#: src/protocols/oscar/oscar.c:3025
 msgid ""
 "\n"
 "<b>Capabilities:</b> "
@@ -2240,7 +2268,15 @@
 "\n"
 "<b>Fähigkeiten:</b> "
 
-#: src/protocols/oscar/oscar.c:3042
+#: src/protocols/oscar/oscar.c:3031
+msgid ""
+"\n"
+"<b>Status:</b> "
+msgstr ""
+"\n"
+"<b>Status:</b> "
+
+#: src/protocols/oscar/oscar.c:3077
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
@@ -2248,26 +2284,26 @@
 "<i>Kann die Information nicht anzeigen, da sie in einer unbekannten "
 "Kodierung gesendet wurde.</i>"
 
-#: src/protocols/oscar/oscar.c:3048
+#: src/protocols/oscar/oscar.c:3083
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "Online seit : <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3053
+#: src/protocols/oscar/oscar.c:3088
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "Mitglied seit : <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3059
+#: src/protocols/oscar/oscar.c:3094
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "Abwesenheit : <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3062
+#: src/protocols/oscar/oscar.c:3097
 msgid "Idle: <b>Active</b>"
 msgstr "Abwesenheit: <b>Aktiv</b>"
 
-#: src/protocols/oscar/oscar.c:3065
+#: src/protocols/oscar/oscar.c:3100
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2280,27 +2316,27 @@
 "%s%s%s\n"
 "<hr>\n"
 
-#: src/protocols/oscar/oscar.c:3097
+#: src/protocols/oscar/oscar.c:3132
 msgid "<i>User has no away message</i>"
 msgstr "<i>Benutzer hat keine Abwesenheits-Mitteilung</i>"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3143
 msgid "Client Capabilities: "
 msgstr "Client-Fähigkeiten: "
 
-#: src/protocols/oscar/oscar.c:3115
+#: src/protocols/oscar/oscar.c:3150
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Keine Information bereitgestellt</i>"
 
-#: src/protocols/oscar/oscar.c:3136
+#: src/protocols/oscar/oscar.c:3171
 msgid "Your AIM connection may be lost."
 msgstr "Ihre AIM-Verbindung kann unterbrochen sein"
 
-#: src/protocols/oscar/oscar.c:3481
+#: src/protocols/oscar/oscar.c:3519
 msgid "Rate limiting error."
 msgstr "Datenrate-Limitierungsfehler"
 
-#: src/protocols/oscar/oscar.c:3482
+#: src/protocols/oscar/oscar.c:3520
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
@@ -2308,7 +2344,7 @@
 "Die letzte Nachricht wurde nicht verschickt, da die Senderate überschritten "
 "wurde. Bitte warten Sie 10 Sekunden und versuchen Sie es erneut."
 
-#: src/protocols/oscar/oscar.c:3538
+#: src/protocols/oscar/oscar.c:3578
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -2316,111 +2352,111 @@
 "Sie wurden abgemeldet, weil Sie sich von einem anderen Ort mit diesem "
 "Benutzernamen angemeldet haben."
 
-#: src/protocols/oscar/oscar.c:3540
+#: src/protocols/oscar/oscar.c:3580
 msgid "You have been signed off for an unknown reason."
 msgstr "Sie wurden aus einem unbekannten Grund abgemeldet."
 
-#: src/protocols/oscar/oscar.c:3778
+#: src/protocols/oscar/oscar.c:3818
 msgid "UIN:"
 msgstr "UIN:"
 
-#: src/protocols/oscar/oscar.c:3783
+#: src/protocols/oscar/oscar.c:3823
 msgid "First Name:"
 msgstr "Vorname:"
 
-#: src/protocols/oscar/oscar.c:3786
+#: src/protocols/oscar/oscar.c:3826
 msgid "Last Name:"
 msgstr "Nachname:"
 
-#: src/protocols/oscar/oscar.c:3789 src/protocols/oscar/oscar.c:3795
+#: src/protocols/oscar/oscar.c:3829 src/protocols/oscar/oscar.c:3835
 msgid "Email Address:"
 msgstr "E-Mail Adresse:"
 
-#: src/protocols/oscar/oscar.c:3800
+#: src/protocols/oscar/oscar.c:3840
 msgid "Mobile Phone:"
 msgstr "Handy-Nr:"
 
-#: src/protocols/oscar/oscar.c:3803
+#: src/protocols/oscar/oscar.c:3843
 msgid "Gender:"
 msgstr "Geschlecht:"
 
-#: src/protocols/oscar/oscar.c:3803
+#: src/protocols/oscar/oscar.c:3843
 msgid "Female"
 msgstr "Weiblich"
 
-#: src/protocols/oscar/oscar.c:3803
+#: src/protocols/oscar/oscar.c:3843
 msgid "Male"
 msgstr "Männlich"
 
-#: src/protocols/oscar/oscar.c:3812
+#: src/protocols/oscar/oscar.c:3852
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
-#: src/protocols/oscar/oscar.c:3817
+#: src/protocols/oscar/oscar.c:3857
 msgid "Age:"
 msgstr "Alter:"
 
-#: src/protocols/oscar/oscar.c:3820
+#: src/protocols/oscar/oscar.c:3860
 msgid "Personal Web Page:"
 msgstr "Persönliche Webseite:"
 
-#: src/protocols/oscar/oscar.c:3823
+#: src/protocols/oscar/oscar.c:3863
 msgid "Additional Information:"
 msgstr "Zusätzliche Informationen:"
 
-#: src/protocols/oscar/oscar.c:3827
+#: src/protocols/oscar/oscar.c:3867
 msgid "Home Address:"
 msgstr "Privatadresse"
 
-#: src/protocols/oscar/oscar.c:3829 src/protocols/oscar/oscar.c:3845
+#: src/protocols/oscar/oscar.c:3869 src/protocols/oscar/oscar.c:3885
 msgid "Address:"
 msgstr "Adresse:"
 
-#: src/protocols/oscar/oscar.c:3832 src/protocols/oscar/oscar.c:3848
+#: src/protocols/oscar/oscar.c:3872 src/protocols/oscar/oscar.c:3888
 msgid "City:"
 msgstr "Stadt:"
 
-#: src/protocols/oscar/oscar.c:3835 src/protocols/oscar/oscar.c:3851
+#: src/protocols/oscar/oscar.c:3875 src/protocols/oscar/oscar.c:3891
 msgid "State:"
 msgstr "Provinz/Bundesland:"
 
-#: src/protocols/oscar/oscar.c:3838 src/protocols/oscar/oscar.c:3854
+#: src/protocols/oscar/oscar.c:3878 src/protocols/oscar/oscar.c:3894
 msgid "Zip Code:"
 msgstr "PLZ:"
 
-#: src/protocols/oscar/oscar.c:3843
+#: src/protocols/oscar/oscar.c:3883
 msgid "Work Address:"
 msgstr "Adresse (Arbeit):"
 
-#: src/protocols/oscar/oscar.c:3859
+#: src/protocols/oscar/oscar.c:3899
 msgid "Work Information:"
 msgstr "Information (Arbeit):"
 
-#: src/protocols/oscar/oscar.c:3861
+#: src/protocols/oscar/oscar.c:3901
 msgid "Company:"
 msgstr "Firma:"
 
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3904
 msgid "Division:"
 msgstr "Abteilung:"
 
-#: src/protocols/oscar/oscar.c:3867
+#: src/protocols/oscar/oscar.c:3907
 msgid "Position:"
 msgstr "Position:"
 
-#: src/protocols/oscar/oscar.c:3870
+#: src/protocols/oscar/oscar.c:3910
 msgid "Web Page:"
 msgstr "Webseite:"
 
-#: src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:4019
 msgid "Account Confirmation Requested"
 msgstr "Kontobestätigung wurde angefragt"
 
-#: src/protocols/oscar/oscar.c:4006
+#: src/protocols/oscar/oscar.c:4046
 msgid "Error Changing Account Info"
 msgstr "Fehler beim Ändern der Account-Information"
 
-#: src/protocols/oscar/oscar.c:4009
+#: src/protocols/oscar/oscar.c:4049
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -2429,7 +2465,7 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name vom "
 "Original abweicht."
 
-#: src/protocols/oscar/oscar.c:4012
+#: src/protocols/oscar/oscar.c:4052
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -2438,7 +2474,7 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name mit "
 "einem Leerzeichen endet."
 
-#: src/protocols/oscar/oscar.c:4015
+#: src/protocols/oscar/oscar.c:4055
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -2447,7 +2483,7 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name zu "
 "lang ist."
 
-#: src/protocols/oscar/oscar.c:4018
+#: src/protocols/oscar/oscar.c:4058
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -2456,7 +2492,7 @@
 "Error 0x%04x: Kann den Benutzernamen nicht formatieren, weil er schon durch "
 "eine andere Anfrage geändert wird."
 
-#: src/protocols/oscar/oscar.c:4021
+#: src/protocols/oscar/oscar.c:4061
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -2465,7 +2501,7 @@
 "Fehler 0x%04x: Kann die E-Mailadresse nicht ändern, weil es schon zu viele E-"
 "Mailadressen gibt, die zum Benutzernamen gehören."
 
-#: src/protocols/oscar/oscar.c:4024
+#: src/protocols/oscar/oscar.c:4064
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -2474,12 +2510,12 @@
 "Fehler 0x%04x: Kann die E-Mailadresse nicht ändern, weil die angegebene "
 "Adresse falsch ist."
 
-#: src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4067
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fehler 0x%04x: Unbekannter Fehler."
 
-#: src/protocols/oscar/oscar.c:4037
+#: src/protocols/oscar/oscar.c:4077
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -2488,20 +2524,20 @@
 "Ihre Benutzername wird zur Zeit wie folgt formatiert:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4038 src/protocols/oscar/oscar.c:4044
+#: src/protocols/oscar/oscar.c:4078 src/protocols/oscar/oscar.c:4084
 msgid "Account Info"
 msgstr "Konto-Info"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4083
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Die E-Mail-Adresse für %s ist %s"
 
-#: src/protocols/oscar/oscar.c:4249
+#: src/protocols/oscar/oscar.c:4291
 msgid "Unable to set AIM profile."
 msgstr "Kann der AIM-Profil nicht setzen"
 
-#: src/protocols/oscar/oscar.c:4250
+#: src/protocols/oscar/oscar.c:4292
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -2511,7 +2547,7 @@
 "Anmeldeprozedur abgeschlossen war. Das Profil bleibt ungesetzt. Versuchen "
 "Sie es wieder, wenn Sie vollständig verbunden sind."
 
-#: src/protocols/oscar/oscar.c:4256
+#: src/protocols/oscar/oscar.c:4298
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
@@ -2520,11 +2556,11 @@
 "Die maximale Profilgröße von %d Bytes wurde überschritten. Gaim hat das "
 "Profil abgeschnitten und es so gesetzt."
 
-#: src/protocols/oscar/oscar.c:4293
+#: src/protocols/oscar/oscar.c:4335
 msgid "Unable to set AIM away message."
 msgstr "Konnte keine AIM Abwesenheitsmeldung setzen"
 
-#: src/protocols/oscar/oscar.c:4294
+#: src/protocols/oscar/oscar.c:4336
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -2534,7 +2570,7 @@
 "bevor die Anmeldeprozedur abgeschlossen war. Sie bleiben im Anwesent-Status. "
 "Versuchen Sie es wieder, wenn Sie vollständig verbunden sind."
 
-#: src/protocols/oscar/oscar.c:4310
+#: src/protocols/oscar/oscar.c:4352
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
@@ -2543,11 +2579,11 @@
 "Die Abwesenheitsnachricht hat die Größe von %d Bytes überschritten. Gaim hat "
 "die Nachricht abgeschnitten und hat Sie abwesend gesetzt."
 
-#: src/protocols/oscar/oscar.c:4531
+#: src/protocols/oscar/oscar.c:4572
 msgid "Unable To Retrive Buddy List"
 msgstr "Konnte Buddy-Liste nicht laden"
 
-#: src/protocols/oscar/oscar.c:4531
+#: src/protocols/oscar/oscar.c:4572
 msgid ""
 "Gaim was temporarily unable to retrive your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -2557,11 +2593,11 @@
 "laden. Ihre Buddy-Liste ist nicht verloren und wird wahrscheinlich in ein "
 "paar Stunden wieder verfügbar sein."
 
-#: src/protocols/oscar/oscar.c:4616 src/protocols/oscar/oscar.c:4617
+#: src/protocols/oscar/oscar.c:4657 src/protocols/oscar/oscar.c:4658
 msgid "Orphans"
 msgstr "Waisen"
 
-#: src/protocols/oscar/oscar.c:4756
+#: src/protocols/oscar/oscar.c:4797
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -2571,11 +2607,11 @@
 "ist %d und Sie haben %d. Solange Sie nicht unter dieser Grenze sind, werden "
 "einige Buddies nicht als Online angezeigt."
 
-#: src/protocols/oscar/oscar.c:4759
+#: src/protocols/oscar/oscar.c:4800
 msgid "Maximum buddy list length exceeded."
 msgstr "Maximale Länge der Buddy-Liste überschritten."
 
-#: src/protocols/oscar/oscar.c:4792
+#: src/protocols/oscar/oscar.c:4838
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -2584,11 +2620,11 @@
 "Kann den Buddy %s nicht hinzufügen, weil Sie schon zu viele Buddies in Ihrer "
 "Buddy-Liste haben. Bitte entfernen Sie einen und versuchen Sie es nochmal."
 
-#: src/protocols/oscar/oscar.c:4792
+#: src/protocols/oscar/oscar.c:4838
 msgid "(no name)"
 msgstr "(kein Name)"
 
-#: src/protocols/oscar/oscar.c:4835
+#: src/protocols/oscar/oscar.c:4881
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -2597,11 +2633,11 @@
 "Der Benutzer %s hat Ihnen gestattet, Sie zu seiner Buddy-Liste hinzuzufügen. "
 "Möchten Sie ihn hinzufügen?"
 
-#: src/protocols/oscar/oscar.c:4840
+#: src/protocols/oscar/oscar.c:4886
 msgid "Authorization Given"
 msgstr "Authorisierung wurde gegeben"
 
-#: src/protocols/oscar/oscar.c:4869
+#: src/protocols/oscar/oscar.c:4915
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -2612,19 +2648,19 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:4906
+#: src/protocols/oscar/oscar.c:4952
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr ""
 "Der Benutzer %s hat Ihnen erlaubt, daß Sie ihn zu Ihrer Kontaktliste "
 "hinzufügen"
 
-#: src/protocols/oscar/oscar.c:4907
+#: src/protocols/oscar/oscar.c:4953
 msgid "Authorization Granted"
 msgstr "Authorisierung vergeben"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:4910
+#: src/protocols/oscar/oscar.c:4956
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -2635,26 +2671,26 @@
 "wegen dem folgenden Grund abgelehnt:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4911
+#: src/protocols/oscar/oscar.c:4957
 msgid "Authorization Denied"
 msgstr "Authorisierung abgelehnt"
 
 # Ich bin mir nicht sicher was "Exchange" hier genau bedeutet.
-#: src/protocols/oscar/oscar.c:4946 src/protocols/toc/toc.c:1191
+#: src/protocols/oscar/oscar.c:4992 src/protocols/toc/toc.c:1191
 msgid "Exchange:"
 msgstr "Austausch:"
 
 # "Direct IM"
-#: src/protocols/oscar/oscar.c:5303
+#: src/protocols/oscar/oscar.c:5356
 msgid "Unable to open Direct IM"
 msgstr "Direkte Verbindung nicht möglich"
 
-#: src/protocols/oscar/oscar.c:5315
+#: src/protocols/oscar/oscar.c:5368
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Sie haben eine direkte IM-Verbindung mit %s ausgewählt."
 
-#: src/protocols/oscar/oscar.c:5316
+#: src/protocols/oscar/oscar.c:5369
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -2662,97 +2698,75 @@
 "Da dies Ihre IP-Adresse sichtbar macht, kann es als Verletzung der "
 "Privatsphäre bertrachtet werden. Möchten Sie fortsetzen?"
 
-#: src/protocols/oscar/oscar.c:5327
-#, c-format
-msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<HR><I>Remote client does not support "
-"sending status messages.</I><BR>"
-msgstr ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><I>Entfernter Client unterstützt "
-"nicht das Senden von Statusmeldungen.</I></BR>"
-
-#: src/protocols/oscar/oscar.c:5334
-#, c-format
-msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<HR><I>User has no status message.</I><BR>"
-msgstr ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><I>Benutzer hat keine Statusmeldung.</"
-"I></BR>"
-
-#: src/protocols/oscar/oscar.c:5480
+#: src/protocols/oscar/oscar.c:5507
 msgid "Get Status Msg"
 msgstr "Abwesenheits-Mitteilung holen"
 
-#: src/protocols/oscar/oscar.c:5498
-msgid "Direct IM"
-msgstr "Direkte Nachricht"
-
 #: src/protocols/oscar/oscar.c:5540
 msgid "Re-request Authorization"
 msgstr "Nochmal nach Authorisierung fragen"
 
-#: src/protocols/oscar/oscar.c:5561
+#: src/protocols/oscar/oscar.c:5563
 msgid "The new formatting is invalid."
 msgstr "Die neue Formatierung ist nicht in Ordnung."
 
-#: src/protocols/oscar/oscar.c:5562
+#: src/protocols/oscar/oscar.c:5564
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 "Benutzernamen-Formatierung kann nur die Groß-/Kleinschreibung und "
 "Leerzeichen ändern"
 
-#: src/protocols/oscar/oscar.c:5568
+#: src/protocols/oscar/oscar.c:5570
 msgid "New screenname formatting:"
 msgstr "Neue Benutzernamen-Formatierung:"
 
-#: src/protocols/oscar/oscar.c:5613
+#: src/protocols/oscar/oscar.c:5615
 msgid "Change Address To: "
 msgstr "Ändere die Adresse zu: "
 
-#: src/protocols/oscar/oscar.c:5623
+#: src/protocols/oscar/oscar.c:5625
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "Sie warten auf Authorisierung von den folgenden Buddies:<BR>"
 
-#: src/protocols/oscar/oscar.c:5648
+#: src/protocols/oscar/oscar.c:5650
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Sie warten nicht auf eine Authorisierung</i>"
 
-#: src/protocols/oscar/oscar.c:5653
+#: src/protocols/oscar/oscar.c:5655
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
-"clicking on them in the \"Edit Buddies\" pane and selecting \"Re-request "
-"authorization.\""
+"clicking on them and clicking \"Re-request authorization.\""
 msgstr ""
 "%s<BR><BR>Sie können die Authorisierung von diesen Buddies erneut anfordern, "
-"wenn Sie die Buddies mit einem Rechtsklick im \"Buddies bearbeiten\"-Reiter "
-"anklicken und \"Nochmal nach Authorisierung fragen\" auswählen.\""
-
-#: src/protocols/oscar/oscar.c:5688
+"wenn Sie den Buddy mit einem Rechtsklick anklicken und \"Nochmal nach "
+"Authorisierung fragen\" auswählen."
+
+#: src/protocols/oscar/oscar.c:5690
 msgid "Change Password (URL)"
 msgstr "Ändere Paßwort (URL)"
 
-#: src/protocols/oscar/oscar.c:5699
+#: src/protocols/oscar/oscar.c:5701
 msgid "Format Screenname"
 msgstr "Benutzernamen-Format"
 
-#: src/protocols/oscar/oscar.c:5705
+#: src/protocols/oscar/oscar.c:5707
 msgid "Confirm Account"
 msgstr "Konto bestätigen"
 
-#: src/protocols/oscar/oscar.c:5711
+#: src/protocols/oscar/oscar.c:5713
 msgid "Display Current Registered Address"
 msgstr "Zeige die aktuelle registrierte Adresse"
 
-#: src/protocols/oscar/oscar.c:5717
+#: src/protocols/oscar/oscar.c:5719
 msgid "Change Current Registered Address"
 msgstr "Ändere die aktuelle registrierte Adresse"
 
-#: src/protocols/oscar/oscar.c:5726
+#: src/protocols/oscar/oscar.c:5728
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Zeige Buddies, von denen Sie Authorisierung erwarten"
 
-#: src/protocols/oscar/oscar.c:5734
+#: src/protocols/oscar/oscar.c:5736
 msgid "Search for Buddy by Email"
 msgstr "Suche Buddies nach Email-Adresse"
 
@@ -2913,100 +2927,99 @@
 "senden. Gaim verhindert jetzt, daß Nachrichten durchgehen. Dies ist nur "
 "temporär, bitte haben Sie Geduld."
 
-#: src/protocols/toc/toc.c:1307
+#: src/protocols/toc/toc.c:1316
 msgid "Get Dir Info"
 msgstr "Verzeichnis Information holen"
 
-#: src/protocols/toc/toc.c:1431
+#: src/protocols/toc/toc.c:1440
 msgid "Set Dir Info"
 msgstr "Verzeichnisinformation holen"
 
-#: src/protocols/toc/toc.c:1485
+#: src/protocols/toc/toc.c:1495
 msgid "TOC Host:"
 msgstr "TOC Host:"
 
-#: src/protocols/toc/toc.c:1491
+#: src/protocols/toc/toc.c:1501
 msgid "TOC Port:"
 msgstr "TOC Port:"
 
-#: src/protocols/toc/toc.c:1618
+#: src/protocols/toc/toc.c:1628
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Kann %s nicht zum Schreiben öffnen!"
 
-#: src/protocols/toc/toc.c:1696 src/protocols/toc/toc.c:1735
-#: src/protocols/toc/toc.c:1943
+#: src/protocols/toc/toc.c:1706 src/protocols/toc/toc.c:1745
+#: src/protocols/toc/toc.c:1953
 msgid "Could not connect for transfer."
 msgstr "Übertragungsverbindung konnte nicht hergestellt werden!"
 
-#: src/protocols/toc/toc.c:1858
+#: src/protocols/toc/toc.c:1868
 msgid "Could not connect for transfer!"
 msgstr "Übertragungsverbindung konnte nicht hergestellt werden!"
 
-#: src/protocols/toc/toc.c:1890
+#: src/protocols/toc/toc.c:1900
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "Konnte keinen Datei-Kopf schreiben. Die Datei wurde nicht übermittelt. "
 
-#: src/protocols/toc/toc.c:1988 src/gtkft.c:1043
+#: src/protocols/toc/toc.c:1998 src/gtkft.c:1044
 msgid "Gaim - Save As..."
 msgstr "Gaim - Speichern unter..."
 
-#: src/protocols/toc/toc.c:2022
+#: src/protocols/toc/toc.c:2032
 #, c-format
 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 bittet %s %d Datei zu akzeptieren: %s (%.2f %s)%s%s"
 msgstr[1] "%s bittet %s %d Dateien zu akzeptieren: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2029
+#: src/protocols/toc/toc.c:2039
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s bittet Sie eine Datei zu senden"
 
-#: src/protocols/toc/toc.c:2031 src/gtkft.c:1096 src/prpl.c:309
-#: src/server.c:1065
+#: src/protocols/toc/toc.c:2041 src/gtkft.c:1097 src/server.c:1064
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#: src/protocols/yahoo/yahoo.c:584
+#: src/protocols/yahoo/yahoo.c:586
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ihre Yahoo!-Nachricht wurde nicht verschickt."
 
-#: src/protocols/yahoo/yahoo.c:1036 src/protocols/yahoo/yahoo.c:1241
-#: src/protocols/yahoo/yahoo.c:1315
+#: src/protocols/yahoo/yahoo.c:1048 src/protocols/yahoo/yahoo.c:1253
+#: src/protocols/yahoo/yahoo.c:1327
 msgid "Not At Home"
 msgstr "Nicht zu Hause"
 
-#: src/protocols/yahoo/yahoo.c:1038 src/protocols/yahoo/yahoo.c:1243
-#: src/protocols/yahoo/yahoo.c:1316
+#: src/protocols/yahoo/yahoo.c:1050 src/protocols/yahoo/yahoo.c:1255
+#: src/protocols/yahoo/yahoo.c:1328
 msgid "Not At Desk"
 msgstr "Nicht am Tisch"
 
-#: src/protocols/yahoo/yahoo.c:1040 src/protocols/yahoo/yahoo.c:1245
-#: src/protocols/yahoo/yahoo.c:1317
+#: src/protocols/yahoo/yahoo.c:1052 src/protocols/yahoo/yahoo.c:1257
+#: src/protocols/yahoo/yahoo.c:1329
 msgid "Not In Office"
 msgstr "Nicht im Büro"
 
-#: src/protocols/yahoo/yahoo.c:1044 src/protocols/yahoo/yahoo.c:1249
-#: src/protocols/yahoo/yahoo.c:1319
+#: src/protocols/yahoo/yahoo.c:1056 src/protocols/yahoo/yahoo.c:1261
+#: src/protocols/yahoo/yahoo.c:1331
 msgid "On Vacation"
 msgstr "Im Urlaub"
 
-#: src/protocols/yahoo/yahoo.c:1048 src/protocols/yahoo/yahoo.c:1253
-#: src/protocols/yahoo/yahoo.c:1321
+#: src/protocols/yahoo/yahoo.c:1060 src/protocols/yahoo/yahoo.c:1265
+#: src/protocols/yahoo/yahoo.c:1333
 msgid "Stepped Out"
 msgstr "Herausgegangen"
 
-#: src/protocols/yahoo/yahoo.c:1173
+#: src/protocols/yahoo/yahoo.c:1185
 msgid "Activate ID"
 msgstr "Aktiviere ID"
 
-#: src/protocols/yahoo/yahoo.c:1396
+#: src/protocols/yahoo/yahoo.c:1409
 msgid "Pager Host:"
 msgstr "Pager Host:"
 
-#: src/protocols/yahoo/yahoo.c:1402
+#: src/protocols/yahoo/yahoo.c:1415
 msgid "Pager Port:"
 msgstr "Pager Port:"
 
@@ -3032,12 +3045,12 @@
 msgstr "Empfänger:"
 
 # "Info" ist die offizielle GNOME Übersetzung
-#: src/about.c:75
+#: src/about.c:74
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Info zu Gaim v%s"
 
-#: src/about.c:112
+#: src/about.c:106
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -3047,56 +3060,67 @@
 "IRC, Jabber, Napster, Zephy und Gadu-Gadu unterstützt. Gaim ist mit Gtk+ "
 "geschrieben und steht unter der GPL.<BR><BR>"
 
-#: src/about.c:122
+#: src/about.c:116
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> #gaim auf irc.freenode.net<BR><BR>"
 
-#: src/about.c:126
+#: src/about.c:120
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Aktive Entwickler:</FONT><BR>"
 
-#: src/about.c:128
+#: src/about.c:122
 msgid ""
 "  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
-"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
-"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+"A>&gt;<BR>  Sean Egan (lead developer) &lt;<A HREF=\"mailto:"
+"bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;<BR>  Christian "
+"'ChipX86' Hammond (developer & webmaster)<BR>  Herman Bloggs (win32 port) "
+"&lt;<A HREF=\"mailto:hermanator12002@yahoo.com\">hermanator12002@yahoo.com</"
+"A>&gt;<BR>  Nathan 'faceprint' Walp (developer)<BR>  Mark 'KingAnt' Doliner "
+"(developer)<BR>  Luke 'LSchiere' Schierer (support)<BR><BR>"
 msgstr ""
-"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
-"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
-"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
-
-#: src/about.c:136
+"  Rob Flynn (Maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (Hauptentwickler) &lt;<A HREF=\"mailto:"
+"bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;<BR>  Christian "
+"'ChipX86' Hammond (Entwickler & Webmaster)<BR>  Herman Bloggs (Win32 "
+"Portierung) &lt;<A HREF=\"mailto:hermanator12002@yahoo.com"
+"\">hermanator12002@yahoo.com</A>&gt;<BR>  Nathan 'faceprint' Walp "
+"(Entwickler)<BR>  Mark 'KingAnt' Doliner (Entwickler)<BR>  Luke 'LSchiere' "
+"Schierer (Support)<BR><BR>"
+
+#: src/about.c:137
 msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Verrückte Patchschreiber:</FONT><BR>"
 
-#: src/about.c:144
-msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
-msgstr "<FONT SIZE=\"3\">Win32 Portierung:</FONT><BR>"
-
-#: src/about.c:151
+#: src/about.c:147
 msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">Zurückgetretene Entwickler:</FONT><BR>"
 
-#: src/about.c:153
+#: src/about.c:149
 msgid ""
-"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
-"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
-"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+"  Adam Fritzler (former libfaim maintainer)<BR>  Eric Warmenhoven (former "
+"lead developer)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Jim Duchek (former maintainer)<BR>  "
+"Jim Seymour (former Jabber developer)<BR>  Mark Spencer (original author) "
+"&lt;<A HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR>  "
+"Syd Logan (hacker and designated driver [lazy bum])<BR><BR>"
 msgstr ""
-"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
-"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
-"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
-
-#: src/about.c:174 src/dialogs.c:3855 src/prpl.c:524 src/prpl.c:835
-#: src/server.c:1253
+"  Adam Fritzler (früherer libfaim Maintainer)<BR>  Eric Warmenhoven "
+"(früherer Hauptentwickler)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Jim Duchek (früherer Maintainer)<BR>  "
+"Jim Seymour (früherer Jabber Entwickler)<BR>  Mark Spencer (Original-Autor) "
+"&lt;<A HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR>  "
+"Syd Logan (hacker and designated driver [lazy bum])<BR><BR>"
+
+#: src/about.c:169 src/dialogs.c:3816 src/prpl.c:536 src/prpl.c:834
+#: src/server.c:1252
 msgid "Close"
 msgstr "Schließen"
 
-#: src/away.c:220
+#: src/away.c:219
 msgid "Gaim - Away!"
 msgstr "Gaim - Ich bin abwesend!"
 
-#: src/away.c:280
+#: src/away.c:279
 msgid "I'm Back!"
 msgstr "Ich bin zurück"
 
@@ -3128,131 +3152,159 @@
 "Konnte den Browser nicht aufrufen, da der 'Manuell'-Browser gewählt, aber "
 "kein Kommando gesetzt wurde."
 
-#: src/browser.c:579
+#: src/browser.c:582
 #, c-format
 msgid "There was an error launching your chosen browser: %s"
 msgstr "Es gab einen Fehler beim Aufrug des gewählten Browsers: %s"
 
-#: src/buddy.c:220
+#: src/buddy.c:306
+msgid "_Add a Buddy"
+msgstr "Buddy _hinzufügen"
+
+#: src/buddy.c:312
+msgid "_Delete Group"
+msgstr "Gruppe _löschen"
+
+#: src/buddy.c:318
+msgid "_Rename"
+msgstr "_Umbenennen"
+
+#: src/buddy.c:326
 msgid "_Get Info"
 msgstr "Benutzer-_Info holen"
 
-#: src/buddy.c:225
+#: src/buddy.c:331
 msgid "_IM"
 msgstr "_Nachricht"
 
-#: src/buddy.c:231
-msgid "_Alias"
-msgstr "_Alias"
-
-#: src/buddy.c:235
+#: src/buddy.c:337
 msgid "Add Buddy _Pounce"
 msgstr "Buddy-Alarm hinzufügen"
 
-#: src/buddy.c:239
+#: src/buddy.c:341
 msgid "View _Log"
 msgstr "Mitschnitt _anzeigen"
 
+#: src/buddy.c:360
+msgid "_Alias"
+msgstr "_Alias"
+
+#: src/buddy.c:366
+msgid "_Remove"
+msgstr "_Entfernen"
+
 #. Buddies menu
-#: src/buddy.c:531
+#: src/buddy.c:641
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/buddy.c:532
-msgid "/Buddies/_Add A Buddy..."
-msgstr "/Buddies/B_uddy hinzufügen"
-
-#: src/buddy.c:534
+#: src/buddy.c:642
 msgid "/Buddies/New _Instant Message..."
 msgstr "/Buddies/_Neue Nachricht senden"
 
 # vgl. "Join Chat"
-#: src/buddy.c:536
+#: src/buddy.c:643
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Einen _Chat betreten..."
 
-#: src/buddy.c:539
+#: src/buddy.c:644
 msgid "/Buddies/Get _User Info..."
 msgstr "/Buddies/Benutzer-_Info holen"
 
-#: src/buddy.c:542
+#: src/buddy.c:646
+msgid "/Buddies/_Show Offline Buddies"
+msgstr "/Buddies/_Zeige Offline Buddies"
+
+#: src/buddy.c:647
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/Buddies/Zeige _leere Gruppen"
+
+#: src/buddy.c:648
+msgid "/Buddies/_Add a Buddy..."
+msgstr "/Buddies/B_uddy hinzufügen"
+
+#: src/buddy.c:649
+msgid "/Buddies/Add a _Group..."
+msgstr "/Buddies/_Gruppe hinzufügen"
+
+#: src/buddy.c:651
 msgid "/Buddies/_Signoff"
 msgstr "/Buddies/_Abmelden"
 
-#: src/buddy.c:543
+#: src/buddy.c:652
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Beenden"
 
 #. Tools
-#: src/buddy.c:547
+#: src/buddy.c:655
 msgid "/_Tools"
 msgstr "/_Werkzeuge"
 
-#: src/buddy.c:548
+#: src/buddy.c:656
 msgid "/Tools/_Away"
 msgstr "/Werkzeuge/_Abwesenheit"
 
-#: src/buddy.c:549
+#: src/buddy.c:657
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Werkzeuge/Buddy _warnen"
 
-#: src/buddy.c:551
-msgid "/Tools/A_ccounts"
-msgstr "/Werkzeuge/_Konten"
-
-#: src/buddy.c:552
-msgid "/Tools/Preferences"
-msgstr "/Werkzeuge/_Einstellungen"
-
-#: src/buddy.c:554
-msgid "/Tools/_File Transfers"
-msgstr "/Werkzeuge/_Dateitransfers"
-
-#: src/buddy.c:557
+#: src/buddy.c:658
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Werkzeuge/_Protokollaktionen"
 
-#: src/buddy.c:558
-msgid "/Tools/Pr_ivacy"
-msgstr "/Werkzeuge/Pr_ivatspäre"
-
-#: src/buddy.c:559
-msgid "/Tools/View System _Log"
-msgstr "/Werkzeuge/_System-Mitschnitt anzeigen"
+#: src/buddy.c:660
+msgid "/Tools/A_ccounts..."
+msgstr "/Werkzeuge/_Konten..."
+
+#: src/buddy.c:661
+msgid "/Tools/_File Transfers..."
+msgstr "/Werkzeuge/_Dateitransfers..."
+
+#: src/buddy.c:662
+msgid "/Tools/Preferences..."
+msgstr "/Werkzeuge/_Einstellungen..."
+
+#: src/buddy.c:663
+msgid "/Tools/Pr_ivacy..."
+msgstr "/Werkzeuge/Pr_ivatsphäre..."
+
+#: src/buddy.c:665
+msgid "/Tools/View System _Log..."
+msgstr "/Werkzeuge/_System-Mitschnitt anzeigen..."
 
 #. Help
-#: src/buddy.c:562
+#: src/buddy.c:668
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/buddy.c:563
+#: src/buddy.c:669
 msgid "/Help/Online _Help"
 msgstr "/Hilfe/Online-_Hilfe"
 
-#: src/buddy.c:565
-msgid "/Help/_Debug Window"
-msgstr "/Hilfe/_Debug-Fenster"
-
-#: src/buddy.c:566
-msgid "/Help/_About"
-msgstr "/Hilfe/_Über"
-
-#: src/buddy.c:600
+#: src/buddy.c:670
+msgid "/Help/_Debug Window..."
+msgstr "/Hilfe/_Debug-Fenster..."
+
+#: src/buddy.c:671
+msgid "/Help/_About..."
+msgstr "/Hilfe/_Über..."
+
+#: src/buddy.c:705
 #, c-format
 msgid "%dh%02dm"
 msgstr "%dh%02dm"
 
-#: src/buddy.c:602
+#: src/buddy.c:707
 #, c-format
 msgid "%dm"
 msgstr "%dm"
 
-#: src/buddy.c:606
+#: src/buddy.c:717
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/buddy.c:615
+#: src/buddy.c:728
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -3260,7 +3312,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/buddy.c:616
+#: src/buddy.c:729
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -3268,7 +3320,7 @@
 "\n"
 "<b>Spitzname:</b>"
 
-#: src/buddy.c:617
+#: src/buddy.c:730
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -3276,7 +3328,7 @@
 "\n"
 "<b>Untätig:</b>"
 
-#: src/buddy.c:618
+#: src/buddy.c:731
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -3284,42 +3336,93 @@
 "\n"
 "<b>Gewarnt:</b>"
 
-#: src/buddy.c:853
+#: src/buddy.c:732
+msgid ""
+"\n"
+"<b>Status:</b> Offline"
+msgstr ""
+"\n"
+"<b>Status:</b> Offline"
+
+#: src/buddy.c:734
+msgid ""
+"\n"
+"<b>Description:</b> Spooky"
+msgstr ""
+"\n"
+"<b>Beschreibung:</b> Spooky"
+
+#: src/buddy.c:997
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Leerlaufzeit (%dh%02dm) "
 
-#: src/buddy.c:855
+#: src/buddy.c:999
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Leerlaufzeit (%dm) "
 
-#: src/buddy.c:859
+#: src/buddy.c:1003
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Gewarnt: (%d%%)"
 
-#: src/buddy.c:942 src/prefs.c:1703
+#: src/buddy.c:1012 src/buddy.c:1022
+msgid "Offline "
+msgstr "Offline "
+
+#: src/buddy.c:1129 src/prefs.c:1715
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: src/buddy.c:958
+#: src/buddy.c:1151
 msgid "/Tools/Away"
 msgstr "/Werkzeuge/Abwesenheit"
 
-#: src/buddy.c:961
+#: src/buddy.c:1154
 msgid "/Tools/Buddy Pounce"
 msgstr "/Werkzeuge/Buddy-Alarm"
 
-#: src/buddy.c:964
+#: src/buddy.c:1157
 msgid "/Tools/Protocol Actions"
 msgstr "/Werkzeuge/Protokoll-Aktionen"
 
-#: src/buddy.c:1033 src/gtkconv.c:731
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: src/buddy.c:1235
+msgid "/Buddies/Show Offline Buddies"
+msgstr "/Buddies/Zeige Offline Buddies"
+
+#: src/buddy.c:1237
+msgid "/Buddies/Show Empty Groups"
+msgstr "/Buddies/Zeige leere Gruppen"
+
+#: src/buddy.c:1255 src/gtkconv.c:753
 msgid "IM"
 msgstr "Nachricht"
 
-#: src/buddy_chat.c:245
+#: src/buddy.c:1261
+msgid "Send a message to the selected buddy"
+msgstr "Sendet eine Nachricht an den ausgewählten Buddy"
+
+#: src/buddy.c:1264
+msgid "Get Info"
+msgstr "Benutzer-Info"
+
+#: src/buddy.c:1270
+msgid "Get information on the selected buddy"
+msgstr "Info zum ausgewählten Buddy holen"
+
+#: src/buddy.c:1278
+msgid "Join a chat room"
+msgstr "Einem Chatraum beitreten"
+
+#: src/buddy.c:1286
+msgid "Set an away message"
+msgstr "Setze eine Abwesenheits-Mitteilung"
+
+#: src/buddy_chat.c:249
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -3327,78 +3430,78 @@
 "Sie sind im Moment mit allen Protokollen angemeldet, die die Fähigkeit zum "
 "Chatten haben."
 
-#: src/buddy_chat.c:258
+#: src/buddy_chat.c:262
 msgid "Join Chat"
 msgstr "Chat betreten"
 
 # vgl. "Join Chat"!
-#: src/buddy_chat.c:274
+#: src/buddy_chat.c:278
 msgid "Join Chat As:"
 msgstr "Chat betreten als:"
 
 #. Join button.
-#: src/buddy_chat.c:297
+#: src/buddy_chat.c:301
 msgid "Join"
 msgstr "_Betreten"
 
-#: src/conversation.c:398
+#: src/conversation.c:399
 msgid "Unable to send message. The message is too large."
 msgstr "Nachricht kann nicht gesendet werden. Die Nachricht ist zu groß"
 
-#: src/conversation.c:404
+#: src/conversation.c:405
 msgid "Unable to send message."
 msgstr "Nachricht kann nicht gesendet werden"
 
-#: src/conversation.c:1934
+#: src/conversation.c:1958
 #, c-format
 msgid "%s entered the room."
 msgstr "%s hat den Raum betreten."
 
-#: src/conversation.c:1937
+#: src/conversation.c:1961
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] hat den Raum betreten."
 
-#: src/conversation.c:1986
+#: src/conversation.c:2010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
-#: src/conversation.c:2029
+#: src/conversation.c:2053
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s hat den Raum verlassen (%s)."
 
-#: src/conversation.c:2031
+#: src/conversation.c:2055
 #, c-format
 msgid "%s left the room."
 msgstr "%s hat den Raum verlassen"
 
-#: src/conversation.c:2215
+#: src/conversation.c:2239
 msgid "Last created window"
 msgstr "Letztes erstelltes Fenster"
 
-#: src/conversation.c:2217
+#: src/conversation.c:2241
 msgid "New window"
 msgstr "Neues Fenster"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2243
 msgid "By group"
 msgstr "Nach Gruppe"
 
-#: src/conversation.c:2221
+#: src/conversation.c:2245
 msgid "By account"
 msgstr "Nach Konto"
 
-#: src/dialogs.c:377
+#: src/dialogs.c:363
 msgid "Warn User"
 msgstr "Benutzer warnen"
 
-#: src/dialogs.c:377
+#: src/dialogs.c:363
 msgid "_Warn"
 msgstr "_Warnen"
 
-#: src/dialogs.c:393
+#: src/dialogs.c:379
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3411,30 +3514,44 @@
 "Das wird den Warnpegel von %s erhöhen und er oder sie bekommen eine rauere "
 "Bewertung\n"
 
-#: src/dialogs.c:402
+#: src/dialogs.c:388
 msgid "Warn _anonymously?"
 msgstr "_Anonym warnen?"
 
-#: src/dialogs.c:409
+#: src/dialogs.c:395
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "Anonyme Warnungen sind nicht so barsch."
 
-#: src/dialogs.c:431
+#. b->name is null after remove_buddy
+#: src/dialogs.c:418
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "Entferne '%s' von der Buddy-Liste.\n"
 
-#: src/dialogs.c:451
+#: src/dialogs.c:457
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Sie sind dabei %s aus Ihrer Buddy-Liste zu entfernen. Möchten Sie fortsetzen?"
 
-#: src/dialogs.c:452
+#: src/dialogs.c:458
 msgid "Remove Buddy"
 msgstr "Buddy entfernen"
 
+#: src/dialogs.c:464
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"Sie sind dabei, die Gruppe %s und alle darin enthaltenen Mitglieder aus "
+"Ihrer Buddy-Liste zu entfernen. Möchten Sie fortsetzen?"
+
+#: src/dialogs.c:466
+msgid "Remove Group"
+msgstr "Gruppe entfernen"
+
 #: src/dialogs.c:676
 msgid "New Message"
 msgstr "Neue Nachricht"
@@ -3445,43 +3562,43 @@
 "Bitte geben Sie den Benutzernamen der Person ein, mit der Sie chatten "
 "wollen\n"
 
-#: src/dialogs.c:710 src/dialogs.c:811
+#: src/dialogs.c:710 src/dialogs.c:809 src/dialogs.c:3356
 msgid "_Screenname:"
 msgstr "_Benutzername:"
 
-#: src/dialogs.c:725 src/dialogs.c:827
+#: src/dialogs.c:725 src/dialogs.c:825 src/gtkpounce.c:454
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: src/dialogs.c:780
+#: src/dialogs.c:778
 msgid "Get User Info"
 msgstr "Benutzer-_Info holen"
 
-#: src/dialogs.c:799
+#: src/dialogs.c:797
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr ""
 "Bitte geben Sie den Benutzernamen der Person ein, die Sie sehen möchten.\n"
 
-#: src/dialogs.c:978
+#: src/dialogs.c:974
 msgid "Add Group"
 msgstr "Gruppe hinzufügen"
 
-#: src/dialogs.c:995
+#: src/dialogs.c:991
 msgid "Please enter the name of the group to be added.\n"
 msgstr ""
 "Bitte geben Sie den Namen der Gruppe ein, die hinzugefügt werden soll\n"
 
-#: src/dialogs.c:1004 src/dialogs.c:3973
+#: src/dialogs.c:1000 src/dialogs.c:3930
 msgid "_Group:"
 msgstr "Gruppe"
 
-#: src/dialogs.c:1092
+#: src/dialogs.c:1082
 msgid "Add Buddy"
 msgstr "Buddy hinzufügen"
 
-#: src/dialogs.c:1111
+#: src/dialogs.c:1101
 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. "
@@ -3492,181 +3609,181 @@
 "Buddy eingeben. Der Alias wird anstelle des Benutzernamens ausgegeben, "
 "soimmer es möglich ist.\n"
 
-#: src/dialogs.c:1130
+#: src/dialogs.c:1120
 msgid "Screen Name"
 msgstr "Benutzername"
 
-#: src/dialogs.c:1143 src/dialogs.c:3394 src/dialogs.c:3408
+#: src/dialogs.c:1133
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:1153
+#: src/dialogs.c:1143
 msgid "Group"
 msgstr "Gruppe"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1162
+#: src/dialogs.c:1152
 msgid "Add To"
 msgstr "Hinzufügen zu"
 
-#: src/dialogs.c:1492
+#: src/dialogs.c:1482
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1493
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Privacy-Einstellungen werden sofort wirksam"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1502
 msgid "Set privacy for:"
 msgstr "Setze Privatsphäre für:"
 
-#: src/dialogs.c:1529
+#: src/dialogs.c:1519
 msgid "Allow all users to contact me"
 msgstr "Allen Benutzern erlauben, mich zu kontaktieren"
 
-#: src/dialogs.c:1533
+#: src/dialogs.c:1523
 msgid "Allow only users on my buddy list"
 msgstr "Nur den Benutzern in meiner Buddy-Liste erlauben"
 
-#: src/dialogs.c:1537
+#: src/dialogs.c:1527
 msgid "Allow only the users below"
 msgstr "Nur den untenstehenden Benutzern erlauben"
 
-#: src/dialogs.c:1575
+#: src/dialogs.c:1565
 msgid "Deny all users"
 msgstr "Allen Usern verwehren"
 
-#: src/dialogs.c:1579
+#: src/dialogs.c:1569
 msgid "Block the users below"
 msgstr "Nur den untenstehenden Benutzern verwehren"
 
-#: src/dialogs.c:1694
+#: src/dialogs.c:1684
 msgid "Set Directory Info"
 msgstr "Setze Verzeichnis-Info"
 
+#: src/dialogs.c:1692
+msgid "Directory Info"
+msgstr "Profil"
+
 #: src/dialogs.c:1702
-msgid "Directory Info"
-msgstr "Profil"
-
-#: src/dialogs.c:1712
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "Setze Verzeichnis-Info für %s:"
 
 # Die Übersetzung stimmt nicht, oder?
-#: src/dialogs.c:1724
+#: src/dialogs.c:1714
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Ermöglicht Personen, Ihr Profil im Web zu finden"
 
 #. Line 1
-#: src/dialogs.c:1727 src/dialogs.c:2394
+#: src/dialogs.c:1717 src/dialogs.c:2356
 msgid "First Name"
 msgstr "Vorname"
 
 #. Line 2
-#: src/dialogs.c:1738 src/dialogs.c:2406
+#: src/dialogs.c:1728 src/dialogs.c:2366
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
 #. Line 3
-#: src/dialogs.c:1750 src/dialogs.c:2418
+#: src/dialogs.c:1740 src/dialogs.c:2376
 msgid "Last Name"
 msgstr "Nachname"
 
 #. Line 4
-#: src/dialogs.c:1761 src/dialogs.c:2430
+#: src/dialogs.c:1751 src/dialogs.c:2386
 msgid "Maiden Name"
 msgstr "Mädchenname"
 
 #. Line 6
-#: src/dialogs.c:1783 src/dialogs.c:2453
+#: src/dialogs.c:1773 src/dialogs.c:2405
 msgid "State"
 msgstr "Provinz/Bundesland"
 
-#: src/dialogs.c:1826 src/dialogs.c:2014 src/dialogs.c:3198 src/dialogs.c:3864
-#: src/dialogs.c:4743
+#: src/dialogs.c:1815 src/dialogs.c:1986 src/dialogs.c:3118 src/dialogs.c:3825
+#: src/dialogs.c:4600
 msgid "Save"
 msgstr "Speichern"
 
-#: src/dialogs.c:1848
+#: src/dialogs.c:1837
 msgid "New Passwords Do Not Match"
 msgstr "Die neuen Passwörter stimmen nicht überein"
 
-#: src/dialogs.c:1853
+#: src/dialogs.c:1842
 msgid "Fill out all fields completely"
 msgstr "Bitte alle Felder komplett ausfüllen"
 
-#: src/dialogs.c:1897
+#: src/dialogs.c:1885
 #, c-format
 msgid "Changing password for %s:"
 msgstr "Ändere das Paßworts für %s:"
 
-#: src/dialogs.c:1907
+#: src/dialogs.c:1893
 msgid "Original Password"
 msgstr "Altes Paßwort"
 
-#: src/dialogs.c:1921
+#: src/dialogs.c:1904
 msgid "New Password"
 msgstr "Neues Paßwort"
 
-#: src/dialogs.c:1935
+#: src/dialogs.c:1915
 msgid "New Password (again)"
 msgstr "Neues Paßwort (wiederholen)"
 
 #. Build OK Button
-#: src/dialogs.c:1949 src/dialogs.c:2087 src/dialogs.c:2375 src/dialogs.c:2549
-#: src/dialogs.c:4070
+#: src/dialogs.c:1926 src/dialogs.c:2058 src/dialogs.c:2337 src/dialogs.c:2483
+#: src/dialogs.c:3522 src/dialogs.c:4027 src/prpl.c:316
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:1987
+#: src/dialogs.c:1963
 #, c-format
 msgid "Changing info for %s:"
 msgstr "Ändere die Info für %s:"
 
-#: src/dialogs.c:2073
+#: src/dialogs.c:2044
 msgid "Below are the results of your search: "
 msgstr "Das Resultat Ihrer Suche:"
 
-#: src/dialogs.c:2178
+#: src/dialogs.c:2149
 msgid "Permit"
 msgstr "Zulassen"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2181
 msgid "Add Permit"
 msgstr "Erlauben hinzufügen"
 
-#: src/dialogs.c:2220
+#: src/dialogs.c:2183
 msgid "Add Deny"
 msgstr "Verbieten hinzufügen"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2251
 msgid "Log Conversation"
 msgstr "Unterhaltung mitschneiden"
 
-#: src/dialogs.c:2370 src/dialogs.c:2531
+#: src/dialogs.c:2332 src/dialogs.c:2465
 msgid "Search for Buddy"
 msgstr "Nach Buddies suchen"
 
-#: src/dialogs.c:2498
+#: src/dialogs.c:2432
 msgid "Find Buddy By Info"
 msgstr "Buddy nach Info suchen"
 
 # E-Mail
-#: src/dialogs.c:2525
+#: src/dialogs.c:2459
 msgid "Find Buddy By Email"
 msgstr "Buddy nach E-Mail-Adresse suchen"
 
-#: src/dialogs.c:2633
+#: src/dialogs.c:2563
 msgid "Insert Link"
 msgstr "Link einfügen"
 
-#: src/dialogs.c:2635
+#: src/dialogs.c:2565
 msgid "Insert"
 msgstr "Einfügen"
 
-#: src/dialogs.c:2654
+#: src/dialogs.c:2584
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
@@ -3674,24 +3791,24 @@
 "Bitte gebben Sie die URL und die Beschreibung des Links an, den Sie einfügen "
 "möchten. Die Beschreibung ist optional.\n"
 
-#: src/dialogs.c:2817 src/dialogs.c:2834
+#: src/dialogs.c:2747 src/dialogs.c:2764
 msgid "Select Text Color"
 msgstr "Textfarbe auswählen"
 
-#: src/dialogs.c:2865 src/dialogs.c:2882
+#: src/dialogs.c:2795 src/dialogs.c:2812
 msgid "Select Background Color"
 msgstr "Hintergrundfarbe auswählen"
 
-#: src/dialogs.c:2966 src/dialogs.c:2989
+#: src/dialogs.c:2896 src/dialogs.c:2919
 msgid "Select Font"
 msgstr "Schriftart wählen "
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3054
+#: src/dialogs.c:2984
 msgid "You cannot save an away message with a blank title"
 msgstr "Sie können keine Abwesenheitsnachricht ohne Titel speichern"
 
-#: src/dialogs.c:3055
+#: src/dialogs.c:2985
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
@@ -3700,109 +3817,114 @@
 "nicht abzuspeichern"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3064
+#: src/dialogs.c:2994
 msgid "You cannot create an empty away message"
 msgstr "Sie können keine leere Abwesenheitsmeldung erstellen"
 
-#: src/dialogs.c:3129 src/dialogs.c:3138
+#: src/dialogs.c:3059 src/dialogs.c:3067
 msgid "New away message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
-#: src/dialogs.c:3151
+#: src/dialogs.c:3077
 msgid "Away title: "
 msgstr "Abwesenheits-Titel:"
 
-#: src/dialogs.c:3202
+#: src/dialogs.c:3122
 msgid "Save & Use"
 msgstr "Speichern & Übernehmen"
 
-#: src/dialogs.c:3206
+#: src/dialogs.c:3126
 msgid "Use"
 msgstr "Übernehmen"
 
 #. show everything
-#: src/dialogs.c:3341
+#: src/dialogs.c:3261
 msgid "Smile!"
 msgstr "Lächle!"
 
-#: src/dialogs.c:3384 src/pounce.c:419
-msgid "Buddy"
-msgstr "Buddy"
-
-#: src/dialogs.c:3430
+#: src/dialogs.c:3305
 msgid "Alias Buddy"
 msgstr "Alias für Buddy"
 
-#: src/dialogs.c:3468 src/dialogs.c:3475
+#. Setup the label containing the description.
+#: src/dialogs.c:3335
+msgid ""
+"Please enter an aliased name for the person below, or rename this contact in "
+"your buddy list.\n"
+msgstr ""
+"Bitte geben Sie einen Alias-Namen für die Person unten ein oder benennen Sie "
+"diesen Kontakt in Ihrer Buddy-Liste um.\n"
+
+#: src/dialogs.c:3370
+msgid "_Alias:"
+msgstr "_Alias:"
+
+#: src/dialogs.c:3424 src/dialogs.c:3431
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "Kann nicht an %s schreiben"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3455
 msgid "Save Log File"
 msgstr "Mitschnitt speichern"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3485
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "Kann nicht die Datei %s löschen."
 
-#: src/dialogs.c:3548
+#: src/dialogs.c:3504
 msgid "Clear Log"
 msgstr "Mitschnitt löschen"
 
-#: src/dialogs.c:3557
+#: src/dialogs.c:3513
 msgid "Really clear log?"
 msgstr "Mitschnitt wirklich löschen?"
 
-#: src/dialogs.c:3567
-msgid "Okay"
-msgstr "OK"
-
-#: src/dialogs.c:3604
+#: src/dialogs.c:3558
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "Kann Mitschnittdatei %s kann nicht öffnen."
 
-#: src/dialogs.c:3736
+#: src/dialogs.c:3697
 #, c-format
 msgid "Conversations with %s"
 msgstr "Unterhaltungen mit %s"
 
-#: src/dialogs.c:3738
+#: src/dialogs.c:3699
 msgid "System Log"
 msgstr "System-Mitschnitt"
 
-#: src/dialogs.c:3759
+#: src/dialogs.c:3720
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "Kann Konfigurationsdatei %s kann nicht öffnen"
 
-#: src/dialogs.c:3780
+#: src/dialogs.c:3741
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:3837
+#: src/dialogs.c:3798
 msgid "Conversation"
 msgstr "Unterhaltung"
 
-#: src/dialogs.c:3859
+#: src/dialogs.c:3820
 msgid "Clear"
 msgstr "Löschen"
 
-#: src/dialogs.c:3947
+#: src/dialogs.c:3904
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: src/dialogs.c:3964
+#: src/dialogs.c:3921
 msgid "Please enter a new name for the selected group.\n"
 msgstr "Bitte geben Sie einen neuen Namen für die ausgewählte Gruppe ein.\n"
 
-#: src/dialogs.c:4040 src/dialogs.c:4049
+#: src/dialogs.c:3997 src/dialogs.c:4006
 msgid "Rename Buddy"
 msgstr "Buddy umbenennen"
 
-#: src/dialogs.c:4056
+#: src/dialogs.c:4013
 msgid "New name:"
 msgstr "Neuer Name:"
 
@@ -3826,6 +3948,14 @@
 msgid "File transfer from %s aborted.\n"
 msgstr "Dateitransfer zu %s wurde abgebrochen.\n"
 
+#: src/gaim-disclosure.c:253
+msgid "Expander Size"
+msgstr "Expander-Größe"
+
+#: src/gaim-disclosure.c:254
+msgid "Size of the expander arrow"
+msgstr "Größe des Expander-Pfeils"
+
 #: src/gaim-remote.c:32
 #, c-format
 msgid ""
@@ -3842,48 +3972,105 @@
 "\n"
 "    Kommandos:\n"
 "       uri                      Behandle AIM: URI\n"
-"       quit                     Schließe eine laufende Instanz von Gaim\n"
+"       quit                     Schliesse eine laufende Instanz von Gaim\n"
 "\n"
 "    OPTIONEN:\n"
 "       -h, --help [Kommando]    Zeige Hilfe zum Kommando\n"
 
+#: src/gaim-remote.c:135 src/gaim-remote.c:151
+msgid "Gaim not running (on session 0)\n"
+msgstr "Gaim läuft nicht (Sitzung 0)\n"
+
+#: src/gaim-remote.c:163
+msgid ""
+"\n"
+"Using AIM: URIs:\n"
+"Sending an IM to a screenname:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+"In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
+"is the message to be sent.  '+' must be used in place of spaces.\n"
+"Please note the quoting used above - if you run this from a shell the '&'\n"
+"needs to be escaped, or the command will stop at that point.\n"
+"Also,the following will just open a conversation window to a screenname,\n"
+"with no message:\n"
+"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\n"
+"Joining a chat:\n"
+"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"...joins the 'PenguinLounge' chat room.\n"
+"\n"
+"Adding a buddy to your buddy list:\n"
+"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"...prompts you to add 'Penguin' to your buddy list.\n"
+msgstr ""
+"\n"
+"Benutzung von AIM-URIs:\n"
+"Senden einer Nachricht an einen Screen-Namen (Benutzernamen):\n"
+"\tgaim-remote uri 'aim:goim?screenname=Pinguin&message=Hallo+Welt'\n"
+"In diesem Fall ist 'Pinguin' der Screen-Name, den wir eine Nachricht senden "
+"wollen und 'Hallo Welt'\n"
+"ist die Nachricht, die gesendet wird.  '+' muss anstelle von Leerzeichen "
+"benutzt werden.\n"
+"Bitte verwenden Sie einfache Anfuehrungszeichen wie im Beispiel. Wenn Sie "
+"das Kommando in der Shell eingeben, muss z.B. das '&' in Anfuehrungszeichen "
+"stehen, sonst stoppt die Shell an dieser Stelle.\n"
+"Der folgende Befehl oeffnet nur ein Gespraech mit einem Screen-Namen ohne "
+"Nachricht:\n"
+"\tgaim-remote uri aim:goim?screenname=Pinguin\n"
+"\n"
+"Einen Chatraum beitreten:\n"
+"\tgaim-remote uri aim:gochat?roomname=PinguinRaum\n"
+"...tritt dem 'PinguinRaum' Chatraum bei.\n"
+"\n"
+"Einen Buddy zu Ihrer Buddy-Liste hinzufuegen:\n"
+"\tgaim-remote uri aim:addbuddy?screenname=Pinguin\n"
+"...fragt Sie, ob Sie 'Pinguin' zu Ihrer Buddy-Liste hinzufuegen moechten.\n"
+
+#: src/gaim-remote.c:183
+msgid ""
+"\n"
+"Close running copy of Gaim\n"
+msgstr ""
+"\n"
+"Schliesse eine laufende Instanz von Gaim\n"
+
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:48
+#: src/gaimrc.c:50
 msgid "sorry, i ran out for a while. bbl"
 msgstr "Sorry, ich bin für eine Weile rausgegangen. "
 
-#: src/gaimrc.c:265 src/gaimrc.c:298 src/gaimrc.c:1296
+#: src/gaimrc.c:291 src/gaimrc.c:324 src/gaimrc.c:1447
 msgid "boring default"
 msgstr "langweiliger Standard"
 
-#: src/gaimrc.c:1389
+#: src/gaimrc.c:1540
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Konfigurationsdatei %s kann nicht geöffnet werden."
 
-#: src/gtkconv.c:204
+#: src/gtkconv.c:218
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Bild einfügen"
 
-#: src/gtkconv.c:739
+#: src/gtkconv.c:761
 msgid "Un-Ignore"
 msgstr "Beachten"
 
-#: src/gtkconv.c:741 src/prefs.c:504
+#: src/gtkconv.c:763 src/prefs.c:526
 msgid "Ignore"
 msgstr "Ignorieren"
 
 #. Info button
-#: src/gtkconv.c:750 src/gtkconv.c:2627
+#: src/gtkconv.c:772 src/gtkconv.c:2654
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:851
+#: src/gtkconv.c:866
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Buddy in einen Chatraum einladen"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:879
+#: src/gtkconv.c:894
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -3891,220 +4078,220 @@
 "Bitte geben Sie den Benutzernamen der Person ein, die Sie einladen möchten "
 "zusammen mit einer Einladungsnachricht."
 
-#: src/gtkconv.c:900
+#: src/gtkconv.c:915
 msgid "_Buddy:"
 msgstr "_Buddy"
 
-#: src/gtkconv.c:920
+#: src/gtkconv.c:935
 msgid "_Message:"
 msgstr "_Nachricht"
 
-#: src/gtkconv.c:1935
+#: src/gtkconv.c:1962
 msgid "User is typing..."
 msgstr "Benutzer tippt gerade..."
 
-#: src/gtkconv.c:1943
+#: src/gtkconv.c:1970
 msgid "User has typed something and paused"
 msgstr "Benutzer hat etwas getippt und pausiert"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2047
+#: src/gtkconv.c:2077
 msgid "_Send As"
 msgstr "Ab_schicken als"
 
 #. Conversation menu
-#: src/gtkconv.c:2497
+#: src/gtkconv.c:2527
 msgid "/_Conversation"
 msgstr "/_Unterhaltung"
 
-#: src/gtkconv.c:2498
+#: src/gtkconv.c:2528
 msgid "/Conversation/_Save As..."
 msgstr "/Unterhaltung/_Speichern als..."
 
-#: src/gtkconv.c:2500
+#: src/gtkconv.c:2530
 msgid "/Conversation/View _History..."
 msgstr "/Unterhaltung/Betrachte _History"
 
-#: src/gtkconv.c:2502
+#: src/gtkconv.c:2532
 msgid "/Conversation/Insert _URL..."
 msgstr "/Unterhaltung/Füge _URL ein..."
 
-#: src/gtkconv.c:2504
+#: src/gtkconv.c:2534
 msgid "/Conversation/Insert _Image..."
 msgstr "/Unterhaltung/Füge B_ild ein ..."
 
-#: src/gtkconv.c:2507
+#: src/gtkconv.c:2537
 msgid "/Conversation/_Close"
 msgstr "/Unterhaltung/S_chließen"
 
 #. Options
-#: src/gtkconv.c:2511
+#: src/gtkconv.c:2541
 msgid "/_Options"
 msgstr "/_Optionen"
 
-#: src/gtkconv.c:2512
+#: src/gtkconv.c:2542
 msgid "/Options/Enable _Logging"
 msgstr "/Optionen/Scha_lte Mittschnitt ein"
 
-#: src/gtkconv.c:2513
+#: src/gtkconv.c:2543
 msgid "/Options/Enable _Sounds"
 msgstr "/Optionen/_Schalte Klänge ein"
 
-#: src/gtkconv.c:2549
+#: src/gtkconv.c:2579
 msgid "/Conversation/View History..."
 msgstr "/Unterhaltung/Betrachte History..."
 
-#: src/gtkconv.c:2551
+#: src/gtkconv.c:2581
 msgid "/Conversation/Insert URL..."
 msgstr "/Unterhaltung/Füge URL ein..."
 
-#: src/gtkconv.c:2553
+#: src/gtkconv.c:2583
 msgid "/Conversation/Insert Image..."
 msgstr "/Unterhaltung/Füge Bild ein ..."
 
-#: src/gtkconv.c:2555
+#: src/gtkconv.c:2585
 msgid "/Options/Enable Logging"
 msgstr "/Optionen/Schalte Mittschnitt ein"
 
-#: src/gtkconv.c:2557
+#: src/gtkconv.c:2587
 msgid "/Options/Enable Sounds"
 msgstr "/Optionen/Schalte Klänge ein"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2584 src/gtkconv.c:2586 src/gtkconv.c:2684 src/gtkconv.c:2686
-#: src/gtkconv.c:4917
+#: src/gtkconv.c:2611 src/gtkconv.c:2613 src/gtkconv.c:2711 src/gtkconv.c:2713
+#: src/gtkconv.c:4990
 msgid "Send"
 msgstr "Abschicken"
 
-#: src/gtkconv.c:2607 src/gtkconv.c:3720
+#: src/gtkconv.c:2634 src/gtkconv.c:3769
 msgid "Add the user to your buddy list"
 msgstr "Hinzufügen des Benutzern zu Ihrer Buddy-Liste"
 
-#: src/gtkconv.c:2613 src/gtkconv.c:3711
+#: src/gtkconv.c:2640 src/gtkconv.c:3760
 msgid "Remove the user from your buddy list"
 msgstr "Entferne den Benutzer von der Buddy-Liste"
 
 #. Warn button
-#: src/gtkconv.c:2620
+#: src/gtkconv.c:2647
 msgid "Warn"
 msgstr "Warnen"
 
-#: src/gtkconv.c:2624
+#: src/gtkconv.c:2651
 msgid "Warn the user"
 msgstr "Benutzer warnen"
 
-#: src/gtkconv.c:2631 src/gtkconv.c:3054
+#: src/gtkconv.c:2658 src/gtkconv.c:3085
 msgid "Get the user's information"
 msgstr "Hole die Information des Benutzers"
 
 #. Block button
-#: src/gtkconv.c:2634
+#: src/gtkconv.c:2661
 msgid "Block"
 msgstr "Sperren"
 
-#: src/gtkconv.c:2638
+#: src/gtkconv.c:2665
 msgid "Block the user"
 msgstr "Benutzer blockieren"
 
 #. Invite
-#: src/gtkconv.c:2696 src/gtkconv.c:4920
+#: src/gtkconv.c:2723 src/gtkconv.c:4993
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/gtkconv.c:2699
+#: src/gtkconv.c:2726
 msgid "Invite a user"
 msgstr "Benutzer einladen"
 
-#: src/gtkconv.c:2738
+#: src/gtkconv.c:2765
 msgid "Bold"
 msgstr "Fett"
 
-#: src/gtkconv.c:2749
+#: src/gtkconv.c:2776
 msgid "Italic"
 msgstr "Kursiv"
 
-#: src/gtkconv.c:2760
+#: src/gtkconv.c:2787
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: src/gtkconv.c:2776
+#: src/gtkconv.c:2803
 msgid "Larger font size"
 msgstr "Größere Schriftgröße"
 
-#: src/gtkconv.c:2786
+#: src/gtkconv.c:2815
 msgid "Normal font size"
 msgstr "Normale Schriftgröße"
 
-#: src/gtkconv.c:2798
+#: src/gtkconv.c:2827
 msgid "Smaller font size"
 msgstr "Kleinere Schriftgröße"
 
-#: src/gtkconv.c:2813
+#: src/gtkconv.c:2844
 msgid "Font Face"
 msgstr "Schriftart"
 
-#: src/gtkconv.c:2825
+#: src/gtkconv.c:2856
 msgid "Foreground font color"
 msgstr "Vordergrundfarbe"
 
-#: src/gtkconv.c:2837
+#: src/gtkconv.c:2868
 msgid "Background color"
 msgstr "Hintergrundfarbe"
 
-#: src/gtkconv.c:2852
+#: src/gtkconv.c:2883
 msgid "Insert image"
 msgstr "Bild einfügen"
 
-#: src/gtkconv.c:2863
+#: src/gtkconv.c:2894
 msgid "Insert link"
 msgstr "Link einfügen"
 
-#: src/gtkconv.c:2874
+#: src/gtkconv.c:2905
 msgid "Insert smiley"
 msgstr "Smiley einfügen"
 
-#: src/gtkconv.c:2927
+#: src/gtkconv.c:2958
 msgid "Topic:"
 msgstr "Thema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:2974
+#: src/gtkconv.c:3005
 msgid "0 people in room"
 msgstr "0 Leute im Raum"
 
-#: src/gtkconv.c:3031
+#: src/gtkconv.c:3062
 msgid "IM the user"
 msgstr "IM des Benutzers"
 
-#: src/gtkconv.c:3043
+#: src/gtkconv.c:3074
 msgid "Ignore the user"
 msgstr "Benutzer ignorieren"
 
-#: src/gtkconv.c:3560
+#: src/gtkconv.c:3603
 msgid "Close conversation"
 msgstr "Unterhaltung schließen"
 
-#: src/gtkconv.c:4126 src/gtkconv.c:4248
+#: src/gtkconv.c:4198 src/gtkconv.c:4320
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d Person im Raum"
 msgstr[1] "%d Personen im Raum"
 
-#: src/gtkconv.c:4606
+#: src/gtkconv.c:4679
 msgid "Disable Animation"
 msgstr "Animation deaktivieren"
 
-#: src/gtkconv.c:4615
+#: src/gtkconv.c:4688
 msgid "Enable Animation"
 msgstr "Animation aktivieren"
 
-#: src/gtkconv.c:4622
+#: src/gtkconv.c:4695
 msgid "Hide Icon"
 msgstr "Icon verbergen"
 
-#: src/gtkconv.c:4628
+#: src/gtkconv.c:4701
 msgid "Save Icon As..."
 msgstr "Icon speichern unter..."
 
@@ -4165,63 +4352,214 @@
 msgid "Time Remaining:"
 msgstr "Zeit verbleibend:"
 
-#: src/gtkft.c:565
+#: src/gtkft.c:566
 msgid "File Transfers"
 msgstr "Dateitransfers"
 
-#: src/gtkft.c:594
+#: src/gtkft.c:595
 msgid "_Keep the dialog open"
 msgstr "_Lasse den Dialog offen"
 
-#: src/gtkft.c:604
+#: src/gtkft.c:605
 msgid "_Clear finished transfers"
 msgstr "_Entferne beendete Transfers"
 
 #. "Download Details" arrow
-#: src/gtkft.c:613
+#: src/gtkft.c:614
 msgid "Show download details"
 msgstr "Zeige Download-Details"
 
-#: src/gtkft.c:614
+#: src/gtkft.c:615
 msgid "Hide download details"
 msgstr "Verstecke Download-Details"
 
 #. Pause button
-#: src/gtkft.c:656
+#: src/gtkft.c:657
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:666
+#: src/gtkft.c:667
 msgid "_Resume"
 msgstr "Fo_rtsetzen"
 
-#: src/gtkft.c:1000
+#: src/gtkft.c:1001
 msgid "That file already exists. Would you like to overwrite it?"
 msgstr "Diese Datei existiert bereits. Möchten Sie die Datei überschreiben?"
 
-#: src/gtkft.c:1017
+#: src/gtkft.c:1018
 msgid "That file does not exist."
 msgstr "Diese Datei existiert nicht."
 
-#: src/gtkft.c:1041
+#: src/gtkft.c:1042
 msgid "Gaim - Open..."
 msgstr "Gaim - Öffnen..."
 
-#: src/gtkft.c:1090
+#: src/gtkft.c:1091
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s möchte Ihnen %s (%s) senden"
 
-#: src/gtkimhtml.c:316
+#: src/gtkimhtml.c:342
 msgid "_Copy Link Location"
 msgstr "_Kopiere den Link"
 
-#: src/gtkimhtml.c:323
+#: src/gtkimhtml.c:349
 msgid "_Open Link in Browser"
 msgstr "Ö_ffne Link um Browser"
 
-#: src/gtkutils.c:315
+#: src/gtkimhtml.c:1625
+msgid ""
+"Gaim was unable to guess the image type base on the file extension "
+"supplied.  Defaulting to PNG."
+msgstr ""
+"Gaim konnte nicht den Dateityp basierend auf der Dateiendung erraten. Wähle "
+"Standard-Dateityp PNG."
+
+#: src/gtkimhtml.c:1633
+#, c-format
+msgid "Error saving image: %s"
+msgstr "Fehler beim Speichern des Bildes: %s"
+
+#: src/gtkimhtml.c:1642
+msgid "Gaim - Save Image"
+msgstr "Gaim - Bild speichern"
+
+#: src/gtkimhtml.c:1664
+msgid "_Save Image..."
+msgstr "Bild _speichern..."
+
+#: src/gtkpounce.c:108
+msgid "Please enter a buddy to pounce."
+msgstr "Bitte Buddy zum Alarmieren angeben."
+
+#: src/gtkpounce.c:280
+#, c-format
+msgid "%s has started typing to you"
+msgstr "%s kann begonnen, an Sie zu schreiben"
+
+#: src/gtkpounce.c:281
+#, c-format
+msgid "%s has signed on"
+msgstr "%s wurde angemeldet"
+
+#: src/gtkpounce.c:282
+#, c-format
+msgid "%s has returned from being idle"
+msgstr "%s kehrt von Inaktivität zurück"
+
+#: src/gtkpounce.c:283
+#, c-format
+msgid "%s has returned from being away"
+msgstr "%s kam zurück"
+
+#: src/gtkpounce.c:284
+#, c-format
+msgid "%s has stopped typing to you"
+msgstr "%s kann aufgehört, an Sie zu schreiben"
+
+#: src/gtkpounce.c:285
+#, c-format
+msgid "%s has signed off"
+msgstr "%s wurde abgemeldet"
+
+#: src/gtkpounce.c:286
+#, c-format
+msgid "%s has become idle"
+msgstr "%s wurde inaktiv"
+
+#: src/gtkpounce.c:287
+#, c-format
+msgid "%s has gone away."
+msgstr "%s ist weggegangen."
+
+#: src/gtkpounce.c:288
+msgid "Unknown pounce event. Please report this!"
+msgstr "Unbekanntes Alarm-Ereignis. Bitte berichten Sie dieses Problem!"
+
+#. "New Buddy Pounce"
+#: src/gtkpounce.c:429 src/gtkpounce.c:737
+msgid "New Buddy Pounce"
+msgstr "Neuer Buddy-Alarm"
+
+#: src/gtkpounce.c:429
+msgid "Edit Buddy Pounce"
+msgstr "Buddy-Alarm bearbeiten"
+
+#. Create the "Pounce Who" frame.
+#: src/gtkpounce.c:447
+msgid "Pounce Who"
+msgstr "Wen alarmieren"
+
+#: src/gtkpounce.c:469
+msgid "_Buddy Name:"
+msgstr "_Buddy-Name"
+
+#. Create the "Pounce When" frame.
+#: src/gtkpounce.c:488
+msgid "Pounce When"
+msgstr "Wann alarmieren"
+
+#: src/gtkpounce.c:496
+msgid "Sign on"
+msgstr "Anmeldung"
+
+#: src/gtkpounce.c:498
+msgid "Sign off"
+msgstr "Abmeldung"
+
+#: src/gtkpounce.c:502
+msgid "Return from away"
+msgstr "Rückkehr von der Abwesenheit"
+
+#: src/gtkpounce.c:506
+msgid "Return from idle"
+msgstr "Rückkehr von Inaktivität"
+
+#: src/gtkpounce.c:508
+msgid "Buddy starts typing"
+msgstr "Buddy beginnt zu tippen"
+
+#: src/gtkpounce.c:510
+msgid "Buddy stops typing"
+msgstr "Buddy tippt nicht mehr"
+
+#. Create the "Pounce Action" frame.
+#: src/gtkpounce.c:539
+msgid "Pounce Action"
+msgstr "Alarm-Aktion"
+
+# IM benutzen?
+#: src/gtkpounce.c:546
+msgid "Open an IM window"
+msgstr "Nachricht-Fenster öffnen"
+
+#: src/gtkpounce.c:547
+msgid "Popup notification"
+msgstr "Popup-Benachrichtigung"
+
+#: src/gtkpounce.c:548
+msgid "Send a message"
+msgstr "Eine Nachricht senden"
+
+#: src/gtkpounce.c:549
+msgid "Execute a command"
+msgstr "Einen Befehl ausführen"
+
+#: src/gtkpounce.c:550
+msgid "Play a sound"
+msgstr "Spiele einen Klang"
+
+#: src/gtkpounce.c:605
+msgid "_Save this pounce after activation"
+msgstr "Diesen Alarm nach Aktivierung _speichern"
+
+#. "Remove Buddy Pounce"
+#: src/gtkpounce.c:744
+msgid "Remove Buddy Pounce"
+msgstr "Buddy-Alarm entfernen"
+
+#: src/gtkutils.c:318
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Icon speichern"
 
@@ -4234,24 +4572,37 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fehler: Verbindung kann nicht hergestellt werden.\n"
 
-#: src/list.c:465
+#: src/list.c:405
+#, c-format
+msgid ""
+"%d buddies from group %s were not removed because their accounts were not "
+"logged in.  These buddies, and the group were not removed.\n"
+msgstr ""
+"%d Buddies aus der Gruppe %s wurden nicht entfernt, weil ihre Kontos nicht "
+"angemeldet waren.  Diese Buddies und die Gruppe werden nicht entfernt.\n"
+
+#: src/list.c:409
+msgid "Group Not Removed"
+msgstr "Gruppe nicht entfernt"
+
+#: src/list.c:544
 msgid "Invalid Groupname"
 msgstr "Ungültiger Gruppenname"
 
-#: src/list.c:1088
+#: src/list.c:1173
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 "Ein Fehler wurde beim Parsen Ihrer Buddy-Liste festgestellt.  Die Liste "
 "wurde nicht geladen."
 
-#: src/list.c:1090
+#: src/list.c:1175
 msgid "Buddy List Error"
 msgstr "Buddy-Listen Fehler"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/list.c:1096
+#: src/list.c:1181
 #, c-format
 msgid ""
 "Gaim is converting your old buddy lists to a new format, which will now be "
@@ -4260,7 +4611,7 @@
 "Gaim konvertiert Ihre alte Buddy-Liste in ein neues Format, welchen nun "
 "unter %s gespeichert wird"
 
-#: src/list.c:1099
+#: src/list.c:1184
 msgid "Converting Buddy List"
 msgstr "Buddy-Liste konvertieren"
 
@@ -4379,137 +4730,145 @@
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) berichtet, daß %s wieder aktiv ist @ %s"
 
-#: src/main.c:178
+#: src/main.c:177
 msgid "Please enter your login."
 msgstr "Bitte geben Sie Ihren Benutzernamen ein."
 
-#: src/main.c:265
+#: src/main.c:264
 msgid "<New User>"
 msgstr "<Neuer Benutzer>"
 
-#: src/main.c:308
+#: src/main.c:306
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/main.c:331
+#: src/main.c:322
 msgid "Screen Name:"
 msgstr "Benutzername: "
 
 #. And now for the buttons
-#: src/main.c:365
+#: src/main.c:356
 msgid "Accounts"
 msgstr "Konten"
 
-#: src/main.c:375
-msgid "Settings"
+#: src/main.c:366 src/prefs.c:1770 src/win32/systray.c:294
+msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/main.c:381 src/win32/systray.c:145
+#: src/main.c:372 src/win32/systray.c:146
 msgid "Sign On"
 msgstr "Anmelden"
 
-#: src/multi.c:259
+#: src/multi.c:264
 msgid "Screenname"
 msgstr "Benutzername"
 
-#: src/multi.c:287
+#: src/multi.c:292
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/multi.c:590
+#: src/multi.c:618
 msgid "Load Buddy Icon"
 msgstr "Buddy-Icon laden"
 
-#: src/multi.c:633
+#: src/multi.c:661
 msgid "Buddy Icon File:"
 msgstr "Buddy-Icon Datei:"
 
-#: src/multi.c:646
+#: src/multi.c:674
 msgid "Browse"
 msgstr "Auswählen"
 
-#: src/multi.c:651 src/prefs.c:913 src/prefs.c:1534
+#: src/multi.c:679 src/prefs.c:1546
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: src/multi.c:668
+#: src/multi.c:705
 msgid "Login Options"
 msgstr "Anmeldeoptionen"
 
-#: src/multi.c:678
-msgid "Screenname:"
-msgstr "Benutzername:"
-
-#: src/multi.c:701
-msgid "Alias:"
-msgstr "Alias:"
-
-#: src/multi.c:713
+#: src/multi.c:717
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/multi.c:720
+#: src/multi.c:731
+msgid "Screenname:"
+msgstr "Benutzername:"
+
+#: src/multi.c:778
+msgid "Alias:"
+msgstr "Alias:"
+
+#: src/multi.c:786
 msgid "Remember Password"
 msgstr "Paßwort speichern"
 
-#: src/multi.c:721
+#: src/multi.c:787
 msgid "Auto-Login"
 msgstr "Auto-Login"
 
-#: src/multi.c:754
+#: src/multi.c:843
 msgid "User Options"
 msgstr "Benutzereinstellungen"
 
-#: src/multi.c:763
+#: src/multi.c:853
 msgid "New Mail Notifications"
 msgstr "Neue Mail-Benachrichtigungen"
 
-#: src/multi.c:815
+#: src/multi.c:905
 #, c-format
 msgid "%s Options"
 msgstr "%s Einstellungen"
 
-#: src/multi.c:857
+#: src/multi.c:948
 msgid "Register with server"
 msgstr "Beim Server anmelden"
 
-#: src/multi.c:886
+#: src/multi.c:981
 msgid "Proxy Options"
 msgstr "Proxy-Optionen"
 
-#: src/multi.c:900
+#: src/multi.c:995
 msgid "Proxy _Type"
 msgstr "Proxy-_Typ"
 
-#: src/multi.c:909
+#: src/multi.c:1004
 msgid "Use Global Proxy Settings"
 msgstr "Benutze globale Proxy-Einstellungen"
 
-#: src/multi.c:918
+#: src/multi.c:1013
 msgid "No Proxy"
 msgstr "Kein Proxy"
 
-#: src/multi.c:970
+#: src/multi.c:1065
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/multi.c:1006
+#: src/multi.c:1101
 msgid "_User:"
 msgstr "_Benutzer:"
 
-#: src/multi.c:1022
+#: src/multi.c:1117
 msgid "Pa_ssword:"
 msgstr "_Paßwort"
 
-#: src/multi.c:1088
+#: src/multi.c:1188
 msgid "Modify Account"
 msgstr "Konto bearbeiten"
 
-#: src/multi.c:1211
+#: src/multi.c:1206
+msgid "Show more options"
+msgstr "Zeige mehr Optionen"
+
+#: src/multi.c:1206
+msgid "Show fewer options"
+msgstr "Zeige weniger Optionen"
+
+#: src/multi.c:1315
 msgid "_Login"
 msgstr "Anme_lden"
 
-#: src/multi.c:1229
+#: src/multi.c:1333
 #, c-format
 msgid ""
 "Please enter your password for %s.\n"
@@ -4518,15 +4877,15 @@
 "Bitte geben Sie Ihr Paßwort für %s ein.\n"
 "\n"
 
-#: src/multi.c:1240
+#: src/multi.c:1344
 msgid "_Password"
 msgstr "_Paßwort"
 
-#: src/multi.c:1279
+#: src/multi.c:1383
 msgid "TOC not found."
 msgstr "TOC nicht gefunden."
 
-#: src/multi.c:1280
+#: src/multi.c:1384
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
@@ -4537,11 +4896,11 @@
 "Plugin kompiliert. Um sich damit anzumelden, editieren Sie dieses Konto, um "
 "OSCAR zu benutzen und laden Sie das TOC-Plugin."
 
-#: src/multi.c:1286
+#: src/multi.c:1390
 msgid "Protocol not found."
 msgstr "Protokoll nicht gefunden"
 
-#: src/multi.c:1287
+#: src/multi.c:1391
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -4550,40 +4909,40 @@
 "Protokoll nicht geladen haben oder da dieses Protokoll keine Anmelde-"
 "Funktion besitzt."
 
-#: src/multi.c:1363
+#: src/multi.c:1467
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wollen Sie %s wirklich löschen?"
 
-#: src/multi.c:1364
+#: src/multi.c:1468
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/multi.c:1393
+#: src/multi.c:1497
 msgid "Account Editor"
 msgstr "Konten-Editor"
 
-#: src/multi.c:1458
+#: src/multi.c:1562
 msgid "_Modify"
 msgstr "_Bearbeiten"
 
-#: src/multi.c:1506
+#: src/multi.c:1610
 msgid "Done."
 msgstr "Fertig."
 
-#: src/multi.c:1704
+#: src/multi.c:1840
 msgid "Signon: "
 msgstr "Anmeldung: "
 
-#: src/multi.c:1762
+#: src/multi.c:1898
 msgid "Signon"
 msgstr "Anmeldung: "
 
-#: src/multi.c:1774
+#: src/multi.c:1910
 msgid "Cancel All"
 msgstr "Alle Abbrechen"
 
-#: src/multi.c:1831
+#: src/multi.c:1963
 #, c-format
 msgid ""
 "%s\n"
@@ -4592,328 +4951,329 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1852
+#: src/multi.c:1984
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s konnte sich nicht anmelden"
 
-#: src/multi.c:1853
+#: src/multi.c:1985
 msgid "Signon Error"
 msgstr "Anmeldefehler"
 
-#: src/multi.c:1864
+#: src/multi.c:1996
 msgid "Notice"
 msgstr "Hinweis"
 
-#: src/multi.c:1876
+#: src/multi.c:2008
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s wurde abgemeldet"
 
-#: src/multi.c:1877
+#: src/multi.c:2009
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
-#: src/perl.c:382
+#: src/perl.c:386
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr ""
 "GAIM::registen wurde nicht mit den richtigen Argumenten aufgerufen. Lesen "
 "SIe das PERL-HOWTO."
 
-#: src/prefs.c:191
+#: src/prefs.c:193
 msgid "Interface Options"
 msgstr "Allgemeine Einstellungen"
 
-#: src/prefs.c:193
+#: src/prefs.c:195
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "_Anzeigen entfernter Spitznamen, wenn kein Alias gesetzt ist"
 
-#: src/prefs.c:352
+#: src/prefs.c:374
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr ""
 "Wählen Sie ein Smilie-Thema, daß Sie benutzen möchten, aus der "
-"untenstehenden Liste. Neue Themen können durch Drap-and-Drop in die "
+"untenstehenden Liste. Neue Themen können durch Drag-and-Drop in die "
 "Themenliste installiert werden."
 
-#: src/prefs.c:385
+#: src/prefs.c:407
 msgid "Icon"
 msgstr "Icon"
 
-#: src/prefs.c:419
+#: src/prefs.c:441
 msgid "Style"
 msgstr "Stil"
 
-#: src/prefs.c:420
+#: src/prefs.c:442
 msgid "_Bold"
 msgstr "Fett (_B)"
 
-#: src/prefs.c:421
+#: src/prefs.c:443
 msgid "_Italics"
 msgstr "Kurs_iv"
 
-#: src/prefs.c:422
+#: src/prefs.c:444
 msgid "_Underline"
 msgstr "_Unterstrichen"
 
-#: src/prefs.c:423
+#: src/prefs.c:445
 msgid "_Strikethrough"
 msgstr "Durchge_strichen"
 
-#: src/prefs.c:425
+#: src/prefs.c:447
 msgid "Face"
 msgstr "Schriftart"
 
-#: src/prefs.c:428
+#: src/prefs.c:450
 msgid "Use custo_m face"
 msgstr "Benutzerdefinierte _Schrift verwenden"
 
-#: src/prefs.c:442
+#: src/prefs.c:464
 msgid "Use custom si_ze"
 msgstr "Benutzerdefinierte _Größe verwenden"
 
-#: src/prefs.c:450
-msgid "Color"
-msgstr "Farbe"
-
-#: src/prefs.c:455
-msgid "_Text color"
-msgstr "_Text-Farbe"
-
 #: src/prefs.c:472
+msgid "Color"
+msgstr "Farbe"
+
+#: src/prefs.c:477
+msgid "_Text color"
+msgstr "_Text-Farbe"
+
+#: src/prefs.c:494
 msgid "Bac_kground color"
 msgstr "_Hintergrundfarbe"
 
-#: src/prefs.c:497 src/prefs.c:630 src/prefs.c:670
+#: src/prefs.c:519 src/prefs.c:662 src/prefs.c:703
 msgid "Display"
 msgstr "Anzeige"
 
-#: src/prefs.c:498
+#: src/prefs.c:520
 msgid "Show graphical _smileys"
 msgstr "Grafische _Smileys anzeigen"
 
-#: src/prefs.c:499
+#: src/prefs.c:521
 msgid "Show _timestamp on messages"
 msgstr "Zei_tstemple bei Nachrichten zeigen"
 
-#: src/prefs.c:500
+#: src/prefs.c:522
 msgid "Show _URLs as links"
 msgstr "_URLs als Link zeigen"
 
-#: src/prefs.c:502
+#: src/prefs.c:524
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter hervorheben"
 
-#: src/prefs.c:505
+#: src/prefs.c:527
 msgid "Ignore c_olors"
 msgstr "_Schriftfarben ignorieren"
 
-#: src/prefs.c:506
+#: src/prefs.c:528
 msgid "Ignore font _faces"
 msgstr "Schri_ftarten ignorieren"
 
-#: src/prefs.c:507
+#: src/prefs.c:529
 msgid "Ignore font si_zes"
 msgstr "Schrift_größe ignorieren"
 
-#: src/prefs.c:520 src/pounce.c:512
+#: src/prefs.c:542
 msgid "Send Message"
 msgstr "Nachricht senden"
 
-#: src/prefs.c:521
+#: src/prefs.c:543
 msgid "_Enter sends message"
 msgstr "_Enter-Taste verschickt Nachricht"
 
-#: src/prefs.c:522
+#: src/prefs.c:544
 msgid "C_ontrol-Enter sends message"
 msgstr "Strg+E_nter-Taste verschickt Nachricht"
 
-#: src/prefs.c:524
+#: src/prefs.c:546
 msgid "Window Closing"
 msgstr "Fenster schließen"
 
-#: src/prefs.c:525
+#: src/prefs.c:547
 msgid "E_scape closes window"
 msgstr "E_sc schließt Fenster"
 
-#: src/prefs.c:526
+#: src/prefs.c:548
 msgid "Control-_W closes window"
 msgstr "Strg-_W schließt Fenster"
 
-#: src/prefs.c:529
+#: src/prefs.c:551
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Strg-{B/I/U/S} fügt _HTML-Tags ein"
 
-#: src/prefs.c:530
+#: src/prefs.c:552
 msgid "Control-(number) inserts _smileys"
 msgstr "Strg-(Ziffer) fügt _Smileys ein"
 
-#: src/prefs.c:542
-msgid "Buttons"
-msgstr "Knöpfe"
-
-#: src/prefs.c:543
-msgid "_Hide IM/Info/Chat buttons"
-msgstr "Nac_hrichten/Info/Chat-Buttons verstecken"
-
-#: src/prefs.c:544
-msgid "Show _pictures on buttons"
-msgstr "_Bild auf Buttons anzeigen"
-
-#: src/prefs.c:547
-msgid "_Save window size/position"
-msgstr "_Fensterposition und -größe speichern"
-
-#: src/prefs.c:548
+#: src/prefs.c:565
+msgid "Buddy List Toolbar"
+msgstr "Buddy-Listen Werkzeugleiste"
+
+#: src/prefs.c:566 src/prefs.c:645 src/prefs.c:688
+msgid "Show _buttons as:"
+msgstr "_Buttons zeigen als:"
+
+#: src/prefs.c:567 src/prefs.c:646 src/prefs.c:689
+msgid "Pictures"
+msgstr "nur Bilder"
+
+#: src/prefs.c:568 src/prefs.c:647 src/prefs.c:690
+msgid "Text"
+msgstr "Text"
+
+#: src/prefs.c:569 src/prefs.c:648 src/prefs.c:691
+msgid "Pictures and text"
+msgstr "Bilder und Text"
+
+#: src/prefs.c:570 src/prefs.c:1075
+msgid "None"
+msgstr "Kein"
+
+#: src/prefs.c:573
 msgid "_Raise window on events"
 msgstr "Fenster bei Ereignis in _Vordergrund bringen"
 
-#. vbox = make_frame (ret, _("Group Display"));
+#: src/prefs.c:575
+msgid "Group Display"
+msgstr "Gruppen-Anzeige"
+
 #. gaim_button(_("Hide _groups with no online buddies"), &blist_options, OPT_BLIST_NO_MT_GRP, vbox);
-#. gaim_button(_("Show _numbers in groups"), &blist_options, OPT_BLIST_SHOW_GRPNUM, vbox);
-#: src/prefs.c:554
+#: src/prefs.c:577
+msgid "Show _numbers in groups"
+msgstr "A_nzahl in Gruppe anzeigen"
+
+#: src/prefs.c:579
 msgid "Buddy Display"
 msgstr "Buddy-Anzeige"
 
-#: src/prefs.c:555
+#: src/prefs.c:580
 msgid "Show buddy _icons"
 msgstr "Buddy-_Icons anzeigen"
 
-#. gaim_button(_("Show buddy t_ype icons"), &blist_options, OPT_BLIST_SHOW_PIXMAPS, vbox);
-#: src/prefs.c:557
+#: src/prefs.c:581
 msgid "Show _warning levels"
 msgstr "_Warnstufen anzeigen"
 
-#: src/prefs.c:558
+#: src/prefs.c:586
 msgid "Show idle _times"
 msgstr "Inaktivitätszei_ten anzeigen"
 
-#: src/prefs.c:559
-msgid "Grey i_dle buddies"
+#: src/prefs.c:591
+msgid "Dim i_dle buddies"
 msgstr "I_naktive Buddies grau anzeigen"
 
-#: src/prefs.c:577 src/prefs.c:1704
+#: src/prefs.c:609 src/prefs.c:1716
 msgid "Conversations"
 msgstr "Unterhaltungen"
 
-#: src/prefs.c:585
+#: src/prefs.c:617
 msgid "_Placement:"
 msgstr "_Platzierung:"
 
-#: src/prefs.c:593
+#: src/prefs.c:625
 msgid "Show IMs and chats in _same tabbed window."
 msgstr "IMs und Chats im _selben Reiter-Fenster anzeigen"
 
-#: src/prefs.c:612 src/prefs.c:654
+#: src/prefs.c:644 src/prefs.c:687
 msgid "Window"
 msgstr "Fenster"
 
-#: src/prefs.c:613 src/prefs.c:655
-msgid "Show _buttons as:"
-msgstr "_Buttons zeigen als:"
-
-#: src/prefs.c:614 src/prefs.c:656
-msgid "Pictures"
-msgstr "nur Bilder"
-
-#: src/prefs.c:615 src/prefs.c:657
-msgid "Text"
-msgstr "Text"
-
-#: src/prefs.c:616 src/prefs.c:658
-msgid "Pictures and text"
-msgstr "Bilder und Text"
-
-#: src/prefs.c:619 src/prefs.c:661
+#: src/prefs.c:651 src/prefs.c:694
 msgid "New window _width:"
 msgstr "Neue Fenster_breite:"
 
-#: src/prefs.c:620 src/prefs.c:662
+#: src/prefs.c:652 src/prefs.c:695
 msgid "New window _height:"
 msgstr "Neue Fenster_höhe:"
 
-#: src/prefs.c:621 src/prefs.c:663
+#: src/prefs.c:653 src/prefs.c:696
 msgid "_Entry widget height:"
 msgstr "Höhe des _Eingabefelds:"
 
-#: src/prefs.c:622 src/prefs.c:664
+#: src/prefs.c:654 src/prefs.c:697
 msgid "_Raise windows on events"
 msgstr "Fenster bei Ereignis in _Vordergrund bringen"
 
-#: src/prefs.c:623
+#: src/prefs.c:655
 msgid "Hide window on _send"
 msgstr "Fenster beim _Senden verbergen"
 
-#: src/prefs.c:626
+#: src/prefs.c:658
 msgid "Buddy Icons"
 msgstr "Buddy-Icons"
 
-#: src/prefs.c:627
+#: src/prefs.c:659
 msgid "Hide buddy _icons"
 msgstr "Buddy-_Icons verbergen"
 
-#: src/prefs.c:628
+#: src/prefs.c:660
 msgid "Disable buddy icon a_nimation"
 msgstr "Buddy-Icon-A_nimation deaktivieren"
 
-#: src/prefs.c:631
+#: src/prefs.c:663
 msgid "Show _logins in window"
 msgstr "Anme_ldungen im Fenster zeigen"
 
-#: src/prefs.c:633
+#: src/prefs.c:664
+msgid "Show a_liases in tabs/titles"
+msgstr "A_liase in Reitern/Titeln anzeigen"
+
+#: src/prefs.c:666
 msgid "Typing Notification"
 msgstr "Tipp-Benachrichtigung"
 
-#: src/prefs.c:634
+#: src/prefs.c:667
 msgid "Notify buddies that you are _typing to them"
 msgstr "Buddies benachrichten, dass man Ihnen schreib_t"
 
-#: src/prefs.c:666
+#: src/prefs.c:699
 msgid "Tab Completion"
 msgstr "Tabulator-Vervollständigung"
 
-#: src/prefs.c:667
+#: src/prefs.c:700
 msgid "_Tab-complete nicks"
 msgstr "Spitznamen mit _Tabulator vervollständigen"
 
-#: src/prefs.c:668
+#: src/prefs.c:701
 msgid "_Old-style tab completion"
 msgstr "Alte Tabulator-Verv_ollständigung"
 
-#: src/prefs.c:671
+#: src/prefs.c:704
 msgid "_Show people joining/leaving in window"
 msgstr "Eintretende/Verla_ssende Personen im Fenster anzeigen"
 
-#: src/prefs.c:672
+#: src/prefs.c:705
 msgid "Co_lorize screennames"
 msgstr "_Färbe Benutzernamen ein"
 
-#: src/prefs.c:689
+#: src/prefs.c:722
 msgid "IM Tabs"
 msgstr "IM Reiter"
 
-#: src/prefs.c:690 src/prefs.c:700 src/prefs.c:710
+#: src/prefs.c:723 src/prefs.c:733
 msgid "Tab _placement:"
 msgstr "Reiter-_Platzierung:"
 
-#: src/prefs.c:691 src/prefs.c:701 src/prefs.c:711
+#: src/prefs.c:724 src/prefs.c:734
 msgid "Top"
 msgstr "Oben"
 
-#: src/prefs.c:692 src/prefs.c:702 src/prefs.c:712
+#: src/prefs.c:725 src/prefs.c:735
 msgid "Bottom"
 msgstr "Unten"
 
-#: src/prefs.c:693 src/prefs.c:703
+#: src/prefs.c:726 src/prefs.c:736
 msgid "Left"
 msgstr "Links"
 
-#: src/prefs.c:694 src/prefs.c:704
+#: src/prefs.c:727 src/prefs.c:737
 msgid "Right"
 msgstr "Rechts"
 
-#: src/prefs.c:696
+#: src/prefs.c:729
 msgid ""
 "Show all _instant messages in one tabbed\n"
 "window"
@@ -4921,186 +5281,178 @@
 "Alle Chats in einem _Reiter-Fenster\n"
 "zeigen"
 
-#: src/prefs.c:697
-msgid "Show a_liases in tabs/titles"
-msgstr "A_liase in Reitern/Titeln anzeigen"
-
-#: src/prefs.c:699
+#: src/prefs.c:732
 msgid "Chat Tabs"
 msgstr "Chat-Reiter"
 
-#: src/prefs.c:706
+#: src/prefs.c:739
 msgid "Show all c_hats in one tabbed window"
 msgstr "Alle Chats in einem R_eiter-Fenster zeigen"
 
-#: src/prefs.c:709
-msgid "Buddy List Tabs"
-msgstr "Buddy-Listen Reiter"
-
-#: src/prefs.c:715
+#: src/prefs.c:742
 msgid "Tab Options"
 msgstr "Reiter-Optionen"
 
-#: src/prefs.c:716
+#: src/prefs.c:743
 msgid "Show _close button on tabs."
 msgstr "_Beenden-Button in Reitern zeigen."
 
-#: src/prefs.c:736
+#: src/prefs.c:763
 msgid "Proxy Type"
 msgstr "Proxy-Typ"
 
-#: src/prefs.c:737
+#: src/prefs.c:764
 msgid "Proxy _type:"
 msgstr "Proxy-_Typ"
 
-#: src/prefs.c:738
+#: src/prefs.c:765
 msgid "No proxy"
 msgstr "Kein Proxy"
 
-#: src/prefs.c:748
+#: src/prefs.c:770
 msgid "Proxy Server"
 msgstr "Proxy-Server"
 
-#: src/prefs.c:761
+#: src/prefs.c:783
 msgid "_Host"
 msgstr "_Host"
 
-#: src/prefs.c:775
+#: src/prefs.c:797
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:791
+#: src/prefs.c:813
 msgid "_User"
 msgstr "_Benutzer"
 
-#: src/prefs.c:805
+#: src/prefs.c:827
 msgid "Pa_ssword"
 msgstr "_Paßwort"
 
-#: src/prefs.c:826
+#: src/prefs.c:848
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
 msgstr ""
 "Der eingegebene Hilfetext-Browser '%s' ist nicht korrekt. Hyperlinks werden "
 "nicht funktionieren."
 
-#: src/prefs.c:848
+#: src/prefs.c:869
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/prefs.c:849
+#: src/prefs.c:870
 msgid "Opera"
 msgstr "Opera"
 
-#: src/prefs.c:850
+#: src/prefs.c:871
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:851
+#: src/prefs.c:872
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:852
+#: src/prefs.c:873
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/prefs.c:860
+#: src/prefs.c:881
 msgid "Manual"
 msgstr "Manuell"
 
-#: src/prefs.c:884
+#: src/prefs.c:905
 msgid "Browser Selection"
 msgstr "Browserwahl"
 
-#: src/prefs.c:888
+#: src/prefs.c:909
 msgid "_Browser"
 msgstr "_Browser"
 
-#: src/prefs.c:896
+#: src/prefs.c:917
 msgid "_Manual: "
 msgstr "_Manuell: "
 
-#: src/prefs.c:919
+#: src/prefs.c:932
 msgid "Browser Options"
 msgstr "Browser-Einstellungen"
 
-#: src/prefs.c:920
+#: src/prefs.c:933
 msgid "Open new _window by default"
 msgstr "Per _Vorgabe neues Fenster öffnen"
 
-#: src/prefs.c:934
+#: src/prefs.c:947
 msgid "Message Logs"
 msgstr "Nachrichten-Mitschnitt"
 
-#: src/prefs.c:935
+#: src/prefs.c:948
 msgid "_Log all instant messages"
 msgstr "_Schneide alle Nachrichten mit"
 
-#: src/prefs.c:936
+#: src/prefs.c:949
 msgid "Log all c_hats"
 msgstr "Alle C_hats mitschneiden"
 
-#: src/prefs.c:937
+#: src/prefs.c:950
 msgid "Strip _HTML from logs"
 msgstr "_HTML aus Mitschnitt entfernen"
 
-#: src/prefs.c:939
+#: src/prefs.c:952
 msgid "System Logs"
 msgstr "System-Mitschnitt anzeigen"
 
-#: src/prefs.c:940
+#: src/prefs.c:953
 msgid "Log when buddies _sign on/sign off"
 msgstr "An/Abmeldung eines Buddies mit_schneiden"
 
-#: src/prefs.c:942
+#: src/prefs.c:955
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Mitschnitt, wenn Buddies in/a_ktiv werden"
 
-#: src/prefs.c:944
+#: src/prefs.c:957
 msgid "Log when buddies go away/come _back"
 msgstr "Mitschneiden, wenn Buddys gehen/_zurückkommen"
 
-#: src/prefs.c:945
+#: src/prefs.c:958
 msgid "Log your _own signons/idleness/awayness"
 msgstr "_Eigene Anmeldung/Leerlauf/Abwesenheit mitschneiden"
 
-#: src/prefs.c:947
+#: src/prefs.c:960
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Eigene Mitschnitts-_Datei für Anmeldung jedes Buddys"
 
-#: src/prefs.c:980
+#: src/prefs.c:993
 msgid "Sound Options"
 msgstr "Klang-Einstellungen"
 
-#: src/prefs.c:981
+#: src/prefs.c:994
 msgid "_No sounds when you log in"
 msgstr "Kei_n Klang beim Anmelden"
 
-#: src/prefs.c:982
+#: src/prefs.c:995
 msgid "_Sounds while away"
 msgstr "_Klänge bei Abwesenheit"
 
-#: src/prefs.c:985
+#: src/prefs.c:998
 msgid "Sound Method"
 msgstr "Klang-Ausgabesystem"
 
-#: src/prefs.c:986
+#: src/prefs.c:999
 msgid "_Method"
 msgstr "_Methode"
 
-#: src/prefs.c:989
+#: src/prefs.c:1002
 msgid "Console beep"
 msgstr "Konsolen-Lautsprecher"
 
-#: src/prefs.c:991
+#: src/prefs.c:1004
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/prefs.c:998
+#: src/prefs.c:1011
 msgid "Command"
 msgstr "Kommando"
 
-#: src/prefs.c:1007
+#: src/prefs.c:1020
 #, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -5109,75 +5461,67 @@
 "_Klang-Abspielbefehl\n"
 "(%s für Dateiname)"
 
-#: src/prefs.c:1045
+#: src/prefs.c:1058
 msgid "_Sending messages removes away status"
 msgstr "_Senden von Nachrichten hebt Abwesenheit auf"
 
-#: src/prefs.c:1046
+#: src/prefs.c:1059
 msgid "_Queue new messages when away"
 msgstr "Neue _Nachrichten bei Abwesenheit sammeln"
 
-#: src/prefs.c:1047
-msgid "_Ignore new conversations when away"
-msgstr "Neue Unterhaltungen bei Abwesenheit _ignorieren"
-
-#: src/prefs.c:1049
+#: src/prefs.c:1061
 msgid "Auto-response"
 msgstr "Keine automatische Antwort schicken"
 
-#: src/prefs.c:1052
+#: src/prefs.c:1064
 msgid "Seconds before _resending:"
 msgstr "_Sekunden vor dem Neusenden"
 
-#: src/prefs.c:1054
+#: src/prefs.c:1066
 msgid "_Don't send auto-response"
 msgstr "Keine _automatische Antwort schicken"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1067
 msgid "_Only send auto-response when idle"
 msgstr "N_ur automatischen Antworten senden, wenn inaktiv"
 
-#: src/prefs.c:1056
+#: src/prefs.c:1068
 msgid "Do_n't send auto-response in active conversations"
 msgstr "_Keine automatische Antwort während eines Gesprächs schicken"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1074
 msgid "Idle _time reporting:"
 msgstr "Anzeige der Inaktivitätszei_t"
 
-#: src/prefs.c:1063
-msgid "None"
-msgstr "Kein"
-
-#: src/prefs.c:1064
+#: src/prefs.c:1076
 msgid "Gaim usage"
 msgstr "Gaim-Benutzung"
 
-#: src/prefs.c:1067
+#: src/prefs.c:1079
 msgid "X usage"
 msgstr "X-Benutzung"
 
-#: src/prefs.c:1069
+#: src/prefs.c:1081
 msgid "Windows usage"
 msgstr "Fenster-Benutzung"
 
-#: src/prefs.c:1076
+#: src/prefs.c:1088
 msgid "Auto-away"
 msgstr "Automatisch abwesend"
 
-#: src/prefs.c:1077
+#: src/prefs.c:1089
 msgid "Set away _when idle"
 msgstr "Setze auf ab_wesend, wenn inaktiv"
 
-#: src/prefs.c:1078
+#: src/prefs.c:1090
 msgid "_Minutes before setting away:"
 msgstr "_Minuten, bevor auf abwesend gesetzt wird"
 
-#: src/prefs.c:1084
+#: src/prefs.c:1096
 msgid "Away m_essage:"
 msgstr "Abwesenheits-_Mitteilungen"
 
-#: src/prefs.c:1128
+#: src/prefs.c:1140
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5192,7 +5536,7 @@
 "<span weight=\"bold\">Web-Site:</span>\t%s\n"
 "<span weight=\"bold\">Dateiname:</span>\t%s"
 
-#: src/prefs.c:1133
+#: src/prefs.c:1145
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5207,120 +5551,116 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Dateiname:</span>  %s"
 
-#: src/prefs.c:1264
+#: src/prefs.c:1276
 msgid "Load"
 msgstr "Laden"
 
-#: src/prefs.c:1271
+#: src/prefs.c:1283
 msgid "Name"
 msgstr "Name"
 
-#: src/prefs.c:1318
+#: src/prefs.c:1330
 msgid "Details"
 msgstr "Details"
 
-#: src/prefs.c:1416
+#: src/prefs.c:1428
 msgid "Sound Selection"
 msgstr "Klang-Auswahl"
 
-#: src/prefs.c:1507
+#: src/prefs.c:1519
 msgid "Play"
 msgstr "Abspielen"
 
-#: src/prefs.c:1514
+#: src/prefs.c:1526
 msgid "Event"
 msgstr "Ereignis"
 
-#: src/prefs.c:1530
+#: src/prefs.c:1542
 msgid "Test"
 msgstr "Testen"
 
-#: src/prefs.c:1538
+#: src/prefs.c:1550
 msgid "Choose..."
 msgstr "Auswählen..."
 
-#: src/prefs.c:1660
+#: src/prefs.c:1672
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: src/prefs.c:1698
+#: src/prefs.c:1710
 msgid "Interface"
 msgstr "Schnittstelle"
 
-#: src/prefs.c:1699
+#: src/prefs.c:1711
 msgid "Smiley Themes"
 msgstr "Smiley-Themen"
 
-#: src/prefs.c:1700
+#: src/prefs.c:1712
 msgid "Fonts"
 msgstr "Schriftarten"
 
-#: src/prefs.c:1701
+#: src/prefs.c:1713
 msgid "Message Text"
 msgstr "Nachrichtentext"
 
-#: src/prefs.c:1702
+#: src/prefs.c:1714
 msgid "Shortcuts"
 msgstr "Kürzel"
 
-#: src/prefs.c:1705
+#: src/prefs.c:1717
 msgid "IMs"
 msgstr "IMs"
 
-#: src/prefs.c:1706
+#: src/prefs.c:1718
 msgid "Chats"
 msgstr "Chats"
 
-#: src/prefs.c:1707
+#: src/prefs.c:1719
 msgid "Tabs"
 msgstr "Reiter"
 
-#: src/prefs.c:1708
+#: src/prefs.c:1720
 msgid "Proxy"
 msgstr "Proxy"
 
 #. We use the registered default browser in windows
-#: src/prefs.c:1711
+#: src/prefs.c:1723
 msgid "Browser"
 msgstr "Browser"
 
-#: src/prefs.c:1713
+#: src/prefs.c:1725
 msgid "Logging"
 msgstr "Mitschnitt"
 
-#: src/prefs.c:1714
+#: src/prefs.c:1726
 msgid "Sounds"
 msgstr "Klänge"
 
-#: src/prefs.c:1715
+#: src/prefs.c:1727
 msgid "Sound Events"
 msgstr "Klang-Ereignisse"
 
-#: src/prefs.c:1716
+#: src/prefs.c:1728
 msgid "Away / Idle"
 msgstr "Abwesend / Untätig"
 
-#: src/prefs.c:1717
+#: src/prefs.c:1729
 msgid "Away Messages"
 msgstr "Abwesenheits-Mitteilungen"
 
-#: src/prefs.c:1719
+#: src/prefs.c:1731
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/prefs.c:1758 src/win32/systray.c:293
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: src/prefs.c:1876
+#: src/prefs.c:1890
 msgid "Debug Window"
 msgstr "_Debug-Fenster"
 
-#: src/prpl.c:103
+#: src/prpl.c:99
 msgid "ICQ Protocol detected."
 msgstr "ICQ Protokoll erkannt."
 
-#: src/prpl.c:104
+#: src/prpl.c:100
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -5333,49 +5673,49 @@
 "empfohlen, daß Sie das AIM/ICQ Protokoll verwenden, um sich mit ICQ zu "
 "verbinden"
 
-#: src/prpl.c:285
+#: src/prpl.c:292
 msgid "Gaim - Prompt"
 msgstr "Gaim - Anforderungszeichen"
 
-#: src/prpl.c:359
+#: src/prpl.c:366
 msgid "No actions available"
 msgstr "Keine Aktionen verfügbar"
 
-#: src/prpl.c:484
+#: src/prpl.c:491
 #, c-format
 msgid "%s has mail from %s: %s"
 msgstr "%s hat Mail von %s: %s"
 
-#: src/prpl.c:484
+#: src/prpl.c:491
 msgid "No Subject"
 msgstr "Kein Betreff"
 
-#: src/prpl.c:486
+#: src/prpl.c:493
 #, c-format
 msgid "%s has new mail."
 msgstr "%s hat neue Mail."
 
-#: src/prpl.c:489
+#: src/prpl.c:496
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s hat %d neue Nachricht."
 msgstr[1] "%s hat %d neue Nachrichten."
 
-#: src/prpl.c:505
+#: src/prpl.c:512
 msgid "Gaim - New Mail"
 msgstr "Gaim - Neue Post"
 
-#: src/prpl.c:531
+#: src/prpl.c:530
 msgid "Open Mail"
 msgstr "Mail öffnen"
 
-#: src/prpl.c:721
+#: src/prpl.c:725
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s hat %s zu seinem Buddy %s%s%s gemacht"
 
-#: src/prpl.c:729
+#: src/prpl.c:733
 msgid ""
 "\n"
 "\n"
@@ -5385,15 +5725,15 @@
 "\n"
 "Möchten Sie ihn oder sie zu Ihrer Buddy-List hinzufügen?"
 
-#: src/prpl.c:731
+#: src/prpl.c:735
 msgid "Gaim - Information"
 msgstr "Gaim - Information"
 
-#: src/prpl.c:733
+#: src/prpl.c:737
 msgid "Gaim - Confirm"
 msgstr "Gaim - Bestätigung"
 
-#: src/prpl.c:772
+#: src/prpl.c:776
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -5401,42 +5741,42 @@
 "Sie haben momentan keine verfügbaren Protokolle, die das\n"
 "Registrieren neuer Benutzeraccounts ermöglichen."
 
-#: src/prpl.c:809
+#: src/prpl.c:813
 msgid "Gaim - Registration"
 msgstr "Gaim - Anmeldung"
 
-#: src/prpl.c:823
+#: src/prpl.c:825
 msgid "Registration Information"
 msgstr "Anmeldungsinformationen"
 
-#: src/prpl.c:840
+#: src/prpl.c:838
 msgid "Register"
 msgstr "Anmelden"
 
-#: src/server.c:58
+#: src/server.c:54
 msgid "Please enter your password"
 msgstr "Bitte geben Sie Ihr Paßwort ein"
 
-#: src/server.c:707
+#: src/server.c:704
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d Nachrichten)"
 
-#: src/server.c:719
+#: src/server.c:716
 msgid "(1 message)"
 msgstr "(1 Nachricht)"
 
-#: src/server.c:908 src/server.c:915
+#: src/server.c:895 src/server.c:902
 #, c-format
 msgid "%s logged in."
 msgstr "%s hat sich angemeldet."
 
-#: src/server.c:932 src/server.c:939
+#: src/server.c:919 src/server.c:926
 #, c-format
 msgid "%s logged out."
 msgstr "%s hat sich abgemeldet."
 
-#: src/server.c:972
+#: src/server.c:960
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -5445,29 +5785,29 @@
 "%s wurde gewarnt von %s.\n"
 "Ihr neuer Warnpegel ist %d%%"
 
-#: src/server.c:975
+#: src/server.c:963
 msgid "an anonymous person"
 msgstr "eine anonyme Person"
 
-#: src/server.c:1055
+#: src/server.c:1054
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 msgstr ""
-"Benutzer '%s' lädt %s in den Buddy-Chat Raum ein: '%s'\n"
+"Benutzer '%s' lädt %s in den Buddy-Chatraum ein: '%s'\n"
 "%s"
 
-#: src/server.c:1059
+#: src/server.c:1058
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
-msgstr "Benutzer '%s' lädt %s in den Buddy-Chat Raum ein: '%s'\n"
-
-#: src/server.c:1065
+msgstr "Benutzer '%s' lädt %s in den Buddy-Chatraum ein: '%s'\n"
+
+#: src/server.c:1064
 msgid "Buddy Chat Invite"
 msgstr "Buddy-Chat Einladung"
 
-#: src/server.c:1257
+#: src/server.c:1256
 msgid "More Info"
 msgstr "Mehr Informationen"
 
@@ -5552,172 +5892,138 @@
 msgstr[0] "Minute"
 msgstr[1] "Minuten"
 
-#: src/util.c:984
+#: src/util.c:1012
 msgid "Not connected to AIM"
 msgstr "Nicht verbunden mit AIM"
 
-#: src/util.c:993 src/util.c:1032
+#: src/util.c:1021 src/util.c:1060
 msgid "No screenname given."
 msgstr "Kein Spitzname angegeben"
 
-#: src/util.c:1068
+#: src/util.c:1096
 msgid "No roomname given."
 msgstr "Kein Raumname angegeben"
 
-#: src/util.c:1084
+#: src/util.c:1112
 msgid "Invalid AIM URI"
 msgstr "Ungültiger SNAC"
 
-#. * Custom away message.
-#: src/prpl.h:162
-msgid "Custom"
-msgstr "Benutzerdefiniert"
-
-#: src/gaim-disclosure.c:253
-msgid "Expander Size"
-msgstr ""
-
-#: src/gaim-disclosure.c:254
-msgid "Size of the expander arrow"
-msgstr ""
-
 #. 
 #. *  DEFINES, MACROS & DATA TYPES
 #.
-#: src/win32/systray.c:19
+#: src/win32/systray.c:20
 msgid "Gaim Instant Messenger"
 msgstr "Gaim Instant Messenger"
 
-#: src/win32/systray.c:20
+#: src/win32/systray.c:21
 msgid "Gaim Instant Messenger - Signed off"
 msgstr "Gaim Instant Messenger - Abgemeldet"
 
-#: src/win32/systray.c:21
+#: src/win32/systray.c:22
 msgid "Gaim Instant Messenger - Away"
 msgstr "Gaim Instant Messenger - Fortgegangen"
 
-#: src/win32/systray.c:103
+#: src/win32/systray.c:104
 msgid "New"
 msgstr "Neu"
 
-#: src/win32/systray.c:127
+#: src/win32/systray.c:128
 msgid "Set Away Message"
 msgstr "Setze Abwesenheits-Mitteilung"
 
-#: src/win32/systray.c:134
+#: src/win32/systray.c:135
 msgid "I'm Back"
 msgstr "Ich bin zurück"
 
-#: src/win32/systray.c:299
+#: src/win32/systray.c:300
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/pounce.c:83
-#, c-format
-msgid "%s has started typing to you"
-msgstr "%s kann begonnen, an Sie zu schreiben"
-
-#: src/pounce.c:84
-#, c-format
-msgid "%s has signed on"
-msgstr "%s wurde angemeldet"
-
-#: src/pounce.c:85
-#, c-format
-msgid "%s has returned from being idle"
-msgstr "%s kehrt von Inaktivität zurück"
-
-#: src/pounce.c:86
-#, c-format
-msgid "%s has returned from being away"
-msgstr "%s kam zurück"
-
-#: src/pounce.c:183 src/pounce.c:389
-msgid "New Buddy Pounce"
-msgstr "Neuer Buddy-Alarm"
-
-#: src/pounce.c:201
-msgid "Remove Buddy Pounce"
-msgstr "Buddy-Alarm entfernen"
-
-#: src/pounce.c:230
-msgid "[no message]"
-msgstr "[keine Nachricht]"
-
-#: src/pounce.c:232
-msgid "[Click to edit]"
-msgstr "[Zum Bearbeiten anklicken]"
-
-#: src/pounce.c:251
-msgid "Please enter a buddy to pounce."
-msgstr "Bitte Buddy zum Alarmieren angeben."
-
-#. <pounce type="who">
-#: src/pounce.c:399
-msgid "Pounce Who"
-msgstr "Wen alarmieren"
-
-#: src/pounce.c:410
-msgid "Account"
-msgstr "Konto"
-
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/pounce.c:436
-msgid "Pounce When"
-msgstr "Wann alarmieren"
-
-#: src/pounce.c:446
-msgid "Pounce on sign on"
-msgstr "Alarm beim Anmelden"
-
-#: src/pounce.c:455
-msgid "Pounce on return from away"
-msgstr "Alarm bei Rückkehr von Abwesenheit"
-
-#: src/pounce.c:464
-msgid "Pounce on return from idle"
-msgstr "Alarm bei Rückkehr von Inaktivität"
-
-#: src/pounce.c:473
-msgid "Pounce when buddy is typing to you"
-msgstr "Alarm wenn der Buddy schreibt"
-
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/pounce.c:483
-msgid "Pounce Action"
-msgstr "Alarm-Aktion"
-
-# IM benutzen?
-#: src/pounce.c:494
-msgid "Open IM Window"
-msgstr "Nachricht-Fenster öffnen"
-
-#: src/pounce.c:503
-msgid "Popup Notification"
-msgstr "Popup-Benachrichtigung"
-
-#: src/pounce.c:534
-msgid "Execute command on pounce"
-msgstr "Befehl bei Alarm ausführen"
-
-#: src/pounce.c:557
-msgid "Play sound on pounce"
-msgstr "Klang bei Alarm abspielen"
-
-#. </pounce type="action">
-#: src/pounce.c:580
-msgid "Save this pounce after activation"
-msgstr "Diesen Alarm nach Aktivierung speichern"
-
-#: src/pounce.c:600
-msgid "_Save"
-msgstr "_Speichern"
-
-#: src/pounce.c:606
-msgid "C_ancel"
-msgstr "Abbrechen"
+#~ msgid "Custom"
+#~ msgstr "Benutzerdefiniert"
+
+#~ msgid "Buddy"
+#~ msgstr "Buddy"
+
+#~ msgid "[no message]"
+#~ msgstr "[keine Nachricht]"
+
+#~ msgid "[Click to edit]"
+#~ msgstr "[Zum Bearbeiten anklicken]"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
+
+#~ msgid "Pounce on sign on"
+#~ msgstr "Alarm beim Anmelden"
+
+#~ msgid "Pounce when buddy is typing to you"
+#~ msgstr "Alarm wenn der Buddy schreibt"
+
+#~ msgid "Play sound on pounce"
+#~ msgstr "Klang bei Alarm abspielen"
+
+#~ msgid "_Save"
+#~ msgstr "_Speichern"
+
+#~ msgid "C_ancel"
+#~ msgstr "Abbrechen"
+
+#~ msgid "Remove From Roster"
+#~ msgstr "Entferne vom Roster"
+
+#~ msgid "IM Image"
+#~ msgstr "IM Bild"
+
+#~ msgid "Stocks"
+#~ msgstr "Aktienkurse"
+
+#~ msgid ""
+#~ "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR><I>Remote client does not support "
+#~ "sending status messages.</I><BR>"
+#~ msgstr ""
+#~ "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><I>Entfernter Client unterstützt "
+#~ "nicht das Senden von Statusmeldungen.</I></BR>"
+
+#~ msgid ""
+#~ "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR><I>User has no status message.</"
+#~ "I><BR>"
+#~ msgstr ""
+#~ "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><I>Benutzer hat keine "
+#~ "Statusmeldung.</I></BR>"
+
+#~ msgid ""
+#~ "  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko."
+#~ "net</A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:"
+#~ "bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+#~ msgstr ""
+#~ "  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko."
+#~ "net</A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:"
+#~ "bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+
+#~ msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
+#~ msgstr "<FONT SIZE=\"3\">Win32 Portierung:</FONT><BR>"
+
+#~ msgid "Okay"
+#~ msgstr "OK"
+
+#~ msgid "Settings"
+#~ msgstr "Einstellungen"
+
+#~ msgid "Buttons"
+#~ msgstr "Knöpfe"
+
+#~ msgid "_Hide IM/Info/Chat buttons"
+#~ msgstr "Nac_hrichten/Info/Chat-Buttons verstecken"
+
+#~ msgid "Show _pictures on buttons"
+#~ msgstr "_Bild auf Buttons anzeigen"
+
+#~ msgid "_Save window size/position"
+#~ msgstr "_Fensterposition und -größe speichern"
+
+#~ msgid "_Ignore new conversations when away"
+#~ msgstr "Neue Unterhaltungen bei Abwesenheit _ignorieren"
 
 #~ msgid "<b>UIN:</b> %s"
 #~ msgstr "<b>UID:</b> %s"
@@ -5815,13 +6121,6 @@
 
 #~ msgid ""
 #~ "\n"
-#~ "<br><b>Position:</b> "
-#~ msgstr ""
-#~ "\n"
-#~ "<br><b>Position:</b> "
-
-#~ msgid ""
-#~ "\n"
 #~ "<br><b>Web Page:</b> <a href=\""
 #~ msgstr ""
 #~ "\n"
@@ -5830,9 +6129,6 @@
 #~ msgid "Get Capabilities"
 #~ msgstr "Fähigkeiten holen"
 
-#~ msgid "Rename"
-#~ msgstr "Name ändern"
-
 #~ msgid "Un-Alias"
 #~ msgstr "Alias entfernen"
 
@@ -5852,9 +6148,6 @@
 #~ msgid "Idle: "
 #~ msgstr "Inaktiv: "
 
-#~ msgid "Information on selected Buddy"
-#~ msgstr "Info über ausgewählten Buddy"
-
 #~ msgid "Start/join a Buddy Chat"
 #~ msgstr "Buddy-Chat starten"
 
@@ -5965,32 +6258,15 @@
 #~ msgid "Buddy Not Removed"
 #~ msgstr "Buddy nicht entfernt"
 
-#~ msgid ""
-#~ "%d buddies from group %s were not removed because their accounts were not "
-#~ "logged in.  These buddies, and the group were not removed.\n"
-#~ msgstr ""
-#~ "%d Buddies aus der Gruppe %s wurden nicht entfernt, weil ihre Kontos "
-#~ "nicht angemeldet waren.  Diese Buddies und die Gruppe werden nicht "
-#~ "entfernt.\n"
-
-#~ msgid "Group Not Removed"
-#~ msgstr "Gruppe nicht entfernt"
-
 #~ msgid "Gaim - Login"
 #~ msgstr "Gaim - Anmeldung"
 
 #~ msgid "Gaim Account Signon"
 #~ msgstr "Gaim Konten-Anmeldung"
 
-#~ msgid "Group Display"
-#~ msgstr "Gruppen-Anzeige"
-
 #~ msgid "Hide _groups with no online buddies"
 #~ msgstr "_Gruppen verstecken, wenn kein Buddy online ist"
 
-#~ msgid "Show _numbers in groups"
-#~ msgstr "A_nzahl in Gruppe anzeigen"
-
 #~ msgid "Gaim - Sound Configuration"
 #~ msgstr "Gaim - Klang-Konfiguration"
 
--- a/src/buddy.c	Sat Apr 12 01:53:54 2003 +0000
+++ b/src/buddy.c	Sat Apr 12 23:31:41 2003 +0000
@@ -731,7 +731,7 @@
 			       b->evil ? _("\n<b>Warned:</b>") : "", b->evil ? warning : "",
 			       !GAIM_BUDDY_IS_ONLINE(b) ? _("\n<b>Status:</b> Offline") : "",
 			       statustext ? "\n" : "", statustext ? statustext : "",
-				   !g_ascii_strcasecmp(b->name, "robflynn") ? "\n<b>Description:</b> Spooky" : "");
+				   !g_ascii_strcasecmp(b->name, "robflynn") ? _("\n<b>Description:</b> Spooky") : "");
 	
 	if(warning)
 		g_free(warning);
--- a/src/gaim-remote.c	Sat Apr 12 01:53:54 2003 +0000
+++ b/src/gaim-remote.c	Sat Apr 12 23:31:41 2003 +0000
@@ -132,7 +132,7 @@
 	struct gaim_cui_packet *p = NULL;
 	fd = gaim_connect_to_session(0);
 	if (!fd) {
-		fprintf(stderr, "Gaim not running (on session 0)\n");
+		fprintf(stderr, _("Gaim not running (on session 0)\n"));
 		return 1;
 	}
 	p = cui_packet_new(CUI_TYPE_REMOTE, CUI_REMOTE_URI);
@@ -148,7 +148,7 @@
 	struct gaim_cui_packet *p = NULL;
 	fd = gaim_connect_to_session(0);
 	if (!fd) {
-		fprintf(stderr, "Gaim not running (on session 0)\n");
+		fprintf(stderr, _("Gaim not running (on session 0)\n"));
 		return 1;
 	}
 	p = cui_packet_new(CUI_TYPE_META, CUI_META_QUIT);
@@ -158,27 +158,33 @@
 	return 0;
 }
 
-void show_longhelp_uri(){
-	printf ("\n"
-
-	"Using AIM: URIs:\n"
-	"Sending an IM to a screenname:\n"
-	"	gaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-	"In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
-	"is the message to be sent.  '+' must be used in place of spaces.\n"
-	"Please note the quoting used above - if you run this from a shell the '&'\n"
-	"needs to be escaped, or the command will stop at that point.\n"
-	"Also,the following will just open a conversation window to a screenname,\n"
-	"with no message:\n"
-	"	gaim-remote uri aim:goim?screenname=Penguin\n\n"
-	"Joining a chat:\n"
-	"	gaim-remote uri aim:gochat?roomname=PenguinLounge\n"
-	"...joins the 'PenguinLounge' chat room.\n\n"
-	"Adding a buddy to your buddy list:\n"
-	"	gaim-remote uri aim:addbuddy?screenname=Penguin\n"
-	"...prompts you to add 'Penguin' to your buddy list.\n"
-	);
-	return;
+void show_longhelp_uri( char *name, char *command){
+	if(!strcmp(command, "uri")) {
+		printf (_("\n"
+			  "Using AIM: URIs:\n"
+			  "Sending an IM to a screenname:\n"
+			  "	gaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+			  "In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
+			  "is the message to be sent.  '+' must be used in place of spaces.\n"
+			  "Please note the quoting used above - if you run this from a shell the '&'\n"
+			  "needs to be escaped, or the command will stop at that point.\n"
+			  "Also,the following will just open a conversation window to a screenname,\n"
+			  "with no message:\n"
+			  "	gaim-remote uri aim:goim?screenname=Penguin\n\n"
+			  "Joining a chat:\n"
+			  "	gaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+			  "...joins the 'PenguinLounge' chat room.\n\n"
+			  "Adding a buddy to your buddy list:\n"
+			  "	gaim-remote uri aim:addbuddy?screenname=Penguin\n"
+			  "...prompts you to add 'Penguin' to your buddy list.\n")
+			);
+	}
+	else if(!strcmp(command, "quit")) {
+		printf (_("\nClose running copy of Gaim\n"));
+	}
+	else {
+		show_remote_usage(name);
+	}
 }
 
 /* Work in progress - JBS
@@ -190,6 +196,13 @@
 int main (int argc, char *argv[])
 {
 
+#ifdef ENABLE_NLS
+	setlocale (LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	bind_textdomain_codeset(PACKAGE, "UTF-8");
+	textdomain(PACKAGE);
+#endif
+
 	if (get_options(argc, argv)) {
 		show_remote_usage(argv[0]);
 		return 0;
@@ -198,14 +211,18 @@
 	
 	if (!strcmp(opts.command, "uri")) {
 		if(opts.help){
-			show_longhelp_uri();
+			show_longhelp_uri(argv[0], "uri");
 		}else{
 			return command_uri();
 		}
 /*	} else if (!strcmp(opts.command, "info")) {
 		return command_info();*/
 	} else if (!strcmp(opts.command, "quit")) {
-		return command_quit();
+		if(opts.help){
+			show_longhelp_uri(argv[0], "quit");
+		}else{
+			return command_quit();
+		}
 	} else {
 		show_remote_usage(argv[0]);
 		return 1;
--- a/src/gtkconv.c	Sat Apr 12 01:53:54 2003 +0000
+++ b/src/gtkconv.c	Sat Apr 12 23:31:41 2003 +0000
@@ -2556,10 +2556,15 @@
 setup_menubar(struct gaim_window *win)
 {
 	struct gaim_gtk_window *gtkwin;
+	GtkAccelGroup *accel_group;
 	gtkwin = GAIM_GTK_WINDOW(win);
 
+        accel_group = gtk_accel_group_new ();
+        gtk_window_add_accel_group (GTK_WINDOW (gtkwin->window), accel_group);
+        g_object_unref (accel_group);
+
 	gtkwin->menu.item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR,
-			"<main>", NULL);
+			"<main>", accel_group);
 
 	gtk_item_factory_set_translate_func (gtkwin->menu.item_factory,
 					     item_factory_translate_func,