im.pidgin.pidgin: 530c4f758bc1775758210bea1aa6273313d95b6d
lschiere at pidgin.im
lschiere at pidgin.im
Wed Oct 3 00:06:22 EDT 2007
revision: 530c4f758bc1775758210bea1aa6273313d95b6d
date: 2007-10-03T04:02:18
author: lschiere at pidgin.im
branch: im.pidgin.pidgin
changelog:
merge of '6f133a093581cd9a632ca6d0ce110d180e582714'
and 'cbd891d4cc489df2ea1b945a7310c78445688f40'
manifest:
format_version "1"
new_manifest [47eec956362eb75adc2e8388fa0ca12a2398cf17]
old_revision [6f133a093581cd9a632ca6d0ce110d180e582714]
patch "INSTALL"
from [5b39563912c3e0289a4ea052735e1566b07c513f]
to [4d53acadb9c90878fb040a49a257a55d13baf6f7]
old_revision [cbd891d4cc489df2ea1b945a7310c78445688f40]
add_dir "pidgin/pixmaps/toolbar/11"
add_file "libpurple/protocols/bonjour/dns_sd_proxy.c"
content [5199882594a26f949814387e509c1766c0f67dd4]
add_file "pidgin/pixmaps/status/11/log-in.png"
content [0be4a0be280cce09c33ae144538a098abfe260ab]
add_file "pidgin/pixmaps/status/11/log-out.png"
content [e201025bec5d6e617f6803194d47bcf687b9adc7]
add_file "pidgin/pixmaps/toolbar/11/message-new.png"
content [e38d4bfbcfc15be6bf236e0590521a0bae7de169]
add_file "share/ca-certs/Microsoft_Secure_Server_Authority.pem"
content [e1a29b84c3814767aa6bfc86f534fc7cdd70bbe6]
patch "ChangeLog"
from [c2f161b25908eb16f5808764401c4a00b1f58ff9]
to [3a01eeb30f724c069eaca223a0451a1bc6dfeb48]
patch "NEWS"
from [735310af79e6b6df790042cc648fb0e9bbe0e3fd]
to [4460bed7153eb64c9f895f305c7deff33ed49728]
patch "finch/gntblist.c"
from [fcb1d60d55bd0d88e784234a8eec3db528313dc8]
to [4475368c17fdc276466ee0f0e79b7c085999dd93]
patch "finch/libgnt/gntbindable.h"
from [c7f0d7631b1812dbc272cd2f7889852d7cf1687e]
to [9e7af7ad9534107c652956dcfc02af39efb20f84]
patch "finch/libgnt/gntbutton.h"
from [8d03f675f0d77ed44f37f4a648fdde6b5118658e]
to [8789e04c4d75a065a24ca72e720b31fd097dd585]
patch "finch/libgnt/gntcheckbox.h"
from [d8e412ff6e8ada6ecaa9ce0f01109da81611980e]
to [fff8464fe79209f1790f992800870550149bee56]
patch "finch/libgnt/gntclipboard.c"
from [c0aeee7c1c44622b6de257752bd5664230ef6091]
to [169146375a165989f6508edaf72b7b2d7c658841]
patch "finch/libgnt/gntclipboard.h"
from [ff8c8e7fb0dde8d5ecc95952974335e77bcba480]
to [cbc2b477936324240e0839e9ac3a4a1337bccefe]
patch "finch/libgnt/gntcolors.h"
from [038facbccf708c3afeb120ddb17586e6fc6b4f9b]
to [04bc7db0d7de7d04ad866ce58e3dafdf87631b9c]
patch "finch/libgnt/gntcombobox.h"
from [895096dc4eeb8ebd346941ebaac9396d61a4f7dd]
to [27995b038d1188529b6fd288f83797b78242d115]
patch "finch/libgnt/gntentry.h"
from [f4c7cfef2c64b878104956a8a4e48d7b887fbb53]
to [15a838de46a2fe83c482899079bbbad5cf86e956]
patch "finch/libgnt/gntstyle.c"
from [094ba0f14be29266624dabc385f7675fe84f29d2]
to [fa96a2f289254f2cb5ce21774ad49eadffb9a544]
patch "finch/libgnt/gnttree.c"
from [b6c0451cf023872b06f6a3317ff057dfaa88942f]
to [be8a77ee722c4615fac5656740ba2a20ecf8d3cf]
patch "finch/libgnt/gntwm.c"
from [5014a11fd97aa969c1b3cb8e851846f46e6db071]
to [d7f3ec2aabe25e3bec09760027069101d01b8537]
patch "libpurple/certificate.c"
from [e92bb3478e85c939e696305a5286afb1b4069c19]
to [950f284fa04c1cf3515cf50503deb9d55f8fd59e]
patch "libpurple/protocols/bonjour/Makefile.am"
from [90d47f9af47c6f91ae2437b6776523064549ca32]
to [66528f8cacc25d2764e00f74003ed1fa14e095da]
patch "libpurple/protocols/bonjour/Makefile.mingw"
from [d854d40f013c09f8f07c4674c9905b77d6b750b3]
to [68142a3871b3bcb2be7229170c4bc8ea4fd13943]
patch "libpurple/protocols/bonjour/bonjour.c"
from [4bf190ec74fffd44c858abfabab31e1cd8cbfa18]
to [64780fa8de009d3f0535aae3bc3d10505be400da]
patch "libpurple/protocols/bonjour/dns_sd_proxy.h"
from [5c8bb1f2d994ebfb1554d95a18b59601a1f06e4b]
to [51e3eb25f562cfbd2a9609ce2511f8a2dedee880]
patch "libpurple/protocols/bonjour/mdns_win32.c"
from [03e5cd92236058b8970463c7932950f7a356c058]
to [aeba928ec9fa711f19c2bfbbee52b2ca9c1469c1]
patch "libpurple/protocols/gg/buddylist.c"
from [aa1eb8a29f943a90c6fb14c0f6934123fc6b8730]
to [353535de7d31ded3a69e0486d86d6d22604f31e6]
patch "libpurple/protocols/jabber/google.c"
from [03917a6d82c416dc00d87e8b9ac1caefa01f667c]
to [1d29e418ebc78cd7a3430296f02c52dcb3781cbf]
patch "libpurple/protocols/jabber/jutil.h"
from [6d0ede4e040b0093cbf1b95d5c1797020eccae10]
to [febd712fa491d0cb59f5aea97d930405ea662706]
patch "libpurple/protocols/msn/soap.c"
from [b4246c343cc7a5051c673f14257ab0918a4db156]
to [8a27072e32a3cb6052fcaafc1dcd0d1abb6b65d7]
patch "libpurple/protocols/myspace/markup.c"
from [3281e6e2711eecf12224b5cad5dbc8fea7de161e]
to [d89e9798f538d17fdb33c61be404948092164b2e]
patch "libpurple/protocols/myspace/myspace.c"
from [f3813eb28d7a14a765456c715d40a5125ec2ace6]
to [bb0bbb8393fb60ee046f8046dd9f5e27beec957b]
patch "libpurple/protocols/myspace/user.c"
from [cd376f03cc62872fe687b6585cd373130330d2fb]
to [7b2c5dd1ac71ad9a756d53486dd35842accbfba3]
patch "libpurple/purple-remote"
from [ba9eca8159997a15119270a88a7d0d194465107e]
to [cedd9f61973784230e4b3c890d5161d571747955]
patch "pidgin/gtkconv.c"
from [ebe83318f4b597e55d1d16dfc338dd4fab667159]
to [07847dca42d82f448e6f12c44c4813140e0ea6f9]
patch "pidgin/gtknotify.c"
from [02fa502bc544f582590c646b28310db19294c38c]
to [b901bf7e4010ebfa742017742f4a9cd929618fa1]
patch "pidgin/pidginstock.c"
from [a1a460cffd8fa050434e5402f4800f561f2528c5]
to [2c265aa9d5a211ec43e10e414febf9937bb03420]
patch "pidgin/pixmaps/status/11/Makefile.am"
from [9a19ff6d6fcc1bb1b406d6407a095322e30e8c8b]
to [206419b4c8fd3cec428f705dab89a09c27326636]
patch "pidgin/pixmaps/toolbar/Makefile.am"
from [497746a6a16a636054c83cdb0f459206aa1ad609]
to [c5081b872303b49b303ca69d9ae94176f98e00e1]
patch "pidgin/plugins/gestures/stroke-draw.c"
from [d754821b5eb626dad91eaa659c9ac876065fa4c8]
to [4101ccfbfe98a8cbb102e75bbf06d076b276962a]
patch "pidgin/win32/nsis/pixmaps/pidgin-intro.bmp"
from [743fe3b36d453397c445fe08ea301f9163b07923]
to [a286d035366a6522fa166cc53fcbfbaa2f2de370]
patch "pidgin/win32/nsis/translations/arabic.nsh"
from [2a2970fce95fc2f9cd1fcb1fe3f1a1b7569d9825]
to [8af1be4475ad15a8674a8e0cbac479004120b619]
patch "po/ChangeLog"
from [99f4f458e47460ac752ac07c68ef2ae875aab8b7]
to [520ee146dab1fcab40a6ba616f5be58fdca2d5f1]
patch "po/de.po"
from [7d461172b5244d77d7db3f6528e3f59ab7ded449]
to [89141f611e603db6a0d7f61d73ec782a4461a495]
patch "po/stats.pl"
from [2e3937bc597a6218f41a1356c3f064ef6777c3bc]
to [f10f492ca0ef2602e2d7b36d0b446fc5ec8edd11]
patch "share/ca-certs/Makefile.am"
from [6fdd6599e29bf50e32832da473dbfea86f59cde8]
to [d33109c71b83ea1f09f3df5b78fcbdb6ebe94232]
set "pidgin/pixmaps/status/11/log-in.png"
attr "mtn:manual_merge"
value "true"
set "pidgin/pixmaps/status/11/log-out.png"
attr "mtn:manual_merge"
value "true"
set "pidgin/pixmaps/toolbar/11/message-new.png"
attr "mtn:manual_merge"
value "true"
-------------- next part --------------
#
#
# patch "INSTALL"
# from [5b39563912c3e0289a4ea052735e1566b07c513f]
# to [4d53acadb9c90878fb040a49a257a55d13baf6f7]
#
============================================================
--- INSTALL 5b39563912c3e0289a4ea052735e1566b07c513f
+++ INSTALL 4d53acadb9c90878fb040a49a257a55d13baf6f7
@@ -40,7 +40,8 @@ The simplest way to compile this package
the package.
4. Type `make install' to install the programs and any data files and
- documentation.
+ documentation. You must have write access to the prefix you are
+ installing to. See below for more details on the prefix.
5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
-------------- next part --------------
#
#
# add_dir "pidgin/pixmaps/toolbar/11"
#
# add_file "libpurple/protocols/bonjour/dns_sd_proxy.c"
# content [5199882594a26f949814387e509c1766c0f67dd4]
#
# add_file "pidgin/pixmaps/status/11/log-in.png"
# content [0be4a0be280cce09c33ae144538a098abfe260ab]
#
# add_file "pidgin/pixmaps/status/11/log-out.png"
# content [e201025bec5d6e617f6803194d47bcf687b9adc7]
#
# add_file "pidgin/pixmaps/toolbar/11/message-new.png"
# content [e38d4bfbcfc15be6bf236e0590521a0bae7de169]
#
# add_file "share/ca-certs/Microsoft_Secure_Server_Authority.pem"
# content [e1a29b84c3814767aa6bfc86f534fc7cdd70bbe6]
#
# patch "ChangeLog"
# from [c2f161b25908eb16f5808764401c4a00b1f58ff9]
# to [3a01eeb30f724c069eaca223a0451a1bc6dfeb48]
#
# patch "NEWS"
# from [735310af79e6b6df790042cc648fb0e9bbe0e3fd]
# to [4460bed7153eb64c9f895f305c7deff33ed49728]
#
# patch "finch/gntblist.c"
# from [fcb1d60d55bd0d88e784234a8eec3db528313dc8]
# to [4475368c17fdc276466ee0f0e79b7c085999dd93]
#
# patch "finch/libgnt/gntbindable.h"
# from [c7f0d7631b1812dbc272cd2f7889852d7cf1687e]
# to [9e7af7ad9534107c652956dcfc02af39efb20f84]
#
# patch "finch/libgnt/gntbutton.h"
# from [8d03f675f0d77ed44f37f4a648fdde6b5118658e]
# to [8789e04c4d75a065a24ca72e720b31fd097dd585]
#
# patch "finch/libgnt/gntcheckbox.h"
# from [d8e412ff6e8ada6ecaa9ce0f01109da81611980e]
# to [fff8464fe79209f1790f992800870550149bee56]
#
# patch "finch/libgnt/gntclipboard.c"
# from [c0aeee7c1c44622b6de257752bd5664230ef6091]
# to [169146375a165989f6508edaf72b7b2d7c658841]
#
# patch "finch/libgnt/gntclipboard.h"
# from [ff8c8e7fb0dde8d5ecc95952974335e77bcba480]
# to [cbc2b477936324240e0839e9ac3a4a1337bccefe]
#
# patch "finch/libgnt/gntcolors.h"
# from [038facbccf708c3afeb120ddb17586e6fc6b4f9b]
# to [04bc7db0d7de7d04ad866ce58e3dafdf87631b9c]
#
# patch "finch/libgnt/gntcombobox.h"
# from [895096dc4eeb8ebd346941ebaac9396d61a4f7dd]
# to [27995b038d1188529b6fd288f83797b78242d115]
#
# patch "finch/libgnt/gntentry.h"
# from [f4c7cfef2c64b878104956a8a4e48d7b887fbb53]
# to [15a838de46a2fe83c482899079bbbad5cf86e956]
#
# patch "finch/libgnt/gntstyle.c"
# from [094ba0f14be29266624dabc385f7675fe84f29d2]
# to [fa96a2f289254f2cb5ce21774ad49eadffb9a544]
#
# patch "finch/libgnt/gnttree.c"
# from [b6c0451cf023872b06f6a3317ff057dfaa88942f]
# to [be8a77ee722c4615fac5656740ba2a20ecf8d3cf]
#
# patch "finch/libgnt/gntwm.c"
# from [5014a11fd97aa969c1b3cb8e851846f46e6db071]
# to [d7f3ec2aabe25e3bec09760027069101d01b8537]
#
# patch "libpurple/certificate.c"
# from [e92bb3478e85c939e696305a5286afb1b4069c19]
# to [950f284fa04c1cf3515cf50503deb9d55f8fd59e]
#
# patch "libpurple/protocols/bonjour/Makefile.am"
# from [90d47f9af47c6f91ae2437b6776523064549ca32]
# to [66528f8cacc25d2764e00f74003ed1fa14e095da]
#
# patch "libpurple/protocols/bonjour/Makefile.mingw"
# from [d854d40f013c09f8f07c4674c9905b77d6b750b3]
# to [68142a3871b3bcb2be7229170c4bc8ea4fd13943]
#
# patch "libpurple/protocols/bonjour/bonjour.c"
# from [4bf190ec74fffd44c858abfabab31e1cd8cbfa18]
# to [64780fa8de009d3f0535aae3bc3d10505be400da]
#
# patch "libpurple/protocols/bonjour/dns_sd_proxy.h"
# from [5c8bb1f2d994ebfb1554d95a18b59601a1f06e4b]
# to [51e3eb25f562cfbd2a9609ce2511f8a2dedee880]
#
# patch "libpurple/protocols/bonjour/mdns_win32.c"
# from [03e5cd92236058b8970463c7932950f7a356c058]
# to [aeba928ec9fa711f19c2bfbbee52b2ca9c1469c1]
#
# patch "libpurple/protocols/gg/buddylist.c"
# from [aa1eb8a29f943a90c6fb14c0f6934123fc6b8730]
# to [353535de7d31ded3a69e0486d86d6d22604f31e6]
#
# patch "libpurple/protocols/jabber/google.c"
# from [03917a6d82c416dc00d87e8b9ac1caefa01f667c]
# to [1d29e418ebc78cd7a3430296f02c52dcb3781cbf]
#
# patch "libpurple/protocols/jabber/jutil.h"
# from [6d0ede4e040b0093cbf1b95d5c1797020eccae10]
# to [febd712fa491d0cb59f5aea97d930405ea662706]
#
# patch "libpurple/protocols/msn/soap.c"
# from [b4246c343cc7a5051c673f14257ab0918a4db156]
# to [8a27072e32a3cb6052fcaafc1dcd0d1abb6b65d7]
#
# patch "libpurple/protocols/myspace/markup.c"
# from [3281e6e2711eecf12224b5cad5dbc8fea7de161e]
# to [d89e9798f538d17fdb33c61be404948092164b2e]
#
# patch "libpurple/protocols/myspace/myspace.c"
# from [f3813eb28d7a14a765456c715d40a5125ec2ace6]
# to [bb0bbb8393fb60ee046f8046dd9f5e27beec957b]
#
# patch "libpurple/protocols/myspace/user.c"
# from [cd376f03cc62872fe687b6585cd373130330d2fb]
# to [7b2c5dd1ac71ad9a756d53486dd35842accbfba3]
#
# patch "libpurple/purple-remote"
# from [ba9eca8159997a15119270a88a7d0d194465107e]
# to [cedd9f61973784230e4b3c890d5161d571747955]
#
# patch "pidgin/gtkconv.c"
# from [ebe83318f4b597e55d1d16dfc338dd4fab667159]
# to [07847dca42d82f448e6f12c44c4813140e0ea6f9]
#
# patch "pidgin/gtknotify.c"
# from [02fa502bc544f582590c646b28310db19294c38c]
# to [b901bf7e4010ebfa742017742f4a9cd929618fa1]
#
# patch "pidgin/pidginstock.c"
# from [a1a460cffd8fa050434e5402f4800f561f2528c5]
# to [2c265aa9d5a211ec43e10e414febf9937bb03420]
#
# patch "pidgin/pixmaps/status/11/Makefile.am"
# from [9a19ff6d6fcc1bb1b406d6407a095322e30e8c8b]
# to [206419b4c8fd3cec428f705dab89a09c27326636]
#
# patch "pidgin/pixmaps/toolbar/Makefile.am"
# from [497746a6a16a636054c83cdb0f459206aa1ad609]
# to [c5081b872303b49b303ca69d9ae94176f98e00e1]
#
# patch "pidgin/plugins/gestures/stroke-draw.c"
# from [d754821b5eb626dad91eaa659c9ac876065fa4c8]
# to [4101ccfbfe98a8cbb102e75bbf06d076b276962a]
#
# patch "pidgin/win32/nsis/pixmaps/pidgin-intro.bmp"
# from [743fe3b36d453397c445fe08ea301f9163b07923]
# to [a286d035366a6522fa166cc53fcbfbaa2f2de370]
#
# patch "pidgin/win32/nsis/translations/arabic.nsh"
# from [2a2970fce95fc2f9cd1fcb1fe3f1a1b7569d9825]
# to [8af1be4475ad15a8674a8e0cbac479004120b619]
#
# patch "po/ChangeLog"
# from [99f4f458e47460ac752ac07c68ef2ae875aab8b7]
# to [520ee146dab1fcab40a6ba616f5be58fdca2d5f1]
#
# patch "po/de.po"
# from [7d461172b5244d77d7db3f6528e3f59ab7ded449]
# to [89141f611e603db6a0d7f61d73ec782a4461a495]
#
# patch "po/stats.pl"
# from [2e3937bc597a6218f41a1356c3f064ef6777c3bc]
# to [f10f492ca0ef2602e2d7b36d0b446fc5ec8edd11]
#
# patch "share/ca-certs/Makefile.am"
# from [6fdd6599e29bf50e32832da473dbfea86f59cde8]
# to [d33109c71b83ea1f09f3df5b78fcbdb6ebe94232]
#
# set "pidgin/pixmaps/status/11/log-in.png"
# attr "mtn:manual_merge"
# value "true"
#
# set "pidgin/pixmaps/status/11/log-out.png"
# attr "mtn:manual_merge"
# value "true"
#
# set "pidgin/pixmaps/toolbar/11/message-new.png"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
--- libpurple/protocols/bonjour/dns_sd_proxy.c 5199882594a26f949814387e509c1766c0f67dd4
+++ libpurple/protocols/bonjour/dns_sd_proxy.c 5199882594a26f949814387e509c1766c0f67dd4
@@ -0,0 +1,181 @@
+/**
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
+ */
+
+#include "win32dep.h"
+#include "dns_sd_proxy.h"
+
+#ifndef LINK_DNS_SD_DIRECTLY
+static DNSServiceErrorType (DNSSD_API* _DNSServiceAddRecord)(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
+ uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceBrowse)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+ const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context);
+static int (DNSSD_API* _DNSServiceConstructFullName)(char *fullName, const char *service, const char *regtype, const char *domain);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceProcessResult)(DNSServiceRef sdRef);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceQueryRecord)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+ const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context);
+static void (DNSSD_API* _DNSServiceRefDeallocate)(DNSServiceRef sdRef);
+static int (DNSSD_API* _DNSServiceRefSockFD)(DNSServiceRef sdRef);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceRegister)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+ const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,
+ const void *txtRecord, DNSServiceRegisterReply callBack, void *context);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceResolve)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,
+ const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceRemoveRecord)(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceUpdateRecord)(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,
+ uint16_t rdlen, const void *rdata, uint32_t ttl);
+static void (DNSSD_API* _TXTRecordCreate)(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer);
+static void (DNSSD_API* _TXTRecordDeallocate)(TXTRecordRef *txtRecord);
+static const void * (DNSSD_API* _TXTRecordGetBytesPtr)(const TXTRecordRef *txtRecord);
+static int16_t (DNSSD_API* _TXTRecordGetLength)(const TXTRecordRef *txtRecord);
+static const void * (DNSSD_API* _TXTRecordGetValuePtr)(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen);
+static DNSServiceErrorType (DNSSD_API* _TXTRecordSetValue)(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value);
+#endif
+
+gboolean dns_sd_available(void) {
+#ifndef LINK_DNS_SD_DIRECTLY
+ static gboolean initialized = FALSE;
+ static gboolean loaded = FALSE;
+
+ if (!initialized) {
+ initialized = TRUE;
+ if ((_DNSServiceAddRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceAddRecord"))
+ && (_DNSServiceBrowse = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceBrowse"))
+ && (_DNSServiceConstructFullName = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceConstructFullName"))
+ && (_DNSServiceProcessResult = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceProcessResult"))
+ && (_DNSServiceQueryRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceQueryRecord"))
+ && (_DNSServiceRefDeallocate = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRefDeallocate"))
+ && (_DNSServiceRefSockFD = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRefSockFD"))
+ && (_DNSServiceRegister = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRegister"))
+ && (_DNSServiceResolve = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceResolve"))
+ && (_DNSServiceRemoveRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRemoveRecord"))
+ && (_DNSServiceUpdateRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceUpdateRecord"))
+ && (_TXTRecordCreate = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordCreate"))
+ && (_TXTRecordDeallocate = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordDeallocate"))
+ && (_TXTRecordGetBytesPtr = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetBytesPtr"))
+ && (_TXTRecordGetLength = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetLength"))
+ && (_TXTRecordGetValuePtr = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetValuePtr"))
+ && (_TXTRecordSetValue = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordSetValue"))) {
+ loaded = TRUE;
+ }
+ }
+ return loaded;
+#else
+ return TRUE;
+#endif
+}
+
+#ifndef LINK_DNS_SD_DIRECTLY
+
+DNSServiceErrorType _wpurple_DNSServiceAddRecord(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
+ uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl) {
+ g_return_val_if_fail(_DNSServiceAddRecord != NULL, kDNSServiceErr_Unknown);
+ return (_DNSServiceAddRecord)(sdRef, RecordRef, flags, rrtype, rdlen, rdata, ttl);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceBrowse(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+ const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context) {
+ g_return_val_if_fail(_DNSServiceBrowse != NULL, kDNSServiceErr_Unknown);
+ return (_DNSServiceBrowse)(sdRef, flags, interfaceIndex, regtype, domain, callBack, context);
+}
+
+int _wpurple_DNSServiceConstructFullName(char *fullName, const char *service, const char *regtype, const char *domain) {
+ g_return_val_if_fail(_DNSServiceConstructFullName != NULL, 0);
+ return (_DNSServiceConstructFullName)(fullName, service, regtype, domain);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceProcessResult(DNSServiceRef sdRef) {
+ g_return_val_if_fail(_DNSServiceProcessResult != NULL, kDNSServiceErr_Unknown);
+ return (_DNSServiceProcessResult)(sdRef);
+}
+
+
+DNSServiceErrorType _wpurple_DNSServiceQueryRecord(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+ const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context) {
+ g_return_val_if_fail(_DNSServiceQueryRecord != NULL, kDNSServiceErr_Unknown);
+ return (_DNSServiceQueryRecord)(sdRef, flags, interfaceIndex, fullname, rrtype, rrclass, callBack, context);
+}
+
+void _wpurple_DNSServiceRefDeallocate(DNSServiceRef sdRef) {
+ g_return_if_fail(_DNSServiceRefDeallocate != NULL);
+ (_DNSServiceRefDeallocate)(sdRef);
+}
+
+int _wpurple_DNSServiceRefSockFD(DNSServiceRef sdRef) {
+ g_return_val_if_fail(_DNSServiceRefSockFD != NULL, -1);
+ return (_DNSServiceRefSockFD)(sdRef);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceRegister(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+ const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,
+ const void *txtRecord, DNSServiceRegisterReply callBack, void *context) {
+ g_return_val_if_fail(_DNSServiceRegister != NULL, kDNSServiceErr_Unknown);
+ return (_DNSServiceRegister)(sdRef, flags, interfaceIndex, name, regtype, domain, host, port, txtLen, txtRecord, callBack, context);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceResolve(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,
+ const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context) {
+ g_return_val_if_fail(_DNSServiceResolve != NULL, kDNSServiceErr_Unknown);
+ return (_DNSServiceResolve)(sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceRemoveRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags) {
+ g_return_val_if_fail(_DNSServiceRemoveRecord != NULL, kDNSServiceErr_Unknown);
+ return (_DNSServiceRemoveRecord)(sdRef, RecordRef, flags);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceUpdateRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,
+ uint16_t rdlen, const void *rdata, uint32_t ttl) {
+ g_return_val_if_fail(_DNSServiceUpdateRecord != NULL, kDNSServiceErr_Unknown);
+ return (_DNSServiceUpdateRecord)(sdRef, RecordRef, flags, rdlen, rdata, ttl);
+}
+
+void _wpurple_TXTRecordCreate(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer) {
+ g_return_if_fail(_TXTRecordCreate != NULL);
+ (_TXTRecordCreate)(txtRecord, bufferLen, buffer);
+}
+
+void _wpurple_TXTRecordDeallocate(TXTRecordRef *txtRecord) {
+ g_return_if_fail(_TXTRecordDeallocate != NULL);
+ (_TXTRecordDeallocate)(txtRecord);
+}
+
+const void * _wpurple_TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) {
+ g_return_val_if_fail(_TXTRecordGetBytesPtr != NULL, NULL);
+ return (_TXTRecordGetBytesPtr)(txtRecord);
+}
+
+uint16_t _wpurple_TXTRecordGetLength(const TXTRecordRef *txtRecord) {
+ g_return_val_if_fail(_TXTRecordGetLength != NULL, 0);
+ return (_TXTRecordGetLength)(txtRecord);
+}
+
+const void * _wpurple_TXTRecordGetValuePtr(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen) {
+ g_return_val_if_fail(_TXTRecordGetValuePtr != NULL, NULL);
+ return (_TXTRecordGetValuePtr)(txtLen, txtRecord, key, valueLen);
+}
+
+DNSServiceErrorType _wpurple_TXTRecordSetValue(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value) {
+ g_return_val_if_fail(_TXTRecordSetValue != NULL, kDNSServiceErr_Unknown);
+ return (_TXTRecordSetValue)(txtRecord, key, valueSize, value);
+}
+
+#endif /*LINK_DNS_SD_DIRECTLY*/
+
============================================================
# pidgin/pixmaps/status/11/log-in.png is binary
============================================================
# pidgin/pixmaps/status/11/log-out.png is binary
============================================================
# pidgin/pixmaps/toolbar/11/message-new.png is binary
============================================================
--- share/ca-certs/Microsoft_Secure_Server_Authority.pem e1a29b84c3814767aa6bfc86f534fc7cdd70bbe6
+++ share/ca-certs/Microsoft_Secure_Server_Authority.pem e1a29b84c3814767aa6bfc86f534fc7cdd70bbe6
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIE1TCCA72gAwIBAgIKYSsApAADAAAAFDANBgkqhkiG9w0BAQUFADAnMSUwIwYD
+VQQDExxNaWNyb3NvZnQgSW50ZXJuZXQgQXV0aG9yaXR5MB4XDTA2MDQyMTE5MTEw
+NFoXDTA5MDQxOTIzNTkwMFowgYsxEzARBgoJkiaJk/IsZAEZFgNjb20xGTAXBgoJ
+kiaJk/IsZAEZFgltaWNyb3NvZnQxFDASBgoJkiaJk/IsZAEZFgRjb3JwMRcwFQYK
+CZImiZPyLGQBGRYHcmVkbW9uZDEqMCgGA1UEAxMhTWljcm9zb2Z0IFNlY3VyZSBT
+ZXJ2ZXIgQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+syn2tJzCJKsQy98cYrzBT0qMSqTMibRel34u64jqd1GKP9cRMHagyNLZIb1rv8NZ
+XPdf2uI8hGc4lxRh4iprbFPOZSiHQIyq9zoqLS7Bh/KnqnRX4CCntCQbWVa/s5c5
+FbGD5XG5AvA8sjn56WPotYLGeWrSZ/k2bcH9YgvQ2Yrt8t1VxPQciSuX82KSn2Kx
+xxJKgQtAgZpyekR5QdIUUvQsEAPaCfWRsF/OMQoyc4UeAxAELavr2vlq869ye3Fu
+f3fUhVEk8kxtiVPYWYBTAhWts62pEwaKGPteMsGnvbX+BRgIwc55vfs6KWXxnBUL
+9Q8BfQQLbT8nQe7hO4XXMQIDAQABo4IBnDCCAZgwEgYDVR0TAQH/BAgwBgEB/wIB
+ATAdBgNVHQ4EFgQUp08F+9GOQVM3lcpL4UMfWutNzVAwCwYDVR0PBAQDAgGGMBIG
+CSsGAQQBgjcVAQQFAgMDAAMwIwYJKwYBBAGCNxUCBBYEFMnAnEM4ke3T6fpSclUI
+g7XN8o57MBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMB8GA1UdIwQYMBaAFDNf
+3Q+3nFzO7ofdcHCLX33PIry5MGYGA1UdHwRfMF0wW6BZoFeGNGh0dHA6Ly9jcmwu
+bWljcm9zb2Z0LmNvbS9wa2kvbXNjb3JwL2NybC9tc3d3dygzKS5jcmyGH2h0dHA6
+Ly9jb3JwcGtpL2NybC9tc3d3dygzKS5jcmwweQYIKwYBBQUHAQEEbTBrMDwGCCsG
+AQUFBzAChjBodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpL21zY29ycC9tc3d3
+dygzKS5jcnQwKwYIKwYBBQUHMAKGH2h0dHA6Ly9jb3JwcGtpL2FpYS9tc3d3dygz
+KS5jcnQwDQYJKoZIhvcNAQEFBQADggEBAIJDQpkqhodC3ZmKPB4dTveoFCpuc4C0
+qdXPLggvRiTnQJP/SRdnfQwkaulDS3771zWo3fO1/tTiCmVvtU4LNbISpQmrz41q
+AP2QIUl/d4Fjiaz0qchNxmTRlVLGsTrwkMMkOh9MUQEcNyk9RuGepf/1+66qeEnx
+eCgK09yIcbgdE9ffk5ueTX7TNfgoNZO9ORnRS1p7nra3b0Wi1kdGqDmbpw7We+M8
+6B8VpPa0QaofgRdl2dzOijd7hGN+cgRNMvdGpRxzkaWUA52rBOrEVyJLu2IUksPV
+0Q/0ZZMNZXJh8MmWW/o8ebQZJQshN5p4M7HiUN/cZ2onnrdZSpIwyAU=
+-----END CERTIFICATE-----
============================================================
--- ChangeLog c2f161b25908eb16f5808764401c4a00b1f58ff9
+++ ChangeLog 3a01eeb30f724c069eaca223a0451a1bc6dfeb48
@@ -1,10 +1,10 @@ version 2.2.2:
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
version 2.2.2:
http://developer.pidgin.im/query?status=closed&milestone=2.2.2
- NOTE: Due to the backporting that happened for the 2.2.1
- release, it is possible bugs this release fixes bugs
- that were marked as fixed in 2.2.1.
+ NOTE: Due to 2.2.1 being a security fix release, some bugs
+ marked fixed in 2.2.1 may not have been fixed until
+ this release (2.2.2).
libpurple:
* Real usernames are now shown in the system log.
@@ -64,7 +64,7 @@ version 2.2.0 (09/13/2007):
* New protocol plugin: MySpaceIM (Jeff Connelly, Google Summer of
Code)
* XMPP enhancements. See
- http://www.adiumx.com/blog/2007/07/soc-xmpp-update.php (Andreas
+ http://www.adiumx.com/blog/2007/07/soc-xmpp-update.php (Andreas
Monitzer, Google Summer of Code for Adium)
* Certificate management. Libpurple will validate certificates on
SSL-encrypted protocols (William Ehlhardt, Google Summer of Code)
============================================================
--- NEWS 735310af79e6b6df790042cc648fb0e9bbe0e3fd
+++ NEWS 4460bed7153eb64c9f895f305c7deff33ed49728
@@ -5,6 +5,20 @@ 2.2.1 (9/28/2007):
ready for a general release. Instead, this is basically a bug fix
release.
+ Luke: Unfortunately the necessity of this bug fix release means
+ some of the tickets that have been closed as part of the 2.2.1
+ milestone are not actually fixed yet. We have grabbed as many
+ of the changes as we could while avoiding those that are as
+ yet unstable though, and this should still be a marked
+ improvement over 2.2.0. We have spent a lot of time since the
+ last release looking at the tickets that have been submitted
+ and many of them have been closed.
+
+ Stu: I haven't NEWS'd in a while. I haven't actually done much for
+ too long also, maybe I'll find some time soon. This release is
+ basically what 2.2.0 should have been - it actually compiles this
+ time.
+
2.2.0 (9/13/2007):
Sean: 2.2.0 contains the results of several major Google Summer
of Code branches bringing some new, extraordinary features. We
============================================================
--- finch/gntblist.c fcb1d60d55bd0d88e784234a8eec3db528313dc8
+++ finch/gntblist.c 4475368c17fdc276466ee0f0e79b7c085999dd93
@@ -2202,12 +2202,12 @@ send_im_select(GntMenuItem *item, gpoint
group = purple_request_field_group_new(NULL);
purple_request_fields_add_group(fields, group);
- field = purple_request_field_string_new("screenname", _("_Name"), NULL, FALSE);
+ field = purple_request_field_string_new("screenname", _("Name"), NULL, FALSE);
purple_request_field_set_type_hint(field, "screenname");
purple_request_field_set_required(field, TRUE);
purple_request_field_group_add_field(group, field);
- field = purple_request_field_account_new("account", _("_Account"), NULL);
+ field = purple_request_field_account_new("account", _("Account"), NULL);
purple_request_field_set_type_hint(field, "account");
purple_request_field_set_visible(field,
(purple_connections_get_all() != NULL &&
@@ -2227,6 +2227,69 @@ static void
}
static void
+join_chat_select_cb(gpointer data, PurpleRequestFields *fields)
+{
+ PurpleAccount *account;
+ const char *name;
+ PurpleConnection *gc;
+ PurpleChat *chat;
+ GHashTable *hash = NULL;
+
+ account = purple_request_fields_get_account(fields, "account");
+ name = purple_request_fields_get_string(fields, "chat");
+
+ if (!purple_account_is_connected(account))
+ return;
+
+ gc = purple_account_get_connection(account);
+ purple_conversation_new(PURPLE_CONV_TYPE_CHAT, account, name);
+ chat = purple_blist_find_chat(account, name);
+ if (chat == NULL) {
+ if (PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults != NULL)
+ hash = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc, name);
+ } else {
+ hash = chat->components;
+ }
+ serv_join_chat(gc, hash);
+ if (chat == NULL && hash != NULL)
+ g_hash_table_destroy(hash);
+}
+
+static void
+join_chat_select(GntMenuItem *item, gpointer n)
+{
+ PurpleRequestFields *fields;
+ PurpleRequestFieldGroup *group;
+ PurpleRequestField *field;
+
+ fields = purple_request_fields_new();
+
+ group = purple_request_field_group_new(NULL);
+ purple_request_fields_add_group(fields, group);
+
+ field = purple_request_field_string_new("chat", _("Channel"), NULL, FALSE);
+ purple_request_field_set_required(field, TRUE);
+ purple_request_field_group_add_field(group, field);
+
+ field = purple_request_field_account_new("account", _("Account"), NULL);
+ purple_request_field_set_type_hint(field, "account");
+ purple_request_field_set_visible(field,
+ (purple_connections_get_all() != NULL &&
+ purple_connections_get_all()->next != NULL));
+ purple_request_field_set_required(field, TRUE);
+ purple_request_field_group_add_field(group, field);
+
+ purple_request_fields(purple_get_blist(), _("Join a Chat"),
+ NULL,
+ _("Please enter the name of the chat you want to join."),
+ fields,
+ _("Join"), G_CALLBACK(join_chat_select_cb),
+ _("Cancel"), NULL,
+ NULL, NULL, NULL,
+ NULL);
+}
+
+static void
menu_add_buddy_cb(GntMenuItem *item, gpointer null)
{
purple_blist_request_add_buddy(NULL, NULL, NULL, NULL);
@@ -2268,6 +2331,10 @@ create_menu()
gnt_menu_add_item(GNT_MENU(sub), item);
gnt_menuitem_set_callback(GNT_MENU_ITEM(item), send_im_select, NULL);
+ item = gnt_menuitem_new(_("Join Chat..."));
+ gnt_menu_add_item(GNT_MENU(sub), item);
+ gnt_menuitem_set_callback(GNT_MENU_ITEM(item), join_chat_select, NULL);
+
item = gnt_menuitem_new(_("Show"));
gnt_menu_add_item(GNT_MENU(sub), item);
subsub = gnt_menu_new(GNT_MENU_POPUP);
============================================================
--- finch/libgnt/gntbindable.h c7f0d7631b1812dbc272cd2f7889852d7cf1687e
+++ finch/libgnt/gntbindable.h 9e7af7ad9534107c652956dcfc02af39efb20f84
@@ -105,73 +105,75 @@ struct _GntBindableActionParam
/*GntBindableAction *gnt_bindable_action_parse(const char *name);*/
/**
- *
- * @param action
+ * Free a bindable action.
+ *
+ * @param action The bindable action.
*/
void gnt_bindable_action_free(GntBindableAction *action);
/**
- *
- * @param param
+ * Free a GntBindableActionParam.
+ *
+ * @param param The GntBindableActionParam to free.
*/
void gnt_bindable_action_param_free(GntBindableActionParam *param);
/**
- *
- * @param klass
- * @param name
- * @param callback
- * @param trigger
+ * Register a bindable action for a class.
+ *
+ * @param klass The class the binding is for.
+ * @param name The name of the binding.
+ * @param callback The callback for the binding.
+ * @param trigger The default trigger for the binding, or @c NULL, followed by a NULL-terminated
+ * list of default parameters.
*/
void gnt_bindable_class_register_action(GntBindableClass *klass, const char *name, GntBindableActionCallback callback, const char *trigger, ...);
/**
- *
- * @param klass
- * @param name
- * @param trigger
+ * Register a key-binding to an existing action.
+ *
+ * @param klass The class the binding is for.
+ * @param name The name of the binding.
+ * @param trigger A new trigger for the binding, followed by a @c NULL-terminated list of parameters for the callback.
*/
void gnt_bindable_register_binding(GntBindableClass *klass, const char *name, const char *trigger, ...);
/**
- *
- * @param bindable
- * @param keys
+ * Perform an action from a keybinding.
*
- * @return
+ * @param bindable The bindable object.
+ * @param keys The key to trigger the action.
+ *
+ * @return @c TRUE if the action was performed successfully, @c FALSE otherwise.
*/
gboolean gnt_bindable_perform_action_key(GntBindable *bindable, const char *keys);
/**
- *
- * @param bindable
- * @param name
+ * Perform an action on a bindable object.
*
- * @return
+ * @param bindable The bindable object.
+ * @param name The action to perform, followed by a @c NULL-terminated list of parameters.
+ *
+ * @return @c TRUE if the action was performed successfully, @c FALSE otherwise.
*/
gboolean gnt_bindable_perform_action_named(GntBindable *bindable, const char *name, ...);
/**
-* Returns a GntTree populated with "key" -> "binding" for the widget.
-*/
-/**
-*
-* @param widget
-*
-* @return
-*/
-GntBindable * gnt_bindable_bindings_view(GntBindable *bind);
-
-/**
+ * Returns a GntTree populated with "key" -> "binding" for the widget.
+ *
+ * @param widget The object to list the bindings for.
*
- * Builds a window that list the key bindings for a GntBindable object. From this window a user can select a listing to rebind a new key for the given action.
- *
+ * @return The GntTree.
*/
+GntBindable * gnt_bindable_bindings_view(GntBindable *bind);
+
/**
+ * Builds a window that list the key bindings for a GntBindable object.
+ * From this window a user can select a listing to rebind a new key for the given action.
*
- * @param bindable
+ * @param bindable The object to list the bindings for.
*
- * @return
+ * @return @c TRUE
*/
gboolean gnt_bindable_build_help_window(GntBindable *bindable);
============================================================
--- finch/libgnt/gntbutton.h 8d03f675f0d77ed44f37f4a648fdde6b5118658e
+++ finch/libgnt/gntbutton.h 8789e04c4d75a065a24ca72e720b31fd097dd585
@@ -73,17 +73,16 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- *
- * @return
+ * @return GType for Gntbutton
*/
GType gnt_button_get_gtype(void);
/**
- *
- * @param text
+ * Create a new button.
*
- * @return
+ * @param text The text for the button.
+ *
+ * @return The newly created button.
*/
GntWidget * gnt_button_new(const char *text);
============================================================
--- finch/libgnt/gntcheckbox.h d8e412ff6e8ada6ecaa9ce0f01109da81611980e
+++ finch/libgnt/gntcheckbox.h fff8464fe79209f1790f992800870550149bee56
@@ -68,32 +68,33 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- *
- * @return
+ * @return GType for GntCheckBox
*/
GType gnt_check_box_get_gtype(void);
/**
- *
- * @param text
+ * Create a new checkbox.
*
- * @return
+ * @param text The text for the checkbox.
+ *
+ * @return The newly created checkbox.
*/
GntWidget * gnt_check_box_new(const char *text);
/**
- *
- * @param box
- * @param set
+ * Set whether the checkbox should be checked or not.
+ *
+ * @param box The checkbox.
+ * @param set @c TRUE if the checkbox should be selected, @c FALSE otherwise.
*/
void gnt_check_box_set_checked(GntCheckBox *box, gboolean set);
/**
- *
- * @param box
+ * Return the checked state of the checkbox.
*
- * @return
+ * @param box The checkbox.
+ *
+ * @return @c TRUE if the checkbox is selected, @c FALSE otherwise.
*/
gboolean gnt_check_box_get_checked(GntCheckBox *box);
============================================================
--- finch/libgnt/gntclipboard.c c0aeee7c1c44622b6de257752bd5664230ef6091
+++ finch/libgnt/gntclipboard.c 169146375a165989f6508edaf72b7b2d7c658841
@@ -48,7 +48,7 @@ void
*****************************************************************************/
void
-gnt_clipboard_set_string(GntClipboard *clipboard, gchar *string)
+gnt_clipboard_set_string(GntClipboard *clipboard, const gchar *string)
{
g_free(clipboard->string);
clipboard->string = g_strdup(string);
============================================================
--- finch/libgnt/gntclipboard.h ff8c8e7fb0dde8d5ecc95952974335e77bcba480
+++ finch/libgnt/gntclipboard.h cbc2b477936324240e0839e9ac3a4a1337bccefe
@@ -60,26 +60,27 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- *
- * @return
+ * @return GType for GntClipboard.
*/
GType gnt_clipboard_get_gtype(void);
/**
- *
- * @param clip
+ * Get the current text from the clipboard.
*
- * @return
+ * @param clip The clipboard.
+ *
+ * @return A copy of the string in the clipboard. The caller should free the
+ * returned value.
*/
gchar * gnt_clipboard_get_string(GntClipboard *clip);
/**
- *
- * @param clip
- * @param string
+ * Set the text in the clipboard.
+ *
+ * @param clip The clipboard.
+ * @param string New string for the clipboard.
*/
-void gnt_clipboard_set_string(GntClipboard *clip, gchar *string);
+void gnt_clipboard_set_string(GntClipboard *clip, const gchar *string);
G_END_DECLS
============================================================
--- finch/libgnt/gntcolors.h 038facbccf708c3afeb120ddb17586e6fc6b4f9b
+++ finch/libgnt/gntcolors.h 04bc7db0d7de7d04ad866ce58e3dafdf87631b9c
@@ -29,6 +29,9 @@
#include <glib.h>
+/**
+ * Different classes of colors.
+ */
typedef enum
{
GNT_COLOR_NORMAL = 1,
@@ -58,27 +61,28 @@ enum
GNT_TOTAL_COLORS
};
-/* populate some default colors */
/**
- *
+ * Initialize the colors.
*/
void gnt_init_colors(void);
/**
- *
+ * Uninitialize the colors.
*/
void gnt_uninit_colors(void);
#if GLIB_CHECK_VERSION(2,6,0)
/**
- *
- * @param kfile
+ * Parse color information from a file.
+ *
+ * @param kfile The file containing color information.
*/
void gnt_colors_parse(GKeyFile *kfile);
/**
- *
- * @param kfile
+ * Parse color-pair information from a file.
+ *
+ * @param kfile The file containing the color-pair information.
*/
void gnt_color_pairs_parse(GKeyFile *kfile);
============================================================
--- finch/libgnt/gntcombobox.h 895096dc4eeb8ebd346941ebaac9396d61a4f7dd
+++ finch/libgnt/gntcombobox.h 27995b038d1188529b6fd288f83797b78242d115
@@ -69,15 +69,11 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- * Get the GType for GntComboBox
- *
- * @return
+ * @return Get the GType for GntComboBox
*/
GType gnt_combo_box_get_gtype(void);
/**
- *
* Create a new GntComboBox
*
* @return A new GntComboBox
@@ -85,7 +81,6 @@ GntWidget * gnt_combo_box_new(void);
GntWidget * gnt_combo_box_new(void);
/**
- *
* Add an entry
*
* @param box The GntComboBox
@@ -95,7 +90,6 @@ void gnt_combo_box_add_data(GntComboBox
void gnt_combo_box_add_data(GntComboBox *box, gpointer key, const char *text);
/**
- *
* Remove an entry
*
* @param box The GntComboBox
@@ -104,7 +98,6 @@ void gnt_combo_box_remove(GntComboBox *b
void gnt_combo_box_remove(GntComboBox *box, gpointer key);
/**
- *
* Remove all entries
*
* @param box The GntComboBox
@@ -112,7 +105,6 @@ void gnt_combo_box_remove_all(GntComboBo
void gnt_combo_box_remove_all(GntComboBox *box);
/**
- *
* Get the data that is currently selected
*
* @param box The GntComboBox
@@ -122,7 +114,6 @@ gpointer gnt_combo_box_get_selected_data
gpointer gnt_combo_box_get_selected_data(GntComboBox *box);
/**
- *
* Set the current selection to a specific entry
*
* @param box The GntComboBox
============================================================
--- finch/libgnt/gntentry.h f4c7cfef2c64b878104956a8a4e48d7b887fbb53
+++ finch/libgnt/gntentry.h 15a838de46a2fe83c482899079bbbad5cf86e956
@@ -100,95 +100,115 @@ G_BEGIN_DECLS
G_BEGIN_DECLS
/**
- *
- *
- * @return
+ * @return GType for GntEntry.
*/
GType gnt_entry_get_gtype(void);
/**
- *
- * @param text
+ * Create a new GntEntry.
*
- * @return
+ * @param text The text in the new entry box.
+ *
+ * @return The newly created entry box.
*/
GntWidget * gnt_entry_new(const char *text);
/**
- *
- * @param entry
- * @param max
+ * Set the maximum length of the text in the entry box.
+ *
+ * @param entry The entry box.
+ * @param max The maximum length for text. A value of 0 means infinite length.
*/
void gnt_entry_set_max(GntEntry *entry, int max);
/**
- *
- * @param entry
- * @param text
+ * Set the text in an entry box.
+ *
+ * @param entry The entry box.
+ * @param text The text to set in the box.
*/
void gnt_entry_set_text(GntEntry *entry, const char *text);
/**
- *
- * @param entry
- * @param flag
+ * Set flags an entry box.
+ *
+ * @param entry The entry box.
+ * @param flag The flags to set for the entry box.
*/
void gnt_entry_set_flag(GntEntry *entry, GntEntryFlag flag);
+/**
+ * Get the text in an entry box.
+ *
+ * @param entry The entry box.
+ *
+ * @return The current text in the entry box.
+ */
const char *gnt_entry_get_text(GntEntry *entry);
/**
- *
- * @param entry
+ * Clear the text in the entry box.
+ *
+ * @param entry The entry box.
*/
void gnt_entry_clear(GntEntry *entry);
/**
- *
- * @param entry
- * @param set
+ * Set whether the text in the entry box should be masked for display.
+ *
+ * @param entry The entry box.
+ * @param set @c TRUE if the text should be masked, @c FALSE otherwise.
*/
void gnt_entry_set_masked(GntEntry *entry, gboolean set);
/**
- *
- * @param entry
- * @param text
+ * Add a text to the history list for the text. The history length for the
+ * entry box needs to be set first by gnt_entry_set_history_length.
+ *
+ * @param entry The entry box.
+ * @param text A new entry for the history list.
*/
void gnt_entry_add_to_history(GntEntry *entry, const char *text);
/**
- *
- * @param entry
- * @param num
+ * Set the length of history for the entry box.
+ *
+ * @param entry The entry box.
+ * @param num The maximum length of the history.
*/
void gnt_entry_set_history_length(GntEntry *entry, int num);
/**
- *
- * @param entry
- * @param word
+ * Set whether the suggestions are for the entire entry box, or for each
+ * individual word in the entry box.
+ *
+ * @param entry The entry box.
+ * @param word @c TRUE if the suggestions are for individual words, @c FALSE otherwise.
*/
void gnt_entry_set_word_suggest(GntEntry *entry, gboolean word);
/**
- *
- * @param entry
- * @param always
+ * Set whether to always display the suggestions list, or only when the
+ * tab-completion key is pressed (the TAB key, by default).
+ *
+ * @param entry The entry box.
+ * @param always @c TRUE if the suggestion list should always be displayed.
*/
void gnt_entry_set_always_suggest(GntEntry *entry, gboolean always);
/**
- *
- * @param entry
- * @param text
+ * Add an item to the suggestion list.
+ *
+ * @param entry The entry box.
+ * @param text An item to add to the suggestion list.
*/
void gnt_entry_add_suggest(GntEntry *entry, const char *text);
/**
- *
- * @param entry
- * @param text
+ * Remove an entry from the suggestion list.
+ *
+ * @param entry The entry box.
+ * @param text The item to remove from the suggestion list.
*/
void gnt_entry_remove_suggest(GntEntry *entry, const char *text);
============================================================
--- finch/libgnt/gntstyle.c 094ba0f14be29266624dabc385f7675fe84f29d2
+++ finch/libgnt/gntstyle.c fa96a2f289254f2cb5ce21774ad49eadffb9a544
@@ -26,7 +26,6 @@
#include <glib.h>
#include <ctype.h>
-#include <glib/gprintf.h>
#include <stdlib.h>
#include <string.h>
============================================================
--- finch/libgnt/gnttree.c b6c0451cf023872b06f6a3317ff057dfaa88942f
+++ finch/libgnt/gnttree.c be8a77ee722c4615fac5656740ba2a20ecf8d3cf
@@ -1265,8 +1265,10 @@ GntTreeRow *gnt_tree_add_row_after(GntTr
{
GntTreeRow *pr = NULL;
+ row->tree = tree;
+ row->key = key;
+ row->data = NULL;
g_hash_table_replace(tree->hash, key, row);
- row->tree = tree;
if (bigbro == NULL && tree->priv->compare)
{
@@ -1327,9 +1329,6 @@ GntTreeRow *gnt_tree_add_row_after(GntTr
}
}
- row->key = key;
- row->data = NULL;
-
redraw_tree(tree);
return row;
============================================================
--- finch/libgnt/gntwm.c 5014a11fd97aa969c1b3cb8e851846f46e6db071
+++ finch/libgnt/gntwm.c d7f3ec2aabe25e3bec09760027069101d01b8537
@@ -27,8 +27,8 @@
#include "config.h"
+#include <glib.h>
#include <ctype.h>
-#include <glib/gprintf.h>
#include <gmodule.h>
#include <stdlib.h>
#include <string.h>
============================================================
--- libpurple/certificate.c e92bb3478e85c939e696305a5286afb1b4069c19
+++ libpurple/certificate.c 950f284fa04c1cf3515cf50503deb9d55f8fd59e
@@ -88,6 +88,19 @@ purple_certificate_verify_complete(Purpl
g_return_if_fail(vrq);
+ if (st == PURPLE_CERTIFICATE_VALID) {
+ purple_debug_info("certificate",
+ "Successfully verified certificate for %s\n",
+ vrq->subject_name);
+ } else {
+ purple_debug_info("certificate",
+ "Failed to verify certificate for %s\n",
+ vrq->subject_name);
+ }
+
+
+
+
/* Pass the results on to the request's callback */
(vrq->cb)(st, vrq->cb_data);
@@ -1372,7 +1385,8 @@ x509_tls_cached_unknown_peer(PurpleCerti
purple_debug_info("certificate/x509/tls_cached",
"Checking for a CA with DN=%s\n",
ca_id);
- if ( !purple_certificate_pool_contains(ca, ca_id) ) {
+ ca_crt = purple_certificate_pool_retrieve(ca, ca_id);
+ if ( NULL == ca_crt ) {
purple_debug_info("certificate/x509/tls_cached",
"Certificate Authority with DN='%s' not "
"found. I'll prompt the user, I guess.\n",
@@ -1385,16 +1399,7 @@ x509_tls_cached_unknown_peer(PurpleCerti
return;
}
- ca_crt = purple_certificate_pool_retrieve(ca, ca_id);
g_free(ca_id);
- if (!ca_crt) {
- purple_debug_error("certificate/x509/tls_cached",
- "Certificate authority disappeared out "
- "underneath me!\n");
- purple_certificate_verify_complete(vrq,
- PURPLE_CERTIFICATE_INVALID);
- return;
- }
/* Check the signature */
if ( !purple_certificate_signed_by(end_crt, ca_crt) ) {
============================================================
--- libpurple/protocols/bonjour/Makefile.am 90d47f9af47c6f91ae2437b6776523064549ca32
+++ libpurple/protocols/bonjour/Makefile.am 66528f8cacc25d2764e00f74003ed1fa14e095da
@@ -1,5 +1,6 @@ EXTRA_DIST = \
EXTRA_DIST = \
mdns_win32.c \
+ dns_sd_proxy.c \
dns_sd_proxy.h \
Makefile.mingw
============================================================
--- libpurple/protocols/bonjour/Makefile.mingw d854d40f013c09f8f07c4674c9905b77d6b750b3
+++ libpurple/protocols/bonjour/Makefile.mingw 68142a3871b3bcb2be7229170c4bc8ea4fd13943
@@ -45,6 +45,7 @@ C_SRC = bonjour.c \
##
C_SRC = bonjour.c \
buddy.c \
+ dns_sd_proxy.c \
mdns_common.c \
mdns_win32.c \
parser.c \
@@ -59,11 +60,15 @@ LIBS = \
-lglib-2.0 \
-lws2_32 \
-lintl \
- -ldnssd \
-lnetapi32 \
-lxml2 \
-lpurple
+ifeq ($(LINK_DNS_SD_DIRECTLY), 1)
+ CFLAGS += -DLINK_DNS_SD_DIRECTLY
+ LIBS += -ldnssd
+endif
+
include $(PIDGIN_COMMON_RULES)
##
============================================================
--- libpurple/protocols/bonjour/bonjour.c 4bf190ec74fffd44c858abfabab31e1cd8cbfa18
+++ libpurple/protocols/bonjour/bonjour.c 64780fa8de009d3f0535aae3bc3d10505be400da
@@ -26,6 +26,7 @@
#define UNICODE
#include <windows.h>
#include <lm.h>
+#include "dns_sd_proxy.h"
#endif
#include "internal.h"
@@ -99,6 +100,17 @@ bonjour_login(PurpleAccount *account)
PurpleStatus *status;
PurplePresence *presence;
+#ifdef _WIN32
+ if (!dns_sd_available()) {
+ gc->wants_to_die = TRUE;
+ purple_connection_error(gc,
+ _("The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: "
+ "http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging"
+ " for more information."));
+ return;
+ }
+#endif
+
gc->flags |= PURPLE_CONNECTION_HTML;
gc->proto_data = bd = g_new0(BonjourData, 1);
@@ -155,13 +167,13 @@ bonjour_close(PurpleConnection *connecti
BonjourData *bd = connection->proto_data;
/* Stop looking for buddies in the LAN */
- if (bd->dns_sd_data != NULL)
+ if (bd != NULL && bd->dns_sd_data != NULL)
{
bonjour_dns_sd_stop(bd->dns_sd_data);
bonjour_dns_sd_free(bd->dns_sd_data);
}
- if (bd->jabber_data != NULL)
+ if (bd != NULL && bd->jabber_data != NULL)
{
/* Stop waiting for conversations */
bonjour_jabber_stop(bd->jabber_data);
============================================================
--- libpurple/protocols/bonjour/dns_sd_proxy.h 5c8bb1f2d994ebfb1554d95a18b59601a1f06e4b
+++ libpurple/protocols/bonjour/dns_sd_proxy.h 51e3eb25f562cfbd2a9609ce2511f8a2dedee880
@@ -10,4 +10,85 @@
#include <dns_sd.h>
+gboolean dns_sd_available(void);
+
+#ifndef LINK_DNS_SD_DIRECTLY
+
+DNSServiceErrorType _wpurple_DNSServiceAddRecord(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
+ uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl);
+#define DNSServiceAddRecord(sdRef, RecordRef, flags, rrtype, rdlen, rdata, ttl) \
+ _wpurple_DNSServiceAddRecord(sdRef, RecordRef, flags, rrtype, rdlen, rdata, ttl)
+
+DNSServiceErrorType _wpurple_DNSServiceBrowse(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+ const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context);
+#define DNSServiceBrowse(sdRef, flags, interfaceIndex, regtype, domain, callBack, context) \
+ _wpurple_DNSServiceBrowse(sdRef, flags, interfaceIndex, regtype, domain, callBack, context)
+
+int _wpurple_DNSServiceConstructFullName(char *fullName, const char *service, const char *regtype, const char *domain);
+#define DNSServiceConstructFullName(fullName, service, regtype, domain) \
+ _wpurple_DNSServiceConstructFullName(fullName, service, regtype, domain)
+
+DNSServiceErrorType _wpurple_DNSServiceProcessResult(DNSServiceRef sdRef);
+#define DNSServiceProcessResult(sdRef) \
+ _wpurple_DNSServiceProcessResult(sdRef);
+
+DNSServiceErrorType _wpurple_DNSServiceQueryRecord(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+ const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context);
+#define DNSServiceQueryRecord(sdRef, flags, interfaceIndex, fullname, rrtype, rrclass, callBack, context) \
+ _wpurple_DNSServiceQueryRecord(sdRef, flags, interfaceIndex, fullname, rrtype, rrclass, callBack, context)
+
+void _wpurple_DNSServiceRefDeallocate(DNSServiceRef sdRef);
+#define DNSServiceRefDeallocate(sdRef) \
+ _wpurple_DNSServiceRefDeallocate(sdRef)
+
+int _wpurple_DNSServiceRefSockFD(DNSServiceRef sdRef);
+#define DNSServiceRefSockFD(sdRef) \
+ _wpurple_DNSServiceRefSockFD(sdRef)
+
+DNSServiceErrorType _wpurple_DNSServiceRegister(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+ const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,
+ const void *txtRecord, DNSServiceRegisterReply callBack, void *context);
+#define DNSServiceRegister(sdRef, flags, interfaceIndex, name, regtype, domain, host, port, txtLen, txtRecord, callBack, context) \
+ _wpurple_DNSServiceRegister(sdRef, flags, interfaceIndex, name, regtype, domain, host, port, txtLen, txtRecord, callBack, context)
+
+DNSServiceErrorType _wpurple_DNSServiceResolve(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,
+ const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context);
+#define DNSServiceResolve(sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context) \
+ _wpurple_DNSServiceResolve(sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context)
+
+DNSServiceErrorType _wpurple_DNSServiceRemoveRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags);
+#define DNSServiceRemoveRecord(sdRef, RecordRef, flags) \
+ _wpurple_DNSServiceRemoveRecord(sdRef, RecordRef, flags)
+
+DNSServiceErrorType _wpurple_DNSServiceUpdateRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,
+ uint16_t rdlen, const void *rdata, uint32_t ttl);
+#define DNSServiceUpdateRecord(sdRef, RecordRef, flags, rdlen, rdata, ttl) \
+ _wpurple_DNSServiceUpdateRecord(sdRef, RecordRef, flags, rdlen, rdata, ttl)
+
+void _wpurple_TXTRecordCreate(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer);
+#define TXTRecordCreate(txtRecord, bufferLen, buffer) \
+ _wpurple_TXTRecordCreate(txtRecord, bufferLen, buffer)
+
+void _wpurple_TXTRecordDeallocate(TXTRecordRef *txtRecord);
+#define TXTRecordDeallocate(txtRecord) \
+ _wpurple_TXTRecordDeallocate(txtRecord)
+
+const void * _wpurple_TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord);
+#define TXTRecordGetBytesPtr(txtRecord) \
+ _wpurple_TXTRecordGetBytesPtr(txtRecord)
+
+uint16_t _wpurple_TXTRecordGetLength(const TXTRecordRef *txtRecord);
+#define TXTRecordGetLength(txtRecord) \
+ _wpurple_TXTRecordGetLength(txtRecord)
+
+const void * _wpurple_TXTRecordGetValuePtr(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen);
+#define TXTRecordGetValuePtr(txtLen, txtRecord, key, valueLen) \
+ _wpurple_TXTRecordGetValuePtr(txtLen, txtRecord, key, valueLen)
+
+DNSServiceErrorType _wpurple_TXTRecordSetValue(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value);
+#define TXTRecordSetValue(txtRecord, key, valueSize, value) \
+ _wpurple_TXTRecordSetValue(txtRecord, key, valueSize, value)
+
+#endif /*LINK_DNS_SD_DIRECTLY*/
+
#endif
============================================================
--- libpurple/protocols/bonjour/mdns_win32.c 03e5cd92236058b8970463c7932950f7a356c058
+++ libpurple/protocols/bonjour/mdns_win32.c aeba928ec9fa711f19c2bfbbee52b2ca9c1469c1
@@ -1,4 +1,9 @@
-/*
+/**
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
============================================================
--- libpurple/protocols/gg/buddylist.c aa1eb8a29f943a90c6fb14c0f6934123fc6b8730
+++ libpurple/protocols/gg/buddylist.c 353535de7d31ded3a69e0486d86d6d22604f31e6
@@ -27,6 +27,13 @@
#include "gg-utils.h"
#include "buddylist.h"
+#define F_FIRSTNAME 0
+#define F_LASTNAME 1
+/* #define F_ 2 */
+#define F_NICKNAME 3
+#define F_PHONE 4
+#define F_GROUP 5
+#define F_UIN 6
/* void ggp_buddylist_send(PurpleConnection *gc) {{{ */
void ggp_buddylist_send(PurpleConnection *gc)
@@ -90,7 +97,7 @@ void ggp_buddylist_load(PurpleConnection
gchar **users_tbl;
int i;
- /* Don't limit a number of records in a buddylist. */
+ /* Don't limit the number of records in a buddylist. */
users_tbl = g_strsplit(buddylist, "\r\n", -1);
for (i = 0; users_tbl[i] != NULL; i++) {
@@ -108,8 +115,8 @@ void ggp_buddylist_load(PurpleConnection
continue;
}
- show = charset_convert(data_tbl[3], "CP1250", "UTF-8");
- name = data_tbl[6];
+ show = charset_convert(data_tbl[F_NICKNAME], "CP1250", "UTF-8");
+ name = data_tbl[F_UIN];
if ('\0' == *name) {
purple_debug_warning("gg",
"Something is wrong on line %d of the buddylist. Skipping.\n",
@@ -121,7 +128,7 @@ void ggp_buddylist_load(PurpleConnection
show = g_strdup(name);
}
- purple_debug_info("gg", "got buddy: name=%s show=%s\n", name, show);
+ purple_debug_info("gg", "got buddy: name=%s; show=%s\n", name, show);
if (purple_find_buddy(purple_connection_get_account(gc), name)) {
g_free(show);
@@ -131,19 +138,19 @@ void ggp_buddylist_load(PurpleConnection
g = g_strdup("Gadu-Gadu");
- if ('\0' != data_tbl[5]) {
+ if ('\0' != data_tbl[F_GROUP]) {
/* XXX: Probably buddy should be added to all the groups. */
/* Hard limit to at most 50 groups */
- gchar **group_tbl = g_strsplit(data_tbl[5], ",", 50);
+ gchar **group_tbl = g_strsplit(data_tbl[F_GROUP], ",", 50);
if (ggp_array_size(group_tbl) > 0) {
g_free(g);
- g = g_strdup(group_tbl[0]);
+ g = charset_convert(group_tbl[0], "CP1250", "UTF-8");
}
g_strfreev(group_tbl);
}
buddy = purple_buddy_new(purple_connection_get_account(gc), name,
- strlen(show) ? show : NULL);
+ strlen(show) ? show : NULL);
if (!(group = purple_find_group(g))) {
group = purple_group_new(g);
@@ -159,7 +166,6 @@ void ggp_buddylist_load(PurpleConnection
g_strfreev(users_tbl);
ggp_buddylist_send(gc);
-
}
/* }}} */
@@ -192,8 +198,7 @@ void ggp_buddylist_offline(PurpleConnect
continue;
purple_prpl_got_user_status(
- purple_connection_get_account(gc),
- buddy->name, "offline", NULL);
+ account, buddy->name, "offline", NULL);
purple_debug_info("gg",
"ggp_buddylist_offline: gone: %s\n",
============================================================
--- libpurple/protocols/jabber/google.c 03917a6d82c416dc00d87e8b9ac1caefa01f667c
+++ libpurple/protocols/jabber/google.c 1d29e418ebc78cd7a3430296f02c52dcb3781cbf
@@ -64,7 +64,8 @@ jabber_gmail_parse(JabberStream *js, xml
message = xmlnode_get_child(child, "mail-thread-info");
if (count == 0 || !message) {
- purple_notify_emails(js->gc, count, FALSE, NULL, NULL, (const char**) default_tos, NULL, NULL, NULL);
+ if (count > 0)
+ purple_notify_emails(js->gc, count, FALSE, NULL, NULL, (const char**) default_tos, NULL, NULL, NULL);
g_free(default_tos[0]);
return;
}
============================================================
--- libpurple/protocols/jabber/jutil.h 6d0ede4e040b0093cbf1b95d5c1797020eccae10
+++ libpurple/protocols/jabber/jutil.h febd712fa491d0cb59f5aea97d930405ea662706
@@ -22,8 +22,6 @@
#ifndef _PURPLE_JABBER_JUTIL_H_
#define _PURPLE_JABBER_JUTIL_H_
-#include "account.h"
-
typedef struct _JabberID {
char *node;
char *domain;
============================================================
--- libpurple/protocols/msn/soap.c b4246c343cc7a5051c673f14257ab0918a4db156
+++ libpurple/protocols/msn/soap.c 8a27072e32a3cb6052fcaafc1dcd0d1abb6b65d7
@@ -26,7 +26,7 @@
#include "msn.h"
#include "soap.h"
-
+#define MSN_SOAP_DEBUG
/*local function prototype*/
void msn_soap_set_process_step(MsnSoapConn *soapconn, MsnSoapStep step);
============================================================
--- libpurple/protocols/myspace/markup.c 3281e6e2711eecf12224b5cad5dbc8fea7de161e
+++ libpurple/protocols/myspace/markup.c d89e9798f538d17fdb33c61be404948092164b2e
@@ -444,7 +444,8 @@ html_tag_to_msim_markup(MsimSession *ses
*begin = g_strdup_printf("<f s='%d'>", MSIM_TEXT_UNDERLINE);
*end = g_strdup("</f>");
} else if (!purple_utf8_strcasecmp(root->name, "a")) {
- const gchar *href, *link_text;
+ const gchar *href;
+ gchar *link_text;
href = xmlnode_get_attrib(root, "href");
@@ -476,6 +477,7 @@ html_tag_to_msim_markup(MsimSession *ses
/* Sorry, kid. MySpace doesn't support you within <a> tags. */
xmlnode_free(root->child);
+ g_free(link_text);
root->child = NULL;
*end = g_strdup("");
@@ -568,10 +570,7 @@ msim_convert_xmlnode(MsimSession *sessio
case XMLNODE_TYPE_DATA:
/* Literal text. */
- inner = g_new0(char, node->data_sz + 1);
- strncpy(inner, node->data, node->data_sz);
- inner[node->data_sz] = 0;
-
+ inner = g_strndup(node->data, node->data_sz);
purple_debug_info("msim", " ** node data=%s\n",
inner ? inner : "(NULL)");
break;
@@ -584,6 +583,8 @@ msim_convert_xmlnode(MsimSession *sessio
if (inner) {
g_string_append(final, inner);
+ g_free(inner);
+ inner = NULL;
}
}
@@ -593,6 +594,9 @@ msim_convert_xmlnode(MsimSession *sessio
* Comment out this line below to see. */
g_string_append(final, end);
+ g_free(begin);
+ g_free(end);
+
purple_debug_info("msim", "msim_markup_xmlnode_to_gtkhtml: RETURNING %s\n",
(final && final->str) ? final->str : "(NULL)");
============================================================
--- libpurple/protocols/myspace/myspace.c f3813eb28d7a14a765456c715d40a5125ec2ace6
+++ libpurple/protocols/myspace/myspace.c bb0bbb8393fb60ee046f8046dd9f5e27beec957b
@@ -289,7 +289,7 @@ msim_login(PurpleAccount *acct)
(int)strlen(acct->password));
/* Notify an error message also, because this is important! */
- purple_notify_error(acct, g_strdup(_("MySpaceIM Error")), str, NULL);
+ purple_notify_error(acct, _("MySpaceIM Error"), str, NULL);
gc->wants_to_die = TRUE;
purple_connection_error(gc, str);
@@ -636,6 +636,7 @@ msim_incoming_bm_record_cv(MsimSession *
g_return_val_if_fail(username != NULL, FALSE);
if (!cv) {
/* No client version to record, don't worry about it. */
+ g_free(username);
return FALSE;
}
@@ -825,6 +826,7 @@ msim_incoming_media(MsimSession *session
serv_got_typing_stopped(session->gc, username);
g_free(username);
+ g_free(text);
return TRUE;
}
@@ -973,7 +975,6 @@ msim_get_info_cb(MsimSession *session, M
purple_debug_info("msim", "msim_get_info_cb: username=%s\n", username);
purple_notify_user_info_destroy(user_info);
- /* TODO: do not free username, since it will be used by user_info? */
if (temporary_user) {
g_free(user->client_info);
@@ -987,7 +988,7 @@ msim_get_info_cb(MsimSession *session, M
g_free(user->image_url);
g_free(user);
}
-
+ g_free(username);
}
/** Retrieve a user's profile.
@@ -1166,7 +1167,7 @@ msim_incoming_resolved(MsimSession *sess
/* TODO: more elegant solution than below. attach whole message? */
/* Special elements name beginning with '_', we'll use internally within the
* program (did not come directly from the wire). */
- msg = msim_msg_append(msg, "_username", MSIM_TYPE_STRING, username);
+ msg = msim_msg_append(msg, "_username", MSIM_TYPE_STRING, username); /* This makes 'msg' the owner of 'username' */
/* TODO: attach more useful information, like ImageURL */
@@ -1802,8 +1803,7 @@ msim_error(MsimSession *session, MsimMes
}
purple_connection_error(session->gc, full_errmsg);
} else {
- purple_notify_error(session->account, g_strdup(_("MySpaceIM Error")),
- full_errmsg, NULL);
+ purple_notify_error(session->account, _("MySpaceIM Error"), full_errmsg, NULL);
}
g_free(full_errmsg);
@@ -2674,6 +2674,7 @@ msim_add_contact_from_server_cb(MsimSess
/* TODO: other fields, store in 'user' */
msim_msg_free(contact_info);
+ g_free(username);
}
/** Add first ContactID in contact_info to buddy's list. Used to add
============================================================
--- libpurple/protocols/myspace/user.c cd376f03cc62872fe687b6585cd373130330d2fb
+++ libpurple/protocols/myspace/user.c 7b2c5dd1ac71ad9a756d53486dd35842accbfba3
@@ -30,10 +30,10 @@ msim_format_now_playing(gchar *band, gch
static gchar *
msim_format_now_playing(gchar *band, gchar *song)
{
- if ((band && strlen(band)) || (song && strlen(song))) {
+ if ((band && *band) || (song && *song)) {
return g_strdup_printf("%s - %s",
- (band && strlen(band)) ? band : "Unknown Artist",
- (song && strlen(song)) ? song : "Unknown Song");
+ (band && *band) ? band : "Unknown Artist",
+ (song && *song) ? song : "Unknown Song");
} else {
return NULL;
}
@@ -99,58 +99,63 @@ msim_append_user_info(MsimSession *sessi
if (full) {
/* TODO: link to username, if available */
- purple_notify_user_info_add_pair(user_info, _("Profile"),
- g_strdup_printf("<a href=\"http://myspace.com/%d\">http://myspace.com/%d</a>",
- uid, uid));
+ char *profile = g_strdup_printf("<a href=\"http://myspace.com/%d\">http://myspace.com/%d</a>",
+ uid, uid);
+ purple_notify_user_info_add_pair(user_info, _("Profile"), profile);
+ g_free(profile);
}
/* a/s/l...the vitals */
if (user->age) {
- purple_notify_user_info_add_pair(user_info, _("Age"),
- g_strdup_printf("%d", user->age));
+ char age[16];
+ g_snprintf(age, sizeof(age), "%d", user->age);
+ purple_notify_user_info_add_pair(user_info, _("Age"), age);
}
- if (user->gender && strlen(user->gender)) {
+ if (user->gender && *user->gender) {
purple_notify_user_info_add_pair(user_info, _("Gender"), user->gender);
}
- if (user->location && strlen(user->location)) {
+ if (user->location && *user->location) {
purple_notify_user_info_add_pair(user_info, _("Location"), user->location);
}
/* Other information */
- if (user->headline && strlen(user->headline)) {
+ if (user->headline && *user->headline) {
purple_notify_user_info_add_pair(user_info, _("Headline"), user->headline);
}
str = msim_format_now_playing(user->band_name, user->song_name);
- if (str && strlen(str)) {
+ if (str && *str) {
purple_notify_user_info_add_pair(user_info, _("Song"), str);
}
+ g_free(str);
/* Note: total friends only available if looked up by uid, not username. */
if (user->total_friends) {
- purple_notify_user_info_add_pair(user_info, _("Total Friends"),
- g_strdup_printf("%d", user->total_friends));
+ char friends[16];
+ g_snprintf(friends, sizeof(friends), "%d", user->total_friends);
+ purple_notify_user_info_add_pair(user_info, _("Total Friends"), friends);
}
if (full) {
/* Client information */
+ char *client = NULL;
str = user->client_info;
cv = user->client_cv;
if (str && cv != 0) {
- purple_notify_user_info_add_pair(user_info, _("Client Version"),
- g_strdup_printf("%s (build %d)", str, cv));
+ client = g_strdup_printf("%s (build %d)", str, cv);
} else if (str) {
- purple_notify_user_info_add_pair(user_info, _("Client Version"),
- g_strdup(str));
+ client = g_strdup(str);
} else if (cv) {
- purple_notify_user_info_add_pair(user_info, _("Client Version"),
- g_strdup_printf("Build %d", cv));
+ client = g_strdup_printf("Build %d", cv);
}
+ if (client && *client)
+ purple_notify_user_info_add_pair(user_info, _("Client Version"), client);
+ g_free(client);
}
}
============================================================
--- libpurple/purple-remote ba9eca8159997a15119270a88a7d0d194465107e
+++ libpurple/purple-remote cedd9f61973784230e4b3c890d5161d571747955
@@ -9,7 +9,12 @@ xml.dom.minidom.Element.all = xml.dom.
xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName
-obj = dbus.SessionBus().get_object("im.pidgin.purple.PurpleService", "/im/pidgin/purple/PurpleObject")
+obj = None
+try:
+ obj = dbus.SessionBus().get_object("im.pidgin.purple.PurpleService", "/im/pidgin/purple/PurpleObject")
+except:
+ pass
+
purple = dbus.Interface(obj, "im.pidgin.purple.PurpleInterface")
class CheckedObject:
@@ -212,7 +217,10 @@ if len(sys.argv) == 1:
if len(sys.argv) == 1:
show_help()
-
+elif (obj == None):
+ print "No existing libpurple instance detected."
+ sys.exit(1);
+
for arg in sys.argv[1:]:
output = execute(arg)
============================================================
--- pidgin/gtkconv.c ebe83318f4b597e55d1d16dfc338dd4fab667159
+++ pidgin/gtkconv.c 07847dca42d82f448e6f12c44c4813140e0ea6f9
@@ -6835,7 +6835,9 @@ pidgin_conv_update_buddy_icon(PurpleConv
event = gtk_event_box_new();
gtk_container_add(GTK_CONTAINER(gtkconv->u.im->icon_container), event);
+#if GTK_CHECK_VERSION(2,4,0)
gtk_event_box_set_visible_window(GTK_EVENT_BOX(event), FALSE);
+#endif
gtk_widget_add_events(event,
GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
g_signal_connect(G_OBJECT(event), "button-press-event",
@@ -8940,7 +8942,9 @@ pidgin_conv_window_add_gtkconv(PidginWin
/* Close button. */
gtkconv->close = gtk_event_box_new();
+#if GTK_CHECK_VERSION(2,4,0)
gtk_event_box_set_visible_window(GTK_EVENT_BOX(gtkconv->close), FALSE);
+#endif
gtk_widget_set_events(gtkconv->close, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
close_image = gtk_label_new("×");
g_signal_connect(G_OBJECT(gtkconv->close), "enter-notify-event", G_CALLBACK(close_button_entered_cb), close_image);
============================================================
--- pidgin/gtknotify.c 02fa502bc544f582590c646b28310db19294c38c
+++ pidgin/gtknotify.c b901bf7e4010ebfa742017742f4a9cd929618fa1
@@ -430,7 +430,12 @@ pidgin_notify_add_mail(GtkTreeStore *tre
PIDGIN_MAIL_DATA, &data, -1);
if (data->account == account) {
if (clear) {
+#if GTK_CHECK_VERSION(2,2,0)
advanced = gtk_tree_store_remove(treemodel, &iter);
+#else
+ gtk_tree_store_remove(treemodel, &iter);
+ advanced = (iter.stamp == 0) ? FALSE : TRUE;
+#endif
purple_notify_close(PURPLE_NOTIFY_EMAILS, data);
/* We're completely done if we've processed all entries */
if (!advanced)
============================================================
--- pidgin/pidginstock.c a1a460cffd8fa050434e5402f4800f561f2528c5
+++ pidgin/pidginstock.c 2c265aa9d5a211ec43e10e414febf9937bb03420
@@ -114,11 +114,11 @@ static struct SizedStockIcon {
{ PIDGIN_STOCK_STATUS_CHAT, "status", "chat.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
{ PIDGIN_STOCK_STATUS_INVISIBLE,"status", "invisible.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
{ PIDGIN_STOCK_STATUS_XA, "status", "extended-away.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, PIDGIN_STOCK_STATUS_XA_I },
- { PIDGIN_STOCK_STATUS_LOGIN, "status", "log-in.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
- { PIDGIN_STOCK_STATUS_LOGOUT, "status", "log-out.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
+ { PIDGIN_STOCK_STATUS_LOGIN, "status", "log-in.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
+ { PIDGIN_STOCK_STATUS_LOGOUT, "status", "log-out.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
{ PIDGIN_STOCK_STATUS_OFFLINE, "status", "offline.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_OFFLINE_I },
{ PIDGIN_STOCK_STATUS_PERSON, "status", "person.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
- { PIDGIN_STOCK_STATUS_MESSAGE, "toolbar", "message-new.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+ { PIDGIN_STOCK_STATUS_MESSAGE, "toolbar", "message-new.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
{ PIDGIN_STOCK_STATUS_IGNORED, "emblems", "blocked.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
{ PIDGIN_STOCK_STATUS_FOUNDER, "emblems", "founder.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
============================================================
--- pidgin/pixmaps/status/11/Makefile.am 9a19ff6d6fcc1bb1b406d6407a095322e30e8c8b
+++ pidgin/pixmaps/status/11/Makefile.am 206419b4c8fd3cec428f705dab89a09c27326636
@@ -6,6 +6,8 @@ EXTRA_DIST = available.png \
chat.png \
extended-away.png \
invisible.png \
+ log-in.png \
+ log-out.png \
offline.png \
person.png
============================================================
--- pidgin/pixmaps/toolbar/Makefile.am 497746a6a16a636054c83cdb0f459206aa1ad609
+++ pidgin/pixmaps/toolbar/Makefile.am c5081b872303b49b303ca69d9ae94176f98e00e1
@@ -1,6 +1,11 @@ SUBDIRS = 16 22
SUBDIRS = 16 22
+TINY_ICONS = 11/message-new.png
EXTRA_DIST = \
Makefile.mingw \
16/Makefile.mingw \
+ 22/Makefile.mingw \
+ $(TINY_ICONS)
+
+pidgintinytoolbarpixdir = $(datadir)/pixmaps/pidgin/toolbar/11
+pidgintinytoolbarpix_DATA = $(TINY_ICONS)
- 22/Makefile.mingw
============================================================
--- pidgin/plugins/gestures/stroke-draw.c d754821b5eb626dad91eaa659c9ac876065fa4c8
+++ pidgin/plugins/gestures/stroke-draw.c 4101ccfbfe98a8cbb102e75bbf06d076b276962a
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <glib.h>
#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
#include "gstroke.h"
#include "gstroke-internal.h"
============================================================
# pidgin/win32/nsis/pixmaps/pidgin-intro.bmp is binary
============================================================
--- pidgin/win32/nsis/translations/arabic.nsh 2a2970fce95fc2f9cd1fcb1fe3f1a1b7569d9825
+++ pidgin/win32/nsis/translations/arabic.nsh 8af1be4475ad15a8674a8e0cbac479004120b619
@@ -1,65 +1,60 @@
;;
;; Arabic.nsh
;;
;; Arabic language translated strings for the Windows Pidgin NSIS installer.
-;; Windows Code page: 1252
+;; Windows Code page: 1256
;;
;; Version 3
-;; Note: If translating this file, replace '!insertmacro PIDGIN_MACRO_DEFAULT_STRING'
-;; with '!define'.
-; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in
-; langmacros.nsh when updating this file
-
; Startup Checks
-!define INSTALLER_IS_RUNNING "المثبّÙت يعمل بالÙعل."
-!define PIDGIN_IS_RUNNING "بÙدْجÙÙ† يعمل Øاليا. من Ùضلك أغلق بÙدْجن ثم أعد المØاولة."
-!define GTK_INSTALLER_NEEDED "بيئة جتك+ (GTK+) Ù…Ùقودة أو تØتاج للتØديث.$\rمن Ùضلك ثبّÙت v${GTK_MIN_VERSION} أو Ø£Øدث من بيئة جتك+"
+!define INSTALLER_IS_RUNNING "ÇáãËÈøöÊ íÚãá ÈÇáÝÚá."
+!define PIDGIN_IS_RUNNING "ÈöÏúÌöä íÚãá ÍÇáíÇ. ãä ÝÖáß ÃÛáÞ ÈöÏúÌä Ëã ÃÚÏ ÇáãÍÇæáÉ."
+!define GTK_INSTALLER_NEEDED "ÈíÆÉ ÌÊß+ (GTK+) ãÝÞæÏÉ Ãæ ÊÍÊÇÌ ááÊÍÏíË.$\rãä ÝÖáß ËÈøöÊ v${GTK_MIN_VERSION} Ãæ ÃÍÏË ãä ÈíÆÉ ÌÊß+"
; License Page
-!define PIDGIN_LICENSE_BUTTON "التالي >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) يخضع لرخصة جنو العموميّة العامة (GPL). الرخصة المعطاة هنا لغرض الإعلام Ùقط. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON "ÇáÊÇáí >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) íÎÖÚ áÑÎÕÉ Ìäæ ÇáÚãæãíøÉ ÇáÚÇãÉ (GPL). ÇáÑÎÕÉ ÇáãÚØÇÉ åäÇ áÛÑÖ ÇáÅÚáÇã ÝÞØ. $_CLICK"
; Components Page
-!define PIDGIN_SECTION_TITLE "عميل التراسل الÙوري بÙدْجÙÙ† (مطلوب)"
-!define GTK_SECTION_TITLE "بيئة جتك+ (مطلوبة إن لم تكن موجودة)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE "الاختصارات"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Ø³Ø·Ø Ø§Ù„Ù…ÙƒØªØ¨"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "قائمة ابدأ"
-!define PIDGIN_SECTION_DESCRIPTION " Ùˆ ملÙات Ù„Ùب بÙدْجÙÙ† dll"
-!define GTK_SECTION_DESCRIPTION "عدّة واجهة رسوميّة متعددة المنصات، يستخدمها بÙدْجÙÙ†."
+!define PIDGIN_SECTION_TITLE "Úãíá ÇáÊÑÇÓá ÇáÝæÑí ÈöÏúÌöä (ãØáæÈ)"
+!define GTK_SECTION_TITLE "ÈíÆÉ ÌÊß+ (ãØáæÈÉ Åä áã Êßä ãæÌæÏÉ)"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE "ÇáÇÎÊÕÇÑÇÊ"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "ÓØÍ ÇáãßÊÈ"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "ÞÇÆãÉ ÇÈÏÃ"
+!define PIDGIN_SECTION_DESCRIPTION " æ ãáÝÇÊ áõÈ ÈöÏúÌöä dll"
+!define GTK_SECTION_DESCRIPTION "ÚÏøÉ æÇÌåÉ ÑÓæãíøÉ ãÊÚÏÏÉ ÇáãäÕÇÊ¡ íÓÊÎÏãåÇ ÈöÏúÌöä."
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "اختصارات لبدأ بÙدْجÙÙ†"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC "أنشئ اختصارا لبÙدْجÙÙ† على Ø³Ø·Ø Ø§Ù„Ù…ÙƒØªØ¨"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC "أنشئ Ù…Ùدخلة لبدجن ÙÙŠ قائمة ابدأ"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "ÇÎÊÕÇÑÇÊ áÈÏà ÈöÏúÌöä"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC "ÃäÔÆ ÇÎÊÕÇÑÇ áÈöÏúÌöä Úáì ÓØÍ ÇáãßÊÈ"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC "ÃäÔÆ ãõÏÎáÉ áÈÏÌä Ýí ÞÇÆãÉ ÇÈÏÃ"
; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT "ÙˆÙجÙدت نسخة قديمة من بيئة جتك+. أتريد التØديث؟$\rلاØظ: قد لا يعمل $(^Name) مالم تÙعل هذا."
-!define GTK_WINDOWS_INCOMPATIBLE "لا يتواÙÙ‚ ويندوز 95/98/Me مع جتك+ 2.8.0 أو Ø£Øدث. جتك+ ${GTK_INSTALL_VERSION} لن تÙثبّت.$\rإذا لم يكن لديك جتك+ ${GTK_MIN_VERSION} أو Ø£Øدث مثبتة بالÙعل، سيÙØبط التثبيت."
+!define GTK_UPGRADE_PROMPT "æõÌöÏÊ äÓÎÉ ÞÏíãÉ ãä ÈíÆÉ ÌÊß+. ÃÊÑíÏ ÇáÊÍÏíË¿$\ráÇÍÙ: ÞÏ áÇ íÚãá $(^Name) ãÇáã ÊÝÚá åÐÇ."
+!define GTK_WINDOWS_INCOMPATIBLE "áÇ íÊæÇÝÞ æíäÏæÒ 95/98/Me ãÚ ÌÊß+ 2.8.0 Ãæ ÃÍÏË. ÌÊß+ ${GTK_INSTALL_VERSION} áä ÊõËÈøÊ.$\rÅÐÇ áã íßä áÏíß ÌÊß+ ${GTK_MIN_VERSION} Ãæ ÃÍÏË ãËÈÊÉ ÈÇáÝÚá¡ ÓíõÍÈØ ÇáÊËÈíÊ."
; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE "قم بزيارة صÙØØ© بدجن على الوÙب"
+!define PIDGIN_FINISH_VISIT_WEB_SITE "Þã ÈÒíÇÑÉ ÕÝÍÉ ÈÏÌä Úáì ÇáæöÈ"
; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "تعذّر إزالة نسخة بدجن المثبّتة. ثتÙثبّت النسخة الØديثة بدون إزالة النسخة المثبّتة مسبقا."
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "ÊÚÐøÑ ÅÒÇáÉ äÓÎÉ ÈÏÌä ÇáãËÈøÊÉ. ËÊõËÈøÊ ÇáäÓÎÉ ÇáÍÏíËÉ ÈÏæä ÅÒÇáÉ ÇáäÓÎÉ ÇáãËÈøÊÉ ãÓÈÞÇ."
; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR "خطأ أثناء تثبيت بيئة جتك+."
-!define GTK_BAD_INSTALL_PATH "لا يمكن الوصول أو إنشاء المسار الذي Øددته."
+!define GTK_INSTALL_ERROR "ÎØà ÃËäÇÁ ÊËÈíÊ ÈíÆÉ ÌÊß+."
+!define GTK_BAD_INSTALL_PATH "áÇ íãßä ÇáæÕæá Ãæ ÅäÔÇÁ ÇáãÓÇÑ ÇáÐí ÍÏÏÊå."
; URL Handler section
-!define URI_HANDLERS_SECTION_TITLE "متعاملات المسارات"
+!define URI_HANDLERS_SECTION_TITLE "ãÊÚÇãáÇÊ ÇáãÓÇÑÇÊ"
; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1 "لم ÙŠÙعثر المثبت على خانات السجل الخاصة ببدجن.$\rغالبا ثبت هذا البرنامج مستخدم آخر."
-!define un.PIDGIN_UNINSTALL_ERROR_2 "لا تملك الصلاØيات لتثبيت هذا التطبيق."
+!define un.PIDGIN_UNINSTALL_ERROR_1 "áã íõÚËÑ ÇáãËÈÊ Úáì ÎÇäÇÊ ÇáÓÌá ÇáÎÇÕÉ ÈÈÏÌä.$\rÛÇáÈÇ ËÈÊ åÐÇ ÇáÈÑäÇãÌ ãÓÊÎÏã ÂÎÑ."
+!define un.PIDGIN_UNINSTALL_ERROR_2 "áÇ Êãáß ÇáÕáÇÍíÇÊ áÊËÈíÊ åÐÇ ÇáÊØÈíÞ."
; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE "دعم التدقيق الإملائي"
-!define PIDGIN_SPELLCHECK_ERROR "خطأ أثناء تثبيت التدقيق الإملائي"
-!define PIDGIN_SPELLCHECK_DICT_ERROR "خطأ أثناء تثبيت قاموس التدقيق الإملائي"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION "دعم التدقيق الإملائي. (مطلوب اتصال بالإنترنت للتثبيت)"
-!define ASPELL_INSTALL_FAILED "Ùشل التثبيت"
+!define PIDGIN_SPELLCHECK_SECTION_TITLE "ÏÚã ÇáÊÏÞíÞ ÇáÅãáÇÆí"
+!define PIDGIN_SPELLCHECK_ERROR "ÎØà ÃËäÇÁ ÊËÈíÊ ÇáÊÏÞíÞ ÇáÅãáÇÆí"
+!define PIDGIN_SPELLCHECK_DICT_ERROR "ÎØà ÃËäÇÁ ÊËÈíÊ ÞÇãæÓ ÇáÊÏÞíÞ ÇáÅãáÇÆí"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION "ÏÚã ÇáÊÏÞíÞ ÇáÅãáÇÆí. (ãØáæÈ ÇÊÕÇá ÈÇáÅäÊÑäÊ ááÊËÈíÊ)"
+!define ASPELL_INSTALL_FAILED "ÝÔá ÇáÊËÈíÊ"
!define PIDGIN_SPELLCHECK_BRETON "Breton"
!define PIDGIN_SPELLCHECK_CATALAN "Catalan"
!define PIDGIN_SPELLCHECK_CZECH "Czech"
============================================================
--- po/ChangeLog 99f4f458e47460ac752ac07c68ef2ae875aab8b7
+++ po/ChangeLog 520ee146dab1fcab40a6ba616f5be58fdca2d5f1
@@ -1,6 +1,7 @@ version 2.2.2
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
version 2.2.2
+ * German translation updated (Bjoern Voigt)
version 2.2.1
* Arabic translation updated (Khaled Hosny)
============================================================
--- po/de.po 7d461172b5244d77d7db3f6528e3f59ab7ded449
+++ po/de.po 89141f611e603db6a0d7f61d73ec782a4461a495
@@ -12,9 +12,9 @@ msgstr ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-09-11 22:46+0200\n"
-"Last-Translator: Bjoern Voigt <bjoern at cs.tu-berlin.de>\n"
+"POT-Creation-Date: 2007-10-01 08:48+0200\n"
+"PO-Revision-Date: 2007-10-01 11:30+0200\n"
+"Last-Translator: Jochen Kemnade <kemnade at gmail.com>\n"
"Language-Team: Deutsch <de at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -53,7 +53,7 @@ msgstr ""
" -n, --nologin nicht automatisch anmelden\n"
" -v, --version zeigt aktuelle Version und beendet das Programm\n"
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
#, c-format
msgid ""
"%s encountered errors migrating your settings from %s to %s. Please "
@@ -66,11 +66,11 @@ msgstr ""
"pidgin.im"
#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:235 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
#: ../libpurple/protocols/jabber/chat.c:677
#: ../libpurple/protocols/jabber/chat.c:688
#: ../libpurple/protocols/jabber/jabber.c:1515
@@ -105,8 +105,8 @@ msgstr "(Sie haben wahrscheinlich verges
msgid "(You probably forgot to 'make install'.)"
msgstr "(Sie haben wahrscheinlich vergessen 'make install' aufzurufen.)"
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4322
msgid "Modify Account"
msgstr "Konto bearbeiten"
@@ -136,8 +136,8 @@ msgstr "Alias:"
#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntcertmgr.c:91
+#: ../finch/gntplugin.c:472 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
@@ -146,8 +146,8 @@ msgstr "Alias:"
#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
#: ../libpurple/protocols/gg/gg.c:884
#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2416
+#: ../libpurple/protocols/jabber/buddy.c:2452
#: ../libpurple/protocols/jabber/chat.c:786
#: ../libpurple/protocols/jabber/jabber.c:1008
#: ../libpurple/protocols/jabber/jabber.c:1017
@@ -156,10 +156,10 @@ msgstr "Alias:"
#: ../libpurple/protocols/jabber/usermood.c:184
#: ../libpurple/protocols/jabber/usernick.c:78
#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
+#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/msn/msn.c:362
+#: ../libpurple/protocols/oscar/oscar.c:6146
#: ../libpurple/protocols/oscar/peer.c:1046
#: ../libpurple/protocols/qq/buddy_info.c:484
#: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -194,10 +194,10 @@ msgstr "Alias:"
#: ../libpurple/protocols/silc10/ops.c:1904
#: ../libpurple/protocols/silc10/silc.c:736
#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:6267
#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
@@ -205,7 +205,7 @@ msgstr "Alias:"
#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1108
#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
@@ -215,8 +215,8 @@ msgstr "Abbrechen"
#. Save button
#. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:472 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
@@ -239,12 +239,12 @@ msgstr "Konto löschen"
#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtkpounce.c:1107 ../pidgin/gtkrequest.c:274
#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
msgid "Delete"
msgstr "Löschen"
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
msgid "Accounts"
msgstr "Konten"
@@ -255,15 +255,16 @@ msgstr "Sie können Konten auf der folge
#. Add button
#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2305
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:383 ../finch/gntpounce.c:713
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
+#: ../libpurple/protocols/qq/sys_msg.c:114
#: ../libpurple/protocols/qq/sys_msg.c:173
#: ../libpurple/protocols/qq/sys_msg.c:267
#: ../libpurple/protocols/sametime/sametime.c:5486
#: ../libpurple/protocols/silc/chat.c:615
#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
+#: ../pidgin/gtkblist.c:6266 ../pidgin/gtkconv.c:1712
#: ../pidgin/gtkrequest.c:275
msgid "Add"
msgstr "Hinzufügen"
@@ -323,13 +324,13 @@ msgstr "Fehler beim Hinzufügen des Budd
msgid "Error adding buddy"
msgstr "Fehler beim Hinzufügen des Buddys"
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2902
#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
msgid "Screen Name"
msgstr "Benutzername"
#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
+#: ../libpurple/protocols/msn/msn.c:1507
#: ../libpurple/protocols/silc/chat.c:606
#: ../libpurple/protocols/silc10/chat.c:590
#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
@@ -347,8 +348,8 @@ msgstr "Gruppe"
#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../pidgin/gtkblist.c:3206 ../pidgin/gtknotify.c:506
+#: ../pidgin/gtkpounce.c:1275 ../pidgin/plugins/gevolution/gevolution.c:445
msgid "Account"
msgstr "Konto"
@@ -361,7 +362,7 @@ msgstr "Konto"
#: ../libpurple/protocols/silc10/buddy.c:1033
#: ../libpurple/protocols/silc10/buddy.c:1080
#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5772
#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
msgid "Add Buddy"
msgstr "Buddy hinzufügen"
@@ -370,15 +371,15 @@ msgstr "Bitte Buddy-Informationen angebe
msgid "Please enter buddy information."
msgstr "Bitte Buddy-Informationen angeben."
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
msgid "Chats"
msgstr "Chats"
#. Extract their Name and put it in
#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1694 ../libpurple/protocols/msn/msn.c:1759
+#: ../libpurple/protocols/msn/msn.c:1786
#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
#: ../pidgin/gtkroomlist.c:618
#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -390,7 +391,7 @@ msgstr "Automatisch beitreten"
msgid "Auto-join"
msgstr "Automatisch beitreten"
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6154
msgid "Add Chat"
msgstr "Chat hinzufügen"
@@ -412,7 +413,7 @@ msgstr "Es gibt schon eine Gruppe mit di
#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6263
msgid "Add Group"
msgstr "Gruppe hinzufügen"
@@ -444,7 +445,7 @@ msgstr "Empfange..."
msgid "Retrieving..."
msgstr "Empfange..."
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
#: ../libpurple/protocols/silc/chat.c:899
#: ../libpurple/protocols/silc10/chat.c:883
msgid "Get Info"
@@ -455,10 +456,10 @@ msgstr "Buddy-Alarm hinzufügen"
msgstr "Buddy-Alarm hinzufügen"
#. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
#: ../libpurple/protocols/jabber/si.c:874
#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../pidgin/gtkconv.c:1660
msgid "Send File"
msgstr "Datei versenden"
@@ -504,14 +505,14 @@ msgstr "Entfernen bestätigen"
msgstr "Entfernen bestätigen"
#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1709 ../pidgin/gtkrequest.c:276
#: ../pidgin/gtkstatusbox.c:264
msgid "Remove"
msgstr "Entfernen"
#. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2355 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4566
#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
msgid "Buddy List"
msgstr "Buddy-Liste"
@@ -530,15 +531,15 @@ msgstr "Markierung umkehren"
#: ../libpurple/protocols/gg/gg.c:2207
#: ../libpurple/protocols/jabber/buddy.c:286
#: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2399
#: ../libpurple/protocols/jabber/jabber.c:937
#: ../libpurple/protocols/jabber/jabber.c:1544
#: ../libpurple/protocols/jabber/jabber.c:1567
#: ../libpurple/protocols/jabber/jabber.c:1590
#: ../libpurple/protocols/jabber/jabber.c:1613
#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1515 ../libpurple/protocols/msn/msn.c:1697
#: ../libpurple/protocols/qq/buddy_info.c:43
#: ../libpurple/protocols/silc/buddy.c:1535
#: ../libpurple/protocols/silc/ops.c:1002
@@ -548,7 +549,7 @@ msgstr "Markierung umkehren"
#: ../libpurple/protocols/silc10/ops.c:1036
#: ../libpurple/protocols/silc10/ops.c:1179
#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3230
msgid "Nickname"
msgstr "Spitzname"
@@ -557,12 +558,12 @@ msgstr "Spitzname"
#: ../libpurple/protocols/bonjour/bonjour.c:340
#: ../libpurple/protocols/jabber/buddy.c:787
#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2926
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
+#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
msgid "Idle"
msgstr "Untätig"
@@ -593,36 +594,36 @@ msgstr ""
"\n"
"Zuletzt gesehen: vor %s"
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:470
#: ../pidgin/gtkstatusbox.c:1072
msgid "New..."
msgstr "Neu..."
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:471
#: ../pidgin/gtkstatusbox.c:1073
msgid "Saved..."
msgstr "Gespeichert..."
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
+#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:343 ../finch/gntui.c:88
#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
msgid "Plugins"
msgstr "Plugins"
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
+#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:754
#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
msgid "_Name"
msgstr "_Name"
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
+#: ../finch/gntblist.c:2210 ../pidgin/gtkdialogs.c:759
#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
msgid "_Account"
msgstr "_Konto"
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:767
msgid "New Instant Message"
msgstr "Neue Sofortnachricht"
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:769
msgid ""
"Please enter the screen name or alias of the person you would like to IM."
msgstr ""
@@ -631,15 +632,15 @@ msgstr ""
#. Not multiline
#. Not masked?
#. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
+#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
#: ../libpurple/protocols/jabber/jabber.c:1736
#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/msn/msn.c:289 ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:323 ../libpurple/protocols/msn/msn.c:340
+#: ../libpurple/protocols/oscar/oscar.c:6145
#: ../libpurple/protocols/silc/buddy.c:454
#: ../libpurple/protocols/silc/buddy.c:1190
#: ../libpurple/protocols/silc/chat.c:447
@@ -656,9 +657,9 @@ msgstr ""
#: ../libpurple/protocols/silc10/ops.c:1297
#: ../libpurple/protocols/silc10/ops.c:1903
#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4321
#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
#: ../pidgin/gtkrequest.c:270
@@ -666,36 +667,42 @@ msgstr "OK"
msgstr "OK"
#. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2261 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:797
msgid "Options"
msgstr "Optionen"
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2267
msgid "Send IM..."
msgstr "Nachricht senden..."
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "Zeige leere Gruppen"
+#: ../finch/gntblist.c:2271
+msgid "Show"
+msgstr "Anzeigen"
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "Zeige Offline-Buddys"
+#: ../finch/gntblist.c:2276
+msgid "Empty groups"
+msgstr "Leere Gruppen"
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "Nach Status sortieren"
+#: ../finch/gntblist.c:2282
+msgid "Offline buddies"
+msgstr "Offline-Buddys"
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "Alphabetisch sortieren"
+#: ../finch/gntblist.c:2288
+msgid "Sort"
+msgstr "Sortieren"
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "Nach Größe der Logs sortieren"
+#: ../finch/gntblist.c:2293
+msgid "By Status"
+msgstr "Nach Status"
+#: ../finch/gntblist.c:2297 ../pidgin/gtkblist.c:4106
+msgid "Alphabetically"
+msgstr "Alphabetisch"
+
+#: ../finch/gntblist.c:2301
+msgid "By Log Size"
+msgstr "Nach Größe der Logs"
+
#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
msgid "Certificate Import"
msgstr "Zertifikat-Import"
@@ -763,9 +770,9 @@ msgstr ""
"SHA1 fingerprint:\n"
"%s"
msgstr ""
-"Common name: %s\n"
+"Allgemeiner Name (Common name): %s\n"
"\n"
-"SHA1 fingerprint:\n"
+"SHA1-Fingerabdruck:\n"
"%s"
#: ../finch/gntcertmgr.c:198
@@ -792,32 +799,32 @@ msgstr "Rechnername"
msgid "Hostname"
msgstr "Rechnername"
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1688
#: ../pidgin/gtkdebug.c:835
msgid "Info"
msgstr "Info"
#. Close button
#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
+#: ../finch/gntplugin.c:211 ../finch/gntplugin.c:403 ../finch/gntpounce.c:738
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:406
#: ../libpurple/protocols/silc/util.c:382
#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
#: ../pidgin/gtkrequest.c:273
msgid "Close"
msgstr "Schließen"
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
#, c-format
msgid "%s disconnected."
msgstr "%s abgemeldet."
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
#, c-format
msgid ""
"%s\n"
@@ -830,7 +837,7 @@ msgstr ""
"Finch wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler "
"behoben und das Konto wieder aktiviert haben."
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4323
msgid "Re-enable Account"
msgstr "Konten reaktivieren"
@@ -838,24 +845,24 @@ msgstr "Es gibt kein solches Kommando."
msgid "No such command."
msgstr "Es gibt kein solches Kommando."
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:530
msgid "Syntax Error: You typed the wrong number of arguments to that command."
msgstr ""
"Syntaxfehler: Sie übergaben dem Kommando eine falsche Anzahl von Argumenten."
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:536
msgid "Your command failed for an unknown reason."
msgstr "Ihre Kommando scheiterte aus einem unbekannten Grund."
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:543
msgid "That command only works in chats, not IMs."
msgstr "Dieses Kommando funktioniert nur in Chats, nicht bei IMs."
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:546
msgid "That command only works in IMs, not chats."
msgstr "Dieses Kommando funktioniert nur bei IMs, nicht bei Chats."
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:551
msgid "That command doesn't work on this protocol."
msgstr "Dieses Kommando funktioniert nicht in diesem Protokoll."
@@ -873,7 +880,7 @@ msgstr "%s [%s]"
msgid "%s [%s]"
msgstr "%s [%s]"
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
#, c-format
msgid ""
"\n"
@@ -886,65 +893,65 @@ msgstr "Sie haben diesen Chat verlassen.
msgid "You have left this chat."
msgstr "Sie haben diesen Chat verlassen."
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1415
msgid "Logging started. Future messages in this conversation will be logged."
msgstr ""
"Mitschnitt gestartet. Zukünftige Nachrichten dieser Unterhaltung werden "
"mitgeschnitten."
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1423
msgid ""
"Logging stopped. Future messages in this conversation will not be logged."
msgstr ""
"Mitschnitt angehalten. Zukünftige Nachrichten dieser Unterhaltung werden "
"nicht mitgeschnitten."
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:469
msgid "Send To"
msgstr "Senden an"
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:513
msgid "Conversation"
msgstr "Unterhaltung"
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:519
msgid "Clear Scrollback"
msgstr "Gesprächsfenster leeren"
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
msgid "Show Timestamps"
msgstr "Zeige Zeitstempel"
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:539
msgid "Add Buddy Pounce..."
msgstr "Buddy-Alarm hinzufügen..."
-#: ../finch/gntconv.c:527
+#: ../finch/gntconv.c:554
msgid "Enable Logging"
msgstr "Mitschnitt einschalten"
-#: ../finch/gntconv.c:533
+#: ../finch/gntconv.c:560
msgid "Enable Sounds"
msgstr "Klänge aktivieren"
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:766
msgid "<AUTO-REPLY> "
msgstr "<AUTO-REPLY> "
#. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:889
msgid "List of users:\n"
msgstr "Liste der Benutzer:\n"
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:370
msgid "Supported debug options are: version"
msgstr "Unterstützte Debug-Optionen sind: version"
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:422
msgid "No such command (in this context)."
msgstr "Kein solches Kommando (in diesem Kontext)."
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:425
msgid ""
"Use \"/help <command>\" for help on a specific command.\n"
"The following commands are available in this context:\n"
@@ -953,7 +960,7 @@ msgstr ""
"zu erhalten.\n"
"Die folgenden Kommandos sind in diesem Kontext verfügbar:\n"
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7642
msgid ""
"say <message>: Send a message normally as if you weren't using a "
"command."
@@ -961,13 +968,13 @@ msgstr ""
"say <Nachricht>: Sendet eine Nachricht genau so, als wenn Sie die "
"Nachricht ohne ein Kommando absenden."
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7645
msgid "me <action>: Send an IRC style action to a buddy or chat."
msgstr ""
"me <Aktion>: Sende eine IRC-ähnliche Aktion an einen Buddy oder einen "
"Chat."
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7648
msgid ""
"debug <option>: Send various debug information to the current "
"conversation."
@@ -975,43 +982,48 @@ msgstr ""
"debug <Option>: Verschiedene Debugging-Informationen zur aktuellen "
"Unterhaltung senden."
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7651
msgid "clear: Clears the conversation scrollback."
msgstr "clear: Leert das Gesprächsfenster."
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7657
msgid "help <command>: Help on a specific command."
msgstr "help <Kommando>: Hilfe zu einem bestimmten Kommando."
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1163
msgid "users: Show the list of users in the chat."
msgstr "users: Liste der Benutzer im Chat anzeigen."
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1168
msgid "plugins: Show the plugins window."
msgstr "plugins: Plugin-Fenster anzeigen."
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1171
msgid "buddylist: Show the buddylist."
msgstr "buddylist: Die Kontaktliste anzeigen."
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1174
msgid "accounts: Show the accounts window."
msgstr "accounts: Das Konten-Fenster anzeigen."
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1177
msgid "debugwin: Show the debug window."
msgstr "debugwin: Das Debugging-Fenster anzeigen."
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1180
msgid "prefs: Show the preference window."
msgstr "prefs: Das Einstellungs-Fenster anzeigen."
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1183
msgid "statuses: Show the savedstatuses window."
msgstr "statuses: Das Fenster mit gespeicherten Status-Infos anzeigen."
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:988 ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "Konnte die Datei nicht öffnen."
+
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
msgid "Debug Window"
msgstr "Debug-Fenster"
@@ -1019,15 +1031,15 @@ msgstr "Debug-Fenster"
#. * it's necessary to make the width of the debug window resizable ... like I said,
#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
#.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:754
msgid "Clear"
msgstr "Leeren"
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
-msgstr "Filter: "
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
+msgstr "Filter:"
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:763
msgid "Pause"
msgstr "Pause"
@@ -1071,17 +1083,17 @@ msgstr "Verbleibend"
#: ../libpurple/protocols/jabber/buddy.c:782
#: ../libpurple/protocols/jabber/buddy.c:941
#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/msn/msn.c:596 ../libpurple/protocols/msn/msn.c:603
+#: ../libpurple/protocols/novell/novell.c:2840
#: ../libpurple/protocols/oscar/oscar.c:821
#: ../libpurple/protocols/oscar/oscar.c:826
#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/oscar/oscar.c:2714
+#: ../libpurple/protocols/oscar/oscar.c:3794
#: ../libpurple/protocols/sametime/sametime.c:3263
#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
+#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
msgid "Status"
msgstr "Status"
@@ -1125,7 +1137,7 @@ msgstr "Fertig"
msgid "Finished"
msgstr "Fertig"
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:386
msgid "Transferring"
msgstr "Ãœbertragung"
@@ -1156,49 +1168,49 @@ msgstr "Neue Mail"
msgid "New Mail"
msgstr "Neue Mail"
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:942
#, c-format
msgid "Info for %s"
msgstr "Info über %s"
#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../pidgin/gtknotify.c:943
msgid "Buddy Information"
msgstr "Buddy-Information"
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:380 ../libpurple/protocols/qq/group_join.c:367
msgid "Continue"
msgstr "Fortfahren"
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:389 ../pidgin/gtkconv.c:1649
msgid "IM"
msgstr "Nachricht"
-#: ../finch/gntnotify.c:389
+#: ../finch/gntnotify.c:392
msgid "Join"
msgstr "Betreten"
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:395 ../libpurple/protocols/sametime/sametime.c:3473
msgid "Invite"
msgstr "Einladen"
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:398
msgid "(none)"
msgstr "(kein)"
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:76 ../finch/gntplugin.c:85
msgid "ERROR"
msgstr "FEHLER"
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:76
msgid "loading plugin failed"
msgstr "Laden des Plugins fehlgeschlagen"
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:85
msgid "unloading plugin failed"
msgstr "Entladen des Plugins fehlgeschlagen"
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:130
#, c-format
msgid ""
"Name: %s\n"
@@ -1215,19 +1227,42 @@ msgstr ""
"Website: %s\n"
"Dateiname: %s\n"
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:188
msgid "Plugin need to be loaded before you can configure it."
msgstr "Das Plugin muss geladen werden, bevor es konfiguriert werden kann."
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:236
msgid "No configuration options for this plugin."
msgstr "Keine Einstellungsoptionen für dieses Plugin."
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:257
+msgid "Error loading plugin"
+msgstr "Beim Laden des Plugins traten Fehler auf"
+
+#: ../finch/gntplugin.c:258
+msgid "The selected file is not a valid plugin."
+msgstr "Die gewählte Datei ist kein gültiges Plugin."
+
+#: ../finch/gntplugin.c:259
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"Bitte öffnen Sie das Debug-Fenster und versuchen Sie es erneut, um die "
+"genaue Fehlermeldung zu sehen."
+
+#: ../finch/gntplugin.c:322
+msgid "Select plugin to install"
+msgstr "Wählen Sie ein Plugin zum Installieren"
+
+#: ../finch/gntplugin.c:348
msgid "You can (un)load plugins from the following list."
msgstr "Die können Plugins von der folgenden Liste laden bzw. entladen."
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:399
+msgid "Install Plugin..."
+msgstr "Plugin installieren..."
+
+#: ../finch/gntplugin.c:408
msgid "Configure Plugin"
msgstr "Plugin konfigurieren"
@@ -1236,8 +1271,8 @@ msgstr "Plugin konfigurieren"
#. (that should have been "effect," right?)
#. Back to instant-apply! I win! BU-HAHAHA!
#. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:464 ../finch/gntplugin.c:471 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2069
msgid "Preferences"
msgstr "Einstellungen"
@@ -1245,11 +1280,11 @@ msgstr "Bitte Buddy zum Alarmieren angeb
msgid "Please enter a buddy to pounce."
msgstr "Bitte Buddy zum Alarmieren angeben."
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
msgid "New Buddy Pounce"
msgstr "Neuer Buddy-Alarm"
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
msgid "Edit Buddy Pounce"
msgstr "Buddy-Alarm bearbeiten"
@@ -1267,7 +1302,7 @@ msgstr "Buddy-Name:"
msgstr "Buddy-Name:"
#. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:592
msgid "Pounce When Buddy..."
msgstr "Alarm, wenn Buddy..."
@@ -1312,7 +1347,7 @@ msgstr "eine Nachricht sendet"
msgstr "eine Nachricht sendet"
#. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:653
msgid "Action"
msgstr "Aktion"
@@ -1340,7 +1375,7 @@ msgstr "Nur alarmieren, wenn ich nicht v
msgid "Pounce only when my status is not available"
msgstr "Nur alarmieren, wenn ich nicht verfügbar bin"
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1288
msgid "Recurring"
msgstr "Wiederkehrend"
@@ -1356,66 +1391,66 @@ msgstr "Sie müssen ein Konto anlegen, b
msgid "You must create an account first before you can create a pounce."
msgstr "Sie müssen ein Konto anlegen, bevor Sie einen Alarm erzeugen können."
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1103
#, c-format
msgid "Are you sure you want to delete the pounce on %s for %s?"
msgstr "Wollen Sie die Alarmierung für %s (Konto %s) wirklich löschen?"
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1332
msgid "Buddy Pounces"
msgstr "Buddy-Alarm"
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1459
#, c-format
msgid "%s has started typing to you (%s)"
msgstr "%s hat begonnen Ihnen zu schreiben (%s)"
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1461
#, c-format
msgid "%s has paused while typing to you (%s)"
msgstr "%s hat beim Schreiben an Sie (%s) angehalten"
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1463
#, c-format
msgid "%s has signed on (%s)"
msgstr "%s hat sich angemeldet (%s)"
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1465
#, c-format
msgid "%s has returned from being idle (%s)"
msgstr "%s ist nicht mehr inaktiv (%s)"
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1467
#, c-format
msgid "%s has returned from being away (%s)"
msgstr "%s ist wieder anwesend (%s)"
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1469
#, c-format
msgid "%s has stopped typing to you (%s)"
msgstr "%s hat aufgehört, Ihnen zu schreiben (%s)"
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1471
#, c-format
msgid "%s has signed off (%s)"
msgstr "%s hat sich abgemeldet (%s)"
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1473
#, c-format
msgid "%s has become idle (%s)"
msgstr "%s wurde untätig (%s)"
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1475
#, c-format
msgid "%s has gone away. (%s)"
msgstr "%s ist abwesend. (%s)"
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1477
#, c-format
msgid "%s has sent you a message. (%s)"
msgstr "%s hat Ihnen eine Nachricht gesendet. (%s)"
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1478
#, c-format
msgid "Unknown pounce event. Please report this!"
msgstr "Unbekanntes Alarm-Ereignis. Bitte berichten Sie dieses Problem!"
@@ -1424,12 +1459,12 @@ msgstr "Abhängig von Tastaturbenutzung"
msgid "Based on keyboard use"
msgstr "Abhängig von Tastaturbenutzung"
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
msgid "From last sent message"
msgstr "Von letzter gesendeter Nachricht"
#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
msgid "Never"
msgstr "Niemals"
@@ -1479,25 +1514,25 @@ msgstr "Ändere Status zu"
msgstr "Ändere Status zu"
#. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
msgid "Conversations"
msgstr "Unterhaltungen"
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
msgid "Logging"
msgstr "Mitschnitt"
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:585
msgid "Not implemented yet."
msgstr "Noch nicht implementiert."
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1555
#: ../pidgin/gtkrequest.c:1601
msgid "Save File..."
msgstr "Datei speichern..."
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1556
#: ../pidgin/gtkrequest.c:1602
msgid "Open File..."
msgstr "Datei öffnen..."
@@ -1550,8 +1585,8 @@ msgstr "GStreamer konnte nicht initialis
msgid "GStreamer failed to initialize."
msgstr "GStreamer konnte nicht initialisiert werden."
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
+#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
msgid "(default)"
msgstr "(Standard)"
@@ -1567,7 +1602,7 @@ msgstr "Profile"
msgid "Profiles"
msgstr "Profile"
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
msgid "Automatic"
msgstr "Automatisch"
@@ -1575,7 +1610,7 @@ msgstr "Konsolen-Lautsprecher"
msgid "Console Beep"
msgstr "Konsolen-Lautsprecher"
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
msgid "Command"
msgstr "Kommando"
@@ -1583,7 +1618,7 @@ msgstr "Kein Klang"
msgid "No Sound"
msgstr "Kein Klang"
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
msgid "Sound Method"
msgstr "Klang-Ausgabesystem"
@@ -1601,7 +1636,7 @@ msgstr ""
"(%s für den Dateinamen)"
#. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
msgid "Sound Options"
msgstr "Klang-Optionen"
@@ -1610,17 +1645,17 @@ msgstr "Klang, wenn das Gespräch den Fo
msgstr "Klang, wenn das Gespräch den Fokus hat"
#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
#: ../pidgin/plugins/timestamp_format.c:51
#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
msgid "Always"
msgstr "Immer"
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
msgid "Only when available"
msgstr "Nur wenn anwesend"
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
msgid "Only when not available"
msgstr "Nur wenn nicht verfügbar"
@@ -1629,11 +1664,11 @@ msgstr "Lautstärke (0-100):"
msgstr "Lautstärke (0-100):"
#. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
msgid "Sound Events"
msgstr "Klang-Ereignisse"
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
msgid "Event"
msgstr "Ereignis"
@@ -1641,15 +1676,15 @@ msgstr "Datei"
msgid "File"
msgstr "Datei"
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
msgid "Test"
msgstr "Testen"
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
msgid "Reset"
msgstr "Zurücksetzen"
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
msgid "Choose..."
msgstr "Auswählen..."
@@ -1669,7 +1704,7 @@ msgstr "Gespeicherter Status"
#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
#: ../libpurple/protocols/jabber/buddy.c:298
#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1486
#: ../pidgin/gtksavedstatuses.c:500
msgid "Title"
msgstr "Titel"
@@ -1700,17 +1735,20 @@ msgstr "Typ"
#: ../libpurple/protocols/jabber/jabber.c:1601
#: ../libpurple/protocols/jabber/jabber.c:1624
#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/msn/msn.c:634 ../libpurple/protocols/msn/msn.c:641
+#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/msn.c:655
+#: ../libpurple/protocols/msn/msn.c:661 ../libpurple/protocols/msn/msn.c:667
#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/novell/novell.c:2946
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/oscar/oscar.c:5606
+#: ../libpurple/protocols/oscar/oscar.c:5824
+#: ../libpurple/protocols/oscar/oscar.c:5838
+#: ../libpurple/protocols/oscar/oscar.c:5854
+#: ../libpurple/protocols/oscar/oscar.c:5861
+#: ../libpurple/protocols/oscar/oscar.c:5868
#: ../libpurple/protocols/sametime/sametime.c:3286
#: ../libpurple/protocols/sametime/sametime.c:3292
#: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1718,8 +1756,8 @@ msgstr "Typ"
#: ../libpurple/protocols/silc/buddy.c:1551
#: ../libpurple/protocols/silc10/buddy.c:1551
#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
#: ../libpurple/protocols/zephyr/zephyr.c:2337
#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
msgid "Message"
@@ -1775,7 +1813,7 @@ msgstr "Zertifikate"
msgid "Certificates"
msgstr "Zertifikate"
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
msgid "Sounds"
msgstr "Klänge"
@@ -1879,16 +1917,16 @@ msgstr "Toaster-Plugin"
msgid "Toaster plugin"
msgstr "Toaster-Plugin"
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:123
#, c-format
msgid "<b>Conversation with %s on %s:</b><br>"
msgstr "<b>Unterhaltung mit %s am %s:</b><br>"
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:150
msgid "History Plugin Requires Logging"
msgstr "Das Verlaufs-Plugin erfordert das Mitschneiden"
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:151
msgid ""
"Logging can be enabled from Tools -> Preferences -> Logging.\n"
"\n"
@@ -1905,11 +1943,11 @@ msgstr "Gnt-Verlauf"
msgid "GntHistory"
msgstr "Gnt-Verlauf"
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:194
msgid "Shows recently logged conversations in new conversations."
msgstr "Zeigt vor kurzem mitgeschnittene Gespräche in neuen Gesprächen an."
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:195
msgid ""
"When a new conversation is opened this plugin will insert the last "
"conversation into the current conversation."
@@ -1962,7 +2000,7 @@ msgstr "Fehlendes Protokoll-Plugin für
msgstr "Fehlendes Protokoll-Plugin für %s"
#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkblist.c:4318
msgid "Connection Error"
msgstr "Verbindungsfehler"
@@ -2007,16 +2045,16 @@ msgstr "Benutzer-Info setzen"
#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2836
#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
msgid "Unknown"
msgstr "Unbekannt"
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3249 ../pidgin/gtkblist.c:5662
#: ../pidgin/plugins/gevolution/gevo-util.c:67
#: ../pidgin/plugins/gevolution/gevolution.c:96
msgid "Buddies"
@@ -2043,8 +2081,8 @@ msgstr ""
"Common name: %s %s\n"
"Fingerprint (SHA1): %s"
msgstr ""
-"Common name: %s %s\n"
-"Fingerprint (SHA1): %s"
+"Allgemeiner Name (Common name:) %s %s\n"
+"Fingerabdruck (SHA1): %s"
#. TODO: Find what the handle ought to be
#: ../libpurple/certificate.c:555
@@ -2205,9 +2243,9 @@ msgstr "+++ %s hat sich abgemeldet"
msgstr "+++ %s hat sich abgemeldet"
#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/protocols/jabber/buddy.c:2340
#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:361
msgid "Unknown error"
msgstr "Unbekannter Fehler"
@@ -2785,13 +2823,13 @@ msgstr "_Speichern"
#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/protocols/oscar/oscar.c:2247
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5993
+#: ../libpurple/protocols/oscar/oscar.c:6219
+#: ../libpurple/protocols/oscar/oscar.c:6289 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
msgid "_Cancel"
msgstr "A_bbrechen"
@@ -2833,8 +2871,8 @@ msgstr ""
"Dateiübertragung abgeschlossen ist\n"
"(nur, wenn es keine Unterhaltung mit dem Sender gibt)"
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1800
msgid "Notes"
msgstr "Notizen"
@@ -3278,9 +3316,9 @@ msgstr "Sie können den Alarm im `Buddy-
msgstr "Sie können den Alarm im `Buddy-Alarm'-Dialog ändern/löschen"
#: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/novell/novell.c:1919
#: ../libpurple/protocols/silc/buddy.c:317
#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
#: ../libpurple/protocols/silc10/buddy.c:314
@@ -3290,9 +3328,9 @@ msgstr "Ja"
msgstr "Ja"
#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/novell/novell.c:1920
#: ../libpurple/protocols/silc/buddy.c:318
#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
#: ../libpurple/protocols/silc10/buddy.c:315
@@ -3400,7 +3438,7 @@ msgstr "Tests, um zu sehen, ob das meist
msgstr "Tests, um zu sehen, ob das meiste funktioniert."
#. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
#: ../libpurple/plugins/ssl/ssl-nss.c:725
msgid "X.509 Certificates"
msgstr "X.509-Zertifikate"
@@ -3411,7 +3449,7 @@ msgstr "X.509-Zertifikate"
#. *< dependencies
#. *< priority
#. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
msgid "GNUTLS"
msgstr "GNUTLS"
@@ -3419,8 +3457,8 @@ msgstr "GNUTLS"
#. *< version
#. * summary
#. * description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
msgid "Provides SSL support through GNUTLS."
msgstr "Erlaubt SSL-Unterstützung mit GNUTLS."
@@ -3525,15 +3563,15 @@ msgstr ""
"Benachrichtigt in einem Gesprächsfenster darüber, ob ein Buddy gegangen ist "
"oder vom Abwesenheits- oder Untätigkeitsstatus zurückgekehrt ist."
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
msgid "Tcl Plugin Loader"
msgstr "Tcl-Plugin-Lader"
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
msgid "Provides support for loading Tcl plugins"
msgstr "Ermöglicht das Laden von Tcl-Plugins"
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
msgid ""
"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
"install ActiveTCL from http://www.activestate.com\n"
@@ -3571,7 +3609,7 @@ msgstr "Nachname"
#: ../libpurple/protocols/jabber/buddy.c:295
#: ../libpurple/protocols/jabber/buddy.c:1325
#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
#: ../libpurple/protocols/silc/ops.c:1041
#: ../libpurple/protocols/silc/util.c:555
#: ../libpurple/protocols/silc10/ops.c:1075
@@ -3754,8 +3792,8 @@ msgstr "Bitte füllen sie die folgenden
#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
#: ../libpurple/protocols/gg/gg.c:1126
#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
#: ../libpurple/protocols/qq/buddy_info.c:49
msgid "City"
msgstr "Stadt"
@@ -3764,9 +3802,9 @@ msgstr "Geburtsjahr"
msgid "Year of birth"
msgstr "Geburtsjahr"
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1699
#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3746
#: ../libpurple/protocols/qq/buddy_info.c:46
#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3779,14 +3817,14 @@ msgstr "Männlich oder weiblich"
msgstr "Männlich oder weiblich"
#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3746
#: ../libpurple/protocols/qq/buddy_info.c:83
#: ../libpurple/protocols/qq/qq.c:226
msgid "Male"
msgstr "Männlich"
#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3746
#: ../libpurple/protocols/qq/buddy_info.c:84
#: ../libpurple/protocols/qq/qq.c:229
msgid "Female"
@@ -3847,25 +3885,25 @@ msgstr "Zum Chat hinzufügen..."
msgstr "Zum Chat hinzufügen..."
#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2833
#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5656
#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
msgid "Offline"
msgstr "Offline"
#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/buddy.c:2036
#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/novell/novell.c:2821
#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
+#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:155
#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
msgid "Available"
msgstr "Verfügbar"
@@ -3875,32 +3913,32 @@ msgstr "Verfügbar"
#. Away stuff
#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2824
#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
+#: ../libpurple/protocols/oscar/oscar.c:4561
+#: ../libpurple/protocols/oscar/oscar.c:5684
#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
#: ../libpurple/protocols/silc/buddy.c:1476
#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1941
#: ../pidgin/gtkstatusbox.c:1058
#, c-format
msgid "Away"
msgstr "Abwesend"
#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/oscar/oscar.c:2713
+#: ../libpurple/protocols/oscar/oscar.c:3713
msgid "UIN"
msgstr "UIN"
#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:3724
#: ../libpurple/protocols/silc/ops.c:990
#: ../libpurple/protocols/silc10/ops.c:1024
msgid "First Name"
@@ -3911,7 +3949,7 @@ msgstr "Geburtsjahr"
msgstr "Geburtsjahr"
#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/oscar/oscar.c:3925
msgid "Unable to display the search results."
msgstr "Kann Suchergebnisse nicht anzeigen."
@@ -3955,7 +3993,7 @@ msgstr "Verbindung fehlgeschlagen."
msgid "Connection failed."
msgstr "Verbindung fehlgeschlagen."
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:621
msgid "Blocked"
msgstr "Blockiert"
@@ -4093,7 +4131,7 @@ msgstr "MOTD für %s"
#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/myspace/myspace.c:2361
msgid "Server has disconnected"
msgstr "Serververbindung wurde unterbrochen"
@@ -4119,14 +4157,14 @@ msgstr "IRC-Nicknamen dürfen keine Leer
#. connect to the server
#: ../libpurple/protocols/irc/irc.c:319
#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/msn/session.c:384
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2187
#: ../libpurple/protocols/oscar/oscar.c:1287
#: ../libpurple/protocols/qq/qq.c:136
#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/simple/simple.c:1718
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
msgid "Connecting"
msgstr "Verbindungsaufbau"
@@ -4140,20 +4178,20 @@ msgstr "SSL-Unterstützung nicht verfüg
#. TODO: try other ports if in auto mode, then save
#. * working port and try that first next time.
#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
+#: ../libpurple/protocols/myspace/myspace.c:318
#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/simple/simple.c:1633
msgid "Couldn't create socket"
msgstr "Kann Socket nicht erstellen"
#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
+#: ../libpurple/protocols/myspace/myspace.c:2474
#: ../libpurple/protocols/oscar/oscar.c:1283
msgid "Couldn't connect to host"
msgstr "Keine Verbindung zum Host"
#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/myspace/myspace.c:2357
msgid "Read error"
msgstr "Fehler beim Lesen"
@@ -4193,22 +4231,22 @@ msgstr "Das IRC-Protokoll-Plugin mit wen
#. host to connect to
#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
+#: ../libpurple/protocols/msn/msn.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:6723
#: ../libpurple/protocols/qq/qq.c:755
#: ../libpurple/protocols/sametime/sametime.c:5727
#: ../libpurple/protocols/silc/ops.c:1249
#: ../libpurple/protocols/silc/ops.c:1341
#: ../libpurple/protocols/silc10/ops.c:1244
#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:1898
#: ../libpurple/protocols/toc/toc.c:2327
msgid "Server"
msgstr "Server"
#. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2302
+#: ../libpurple/protocols/oscar/oscar.c:6726
#: ../libpurple/protocols/qq/qq.c:758
#: ../libpurple/protocols/sametime/sametime.c:5732
#: ../libpurple/protocols/silc/silc.c:1918
@@ -4280,7 +4318,7 @@ msgstr " <i>(identifiziert)</i>"
msgstr " <i>(identifiziert)</i>"
#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3714
#: ../libpurple/protocols/silc/ops.c:1418
#: ../libpurple/protocols/silc10/ops.c:1414
msgid "Nick"
@@ -4379,28 +4417,28 @@ msgstr "Nur Einladungen"
msgid "Invitation only"
msgstr "Nur Einladungen"
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:798
#, c-format
msgid "You have been kicked by %s: (%s)"
msgstr "Sie wurden hinausgeworfen von %s: (%s)"
#. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699
#: ../libpurple/protocols/silc10/ops.c:720
#, c-format
msgid "Kicked by %s (%s)"
msgstr "Hinausgeworfen durch %s (%s)"
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:826
#, c-format
msgid "mode (%s %s) by %s"
msgstr "Modus (%s %s) von %s"
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
msgid "Invalid nickname"
msgstr "Ungültiger Benutzername"
-#: ../libpurple/protocols/irc/msgs.c:910
+#: ../libpurple/protocols/irc/msgs.c:913
msgid ""
"Your selected nickname was rejected by the server. It probably contains "
"invalid characters."
@@ -4408,7 +4446,7 @@ msgstr ""
"Ihr gewählter Kontoname wurde vom Server abgelehnt. Er enthält vermutlich "
"ungültige Zeichen."
-#: ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:918
msgid ""
"Your selected account name was rejected by the server. It probably contains "
"invalid characters."
@@ -4416,44 +4454,44 @@ msgstr ""
"Ihr gewählter Kontoname wurde vom Server abgelehnt. Er enthält vermutlich "
"ungültige Zeichen."
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
msgid "Cannot change nick"
msgstr "Kann den Spitznamen nicht ändern"
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
msgid "Could not change nick"
msgstr "Konnte den Spitznamen nicht ändern"
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:978
#, c-format
msgid "You have parted the channel%s%s"
msgstr "Sie waren im Kanal%s%s"
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1020
msgid "Error: invalid PONG from server"
msgstr "Fehler: falsches PONG vom Server"
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1022
#, c-format
msgid "PING reply -- Lag: %lu seconds"
msgstr "PING-Antwort -- Verzögerung: %lu Sekunden"
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1113
#, c-format
msgid "Cannot join %s: Registration is required."
msgstr "Kann %s nicht beitreten: Registrierung ist erforderlich."
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1114
#: ../libpurple/protocols/silc/ops.c:1093
#: ../libpurple/protocols/silc10/ops.c:1128
msgid "Cannot join channel"
msgstr "Kann den Kanal nicht betreten"
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1148
msgid "Nick or channel is temporarily unavailable."
msgstr "Der Spitzname oder Kanal ist zur Zeit nicht verfügbar."
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1160
#, c-format
msgid "Wallops from %s"
msgstr "Wallops von %s"
@@ -4563,7 +4601,7 @@ msgstr "names [Kanal]: Listet die Benut
msgstr "names [Kanal]: Listet die Benutzer im aktuellen Kanal auf."
#: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2299
msgid "nick <new nickname>: Change your nickname."
msgstr "nick <new nickname>: Ihren Spitznamen ändern."
@@ -4706,7 +4744,7 @@ msgstr "Ad Hoc-Kommando gescheitert"
msgid "Ad-Hoc Command Failed"
msgstr "Ad Hoc-Kommando gescheitert"
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
+#: ../libpurple/protocols/jabber/adhoccommands.c:176
msgid "execute"
msgstr "Ausführen"
@@ -4856,15 +4894,15 @@ msgstr "Funktion"
#: ../libpurple/protocols/jabber/buddy.c:300
#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1768
+#: ../libpurple/protocols/oscar/oscar.c:3763
msgid "Birthday"
msgstr "Geburtstag"
#: ../libpurple/protocols/jabber/buddy.c:301
#: ../libpurple/protocols/jabber/buddy.c:1365
#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
+#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3314
#: ../pidgin/gtkprefs.c:739
msgid "Description"
msgstr "Beschreibung"
@@ -5149,7 +5187,7 @@ msgstr "Hop-Überprüfung"
#: ../libpurple/protocols/jabber/buddy.c:921
#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2920
msgid "Capabilities"
msgstr "Fähigkeiten"
@@ -5176,8 +5214,8 @@ msgstr "Zweiter Name"
#: ../libpurple/protocols/jabber/buddy.c:1270
#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3815
#: ../libpurple/protocols/qq/buddy_info.c:56
#: ../libpurple/protocols/silc/ops.c:1030
#: ../libpurple/protocols/silc10/ops.c:1064
@@ -5196,72 +5234,72 @@ msgstr "Logo"
msgid "Logo"
msgstr "Logo"
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
msgid "Un-hide From"
msgstr "Sichtbar von"
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
msgid "Temporarily Hide From"
msgstr "Temporär versteckt von"
#. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
msgid "Cancel Presence Notification"
msgstr "Abbrechen der Anwesenheitsbenachrichtigung"
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
msgid "(Re-)Request authorization"
msgstr "(Nochmal) nach Autorisierung fragen"
#. if(NOT ME)
#. shouldn't this just happen automatically when the buddy is
#. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
msgid "Unsubscribe"
msgstr "Abbestellen"
-#: ../libpurple/protocols/jabber/buddy.c:1985
+#: ../libpurple/protocols/jabber/buddy.c:1988
msgid "Log In"
msgstr "Anmelden"
-#: ../libpurple/protocols/jabber/buddy.c:1989
+#: ../libpurple/protocols/jabber/buddy.c:1992
msgid "Log Out"
msgstr "Abmelden"
-#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/buddy.c:2038
#: ../libpurple/protocols/jabber/jabber.c:1553
msgid "Chatty"
msgstr "Gesprächig"
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
msgid "Extended Away"
msgstr "Abwesend (erweitert)"
-#: ../libpurple/protocols/jabber/buddy.c:2041
+#: ../libpurple/protocols/jabber/buddy.c:2044
#: ../libpurple/protocols/jabber/jabber.c:1622
#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
+#: ../libpurple/protocols/oscar/oscar.c:5860
#: ../libpurple/protocols/sametime/sametime.c:3297
#, c-format
msgid "Do Not Disturb"
msgstr "Nicht stören"
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
msgid "JID"
msgstr "JID"
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/oscar/oscar.c:3725
msgid "Last Name"
msgstr "Nachname"
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
msgid "The following are the results of your search"
msgstr "Dies sind die Ergebnisse Ihrer Suche"
#. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
+#: ../libpurple/protocols/jabber/buddy.c:2322
msgid ""
"Find a contact by entering the search criteria in the given fields. Note: "
"Each field supports wild card searches (%)"
@@ -5269,41 +5307,41 @@ msgstr ""
"Suchen Sie einen Kontakt durch Eingabe von Suchkriterien in den angegebenen "
"Feldern. Hinweis: Jedes Feld unterstützt die Suche mit Platzhaltern (%)"
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2342
msgid "Directory Query Failed"
msgstr "Verzeichnisanfrage gescheitert"
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2343
msgid "Could not query the directory server."
msgstr "Konnte die Anfrage beim Verzeichnisdienst nicht durchführen."
#. Try to translate the message (see static message
#. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2377
#, c-format
msgid "Server Instructions: %s"
msgstr "Anleitung vom Server: %s"
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2384
msgid "Fill in one or more fields to search for any matching XMPP users."
msgstr ""
"Füllen sie ein oder mehrere Felder aus, um nach entsprechenden XMPP-"
"Benutzern zu suchen."
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/novell/novell.c:1490
+#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3737
msgid "E-Mail Address"
msgstr "E-Mail-Adresse"
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2414
msgid "Search for XMPP users"
msgstr "Suche nach XMPP-Benutzern"
#. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2415
#: ../libpurple/protocols/qq/group.c:123
#: ../libpurple/protocols/qq/group_im.c:147
#: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5315,24 +5353,24 @@ msgstr "Suchen"
msgid "Search"
msgstr "Suchen"
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2430
msgid "Invalid Directory"
msgstr "Ungültiges Verzeichnis"
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2447
msgid "Enter a User Directory"
msgstr "Geben Sie ein Benutzerverzeichnis ein"
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2448
msgid "Select a user directory to search"
msgstr "Wählen Sie ein Benutzerverzeichnis zum Suchen"
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2451
msgid "Search Directory"
msgstr "Suche im Verzeichnis"
#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5344
#: ../libpurple/protocols/yahoo/yahoochat.c:1048
msgid "_Room:"
msgstr "_Raum:"
@@ -5445,9 +5483,9 @@ msgstr "Fehler beim Lesen"
msgstr "Fehler beim Lesen"
#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
#, c-format
msgid ""
"Could not establish a connection with the server:\n"
@@ -5510,8 +5548,8 @@ msgstr "Schon registriert"
msgstr "Schon registriert"
#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
msgid "State"
msgstr "Provinz/Bundesland"
@@ -5593,7 +5631,7 @@ msgstr "Initialisiere SSL/TLS"
msgstr "Initialisiere SSL/TLS"
#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:390
msgid "Authenticating"
msgstr "Authentifizierung"
@@ -5606,7 +5644,7 @@ msgstr "Initialisiere Stream nochmal"
#: ../libpurple/protocols/jabber/jabber.c:1909
#: ../libpurple/protocols/jabber/jabber.c:1945
#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5654
msgid "Not Authorized"
msgstr "Nicht autorisiert"
@@ -5770,7 +5808,7 @@ msgstr "Bitte geben Sie Ihr neues Passwo
msgstr "Bitte geben Sie Ihr neues Passwort ein"
#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6440
#: ../libpurple/protocols/silc/silc.c:1093
#: ../libpurple/protocols/silc10/silc.c:1004
msgid "Set User Info..."
@@ -5778,7 +5816,7 @@ msgstr "Benutzer-Info setzen..."
#. if (js->protocol_options & CHANGE_PASSWORD) {
#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
+#: ../libpurple/protocols/oscar/oscar.c:6451
#: ../libpurple/protocols/silc/silc.c:1089
#: ../libpurple/protocols/silc10/silc.c:1000
msgid "Change Password..."
@@ -6039,31 +6077,49 @@ msgstr "Kann nicht anklopfen, da der Ben
msgid "Unable to buzz, because the user %s does not support it."
msgstr "Kann nicht anklopfen, da der Benutzer %s dies nicht unterstützt."
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#: ../libpurple/protocols/jabber/jabber.c:2250
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+msgid "Buzz"
+msgstr "Anklopfen"
+
+#: ../libpurple/protocols/jabber/jabber.c:2251
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s hat bei Ihnen angeklopft!"
+
+#: ../libpurple/protocols/jabber/jabber.c:2252
+#: ../libpurple/protocols/yahoo/yahoo.c:4123
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s anklopfen..."
+
+#: ../libpurple/protocols/jabber/jabber.c:2291
msgid "config: Configure a chat room."
msgstr "config: Konfiguriere einen Chatraum."
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2295
msgid "configure: Configure a chat room."
msgstr "configure: Konfiguriere einen Chatraum."
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2304
msgid "part [room]: Leave the room."
msgstr "part [Raum]: Verlasse den Raum."
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2309
msgid "register: Register with a chat room."
msgstr "register: Für einen Chatraum anmelden."
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2315
msgid "topic [new topic]: View or change the topic."
msgstr "topic [neues Thema]: Thema ändern oder anzeigen."
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2321
msgid "ban <user> [room]: Ban a user from the room."
msgstr "ban <Benutzer> [Raum]: Verbanne einen Benutzer aus dem Raum."
-#: ../libpurple/protocols/jabber/jabber.c:2289
+#: ../libpurple/protocols/jabber/jabber.c:2327
msgid ""
"affiliate <user> <owner|admin|member|outcast|none>: Set a user's "
"affiliation with the room."
@@ -6071,7 +6127,7 @@ msgstr ""
"affiliate <Benutzer> <owner|admin|member|outcast|none>: Setze "
"eine Benutzerzugehörigkeit für den Raum."
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2333
msgid ""
"role <user> <moderator|participant|visitor|none>: Set a user's "
"role in the room."
@@ -6079,32 +6135,32 @@ msgstr ""
"role <Benutzer> <moderator|participant|visitor|none>: Setze eine "
"Rolle für den Benutzer im Raum."
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2339
msgid "invite <user> [message]: Invite a user to the room."
msgstr ""
"invite <Benutzer> [Nachricht]: Lade einen Benutzer in den Raum ein."
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2345
msgid "join: <room> [server]: Join a chat on this server."
msgstr "join: <Raum> [Server]: Betrete einen Chat auf diesem Server."
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2351
msgid "kick <user> [room]: Kick a user from the room."
msgstr "kick <Benutzer> [Raum]: Kickt einen Benutzer aus dem Raum."
-#: ../libpurple/protocols/jabber/jabber.c:2318
+#: ../libpurple/protocols/jabber/jabber.c:2356
msgid ""
"msg <user> <message>: Send a private message to another user."
msgstr ""
"msg <Benutzer> <Nachricht>: Sendet eine private Nachricht an "
"einen anderen Benutzer."
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2362
msgid "ping <jid>:\tPing a user/component/server."
msgstr "ping <jid>:\tBenutzer/Kommponente/Server anpingen."
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+#: ../libpurple/protocols/jabber/jabber.c:2367
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
msgid "buzz: Buzz a user to get their attention"
msgstr "buzz: Einen Kontakt anrufen, um seine Aufmerksamkeit zu erhalten"
@@ -6141,8 +6197,8 @@ msgstr "Erlaube Klartext-Authentifikatio
msgstr "Erlaube Klartext-Authentifikation über einen unverschlüsselten Kanal"
#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/myspace/myspace.c:3282
+#: ../libpurple/protocols/simple/simple.c:1904
msgid "Connect port"
msgstr "Verbindungsport"
@@ -6150,7 +6206,7 @@ msgstr "Verbindungsport"
#. * able to set the first port to try (like LastConnectedPort in Windows client).
#. Account options
#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
+#: ../libpurple/protocols/myspace/myspace.c:3279
#: ../libpurple/protocols/silc/silc.c:1914
#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
msgid "Connect server"
@@ -6185,12 +6241,6 @@ msgstr "XMPP-Nachrichtenfehler"
msgid "XMPP Message Error"
msgstr "XMPP-Nachrichtenfehler"
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, c-format
-msgid "%s has buzzed you!"
-msgstr "%s hat bei Ihnen angeklopft!"
-
#: ../libpurple/protocols/jabber/message.c:407
#, c-format
msgid " (Code %s)"
@@ -6200,16 +6250,16 @@ msgstr "Fehler bei Einlesen von XML-Date
msgid "XML Parse error"
msgstr "Fehler bei Einlesen von XML-Daten"
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:422
msgid "Unknown Error in presence"
msgstr "Unbekannter Fehlercode"
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:503
+#: ../libpurple/protocols/jabber/presence.c:504
msgid "Create New Room"
msgstr "Einen neuen Chat-Raum erstellen"
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:505
msgid ""
"You are creating a new room. Would you like to configure it, or accept the "
"default settings?"
@@ -6217,20 +6267,20 @@ msgstr ""
"Sie erstellen einen neuen Chat-Raum. Möchten Sie den Raum konfigurieren "
"oder akzeptieren Sie die Standardeinstellungen?"
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:511
msgid "_Configure Room"
msgstr "Raum _konfigurieren"
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:512
msgid "_Accept Defaults"
msgstr "Standards _akzeptieren"
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:554
#, c-format
msgid "Error in chat %s"
msgstr "Fehler im Chat %s"
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:558
#, c-format
msgid "Error joining chat %s"
msgstr "Fehler beim Betreten des Chats %s"
@@ -6281,7 +6331,7 @@ msgid "Please select your mood from the
#: ../libpurple/protocols/jabber/usermood.c:181
msgid "Please select your mood from the list."
-msgstr "Bitte setzen Sie eine Stimmung aus der Liste"
+msgstr "Bitte setzen Sie eine Stimmung aus der Liste."
#: ../libpurple/protocols/jabber/usermood.c:183
#: ../libpurple/protocols/jabber/usernick.c:78
@@ -6294,7 +6344,7 @@ msgid "Set User Nickname"
#: ../libpurple/protocols/jabber/usernick.c:76
msgid "Set User Nickname"
-msgstr "Setze Benutzer-Spitzname"
+msgstr "Setze Benutzer-Spitznamen"
#: ../libpurple/protocols/jabber/usernick.c:76
msgid "Please specify a new nickname for you."
@@ -6308,9 +6358,9 @@ msgstr ""
"Diese Information ist sichtbar für alle Kontakte in Ihrer Kontaktliste. So "
"wählen Sie passendes."
-#: ../libpurple/protocols/jabber/usernick.c:99
+#: ../libpurple/protocols/jabber/usernick.c:100
msgid "Set Nickname..."
-msgstr "Setze Spitzname..."
+msgstr "Setze Spitznamen..."
#: ../libpurple/protocols/jabber/xdata.c:378
msgid "Actions"
@@ -6320,12 +6370,20 @@ msgstr "Wählen Sie eine Aktion"
msgid "Select an action"
msgstr "Wählen Sie eine Aktion"
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/contact.c:188
+msgid "Unable to connect to contact server"
+msgstr "Verbindung zum Kontaktserver nicht möglich"
+
+#: ../libpurple/protocols/msn/contact.c:948
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Konnte das MSN-Adressbuch nicht abrufen"
+
+#: ../libpurple/protocols/msn/dialog.c:118
#, c-format
msgid "Buddy list synchronization issue in %s (%s)"
msgstr "Fehler bei der Buddy-Listen-Synchronisation bei %s (%s)"
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
#, c-format
msgid ""
"%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6334,7 +6392,7 @@ msgstr ""
"%s auf der lokalen Liste ist in der Gruppe „%s“, aber nicht auf der "
"Serverliste. Möchten Sie, dass der Buddy hinzugefügt wird?"
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
#, c-format
msgid ""
"%s is on the local list but not on the server list. Do you want this buddy "
@@ -6645,31 +6703,31 @@ msgstr "Ihr neuer MSN-Benutzername zu la
msgid "Your new MSN friendly name is too long."
msgstr "Ihr neuer MSN-Benutzername zu lang."
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:285
msgid "Set your friendly name."
msgstr "Setze Ihren Spitznamen."
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:286
msgid "This is the name that other MSN buddies will see you as."
msgstr "Das ist der Name, den andere MSN-Buddys von Ihren sehen."
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:304
msgid "Set your home phone number."
msgstr "Setze Ihre private Telefonnummer."
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:321
msgid "Set your work phone number."
msgstr "Setze Ihre geschäftliche Telefonnummer."
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:338
msgid "Set your mobile phone number."
msgstr "Setze Ihre Handynummer."
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:353
msgid "Allow MSN Mobile pages?"
msgstr "Erlaube die SMS-Seiten von MSN?"
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:354
msgid ""
"Do you want to allow or disallow people on your buddy list to send you MSN "
"Mobile pages to your cell phone or other mobile device?"
@@ -6677,323 +6735,326 @@ msgstr ""
"Möchten Sie anderen Leuten in Ihrer Buddy-Liste erlauben oder verbieten, "
"Ihnen Nachrichten an Ihre Handy oder an andere mobile Geräte zu senden?"
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:360
msgid "Allow"
msgstr "Erlauben"
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:361
msgid "Disallow"
msgstr "Verbieten"
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:377
msgid "This Hotmail account may not be active."
msgstr "Dieses Hotmail-Konto ist vielleicht nicht aktiv."
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:403
msgid "Send a mobile message."
msgstr "Eine SMS senden."
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:405
msgid "Page"
msgstr "Nachricht"
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "Hat Sie"
+#: ../libpurple/protocols/msn/msn.c:610 ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/msn/msn.c:642 ../libpurple/protocols/msn/msn.c:649
+#: ../libpurple/protocols/msn/msn.c:656 ../libpurple/protocols/msn/msn.c:662
+#: ../libpurple/protocols/msn/msn.c:668
+msgid "Current media"
+msgstr "Aktuelles Medium"
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
msgid "Be Right Back"
msgstr "Bin gleich zurück"
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2827
+#: ../libpurple/protocols/novell/novell.c:2957
#: ../libpurple/protocols/silc/buddy.c:1480
#: ../libpurple/protocols/silc/silc.c:56
#: ../libpurple/protocols/silc10/buddy.c:1480
#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
msgid "Busy"
msgstr "Beschäftigt"
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
msgid "On the Phone"
msgstr "Am Telefon"
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:666
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
msgid "Out to Lunch"
msgstr "Zur Mittagspause"
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:697
msgid "Set Friendly Name..."
msgstr "Setze Spitzname..."
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:702
msgid "Set Home Phone Number..."
msgstr "Setze private Telefonnummer..."
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:706
msgid "Set Work Phone Number..."
msgstr "Setze geschäftliche Telefonnummer..."
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:710
msgid "Set Mobile Phone Number..."
msgstr "Setze Handynummer..."
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:716
msgid "Enable/Disable Mobile Devices..."
msgstr "Erlaube/verbiete mobile Geräte..."
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:721
msgid "Allow/Disallow Mobile Pages..."
msgstr "Erlaube/verbiete mobile Webseiten..."
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:732
msgid "Open Hotmail Inbox"
msgstr "Öffne Hotmail-Posteingang"
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:756
msgid "Send to Mobile"
msgstr "Sende an mobiles Gerät"
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:766
+#: ../libpurple/protocols/novell/novell.c:3413
msgid "Initiate _Chat"
msgstr "Initiiere _Chat"
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:804
msgid "SSL support is needed for MSN. Please install a supported SSL library."
msgstr ""
"Für MSN wird SSL-Unterstützung benötigt. Bitte installieren Sie eine "
"unterstützte SSL-Bibliothek."
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:832
msgid "Failed to connect to server."
msgstr "Verbindung zum Server nicht möglich."
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1620 ../libpurple/protocols/msn/msn.c:1968
#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
msgid "Error retrieving profile"
msgstr "Fehler beim Empfangen des Profils"
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1691 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
msgid "General"
msgstr "Allgemein"
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1698
#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/oscar/oscar.c:3769
#: ../libpurple/protocols/qq/buddy_info.c:45
#: ../libpurple/protocols/qq/qq.c:221
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
msgid "Age"
msgstr "Alter"
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1700
#: ../libpurple/protocols/qq/buddy_info.c:51
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
msgid "Occupation"
msgstr "Beruf"
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1701
#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/novell/novell.c:1480
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
#: ../libpurple/protocols/zephyr/zephyr.c:798
#: ../libpurple/protocols/zephyr/zephyr.c:1215
msgid "Location"
msgstr "Ort"
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1898
+#: ../libpurple/protocols/msn/msn.c:1904 ../libpurple/protocols/msn/msn.c:1911
msgid "Hobbies and Interests"
msgstr "Hobbys und Interessen"
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msn/msn.c:1838 ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msn/msn.c:1853 ../libpurple/protocols/msn/msn.c:1860
msgid "A Little About Me"
msgstr "Einige Informationen über mich"
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1729
msgid "Social"
msgstr "Sozial"
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1731
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
msgid "Marital Status"
msgstr "Familienstatus"
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1732
msgid "Interests"
msgstr "Interessen"
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1733
msgid "Pets"
msgstr "Haustiere"
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1734
msgid "Hometown"
msgstr "Heimatstadt"
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1735
msgid "Places Lived"
msgstr "Bisherige Wohnorte"
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1736
msgid "Fashion"
msgstr "Mode"
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1737
msgid "Humor"
msgstr "Humor"
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1738
msgid "Music"
msgstr "Musik"
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1739 ../libpurple/protocols/msn/msn.c:1920
+#: ../libpurple/protocols/msn/msn.c:1926
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
msgid "Favorite Quote"
msgstr "Lieblingsspruch"
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1756
msgid "Contact Info"
msgstr "Kontakt-Info"
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1757
msgid "Personal"
msgstr "Privat"
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1760
msgid "Significant Other"
msgstr "Andere wichtige Dinge"
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1761
msgid "Home Phone"
msgstr "Telefon (privat)"
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1762
msgid "Home Phone 2"
msgstr "Telefon 2 (privat)"
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1763
+#: ../libpurple/protocols/oscar/oscar.c:3807
msgid "Home Address"
msgstr "Privatadresse"
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1764
msgid "Personal Mobile"
msgstr "Handy (privat)"
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1765
msgid "Home Fax"
msgstr "Fax (privat)"
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1766
msgid "Personal E-Mail"
msgstr "E-Mail (privat)"
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1767
msgid "Personal IM"
msgstr "IM (privat)"
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1769
msgid "Anniversary"
msgstr "Jahrestag"
#. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1785
msgid "Work"
msgstr "Geschäftlich"
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1787
#: ../libpurple/protocols/silc/ops.c:1010
#: ../libpurple/protocols/silc10/ops.c:1044
msgid "Job Title"
msgstr "Beruf"
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/oscar/oscar.c:3828
msgid "Company"
msgstr "Firma"
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/novell/novell.c:1482
msgid "Department"
msgstr "Abteilung"
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1790
msgid "Profession"
msgstr "Beruf"
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1791
msgid "Work Phone"
msgstr "Telefon (geschäftlich)"
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1792
msgid "Work Phone 2"
msgstr "Telefon 2 (geschäftlich)"
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/oscar/oscar.c:3820
msgid "Work Address"
msgstr "Adresse (geschäftlich)"
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1794
msgid "Work Mobile"
msgstr "Handy (geschäftlich)"
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1795
msgid "Work Pager"
msgstr "Pager (geschäftlich)"
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1796
msgid "Work Fax"
msgstr "Fax (geschäftlich)"
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1797
msgid "Work E-Mail"
msgstr "E-Mail (geschäftlich)"
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1798
msgid "Work IM"
msgstr "IM (geschäftlich)"
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1799
msgid "Start Date"
msgstr "Anfangsdatum"
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1869 ../libpurple/protocols/msn/msn.c:1875
+#: ../libpurple/protocols/msn/msn.c:1882 ../libpurple/protocols/msn/msn.c:1889
msgid "Favorite Things"
msgstr "Lieblingsdinge"
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1934
msgid "Last Updated"
msgstr "Zuletzt aktualisiert"
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1945
#: ../libpurple/protocols/qq/buddy_info.c:60
#: ../libpurple/protocols/silc/ops.c:1026
#: ../libpurple/protocols/silc10/ops.c:1060
msgid "Homepage"
msgstr "Homepage"
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:1969
msgid "The user has not created a public profile."
msgstr "Der Benutzer hat kein öffentliches Profil erstellt."
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:1970
msgid ""
"MSN reported not being able to find the user's profile. This either means "
"that the user does not exist, or that the user exists but has not created a "
@@ -7003,7 +7064,7 @@ msgstr ""
"der Benutzer nicht existiert oder dass der Benutzer zwar existiert, aber "
"kein öffentliches Profil angelegt hat."
-#: ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/msn/msn.c:1974
msgid ""
"Could not find any information in the user's profile. The user most likely "
"does not exist."
@@ -7011,7 +7072,7 @@ msgstr ""
"Konnte keinerlei Information im Profil des Benutzers finden. Der Benutzer "
"existiert wahrscheinlich nicht."
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:1982
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
msgid "Profile URL"
msgstr "URL des Profils"
@@ -7026,101 +7087,103 @@ msgstr "URL des Profils"
#. *< version
#. * summary
#. * description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "MSN-Protokoll-Plugin"
+#: ../libpurple/protocols/msn/msn.c:2269 ../libpurple/protocols/msn/msn.c:2271
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Windows Live Messenger Protokoll-Plugin"
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2306
msgid "Use HTTP Method"
msgstr "Benutze HTTP"
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:2311
msgid "HTTP Method Server"
-msgstr "IPC Testserver"
+msgstr "HTTP-Methoden-Server"
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2316
msgid "Show custom smileys"
msgstr "Zeige benutzerdefinierte Smileys"
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2324
msgid "nudge: nudge a user to get their attention"
msgstr "nudge: Einen Kontakt anstoßen, um seine Aufmerksamkeit zu erhalten"
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "Verbindung nicht möglich"
+#: ../libpurple/protocols/msn/nexus.c:137
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows Live ID-Authentifikation:Kann nicht verbinden"
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:275
+msgid "Windows Live ID authentication Failed"
+msgstr "Windows Live ID - Authentifikation fehlgeschlagen"
+
+#: ../libpurple/protocols/msn/notification.c:185
#, c-format
msgid "%s is not a valid group."
msgstr "%s ist keine gültige Gruppe."
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:934
+#: ../libpurple/protocols/msn/session.c:369
msgid "Unknown error."
msgstr "Unbekannter Fehler."
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
#, c-format
msgid "%s on %s (%s)"
msgstr "%s auf %s (%s)"
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:512
#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s hat Sie gerade angestoßen!"
+
+#: ../libpurple/protocols/msn/notification.c:839
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Unbekannter Fehler (%d)"
+
+#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "Kann den Benutzer nicht hinzufügen"
+
+#: ../libpurple/protocols/msn/notification.c:900
+#, c-format
msgid "Unable to add user on %s (%s)"
msgstr "Kann den Benutzer nicht zu %s (%s) hinzufügen"
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:904
#, c-format
msgid "Unable to block user on %s (%s)"
msgstr "Kann den Benutzer nicht für %s (%s) blockieren"
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:908
#, c-format
msgid "Unable to permit user on %s (%s)"
msgstr "Kann den Benutzer nicht für %s (%s) erlauben"
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:916
#, c-format
msgid "%s could not be added because your buddy list is full."
msgstr "%s konnte nicht hinzugefügt werden, da Ihre Buddy-Liste voll ist."
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:925
#, c-format
msgid "%s is not a valid passport account."
msgstr "%s ist kein gültiges Passport-Konto."
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:930
msgid "Service Temporarily Unavailable."
msgstr "Dienst momentan nicht verfügbar."
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1268
msgid "Unable to rename group"
msgstr "Kann die Gruppe nicht umbenennen"
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1323
msgid "Unable to delete group"
msgstr "Kann die Gruppe nicht löschen"
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1939
#, c-format
msgid ""
"The MSN server will shut down for maintenance in %d minute. You will "
@@ -7151,6 +7214,29 @@ msgstr[1] ""
"Nach Beendigung der Wartungsarbeiten können Sie sich wieder problemlos "
"anmelden."
+#: ../libpurple/protocols/msn/oim.c:141
+msgid "Unable to connect to OIM server"
+msgstr "Verbindung zum OIM-Server nicht möglich"
+
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Verbindung nicht möglich"
+
#: ../libpurple/protocols/msn/servconn.c:137
msgid "Writing error"
msgstr "Schreibfehler"
@@ -7168,60 +7254,60 @@ msgstr ""
"Verbindungsfehler vom %s-Server:\n"
"%s"
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:336
msgid "Our protocol is not supported by the server."
msgstr "Unser Protokoll wird vom Server nicht unterstützt."
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:340
msgid "Error parsing HTTP."
msgstr "Fehler beim Verarbeiten von HTTP."
-#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/msn/session.c:344
#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/yahoo/yahoo.c:207
msgid "You have signed on from another location."
msgstr "Sie haben sich von einem anderen Ort angemeldet."
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:349
msgid "The MSN servers are temporarily unavailable. Please wait and try again."
msgstr ""
"Die MSN-Server sind temporär nicht verfügbar. Bitte warten Sie und versuchen "
"Sie es später nochmal."
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:354
msgid "The MSN servers are going down temporarily."
msgstr "Die MSN-Server werden kurzzeitig heruntergefahren."
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:359
#, c-format
msgid "Unable to authenticate: %s"
msgstr "Kann nicht authentifizieren: %s"
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:364
msgid ""
"Your MSN buddy list is temporarily unavailable. Please wait and try again."
msgstr ""
"Ihre MSN-Buddy-Liste ist temporär nicht verfügbar. Bitte warten Sie und "
"versuchen Sie es später nochmal."
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:385
+#: ../libpurple/protocols/msn/session.c:387
msgid "Handshaking"
msgstr "Händedruck"
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:388
msgid "Starting authentication"
msgstr "Starte Authentifizierung"
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:389
msgid "Getting cookie"
msgstr "Cookie erhalten"
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:391
msgid "Sending cookie"
msgstr "Cookie senden"
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:392
msgid "Retrieving buddy list"
msgstr "Abfragen der Buddy-Liste"
@@ -7285,22 +7371,25 @@ msgstr ""
"Nachricht konnte nicht gesendet werden, da ein unbekannter Fehler "
"aufgetreten ist:"
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:249
#, c-format
msgid "%s has added you to his or her buddy list."
msgstr "Der Benutzer %s hat Sie zu seiner Buddy-Liste hinzugefügt."
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:318
#, c-format
msgid "%s has removed you from his or her buddy list."
msgstr "Der Benutzer %s hat Sie von seiner Buddy-Liste gelöscht."
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:699
#, c-format
msgid "Unable to add \"%s\"."
msgstr "Kann „%s“ nicht hinzufügen."
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:702
msgid "The screen name specified is invalid."
msgstr "Der angegebene Benutzername ist ungültig."
@@ -7331,67 +7420,67 @@ msgstr ""
#. Notify an error message also, because this is important!
#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1805
msgid "MySpaceIM Error"
msgstr "MySpaceIM-Fehler"
-#: ../libpurple/protocols/myspace/myspace.c:349
+#: ../libpurple/protocols/myspace/myspace.c:350
msgid "Reading challenge"
msgstr "Lese Challenge"
-#: ../libpurple/protocols/myspace/myspace.c:355
+#: ../libpurple/protocols/myspace/myspace.c:356
msgid "Unexpected challenge length from server"
msgstr "Unerwartete Challenge-Länge vom Server"
-#: ../libpurple/protocols/myspace/myspace.c:359
+#: ../libpurple/protocols/myspace/myspace.c:360
msgid "Logging in"
msgstr "Logge ein"
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1288
#, c-format
msgid "Connection to server lost (no data received within %d seconds)"
msgstr ""
"Verbindung zum Server verloren (seit %d Sekunden keine Daten empfangen)"
#. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
+#: ../libpurple/protocols/myspace/myspace.c:1330
msgid "New mail messages"
msgstr "Neue Mail-Nachrichten"
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:1331
msgid "New blog comments"
msgstr "Neue Blog-Kommentare"
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1332
msgid "New profile comments"
msgstr "Neue Profil-Kommentare"
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1333
msgid "New friend requests!"
msgstr "Neue Freundschaftsanfragen!"
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1334
msgid "New picture comments"
msgstr "Neue Bild-Kommentare"
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1362
msgid "MySpace"
msgstr "MySpace"
#. The session is now set up, ready to be connected. This emits the
#. * signedOn signal, so clients can now do anything with msimprpl, and
#. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
+#: ../libpurple/protocols/myspace/myspace.c:1545
#: ../libpurple/protocols/sametime/sametime.c:1544
msgid "Connected"
msgstr "Verbunden"
-#: ../libpurple/protocols/myspace/myspace.c:1554
#: ../libpurple/protocols/myspace/myspace.c:1556
+#: ../libpurple/protocols/myspace/myspace.c:1558
msgid "No username set"
msgstr "Kein Benutzername gesetzt"
-#: ../libpurple/protocols/myspace/myspace.c:1555
+#: ../libpurple/protocols/myspace/myspace.c:1557
msgid ""
"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
"username and choose a username and try to login again."
@@ -7400,72 +7489,72 @@ msgstr ""
"fuseaction=profile.username und wählen sie einen Benutzernamen und versuchen "
"Sie sich erneut anzumelden."
-#: ../libpurple/protocols/myspace/myspace.c:1782
+#: ../libpurple/protocols/myspace/myspace.c:1784
#, c-format
msgid "Protocol error, code %d: %s"
msgstr "Protokollfehler, Code %d: %s"
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:1977
+#: ../libpurple/protocols/myspace/myspace.c:2011
msgid "Failed to add buddy"
msgstr "Kontakt konnte nicht hinzugefügt werden"
-#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:1977
msgid "'addbuddy' command failed."
msgstr "'addbuddy'-Kommando gescheitert."
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2011
+#: ../libpurple/protocols/myspace/myspace.c:2252
msgid "persist command failed"
msgstr "'persist'-Kommando gescheitert"
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2120
#, c-format
msgid "No such user: %s"
msgstr "Kein solcher Benutzer: %s"
-#: ../libpurple/protocols/myspace/myspace.c:2116
+#: ../libpurple/protocols/myspace/myspace.c:2121
msgid "User lookup"
msgstr "Benutzersuche"
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2233
+#: ../libpurple/protocols/myspace/myspace.c:2252
+#: ../libpurple/protocols/myspace/myspace.c:2274
msgid "Failed to remove buddy"
msgstr "Kontakt konnte nicht entfernt werden"
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2233
msgid "'delbuddy' command failed"
msgstr "'delbuddy'-Kommando gescheitert"
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2274
msgid "blocklist command failed"
msgstr "'blocklist'-Kommando gescheitert"
-#: ../libpurple/protocols/myspace/myspace.c:2315
+#: ../libpurple/protocols/myspace/myspace.c:2320
msgid "Invalid input condition"
msgstr "Ungültige Eingabebedingung"
#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
+#: ../libpurple/protocols/myspace/myspace.c:2338
+#: ../libpurple/protocols/myspace/myspace.c:2369
msgid "Read buffer full"
msgstr "Lesepuffer voll"
-#: ../libpurple/protocols/myspace/myspace.c:2402
+#: ../libpurple/protocols/myspace/myspace.c:2407
msgid "Unparseable message"
msgstr "Kann die Nachricht nicht parsen"
-#: ../libpurple/protocols/myspace/myspace.c:2471
+#: ../libpurple/protocols/myspace/myspace.c:2476
#, c-format
msgid "Couldn't connect to host: %s (%d)"
msgstr "Konnte nicht zum Host verbinden: %s (%d)"
-#: ../libpurple/protocols/myspace/myspace.c:2642
+#: ../libpurple/protocols/myspace/myspace.c:2647
msgid "IM Friends"
msgstr "IM-Freunde"
-#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2746
#, c-format
msgid ""
"%d buddies were added or updated from the server (including buddies already "
@@ -7474,60 +7563,60 @@ msgstr ""
"%d Buddys wurden vom Server hinzugefügt oder aktualisiert (inklusive der "
"Buddys, die schon auf der Serverliste sind)"
-#: ../libpurple/protocols/myspace/myspace.c:2742
+#: ../libpurple/protocols/myspace/myspace.c:2747
msgid "Add contacts from server"
msgstr "Kontakte vom Server hinzufügen"
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2799
+#: ../libpurple/protocols/myspace/myspace.c:2864
msgid "Add friends from MySpace.com"
msgstr "Freunde von MySpace.com hinzufügen"
-#: ../libpurple/protocols/myspace/myspace.c:2795
+#: ../libpurple/protocols/myspace/myspace.c:2800
msgid "Importing friends failed"
msgstr "Importieren der Freunde fehlgeschlagen"
#. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
+#: ../libpurple/protocols/myspace/myspace.c:2856
msgid "Find people..."
msgstr "Finde Leute..."
-#: ../libpurple/protocols/myspace/myspace.c:2854
+#: ../libpurple/protocols/myspace/myspace.c:2859
msgid "Change IM name..."
msgstr "IM-Namen ändern..."
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3161
msgid "myim URL handler"
msgstr "myim-URL-Behandlungsroutine"
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3162
msgid "No suitable MySpaceIM account could be found to open this myim URL."
msgstr ""
"Es konnte kein geeignetes MySpaceIm-Konto zum öffnen dieser myim-URL "
"gefunden werden."
-#: ../libpurple/protocols/myspace/myspace.c:3158
+#: ../libpurple/protocols/myspace/myspace.c:3163
msgid "Enable the proper MySpaceIM account and try again."
msgstr ""
"Aktivieren Sie das passende MySpaceIM-Konto und versuchen Sie es erneut."
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:3286
msgid "Show display name in status text"
msgstr "Displaynamen im Statustext anzeigen"
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:3289
msgid "Show headline in status text"
msgstr "Ãœberschrift im Statustext anzeigen"
-#: ../libpurple/protocols/myspace/myspace.c:3289
+#: ../libpurple/protocols/myspace/myspace.c:3294
msgid "Send emoticons"
msgstr "Emoticons senden"
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3299
msgid "Screen resolution (dots per inch)"
msgstr "Bildschirmauflösung (dpi)"
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:3302
msgid "Base font size (points)"
msgstr "Basis-Schriftgrüße (Punkt)"
@@ -7539,7 +7628,7 @@ msgstr "Benutzer"
#. TODO: link to username, if available
#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/oscar/oscar.c:2978
msgid "Profile"
msgstr "Profil"
@@ -7562,146 +7651,176 @@ msgstr "Client-Version"
msgstr "Client-Version"
#. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon." This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:214
msgid "Zap"
msgstr "Zappen"
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
#, c-format
msgid "%s has zapped you!"
-msgstr "%s hat sich Dich abgeknallt!"
+msgstr "%s hat sich Sie abgeknallt!"
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
#, c-format
msgid "Zapping %s..."
msgstr "Knalle %s ab..."
-#: ../libpurple/protocols/myspace/zap.c:45
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
msgid "Whack"
msgstr "Schlag"
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
#, c-format
msgid "%s has whacked you!"
msgstr "%s hat Sie geschlagen!"
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
#, c-format
msgid "Whacking %s..."
msgstr "Schlage %s..."
-#: ../libpurple/protocols/myspace/zap.c:46
+#. Torch means "to set on fire." Don't worry, this doesn't
+#. * make a whole lot of sense in English, either. Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:59
msgid "Torch"
msgstr "Abfackeln"
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
#, c-format
msgid "%s has torched you!"
msgstr "%s hat Sie abgefackelt!"
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
#, c-format
msgid "Torching %s..."
msgstr "%s abfackeln..."
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
+#, fuzzy
msgid "Smooch"
-msgstr "Schmusen"
+msgstr "Knutschen"
-#: ../libpurple/protocols/myspace/zap.c:47
-#, c-format
+#: ../libpurple/protocols/myspace/zap.c:62
+#, fuzzy
msgid "%s has smooched you!"
-msgstr "%s hat mit Ihnen geschmust!"
+msgstr "%s hat Sie geknutscht!"
-#: ../libpurple/protocols/myspace/zap.c:47
-#, c-format
+#: ../libpurple/protocols/myspace/zap.c:62
+#, fuzzy
msgid "Smooching %s..."
-msgstr "Schmusen mit %s..."
+msgstr "%s knutschen..."
-#: ../libpurple/protocols/myspace/zap.c:48
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
+#, fuzzy
msgid "Hug"
-msgstr "Umarmen"
+msgstr "Knuddeln"
-#: ../libpurple/protocols/myspace/zap.c:48
-#, c-format
+#: ../libpurple/protocols/myspace/zap.c:65
+#, fuzzy
msgid "%s has hugged you!"
-msgstr "%s hat sich mit Ihnen umarmt!"
+msgstr "%s hat Sie geknuddelt!"
-#: ../libpurple/protocols/myspace/zap.c:48
-#, c-format
+#: ../libpurple/protocols/myspace/zap.c:65
+#, fuzzy
msgid "Hugging %s..."
-msgstr "Umarme %s..."
+msgstr "%s knuddeln..."
-#: ../libpurple/protocols/myspace/zap.c:49
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
+#, fuzzy
msgid "Slap"
-msgstr "Klaps"
+msgstr "Ohrfeigen"
-#: ../libpurple/protocols/myspace/zap.c:49
-#, c-format
+#: ../libpurple/protocols/myspace/zap.c:68
+#, fuzzy
msgid "%s has slapped you!"
-msgstr "%s hat Ihnen einen Klaps gegeben!"
+msgstr "%s hat Ihnen eine Ohrfeige gegeben!"
-#: ../libpurple/protocols/myspace/zap.c:49
-#, c-format
+#: ../libpurple/protocols/myspace/zap.c:68
+#, fuzzy
msgid "Slapping %s..."
-msgstr "Klopfe %s..."
+msgstr "%s ohrfeigen..."
-#: ../libpurple/protocols/myspace/zap.c:50
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
msgid "Goose"
-msgstr "Gans"
+msgstr "Zwicken"
-#: ../libpurple/protocols/myspace/zap.c:50
+#: ../libpurple/protocols/myspace/zap.c:71
#, c-format
msgid "%s has goosed you!"
-msgstr "%s hat Sie zur Gans gemacht!"
+msgstr "%s hat Sie gezwickt!"
-#: ../libpurple/protocols/myspace/zap.c:50
+#: ../libpurple/protocols/myspace/zap.c:71
#, c-format
msgid "Goosing %s..."
-msgstr "%s zur Gans machen..."
+msgstr "%s zwicken..."
-#: ../libpurple/protocols/myspace/zap.c:51
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads. It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:76
+#, fuzzy
msgid "High-five"
-msgstr "High-five (gegenseitiges Hände klatschen)"
+msgstr "Fünf geben"
-#: ../libpurple/protocols/myspace/zap.c:51
-#, c-format
+#: ../libpurple/protocols/myspace/zap.c:76
+#, fuzzy
msgid "%s has high-fived you!"
-msgstr "%s hat sich mit Ihnen in die Hände geklatscht!"
+msgstr "%s hat Ihnen Fünf gegeben!"
-#: ../libpurple/protocols/myspace/zap.c:51
-#, c-format
+#: ../libpurple/protocols/myspace/zap.c:76
+#, fuzzy
msgid "High-fiving %s..."
-msgstr "In die Hände klatschen mit %s..."
+msgstr "%s Fünf geben..."
-#: ../libpurple/protocols/myspace/zap.c:52
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank." Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:81
msgid "Punk"
msgstr "Punk"
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
#, c-format
msgid "%s has punk'd you!"
msgstr "%s hat Sie zum Punk gemacht!"
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
#, c-format
msgid "Punking %s..."
msgstr "%s zum Punk machen..."
-#: ../libpurple/protocols/myspace/zap.c:53
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow. It is typically done when
+#. * gloating or bragging. Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation. It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:90
msgid "Raspberry"
-msgstr "Himbeere"
+msgstr "Zunge herausstrecken"
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
#, c-format
msgid "%s has raspberried you!"
-msgstr "%s hat Sie zur Himbeere gemacht!"
+msgstr "%s hat Ihnen die Zunge herausgestreckt!"
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
#, c-format
msgid "Raspberrying %s..."
-msgstr "%s zur Himbeere machen..."
+msgstr "%s die Zunge herausstrecken..."
#: ../libpurple/protocols/novell/nmuser.c:1864
msgid "Required parameters not passed in"
@@ -7837,44 +7956,44 @@ msgstr "Anmeldung fehlgeschlagen (%s)."
msgid "Login failed (%s)."
msgstr "Anmeldung fehlgeschlagen (%s)."
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:249
#, c-format
msgid "Unable to send message. Could not get details for user (%s)."
msgstr ""
"Kann die Nachricht nicht senden. Kann die Details vom Benutzer nicht holen (%"
"s)."
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:398
#, c-format
msgid "Unable to add %s to your buddy list (%s)."
msgstr "Kann %s nicht zu Ihrer Buddy-Liste hinzufügen (%s)."
#. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:424
#, c-format
msgid "Unable to send message (%s)."
msgstr "Kann die Nachricht nicht senden (%s)."
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:495
+#: ../libpurple/protocols/novell/novell.c:987
#, c-format
msgid "Unable to invite user (%s)."
msgstr "Kann den Benutzer nicht einladen (%s)."
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:534
#, c-format
msgid "Unable to send message to %s. Could not create the conference (%s)."
msgstr ""
"Kann die Nachricht nicht an %s senden. Kann die Konferenz nicht erstellen (%"
"s)."
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:539
#, c-format
msgid "Unable to send message. Could not create the conference (%s)."
msgstr ""
"Kann die Nachricht nicht senden. Kann die Konferenz nicht erstellen (%s)."
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:586
#, c-format
msgid ""
"Unable to move user %s to folder %s in the server side list. Error while "
@@ -7883,7 +8002,7 @@ msgstr ""
"Fehler beim Verschieben des Benutzers %s zum Verzeichnis %s auf der "
"serverseitigen Liste. Fehler beim Erstellen des Verzeichnisses (%s)."
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:634
#, c-format
msgid ""
"Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7892,62 +8011,62 @@ msgstr ""
"Kann den Benutzer %s nicht zur Buddy-Liste hinzufügen. Fehler beim Erstellen "
"des Verzeichnisses auf der serverseitigen Liste (%s)."
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:707
#, c-format
msgid "Could not get details for user %s (%s)."
msgstr "Kann die Details für den Benutzer %s nicht holen (%s)."
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:753
+#: ../libpurple/protocols/novell/novell.c:899
#, c-format
msgid "Unable to add user to privacy list (%s)."
msgstr "Kann den Benutzer nicht zu Ihrer Privatsphäre-Liste hinzufügen (%s)."
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:800
#, c-format
msgid "Unable to add %s to deny list (%s)."
msgstr "Kann %s nicht zu Ihrer Verboten-Liste hinzufügen (%s)."
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:853
#, c-format
msgid "Unable to add %s to permit list (%s)."
msgstr "Kann %s nicht zu Ihrer Erlaubt-Liste hinzufügen (%s)."
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:921
#, c-format
msgid "Unable to remove %s from privacy list (%s)."
msgstr "Kann %s nicht zu Ihrer Privatsphäre-Liste entfernen (%s)."
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:944
+#: ../libpurple/protocols/novell/novell.c:1649
#, c-format
msgid "Unable to change server side privacy settings (%s)."
msgstr ""
"Kann die serverseitigen Einstellungen zur Privatsphäre nicht ändern (%s)."
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1014
#, c-format
msgid "Unable to create conference (%s)."
msgstr "Konferenz kann nicht erstellt werden (%s)."
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1123
+#: ../libpurple/protocols/novell/novell.c:1694
msgid "Error communicating with server. Closing connection."
msgstr "Kommunikationsfehler mit dem Server. Schließe die Verbindung."
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1478
msgid "Telephone Number"
msgstr "Telefonnummer"
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1484
msgid "Personal Title"
msgstr "Persönlicher Titel"
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1488
msgid "Mailstop"
msgstr "Hauspostcode"
-#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/novell/novell.c:1504
#: ../libpurple/protocols/sametime/sametime.c:4122
msgid "User ID"
msgstr "Benutzer-ID"
@@ -7958,41 +8077,41 @@ msgstr "Benutzer-ID"
#. purple_notify_user_info_add_pair(user_info, tag, value);
#. }
#.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1517
msgid "Full name"
msgstr "Vollständiger Name"
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1639
#, c-format
msgid "GroupWise Conference %d"
msgstr "GroupWise-Konferenz %d"
-#: ../libpurple/protocols/novell/novell.c:1668
+#: ../libpurple/protocols/novell/novell.c:1670
msgid "Unable to make SSL connection to server."
msgstr "Kann keine SSL-Verbindung zum Server herstellen."
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1722
msgid "Authenticating..."
msgstr "Authentifizierung..."
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1734
msgid "Unable to connect to server."
msgstr "Verbindung zum Server nicht möglich."
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1737
msgid "Waiting for response..."
msgstr "Warte auf Antwort..."
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1872
#, c-format
msgid "%s has been invited to this conversation."
msgstr "%s wurde zu diesem Gespräch eingeladen."
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1900
msgid "Invitation to Conversation"
msgstr "Einladung zur Unterhaltung"
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1901
#, c-format
msgid ""
"Invitation from: %s\n"
@@ -8003,18 +8122,17 @@ msgstr ""
"\n"
"Gesendet: %s"
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1903
msgid "Would you like to join the conversation?"
msgstr "Möchten der Konferenz beitreten?"
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2017
msgid "You have been logged out because you logged in at another workstation."
msgstr ""
"Sie wurden abgemeldet, weil Sie sich an einer anderen Workstation angemeldet "
"haben."
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2074
#, c-format
msgid ""
"%s appears to be offline and did not receive the message that you just sent."
@@ -8026,7 +8144,7 @@ msgstr ""
#. * purple_request_fields(gc, _("Server Address"),...);
#.
#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2172
msgid ""
"Unable to connect to server. Please enter the address of the server you wish "
"to connect to."
@@ -8034,11 +8152,11 @@ msgstr ""
"Kann keine Verbindung zum Server herstellen. Bitte geben Sie die Adresse des "
"Servers ein, mit dem Sie sich verbinden wollen."
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2200
msgid "Error. SSL support is not installed."
msgstr "Fehler. SSL ist nicht installiert."
-#: ../libpurple/protocols/novell/novell.c:2504
+#: ../libpurple/protocols/novell/novell.c:2509
#, c-format
msgid "This conference has been closed. No more messages can be sent."
msgstr ""
@@ -8055,31 +8173,31 @@ msgstr ""
#. *< version
#. * summary
#. * description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3523
+#: ../libpurple/protocols/novell/novell.c:3525
msgid "Novell GroupWise Messenger Protocol Plugin"
msgstr "Novell GroupWise Messenger Protokoll-Plugin"
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3550
msgid "Server address"
msgstr "Server-Adresse"
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3554
msgid "Server port"
msgstr "Server-Port"
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
msgid "Server closed the connection."
msgstr "Der Server hat die Verbindung beendet."
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:593
#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
#, c-format
@@ -8090,7 +8208,7 @@ msgstr ""
"Verbindung zum Server verloren:\n"
"%s"
-#: ../libpurple/protocols/oscar/flap_connection.c:392
+#: ../libpurple/protocols/oscar/flap_connection.c:394
#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
#: ../libpurple/proxy.c:1478
@@ -8128,38 +8246,48 @@ msgstr "IRC-Protokoll-Plugin"
msgstr "IRC-Protokoll-Plugin"
#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
#: ../libpurple/protocols/zephyr/zephyr.c:2997
msgid "Encoding"
msgstr "Kodierung"
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
msgid "The remote user has closed the connection."
msgstr "Der entfernte Benutzer hat das Gespräch beendet."
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
msgid "The remote user has declined your request."
msgstr "Der entfernte Benutzer hat Ihre Anfrage abgelehnt."
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
#, c-format
msgid "Lost connection with the remote user:<br>%s"
msgstr "Verbindung zum entfernten Benutzer verloren: <br>%s"
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
msgid "Received invalid data on connection with remote user."
msgstr ""
"Ungültige Daten in der Verbindung mit dem entfernten Benutzer empfangen."
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
msgid "Could not establish a connection with the remote user."
msgstr ""
"Die Verbindung mit dem entfernten Benutzer konnte nicht hergestellt werden."
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
msgid "Direct IM established"
msgstr "Direkt-IM hergestellt"
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM. Try using file transfer instead.\n"
+msgstr ""
+"%s hat versucht ihnen eine %s große Datei zu senden, aber wir erlauben nur "
+"Dateien bis zu %s über Direkt-IM. Versuchen Sie statt dessen die "
+"Dateiübertragung zu benutzen.\n"
+
#: ../libpurple/protocols/oscar/oft.c:656
#, c-format
msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -8307,7 +8435,7 @@ msgstr "Chat"
msgstr "Chat"
#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6062
msgid "Get File"
msgstr "Datei abrufen"
@@ -8380,19 +8508,19 @@ msgstr "Kamera"
msgstr "Kamera"
#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
+#: ../libpurple/protocols/oscar/oscar.c:5832
#, c-format
msgid "Free For Chat"
msgstr "Bereit zum Chatten"
#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
+#: ../libpurple/protocols/oscar/oscar.c:5867
#, c-format
msgid "Not Available"
msgstr "Nicht verfügbar"
#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
+#: ../libpurple/protocols/oscar/oscar.c:5853
#, c-format
msgid "Occupied"
msgstr "Beschäftigt"
@@ -8404,7 +8532,7 @@ msgstr "In Web"
#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
+#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:157
#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
#, c-format
msgid "Invisible"
@@ -8416,13 +8544,13 @@ msgstr "Online"
msgstr "Online"
#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
msgid "IP Address"
msgstr "IP-Adresse"
#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2905
msgid "Warning Level"
msgstr "Warnstufe"
@@ -8474,14 +8602,14 @@ msgstr ""
"Leerzeichen enthalten oder nur aus Ziffern bestehen."
#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
msgid "Invalid screen name."
msgstr "Ungültiger Benutzername."
#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
msgid "Incorrect password."
msgstr "Falsches Passwort."
@@ -8534,10 +8662,10 @@ msgstr "Geben Sie die 6-stellige Nummer
#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
#.
#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:2246
+#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:6218 ../libpurple/request.h:1388
msgid "_OK"
msgstr "_OK"
@@ -8574,33 +8702,33 @@ msgstr "Kann Verbindung nicht erstellen"
msgid "Unable to initialize connection"
msgstr "Kann Verbindung nicht erstellen"
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2204
msgid "Please authorize me so I can add you to my buddy list."
msgstr ""
"Bitte autorisieren Sie mich, sodass ich Sie in meine Buddy-Liste aufnehmen "
"kann."
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2244
msgid "Authorization Request Message:"
msgstr "Autorisierungsanfrage:"
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2245
msgid "Please authorize me!"
msgstr "Bitte autorisiere mich!"
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2286
+#: ../libpurple/protocols/oscar/oscar.c:2294
+#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:5313
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
msgid "No reason given."
msgstr "Kein Grund angegeben."
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2293
msgid "Authorization Denied Message:"
msgstr "Nachricht für die Ablehnung der Autorisierung:"
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2421
#, c-format
msgid ""
"The user %u has denied your request to add them to your buddy list for the "
@@ -8611,19 +8739,19 @@ msgstr ""
"Liste hinzufügen zu dürfen, und zwar aus folgendem Grund:\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2422
msgid "ICQ authorization denied."
msgstr "ICQ-Autorisierung verweigert."
#. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2429
#, c-format
msgid "The user %u has granted your request to add them to your buddy list."
msgstr ""
"Der Benutzer %u hat Ihre Anfrage akzeptiert, ihn bzw. sie zu Ihrer Buddy-"
"Liste hinzufügen zu dürfen."
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2437
#, c-format
msgid ""
"You have received a special message\n"
@@ -8636,7 +8764,7 @@ msgstr ""
"Von: %s [%s]\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2445
#, c-format
msgid ""
"You have received an ICQ page\n"
@@ -8649,7 +8777,7 @@ msgstr ""
"Von: %s [%s]\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2453
#, c-format
msgid ""
"You have received an ICQ e-mail from %s [%s]\n"
@@ -8662,24 +8790,24 @@ msgstr ""
"Nachricht:\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2474
#, c-format
msgid "ICQ user %u has sent you a buddy: %s (%s)"
msgstr "Der ICQ Benutzer %u hat Ihnen einen Buddy gesendet: %s (%s)"
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2480
msgid "Do you want to add this buddy to your buddy list?"
msgstr "Möchten Sie diesen Buddy zu Ihrer Buddy-Liste hinzufügen?"
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2485 ../pidgin/gtkroomlist.c:309
msgid "_Add"
msgstr "_Hinzufügen"
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2486
msgid "_Decline"
msgstr "_Ablehnen"
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2610
#, c-format
msgid "You missed %hu message from %s because it was invalid."
msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -8687,7 +8815,7 @@ msgstr[1] ""
msgstr[1] ""
"Sie haben %hu Nachrichten von %s nicht erhalten, da sie ungültig waren."
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2619
#, c-format
msgid "You missed %hu message from %s because it was too large."
msgid_plural "You missed %hu messages from %s because they were too large."
@@ -8695,7 +8823,7 @@ msgstr[1] ""
msgstr[1] ""
"Sie haben %hu Nachrichten von %s nicht erhalten, da sie zu groß waren."
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2628
#, c-format
msgid ""
"You missed %hu message from %s because the rate limit has been exceeded."
@@ -8708,7 +8836,7 @@ msgstr[1] ""
"Sie haben %hu Nachrichten von %s nicht erhalten, da die Senderate "
"überschritten wurde."
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2637
#, c-format
msgid "You missed %hu message from %s because he/she was too evil."
msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -8717,7 +8845,7 @@ msgstr[1] ""
msgstr[1] ""
"Sie haben %hu Nachrichten von %s nicht erhalten,/sie zu boshaft war."
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2646
#, c-format
msgid "You missed %hu message from %s because you are too evil."
msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -8726,7 +8854,7 @@ msgstr[1] ""
msgstr[1] ""
"Sie haben %hu Nachrichten von %s nicht erhalten, da Sie zu boshaft sind."
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2655
#, c-format
msgid "You missed %hu message from %s for an unknown reason."
msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -8736,47 +8864,47 @@ msgstr[1] ""
"Sie haben %hu Nachrichten von %s aus unbekannten Gründen nicht erhalten."
#. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2810
#, c-format
msgid "Unable to send message: %s"
msgstr "Kann die Nachricht nicht senden: %s"
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2810
+#: ../libpurple/protocols/oscar/oscar.c:2815
+#: ../libpurple/protocols/oscar/oscar.c:2879
msgid "Unknown reason."
msgstr "Unbekannter Grund."
-#: ../libpurple/protocols/oscar/oscar.c:2799
+#: ../libpurple/protocols/oscar/oscar.c:2813
#: ../libpurple/protocols/sametime/sametime.c:2409
#, c-format
msgid "Unable to send message to %s:"
msgstr "Kann die Nachricht an %s nicht senden:"
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2879
#, c-format
msgid "User information not available: %s"
msgstr "Benutzerinformation nicht verfügbar: %s"
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2910
msgid "Online Since"
msgstr "Online seit"
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2915
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
msgid "Member Since"
msgstr "Mitglied seit"
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2950
msgid "Available Message"
msgstr "Verfügbarkeitsnachricht"
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3058
msgid "Your AIM connection may be lost."
msgstr "Ihre AIM-Verbindung könnte unterbrochen sein."
#. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3246
msgid ""
"[Unable to display a message from this user because it contained invalid "
"characters.]"
@@ -8784,7 +8912,7 @@ msgstr ""
"[Kann die Nachricht von diesem Benutzer nicht anzeigen, da sie ungültige "
"Zeichen enthält.]"
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3410
msgid ""
"The last action you attempted could not be performed because you are over "
"the rate limit. Please wait 10 seconds and try again."
@@ -8793,85 +8921,85 @@ msgstr ""
"Senderate überschritten wurde. Bitte warten Sie 10 Sekunden und versuchen "
"Sie es erneut."
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3493
#: ../libpurple/protocols/toc/toc.c:977
#, c-format
msgid "You have been disconnected from chat room %s."
msgstr "Die Verbindung zum Raum %s wurde unterbrochen."
-#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3743
#: ../libpurple/protocols/silc/util.c:585
#: ../libpurple/protocols/silc10/util.c:581
msgid "Mobile Phone"
msgstr "Handynummer"
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3773
msgid "Personal Web Page"
msgstr "Persönliche Webseite"
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3797
#: ../libpurple/protocols/qq/buddy_info.c:40
msgid "Additional Information"
msgstr "Zusätzliche Informationen"
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
msgid "Zip Code"
msgstr "PLZ"
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3829
msgid "Division"
msgstr "Abteilung"
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3830
msgid "Position"
msgstr "Position"
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3832
msgid "Web Page"
msgstr "Webseite"
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3835
msgid "Work Information"
msgstr "Information (Arbeit)"
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3891
msgid "Pop-Up Message"
msgstr "Pop-Up Nachricht"
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3931
#, c-format
msgid "The following screen name is associated with %s"
msgid_plural "The following screen names are associated with %s"
msgstr[0] "Die folgende Benutzername ist verbunden mit %s"
msgstr[1] "Die folgenden Benutzernamen sind verbunden mit %s"
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3936
msgid "Screen name"
msgstr "Benutzername"
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3962
#, c-format
msgid "No results found for e-mail address %s"
msgstr "Keine Ergebnisse für die E-Mail-Adresse %s gefunden"
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3983
#, c-format
msgid "You should receive an e-mail asking to confirm %s."
msgstr ""
"Sie sollten eine E-Mail erhalten, in der Sie aufgefordert werden, %s zu "
"bestätigen."
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3985
msgid "Account Confirmation Requested"
msgstr "Kontobestätigung wurde angefragt"
-#: ../libpurple/protocols/oscar/oscar.c:4002
+#: ../libpurple/protocols/oscar/oscar.c:4016
#, c-format
msgid "Error Changing Account Info"
msgstr "Fehler beim Ändern der Konten-Information"
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4019
#, c-format
msgid ""
"Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8880,14 +9008,14 @@ msgstr ""
"Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name vom "
"Original abweicht."
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4022
#, c-format
msgid "Error 0x%04x: Unable to format screen name because it is invalid."
msgstr ""
"Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil er ungültig "
"ist."
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4025
#, c-format
msgid ""
"Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8896,7 +9024,7 @@ msgstr ""
"Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name zu "
"lang ist."
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4028
#, c-format
msgid ""
"Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8905,7 +9033,7 @@ msgstr ""
"Error 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil es schon eine "
"laufende Anfrage für diesen Benutzernamen gibt."
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4031
#, c-format
msgid ""
"Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8914,7 +9042,7 @@ msgstr ""
"Fehler 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil es schon zu viele "
"E-Mail-Adressen gibt, die zum Benutzernamen gehören."
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4034
#, c-format
msgid ""
"Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8923,32 +9051,32 @@ msgstr ""
"Fehler 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil die angegebene "
"Adresse falsch ist."
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4037
#, c-format
msgid "Error 0x%04x: Unknown error."
msgstr "Fehler 0x%04x: Unbekannter Fehler."
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4047
#, c-format
msgid "The e-mail address for %s is %s"
msgstr "Die E-Mail-Adresse für %s ist %s"
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4049
msgid "Account Info"
msgstr "Konto-Info"
-#: ../libpurple/protocols/oscar/oscar.c:4218
+#: ../libpurple/protocols/oscar/oscar.c:4232
msgid ""
"Your IM Image was not sent. You must be Direct Connected to send IM Images."
msgstr ""
"Ihr IM-Bild wurde nicht gesendet. Sie müssen direkt verbunden sein, um IM-"
"Bilder senden zu können."
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4503
msgid "Unable to set AIM profile."
msgstr "Kann das AIM-Profil nicht setzen."
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4504
msgid ""
"You have probably requested to set your profile before the login procedure "
"completed. Your profile remains unset; try setting it again when you are "
@@ -8958,7 +9086,7 @@ msgstr ""
"Anmeldeprozedur abgeschlossen war. Das Profil bleibt ungesetzt. Versuchen "
"Sie es wieder, wenn Sie vollständig verbunden sind."
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4518
#, c-format
msgid ""
"The maximum profile length of %d byte has been exceeded. It has been "
@@ -8973,11 +9101,11 @@ msgstr[1] ""
"Die maximale Profilgröße von %d Bytes wurde überschritten. Es wurde für Sie "
"abgeschnitten."
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4523
msgid "Profile too long."
msgstr "Profil zu lang."
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4568
#, c-format
msgid ""
"The maximum away message length of %d byte has been exceeded. It has been "
@@ -8992,11 +9120,11 @@ msgstr[1] ""
"Die Abwesenheitsnachricht hat die maximale Größe von %d Bytes "
"überschritten. Sie wurde für Sie abgeschnitten."
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4573
msgid "Away message too long."
msgstr "Abwesenheitsmitteilungen zu lang."
-#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:4646
#, c-format
msgid ""
"Could not add the buddy %s because the screen name is invalid. Screen names "
@@ -9008,17 +9136,17 @@ msgstr ""
"beginnen und nur Buchstaben, Ziffern und Leerzeichen enthalten oder nur aus "
"Ziffern bestehen."
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4648
+#: ../libpurple/protocols/oscar/oscar.c:5099
+#: ../libpurple/protocols/oscar/oscar.c:5114
msgid "Unable To Add"
msgstr "Kann nicht hinzufügen"
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4767
msgid "Unable To Retrieve Buddy List"
msgstr "Konnte Buddy-Liste nicht laden"
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4768
msgid ""
"The AIM servers were temporarily unable to send your buddy list. Your buddy "
"list is not lost, and will probably become available in a few hours."
@@ -9027,15 +9155,15 @@ msgstr ""
"versenden. Ihre Buddy-Liste ist nicht verloren und wird wahrscheinlich in "
"ein paar Stunden wieder verfügbar sein."
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../libpurple/protocols/oscar/oscar.c:4950
+#: ../libpurple/protocols/oscar/oscar.c:4952
+#: ../libpurple/protocols/oscar/oscar.c:5179
+#: ../libpurple/protocols/oscar/oscar.c:5180
+#: ../libpurple/protocols/oscar/oscar.c:5185
msgid "Orphans"
msgstr "Waisen"
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5097
#, c-format
msgid ""
"Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9044,17 +9172,17 @@ msgstr ""
"Kann den Buddy %s nicht hinzufügen, weil Sie schon zu viele Buddys in Ihrer "
"Buddy-Liste haben. Bitte entfernen Sie einen und versuchen Sie es nochmal."
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5112
msgid "(no name)"
msgstr "(kein Name)"
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5111
#, c-format
msgid "Could not add the buddy %s for an unknown reason."
msgstr "Konnte den Buddy %s aus einem unbekannten Grund nicht hinzufügen."
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5228
#, c-format
msgid ""
"The user %s has given you permission to add you to their buddy list. Do you "
@@ -9063,24 +9191,24 @@ msgstr ""
"Der Benutzer %s hat Ihnen gestattet, Sie zu seiner Buddy-Liste hinzuzufügen. "
"Möchten Sie ihn hinzufügen?"
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5236
msgid "Authorization Given"
msgstr "Autorisierung wurde gegeben"
#. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5309
#, c-format
msgid "The user %s has granted your request to add them to your buddy list."
msgstr ""
"Der Benutzer %s hat Ihre Anfrage akzeptiert, ihn bzw. sie zu Ihrer Buddy-"
"Liste hinzufügen zu dürfen."
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5310
msgid "Authorization Granted"
msgstr "Autorisierung erteilt"
#. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5313
#, c-format
msgid ""
"The user %s has denied your request to add them to your buddy list for the "
@@ -9091,53 +9219,53 @@ msgstr ""
"Liste hinzufügen zu dürfen, und zwar aus folgendem Grund:\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5314
msgid "Authorization Denied"
msgstr "Autorisierung abgelehnt"
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5350
#: ../libpurple/protocols/toc/toc.c:1371
msgid "_Exchange:"
msgstr "A_ustausch:"
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5390
msgid "Invalid chat name specified."
msgstr "Ungültiger Chat-Name angegeben."
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5459
msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
msgstr ""
"Ihr IM-Bild wurde nicht gesendet. Sie können keine IM-Bilder in AIM-Chats "
"senden."
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5621
+#: ../libpurple/protocols/oscar/oscar.c:5626
msgid "Away Message"
msgstr "Abwesenheitsnachricht"
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5626
msgid "<i>(retrieving)</i>"
msgstr "<i>(empfange)</i>"
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5826
msgid "iTunes Music Store Link"
msgstr "iTunes Music Store Link"
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5934
#, c-format
msgid "Buddy Comment for %s"
msgstr "Buddy-Kommentar für %s"
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5935
msgid "Buddy Comment:"
msgstr "Buddy-Kommentar:"
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5982
#, c-format
msgid "You have selected to open a Direct IM connection with %s."
msgstr "Sie haben eine direkte IM-Verbindung mit %s ausgewählt."
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5986
msgid ""
"Because this reveals your IP address, it may be considered a security risk. "
"Do you wish to continue?"
@@ -9145,66 +9273,66 @@ msgstr ""
"Da dies Ihre IP-Adresse sichtbar macht, kann es als Sicherheitsrisiko "
"betrachtet werden. Möchten Sie fortfahren?"
-#: ../libpurple/protocols/oscar/oscar.c:5940
+#: ../libpurple/protocols/oscar/oscar.c:5992
#: ../libpurple/protocols/oscar/peer.c:1045
msgid "C_onnect"
msgstr "V_erbinden"
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6027
msgid "Get AIM Info"
msgstr "AIM-Info"
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6033
msgid "Edit Buddy Comment"
msgstr "Buddy-Kommentar bearbeiten"
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6041
msgid "Get Status Msg"
msgstr "Abwesenheitsmitteilung abrufen"
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6054
msgid "Direct IM"
msgstr "Direkte Nachricht"
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6076
msgid "Re-request Authorization"
msgstr "Nochmal nach Autorisierung fragen"
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6135
msgid "Require authorization"
msgstr "Autorisierung erforderlich"
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6138
msgid "Web aware (enabling this will cause you to receive SPAM!)"
msgstr "Web aware (Wenn Sie dies aktivieren, werden Sie SPAM erhalten!)"
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6143
msgid "ICQ Privacy Options"
msgstr "ICQ Privatsphärenoptionen"
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6162
msgid "The new formatting is invalid."
msgstr "Die neue Formatierung ist ungültig."
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6163
msgid "Screen name formatting can change only capitalization and whitespace."
msgstr ""
"Benutzernamen-Formatierung kann nur die Groß-/Kleinschreibung und "
"Leerzeichen ändern."
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6216
msgid "Change Address To:"
msgstr "Ändere die Adresse zu:"
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6262
msgid "<i>you are not waiting for authorization</i>"
msgstr "<i>Sie warten derzeit auf keine Autorisierungen</i>"
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6265
msgid "You are awaiting authorization from the following buddies"
msgstr "Sie warten auf Autorisierung von den folgenden Buddys"
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6266
msgid ""
"You can re-request authorization from these buddies by right-clicking on "
"them and selecting \"Re-request Authorization.\""
@@ -9213,73 +9341,73 @@ msgstr ""
"den Buddy mit einem Rechtsklick anklicken und „Nochmal nach Autorisierung "
"fragen“ auswählen."
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6283
msgid "Find Buddy by E-Mail"
msgstr "Suche Buddys nach E-Mail-Adresse"
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6284
msgid "Search for a buddy by e-mail address"
msgstr "Suche nach einem Buddy mit einer bestimmten E-Mail-Adresse"
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6285
msgid "Type the e-mail address of the buddy you are searching for."
msgstr "Geben Sie die E-Mail-Adresse des Buddys ein, nach dem Sie suchen."
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6288
msgid "_Search"
msgstr "_Suchen"
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6446
msgid "Set User Info (URL)..."
msgstr "Benutzer-Info (URL) setzen..."
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6457
msgid "Change Password (URL)"
msgstr "Ändere Passwort (URL)"
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6461
msgid "Configure IM Forwarding (URL)"
msgstr "Konfiguriere IM-Weiterleitung (URL)"
#. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6471
msgid "Set Privacy Options..."
msgstr "Privatsphärenoptionen setzen..."
#. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6478
msgid "Confirm Account"
msgstr "Konto bestätigen"
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6482
msgid "Display Currently Registered E-Mail Address"
msgstr "Zeige die aktuell registrierte E-Mail-Adresse"
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6486
msgid "Change Currently Registered E-Mail Address..."
msgstr "Ändere die aktuell registrierte E-Mail-Adresse..."
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6493
msgid "Show Buddies Awaiting Authorization"
msgstr "Zeige Buddys, von denen Sie Autorisierung erwarten"
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6499
msgid "Search for Buddy by E-Mail Address..."
msgstr "Suche Buddys nach E-Mail-Adresse..."
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6504
msgid "Search for Buddy by Information"
msgstr "Suche Buddy nach Information"
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6572
msgid "Use recent buddies group"
msgstr "Benutze neueste Gruppe"
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6575
msgid "Show how long you have been idle"
msgstr "Anzeigen, wie lange ich untätig war"
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6730
msgid ""
"Always use ICQ proxy server for file transfers\n"
"(slower, but does not reveal your IP address)"
@@ -9764,7 +9892,7 @@ msgstr "Fehler beim Abfragen des Anmelde
msgid "Error requesting login token"
msgstr "Fehler beim Abfragen des Anmelde-Tokens"
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:488
msgid "Unable to login, check debug log"
msgstr "Anmeldung fehlgeschlagen, Debugmitschnitt beachten"
@@ -10141,7 +10269,7 @@ msgstr "Sende TEST-Nachricht"
msgid "Send TEST Announcement"
msgstr "Sende TEST-Nachricht"
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4417
msgid "Topic:"
msgstr "Thema:"
@@ -10166,7 +10294,7 @@ msgstr "Kein Sametime-Community Server a
msgid "No Sametime Community Server Specified"
msgstr "Kein Sametime-Community Server angegeben"
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4323
msgid "Connect"
msgstr "Verbinden"
@@ -10220,10 +10348,6 @@ msgstr ""
"Der Bezeichner '%s' passt zu keinem der Benutzer in Ihrer Sametime-"
"Community. Der Eintrag wurde von Ihrer Buddy-Liste entfernt."
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Kann den Benutzer nicht hinzufügen"
-
#: ../libpurple/protocols/sametime/sametime.c:5011
#, c-format
msgid ""
@@ -10346,7 +10470,7 @@ msgstr ""
"können diese Benutzer zu Ihrer Buddy-Liste hinzufügen oder ihnen Nachrichten "
"senden, indem sie die folgenden Aktions-Buttons benutzen."
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:757
msgid "Search Results"
msgstr "Suchergebnisse"
@@ -11624,7 +11748,7 @@ msgstr "Ihre momentane Stimmung"
msgstr "Ihre momentane Stimmung"
#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
#, c-format
msgid "Normal"
msgstr "Normal"
@@ -12026,7 +12150,7 @@ msgstr "Sichere Internet Live Konferenz
msgstr "Sichere Internet Live Konferenz (SILC) Protokoll"
#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
msgid "Network"
msgstr "Netzwerk"
@@ -12302,31 +12426,30 @@ msgstr "Konnte nicht schreiben"
msgstr "Konnte nicht schreiben"
#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:1531
msgid "Could not connect"
msgstr "Verbinden nicht möglich"
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1061
msgid "Unknown server response."
-msgstr "Unbekannter Grund."
+msgstr "Unbekannte Serverantwort."
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1565
+#: ../libpurple/protocols/simple/simple.c:1607
+#: ../libpurple/protocols/simple/simple.c:1620
+#: ../libpurple/protocols/simple/simple.c:1671
msgid "Could not create listen socket"
msgstr "Kann Listen-Socket nicht erstellen"
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1588
msgid "Couldn't resolve host"
msgstr "Kann den Hostnamen nicht auflösen"
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1679
msgid "Could not resolve hostname"
msgstr "Konnte den Hostnamen nicht auflösen"
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1696
msgid "SIP screen names may not contain whitespaces or @ symbols"
msgstr "SIP-Benutzernamen dürfen keine Leerzeichen oder @-Symbole enthalten"
@@ -12338,36 +12461,36 @@ msgstr "SIP-Benutzernamen dürfen keine
#. *< id
#. *< name
#. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1872
msgid "SIP/SIMPLE Protocol Plugin"
msgstr "SIP/SIMPLE Protokoll-Plugin"
#. * summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1873
msgid "The SIP/SIMPLE Protocol Plugin"
msgstr "Das SIP/SIMPLE-Protokoll-Plugin"
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:1901
msgid "Publish status (note: everyone may watch you)"
msgstr "Status veröffentlichen (Bemerkung: Jeder kann Sie sehen)"
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:1907
msgid "Use UDP"
msgstr "Benutze UDP"
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1909
msgid "Use proxy"
msgstr "Proxy benutzen"
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1911
msgid "Proxy"
msgstr "Proxy"
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:1913
msgid "Auth User"
msgstr "Auth-Benutzer"
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1915
msgid "Auth Domain"
msgstr "Auth-Domain"
@@ -12546,8 +12669,8 @@ msgstr "Passwortänderung erfolgreich"
msgid "Password Change Successful"
msgstr "Passwortänderung erfolgreich"
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5871
+#: ../pidgin/gtkblist.c:6227
msgid "_Group:"
msgstr "_Gruppe:"
@@ -12610,26 +12733,26 @@ msgstr "TOC-Protokoll-Plugin"
msgid "TOC Protocol Plugin"
msgstr "TOC-Protokoll-Plugin"
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:784
#, c-format
msgid "%s has sent you a webcam invite, which is not yet supported."
msgstr ""
"%s hat Ihnen eine Webcam-Einladung gesenden, die noch nicht unterstützt wird."
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+#: ../libpurple/protocols/yahoo/yahoo.c:840
msgid "Your Yahoo! message did not get sent."
msgstr "Ihre Yahoo!-Nachricht wurde nicht verschickt."
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:962
#, c-format
msgid "Yahoo! system message for %s:"
msgstr "Yahoo!-Systemnachricht für %s:"
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
msgid "Authorization denied message:"
msgstr "Nachricht für die Ablehnung der Autorisierung:"
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
#, c-format
msgid ""
"%s has (retroactively) denied your request to add them to your list for the "
@@ -12638,18 +12761,18 @@ msgstr ""
"%s hat (rückwirkend) Ihre Anfrage abgelehnt, dass Sie ihn bzw. sie zu Ihrer "
"Buddy-Liste hinzufügen und zwar aus folgendem Grund: %s."
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
#, c-format
msgid "%s has (retroactively) denied your request to add them to your list."
msgstr ""
"%s hat (rückwirkend) Ihre Anfrage abgelehnt, dass Sie ihn bzw. sie zu Ihrer "
"Buddy-Liste hinzufügen."
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
msgid "Add buddy rejected"
msgstr "Hinzufügen des Buddys zurückgewiesen"
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
#, c-format
msgid ""
"The Yahoo server has requested the use of an unrecognized authentication "
@@ -12660,11 +12783,11 @@ msgstr ""
"Sie werden wahrscheinlich nicht in der Lage sein, Sich erfolgreich bei Yahoo "
"anzumelden. Prüfen Sie %s auf Updates."
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
msgid "Failed Yahoo! Authentication"
msgstr "Yahoo-Authentifizierung fehlgeschlagen"
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
#, c-format
msgid ""
"You have tried to ignore %s, but the user is on your buddy list. Clicking "
@@ -12673,53 +12796,53 @@ msgstr ""
"Sie haben versucht %s zu ignorieren, aber der Benutzer ist in Ihrer Buddy-"
"Liste. Wenn Sie auf „Ja“ klicken, wird der Buddy entfernt und ignoriert."
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
msgid "Ignore buddy?"
msgstr "Buddy ignorieren?"
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
msgid "Your account is locked, please log in to the Yahoo! website."
msgstr ""
"Ihr Konto ist gesperrt. Bitte melden Sie sich auf der Yahoo! Webseite an."
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
#, c-format
msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
msgstr ""
"Unbekannte Fehlernummer %d. Vielleicht kann dies repariert werden, wenn Sie "
"sich auf der Yahoo! Webseite anmelden."
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
#, c-format
msgid "Could not add buddy %s to group %s to the server list on account %s."
msgstr ""
"Konnte den Buddy %s der Gruppe %s nicht zur Serverliste des Kontos %s "
"hinzufügen."
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
msgid "Could not add buddy to server list"
msgstr "Konnte den Buddy nicht zur Serverliste hinzufügen"
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
#, c-format
msgid "[ Audible %s/%s/%s.swf ] %s"
msgstr "[ Hörbar %s/%s/%s.swf ] %s"
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
msgid "Received unexpected HTTP response from server."
msgstr "Ungültige HTTP-Antwort vom Server empfangen."
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
#: ../libpurple/protocols/yahoo/yahoochat.c:1514
#: ../libpurple/protocols/yahoo/yahoochat.c:1584
#: ../libpurple/protocols/yahoo/ycht.c:585
msgid "Connection problem"
msgstr "Verbindungsfehler"
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
#, c-format
msgid ""
"Lost connection with %s:\n"
@@ -12728,7 +12851,7 @@ msgstr ""
"Verbindung zu %s verloren:\n"
"%s"
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
#, c-format
msgid ""
"Could not establish a connection with %s:\n"
@@ -12737,112 +12860,103 @@ msgstr ""
"Die Verbindung mit %s konnte nicht hergestellt werden:\n"
"%s"
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
msgid "Not at Home"
msgstr "Nicht zu Hause"
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
msgid "Not at Desk"
msgstr "Nicht am Schreibtisch"
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
msgid "Not in Office"
msgstr "Nicht im Büro"
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
msgid "On Vacation"
msgstr "Im Urlaub"
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
msgid "Stepped Out"
msgstr "Hinausgegangen"
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
msgid "Not on server list"
msgstr "Nicht auf der Serverliste"
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
msgid "Appear Online"
msgstr "Online erscheinen"
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
msgid "Appear Permanently Offline"
msgstr "Permanent offline erscheinen"
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
msgid "Presence"
msgstr "Präsenz"
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
msgid "Appear Offline"
msgstr "Offline erscheinen"
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
msgid "Don't Appear Permanently Offline"
msgstr "Nicht permanent offline erscheinen"
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
msgid "Join in Chat"
msgstr "Chat betreten"
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
msgid "Initiate Conference"
msgstr "Konferenz einleiten"
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
msgid "Presence Settings"
msgstr "Anwesenheitseinstellungen"
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
msgid "Start Doodling"
msgstr "Anfangen zu malen"
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
msgid "Activate which ID?"
msgstr "Welche ID aktivieren?"
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
msgid "Join whom in chat?"
msgstr "Wen wollen Sie zum Chat einladen?"
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
msgid "Activate ID..."
msgstr "Aktiviere ID..."
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
msgid "Join User in Chat..."
msgstr "Einen Benutzer zum Chat einladen..."
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
msgid "Open Inbox"
msgstr "Öffne Posteingang"
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr "Anklopfen"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr "%s anklopfen..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
msgid "join <room>: Join a chat room on the Yahoo network"
msgstr "join: <Raum>: Einen Chatraum im Yahoo-Netzwerk betreten"
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4143
msgid "list: List rooms on the Yahoo network"
msgstr "list: Liste Räume im Yahoo-Netzwerk auf"
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4151
msgid "doodle: Request user to start a Doodle session"
msgstr "doodle: Einen Benutzer auffordern, eine Mal-Sitzung zu starten"
@@ -12856,56 +12970,56 @@ msgstr "doodle: Einen Benutzer aufforder
#. *< version
#. * summary
#. * description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
#: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4362
msgid "Yahoo Protocol Plugin"
msgstr "Yahoo-Protokoll-Plugin"
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4385
msgid "Yahoo Japan"
msgstr "Yahoo Japan"
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4388
msgid "Pager server"
msgstr "Pager-Server"
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4391
msgid "Japan Pager server"
msgstr "Pager-Server (Japan)"
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
msgid "Pager port"
msgstr "Pager-Port"
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
msgid "File transfer server"
msgstr "Server für Dateiübertragungen"
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
msgid "Japan file transfer server"
msgstr "Server für Dateiübertragungen (Japan)"
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
msgid "File transfer port"
msgstr "Port für Dateiübertragungen"
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
msgid "Chat room locale"
msgstr "Chatraum-Gebiet"
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
msgid "Ignore conference and chatroom invitations"
msgstr "Konferenz- und Chateinladungen ignorieren"
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
msgid "Chat room list URL"
msgstr "Chatraumliste (URL)"
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
msgid "Yahoo Chat server"
msgstr "Yahoo-Chat-Server"
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4423
msgid "Yahoo Chat port"
msgstr "Yahoo-Chat-Port"
@@ -13353,7 +13467,7 @@ msgstr "%s hat um Ihre Aufmerksamkeit ge
msgid "%s has requested your attention!"
msgstr "%s hat um Ihre Aufmerksamkeit gebeten!"
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:793
#, c-format
msgid ""
"%s has invited %s to the chat room %s:\n"
@@ -13362,12 +13476,12 @@ msgstr ""
"%s hat %s in den Chatraum %s eingeladen:\n"
"%s"
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
#, c-format
msgid "%s has invited %s to the chat room %s\n"
msgstr "%s hat %s in den Chatraum %s eingeladen\n"
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
msgid "Accept chat invitation?"
msgstr "Akzeptieren Sie die Chat-Einladung?"
@@ -13408,47 +13522,62 @@ msgstr "%s hat den Status von %s zu %s g
msgid "%s changed status from %s to %s"
msgstr "%s hat den Status von %s zu %s geändert"
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:612
#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) hat den Status von %s zu %s geändert"
+
+#: ../libpurple/status.c:623
+#, c-format
msgid "%s is now %s"
msgstr "%s ist jetzt %s"
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:625
#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) ist jetzt %s"
+
+#: ../libpurple/status.c:631
+#, c-format
msgid "%s is no longer %s"
msgstr "%s ist nicht mehr %s"
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:633
#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) ist nicht mehr %s"
+
+#: ../libpurple/status.c:1244
+#, c-format
msgid "%s became idle"
msgstr "%s wurde untätig"
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1261
#, c-format
msgid "%s became unidle"
msgstr "%s wurde tätig"
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1324
#, c-format
msgid "+++ %s became idle"
msgstr "+++ %s wurde untätig"
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1326
#, c-format
msgid "+++ %s became unidle"
msgstr "+++ %s wurde tätig"
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:701
#, c-format
msgid "%x %X"
msgstr "%x %X"
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2705
#, c-format
msgid "Error Reading %s"
msgstr "Fehler beim Lesen von %s"
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2706
#, c-format
msgid ""
"An error was encountered reading your %s. They have not been loaded, and "
@@ -13457,67 +13586,67 @@ msgstr ""
"Beim Einlesen Ihrer %s trat ein Fehler auf. Die Liste wurde nicht geladen "
"und die alte Datei wurde in %s~ umbenannt."
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:3206
msgid "Calculating..."
msgstr "Berechne..."
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3209
msgid "Unknown."
msgstr "Unbekannt."
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3235
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d Sekunde"
msgstr[1] "%d Sekunden"
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3247
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d Tag"
msgstr[1] "%d Tage"
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3255
#, c-format
msgid "%s, %d hour"
msgid_plural "%s, %d hours"
msgstr[0] "%s, %d Stunde"
msgstr[1] "%s, %d Stunden"
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3261
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d Stunde"
msgstr[1] "%d Stunden"
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3269
#, c-format
msgid "%s, %d minute"
msgid_plural "%s, %d minutes"
msgstr[0] "%s, %d Minute"
msgstr[1] "%s, %d Minuten"
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3275
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d Minute"
msgstr[1] "%d Minuten"
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3535
#, c-format
msgid "Could not open %s: Redirected too many times"
msgstr "Konnte %s nicht öffnen: Zu oft weitergeleitet"
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3572 ../libpurple/util.c:3868
#, c-format
msgid "Unable to connect to %s"
msgstr "Verbindung zu %s nicht möglich"
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3695
#, c-format
msgid ""
"Unable to allocate enough memory to hold the contents from %s. The web "
@@ -13526,17 +13655,17 @@ msgstr ""
"Nicht genug Speicher für die Inhalte von %s verfügbar. Eventuell versucht "
"der Web-Server etwas böses zu tun."
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3730
#, c-format
msgid "Error reading from %s: %s"
msgstr "Fehler beim Lesen von %s: %s"
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3761
#, c-format
msgid "Error writing to %s: %s"
msgstr "Fehler beim Schreiben von %s: %s"
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3786
#, c-format
msgid "Unable to connect to %s: %s"
msgstr "Verbindung zu %s nicht möglich: %s"
@@ -13626,7 +13755,7 @@ msgstr "SOCKS 5"
msgid "SOCKS 5"
msgstr "SOCKS 5"
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
msgid "Use Environmental Settings"
msgstr "Benutze Umgebungsvariablen"
@@ -13648,15 +13777,15 @@ msgstr "Proxy-Optionen"
msgid "Proxy Options"
msgstr "Proxy-Optionen"
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
msgid "Proxy _type:"
msgstr "Proxy-_Typ:"
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
msgid "_Host:"
msgstr "_Host:"
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
msgid "_Port:"
msgstr "_Port:"
@@ -13664,7 +13793,7 @@ msgstr "_Benutzer:"
msgid "_Username:"
msgstr "_Benutzer:"
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
msgid "Pa_ssword:"
msgstr "P_asswort:"
@@ -13725,11 +13854,34 @@ msgstr ""
"Kontaktlistenfenster zu diesem Dialog zurückkehren und Konten hinzufügen, "
"bearbeiten oder löschen"
-#: ../pidgin/gtkblist.c:767
+#: ../pidgin/gtkblist.c:524
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "Sie haben %d Kontakt als %s benannt. Möchten Sie diese mischen?"
+msgstr[1] "Sie haben %d Kontakte als %s benannt. Möchten Sie diese mischen?"
+
+#: ../pidgin/gtkblist.c:525
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+"Das Mischen dieser Kontakte bewirkt, dass diese sich gemeinsam einen "
+"einzelnen Eintrag in der Buddy-Liste teilen. Sie können sie wieder "
+"auseinandernehmen, wenn Sie auf 'Expandieren' im Kontextmenü des Kontakts "
+"klicken"
+
+#: ../pidgin/gtkblist.c:527
+msgid "_Merge"
+msgstr "_Mischen"
+
+#: ../pidgin/gtkblist.c:924
msgid "Join a Chat"
msgstr "Chat betreten"
-#: ../pidgin/gtkblist.c:788
+#: ../pidgin/gtkblist.c:945
msgid ""
"Please enter the appropriate information about the chat you would like to "
"join.\n"
@@ -13737,95 +13889,108 @@ msgstr ""
"Bitte geben Sie geeignete Informationen über den Chat ein, den Sie betreten "
"wollen.\n"
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6188
+#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:396
msgid "_Account:"
msgstr "_Konto:"
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
#: ../pidgin/gtkprivacy.c:617
msgid "_Block"
msgstr "_Sperren"
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1245
msgid "Un_block"
msgstr "_Sperrung aufheben"
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1288
+msgid "Move to"
+msgstr "Verschieben nach"
+
+#: ../pidgin/gtkblist.c:1328
msgid "Get _Info"
msgstr "_Info abrufen"
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
msgid "I_M"
msgstr "I_M"
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Datei versenden"
+#: ../pidgin/gtkblist.c:1337
+msgid "_Send File..."
+msgstr "Datei ver_senden..."
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "B_uddy-Alarm hinzufügen"
+#: ../pidgin/gtkblist.c:1344
+msgid "Add Buddy _Pounce..."
+msgstr "Buddy-_Alarm hinzufügen..."
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
msgid "View _Log"
msgstr "Mi_tschnitt anzeigen"
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1359
+msgid "Hide when offline"
+msgstr "Verstecken, wenn im Offline-Modus"
+
+#: ../pidgin/gtkblist.c:1359
+msgid "Show when offline"
+msgstr "Anzeigen, wenn im Offline-Modus"
+
+#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
msgid "_Alias..."
msgstr "_Alias..."
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
msgid "_Remove"
msgstr "_Entfernen"
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "Buddy _hinzufügen"
+#: ../pidgin/gtkblist.c:1434
+msgid "Add _Buddy..."
+msgstr "_Buddy hinzufügen..."
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "C_hat hinzufügen"
+#: ../pidgin/gtkblist.c:1437
+msgid "Add C_hat..."
+msgstr "_Chat hinzufügen..."
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1440
msgid "_Delete Group"
msgstr "Gruppe _löschen"
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1442
msgid "_Rename"
msgstr "_Umbenennen"
#. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
msgid "_Join"
msgstr "_Betreten"
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1464
msgid "Auto-Join"
msgstr "Automatisch beitreten"
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1466
+msgid "Persistent"
+msgstr "Persistent"
+
+#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
msgid "_Collapse"
msgstr "_Zusammenklappen"
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1532
msgid "_Expand"
msgstr "A_usklappen"
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
+#: ../pidgin/gtkblist.c:4885 ../pidgin/gtkblist.c:4898
msgid "/Tools/Mute Sounds"
msgstr "/Werkzeuge/Stummschalten"
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
+#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4903
+#: ../pidgin/gtkpounce.c:437
msgid ""
"You are not currently signed on with an account that can add that buddy."
msgstr ""
@@ -13833,138 +13998,138 @@ msgstr ""
"kann, um diesen Buddy hinzuzufügen."
#. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3067
msgid "/_Buddies"
msgstr "/_Buddys"
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3068
msgid "/Buddies/New Instant _Message..."
msgstr "/Buddys/_Neue Sofortnachricht..."
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3069
msgid "/Buddies/Join a _Chat..."
msgstr "/Buddys/Einen _Chat betreten..."
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3070
msgid "/Buddies/Get User _Info..."
msgstr "/Buddys/B_enutzer-Info abrufen..."
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3071
msgid "/Buddies/View User _Log..."
msgstr "/Buddys/Benutzer-_Mitschnitt ansehen..."
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:3073
msgid "/Buddies/Show"
msgstr "/Buddys/Anzeigen"
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:3074
msgid "/Buddies/Show/_Offline Buddies"
msgstr "/Buddys/Anzeigen/_Offline-Buddys"
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:3075
msgid "/Buddies/Show/_Empty Groups"
msgstr "/Buddys/Anzeigen/_leere Gruppen"
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:3076
msgid "/Buddies/Show/Buddy _Details"
msgstr "/Buddys/Anzeigen/Buddy-_Details"
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:3077
msgid "/Buddies/Show/Idle _Times"
msgstr "/Buddys/Anzeigen/Untätigkeitszei_ten"
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:3078
msgid "/Buddies/Show/_Protocol Icons"
msgstr "/Buddys/Anzeigen/_Protokoll-Icons"
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3079
msgid "/Buddies/_Sort Buddies"
msgstr "/Buddys/Buddys _sortieren"
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3081
msgid "/Buddies/_Add Buddy..."
msgstr "/Buddys/B_uddy hinzufügen..."
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3082
msgid "/Buddies/Add C_hat..."
msgstr "/Buddys/C_hat hinzufügen..."
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3083
msgid "/Buddies/Add _Group..."
msgstr "/Buddys/_Gruppe hinzufügen..."
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3085
msgid "/Buddies/_Quit"
msgstr "/Buddys/_Beenden"
#. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3088
msgid "/_Accounts"
msgstr "/_Konten"
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Konten/Hinzufügen\\/Ändern"
+#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6889
+msgid "/Accounts/Manage"
+msgstr "/Konten/Verwalten"
#. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3092
msgid "/_Tools"
msgstr "/_Werkzeuge"
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3093
msgid "/Tools/Buddy _Pounces"
msgstr "/Werkzeuge/Buddy-_Alarm"
-#: ../pidgin/gtkblist.c:2896
+#: ../pidgin/gtkblist.c:3094
msgid "/Tools/_Certificates"
msgstr "/Werkzeuge/_Zertifikate"
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:3095
msgid "/Tools/Plu_gins"
msgstr "/Werkzeuge/Plu_gins"
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3096
msgid "/Tools/Pr_eferences"
msgstr "/Werkzeuge/_Einstellungen"
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3097
msgid "/Tools/Pr_ivacy"
msgstr "/Werkzeuge/Pri_vatsphäre"
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3099
msgid "/Tools/_File Transfers"
msgstr "/Werkzeuge/_Dateiübertragungen"
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3100
msgid "/Tools/R_oom List"
msgstr "/Werkzeuge/Chat_räume"
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3101
msgid "/Tools/System _Log"
msgstr "/Werkzeuge/_System-Mitschnitt"
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3103
msgid "/Tools/Mute _Sounds"
msgstr "/Werkzeuge/_Stummschalten"
#. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3105
msgid "/_Help"
msgstr "/_Hilfe"
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3106
msgid "/Help/Online _Help"
msgstr "/Hilfe/Online-_Hilfe"
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3107
msgid "/Help/_Debug Window"
msgstr "/Hilfe/_Debug-Fenster"
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
msgid "/Help/_About"
msgstr "/Hilfe/Ü_ber"
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3140
#, c-format
msgid ""
"\n"
@@ -13973,167 +14138,163 @@ msgstr ""
"\n"
"<b>Konto:</b> %s"
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3218
msgid "Buddy Alias"
msgstr "Buddy-Alias"
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3247
msgid "Logged In"
msgstr "Angemeldet"
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3293
msgid "Last Seen"
msgstr "Zuletzt gesehen"
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3314
msgid "Spooky"
msgstr "Gruselig"
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3316
msgid "Awesome"
msgstr "Großartig"
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3318
msgid "Rockin'"
msgstr "Abgefahren"
-#: ../pidgin/gtkblist.c:3453
+#: ../pidgin/gtkblist.c:3657
#, c-format
msgid "Idle %dd %dh %02dm"
msgstr "Untätig %dd %dh %02dm"
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3659
#, c-format
msgid "Idle %dh %02dm"
msgstr "Untätig %dh %02dm"
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3661
#, c-format
msgid "Idle %dm"
msgstr "Untätig %dm"
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3806
msgid "/Buddies/New Instant Message..."
msgstr "/Buddys/Neue Sofortnachricht..."
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3807 ../pidgin/gtkblist.c:3840
msgid "/Buddies/Join a Chat..."
msgstr "/Buddys/Chat betreten..."
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3808
msgid "/Buddies/Get User Info..."
msgstr "/Buddys/Benutzer-Info abrufen..."
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3809
msgid "/Buddies/Add Buddy..."
msgstr "/Buddys/Buddy hinzufügen..."
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3810 ../pidgin/gtkblist.c:3843
msgid "/Buddies/Add Chat..."
msgstr "/Buddys/Chat hinzufügen..."
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3811
msgid "/Buddies/Add Group..."
msgstr "/Buddys/Gruppe hinzufügen..."
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3846
msgid "/Tools/Privacy"
msgstr "/Werkzeuge/Privatsphäre"
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3849
msgid "/Tools/Room List"
msgstr "/Werkzeuge/Chaträume"
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3944 ../pidgin/gtkdocklet.c:153
#, c-format
msgid "%d unread message from %s\n"
msgid_plural "%d unread messages from %s\n"
msgstr[0] "%d ungelesene Nachricht von %s\n"
msgstr[1] "%d ungelesene Nachrichten von %s\n"
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4104
msgid "Manually"
msgstr "Manuell"
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "Alphabetisch"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4107
msgid "By status"
msgstr "Nach Status"
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4108
msgid "By log size"
msgstr "Nach Größe der Logs"
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4313 ../pidgin/gtkconn.c:180
#, c-format
msgid "%s disconnected"
msgstr "%s abgemeldet"
-#: ../pidgin/gtkblist.c:4067
+#: ../pidgin/gtkblist.c:4349
#, c-format
msgid "<span color=\"red\">%s disconnected: %s</span>"
msgstr "<span color=\"red\">%s abgemeldet: %s</span>"
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4501
msgid "<b>Username:</b>"
msgstr "<b>Benutzername:</b>"
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4508
msgid "<b>Password:</b>"
msgstr "<b>Passwort:</b>"
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4519
msgid "_Login"
msgstr "_Anmelden"
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4602
msgid "/Accounts"
msgstr "/Konten"
#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4616
+#, c-format
msgid ""
"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
"\n"
"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
"able to sign on, set your status, and talk to your friends."
msgstr ""
"<span weight='bold' size='larger'>Willkommen bei %s!</span>\n"
"\n"
-"Sie haben keine Konten aktiviert. Aktivieren Sie Ihre IM-Konten im "
-"<b>Konten</b>-Fenster über <b>Konten->Hinzufügen/Bearbeiten</b>. Wenn Sie "
-"Konten aktiviert haben, können Sie sich anmelden, Ihren Status setzen und "
-"mit Ihren Freunden reden."
+"Sie haben keine Konten aktiviert. Aktivieren Sie Ihre IM-Konten vom "
+"<b>Konten</b>-Fenster über <b>Konten->Verwalten</b>. Wenn Sie Konten "
+"aktiviert haben, können Sie sich anmelden, Ihren Status setzen und mit Ihren "
+"Freunden reden."
#. set the Show Offline Buddies option. must be done
#. * after the treeview or faceprint gets mad. -Robot101
#.
-#: ../pidgin/gtkblist.c:4597
+#: ../pidgin/gtkblist.c:4879
msgid "/Buddies/Show/Offline Buddies"
msgstr "/Buddys/Anzeigen/Offline-Buddys"
-#: ../pidgin/gtkblist.c:4600
+#: ../pidgin/gtkblist.c:4882
msgid "/Buddies/Show/Empty Groups"
msgstr "/Buddys/Anzeigen/leere Gruppen"
-#: ../pidgin/gtkblist.c:4606
+#: ../pidgin/gtkblist.c:4888
msgid "/Buddies/Show/Buddy Details"
msgstr "/Buddys/Anzeigen/Buddy-Details"
-#: ../pidgin/gtkblist.c:4609
+#: ../pidgin/gtkblist.c:4891
msgid "/Buddies/Show/Idle Times"
msgstr "/Buddys/Anzeigen/Untätigkeitszeiten"
-#: ../pidgin/gtkblist.c:4612
+#: ../pidgin/gtkblist.c:4894
msgid "/Buddies/Show/Protocol Icons"
msgstr "/Buddys/Anzeigen/Protokoll-Icons"
-#: ../pidgin/gtkblist.c:5507
+#: ../pidgin/gtkblist.c:5796
msgid ""
"Please enter the screen name of the person you would like to add to your "
"buddy list. You may optionally enter an alias, or nickname, for the buddy. "
@@ -14144,26 +14305,31 @@ msgstr ""
"Buddy eingeben. Der Alias wird anstelle des Benutzernamens ausgegeben, wann "
"immer es möglich ist.\n"
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:5819
+msgid "A_ccount:"
+msgstr "_Konto:"
+
#. End of account box
-#: ../pidgin/gtkblist.c:5542
+#: ../pidgin/gtkblist.c:5831
msgid "_Screen name:"
msgstr "_Benutzername:"
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkblist.c:5853 ../pidgin/gtkblist.c:6209
msgid "A_lias:"
msgstr "A_lias:"
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6121
msgid "This protocol does not support chat rooms."
msgstr "Dieses Protokoll unterstützt keine Chaträume."
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:6137
msgid ""
"You are not currently signed on with any protocols that have the ability to "
"chat."
msgstr "Sie sind derzeit mit keinem Chat-fähigen Protokoll angemeldet."
-#: ../pidgin/gtkblist.c:5883
+#: ../pidgin/gtkblist.c:6178
msgid ""
"Please enter an alias, and the appropriate information about the chat you "
"would like to add to your buddy list.\n"
@@ -14171,39 +14337,47 @@ msgstr ""
"Bitte geben Sie einen Alias und geeignete Informationen über den Chat ein, "
"den Sie in Ihre Buddy-Liste aufnehmen wollen.\n"
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6237
+msgid "Autojoin when account becomes online."
+msgstr "Automatisch beitreten, wenn das Konto online geht."
+
+#: ../pidgin/gtkblist.c:6238
+msgid "Hide chat when the window is closed."
+msgstr "Chat verstecken, wenn das Fenster geschlossen wird."
+
+#: ../pidgin/gtkblist.c:6264
msgid "Please enter the name of the group to be added."
msgstr "Bitte geben Sie den Namen der Gruppe ein, die hinzugefügt werden soll."
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6909
msgid "<PurpleMain>/Accounts/"
msgstr "<PurpleMain>/Konten"
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:6933
msgid "_Edit Account"
msgstr "Konto _bearbeiten"
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:6946 ../pidgin/gtkconv.c:3136
msgid "No actions available"
msgstr "Keine Aktionen verfügbar"
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:6954
msgid "_Disable"
msgstr "_Deaktivieren"
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:6966
msgid "Enable Account"
msgstr "Konten aktivieren"
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:6972
msgid "<PurpleMain>/Accounts/Enable Account"
msgstr "<PurpleMain>/Konten/Konto aktivieren"
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7021
msgid "/Tools"
msgstr "/Werkzeuge"
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7091
msgid "/Buddies/Sort Buddies"
msgstr "/Buddys/Buddys sortieren"
@@ -14212,7 +14386,7 @@ msgstr "SSL-Server"
msgid "SSL Servers"
msgstr "SSL-Server"
-#: ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkconn.c:181
#, c-format
msgid ""
"%s\n"
@@ -14225,27 +14399,27 @@ msgstr ""
"%s wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler "
"behoben und das Konto wieder aktiviert haben."
-#: ../pidgin/gtkconv.c:482
+#: ../pidgin/gtkconv.c:523
msgid "Unknown command."
msgstr "Unbekanntes Kommando."
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:795 ../pidgin/gtkconv.c:821
msgid "That buddy is not on the same protocol as this chat."
msgstr "Der Buddy hat nicht das gleiche Protokoll wie dieser Chat."
-#: ../pidgin/gtkconv.c:774
+#: ../pidgin/gtkconv.c:815
msgid ""
"You are not currently signed on with an account that can invite that buddy."
msgstr ""
"Sie sind im Moment nicht mit einem Konto angemeldet, welches benutzt werden "
"kann, um diesen Buddy einzuladen."
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:868
msgid "Invite Buddy Into Chat Room"
msgstr "Buddy in einen Chatraum einladen"
#. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
+#: ../pidgin/gtkconv.c:898
msgid ""
"Please enter the name of the user you wish to invite, along with an optional "
"invite message."
@@ -14253,188 +14427,183 @@ msgstr ""
"Bitte geben Sie den Benutzernamen der Person ein, die Sie einladen möchten "
"zusammen mit einer optionalen Einladungsnachricht."
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:919
msgid "_Buddy:"
msgstr "_Buddy:"
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:930 ../pidgin/gtksavedstatuses.c:1194
#: ../pidgin/gtksavedstatuses.c:1528
msgid "_Message:"
msgstr "_Nachricht:"
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "Konnte die Datei nicht öffnen."
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:994
#, c-format
msgid "<h1>Conversation with %s</h1>\n"
msgstr "<h1>Unterhaltung mit %s</h1>\n"
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:1032
msgid "Save Conversation"
msgstr "Unterhaltung speichern"
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
msgid "Find"
msgstr "Suchen"
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1204 ../pidgin/gtkdebug.c:195
msgid "_Search for:"
msgstr "_Suche nach:"
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1675
msgid "Un-Ignore"
msgstr "Nicht Ignorieren"
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1678
msgid "Ignore"
msgstr "Ignorieren"
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1698
msgid "Get Away Message"
msgstr "Neue Abwesenheitsnachricht abholen"
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1721
msgid "Last said"
msgstr "Zuletzt gesagt"
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2665
msgid "Unable to save icon file to disk."
msgstr "Kann Icon-Datei nicht auf die Festplatte speichern."
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2716
msgid "Save Icon"
msgstr "Icon speichern"
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2768
msgid "Animate"
msgstr "Animieren"
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2773
msgid "Hide Icon"
msgstr "Icon verbergen"
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2776
msgid "Save Icon As..."
msgstr "Icon speichern unter..."
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2780
msgid "Set Custom Icon..."
msgstr "Setze benutzerdefiniertes Icon..."
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2793
msgid "Remove Custom Icon"
msgstr "Benutzerdefiniertes Icon entfernen"
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2924
msgid "Show All"
msgstr "Alle anzeigen"
#. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2943
msgid "/_Conversation"
msgstr "/_Unterhaltung"
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2945
msgid "/Conversation/New Instant _Message..."
msgstr "/Unterhaltung/_Neue Sofortnachricht..."
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2950
msgid "/Conversation/_Find..."
msgstr "/Unterhaltung/_Finden..."
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2952
msgid "/Conversation/View _Log"
msgstr "/Unterhaltung/Betrachte _Mitschnitt"
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2953
msgid "/Conversation/_Save As..."
msgstr "/Unterhaltung/_Speichern als..."
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2955
msgid "/Conversation/Clea_r Scrollback"
msgstr "/Unterhaltung/_Leeren"
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2959
msgid "/Conversation/Se_nd File..."
msgstr "/Unterhaltung/Datei _senden..."
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2960
msgid "/Conversation/Add Buddy _Pounce..."
msgstr "/Unterhaltung/Buddy-Alar_m hinzufügen..."
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2962
msgid "/Conversation/_Get Info"
msgstr "/Unterhaltung/B_enutzer-Info abrufen"
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2964
msgid "/Conversation/In_vite..."
msgstr "/Unterhaltung/_Einladen..."
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2966
msgid "/Conversation/M_ore"
msgstr "/Unterhaltung/M_ehr"
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2970
msgid "/Conversation/Al_ias..."
msgstr "/Unterhaltung/Al_ias..."
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2972
msgid "/Conversation/_Block..."
msgstr "/Unterhaltung/_Blockieren..."
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2974
msgid "/Conversation/_Unblock..."
msgstr "/Unterhaltung/_Entsperren..."
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2976
msgid "/Conversation/_Add..."
msgstr "/Unterhaltung/_Hinzufügen..."
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2978
msgid "/Conversation/_Remove..."
msgstr "/Unterhaltung/_Entfernen..."
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2983
msgid "/Conversation/Insert Lin_k..."
msgstr "/Unterhaltung/Lin_k einfügen..."
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2985
msgid "/Conversation/Insert Imag_e..."
msgstr "/Unterhaltung/Bil_d einfügen..."
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2991
msgid "/Conversation/_Close"
msgstr "/Unterhaltung/S_chließen"
#. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:2995
msgid "/_Options"
msgstr "/_Optionen"
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:2996
msgid "/Options/Enable _Logging"
msgstr "/Optionen/Schalte _Mitschnitt ein"
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:2997
msgid "/Options/Enable _Sounds"
msgstr "/Optionen/Schalte _Klänge ein"
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:2999
msgid "/Options/Show Formatting _Toolbars"
msgstr "/Optionen/Zeige _Werkzeugleisten für Formatierung"
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:3000
msgid "/Options/Show Ti_mestamps"
msgstr "/Optionen/Zeige Zeitste_mpel"
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3124
msgid "/Conversation/More"
msgstr "/Unterhaltung/Mehr"
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3180
msgid "/Options"
msgstr "/Optionen"
@@ -14443,173 +14612,173 @@ msgstr "/Optionen"
#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
#. * the 'Conversation' menu pops up because the entries can change after the
#. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3215 ../pidgin/gtkconv.c:3247
msgid "/Conversation"
msgstr "/Unterhaltung"
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3255
msgid "/Conversation/View Log"
msgstr "/Unterhaltung/Betrachte Mitschnitt"
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3261
msgid "/Conversation/Send File..."
msgstr "/Unterhaltung/Datei senden ..."
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3265
msgid "/Conversation/Add Buddy Pounce..."
msgstr "/Unterhaltung/Buddy-Alarm hinzufügen..."
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3271
msgid "/Conversation/Get Info"
msgstr "/Unterhaltung/Info abrufen"
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3275
msgid "/Conversation/Invite..."
msgstr "/Unterhaltung/Einladen ..."
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3281
msgid "/Conversation/Alias..."
msgstr "/Unterhaltung/Alias..."
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3285
msgid "/Conversation/Block..."
msgstr "/Unterhaltung/Blockieren..."
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3289
msgid "/Conversation/Unblock..."
msgstr "/Unterhaltung/Entsperren..."
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3293
msgid "/Conversation/Add..."
msgstr "/Unterhaltung/Hinzufügen..."
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3297
msgid "/Conversation/Remove..."
msgstr "/Unterhaltung/Entfernen..."
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3303
msgid "/Conversation/Insert Link..."
msgstr "/Unterhaltung/Link einfügen..."
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3307
msgid "/Conversation/Insert Image..."
msgstr "/Unterhaltung/Bild einfügen..."
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3313
msgid "/Options/Enable Logging"
msgstr "/Optionen/Schalte Mitschnitt ein"
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3316
msgid "/Options/Enable Sounds"
msgstr "/Optionen/Schalte Klänge ein"
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3329
msgid "/Options/Show Formatting Toolbars"
msgstr "/Optionen/Zeige Werkzeugleisten für Formatierung"
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3332
msgid "/Options/Show Timestamps"
msgstr "/Optionen/Zeige Zeitstempel"
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3409 ../pidgin/gtkconv.c:3451
msgid "User is typing..."
msgstr "Benutzer tippt gerade..."
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3454
msgid "User has typed something and stopped"
msgstr "Benutzer hat etwas getippt und wartet nun"
#. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "_Senden an"
+#: ../pidgin/gtkconv.c:3637 ../pidgin/gtkconv.c:8103
+msgid "S_end To"
+msgstr "S_enden an"
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:4349
msgid "_Send"
msgstr "Ab_schicken"
#. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4453
msgid "0 people in room"
msgstr "0 Personen im Raum"
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5823 ../pidgin/gtkconv.c:5944
#, c-format
msgid "%d person in room"
msgid_plural "%d people in room"
msgstr[0] "%d Person im Raum"
msgstr[1] "%d Personen im Raum"
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6550 ../pidgin/gtkstatusbox.c:660
msgid "Typing"
msgstr "Tippt gerade"
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6554
msgid "Stopped Typing"
msgstr "Tippen gestoppt"
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6557
msgid "Nick Said"
msgstr "Spitzname gesagt"
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6560 ../pidgin/gtkdocklet.c:492
msgid "Unread Messages"
msgstr "Ungelesene Nachrichten"
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6563
msgid "New Event"
msgstr "Neue Ereignisse"
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7654
msgid "clear: Clears all conversation scrollbacks."
msgstr "clear: Leert alle Gesprächsfenster."
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7817
msgid "Confirm close"
msgstr "Schließen bestätigen"
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7849
msgid "You have unread messages. Are you sure you want to close the window?"
msgstr ""
"Sie haben ungelesene Nachrichten. Wollen Sie das Fenster wirklich schließen?"
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8436
msgid "Close other tabs"
msgstr "Andere Reiter schließen"
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8442
msgid "Close all tabs"
msgstr "Alle Reiter schließen"
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8450
msgid "Detach this tab"
msgstr "Diesen Reiter ablösen"
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8456
msgid "Close this tab"
msgstr "Diesen Reiter schließen"
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:8951
msgid "Close conversation"
msgstr "Unterhaltung schließen"
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9553
msgid "Last created window"
msgstr "Letztes erstelltes Fenster"
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9555
msgid "Separate IM and Chat windows"
msgstr "Getrennte IM- und Chat-Fenster"
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9557 ../pidgin/gtkprefs.c:1417
msgid "New window"
msgstr "Neues Fenster"
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9559
msgid "By group"
msgstr "Nach Gruppe"
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9561
msgid "By account"
msgstr "Nach Konto"
@@ -14898,9 +15067,8 @@ msgstr "Kurdisch"
msgstr "Kurdisch"
#: ../pidgin/gtkdialogs.c:185
-#, fuzzy
msgid "Lao"
-msgstr "Löwe"
+msgstr "Laotisch"
#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
#: ../pidgin/gtkdialogs.c:253
@@ -15039,16 +15207,15 @@ msgstr ""
"complete list of contributors. We provide no warranty for this program."
"<BR><BR>"
msgstr ""
-"%s ist ein grafischer modularer Nachrichtendienst, basierend auf "
-"libpurple, , der AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu und QQ "
-"gleichzeitig unterstützt. Er wird mit GTK+ entwickelt.<BR><BR>Sie können "
-"das Programm nach den Bedingungen der GPL (Version 2 oder später) "
-"modifizieren und weitergeben. Eine Kopie der GPL ist in der Datei 'COPYING' "
-"enthalten, die mit %s ausgeliefert wird. %s wird von seinen Mitwirkenden "
-"urheberrechtlich geschützt. Die Datei 'COPYRIGHT' enthält die komplette "
-"Liste der Mitwirkenden. Wir übernehmen keine Haftung für dieses Programm."
-"<BR><BR>"
+"%s ist ein grafischer modularer Nachrichtendienst, basierend auf libpurple, "
+"der AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, "
+"Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu und QQ gleichzeitig "
+"unterstützt. Er wird mit GTK+ entwickelt.<BR><BR>Sie können das Programm "
+"nach den Bedingungen der GPL (Version 2 oder später) modifizieren und "
+"weitergeben. Eine Kopie der GPL ist in der Datei 'COPYING' enthalten, die "
+"mit %s ausgeliefert wird. %s wird von seinen Mitwirkenden urheberrechtlich "
+"geschützt. Die Datei 'COPYRIGHT' enthält die komplette Liste der "
+"Mitwirkenden. Wir übernehmen keine Haftung für dieses Programm.<BR><BR>"
#: ../pidgin/gtkdialogs.c:418
#, c-format
@@ -15247,8 +15414,7 @@ msgstr "Stummschalten"
msgstr "Stummschalten"
#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
+msgid "Blink on New Message"
msgstr "Bei neuen Nachrichten blinken"
#: ../pidgin/gtkdocklet.c:542
@@ -15345,7 +15511,7 @@ msgstr "Einfügen als normaler _Text"
msgid "Paste as Plain _Text"
msgstr "Einfügen als normaler _Text"
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1195
msgid "_Reset formatting"
msgstr "Formatierung _zurücksetzen"
@@ -15465,7 +15631,7 @@ msgstr "Link einfügen"
msgid "Insert Link"
msgstr "Link einfügen"
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1263
msgid "_Insert"
msgstr "_Einfügen"
@@ -15487,7 +15653,7 @@ msgstr "Lächeln!"
msgid "Smile!"
msgstr "Lächeln!"
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1220
msgid "_Font"
msgstr "_Schrift"
@@ -15547,65 +15713,65 @@ msgstr "Smiley einfügen"
msgid "Insert Smiley"
msgstr "Smiley einfügen"
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1180
msgid "<b>_Bold</b>"
msgstr "<b>_Fett</b>"
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1181
msgid "<i>_Italic</i>"
msgstr "<i>_Kursiv</i>"
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1182
msgid "<u>_Underline</u>"
msgstr "<u>_Unterstrichen</u>"
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1183
msgid "<span strikethrough='true'>Strikethrough</span>"
msgstr "<span strikethrough='true'>Durchgestrichen</span>"
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1184
msgid "<span size='larger'>_Larger</span>"
msgstr "<span size='larger'>_Größer</span>"
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1186
msgid "_Normal"
msgstr "_Normal"
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1188
msgid "<span size='smaller'>_Smaller</span>"
msgstr "<span size='smaller'>_Kleiner</span>"
#. If we want to show the formatting for the following items, we would
#. * need to update them when formatting changes. The above items don't need
#. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1192
msgid "_Font face"
msgstr "_Schriftart"
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1193
msgid "Foreground _color"
msgstr "_Vordergrundfarbe"
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1194
msgid "Bac_kground color"
msgstr "_Hintergrundfarbe"
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "_Smiley"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+#: ../pidgin/gtkimhtmltoolbar.c:1271
msgid "_Image"
msgstr "_Bild"
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+#: ../pidgin/gtkimhtmltoolbar.c:1277
msgid "_Link"
msgstr "_Link"
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1283
msgid "_Horizontal rule"
msgstr "_Horizontale Linie"
+#: ../pidgin/gtkimhtmltoolbar.c:1305
+msgid "_Smile!"
+msgstr "_Lächeln!"
+
#: ../pidgin/gtklog.c:293
#, c-format
msgid ""
@@ -15703,7 +15869,7 @@ msgstr "%s %s. Versuchen Sie `%s -h' fü
msgstr "%s %s. Versuchen Sie `%s -h' für weitere Informationen.\n"
#: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s %s\n"
"Usage: %s [OPTION]...\n"
@@ -15715,25 +15881,27 @@ msgid ""
" -n, --nologin don't automatically login\n"
" -l, --login[=NAME] automatically login (optional argument NAME specifies\n"
" account(s) to use, separated by commas)\n"
+" --display=DISPLAY X display to use\n"
" -v, --version display the current version and exit\n"
msgstr ""
"%s %s\n"
"Benutzung: %s [OPTION]...\n"
"\n"
" -c, --config=VERZ benutze VERZ als Konfigurationsverzeichnis\n"
-" -d, --debug drucke Debugging-Meldungen nach stdout\n"
+" -d, --debug gibt Debugging-Meldungen nach stdout aus\n"
" -h, --help zeigt diese Hilfe und beendet das Programm\n"
" -m, --multiple mehrere Instanzen erlauben\n"
" -n, --nologin nicht automatisch anmelden\n"
" -l, --login[=NAME] automatische Anmeldung (optionales Argument \n"
-" NAME bestimmt Konto(n), die benutzt werden \n"
+" NAME bestimmt Konto(n), die benutzt werden\n"
" sollen, getrennt durch Kommata)\n"
+" --display=DISPLAY zu benutzendes X-Display\n"
" -v, --version zeigt aktuelle Version und beendet das Programm\n"
-#: ../pidgin/gtkmain.c:512
-#, fuzzy, c-format
+#: ../pidgin/gtkmain.c:516
+#, c-format
msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+"%s %s has segfaulted and attempted to dump a core file.\n"
"This is a bug in the software and has happened through\n"
"no fault of your own.\n"
"\n"
@@ -15751,7 +15919,7 @@ msgstr ""
"on other protocols is at\n"
"%swiki/DeveloperPages\n"
msgstr ""
-"%s hat einen Speicherzugriffsfehler festgestellt und \n"
+"%s %s hat einen Speicherzugriffsfehler festgestellt und \n"
"versucht, eine Core-Datei zu schreiben. Dies ist ein \n"
"Fehler im Programm und kein Fehler von Ihnen.\n"
"\n"
@@ -15772,7 +15940,7 @@ msgstr ""
#. Translators may want to transliterate the name.
#. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
msgid "Pidgin"
msgstr "Pidgin"
@@ -15792,28 +15960,28 @@ msgstr[1] "%s hat %d neue Nachrichten."
msgstr[1] "%s hat %d neue Nachrichten."
#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>Sie haben %d neue E-Mail.</b>"
-msgstr[1] "<b>Sie haben %d neue E-Mails.</b>"
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>%d neue E-Mail.</b>"
+msgstr[1] "<b>%d neue E-Mails.</b>"
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:991
#, c-format
msgid "The browser command \"%s\" is invalid."
msgstr "Das Browser-Kommando „%s“ ist falsch."
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:993 ../pidgin/gtknotify.c:1005
+#: ../pidgin/gtknotify.c:1018 ../pidgin/gtknotify.c:1146
msgid "Unable to open URL"
msgstr "Kann die URL nicht öffnen"
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1003 ../pidgin/gtknotify.c:1016
#, c-format
msgid "Error launching \"%s\": %s"
msgstr "Fehler beim Aufruf von „%s“: %s"
-#: ../pidgin/gtknotify.c:1145
+#: ../pidgin/gtknotify.c:1147
msgid ""
"The 'Manual' browser command has been chosen, but no command has been set."
msgstr ""
@@ -15866,95 +16034,95 @@ msgstr "Wählen Sie eine Datei"
msgstr "Wählen Sie eine Datei"
#. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:539
msgid "Pounce on Whom"
msgstr "Bei wem alarmieren"
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:566
msgid "_Buddy name:"
msgstr "_Buddy-Name:"
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:600
msgid "Si_gns on"
msgstr "_sich anmeldet"
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:602
msgid "Signs o_ff"
msgstr "sich abmel_det"
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:604
msgid "Goes a_way"
msgstr "_hinausgeht"
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:606
msgid "Ret_urns from away"
msgstr "wi_eder anwesend ist"
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:608
msgid "Becomes _idle"
msgstr "_untätig wird"
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:610
msgid "Is no longer i_dle"
msgstr "nicht meh_r untätig ist"
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:612
msgid "Starts _typing"
msgstr "zu _tippen beginnt"
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:614
msgid "P_auses while typing"
msgstr "beim Tippen an_hält"
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:616
msgid "Stops t_yping"
msgstr "aufhört _zu tippen"
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:618
msgid "Sends a _message"
msgstr "eine _Nachricht sendet"
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:661
msgid "Ope_n an IM window"
msgstr "Gesprächsfenster ö_ffnen"
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:663
msgid "_Pop up a notification"
msgstr "_Popup-Benachrichtigung"
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:665
msgid "Send a _message"
msgstr "_Nachricht senden"
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:667
msgid "E_xecute a command"
msgstr "Befeh_l ausführen"
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:669
msgid "P_lay a sound"
msgstr "einen _Klang abspielen"
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:675
msgid "Brows_e..."
msgstr "Aus_wählen..."
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:677
msgid "Br_owse..."
msgstr "Aus_wählen..."
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:678
msgid "Pre_view"
msgstr "_Vorschau"
-#: ../pidgin/gtkpounce.c:798
+#: ../pidgin/gtkpounce.c:805
msgid "P_ounce only when my status is not Available"
msgstr "Nur _alarmieren, wenn ich nicht verfügbar bin"
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:810
msgid "_Recurring"
msgstr "_Wiederkehrend"
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1253
msgid "Pounce Target"
msgstr "Alarm-Ziel"
@@ -16003,7 +16171,7 @@ msgstr "_Neue IM-Gespräche verstecken:"
msgid "_Hide new IM conversations:"
msgstr "_Neue IM-Gespräche verstecken:"
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
msgid "When away"
msgstr "Bei Abwesenheit"
@@ -16056,55 +16224,59 @@ msgstr "Zeige _Formatierung bei ankommen
msgid "Show _formatting on incoming messages"
msgstr "Zeige _Formatierung bei ankommenden Nachrichten"
-#: ../pidgin/gtkprefs.c:998
+#: ../pidgin/gtkprefs.c:997
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Schließe IMs sofort, wenn der Reiter geschlossen wird"
+
+#: ../pidgin/gtkprefs.c:1000
msgid "Show _detailed information"
msgstr "_Detaillierte Informationen anzeigen"
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:1002
msgid "Enable buddy ic_on animation"
msgstr "Buddy-Ic_on-Animation aktivieren"
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1009
msgid "_Notify buddies that you are typing to them"
msgstr "Buddys be_nachrichtigen, dass Sie ihnen schreiben"
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1012
msgid "Highlight _misspelled words"
msgstr "_Falsch geschriebene Wörter hervorheben"
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1016
msgid "Use smooth-scrolling"
msgstr "Weiches Scrollen aktivieren"
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1019
msgid "F_lash window when IMs are received"
msgstr "Fenster b_linkt, wenn Nachrichten empfangen werden"
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1021
msgid "Minimi_ze new conversation windows"
msgstr "Neue Gesprächsfenster mi_nimieren"
-#: ../pidgin/gtkprefs.c:1023
+#: ../pidgin/gtkprefs.c:1025
msgid "Font"
msgstr "Schriftart"
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1027
msgid "Use document font from _theme"
msgstr "Benutze Dokumentenschriftart des _Themas"
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1029
msgid "Use font from _theme"
msgstr "Benutze Schriftart des _Themas"
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1031
msgid "Conversation _font:"
msgstr "Gesprächsschri_ftart:"
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1045
msgid "Default Formatting"
msgstr "Standard-Formatierung"
-#: ../pidgin/gtkprefs.c:1062
+#: ../pidgin/gtkprefs.c:1064
msgid ""
"This is how your outgoing message text will appear when you use protocols "
"that support formatting."
@@ -16112,119 +16284,119 @@ msgstr ""
"So wird der ausgehende Nachrichtentext aussehen, wenn Sie "
"Protokollebenutzen, die Formatierung unterstützen."
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1130
msgid "ST_UN server:"
msgstr "ST_UN Server:"
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1142
msgid "<span style=\"italic\">Example: stunserver.org</span>"
msgstr "<span style=\"italic\">Beispiel: stunserver.org</span>"
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1146
msgid "_Autodetect IP address"
msgstr "IP-Adresse _automatisch erkennen"
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1155
msgid "Public _IP:"
msgstr "Öffentliche _IP:"
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
msgid "Ports"
msgstr "Ports"
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
msgid "_Manually specify range of ports to listen on"
msgstr "Port-Bereich, auf dem gehört werden soll, _manuell bestimmen"
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1190
msgid "_Start port:"
msgstr "_Start-Port:"
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1197
msgid "_End port:"
msgstr "_End-Port:"
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1205
msgid "Proxy Server"
msgstr "Proxy-Server"
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkprefs.c:1209
msgid "No proxy"
msgstr "Kein Proxy"
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1265
msgid "_User:"
msgstr "_Benutzer:"
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
msgid "Seamonkey"
msgstr "Seamonkey"
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
msgid "Opera"
msgstr "Opera"
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
msgid "Netscape"
msgstr "Netscape"
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
msgid "Mozilla"
msgstr "Mozilla"
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
msgid "Konqueror"
msgstr "Konqueror"
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
msgid "GNOME Default"
msgstr "GNOME-Standard"
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
msgid "Galeon"
msgstr "Galeon"
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1337
msgid "Firefox"
msgstr "Firefox"
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1338
msgid "Firebird"
msgstr "Firebird"
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1339
msgid "Epiphany"
msgstr "Epiphany"
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1348
msgid "Manual"
msgstr "Manuell"
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1401
msgid "Browser Selection"
msgstr "Browserauswahl"
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1405
msgid "_Browser:"
msgstr "_Browser:"
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
msgid "_Open link in:"
msgstr "Ö_ffne Link in:"
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
msgid "Browser default"
msgstr "Standard-Browser"
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1416
msgid "Existing window"
msgstr "Existierendes Fenster"
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1418
msgid "New tab"
msgstr "Neuer Reiter"
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1432
#, c-format
msgid ""
"_Manual:\n"
@@ -16233,69 +16405,69 @@ msgstr ""
"_Manuell:\n"
"(%s für die URL)"
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1472
msgid "Log _format:"
msgstr "Mitschnitt-_Format:"
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1477
msgid "Log all _instant messages"
msgstr "_Schneide alle Sofortnachrichten mit"
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1479
msgid "Log all c_hats"
msgstr "Alle C_hats mitschneiden"
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1481
msgid "Log all _status changes to system log"
msgstr "Schneide alle _Statusveränderungen im System-Mitschnitt mit"
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1627
msgid "Sound Selection"
msgstr "Klang-Auswahl"
-#: ../pidgin/gtkprefs.c:1635
+#: ../pidgin/gtkprefs.c:1637
#, c-format
msgid "Quietest"
msgstr "Am leisesten"
-#: ../pidgin/gtkprefs.c:1637
+#: ../pidgin/gtkprefs.c:1639
#, c-format
msgid "Quieter"
msgstr "Leiser"
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1641
#, c-format
msgid "Quiet"
msgstr "Leise"
-#: ../pidgin/gtkprefs.c:1643
+#: ../pidgin/gtkprefs.c:1645
#, c-format
msgid "Loud"
msgstr "Laut"
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1647
#, c-format
msgid "Louder"
msgstr "Lauter"
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1649
#, c-format
msgid "Loudest"
msgstr "Am lautesten"
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1715
msgid "_Method:"
msgstr "_Methode:"
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1717
msgid "Console beep"
msgstr "Konsolen-Lautsprecher"
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1724
msgid "No sounds"
msgstr "Keine Klänge"
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1732
#, c-format
msgid ""
"Sound c_ommand:\n"
@@ -16304,82 +16476,82 @@ msgstr ""
"Klang-_Abspielbefehl:\n"
"(%s für den Dateinamen)"
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1759
msgid "Sounds when conversation has _focus"
msgstr "Klang, wenn das Gespräch den _Fokus hat"
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1761
msgid "Enable sounds:"
msgstr "Klänge aktivieren:"
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1772
msgid "Volume:"
msgstr "Lautstärke:"
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1852
msgid "Play"
msgstr "Abspielen"
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
msgid "_Report idle time:"
msgstr "Inaktivitätszei_ten anzeigen:"
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:1934
msgid "Based on keyboard or mouse use"
msgstr "Abhängig von Tastatur- oder Mausbenutzung"
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:1943
msgid "_Auto-reply:"
msgstr "A_utomatische Antwort:"
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1947
msgid "When both away and idle"
msgstr "Wenn abwesend und untätig"
#. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:1953
msgid "Auto-away"
msgstr "Automatisch abwesend"
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1955
msgid "Change status when _idle"
msgstr "Ändere Status, wenn _inaktiv"
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:1959
msgid "_Minutes before becoming idle:"
msgstr "_Minuten, bevor auf abwesend gesetzt wird:"
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:1967
msgid "Change _status to:"
msgstr "Ändere _Status zu:"
#
#. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:1988
msgid "Status at Startup"
msgstr "Status beim Start"
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1990
msgid "Use status from last _exit at startup"
msgstr "Status beim Neu_start wiederherstellen"
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:1996
msgid "Status to a_pply at startup:"
msgstr "Beim Starten folgenden Status _benutzen:"
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2034
msgid "Interface"
msgstr "Schnittstelle"
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2036
msgid "Smiley Themes"
msgstr "Smiley-Themen"
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2043
msgid "Browser"
msgstr "Browser"
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2047
msgid "Status / Idle"
msgstr "Status / Untätig"
@@ -16885,7 +17057,7 @@ msgstr "Empfangene Nachrichten"
msgid "Received Messages"
msgstr "Empfangene Nachrichten"
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
#, c-format
msgid "Select Color for %s"
msgstr "Textfarbe für %s auswählen"
@@ -17163,7 +17335,7 @@ msgstr ""
"\n"
"<b>Buddy-Notizen</b>: %s"
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:192
msgid "History"
msgstr "Verlauf"
@@ -17423,45 +17595,37 @@ msgstr "GtkTreeview horizontaler Abstand
msgid "GtkTreeView Horizontal Separation"
msgstr "GtkTreeview horizontaler Abstand"
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
msgid "Conversation Entry"
msgstr "Unterhaltungseintrag"
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Unterhaltungsverlauf"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Mitschnittsbetrachter"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
msgid "Request Dialog"
msgstr "Dialog anfordern"
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
msgid "Notify Dialog"
msgstr "Benachrichtigungsdialog"
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
msgid "Select Color"
msgstr "Farbe auswählen"
-#: ../pidgin/plugins/pidginrc.c:300
+#: ../pidgin/plugins/pidginrc.c:294
#, c-format
msgid "Select Interface Font"
msgstr "Schriftart wählen"
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
#, c-format
msgid "Select Font for %s"
msgstr "Schriftart für %s wählen"
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
msgid "GTK+ Interface Font"
msgstr "GTK+ Schrift"
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
msgid "GTK+ Text Shortcut Theme"
msgstr "GTK+ Text Shortcut-Thema"
@@ -17485,36 +17649,36 @@ msgstr "GTK+ Text Shortcut-Thema"
#. widget_bool_widgets[i]);
#. }
#.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
msgid "Interface colors"
msgstr "UI-Farben"
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
msgid "Widget Sizes"
msgstr "Widget-Größen"
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
msgid "Fonts"
msgstr "Schrift"
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
msgid "Gtkrc File Tools"
msgstr "Gtkrc-Datei-Werkzeuge"
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
#, c-format
msgid "Write settings to %s%sgtkrc-2.0"
msgstr "Schreibe Einstellungen nach %s%sgtkrc-2.0"
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
msgid "Re-read gtkrc files"
msgstr "Neueinlesen der gtkrc-Dateien"
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:538
msgid "Pidgin GTK+ Theme Control"
msgstr "Pidgin GTK+ Themenkontrolle"
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
msgid "Provides access to commonly used gtkrc settings."
msgstr "Erlaubt den Zugriff auf häufig benutzte gtkrc-Einstellungen."
@@ -17911,115 +18075,3 @@ msgstr ""
msgid "This plugin is useful for debbuging XMPP servers or clients."
msgstr ""
"Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
-
-#, fuzzy
-#~ msgid "Show"
-#~ msgstr "Alle anzeigen"
-
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Zeige Offline-Buddys"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Port"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "Nach Status"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "Nach Größe der Logs"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Verbindung zum Server nicht möglich."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Wählen Sie das Notes-Adressbuch"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Aktuelles Kürzel"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Novell GroupWise Messenger Protokoll-Plugin"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Fehler: Authentifizierung fehlgeschlagen"
-
-#, fuzzy
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s hat Ihnen eine Nachricht gesendet"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Unbekannter Fehler"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Verbindung zum Server nicht möglich."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s hat den Status von %s zu %s geändert"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s ist jetzt %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s ist nicht mehr %s"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Nachricht:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "Datei ver_senden"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Buddy-Alarm hinzufügen..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "Nicht erlaubt im Offline-Modus"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "Nicht erlaubt im Offline-Modus"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Buddy hinzufügen"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Chat hinzufügen"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Persisch"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Konten"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Konto:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "Senden an"
-
-#, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "Lächeln!"
============================================================
--- po/stats.pl 2e3937bc597a6218f41a1356c3f064ef6777c3bc
+++ po/stats.pl f10f492ca0ef2602e2d7b36d0b446fc5ec8edd11
@@ -32,7 +32,7 @@ $lang{pt_BR} = "Portuguese (Brazilian)";
$lang{en_GB} = "English (British)";
$lang{my_MM} = "Burmese (Myanmar)";
$lang{pt_BR} = "Portuguese (Brazilian)";
-$lang{'sr at Latn'} = "Serbian (Latin)";
+$lang{'sr at latin'} = "Serbian (Latin)";
$lang{zh_CN} = "Chinese (Simplified)";
$lang{zh_HK} = "Chinese (Hong Kong)";
$lang{zh_TW} = "Chinese (Traditional)";
============================================================
--- share/ca-certs/Makefile.am 6fdd6599e29bf50e32832da473dbfea86f59cde8
+++ share/ca-certs/Makefile.am d33109c71b83ea1f09f3df5b78fcbdb6ebe94232
@@ -1,7 +1,8 @@ cacerts_DATA = \
cacertsdir = $(datadir)/purple/ca-certs
cacerts_DATA = \
Equifax_Secure_CA.pem \
GTE_CyberTrust_Global_Root.pem \
+ Microsoft_Secure_Server_Authority.pem \
Verisign_RSA_Secure_Server_CA.pem \
Verisign_Class3_Primary_CA.pem
More information about the Commits
mailing list