aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--help/C/account-irc.page2
-rw-r--r--help/C/create-account.page9
-rw-r--r--help/C/introduction.page17
-rw-r--r--help/C/irc-join-pwd.page10
-rw-r--r--help/C/irc-nick-password.page2
-rw-r--r--help/de/de.po1137
-rw-r--r--help/es/es.po373
-rw-r--r--help/it/it.po296
-rw-r--r--libempathy-gtk/empathy-avatar-image.c4
-rw-r--r--libempathy-gtk/empathy-location-manager.c17
-rw-r--r--libempathy-gtk/empathy-theme-boxes.c37
-rw-r--r--libempathy/empathy-contact.c83
-rw-r--r--libempathy/empathy-tp-contact-factory.c369
-rw-r--r--libempathy/empathy-tp-contact-factory.h2
-rw-r--r--libempathy/empathy-tp-file.c1
-rw-r--r--libempathy/irc-networks.xml2
-rw-r--r--po/de.po809
-rw-r--r--po/es.po374
-rw-r--r--po/fr.po3
-rw-r--r--po/gl.po58
-rw-r--r--po/nb.po683
-rw-r--r--src/Makefile.am1
-rw-r--r--src/cc-empathy-accounts-panel.c4
-rw-r--r--src/empathy-accounts-module.c2
25 files changed, 2040 insertions, 2257 deletions
diff --git a/configure.ac b/configure.ac
index b30abc186..0ea89b569 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_COPYRIGHT([
GLIB_REQUIRED=2.22.0
GTK_REQUIRED=2.20.0
GCONF_REQUIRED=1.2.0
-TELEPATHY_GLIB_REQUIRED=0.11.1
+TELEPATHY_GLIB_REQUIRED=0.11.3
TELEPATHY_LOGGER=0.1.1
ENCHANT_REQUIRED=1.2.0
ISO_CODES_REQUIRED=0.35
diff --git a/help/C/account-irc.page b/help/C/account-irc.page
index 85f23d0d3..213247c8d 100644
--- a/help/C/account-irc.page
+++ b/help/C/account-irc.page
@@ -66,7 +66,7 @@
<p>On some networks, nicknames can be registered using a service
known as NickServ. <app>Empathy</app> does not directly support
nickname passwords. On some networks, including the popular
- FreeNode network, server passwords are automatically forwarded
+ freenode network, server passwords are automatically forwarded
to NickServ, allowing you to set this field to identify yourself
with NickServ. See <link xref="irc-nick-password"/> for more
details.</p>
diff --git a/help/C/create-account.page b/help/C/create-account.page
index 19232e806..4aa01710b 100644
--- a/help/C/create-account.page
+++ b/help/C/create-account.page
@@ -40,17 +40,16 @@
<p>This page provides information on creating a new account for various types of
accounts. Your account provider should give you a login ID and a password, as well
- as any additional information you need to connect with <app>Empathy</app>.</p>
+ as any additional information you need to connect using <app>Empathy</app>.</p>
<section id="facebook">
<title>Facebook</title>
<p>
- Facebook is one of the most used social network. It provides users with
- the opportunity to create their own profile, and to communicate with their
- friends.
+ Facebook is one of the most-used social networks. It allows users to
+ create their own profile and to communicate with their friends.
</p>
<p>
- In order to use Facebook to communicate with your friends, you will need
+ To use Facebook to communicate with your friends, you will need
to create a new account from the website:
<link href="http://www.facebook.com">www.facebook.com</link>.
</p>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 7dc2441e9..e7f96b899 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -15,21 +15,14 @@
</credit>
<license>
<p>Creative Commons Share Alike 3.0</p>
- </license>
-<!--
- <copyright>
- <year>2009</year>
- <name>GNOME Documentation Project</name>
- </copyright>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
--->
+ </license>
</info>
<title>Introduction</title>
<p>
<app>Empathy</app> is an instant messaging application for the GNOME Desktop.
- It supports text messaging, voice &amp; video call, file transfers and all the
+ It supports text messaging, voice &amp; video calls, file transfers, and all the
most used messaging systems such as MSN and Google Talk.
</p>
<p>
@@ -37,9 +30,9 @@
and that let you easily keep in touch with your friends.
</p>
<p>
- You can group all the conversations in a single window, or have multiple windows for
- different kind of conversations; easily search through your previous conversations, and
- share your desktop in just two clicks.
+ Using <app>Empathy</app>, you can group all the conversations in a single window,
+ have multiple windows for different kind of conversations, easily search through
+ your previous conversations, and share your desktop in just two clicks.
</p>
<figure>
diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page
index b8fd52afb..f883094bc 100644
--- a/help/C/irc-join-pwd.page
+++ b/help/C/irc-join-pwd.page
@@ -26,20 +26,18 @@
<p>
On some IRC networks, private IRC rooms may be protected with a password.
- </p>
- <p>
- To join such a room, if you know the password:
+ If you know the password, use the following steps to join:
</p>
<steps>
<item>
<p>
- <link xref="irc-join-room">Join the room</link>.
+ <link xref="irc-join-room">Join the room</link> as normal.
</p>
</item>
<item>
<p>
- In the <gui>This room is protected by a password</gui> text box, type the
- IRC room password, and click on <gui style="button">Join</gui>.
+ Empathy will prompt you for a password. Enter the password for the
+ IRC chat room and click <gui style="button">Join</gui>.
</p>
</item>
</steps>
diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page
index 1adc93d89..0e371ae3b 100644
--- a/help/C/irc-nick-password.page
+++ b/help/C/irc-nick-password.page
@@ -40,7 +40,7 @@
<p><app>Empathy</app> does not currently support nickname registration. Some
IRC networks, however, will automatically forward a <em>server password</em> to
NickServ. On these networks, you can use the IRC password in <app>Empathy</app>
- to identify yourself to NickServ. The popular FreeNode network is known to have
+ to identify yourself to NickServ. The popular freenode network is known to have
this feature.</p>
<p>To set an IRC server password:</p>
diff --git a/help/de/de.po b/help/de/de.po
index a4d75f220..204661681 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the empathy
# documentation package.
#
-# Mario Blättermann <mariobl@gnome.org>, 2008, 2009.
# Philipp Kerling <k.philipp@gmail.com>, 2008.
# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009.
+# Mario Blättermann <mariobl@gnome.org>, 2008-2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy\n"
+"Project-Id-Version: empathy help\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-24 15:57+0000\n"
-"PO-Revision-Date: 2010-03-26 11:12+0100\n"
+"POT-Creation-Date: 2010-04-29 10:09+0000\n"
+"PO-Revision-Date: 2010-04-29 12:12+0100\n"
"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
"Language-Team: German <gnome-de@gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: C/video-call.page:45(None) C/video-call.page:61(None)
-#: C/audio-video.page:70(None) C/audio-call.page:63(None)
+#: C/video-call.page:45(None) C/video-call.page:63(None)
+#: C/audio-video.page:70(None) C/audio-call.page:65(None)
msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
msgstr "a"
@@ -35,11 +35,11 @@ msgstr "Beginnen Sie eine Videounterhaltung mit einem Ihrer Kontakte."
#: C/video-call.page:21(name) C/status-icons.page:16(name)
#: C/share-desktop.page:13(name) C/set-custom-status.page:19(name)
#: C/send-file.page:21(name) C/salut-protocol.page:18(name)
-#: C/remove-account.page:17(name) C/prob-conn-neterror.page:18(name)
+#: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
#: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
#: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
#: C/irc-start-conversation.page:15(name) C/irc-send-file.page:16(name)
-#: C/irc-nick-password.page:18(name) C/irc-manage.page:18(name)
+#: C/irc-nick-password.page:18(name) C/irc-manage.page:19(name)
#: C/irc-join-room.page:16(name) C/irc-join-pwd.page:17(name)
#: C/irc-commands.page:10(name) C/introduction.page:13(name)
#: C/index.page:18(name) C/import-account.page:23(name)
@@ -48,19 +48,19 @@ msgstr "Beginnen Sie eine Videounterhaltung mit einem Ihrer Kontakte."
#: C/geolocation-supported.page:16(name) C/geolocation-privacy.page:17(name)
#: C/geolocation-not-showing.page:17(name) C/geolocation.page:17(name)
#: C/favorite-rooms.page:14(name) C/disable-account.page:20(name)
-#: C/create-account.page:17(name) C/audio-video.page:17(name)
-#: C/audio-call.page:18(name) C/add-account.page:19(name)
+#: C/create-account.page:18(name) C/audio-video.page:17(name)
+#: C/audio-call.page:18(name) C/add-account.page:20(name)
msgid "Milo Casagrande"
msgstr "Milo Casagrande"
#: C/video-call.page:22(email) C/status-icons.page:17(email)
#: C/share-desktop.page:14(email) C/set-custom-status.page:20(email)
#: C/send-file.page:22(email) C/salut-protocol.page:19(email)
-#: C/remove-account.page:18(email) C/prob-conn-neterror.page:19(email)
+#: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
#: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
#: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
#: C/irc-start-conversation.page:16(email) C/irc-send-file.page:17(email)
-#: C/irc-nick-password.page:19(email) C/irc-manage.page:19(email)
+#: C/irc-nick-password.page:19(email) C/irc-manage.page:20(email)
#: C/irc-join-room.page:17(email) C/irc-join-pwd.page:18(email)
#: C/irc-commands.page:11(email) C/introduction.page:14(email)
#: C/index.page:19(email) C/import-account.page:24(email)
@@ -69,32 +69,31 @@ msgstr "Milo Casagrande"
#: C/geolocation-supported.page:17(email) C/geolocation-privacy.page:18(email)
#: C/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
#: C/favorite-rooms.page:15(email) C/disable-account.page:21(email)
-#: C/create-account.page:18(email) C/audio-video.page:18(email)
-#: C/audio-call.page:19(email) C/add-account.page:20(email)
+#: C/create-account.page:19(email) C/audio-video.page:18(email)
+#: C/audio-call.page:19(email) C/add-account.page:21(email)
msgid "milo@ubuntu.com"
msgstr "milo@ubuntu.com"
-#: C/video-call.page:25(p) C/status-icons.page:24(p)
-#: C/share-desktop.page:17(p) C/set-custom-status.page:23(p)
-#: C/send-message.page:20(p) C/send-file.page:25(p)
-#: C/salut-protocol.page:22(p) C/remove-account.page:21(p)
-#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p)
-#: C/prob-conn-name.page:21(p) C/prob-conn-auth.page:25(p)
-#: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p)
-#: C/irc-start-conversation.page:19(p) C/irc-send-file.page:20(p)
-#: C/irc-nick-password.page:22(p) C/irc-manage.page:22(p)
-#: C/irc-join-room.page:20(p) C/irc-join-pwd.page:21(p)
+#: C/video-call.page:25(p) C/status-icons.page:24(p) C/share-desktop.page:17(p)
+#: C/set-custom-status.page:23(p) C/send-message.page:20(p)
+#: C/send-file.page:25(p) C/salut-protocol.page:22(p)
+#: C/remove-account.page:22(p) C/prob-conn.page:18(p)
+#: C/prob-conn-neterror.page:22(p) C/prob-conn-name.page:21(p)
+#: C/prob-conn-auth.page:25(p) C/prob-conn-acctdisabled.page:22(p)
+#: C/prev-conv.page:24(p) C/irc-start-conversation.page:19(p)
+#: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p)
+#: C/irc-manage.page:23(p) C/irc-join-room.page:20(p) C/irc-join-pwd.page:21(p)
#: C/irc-commands.page:14(p) C/introduction.page:17(p) C/index.page:22(p)
#: C/import-account.page:31(p) C/hide-contacts.page:15(p)
#: C/group-conversations.page:23(p) C/geolocation-what-is.page:22(p)
#: C/geolocation-turn.page:22(p) C/geolocation-supported.page:20(p)
#: C/geolocation-privacy.page:21(p) C/geolocation-not-showing.page:21(p)
#: C/geolocation.page:21(p) C/favorite-rooms.page:18(p)
-#: C/disable-account.page:28(p) C/create-account.page:21(p)
+#: C/disable-account.page:28(p) C/create-account.page:22(p)
#: C/change-status.page:23(p) C/audio-video.page:21(p) C/audio-call.page:22(p)
-#: C/add-contact.page:22(p) C/add-account.page:27(p)
+#: C/add-contact.page:22(p) C/add-account.page:28(p)
#: C/accounts-window.page:22(p) C/account-jabber.page:18(p)
-#: C/account-irc.page:18(p)
+#: C/account-irc.page:20(p)
msgid "Creative Commons Share Alike 3.0"
msgstr "Creative Commons Share Alike 3.0"
@@ -116,17 +115,17 @@ msgstr ""
#: C/video-call.page:44(p)
msgid ""
-"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
-"next to the name of the contact you wish to call and choose <gui style="
-"\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
-"choose <gui style=\"menuitem\">Video Call</gui>."
+"From the <gui>Contact List</gui> window, click the <media type=\"image\" mime="
+"\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next to "
+"the name of the contact you wish to call and choose <gui style=\"menuitem"
+"\">Video Call</gui>. Alternatively, right click the contact and choose <gui "
+"style=\"menuitem\">Video Call</gui>."
msgstr ""
-"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image"
-"\" mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</media>-"
-"Symbol neben dem Namen des Kontakts, den Sie anrufen wollen, und wählen Sie "
-"<gui style=\"menuitem\">Videoanruf</gui>. Alternativ klicken Sie mit der "
-"rechten Maustaste auf den Kontakt und wählen Sie <gui>Videoanruf</gui>."
+"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</media>-Symbol "
+"neben dem Namen des Kontakts, den Sie anrufen wollen, und wählen Sie <gui "
+"style=\"menuitem\">Videoanruf</gui>. Alternativ klicken Sie mit der rechten "
+"Maustaste auf den Kontakt und wählen Sie <gui>Videoanruf</gui>."
#: C/video-call.page:50(p) C/audio-call.page:52(p)
msgid ""
@@ -134,28 +133,26 @@ msgid ""
"<gui>Connected</gui> at the bottom of the window, along with the total "
"conversation time."
msgstr ""
-"Ein neues Fenster wird geöffnet. Sobald die Verbindung aufgebaut wurde, "
-"sehen Sie am unteren Rand des Fensters <gui>Verbunden</gui> und die "
-"Gesamtzeit der Unterhaltung."
+"Ein neues Fenster wird geöffnet. Sobald die Verbindung aufgebaut wurde, sehen "
+"Sie am unteren Rand des Fensters <gui>Verbunden</gui> und die Gesamtzeit der "
+"Unterhaltung."
#: C/video-call.page:55(p) C/audio-call.page:57(p)
-msgid ""
-"To end the conversation, choose <guiseq><gui style=\"menu\">Call</gui><gui "
-"style=\"menuitem\">Hang up</gui></guiseq>."
+msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
msgstr ""
-"Um eine Unterhaltung zu beenden, wählen Sie <guiseq><gui style=\"menu"
-"\">Anruf</gui><gui style=\"menuitem\">Auflegen</gui></guiseq>."
+"Um eine Unterhaltung zu beenden, klicken Sie auf <gui style=\"button"
+"\">Auflegen</gui>."
-#: C/video-call.page:59(p)
+#: C/video-call.page:61(p)
msgid ""
"To turn a video conversation into an audio conversation, choose <guiseq><gui "
"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>, "
"or click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-"
"web.png\">video call</media> toolbar button to deselect it."
msgstr ""
-"Um eine Video-Unterhaltung in eine Audio-Unterhaltung umzuwandeln, wählen "
-"Sie <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video "
-"aus</gui></guiseq> oder klicken Sie auf den Werkzeugleistenknopf <media type="
+"Um eine Video-Unterhaltung in eine Audio-Unterhaltung umzuwandeln, wählen Sie "
+"<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video aus</"
+"gui></guiseq> oder klicken Sie auf den Werkzeugleistenknopf <media type="
"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</"
"media>, um ihn zu deaktivieren."
@@ -191,15 +188,15 @@ msgstr "Erläuterung der verschiedenen Status und deren Symbole."
#: C/prev-conv.page:20(name) C/prev-conv.page:38(cite)
#: C/import-account.page:27(name) C/disable-account.page:24(name)
#: C/audio-video.page:109(cite) C/audio-video.page:117(cite)
-#: C/add-account.page:23(name) C/accounts-window.page:18(name)
-#: C/account-jabber.page:14(name) C/account-irc.page:14(name)
+#: C/add-account.page:24(name) C/accounts-window.page:18(name)
+#: C/account-jabber.page:14(name) C/account-irc.page:16(name)
msgid "Shaun McCance"
msgstr "Shaun McCance"
#: C/status-icons.page:21(email) C/prev-conv.page:21(email)
#: C/import-account.page:28(email) C/disable-account.page:25(email)
-#: C/add-account.page:24(email) C/accounts-window.page:19(email)
-#: C/account-jabber.page:15(email) C/account-irc.page:15(email)
+#: C/add-account.page:25(email) C/accounts-window.page:19(email)
+#: C/account-jabber.page:15(email) C/account-irc.page:17(email)
msgid "shaunm@gnome.org"
msgstr "shaunm@gnome.org"
@@ -234,18 +231,18 @@ msgstr "Beschäftigt"
#: C/status-icons.page:47(p)
msgid ""
-"Use the <em>Busy</em> status to let your contacts know that you don’t want "
-"to chat right now. They can still contact you, for instance if they have "
+"Use the <em>Busy</em> status to let your contacts know that you don’t want to "
+"chat right now. They can still contact you, for instance if they have "
"something urgent they need to discuss. By default, <app>Empathy</app> will "
"not use notification bubbles and sounds when you are busy. You can set a "
"custom message for this status."
msgstr ""
-"Verwenden Sie den Status <em>Beschäftigt</em>, wenn Sie Ihre Kontakte "
-"darüber informieren wollen, dass Sie gerade keine Unterhaltung wünschen. "
-"Diese können Sie trotzdem noch kontaktieren, beispielsweise in dringenden "
-"Fällen. Per Vorgabe zeigt <app>Empathy</app> keine einblendenden "
-"Benachrichtigungen an oder spielt Klänge ab, wenn Sie beschäftigt sind. Sie "
-"können für diesen Status eine benutzerdefinierte Nachricht festlegen."
+"Verwenden Sie den Status <em>Beschäftigt</em>, wenn Sie Ihre Kontakte darüber "
+"informieren wollen, dass Sie gerade keine Unterhaltung wünschen. Diese können "
+"Sie trotzdem noch kontaktieren, beispielsweise in dringenden Fällen. Per "
+"Vorgabe zeigt <app>Empathy</app> keine einblendenden Benachrichtigungen an "
+"oder spielt Klänge ab, wenn Sie beschäftigt sind. Sie können für diesen "
+"Status eine benutzerdefinierte Nachricht festlegen."
#: C/status-icons.page:53(media)
msgid "Away icon"
@@ -268,8 +265,8 @@ msgstr ""
"abwesend, wenn Sie Ihren Rechner für einen gewissen Zeitraum nicht bedienen "
"oder wenn der Bildschirmschoner eingeschaltet ist. <app>Empathy</app> zeigt "
"keine einblendenden Benachrichtigungen an oder spielt Klänge ab, wenn Sie "
-"abwesend sind. Sie können für diesen Status eine benutzerdefinierte "
-"Nachricht festlegen."
+"abwesend sind. Sie können für diesen Status eine benutzerdefinierte Nachricht "
+"festlegen."
#: C/status-icons.page:62(media) C/status-icons.page:69(media)
msgid "Offline icon"
@@ -281,14 +278,13 @@ msgstr "Unsichtbar"
#: C/status-icons.page:64(p)
msgid ""
-"When you set your status to <em>Invisible</em>, you will appear as offline "
-"to your contacts. You will still be connected to your accounts, and you "
-"still see your contacts’ statuses and start conversations with them."
+"When you set your status to <em>Invisible</em>, you will appear as offline to "
+"your contacts. You will still be connected to your accounts, and you still "
+"see your contacts’ statuses and start conversations with them."
msgstr ""
-"Wenn Sie Ihren Status auf <em>Unsichtbar</em> setzen, erscheinen Sie für "
-"Ihre Kontakte als abgemeldet. Sie sind noch immer mit Ihren Kontakten "
-"verbunden. Sie sehen deren Status und können Unterhaltungen mit Ihnen "
-"beginnen."
+"Wenn Sie Ihren Status auf <em>Unsichtbar</em> setzen, erscheinen Sie für Ihre "
+"Kontakte als abgemeldet. Sie sind noch immer mit Ihren Kontakten verbunden. "
+"Sie sehen deren Status und können Unterhaltungen mit Ihnen beginnen."
#: C/status-icons.page:70(gui)
msgid "Offline"
@@ -342,8 +338,7 @@ msgstr ""
#: C/share-desktop.page:51(p)
msgid ""
"Select the contact you want to share your desktop with, and choose "
-"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></"
-"guiseq>."
+"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></guiseq>."
msgstr ""
"Wählen Sie den Kontakt aus, für den Sie Ihre Arbeitsumgebung freigeben "
"wollen, und wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Kontakt</"
@@ -354,16 +349,16 @@ msgid ""
"Right-click on the name of the contact you want to share your desktop with, "
"and select <gui>Share my desktop</gui>."
msgstr ""
-"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, für den "
-"Sie Ihre Arbeitsumgebung freigeben wollen und wählen Sie <gui>Meine "
+"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, für den Sie "
+"Ihre Arbeitsumgebung freigeben wollen und wählen Sie <gui>Meine "
"Arbeitsumgebung freigeben</gui>."
#: C/share-desktop.page:65(p)
msgid ""
-"A request will be sent to the contact you want to share your desktop with. "
-"If they accept, the default remote desktop viewer application will be "
-"launched in order to permit you to disconnect the user that is controlling "
-"your desktop."
+"A request will be sent to the contact you want to share your desktop with. If "
+"they accept, the default remote desktop viewer application will be launched "
+"in order to permit you to disconnect the user that is controlling your "
+"desktop."
msgstr ""
"Es wird eine Anfrage an den Kontakt gesendet, dem Sie Ihre Arbeitsumgebung "
"freigeben wollen. Falls diese akzeptiert wird, dann wird die voreingestellte "
@@ -401,8 +396,7 @@ msgstr ""
#: C/set-custom-status.page:9(desc)
msgid "Add, edit or delete personal messages for your status."
msgstr ""
-"Hinzufügen, Bearbeiten oder Löschen persönlicher Nachrichten für Ihren "
-"Status."
+"Hinzufügen, Bearbeiten oder Löschen persönlicher Nachrichten für Ihren Status."
#: C/set-custom-status.page:15(name)
msgid "Jim Campbell"
@@ -422,8 +416,8 @@ msgid ""
"to let people know that you will be unavailable for a certain period of time."
msgstr ""
"Vielleicht wollen Sie eine benutzerdefinierte Nachricht für Ihren Status "
-"festlegen, zum Beispiel um jemanden darüber zu informieren, dass Sie für "
-"eine bestimmte Zeitspanne nicht verfügbar sein werden."
+"festlegen, zum Beispiel um jemanden darüber zu informieren, dass Sie für eine "
+"bestimmte Zeitspanne nicht verfügbar sein werden."
#: C/set-custom-status.page:40(p)
msgid ""
@@ -442,17 +436,17 @@ msgstr ""
#: C/set-custom-status.page:52(p)
msgid ""
-"Select the status you want to add a custom message to. You have to select "
-"the one identified with the label <gui>Custom Message</gui>."
+"Select the status you want to add a custom message to. You have to select the "
+"one identified with the label <gui>Custom Message</gui>."
msgstr ""
-"Wählen Sie den Status aus, dem Sie eine benutzerdefinierte Nachricht "
-"zuordnen wollen. Sie müssen denjenigen mit der Bezeichnung "
-"<gui>Benutzerdefinierte Nachricht</gui> auswählen."
+"Wählen Sie den Status aus, dem Sie eine benutzerdefinierte Nachricht zuordnen "
+"wollen. Sie müssen denjenigen mit der Bezeichnung <gui>Benutzerdefinierte "
+"Nachricht</gui> auswählen."
#: C/set-custom-status.page:58(p)
msgid ""
-"Enter your custom message in the text box at the top of the window, and "
-"press <key>Enter</key> to set the message."
+"Enter your custom message in the text box at the top of the window, and press "
+"<key>Enter</key> to set the message."
msgstr ""
"Geben Sie Ihre benutzerdefinierte Nachricht in das Textfeld am oberen Rand "
"des Fensters ein und drücken Sie die <gui>Eingabetaste</gui>, um sie zu "
@@ -461,13 +455,13 @@ msgstr ""
#: C/set-custom-status.page:64(p)
msgid ""
"If you want to set the custom message as a favorite, saving it in order to "
-"use it again, click on the little star on the right of the text box where "
-"you wrote your custom message."
+"use it again, click on the little star on the right of the text box where you "
+"wrote your custom message."
msgstr ""
"Wenn Sie die benutzerdefinierte Nachricht als bevorzugt festlegen wollen, "
-"speichern Sie sie, um sie wiederverwenden zu können. Klicken Sie "
-"anschließend auf den kleinen Stern an der rechten Seite des Textfeldes, in "
-"welches Sie Ihre benutzerdefinierte Nachricht eingegeben haben."
+"speichern Sie sie, um sie wiederverwenden zu können. Klicken Sie anschließend "
+"auf den kleinen Stern an der rechten Seite des Textfeldes, in welches Sie "
+"Ihre benutzerdefinierte Nachricht eingegeben haben."
#: C/set-custom-status.page:69(p)
msgid ""
@@ -496,8 +490,8 @@ msgid ""
"From the <gui>Saved Presets</gui> box, select the status message you want to "
"edit and double-click on it."
msgstr ""
-"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung "
-"aus, die Sie bearbeiten wollen, und klicken Sie zweimal darauf."
+"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung aus, "
+"die Sie bearbeiten wollen, und klicken Sie zweimal darauf."
#: C/set-custom-status.page:106(p)
msgid "Type the new custom message and press <key>Enter</key> to modify it."
@@ -514,19 +508,18 @@ msgid ""
"From the <gui>Saved Presets</gui> box, select the status message you want to "
"remove."
msgstr ""
-"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung "
-"aus, die Sie entfernen wollen."
+"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung aus, "
+"die Sie entfernen wollen."
#: C/set-custom-status.page:124(p)
msgid "Click on the <gui>Remove</gui> button."
msgstr "Klicken Sie auf den Knopf <gui>Entfernen</gui>."
#: C/set-custom-status.page:131(p)
-msgid ""
-"To add a new custom message, from the <gui>Add New Preset</gui> section:"
+msgid "To add a new custom message, from the <gui>Add New Preset</gui> section:"
msgstr ""
-"So fügen Sie im Abschnitt <gui>Neue Voreinstellung hinzufügen</gui> eine "
-"neue benutzerdefinierte Nachricht hinzu:"
+"So fügen Sie im Abschnitt <gui>Neue Voreinstellung hinzufügen</gui> eine neue "
+"benutzerdefinierte Nachricht hinzu:"
#: C/set-custom-status.page:136(p)
msgid ""
@@ -589,16 +582,16 @@ msgid ""
"Double click the name of the contact that you want to have a conversation "
"with."
msgstr ""
-"Klicken Sie doppelt auf den Namen des Kontakts, mit dem Sie eine "
-"Unterhaltung beginnen wollen."
+"Klicken Sie doppelt auf den Namen des Kontakts, mit dem Sie eine Unterhaltung "
+"beginnen wollen."
#: C/send-message.page:46(p)
msgid ""
"Right-click on the name of the contact you want to have a conversation with, "
"and choose <gui>Chat</gui>."
msgstr ""
-"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, mit dem "
-"Sie eine Unterhaltung führen wollen, und klicken Sie anschließend auf "
+"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, mit dem Sie "
+"eine Unterhaltung führen wollen, und klicken Sie anschließend auf "
"<gui>Unterhaltung</gui>."
#: C/send-message.page:54(p)
@@ -607,8 +600,8 @@ msgid ""
"window and press <key>Enter</key> to send it."
msgstr ""
"Ein neues Fenster wird geöffnet. Geben Sie eine Nachricht in das Feld am "
-"unteren Rand des Fensters ein und drücken Sie die <key>Eingabetaste</gui>, "
-"um sie zu senden."
+"unteren Rand des Fensters ein und drücken Sie die <key>Eingabetaste</gui>, um "
+"sie zu senden."
#: C/send-file.page:8(desc)
msgid "Send a file from your computer to one of your contacts."
@@ -624,8 +617,8 @@ msgid ""
"file</gui>."
msgstr ""
"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, dem Sie "
-"eine Datei senden wollen, und klicken Sie anschließend auf <gui>Datei "
-"senden</gui>."
+"eine Datei senden wollen, und klicken Sie anschließend auf <gui>Datei senden</"
+"gui>."
#: C/send-file.page:50(p)
msgid ""
@@ -667,10 +660,9 @@ msgid ""
"<gui>Clear</gui> to empty the list. This will only remove the files from the "
"list and will not delete them from your computer."
msgstr ""
-"Falls mehrere abgeschlossene Dateiübertragungen in diesem Fenster "
-"aufgelistet sind, dann klicken Sie auf <gui>Leeren</gui>, um die Liste zu "
-"leeren. Dies entfernt die Dateien nur aus der Liste, aber nicht von Ihrem "
-"Rechner."
+"Falls mehrere abgeschlossene Dateiübertragungen in diesem Fenster aufgelistet "
+"sind, dann klicken Sie auf <gui>Leeren</gui>, um die Liste zu leeren. Dies "
+"entfernt die Dateien nur aus der Liste, aber nicht von Ihrem Rechner."
#: C/send-file.page:87(p)
msgid ""
@@ -682,8 +674,8 @@ msgstr ""
#: C/send-file.page:93(p)
msgid ""
-"In order to send a file to someone, you need to be connected to the "
-"Internet, or to a local area network."
+"In order to send a file to someone, you need to be connected to the Internet, "
+"or to a local area network."
msgstr ""
"Um jemandem eine Datei senden zu können, müssen Sie mit dem Internet oder "
"einem lokalen Netzwerk verbunden sein."
@@ -706,8 +698,8 @@ msgid ""
"need to connect and authenticate to a central server in order to use it."
msgstr ""
"Der Dienst »People Nearby« ist ein Kommunikationsdienst, der ohne Server "
-"auskommt: Es ist nicht notwendig, sich mit einem Server zu verbinden und "
-"sich zu legitimieren, um den Dienst zu nutzen."
+"auskommt: Es ist nicht notwendig, sich mit einem Server zu verbinden und sich "
+"zu legitimieren, um den Dienst zu nutzen."
#: C/salut-protocol.page:45(p)
msgid ""
@@ -732,31 +724,30 @@ msgid ""
"All the modern local area networks should be able to support this kind of "
"service."
msgstr ""
-"Alle modernen lokalen Netzwerke sollten in der Lage sein, diese Art Dienst "
-"zu unterstützen."
+"Alle modernen lokalen Netzwerke sollten in der Lage sein, diese Art Dienst zu "
+"unterstützen."
#: C/remove-account.page:8(desc)
msgid "Completely remove an account from <app>Empathy</app>."
msgstr "Ein Konto vollständig aus <app>Empathy</app> löschen."
-#: C/remove-account.page:32(title)
+#: C/remove-account.page:33(title)
msgid "Remove an account"
msgstr "Löschen eines Kontos"
-#: C/remove-account.page:34(p)
+#: C/remove-account.page:35(p)
msgid ""
-"You can completely remove an account from <app>Empathy</app> if you no "
-"longer wish to use the account. If you wish to use the account in "
-"<app>Empathy</app> again in the future, you will have to add your account "
-"details again."
+"You can completely remove an account from <app>Empathy</app> if you no longer "
+"wish to use the account. If you wish to use the account in <app>Empathy</app> "
+"again in the future, you will have to add your account details again."
msgstr ""
"Sie können ein Konto aus <app>Empathy</app> vollständig löschen, falls Sie "
"dieses nicht mehr benutzen wollen. Sollten Sie in Zukunft dieses Konto in "
"<app>Empathy</app> erneut nutzen wollen, dann müssen Sie die Kontendetails "
"erneut eingeben."
-#: C/remove-account.page:41(p) C/irc-nick-password.page:50(p)
-#: C/disable-account.page:48(p) C/add-account.page:47(p)
+#: C/remove-account.page:42(p) C/irc-nick-password.page:50(p)
+#: C/disable-account.page:48(p) C/add-account.page:48(p)
msgid ""
"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
@@ -764,20 +755,19 @@ msgstr ""
"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Bearbeiten</"
"gui><gui>Konten</gui></guiseq> oder drücken Sie <key>F4</key>."
-#: C/remove-account.page:45(p)
+#: C/remove-account.page:46(p)
msgid ""
-"Select the account you wish to remove from the accounts list on the left "
-"side of the window."
+"Select the account you wish to remove from the accounts list on the left side "
+"of the window."
msgstr ""
"Wählen Sie das Konto, das Sie aus der Kontenliste entfernen wollen, an der "
"linken Seite des Fensters aus."
-#: C/remove-account.page:49(p)
-msgid "Click on the trash icon next to the account name to remove the account."
-msgstr ""
-"Klicken Sie auf das Müll-Symbol rechts neben dem Konto, um es zu entfernen."
+#: C/remove-account.page:50(p)
+msgid "Click on <gui style=\"button\">Remove</gui>."
+msgstr "Klicken Sie auf <gui style=\"button\">Entfernen</gui>."
-#: C/remove-account.page:52(p)
+#: C/remove-account.page:53(p)
msgid ""
"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
"button to permanently remove the account."
@@ -785,7 +775,7 @@ msgstr ""
"Ein Dialogfenster bittet darum, den Vorgang zu bestätigen. Klicken Sie auf "
"den Knopf <gui>Entfernen</gui>, um das Konto dauerhaft zu entfernen."
-#: C/remove-account.page:58(p)
+#: C/remove-account.page:59(p)
msgid ""
"Even after removing an account, <app>Empathy</app> does not delete your "
"conversation history for that account."
@@ -806,7 +796,7 @@ msgstr "Probleme beim Verbinden zu einem Sofortnachrichtendienst"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/prob-conn-neterror.page:58(None) C/prob-conn-name.page:43(None)
-#: C/prob-conn-auth.page:58(None) C/account-irc.page:107(None)
+#: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None)
msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
msgstr "a"
@@ -880,8 +870,8 @@ msgstr ""
#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p)
msgid ""
-"Deselect the <gui>Enabled</gui>, and then select it again to try to "
-"reconnect to the service."
+"Deselect the <gui>Enabled</gui>, and then select it again to try to reconnect "
+"to the service."
msgstr ""
"Deaktivieren Sie das Ankreuzfeld <gui>Aktiviert</gui> und aktivieren Sie es "
"erneut, um einen neuen Verbindungsversuch zu starten."
@@ -935,10 +925,9 @@ msgid ""
"the password for that nickname. For more information, see <link xref=\"irc-"
"nick-password\"/>."
msgstr ""
-"Falls Sie diesen Spitznamen in dem von Ihnen verwendeten Netzwerk "
-"registriert haben, legen Sie für diesen Spitznamen ein Passwort fest. "
-"Weitere Informationen hierzu finden Sie in <link xref=\"irc-nick-password\"/"
-">."
+"Falls Sie diesen Spitznamen in dem von Ihnen verwendeten Netzwerk registriert "
+"haben, legen Sie für diesen Spitznamen ein Passwort fest. Weitere "
+"Informationen hierzu finden Sie in <link xref=\"irc-nick-password\"/>."
#: C/prob-conn-name.page:64(p)
msgid ""
@@ -951,8 +940,8 @@ msgstr ""
#: C/prob-conn-auth.page:8(desc)
msgid ""
-"An error message which says “<gui>Authentication failed</gui>” appears in "
-"the main window."
+"An error message which says “<gui>Authentication failed</gui>” appears in the "
+"main window."
msgstr ""
"Eine Fehlermeldung »<gui>Legitimierung fehlgeschlagen</gui>« erscheint im "
"Hauptfenster."
@@ -973,13 +962,13 @@ msgstr ""
#: C/prob-conn-auth.page:50(p)
msgid ""
-"Make sure that you have registered an account with the service you are "
-"trying to connect to. If you do not have an account, most services will not "
-"allow you to connect."
+"Make sure that you have registered an account with the service you are trying "
+"to connect to. If you do not have an account, most services will not allow "
+"you to connect."
msgstr ""
"Stellen Sie sicher, dass Sie bei dem Dienst ein Konto registriert haben, mit "
-"dem Sie sich verbinden wollen. Falls Sie über kein Konto verfügen, "
-"verweigern die meisten Dienste die Verbindung."
+"dem Sie sich verbinden wollen. Falls Sie über kein Konto verfügen, verweigern "
+"die meisten Dienste die Verbindung."
#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p)
msgid ""
@@ -990,8 +979,8 @@ msgstr ""
#: C/prob-conn-acctdisabled.page:7(desc)
msgid ""
-"The instant messaging account that you want to use is not enabled in the "
-"list of accounts."
+"The instant messaging account that you want to use is not enabled in the list "
+"of accounts."
msgstr ""
"Das Sofortnachrichten-Konto, welches Sie verwenden wollen, ist in der "
"Kontenliste nicht aktiviert."
@@ -1015,8 +1004,8 @@ msgid ""
"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
"account that is not working."
msgstr ""
-"Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Konten</gui></guiseq> und "
-"wählen Sie den nicht funktionierenden Kontakt aus."
+"Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Konten</gui></guiseq> und wählen "
+"Sie den nicht funktionierenden Kontakt aus."
#: C/prob-conn-acctdisabled.page:65(p)
msgid ""
@@ -1024,8 +1013,8 @@ msgid ""
"If it is not, select the check-box to enable the account."
msgstr ""
"Stellen Sie sicher, dass das Ankreuzfeld <gui style=\"checkbox\">Aktiviert</"
-"gui> neben dem Namen Ihres Kontos ausgewählt ist. Falls nicht, aktivieren "
-"Sie das Ankreuzfeld, um das Konto zu aktivieren."
+"gui> neben dem Namen Ihres Kontos ausgewählt ist. Falls nicht, aktivieren Sie "
+"das Ankreuzfeld, um das Konto zu aktivieren."
#: C/prev-conv.page:8(desc)
msgid "Browse or search your previous conversations."
@@ -1052,8 +1041,8 @@ msgstr ""
#: C/prev-conv.page:46(p)
msgid ""
"<app>Empathy</app> automatically saves all your text conversations you have "
-"with your contacts. You can <link xref=\"#search\">search through all of "
-"your previous conversations</link> or <link xref=\"#browse\">browse previous "
+"with your contacts. You can <link xref=\"#search\">search through all of your "
+"previous conversations</link> or <link xref=\"#browse\">browse previous "
"conversations</link> by contact and date."
msgstr ""
"<app>Empathy</app> speichert automatisch alle Ihre Text-Unterhaltungen, die "
@@ -1075,16 +1064,15 @@ msgstr "Vorherige Unterhaltungen durchsuchen"
#: C/prev-conv.page:63(p)
msgid ""
-"You can perform a full-text search through all of your previous "
-"conversations."
+"You can perform a full-text search through all of your previous conversations."
msgstr ""
"Sie können den Volltext aller Ihrer vorherigen Unterhaltungen durchsuchen."
#: C/prev-conv.page:67(p) C/prev-conv.page:96(p)
msgid ""
"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
-"<key>F3</key>."
+"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</"
+"key>."
msgstr ""
"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Ansicht</"
"gui><gui>Vorherige Unterhaltungen</gui></guiseq>. Alternativ drücken Sie "
@@ -1109,8 +1097,8 @@ msgid ""
"below the search field. By default, conversations are ordered by date."
msgstr ""
"Jegliche Unterhaltungen, die auf Ihre Suchbegriffe zutreffen, werden in der "
-"Liste unterhalb des Suchfeldes angezeigt. Per Vorgabe sind die "
-"Unterhaltungen nach Datum geordnet."
+"Liste unterhalb des Suchfeldes angezeigt. Per Vorgabe sind die Unterhaltungen "
+"nach Datum geordnet."
#: C/prev-conv.page:82(p)
msgid ""
@@ -1138,8 +1126,8 @@ msgstr "Wählen Sie den Reiter <gui>Unterhaltungen</gui>."
#: C/prev-conv.page:103(p)
msgid ""
-"Select an account from the drop-down list in the top left. A list of "
-"contacts and chat room for that account will be shown below."
+"Select an account from the drop-down list in the top left. A list of contacts "
+"and chat room for that account will be shown below."
msgstr ""
"Wählen Sie ein Konto in der Auswahlliste oben links. Eine Liste der Kontakte "
"und Unterhaltungsräume für dieses Konto wird darunter angezeigt."
@@ -1171,8 +1159,8 @@ msgid ""
"You can search for text in the displayed conversation by typing into the "
"search field at the top. The matching text will be highlighted."
msgstr ""
-"Sie können nach Text in der angezeigten Unterhaltung suchen, indem Sie ihn "
-"in das Suchfeld oben eingeben. Der damit übereinstimmende Text wird "
+"Sie können nach Text in der angezeigten Unterhaltung suchen, indem Sie ihn in "
+"das Suchfeld oben eingeben. Der damit übereinstimmende Text wird "
"hervorgehoben."
#: C/prev-conv.page:121(p)
@@ -1236,13 +1224,13 @@ msgstr "Weitergabe"
#: C/license.page:39(p)
msgid ""
-"You must attribute the work in the manner specified by the author or "
-"licensor (but not in any way that suggests that they endorse you or your use "
-"of the work)."
+"You must attribute the work in the manner specified by the author or licensor "
+"(but not in any way that suggests that they endorse you or your use of the "
+"work)."
msgstr ""
"Sie dürfen das Werk nur unter gleichen Bedingungen weitergeben, wie Sie vom "
-"Autor oder Lizenzgeber festgelegt wurden (aber nicht so, dass es wie Ihr "
-"Werk aussieht)."
+"Autor oder Lizenzgeber festgelegt wurden (aber nicht so, dass es wie Ihr Werk "
+"aussieht)."
#: C/license.page:46(em)
msgid "Share Alike"
@@ -1261,10 +1249,10 @@ msgstr ""
#: C/license.page:53(p)
msgid ""
-"For the full text of the license, see the <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
-"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
-"sa/3.0/\">Commons Deed</link>."
+"For the full text of the license, see the <link href=\"http://creativecommons."
+"org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</link>, or read "
+"the full <link href=\"http://creativecommons.org/licenses/by-sa/3.0/"
+"\">Commons Deed</link>."
msgstr ""
"Den vollständigen Text der Lizenz finden sie auf der <link href=\"http://"
"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons-Webseite</"
@@ -1285,8 +1273,8 @@ msgid ""
"public IRC chat rooms. To start a conversation with another IRC user:"
msgstr ""
"Sie können private Unterhaltungen mit anderen IRC-Benutzern außerhalb der "
-"öffentlichen IRC-Unterhaltungsräume führen. So beginnen Sie eine "
-"Unterhaltung mit einem anderen IRC-Benutzer:"
+"öffentlichen IRC-Unterhaltungsräume führen. So beginnen Sie eine Unterhaltung "
+"mit einem anderen IRC-Benutzer:"
#: C/irc-start-conversation.page:37(p)
msgid ""
@@ -1301,20 +1289,20 @@ msgstr ""
#: C/irc-start-conversation.page:45(p)
msgid ""
-"The IRC room contact list is not the same as <app>Empathy</app> contact "
-"list. It contains a list of users in the IRC chat room you joined. Different "
-"rooms can have different contacts listed."
+"The IRC room contact list is not the same as <app>Empathy</app> contact list. "
+"It contains a list of users in the IRC chat room you joined. Different rooms "
+"can have different contacts listed."
msgstr ""
-"Die Kontaktliste in IRC-Unterhaltungsräumen ist nicht mit der Kontaktliste "
-"in <app>Empathy</app> vergleichbar. Sie enthält eine Liste von Benutzern des "
+"Die Kontaktliste in IRC-Unterhaltungsräumen ist nicht mit der Kontaktliste in "
+"<app>Empathy</app> vergleichbar. Sie enthält eine Liste von Benutzern des "
"Raumes, den Sie betreten haben. Verschiedene Räume können unterschiedliche "
"Kontaktlisten haben."
#: C/irc-start-conversation.page:52(p)
msgid ""
"The IRC room contact list is usually on the right side of the IRC room "
-"window. If you do not see it, choose <guiseq><gui>Conversation</"
-"gui><gui>Show Contact List</gui></guiseq>."
+"window. If you do not see it, choose <guiseq><gui>Conversation</gui><gui>Show "
+"Contact List</gui></guiseq>."
msgstr ""
"Die Kontaktliste des IRC-Raumes befindet sich üblicherweise an der rechten "
"Seite des IRC-Fensters. Falls sie nicht angezeigt wird, wählen Sie "
@@ -1337,8 +1325,8 @@ msgstr "Derzeit ist es nicht möglich, Dateien im IRC zu versenden."
#: C/irc-nick-password.page:10(desc)
msgid "Protect your nickname to prevent other IRC users from using it."
msgstr ""
-"Schützen Sie Ihren Spitznamen, um zu verhindern, dass andere IRC-Benutzer "
-"ihn verwenden."
+"Schützen Sie Ihren Spitznamen, um zu verhindern, dass andere IRC-Benutzer ihn "
+"verwenden."
#: C/irc-nick-password.page:33(title)
msgid "Use a nickname password on IRC"
@@ -1358,19 +1346,25 @@ msgstr ""
"betreten."
#: C/irc-nick-password.page:40(p)
-msgid ""
-"<app>Empathy</app> does not currently support nickname registration. Some "
-"IRC networks, however, will automatically forward a <em>server password</em> "
-"to NickServ. On these networks, you can use the IRC password in "
-"<app>Empathy</app> to identify yourself to NickServ. The popular FreeNode "
-"network is known to have this feature."
+#| msgid ""
+#| "<app>Empathy</app> does not currently support nickname registration. Some "
+#| "IRC networks, however, will automatically forward a <em>server password</"
+#| "em> to NickServ. On these networks, you can use the IRC password in "
+#| "<app>Empathy</app> to identify yourself to NickServ. The popular FreeNode "
+#| "network is known to have this feature."
+msgid ""
+"<app>Empathy</app> does not currently support nickname registration. Some IRC "
+"networks, however, will automatically forward a <em>server password</em> to "
+"NickServ. On these networks, you can use the IRC password in <app>Empathy</"
+"app> to identify yourself to NickServ. The popular freenode network is known "
+"to have this feature."
msgstr ""
"<app>Empathy</app> unterstützt gegenwärtig die Registrierung von Spitznamen "
-"nicht. Einige IRC-Netzwerke leiten jedoch automatisch ein "
-"<em>Serverpasswort</em> an NickServ weiter. In diesen Netzwerken können Sie "
-"das IRC-Passwort in <app>Empathy</app> verwenden, um sich bei NickServ zu "
-"identifizieren. Das populäre FreeNode-Netzwerk verfügt bekanntermaßen über "
-"dieses Funktionsmerkmal."
+"nicht. Einige IRC-Netzwerke leiten jedoch automatisch ein <em>Serverpasswort</"
+"em> an NickServ weiter. In diesen Netzwerken können Sie das IRC-Passwort in "
+"<app>Empathy</app> verwenden, um sich bei NickServ zu identifizieren. Das "
+"populäre FreeNode-Netzwerk verfügt bekanntermaßen über dieses "
+"Funktionsmerkmal."
#: C/irc-nick-password.page:46(p)
msgid "To set an IRC server password:"
@@ -1383,14 +1377,13 @@ msgstr ""
#: C/irc-nick-password.page:57(p)
msgid ""
-"In the <gui>Password</gui> field, type the password you used to register "
-"your nikcname."
+"In the <gui>Password</gui> field, type the password you used to register your "
+"nikcname."
msgstr ""
"Geben Sie im Textfeld <gui>Passwort</gui> das Passwort ein, dass Sie bei der "
"Registrierung Ihres Spitznamens verwendet haben."
#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
-#: C/add-account.page:70(p)
msgid "Click <gui style=\"button\">Apply</gui>."
msgstr "Klicken Sie auf <gui style=\"button\">Anwenden</gui>."
@@ -1409,23 +1402,31 @@ msgstr ""
msgid "How to use IRC with <app>Empathy</app>."
msgstr "Benutzung des IRC mit <app>Empathy</app>."
-#: C/irc-manage.page:33(title)
+#: C/irc-manage.page:34(title)
msgid "Internet Relay Chat (IRC)"
msgstr "Internet Relay Chat (IRC)"
-#: C/irc-manage.page:37(title)
+#: C/irc-manage.page:37(p) C/account-irc.page:39(p)
+msgid ""
+"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
+"<app>Empathy</app>."
+msgstr ""
+"Sie müssen das Paket <sys>telepathy-idle</sys> installiert haben, um das IRC "
+"in <app>Empathy</app> nutzen zu können."
+
+#: C/irc-manage.page:43(title)
msgid "IRC Chat Rooms and Conversations"
msgstr "IRC-Räume und Unterhaltungen"
-#: C/irc-manage.page:39(title)
+#: C/irc-manage.page:45(title)
msgid "Chat Rooms and Conversations"
msgstr "Unterhaltungsräume und Unterhaltungen"
-#: C/irc-manage.page:44(title)
+#: C/irc-manage.page:50(title)
msgid "Common IRC Problems"
msgstr "Häufige Probleme im IRC"
-#: C/irc-manage.page:46(title) C/index.page:52(title)
+#: C/irc-manage.page:52(title) C/index.page:52(title)
msgid "Common Problems"
msgstr "Häufig auftretende Probleme"
@@ -1493,29 +1494,32 @@ msgid "Join a protected IRC chat room"
msgstr "Betreten eines passwortgeschützten Raumes im IRC"
#: C/irc-join-pwd.page:27(p)
+#| msgid ""
+#| "On some IRC networks, private IRC rooms may be protected with a password."
msgid ""
-"On some IRC networks, private IRC rooms may be protected with a password."
+"On some IRC networks, private IRC rooms may be protected with a password. If "
+"you know the password, use the following steps to join:"
msgstr ""
"In einigen IRC-Netzwerken können private IRC-Räume durch ein Passwort "
-"geschützt sein."
-
-#: C/irc-join-pwd.page:30(p)
-msgid "To join such a room, if you know the password:"
-msgstr ""
-"So betreten Sie einen solchen Raum, falls Ihnen das Passwort bekannt ist:"
+"geschützt sein. Falls Sie das Passwort kennen, gehen Sie wie folgt vor, um "
+"den Raum zu betreten:"
-#: C/irc-join-pwd.page:35(p)
-msgid "<link xref=\"irc-join-room\">Join the room</link>."
-msgstr "<link xref=\"irc-join-room\">Betreten Sie den Raum</link>."
+#: C/irc-join-pwd.page:33(p)
+#| msgid "<link xref=\"irc-join-room\">Join the room</link>."
+msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
+msgstr "<link xref=\"irc-join-room\">Betreten Sie den Raum</link> wie gewohnt."
-#: C/irc-join-pwd.page:40(p)
+#: C/irc-join-pwd.page:38(p)
+#| msgid ""
+#| "In the <gui>This room is protected by a password</gui> text box, type the "
+#| "IRC room password, and click on <gui style=\"button\">Join</gui>."
msgid ""
-"In the <gui>This room is protected by a password</gui> text box, type the "
-"IRC room password, and click on <gui style=\"button\">Join</gui>."
+"Empathy will prompt you for a password. Enter the password for the IRC chat "
+"room and click <gui style=\"button\">Join</gui>."
msgstr ""
-"Geben Sie im Textfeld <gui>Dieser Raum ist durch ein Kennwort geschützt</"
-"gui> das Passwort für den IRC-Raum ein und klicken Sie auf <gui style="
-"\"button\">Beitreten</gui>."
+"<app>Empathy</app> wird Sie nach einem Passwort fragen. Geben Sie das "
+"Passwort für den IRC-Raum ein und klicken Sie auf <gui style=\"button"
+"\">Beitreten</gui>."
#: C/irc-commands.page:7(desc)
msgid "The supported IRC commands."
@@ -1556,14 +1560,14 @@ msgstr "Einführung"
#: C/introduction.page:30(p)
msgid ""
-"<app>Empathy</app> is an instant messaging application for the GNOME "
-"Desktop. It supports text messaging, voice &amp; video call, file transfers "
-"and all the most used messaging systems such as MSN and Google Talk."
+"<app>Empathy</app> is an instant messaging application for the GNOME Desktop. "
+"It supports text messaging, voice &amp; video call, file transfers and all "
+"the most used messaging systems such as MSN and Google Talk."
msgstr ""
"<app>Empathy</app> ist eine Sofortnachrichten-Anwendung für die GNOME-"
-"Arbeitsumgebung. Textnachrichten, Sprach- und Videoanrufe, "
-"Dateiübertragungen sowie alle gängigen Nachrichtensysteme wie MSN und "
-"GoogleTalk werden unterstützt."
+"Arbeitsumgebung. Textnachrichten, Sprach- und Videoanrufe, Dateiübertragungen "
+"sowie alle gängigen Nachrichtensysteme wie MSN und GoogleTalk werden "
+"unterstützt."
#: C/introduction.page:35(p)
msgid ""
@@ -1639,8 +1643,7 @@ msgstr "Fortgeschrittene Aktionen"
#: C/import-account.page:10(desc)
msgid "Import an account from another instant messaging application."
-msgstr ""
-"Importieren eines Kontos aus einer anderen Sofortnachrichten-Anwendung."
+msgstr "Importieren eines Kontos aus einer anderen Sofortnachrichten-Anwendung."
#: C/import-account.page:19(name)
msgid "Peter Haslam"
@@ -1660,9 +1663,9 @@ msgid ""
"accounts from other instant messaging applications. Currently, the only "
"supported application is <app>Pidgin</app>."
msgstr ""
-"Wenn Sie <app>Empathy</app> zum ersten Mal starten, wird Ihnen der Import "
-"von Konten aus anderen Sofortnachrichten-Anwendungen angeboten. Gegenwärtig "
-"wird als einzige Anwendung <app>Pidgin</app> unterstützt."
+"Wenn Sie <app>Empathy</app> zum ersten Mal starten, wird Ihnen der Import von "
+"Konten aus anderen Sofortnachrichten-Anwendungen angeboten. Gegenwärtig wird "
+"als einzige Anwendung <app>Pidgin</app> unterstützt."
#: C/import-account.page:50(p)
msgid ""
@@ -1674,8 +1677,8 @@ msgstr ""
#: C/import-account.page:54(p)
msgid ""
-"Select <gui>Yes, import my account details from</gui> and click "
-"<gui>Forward</gui>."
+"Select <gui>Yes, import my account details from</gui> and click <gui>Forward</"
+"gui>."
msgstr ""
"Wählen Sie <gui>Ja, meine Kontodetails importieren von</gui> und klicken Sie "
"auf <gui>Weiter</gui>."
@@ -1732,8 +1735,7 @@ msgstr ""
#: C/group-conversations.page:8(desc)
msgid "Start or join a group conversation with your contacts."
-msgstr ""
-"Starten oder betreten Sie eine Gruppenunterhaltung mit Ihren Kontakten."
+msgstr "Starten oder betreten Sie eine Gruppenunterhaltung mit Ihren Kontakten."
#: C/group-conversations.page:34(title)
msgid "Group conversations"
@@ -1741,8 +1743,8 @@ msgstr "Gruppenunterhaltungen"
#: C/group-conversations.page:36(p)
msgid ""
-"Group conversations permits you to have text conversations with more than "
-"one contact at the same time."
+"Group conversations permits you to have text conversations with more than one "
+"contact at the same time."
msgstr ""
"Gruppenunterhaltungen ermöglichen Ihnen Textunterhaltungen mit mehreren "
"Kontakten zugleich."
@@ -1811,8 +1813,8 @@ msgid ""
"<gui>Contact List</gui> window, select the contact you want to invite, and "
"perform one of the following:"
msgstr ""
-"Um im <gui>Kontaktlisten</gui>-Fenster andere Kontakte zur Teilnahme an "
-"einer Gruppenunterhaltung einzuladen, gehen Sie wie folgt vor:"
+"Um im <gui>Kontaktlisten</gui>-Fenster andere Kontakte zur Teilnahme an einer "
+"Gruppenunterhaltung einzuladen, gehen Sie wie folgt vor:"
#: C/group-conversations.page:97(p)
msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
@@ -1830,8 +1832,8 @@ msgstr ""
#: C/group-conversations.page:107(p)
msgid ""
-"If you have more than one group conversation open, select the one you want "
-"to invite your contacts."
+"If you have more than one group conversation open, select the one you want to "
+"invite your contacts."
msgstr ""
"Falls Sie mehrere Gruppenunterhaltung geöffnet haben, wählen Sie diejenige "
"aus, in welche Sie Ihre Kontakte einladen wollen."
@@ -1843,8 +1845,8 @@ msgstr "Einer Gruppenunterhaltung beitreten"
#: C/group-conversations.page:128(p)
msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
msgstr ""
-"Klappen Sie den Abschnitt <gui>Raumliste</gui> aus, um alle vorhandenen "
-"Räume anzuzeigen."
+"Klappen Sie den Abschnitt <gui>Raumliste</gui> aus, um alle vorhandenen Räume "
+"anzuzeigen."
#: C/group-conversations.page:133(p)
msgid "Double-click on the name of a room to join it."
@@ -1874,8 +1876,8 @@ msgid ""
"computer or a device connected to the Internet."
msgstr ""
"Geoposition ermöglicht Ihnen die Ermittlung des wirklichen geografischen "
-"Ortes eines Rechners oder anderen Gerätes, welches mit dem Internet "
-"verbunden ist."
+"Ortes eines Rechners oder anderen Gerätes, welches mit dem Internet verbunden "
+"ist."
#: C/geolocation-what-is.page:37(p)
msgid "With geolocation in <app>Empathy</app> you can:"
@@ -2019,9 +2021,9 @@ msgstr ""
#: C/geolocation-privacy.page:40(p)
msgid ""
-"The accuracy and the quantity of information about your geographical "
-"position are based on the software or on the infrastructure used to discover "
-"your position."
+"The accuracy and the quantity of information about your geographical position "
+"are based on the software or on the infrastructure used to discover your "
+"position."
msgstr ""
"Die Genauigkeit und die Menge der verfügbaren Informationen über Ihre "
"geografische Position hängen von der Software oder der Infrastruktur ab, die "
@@ -2029,9 +2031,9 @@ msgstr ""
#: C/geolocation-privacy.page:44(p)
msgid ""
-"Different kind of networks may have different accuracy settings, and may "
-"send different information. The use of external devices such as GPS or "
-"mobile phone will increase the accuracy of the information sent."
+"Different kind of networks may have different accuracy settings, and may send "
+"different information. The use of external devices such as GPS or mobile "
+"phone will increase the accuracy of the information sent."
msgstr ""
"Verschiedene Arten von Netzwerken haben unterschiedliche "
"Genauigkeitseinstellungen und senden daher verschiedene Informationen. Die "
@@ -2040,8 +2042,8 @@ msgstr ""
#: C/geolocation-privacy.page:49(p)
msgid ""
-"When the privacy mode is enabled, nothing more precise than your city will "
-"be sent, even if you are using an external device."
+"When the privacy mode is enabled, nothing more precise than your city will be "
+"sent, even if you are using an external device."
msgstr ""
"Wenn der Privatsphäre-Modus aktiviert ist, wird nichts Genaueres als "
"lediglich Angaben über die Stadt gesendet, in der Sie sich befinden, selbst "
@@ -2088,8 +2090,7 @@ msgid "Privacy mode is enabled by default."
msgstr "Der Datenschutzmodus ist per Vorgabe aktiviert."
#: C/geolocation-privacy.page:87(p)
-msgid ""
-"Privacy mode prevails even when using external and more precise devices."
+msgid "Privacy mode prevails even when using external and more precise devices."
msgstr ""
"Der Privatsphäre-Modus ist auch dann wirksam, wenn externe und genauere "
"Geräte benutzt werden."
@@ -2111,8 +2112,8 @@ msgid ""
"If your contacts cannot see your location, <app>Empathy</app> might not be "
"able to discover with a good margin of precision your geographical position."
msgstr ""
-"Falls Ihre Kontakte Ihren Ort nicht sehen können, dann ist <app>Empathy</"
-"app> möglicherweise nicht in der Lage, Ihren Ort mit einer hinreichenden "
+"Falls Ihre Kontakte Ihren Ort nicht sehen können, dann ist <app>Empathy</app> "
+"möglicherweise nicht in der Lage, Ihren Ort mit einer hinreichenden "
"Genauigkeit zu bestimmen."
#: C/geolocation-not-showing.page:38(p)
@@ -2135,14 +2136,14 @@ msgstr ""
msgid ""
"In order to publish your geographical location, your Jabber server needs to "
"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
-"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support "
-"PEP</link> is maintained online. Google Talk does not support this feature "
-"at this time."
+"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support PEP</"
+"link> is maintained online. Google Talk does not support this feature at this "
+"time."
msgstr ""
"Um Ihre geografische Position übermitteln zu können, muss Ihr Jabber-Server "
-"das »Personal Eventing Protocol« (PEP) unterstützen. Eine Liste von <link "
-"href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">Servern mit "
-"PEP-Unterstützung</link> wird im Internet gepflegt. Google Talk unterstützt "
+"das »Personal Eventing Protocol« (PEP) unterstützen. Eine Liste von <link href="
+"\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">Servern mit PEP-"
+"Unterstützung</link> wird im Internet gepflegt. Google Talk unterstützt "
"dieses Funktionsmerkmal derzeit nicht."
#: C/geolocation.page:8(desc)
@@ -2179,19 +2180,19 @@ msgstr "Betreten eines Raumes."
#: C/favorite-rooms.page:40(p)
msgid ""
-"See <link xref=\"irc-join-room\"/> for more information on how to join an "
-"IRC room."
+"See <link xref=\"irc-join-room\"/> for more information on how to join an IRC "
+"room."
msgstr ""
"In <link xref=\"irc-join-room\"/> finden Sie weitere Informationen über das "
"Betreten eines Raumes im IRC."
#: C/favorite-rooms.page:46(p)
msgid ""
-"See <link xref=\"group-conversations\"/> for more information on how to "
-"start or join a group conversation."
+"See <link xref=\"group-conversations\"/> for more information on how to start "
+"or join a group conversation."
msgstr ""
-"In <link xref=\"group-conversations\"/> finden Sie weitere Informationen "
-"über das Starten oder Teilnehmen an einer Gruppenunterhaltung."
+"In <link xref=\"group-conversations\"/> finden Sie weitere Informationen über "
+"das Starten oder Teilnehmen an einer Gruppenunterhaltung."
#: C/favorite-rooms.page:54(p)
msgid ""
@@ -2211,8 +2212,8 @@ msgstr "Drücken Sie <key>F5</key>."
#: C/favorite-rooms.page:76(p)
msgid ""
-"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
-"all your favorite rooms."
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join all "
+"your favorite rooms."
msgstr ""
"Wählen Sie <guiseq><gui>Raum</gui><gui>Favoriten betreten</gui></guiseq>, um "
"alle Ihre bevorzugten Räume zu betreten."
@@ -2225,8 +2226,8 @@ msgstr ""
#: C/favorite-rooms.page:90(p)
msgid ""
-"To join a favorite room, you need to be connected to the Internet and to "
-"your account."
+"To join a favorite room, you need to be connected to the Internet and to your "
+"account."
msgstr ""
"Um einen bevorzugten Raum zu betreten, müssen Sie mit dem Internet und mit "
"Ihrem Konto verbunden sein."
@@ -2248,8 +2249,8 @@ msgid ""
"From the <gui>Account</gui> drop-down list, select the account you want to "
"manage the favorite rooms of."
msgstr ""
-"Aus der <guilabel>Konto</guilabel>-Aufklappliste wählen Sie das Konto, "
-"dessen bevorzugte Räume Sie verwalten wollen."
+"Aus der <guilabel>Konto</guilabel>-Aufklappliste wählen Sie das Konto, dessen "
+"bevorzugte Räume Sie verwalten wollen."
#: C/favorite-rooms.page:111(p)
msgid "Select <gui>All</gui> to see all you favorite rooms."
@@ -2264,8 +2265,8 @@ msgid ""
"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
"that room when you connect to your account."
msgstr ""
-"Aktivieren Sie das Ankreuzfeld <gui>Auto-Verbinden</gui>, um einen Raum "
-"immer dann automatisch zu betreten, wenn Sie sich an Ihrem Konto anmelden."
+"Aktivieren Sie das Ankreuzfeld <gui>Auto-Verbinden</gui>, um einen Raum immer "
+"dann automatisch zu betreten, wenn Sie sich an Ihrem Konto anmelden."
#: C/favorite-rooms.page:127(p)
msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
@@ -2297,8 +2298,8 @@ msgstr ""
"Sie können ein Konto deaktivieren, um zu verhindern, dass <app>Empathy</app> "
"sich an diesem Konto anmeldet. Das Konto wird dabei nicht völlig entfernt. "
"Vielleicht wollen Sie ein Konto deaktivieren und erneut aktivieren, wenn Sie "
-"nur zeitweise angemeldet sein wollen, aber <app>Empathy</app> noch für "
-"andere Konten nutzen wollen."
+"nur zeitweise angemeldet sein wollen, aber <app>Empathy</app> noch für andere "
+"Konten nutzen wollen."
#: C/disable-account.page:52(p)
msgid ""
@@ -2318,8 +2319,7 @@ msgstr ""
#: C/disable-account.page:62(p)
msgid ""
-"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
-"gui>."
+"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</gui>."
msgstr ""
"Um das Konto erneut zu aktivieren, wählen Sie <gui style=\"checkbox"
"\">Aktiviert</gui>."
@@ -2328,11 +2328,11 @@ msgstr ""
msgid "Register for an account with one of the supported messaging services."
msgstr "Ein Konto bei einem der unterstützten Nachrichtendienste registrieren."
-#: C/create-account.page:32(title)
+#: C/create-account.page:33(title)
msgid "Register for a new account"
msgstr "Ein neues Konto registrieren"
-#: C/create-account.page:34(p)
+#: C/create-account.page:35(p)
msgid ""
"Most account types require you to create an account with a account provider "
"before you can connect using instant messaging applications like "
@@ -2340,40 +2340,71 @@ msgid ""
"app> to register for a new account, using the same steps as you would to "
"<link xref=\"add-account\">add an account</link>."
msgstr ""
-"Für die meisten Kontentypen ist es erforderlich, dass Sie ein Konto bei "
-"einem Dienstanbieter erstellen, bevor Sie sich über Sofortnachrichten-"
-"Anwendungen wie <gui>Empathy</gui> verbinden können. Für einige "
-"Kontenanbieter können Sie <gui>Empathy</gui> verwenden, um ein neues Konto "
-"zu registrieren, unter Anwendung der gleichen Schritte wie für das <link "
-"xref=\"add-account\">Hinzufügen eines Kontos</link>."
+"Für die meisten Kontentypen ist es erforderlich, dass Sie ein Konto bei einem "
+"Dienstanbieter erstellen, bevor Sie sich über Sofortnachrichten-Anwendungen "
+"wie <gui>Empathy</gui> verbinden können. Für einige Kontenanbieter können Sie "
+"<gui>Empathy</gui> verwenden, um ein neues Konto zu registrieren, unter "
+"Anwendung der gleichen Schritte wie für das <link xref=\"add-account"
+"\">Hinzufügen eines Kontos</link>."
-#: C/create-account.page:40(p)
+#: C/create-account.page:41(p)
msgid ""
-"This page provides information on creating a new account for various types "
-"of accounts. Your account provider should give you a login ID and a "
-"password, as well as any additional information you need to connect with "
-"<app>Empathy</app>."
+"This page provides information on creating a new account for various types of "
+"accounts. Your account provider should give you a login ID and a password, as "
+"well as any additional information you need to connect with <app>Empathy</"
+"app>."
msgstr ""
"Diese Seite stellt für die verschiedenen Kontentypen Informationen über das "
"Anlegen eines neuen Kontos bereit. Sie sollten von Ihrem Dienstanbieter eine "
"Anmeldekennung und ein Passwort sowie eventuelle zusätzliche Informationen "
"erhalten haben, die Sie zum Verbinden mit <gui>Empathy</gui> benötigen."
-#: C/create-account.page:45(title) C/audio-video.page:170(p)
+#: C/create-account.page:46(title)
+msgid "Facebook"
+msgstr "Facebook"
+
+#: C/create-account.page:47(p)
+#| msgid ""
+#| "Facebook is one of the most used social network. It provides users with "
+#| "the opportunity to create their own profile, and to communicate with their "
+#| "friends."
+msgid ""
+"Facebook is one of the most-used social networks. It allows users to create "
+"their own profile and to communicate with their friends."
+msgstr ""
+"Facebook ist eines der am meisten genutzten sozialen Netzwerke. Den Benutzern "
+"wird die Erstellung eines eigenen Profils und die Kommunikation mit ihren "
+"Freunden ermöglicht."
+
+#: C/create-account.page:51(p)
+#| msgid ""
+#| "In order to use Facebook to communicate with your friends, you will need "
+#| "to create a new account from the website: <link href=\"http://www.facebook."
+#| "com\">www.facebook.com</link>."
+msgid ""
+"To use Facebook to communicate with your friends, you will need to create a "
+"new account from the website: <link href=\"http://www.facebook.com\">www."
+"facebook.com</link>."
+msgstr ""
+"Um Facebook zur Unterhaltung mit Ihren Freunden nutzen zu können, müssen Sie "
+"ein neues Konto auf folgender Webseite erstellen: <link href=\"http://www."
+"facebook.com\">www.facebook.com</link>."
+
+#: C/create-account.page:59(title) C/audio-video.page:170(p)
msgid "Jabber"
msgstr "Jabber"
-#: C/create-account.page:47(p)
+#: C/create-account.page:61(p)
msgid ""
"Jabber is an open instant messaging system. Like email, Jabber allows you to "
"choose your account provider and communicate with all other Jabber users, "
"regardless of their account provider."
msgstr ""
"Jabber ist ein offenes Sofortnachrichtensystem. Wie E-Mail, erlaubt Jabber "
-"die Wahl Ihres Konto-Dienstanbieters und die Kommunikation mit anderen "
-"Jabber-Benutzern, unabhängig von deren Konto-Dienstanbietern."
+"die Wahl Ihres Konto-Dienstanbieters und die Kommunikation mit anderen Jabber-"
+"Benutzern, unabhängig von deren Konto-Dienstanbietern."
-#: C/create-account.page:51(p)
+#: C/create-account.page:65(p)
msgid ""
"You will need to create a new account with a Jabber provider. There are many "
"free providers; one popular provider is <link href=\"http://register.jabber."
@@ -2383,22 +2414,21 @@ msgstr ""
"anlegen. Es gibt zahlreiche freie Jabber-Dienstanbieter, einer der "
"populärsten ist <link href=\"http://register.jabber.org/\">Jabber.org</link>."
-#: C/create-account.page:56(p)
+#: C/create-account.page:70(p)
msgid ""
"If you use Google Mail or Google Talk, you already have a Jabber account. "
"Google Talk is a Jabber service. Simply use your Google Mail address and "
"password in <app>Empathy</app> to connect."
msgstr ""
-"Falls Sie Google Mail oder Google Talk benutzen, haben Sie bereits ein "
-"Jabber-Konto. Google Talk ist ein Jabber-Dienst. Verwenden Sie einfach Ihre "
-"Google Mail-Adresse und Ihr Passwort in <app>Empathy</app> für die "
-"Verbindung."
+"Falls Sie Google Mail oder Google Talk benutzen, haben Sie bereits ein Jabber-"
+"Konto. Google Talk ist ein Jabber-Dienst. Verwenden Sie einfach Ihre Google "
+"Mail-Adresse und Ihr Passwort in <app>Empathy</app> für die Verbindung."
-#: C/create-account.page:63(title) C/audio-video.page:190(p)
+#: C/create-account.page:77(title) C/audio-video.page:190(p)
msgid "People Nearby"
msgstr "Personen in der Nähe"
-#: C/create-account.page:65(p)
+#: C/create-account.page:79(p)
msgid ""
"You do not need to create an account with a service provider to use this "
"feature. This service works whenever you are connected to a local network, "
@@ -2408,18 +2438,18 @@ msgstr ""
"Sie müssen kein Konto bei einem Dienstanbieter anlegen, um dieses "
"Funktionsmerkmal nutzen zu können. Dieser Dienst ist immer dann verfügbar, "
"wenn Sie mit einem lokalen Netzwerk verbunden sind, zum Beispiel einem "
-"drahtlosen Zugangspunkt (Hotspot). Andere Benutzer, die diesen Dienst "
-"nutzen, werden im Netzwerk automatisch gefunden."
+"drahtlosen Zugangspunkt (Hotspot). Andere Benutzer, die diesen Dienst nutzen, "
+"werden im Netzwerk automatisch gefunden."
-#: C/create-account.page:70(p)
+#: C/create-account.page:84(p)
msgid "For more information, see <link xref=\"salut-protocol\"/>."
msgstr "Weitere Informationen finden Sie in <link xref=\"salut-protocol\"/>."
-#: C/create-account.page:74(title) C/audio-video.page:205(p)
+#: C/create-account.page:88(title) C/audio-video.page:205(p)
msgid "SIP"
msgstr "SIP"
-#: C/create-account.page:76(p)
+#: C/create-account.page:90(p)
msgid ""
"SIP is an open system which allows users to have audio and video "
"conversations over the Internet. You need to create an account with a SIP "
@@ -2428,10 +2458,10 @@ msgid ""
msgstr ""
"SIP ist ein offenes System für Audio- und Video-Unterhaltungen übar das "
"Internet. Sie müssen ein SIP-Konto bei einem Dienstanbieter erstellen. "
-"Unabhängig davon, welchen Dienstanbieter Ihre Kontakte nutzen, können Sie "
-"mit allen anderen SIP-Benutzern kommunizieren."
+"Unabhängig davon, welchen Dienstanbieter Ihre Kontakte nutzen, können Sie mit "
+"allen anderen SIP-Benutzern kommunizieren."
-#: C/create-account.page:81(p)
+#: C/create-account.page:95(p)
msgid ""
"There are a number of popular free SIP account providers; one popular "
"provider is <link href=\"https://signup.sipphone.com/new-users/app?"
@@ -2441,7 +2471,7 @@ msgstr ""
"<link href=\"https://signup.sipphone.com/new-users/app?class=NewUser;"
"proc=start\">Sipphone</link>."
-#: C/create-account.page:86(p)
+#: C/create-account.page:100(p)
msgid ""
"Due to technical differences, the free <link href=\"https://www.ekiga.net/"
"index.php?page=register\">Ekiga.net</link> service does not currently work "
@@ -2451,42 +2481,42 @@ msgstr ""
"net/index.php?page=register\">Ekiga.net</link> derzeit nicht mit "
"<app>Empathy</app>."
-#: C/create-account.page:91(p)
+#: C/create-account.page:105(p)
msgid ""
"Some SIP providers allow you to call normal phones from your computer. "
"Generally, you will need to subscribe to a paid service for this feature."
msgstr ""
-"Einige SIP-Dienste ermöglichen es, von Ihrem Rechner aus gewöhnliche "
-"Telefone anzurufen. Im Allgemeinen werden Sie sich hierfür an einem zu "
-"bezahlenden Dienst registrieren müssen."
+"Einige SIP-Dienste ermöglichen es, von Ihrem Rechner aus gewöhnliche Telefone "
+"anzurufen. Im Allgemeinen werden Sie sich hierfür an einem zu bezahlenden "
+"Dienst registrieren müssen."
-#: C/create-account.page:96(title) C/audio-video.page:165(p)
+#: C/create-account.page:110(title) C/audio-video.page:165(p)
msgid "IRC"
msgstr "IRC"
-#: C/create-account.page:98(p)
+#: C/create-account.page:112(p)
msgid ""
-"You do not need to register for an account to use IRC. Although you specify "
-"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
-"is only established each time you connect. If another user is using the "
+"You do not need to register for an account to use IRC. Although you specify a "
+"nickname when you add an IRC account to <app>Empathy</app>, this nickname is "
+"only established each time you connect. If another user is using the "
"nickname, you will need to choose a new nickname."
msgstr ""
-"Sie müssen kein Konto registrieren, um das IRC zu benutzen. Obgleich Sie "
-"beim Hinzufügen eines IRC-Kontos in <app>Empathy</app> einen Spitznamen "
-"angeben, wird dieser Spitzname zwar jedes Mal bei einem Verbindungsaufbau "
-"festgelegt. Falls aber ein anderer Benutzer diesen Spitznamen verwendet, "
-"müssen Sie einen neuen wählen."
+"Sie müssen kein Konto registrieren, um das IRC zu benutzen. Obgleich Sie beim "
+"Hinzufügen eines IRC-Kontos in <app>Empathy</app> einen Spitznamen angeben, "
+"wird dieser Spitzname zwar jedes Mal bei einem Verbindungsaufbau festgelegt. "
+"Falls aber ein anderer Benutzer diesen Spitznamen verwendet, müssen Sie einen "
+"neuen wählen."
-#: C/create-account.page:103(p)
+#: C/create-account.page:117(p)
msgid ""
"Some IRC networks use a service called NickServ to allow users to protect "
-"thier nicknames. See <link xref=\"irc-nick-password\"/> for more information."
+"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
msgstr ""
-"Einige IRC-Netzwerke verwenden einen Dienst namens NickServ, um deren "
-"Spitznamen zu schützen. Weitere Informationen finden Sie in <link xref=\"irc-"
-"nick-password\"/>."
+"Einige IRC-Netzwerke verwenden einen Dienst namens NickServ, um Benutzern zu "
+"ermöglichen, ihre Spitznamen zu schützen. Weitere Informationen finden Sie in "
+"<link xref=\"irc-nick-password\"/>."
-#: C/create-account.page:106(p)
+#: C/create-account.page:120(p)
msgid ""
"Some IRC servers are password protected. You will need to know the password "
"to connect to these servers. Generally, these are private IRC networks."
@@ -2495,11 +2525,11 @@ msgstr ""
"eine Verbindung zu diesen Servern herzustellen. Im Allgemeinen sind dies "
"private IRC-Netzwerke."
-#: C/create-account.page:111(title)
+#: C/create-account.page:125(title)
msgid "Proprietary Services"
msgstr "Proprietäre Dienste"
-#: C/create-account.page:113(p)
+#: C/create-account.page:127(p)
msgid ""
"There are many proprietary instant messaging services that have been "
"developed by different companies or organizations. <app>Empathy</app> allows "
@@ -2514,19 +2544,19 @@ msgstr ""
"anzulegen, besuchen Sie bitte die Webseite des jeweiligen Anbieters. "
"Bestätigen Sie dort die Nutzungsbedingungen."
-#: C/create-account.page:122(link) C/audio-video.page:135(p)
+#: C/create-account.page:136(link) C/audio-video.page:135(p)
msgid "AIM"
msgstr "AIM"
-#: C/create-account.page:127(link) C/audio-video.page:160(p)
+#: C/create-account.page:141(link) C/audio-video.page:160(p)
msgid "ICQ"
msgstr "ICQ"
-#: C/create-account.page:132(link) C/audio-video.page:175(p)
+#: C/create-account.page:146(link) C/audio-video.page:175(p)
msgid "MSN"
msgstr "MSN"
-#: C/create-account.page:137(link) C/audio-video.page:210(p)
+#: C/create-account.page:151(link) C/audio-video.page:210(p)
msgid "Yahoo!"
msgstr "Yahoo!"
@@ -2562,22 +2592,22 @@ msgstr "Wählen Sie einen Status in der Liste aus."
msgid ""
"See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
"what they mean. You can also <link xref=\"set-custom-message\">add custom "
-"status messages</link> to provide more information about your availability "
-"to your contacts."
+"status messages</link> to provide more information about your availability to "
+"your contacts."
msgstr ""
"In <link xref=\"status-icons\"/> finden Sie eine Liste mitgelieferter Status "
"sowie deren Bedeutung. Sie können auch <link xref=\"set-custom-message"
-"\">benutzerdefinierte Statusmeldungen hinzufügen</link>, um für Ihre "
-"Kontakte weitere Informationen über Ihren Status bereitzustellen."
+"\">benutzerdefinierte Statusmeldungen hinzufügen</link>, um für Ihre Kontakte "
+"weitere Informationen über Ihren Status bereitzustellen."
#: C/change-status.page:58(p)
msgid ""
-"If you do not use your computer for a while, or if the screensaver is on, "
-"the status will be automatically set to Away."
+"If you do not use your computer for a while, or if the screensaver is on, the "
+"status will be automatically set to Away."
msgstr ""
"Falls Sie Ihren Rechner für eine gewisse Zeit nicht bedienen oder der "
-"Bildschirmschoner eingeschaltet ist, wird der Status automatisch auf "
-"abwesend gesetzt."
+"Bildschirmschoner eingeschaltet ist, wird der Status automatisch auf abwesend "
+"gesetzt."
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
@@ -2599,8 +2629,8 @@ msgstr "Audio- und Video-Unterstützung"
#: C/audio-video.page:34(p)
msgid ""
-"You can only have audio and video conversation with contacts who are using "
-"an application which also supports this feature. When your contacts support "
+"You can only have audio and video conversation with contacts who are using an "
+"application which also supports this feature. When your contacts support "
"audio or video conversations, you will see the following icons next to their "
"names in the contact list:"
msgstr ""
@@ -2635,8 +2665,8 @@ msgstr "Der Kontakt kann eine Video-Unterhaltung führen."
#: C/audio-video.page:83(p)
msgid ""
-"In order to have an audio conversation, you need to have a sound card that "
-"is supported by your operating system, and a working microphone."
+"In order to have an audio conversation, you need to have a sound card that is "
+"supported by your operating system, and a working microphone."
msgstr ""
"Um eine Audio-Unterhaltung führen zu können, benötigen Sie eine von Ihrem "
"Betriebssystem unterstützte Soundkarte sowie ein funktionierendes Mikrofon."
@@ -2659,10 +2689,9 @@ msgid ""
"supported services. The following table lists whether audio and video is "
"supported for each type of account."
msgstr ""
-"Sie können nur mit denjenigen Konten Audio- oder Video-Unterhaltungen "
-"führen, welche die entsprechenden Dienste unterstützen. In der folgenden "
-"Tabelle wird für jeden Kontentyp aufgelistet, ob Audio und Video unterstützt "
-"werden."
+"Sie können nur mit denjenigen Konten Audio- oder Video-Unterhaltungen führen, "
+"welche die entsprechenden Dienste unterstützen. In der folgenden Tabelle wird "
+"für jeden Kontentyp aufgelistet, ob Audio und Video unterstützt werden."
#: C/audio-video.page:102(p)
msgid ""
@@ -2672,21 +2701,21 @@ msgid ""
"are listed as unsupported here."
msgstr ""
"Kontentypen werden durch Plugins bereitgestellt. Auf Ihrem System könnten "
-"nicht alle der folgenden Typen verfügbar sein, oder die bei Ihnen "
-"verfügbaren Typen sind hier nicht aufgelistet. Durch aktualisierte Plugins "
-"könnte es möglich sein, dass hier als nicht unterstützte Typen aufgelistete "
-"Konten dennoch Audio- und Video-Unterhaltungen ermöglichen."
+"nicht alle der folgenden Typen verfügbar sein, oder die bei Ihnen verfügbaren "
+"Typen sind hier nicht aufgelistet. Durch aktualisierte Plugins könnte es "
+"möglich sein, dass hier als nicht unterstützte Typen aufgelistete Konten "
+"dennoch Audio- und Video-Unterhaltungen ermöglichen."
#: C/audio-video.page:110(p)
msgid ""
"I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
-"need to look at the accessibility impact. I've <link href=\"http://mail."
-"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
+"need to look at the accessibility impact. I've <link href=\"http://mail.gnome."
+"org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
"accessibility team</link> for input."
msgstr ""
"I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
-"need to look at the accessibility impact. I've <link href=\"http://mail."
-"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
+"need to look at the accessibility impact. I've <link href=\"http://mail.gnome."
+"org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
"accessibility team</link> for input."
#: C/audio-video.page:118(p)
@@ -2783,8 +2812,8 @@ msgstr "Eine Audio-Unterhaltung starten"
#: C/audio-call.page:35(p)
msgid ""
"You can call your contacts and have an audio conversation with them. This "
-"features only works with certain types of accounts, and it requires the "
-"other person to have an application that supports audio calls."
+"features only works with certain types of accounts, and it requires the other "
+"person to have an application that supports audio calls."
msgstr ""
"Sie können Ihre Kontakte anrufen und eine Audio-Unterhaltung mit ihnen "
"führen. Dieses Funktionsmerkmal unterstützt verschiedene Kontentypen. "
@@ -2793,30 +2822,30 @@ msgstr ""
#: C/audio-call.page:46(p)
msgid ""
-"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/audio-input-microphone.png\">audio call</"
-"media> icon next to the name of the contact you wish to call and choose <gui "
-"style=\"menuitem\">Audio Call</gui>. Alternatively, right click the contact "
-"and choose <gui style=\"menuitem\">Audio Call</gui>."
+"From the <gui>Contact List</gui> window, click the <media type=\"image\" mime="
+"\"image/png\" src=\"figures/audio-input-microphone.png\">audio call</media> "
+"icon next to the name of the contact you wish to call and choose <gui style="
+"\"menuitem\">Audio Call</gui>. Alternatively, right click the contact and "
+"choose <gui style=\"menuitem\">Audio Call</gui>."
msgstr ""
-"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image"
-"\" mime=\"image/png\" src=\"figures/audio-input-microphone.png\">Audioanruf</"
-"media>-Symbol neben dem Namen des Kontakts, den Sie anrufen wollen und "
-"wählen Sie <gui style=\"menuitem\">Audioanruf</gui>. Alternativ klicken Sie "
-"mit der rechten Maustaste auf den Kontakt und wählen Sie <gui style="
-"\"menuitem\">Audioanruf</gui>."
+"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/audio-input-microphone.png\">Audioanruf</"
+"media>-Symbol neben dem Namen des Kontakts, den Sie anrufen wollen und wählen "
+"Sie <gui style=\"menuitem\">Audioanruf</gui>. Alternativ klicken Sie mit der "
+"rechten Maustaste auf den Kontakt und wählen Sie <gui style=\"menuitem"
+"\">Audioanruf</gui>."
-#: C/audio-call.page:61(p)
+#: C/audio-call.page:63(p)
msgid ""
"To turn an audio conversation into a video conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>, "
-"or click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-"
-"web.png\">video call</media> toolbar button to select it."
-msgstr ""
-"Um eine Audio-Unterhaltung in eine Video-Unterhaltung umzuwandeln, wählen "
-"Sie <guiseq><gui style=\"menu\">Anruf</gui><gui style=\"menuitem\">Video "
-"ein</gui></guiseq> oder klicken Sie auf den <media type=\"image\" mime="
-"\"image/png\" src=\"figures/camera-web.png\">Videoanruf</media>-Knopf in der "
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>, or "
+"click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web."
+"png\">video call</media> toolbar button to select it."
+msgstr ""
+"Um eine Audio-Unterhaltung in eine Video-Unterhaltung umzuwandeln, wählen Sie "
+"<guiseq><gui style=\"menu\">Anruf</gui><gui style=\"menuitem\">Video ein</"
+"gui></guiseq> oder klicken Sie auf den <media type=\"image\" mime=\"image/png"
+"\" src=\"figures/camera-web.png\">Videoanruf</media>-Knopf in der "
"Werkzeugleiste, um dies auszuwählen."
#: C/add-contact.page:9(desc)
@@ -2840,8 +2869,8 @@ msgid ""
"service as the account you select."
msgstr ""
"Wählen Sie in der <gui>Konten</gui>-Auswahlliste das Konto aus, mit dem Sie "
-"sich zu Ihrem Kontakt verbinden wollen. Es ist erforderlich, dass Ihr "
-"Kontakt den gleichen Dienst verwendet, den Sie hier angeben."
+"sich zu Ihrem Kontakt verbinden wollen. Es ist erforderlich, dass Ihr Kontakt "
+"den gleichen Dienst verwendet, den Sie hier angeben."
#: C/add-contact.page:45(p)
msgid ""
@@ -2857,8 +2886,8 @@ msgid ""
"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
"to appear in your contact list."
msgstr ""
-"Geben Sie in das <guilabel>Alias</guilabel>-Textfeld den Namen ein, so wie "
-"er in der Kontaktliste erscheinen soll."
+"Geben Sie in das <guilabel>Alias</guilabel>-Textfeld den Namen ein, so wie er "
+"in der Kontaktliste erscheinen soll."
#: C/add-contact.page:53(p)
msgid "Click <gui>Add</gui> to add the person to your list of contacts."
@@ -2868,8 +2897,8 @@ msgstr ""
#: C/add-contact.page:61(p)
msgid ""
-"To add a new person to your list of contacts, you need to be connected to "
-"the Internet and to your account."
+"To add a new person to your list of contacts, you need to be connected to the "
+"Internet and to your account."
msgstr ""
"Um eine neue Person zu Ihrer Kontaktliste hinzuzufügen, müssen Sie mit dem "
"Internet und mit Ihrem Konto verbunden sein."
@@ -2878,16 +2907,16 @@ msgstr ""
msgid "Add a new account to <app>Empathy</app>."
msgstr "Einen neuen Kontakt zu <app>Empathy</app> hinzufügen."
-#: C/add-account.page:38(title)
+#: C/add-account.page:39(title)
msgid "Add a new account"
msgstr "Hinzufügen eines neuen Kontos"
-#: C/add-account.page:40(p)
+#: C/add-account.page:41(p)
msgid ""
"You can add instant messaging accounts from any supported service to "
-"communicate with all of your contacts in <app>Empathy</app>. For some "
-"account providers, these steps will also allow you to register for a new "
-"account. For more details, see <link xref=\"create-account\"/>."
+"communicate with all of your contacts in <app>Empathy</app>. For some account "
+"providers, these steps will also allow you to register for a new account. For "
+"more details, see <link xref=\"create-account\"/>."
msgstr ""
"Sie können Sofortnachrichten-Konten für jeden unterstützten Dienst anlegen, "
"um mit allen Ihren Kontakten in <app>Empathy</app> zu kommunizieren. Für "
@@ -2895,11 +2924,11 @@ msgstr ""
"eines neuen Kontos. Weitere Details hierzu finden Sie in <link xref=\"create-"
"account\"/>."
-#: C/add-account.page:51(p)
+#: C/add-account.page:52(p)
msgid "Click <gui style=\"button\">Add</gui>."
msgstr "Klicken Sie auf <gui style=\"button\">Hinzufügen</gui>."
-#: C/add-account.page:56(p)
+#: C/add-account.page:57(p)
msgid ""
"From the <gui>Protocol</gui> drop-down list, select the type of account you "
"wish to add."
@@ -2907,7 +2936,7 @@ msgstr ""
"Aus der <gui>Protokoll</gui>-Aufklappliste wählen Sie den Kontentyp, welchen "
"Sie hinzufügen wollen."
-#: C/add-account.page:60(p)
+#: C/add-account.page:61(p)
msgid ""
"If you do not already have a registered account, select <gui>Create a new "
"account on the server</gui>. This feature is not available for all account "
@@ -2920,23 +2949,27 @@ msgstr ""
"Dienstanbietern. Weitere Informationen hierzu finden Sie in <link xref="
"\"create-account\"/>."
-#: C/add-account.page:65(p)
+#: C/add-account.page:66(p)
msgid ""
-"Enter the required information. For most accounts, you will only need a "
-"login ID and a password. Some accounts may require additional information. "
-"See <link xref=\"accounts-window#details\"/> for more information."
+"Enter the required information. For most accounts, you will only need a login "
+"ID and a password. Some accounts may require additional information. See "
+"<link xref=\"accounts-window#details\"/> for more information."
msgstr ""
"Geben Sie die benötigten Informationen ein. Für die meisten Konten wird die "
"Eingabe einer Anmeldekennung und eines Passworts genügen. Einige Konten "
"könnten zusätzliche Angaben erfordern. Weitere Informationen hierzu finden "
"Sie in <link xref=\"accounts-window#details\"/>."
-#: C/add-account.page:77(p)
+#: C/add-account.page:71(p)
+msgid "Click <gui style=\"button\">Log in</gui>."
+msgstr "Klicken Sie auf <gui style=\"button\">Anmelden</gui>."
+
+#: C/add-account.page:78(p)
msgid ""
"To change the name that identifies the account in the <gui>Accounts</gui> "
"window, select the account from the list on the left and either click on the "
-"name or press the space bar. Edit the account name and press <key>Enter</"
-"key> when you’re finished."
+"name or press the space bar. Edit the account name and press <key>Enter</key> "
+"when you’re finished."
msgstr ""
"Um den Namen zu ändern, der das Konto im <gui>Konten</gui>-Fenster "
"identifiziert, wählen Sie das Konto aus der linken Liste aus und klicken Sie "
@@ -2954,8 +2987,7 @@ msgstr "Konten-Fenster"
#: C/accounts-window.page:35(p)
msgid ""
-"The <gui>Accounts</gui> window allows you to add, modify, and delete "
-"accounts."
+"The <gui>Accounts</gui> window allows you to add, modify, and delete accounts."
msgstr ""
"Das <gui>Konten</gui> ermöglicht Ihnen das Hinzufügen, Bearbeiten oder "
"Entfernen von Kontakten."
@@ -2979,23 +3011,23 @@ msgid "Advanced options for Jabber and Google Talk accounts."
msgstr "Fortgeschrittene Optionen für Konten bei Jabber und Google Talk."
#: C/account-jabber.page:29(title)
-msgid "Jabber Account Details"
+msgid "Jabber account details"
msgstr "Jabber-Kontendetails"
#: C/account-jabber.page:31(p)
msgid ""
"Most Jabber accounts will require only a login ID and a password to connect. "
"For some accounts or on certain types of networks, you may need to enter "
-"additional information in the <gui>Advanced</gui> section. Normally, you "
-"will not need to use the advanced options below. For general instructions on "
+"additional information in the <gui>Advanced</gui> section. Normally, you will "
+"not need to use the advanced options below. For general instructions on "
"adding an account, see <link xref=\"add-account\"/>."
msgstr ""
"Die meisten Jabber-Konten erfordern nur eine Anmeldekennung und ein Passwort "
-"für die Verbindung. Für einige Konten oder bestimmte Netzwerktypen können "
-"Sie zusätzliche Informationen im Abschnitt <gui>Fortgeschritten</gui> "
-"eingeben. Normalerweise werden Sie die unten angegebenen zusätzlichen "
-"Optionen nicht benötigen. Allgemeine Informationen über das Hinzufügen eines "
-"Kontos finden Sie in <link xref=\"add-account\"/>."
+"für die Verbindung. Für einige Konten oder bestimmte Netzwerktypen können Sie "
+"zusätzliche Informationen im Abschnitt <gui>Fortgeschritten</gui> eingeben. "
+"Normalerweise werden Sie die unten angegebenen zusätzlichen Optionen nicht "
+"benötigen. Allgemeine Informationen über das Hinzufügen eines Kontos finden "
+"Sie in <link xref=\"add-account\"/>."
#: C/account-jabber.page:39(p)
msgid ""
@@ -3016,17 +3048,17 @@ msgstr "SSL-Zertifikat-Fehler ignorieren"
#: C/account-jabber.page:47(p)
msgid ""
"Whenever possible, communication between <app>Empathy</app> and the Jabber "
-"server is encrypted. If encrypted communication is not possible, messages "
-"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
+"server is encrypted. If encrypted communication is not possible, messages may "
+"be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
"<app>Empathy</app> from communicating with the Jabber server when encryption "
"is not possible."
msgstr ""
-"Wann immer es möglich ist, wird die Kommunikation zwischen <app>Empathy</"
-"app> und dem Jabber-Server verschlüsselt. Falls verschlüsselte Kommunikation "
-"nicht möglich ist, können Nachrichten unverschlüsselt gesendet werden. "
-"Wählen Sie <gui>Verschlüsselung erforderlich</gui>, um eine Kommunikation "
-"von <app>Empathy</app> mit dem Jabber-Server zu verhindern, wenn "
-"Verschlüsselung nicht möglich ist."
+"Wann immer es möglich ist, wird die Kommunikation zwischen <app>Empathy</app> "
+"und dem Jabber-Server verschlüsselt. Falls verschlüsselte Kommunikation nicht "
+"möglich ist, können Nachrichten unverschlüsselt gesendet werden. Wählen Sie "
+"<gui>Verschlüsselung erforderlich</gui>, um eine Kommunikation von "
+"<app>Empathy</app> mit dem Jabber-Server zu verhindern, wenn Verschlüsselung "
+"nicht möglich ist."
#: C/account-jabber.page:52(p)
msgid ""
@@ -3058,15 +3090,15 @@ msgid ""
msgstr ""
"Falls Sie über mehrere Anwendungen gleichzeitig mit Ihrem Konto verbunden "
"sind, beispielsweise von verschiedenen Rechnern aus, können Sie eine "
-"Ressource zur eindeutigen Identifizierung jeder dieser Anmeldungen "
-"festlegen. Als Vorgabe verwendet <app>Empathy</gui> als Ressource "
-"<input>Telepathy</input>."
+"Ressource zur eindeutigen Identifizierung jeder dieser Anmeldungen festlegen. "
+"Als Vorgabe verwendet <app>Empathy</gui> als Ressource <input>Telepathy</"
+"input>."
#: C/account-jabber.page:65(p)
msgid ""
-"You can set the priority to specify which application should receive "
-"incoming messages from your contacts. New messages will be sent to the "
-"application with the highest priority."
+"You can set the priority to specify which application should receive incoming "
+"messages from your contacts. New messages will be sent to the application "
+"with the highest priority."
msgstr ""
"Sie können die Priorität festlegen, um anzugeben, welche Anwendung die "
"eingehenden Nachrichten von Ihren Kontakten annehmen soll. Neue Nachrichten "
@@ -3080,40 +3112,40 @@ msgstr "Server-Einstellungen überschreiben"
msgid ""
"<app>Empathy</app> will use default settings to connect to the Jabber server "
"based on your login ID. For some Jabber servers, you will need to enter "
-"custom server settings manually. These settings should be provided for you "
-"by your Jabber provider."
+"custom server settings manually. These settings should be provided for you by "
+"your Jabber provider."
msgstr ""
-"<app>Empathy</app> verwendet Vorgabeeinstellungen für Verbindungen zum "
-"Jabber-Server, basierend auf Ihrer Anmeldekennung. Für einige Jabber-Server "
-"müssen Sie benutzerdefinierte Einstellungen manuell eingeben. Diese "
-"Einstellungen sollte Ihnen Ihr Jabber-Dienstanbieter zur Verfügung stellen."
+"<app>Empathy</app> verwendet Vorgabeeinstellungen für Verbindungen zum Jabber-"
+"Server, basierend auf Ihrer Anmeldekennung. Für einige Jabber-Server müssen "
+"Sie benutzerdefinierte Einstellungen manuell eingeben. Diese Einstellungen "
+"sollte Ihnen Ihr Jabber-Dienstanbieter zur Verfügung stellen."
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:104(None)
+#: C/account-irc.page:106(None)
msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
msgstr "a"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:110(None)
+#: C/account-irc.page:112(None)
msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
msgstr "a"
-#: C/account-irc.page:7(desc)
+#: C/account-irc.page:8(desc)
msgid "Additional information necessary for connecting to IRC networks."
msgstr ""
"Zusätzlich erforderliche Informationen für Verbindungen zu IRC-Netzwerken."
-#: C/account-irc.page:29(title)
-msgid "IRC Account Details"
+#: C/account-irc.page:31(title)
+msgid "IRC account details"
msgstr "IRC-Kontendetails"
-#: C/account-irc.page:31(p)
+#: C/account-irc.page:33(p)
msgid ""
-"IRC accounts require different information than many other types of "
-"accounts. To create an IRC account, you must specify at least an IRC network "
-"and a nickname. This page details the information you can provide for an IRC "
+"IRC accounts require different information than many other types of accounts. "
+"To create an IRC account, you must specify at least an IRC network and a "
+"nickname. This page details the information you can provide for an IRC "
"account."
msgstr ""
"IRC-Konten erfordern andere Informationen als die meisten anderen "
@@ -3121,73 +3153,71 @@ msgstr ""
"Netzwerk und einen Spitznamen angeben. Diese Seite erläutert die "
"Informationen, die Sie für ein IRC-Konto angeben können."
-#: C/account-irc.page:37(p)
-msgid ""
-"You must have the <sys>telepathy-idle</sys> package installed in order to "
-"use IRC in <app>Empathy</app>."
-msgstr ""
-"Sie müssen das Paket <sys>telepathy-idle</sys> installiert haben, um das IRC "
-"in <app>Empathy</app> nutzen zu können."
-
-#: C/account-irc.page:43(gui) C/account-irc.page:118(gui)
+#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
msgid "Network"
msgstr "Netzwerk"
-#: C/account-irc.page:44(p)
+#: C/account-irc.page:46(p)
msgid ""
"IRC is an open system that allows people to run separate IRC networks. Each "
"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
-"lists the most popular networks in the <gui>Network</gui> drop-down list. "
-"You can add additional networks. See <link xref=\"#networks\"/> below."
+"lists the most popular networks in the <gui>Network</gui> drop-down list. You "
+"can add additional networks. See <link xref=\"#networks\"/> below."
msgstr ""
"IRC ist ein offenes System, welches Personen erlaubt, separate IRC-Netzwerke "
"zu betreiben. Jedes Netzwerk ist in sich abgeschlossen und hat seine eigenen "
"Benutzer und Unterhaltungsräume. <app>Empathy</app> listet die populärsten "
-"Netzwerke in der Auswahlliste <gui>Netzwerk</gui> auf. Sie können "
-"zusätzliche Netzwerke hinzufügen. Siehe <link xref=\"#networks\"/> "
-"nachfolgend."
+"Netzwerke in der Auswahlliste <gui>Netzwerk</gui> auf. Sie können zusätzliche "
+"Netzwerke hinzufügen. Siehe <link xref=\"#networks\"/> nachfolgend."
-#: C/account-irc.page:51(gui)
+#: C/account-irc.page:53(gui)
msgid "Nickname"
msgstr "Spitzname"
-#: C/account-irc.page:52(p)
+#: C/account-irc.page:54(p)
msgid ""
"Your nickname is your unique name on the IRC network. Only one person on a "
-"network may use a given nickname. If you get an error message that says "
-"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change "
-"your nickname."
+"network may use a given nickname. If you get an error message that says <link "
+"xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change your "
+"nickname."
msgstr ""
"Ihr Spitzname ist Ihr eindeutiger Name im IRC-Netzwerk. Nur eine einzige "
-"Person in einem Netzwerk darf einen gegebenen Spitznamen verwenden. Falls "
-"Sie die Fehlermeldung <link xref=\"prob-conn-name\" role=\"error-msg\"/> "
+"Person in einem Netzwerk darf einen gegebenen Spitznamen verwenden. Falls Sie "
+"die Fehlermeldung <link xref=\"prob-conn-name\" role=\"error-msg\"/> "
"erhalten, müssen Sie Ihren Spitznamen ändern."
-#: C/account-irc.page:58(gui)
+#: C/account-irc.page:60(gui)
msgid "Password"
msgstr "Passwort"
-#: C/account-irc.page:59(p)
+#: C/account-irc.page:61(p)
msgid ""
"Some servers, particularly those on private networks, require a password to "
-"connect. If you are authorized to use the network, the network "
-"administrators should provide you with a password."
+"connect. If you are authorized to use the network, the network administrators "
+"should provide you with a password."
msgstr ""
"Einige Server, insbesondere diejenigen in privaten Netzwerken, erfordern ein "
"Passwort für die Verbindung. Falls Sie legitimiert sind, das Netzwerk zu "
"benutzen, sollte Sie Ihnen dessen Verwalter ein Passwort zur Verfügung "
"gestellt haben."
-#: C/account-irc.page:63(title)
+#: C/account-irc.page:65(title)
msgid "NickServ Passwords"
msgstr "NickServ-Passwörter"
-#: C/account-irc.page:64(p)
+#: C/account-irc.page:66(p)
+#| msgid ""
+#| "On some networks, nicknames can be registered using a service known as "
+#| "NickServ. <app>Empathy</app> does not directly support nickname passwords. "
+#| "On some networks, including the popular FreeNode network, server passwords "
+#| "are automatically forwarded to NickServ, allowing you to set this field to "
+#| "identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> "
+#| "for more details."
msgid ""
"On some networks, nicknames can be registered using a service known as "
-"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
-"On some networks, including the popular FreeNode network, server passwords "
-"are automatically forwarded to NickServ, allowing you to set this field to "
+"NickServ. <app>Empathy</app> does not directly support nickname passwords. On "
+"some networks, including the popular freenode network, server passwords are "
+"automatically forwarded to NickServ, allowing you to set this field to "
"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
"more details."
msgstr ""
@@ -3198,24 +3228,24 @@ msgstr ""
"ermöglicht, sich mit diesem Feld bei NickServ zu identifizieren. Weitere "
"Details hierzu finden Sie in <link xref=\"irc-nick-password\"/>"
-#: C/account-irc.page:74(gui)
+#: C/account-irc.page:76(gui)
msgid "Real name"
msgstr "Realname"
-#: C/account-irc.page:75(p)
+#: C/account-irc.page:77(p)
msgid ""
-"You can provide your real name in addition to your nickname. Other users "
-"will be able to see this when they view your information."
+"You can provide your real name in addition to your nickname. Other users will "
+"be able to see this when they view your information."
msgstr ""
"Zusätzlich zu Ihrem Spitznamen können Sie auch Ihren echten Namen angeben. "
"Dieser wird anderen Benutzern angezeigt, wenn diese Ihre persönlichen "
"Informationen betrachten."
-#: C/account-irc.page:79(gui)
+#: C/account-irc.page:81(gui)
msgid "Quit message"
msgstr "Verlassen-Nachricht"
-#: C/account-irc.page:80(p)
+#: C/account-irc.page:82(p)
msgid ""
"When you go offline, a quit message is sent to all the chat rooms you’re in "
"and to all the users you’re having a private conversation with. Use this "
@@ -3226,61 +3256,61 @@ msgstr ""
"Benutzer, mit denen Sie eine private Unterhaltung führen. Verwenden Sie "
"dieses Feld, um eine benutzerdefinierte Nachricht bereitzustellen."
-#: C/account-irc.page:92(title)
+#: C/account-irc.page:94(title)
msgid "IRC Networks"
msgstr "IRC-Netzwerke"
-#: C/account-irc.page:95(title)
+#: C/account-irc.page:97(title)
msgid "Networks"
msgstr "Netzwerke"
-#: C/account-irc.page:97(p)
+#: C/account-irc.page:99(p)
msgid ""
"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
-"another IRC network, you can add it to the list. You can also modify "
-"networks and remove them from the list."
+"another IRC network, you can add it to the list. You can also modify networks "
+"and remove them from the list."
msgstr ""
"<app>Empathy</app> enthält eine Liste populärer IRC-Netzwerke. Falls Sie ein "
-"anderes IRC-Netzwerk wünschen, können Sie es zur Liste hinzufügen. Sie "
-"können auch Netzwerke bearbeiten oder aus der Liste entfernen."
+"anderes IRC-Netzwerk wünschen, können Sie es zur Liste hinzufügen. Sie können "
+"auch Netzwerke bearbeiten oder aus der Liste entfernen."
-#: C/account-irc.page:102(p)
+#: C/account-irc.page:104(p)
msgid ""
"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
msgstr ""
-"Um ein Netzwerk zur Liste hinzuzufügen, klicken Sie auf <media type=\"image"
-"\" mime=\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16"
+"Um ein Netzwerk zur Liste hinzuzufügen, klicken Sie auf <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16"
"\">Hinzufügen</media>."
-#: C/account-irc.page:105(p)
+#: C/account-irc.page:107(p)
msgid ""
"To modify a network in the list, select the network and click <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
-"height=\"16\">Edit</media>."
+"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height="
+"\"16\">Edit</media>."
msgstr ""
-"Um ein Netzwerk in der Liste zu bearbeiten, wählen Sie es aus und klicken "
-"auf <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" "
-"width=\"16\" height=\"16\">Bearbeiten</media>."
+"Um ein Netzwerk in der Liste zu bearbeiten, wählen Sie es aus und klicken auf "
+"<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width="
+"\"16\" height=\"16\">Bearbeiten</media>."
-#: C/account-irc.page:108(p)
+#: C/account-irc.page:110(p)
msgid ""
"To remove a network from the list, select the network and click <media type="
"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
"height=\"16\">Remove</media>."
msgstr ""
-"Um ein Netzwerk aus der Liste zu entfernen, wählen Sie es aus und klicken "
-"auf <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" "
-"width=\"16\" height=\"16\">Entfernen</media>."
+"Um ein Netzwerk aus der Liste zu entfernen, wählen Sie es aus und klicken auf "
+"<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width="
+"\"16\" height=\"16\">Entfernen</media>."
-#: C/account-irc.page:113(p)
+#: C/account-irc.page:115(p)
msgid ""
"When adding or modifying a network, you can enter the following information:"
msgstr ""
"Beim Hinzufügen oder Ändern eines Netzwerks können Sie die folgenden "
"Informationen eingeben:"
-#: C/account-irc.page:119(p)
+#: C/account-irc.page:121(p)
msgid ""
"This is the name of the network as you want it to appear in the list of "
"networks."
@@ -3288,27 +3318,26 @@ msgstr ""
"Dies ist der Name des Netzwerks, so wie der in der Liste der Netzwerke "
"erscheinen soll."
-#: C/account-irc.page:123(gui)
+#: C/account-irc.page:125(gui)
msgid "Charset"
msgstr "Zeichensatz"
-#: C/account-irc.page:124(p)
+#: C/account-irc.page:126(p)
msgid ""
-"This specifies the character encoding that is typically used on this "
-"network. A character encoding is a specific way of recording characters "
-"internally in a computer. There are many character encodings, and you need "
-"to use the same character encoding as other users to see their messages "
-"correctly."
+"This specifies the character encoding that is typically used on this network. "
+"A character encoding is a specific way of recording characters internally in "
+"a computer. There are many character encodings, and you need to use the same "
+"character encoding as other users to see their messages correctly."
msgstr ""
"Dies legt die Zeichenkodierung fest, die typischerweise in diesem Netzwerk "
"verwendet wird. Eine Zeichenkodierung ist eine spezifische Art der internen "
"Aufzeichnung von Zeichen in einem Rechner. Es gibt zahlreiche "
-"Zeichenkodierungen. Sie müssen die gleiche Kodierung wie die anderen "
-"Benutzer verwenden, damit deren Nachrichten korrekt angezeigt werden können."
+"Zeichenkodierungen. Sie müssen die gleiche Kodierung wie die anderen Benutzer "
+"verwenden, damit deren Nachrichten korrekt angezeigt werden können."
#. Translators: Recommend character encodings that are common
#. for your language.
-#: C/account-irc.page:133(p)
+#: C/account-irc.page:135(p)
msgid ""
"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
"can handle text from most of the world's languages. Another common encoding "
@@ -3319,11 +3348,11 @@ msgstr ""
"kann. Eine weitere häufig benutzte Kodierung für Englisch und andere "
"westliche Sprachen ist ISO-8859-1."
-#: C/account-irc.page:139(gui)
+#: C/account-irc.page:141(gui)
msgid "Servers"
msgstr "Server"
-#: C/account-irc.page:140(p)
+#: C/account-irc.page:142(p)
msgid ""
"An IRC network may have many servers you can connect to. When you are "
"connected to a server on a particular network, you can communicate with all "
@@ -3337,27 +3366,27 @@ msgstr ""
"<gui>Hinzufügen</gui> und <gui>Entfernen</gui> Server dieses Netzwerks "
"hinzufügen und entfernen."
-#: C/account-irc.page:145(p)
+#: C/account-irc.page:147(p)
msgid ""
"When a server is selected, click the field under <gui>Server</gui> or "
"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
"to focus the field, and press the space bar to begin editing."
msgstr ""
-"Wenn ein Server ausgewählt ist, klicken Sie auf die Felder unter "
-"<gui>Server</gui> oder <gui>Port</gui>, um diese zu bearbeiten. Alternativ "
-"verwenden Sie die linke und rechte Pfeiltaste, um das Feld zu fokussieren. "
-"Mit der Leertaste beginnen Sie mit der Bearbeitung."
+"Wenn ein Server ausgewählt ist, klicken Sie auf die Felder unter <gui>Server</"
+"gui> oder <gui>Port</gui>, um diese zu bearbeiten. Alternativ verwenden Sie "
+"die linke und rechte Pfeiltaste, um das Feld zu fokussieren. Mit der "
+"Leertaste beginnen Sie mit der Bearbeitung."
-#: C/account-irc.page:149(p)
+#: C/account-irc.page:151(p)
msgid ""
"Select the check box in the <gui>SSL</gui> column to encrypt all "
"communication with a server. Note that this does not prevent other users on "
"the network from seeing what you write on public chat rooms."
msgstr ""
"Aktivieren Sie das Ankreuzfeld in der <gui>SSL</gui>-Spalte, um jegliche "
-"Kommunikation mit dem Server zu verschlüsseln. Beachten Sie, dass dies "
-"andere Benutzer des Netzwerks nicht daran hindern wird, alles zu sehen, was "
-"Sie in öffentlichen Unterhaltungsräumen schreiben."
+"Kommunikation mit dem Server zu verschlüsseln. Beachten Sie, dass dies andere "
+"Benutzer des Netzwerks nicht daran hindern wird, alles zu sehen, was Sie in "
+"öffentlichen Unterhaltungsräumen schreiben."
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
#: C/index.page:0(None)
@@ -3366,6 +3395,15 @@ msgstr ""
"Mario Blättermann <mariobl@gnome.org>, 2008, 2009, 2010\n"
"Philipp Kerling <k.philipp@gmail.com>, 2008"
+#~ msgid "To join such a room, if you know the password:"
+#~ msgstr ""
+#~ "So betreten Sie einen solchen Raum, falls Ihnen das Passwort bekannt ist:"
+
+#~ msgid ""
+#~ "Click on the trash icon next to the account name to remove the account."
+#~ msgstr ""
+#~ "Klicken Sie auf das Müll-Symbol rechts neben dem Konto, um es zu entfernen."
+
#~ msgid ""
#~ "<app>Empathy</app> does not currently support password-protected IRC chat "
#~ "rooms."
@@ -3382,9 +3420,9 @@ msgstr ""
#~ msgstr "Sehen Sie alle Ihre Kontakte, auch wenn diese abgemeldet sind."
#~ msgid ""
-#~ "As a special exception, the copyright holders give you permission to "
-#~ "copy, modify, and distribute the example code contained in this document "
-#~ "under the terms of your choosing, without restriction."
+#~ "As a special exception, the copyright holders give you permission to copy, "
+#~ "modify, and distribute the example code contained in this document under "
+#~ "the terms of your choosing, without restriction."
#~ msgstr ""
#~ "Als besondere Ausnahme geben Ihnen die Urheberrechtsinhaber die "
#~ "Genehmigung, den in diesem Dokument enthaltenen Beispielcode ohne "
@@ -3395,8 +3433,7 @@ msgstr ""
#~ msgid "Click on the <gui>Edit Account</gui> button in the error message."
#~ msgstr ""
-#~ "Klicken Sie auf den <gui>Konto bearbeiten</gui>-Knopf in der "
-#~ "Fehlermeldung."
+#~ "Klicken Sie auf den <gui>Konto bearbeiten</gui>-Knopf in der Fehlermeldung."
#~ msgid ""
#~ "In the case of an IRC account, type your nickname in the <gui>Nickname</"
@@ -3423,9 +3460,9 @@ msgstr ""
#~ "zu aktivieren."
#~ msgid ""
-#~ "If you close the <gui>Accounts</gui> window without clicking "
-#~ "<gui>Connect</gui>, the entire account will be lost, and you will need to "
-#~ "create it again."
+#~ "If you close the <gui>Accounts</gui> window without clicking <gui>Connect</"
+#~ "gui>, the entire account will be lost, and you will need to create it "
+#~ "again."
#~ msgstr ""
#~ "Falls Sie das <gui>Konten</gui>-Fenster schließen, ohne auf "
#~ "<gui>Verbinden</gui> zu klicken, geht das gesamte Konto verloren, und Sie "
@@ -3814,8 +3851,8 @@ msgstr ""
#~ msgstr "Kontakt-ID:"
#~ msgid ""
-#~ "To start a text conversation, click on <placeholder-1/>; to start an "
-#~ "audio conversation, click on <placeholder-2/>."
+#~ "To start a text conversation, click on <placeholder-1/>; to start an audio "
+#~ "conversation, click on <placeholder-2/>."
#~ msgstr ""
#~ "Um eine Textunterhaltung zu beginnen, klicken Sie auf <placeholder-1/>, "
#~ "für eine Sprachunterhaltung klicken Sie auf <placeholder-2/>."
@@ -3850,16 +3887,16 @@ msgstr ""
#~ msgstr "Verwenden Sie dieses Symbol, wenn Sie nicht gestört werden wollen."
#~ msgid ""
-#~ "Use this icon when you are going away from the computer. This icon is "
-#~ "used also when you leave the computer and the screensaver turns on."
+#~ "Use this icon when you are going away from the computer. This icon is used "
+#~ "also when you leave the computer and the screensaver turns on."
#~ msgstr ""
-#~ "Verwenden Sie dieses Symbol, wenn Sie den Rechner verlassen. Dieses "
-#~ "Symbol wird ebenfalls verwendet, wenn Sie den Rechner verlassen und der "
+#~ "Verwenden Sie dieses Symbol, wenn Sie den Rechner verlassen. Dieses Symbol "
+#~ "wird ebenfalls verwendet, wenn Sie den Rechner verlassen und der "
#~ "Bildschirmschoner gestartet wird."
#~ msgid ""
-#~ "After removing an account you will not be able to recover it or to "
-#~ "recover the conversations you had."
+#~ "After removing an account you will not be able to recover it or to recover "
+#~ "the conversations you had."
#~ msgstr ""
#~ "Nach dem Entfernen eines Kontos sind Sie nicht mehr in der Lage, dieses "
#~ "Konto oder die geführten Unterhaltungen wiederherzustellen."
@@ -3908,9 +3945,9 @@ msgstr ""
#~ "channels may be configured to accept only registered nickname."
#~ msgstr ""
#~ "Das Registrieren eines Spitznamens ist nützlich, um Ihre Identität im IRC "
-#~ "zu bewahren, indem Sie immer den gleichen Spitznamen verwenden. In "
-#~ "einigen Fällen können IRC-Channels so eingerichtet sein, dass nur "
-#~ "registrierte Spitznamen anerkannt werden."
+#~ "zu bewahren, indem Sie immer den gleichen Spitznamen verwenden. In einigen "
+#~ "Fällen können IRC-Channels so eingerichtet sein, dass nur registrierte "
+#~ "Spitznamen anerkannt werden."
#~ msgid "Enable"
#~ msgstr "Aktivieren"
diff --git a/help/es/es.po b/help/es/es.po
index b66a8df3d..e8ab3041c 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -1,11 +1,12 @@
# translation of empathy-help.master.po to Español
# Jorge González <jorgegonz@svn.gnome.org>, 2009, 2010.
+#
msgid ""
msgstr ""
"Project-Id-Version: empathy-help.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-24 15:57+0000\n"
-"PO-Revision-Date: 2010-03-24 20:44+0100\n"
+"POT-Creation-Date: 2010-05-02 16:21+0000\n"
+"PO-Revision-Date: 2010-05-03 08:31+0200\n"
"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
"Language-Team: Español <gnome-es-list@gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -16,8 +17,8 @@ msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: C/video-call.page:45(None) C/video-call.page:61(None)
-#: C/audio-video.page:70(None) C/audio-call.page:63(None)
+#: C/video-call.page:45(None) C/video-call.page:63(None)
+#: C/audio-video.page:70(None) C/audio-call.page:65(None)
msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
msgstr ""
"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
@@ -29,11 +30,11 @@ msgstr "Iniciar una conversación de vídeo con uno de sus contactos."
#: C/video-call.page:21(name) C/status-icons.page:16(name)
#: C/share-desktop.page:13(name) C/set-custom-status.page:19(name)
#: C/send-file.page:21(name) C/salut-protocol.page:18(name)
-#: C/remove-account.page:17(name) C/prob-conn-neterror.page:18(name)
+#: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
#: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
#: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
#: C/irc-start-conversation.page:15(name) C/irc-send-file.page:16(name)
-#: C/irc-nick-password.page:18(name) C/irc-manage.page:18(name)
+#: C/irc-nick-password.page:18(name) C/irc-manage.page:19(name)
#: C/irc-join-room.page:16(name) C/irc-join-pwd.page:17(name)
#: C/irc-commands.page:10(name) C/introduction.page:13(name)
#: C/index.page:18(name) C/import-account.page:23(name)
@@ -42,19 +43,19 @@ msgstr "Iniciar una conversación de vídeo con uno de sus contactos."
#: C/geolocation-supported.page:16(name) C/geolocation-privacy.page:17(name)
#: C/geolocation-not-showing.page:17(name) C/geolocation.page:17(name)
#: C/favorite-rooms.page:14(name) C/disable-account.page:20(name)
-#: C/create-account.page:17(name) C/audio-video.page:17(name)
-#: C/audio-call.page:18(name) C/add-account.page:19(name)
+#: C/create-account.page:18(name) C/audio-video.page:17(name)
+#: C/audio-call.page:18(name) C/add-account.page:20(name)
msgid "Milo Casagrande"
msgstr "Milo Casagrande"
#: C/video-call.page:22(email) C/status-icons.page:17(email)
#: C/share-desktop.page:14(email) C/set-custom-status.page:20(email)
#: C/send-file.page:22(email) C/salut-protocol.page:19(email)
-#: C/remove-account.page:18(email) C/prob-conn-neterror.page:19(email)
+#: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
#: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
#: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
#: C/irc-start-conversation.page:16(email) C/irc-send-file.page:17(email)
-#: C/irc-nick-password.page:19(email) C/irc-manage.page:19(email)
+#: C/irc-nick-password.page:19(email) C/irc-manage.page:20(email)
#: C/irc-join-room.page:17(email) C/irc-join-pwd.page:18(email)
#: C/irc-commands.page:11(email) C/introduction.page:14(email)
#: C/index.page:19(email) C/import-account.page:24(email)
@@ -63,20 +64,20 @@ msgstr "Milo Casagrande"
#: C/geolocation-supported.page:17(email) C/geolocation-privacy.page:18(email)
#: C/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
#: C/favorite-rooms.page:15(email) C/disable-account.page:21(email)
-#: C/create-account.page:18(email) C/audio-video.page:18(email)
-#: C/audio-call.page:19(email) C/add-account.page:20(email)
+#: C/create-account.page:19(email) C/audio-video.page:18(email)
+#: C/audio-call.page:19(email) C/add-account.page:21(email)
msgid "milo@ubuntu.com"
msgstr "milo@ubuntu.com"
#: C/video-call.page:25(p) C/status-icons.page:24(p)
#: C/share-desktop.page:17(p) C/set-custom-status.page:23(p)
#: C/send-message.page:20(p) C/send-file.page:25(p)
-#: C/salut-protocol.page:22(p) C/remove-account.page:21(p)
+#: C/salut-protocol.page:22(p) C/remove-account.page:22(p)
#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p)
#: C/prob-conn-name.page:21(p) C/prob-conn-auth.page:25(p)
#: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p)
#: C/irc-start-conversation.page:19(p) C/irc-send-file.page:20(p)
-#: C/irc-nick-password.page:22(p) C/irc-manage.page:22(p)
+#: C/irc-nick-password.page:22(p) C/irc-manage.page:23(p)
#: C/irc-join-room.page:20(p) C/irc-join-pwd.page:21(p)
#: C/irc-commands.page:14(p) C/introduction.page:17(p) C/index.page:22(p)
#: C/import-account.page:31(p) C/hide-contacts.page:15(p)
@@ -84,11 +85,11 @@ msgstr "milo@ubuntu.com"
#: C/geolocation-turn.page:22(p) C/geolocation-supported.page:20(p)
#: C/geolocation-privacy.page:21(p) C/geolocation-not-showing.page:21(p)
#: C/geolocation.page:21(p) C/favorite-rooms.page:18(p)
-#: C/disable-account.page:28(p) C/create-account.page:21(p)
+#: C/disable-account.page:28(p) C/create-account.page:22(p)
#: C/change-status.page:23(p) C/audio-video.page:21(p) C/audio-call.page:22(p)
-#: C/add-contact.page:22(p) C/add-account.page:27(p)
+#: C/add-contact.page:22(p) C/add-account.page:28(p)
#: C/accounts-window.page:22(p) C/account-jabber.page:18(p)
-#: C/account-irc.page:18(p)
+#: C/account-irc.page:20(p)
msgid "Creative Commons Share Alike 3.0"
msgstr "Creative Commons Compartir Igual 3.0"
@@ -133,14 +134,11 @@ msgstr ""
"de conversación."
#: C/video-call.page:55(p) C/audio-call.page:57(p)
-msgid ""
-"To end the conversation, choose <guiseq><gui style=\"menu\">Call</gui><gui "
-"style=\"menuitem\">Hang up</gui></guiseq>."
+msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
msgstr ""
-"Para finalizar una conversación elija <guiseq><gui style=\"menu\">Llamada</"
-"gui><gui style=\"menuitem\">Colgar</gui></guiseq>."
+"Para finalizar una conversación pulse <gui style=\"button\">Colgar</gui>."
-#: C/video-call.page:59(p)
+#: C/video-call.page:61(p)
msgid ""
"To turn a video conversation into an audio conversation, choose <guiseq><gui "
"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>, "
@@ -185,15 +183,15 @@ msgstr "Entender los diversos estados e iconos de estado."
#: C/prev-conv.page:20(name) C/prev-conv.page:38(cite)
#: C/import-account.page:27(name) C/disable-account.page:24(name)
#: C/audio-video.page:109(cite) C/audio-video.page:117(cite)
-#: C/add-account.page:23(name) C/accounts-window.page:18(name)
-#: C/account-jabber.page:14(name) C/account-irc.page:14(name)
+#: C/add-account.page:24(name) C/accounts-window.page:18(name)
+#: C/account-jabber.page:14(name) C/account-irc.page:16(name)
msgid "Shaun McCance"
msgstr "Shaun McCance"
#: C/status-icons.page:21(email) C/prev-conv.page:21(email)
#: C/import-account.page:28(email) C/disable-account.page:25(email)
-#: C/add-account.page:24(email) C/accounts-window.page:19(email)
-#: C/account-jabber.page:15(email) C/account-irc.page:15(email)
+#: C/add-account.page:25(email) C/accounts-window.page:19(email)
+#: C/account-jabber.page:15(email) C/account-irc.page:17(email)
msgid "shaunm@gnome.org"
msgstr "shaunm@gnome.org"
@@ -715,11 +713,11 @@ msgstr ""
msgid "Completely remove an account from <app>Empathy</app>."
msgstr "Quitar completamente una cuenta en <app>Empathy</app>."
-#: C/remove-account.page:32(title)
+#: C/remove-account.page:33(title)
msgid "Remove an account"
msgstr "Quitar una cuenta"
-#: C/remove-account.page:34(p)
+#: C/remove-account.page:35(p)
msgid ""
"You can completely remove an account from <app>Empathy</app> if you no "
"longer wish to use the account. If you wish to use the account in "
@@ -730,8 +728,8 @@ msgstr ""
"seguir usándola. Si quiere usar de nuevo la cuenta en <app>Empathy</app> en "
"el futuro, deberá añadir los detalles de la cuenta de nuevo."
-#: C/remove-account.page:41(p) C/irc-nick-password.page:50(p)
-#: C/disable-account.page:48(p) C/add-account.page:47(p)
+#: C/remove-account.page:42(p) C/irc-nick-password.page:50(p)
+#: C/disable-account.page:48(p) C/add-account.page:48(p)
msgid ""
"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
@@ -739,7 +737,7 @@ msgstr ""
"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Editar</"
"gui><gui>Cuentas</gui></guiseq> o pulse <key>F4</key>."
-#: C/remove-account.page:45(p)
+#: C/remove-account.page:46(p)
msgid ""
"Select the account you wish to remove from the accounts list on the left "
"side of the window."
@@ -747,13 +745,11 @@ msgstr ""
"Seleccione la cuenta que quiere quitar de la lista de cuentas en la parte "
"izquierda de la ventana."
-#: C/remove-account.page:49(p)
-msgid "Click on the trash icon next to the account name to remove the account."
-msgstr ""
-"Para quitar la cuenta pulse el icono de la papelera junto al nombre de la "
-"cuenta."
+#: C/remove-account.page:50(p)
+msgid "Click on <gui style=\"button\">Remove</gui>."
+msgstr "Pulse <gui style=\"button\">Quitar</gui>."
-#: C/remove-account.page:52(p)
+#: C/remove-account.page:53(p)
msgid ""
"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
"button to permanently remove the account."
@@ -761,7 +757,7 @@ msgstr ""
"Se mostrará un diálogo preguntando por una confirmación. Pulse el botón "
"<gui>Quitar</gui> para quitar la cuenta permanentemente."
-#: C/remove-account.page:58(p)
+#: C/remove-account.page:59(p)
msgid ""
"Even after removing an account, <app>Empathy</app> does not delete your "
"conversation history for that account."
@@ -782,7 +778,7 @@ msgstr "Problemas al conectarse a un servicio de mensajería instantánea"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/prob-conn-neterror.page:58(None) C/prob-conn-name.page:43(None)
-#: C/prob-conn-auth.page:58(None) C/account-irc.page:107(None)
+#: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None)
msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
@@ -990,9 +986,6 @@ msgstr ""
"cuenta que no está funcionando."
#: C/prob-conn-acctdisabled.page:65(p)
-#| msgid ""
-#| "Check that the <gui style=\"checkbox\">Enabled</gui> check-box is "
-#| "selected. If it is not, select the check-box to enalbe the account."
msgid ""
"Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. "
"If it is not, select the check-box to enable the account."
@@ -1326,14 +1319,14 @@ msgid ""
"<app>Empathy</app> does not currently support nickname registration. Some "
"IRC networks, however, will automatically forward a <em>server password</em> "
"to NickServ. On these networks, you can use the IRC password in "
-"<app>Empathy</app> to identify yourself to NickServ. The popular FreeNode "
+"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
"network is known to have this feature."
msgstr ""
"Actualmente <app>Empathy</app> no soporta el registro de apodos. No obstante "
"algunos servidores de IRC reenviarán automáticamente una <em>contraseña de "
"servidor</em> a NickServ. En esas redes podrá usar contraseñas de IRC en "
"<app>Empathy</app> para identificarse contra NickServ. Se sabe que la "
-"popular red FreeNode dispone de esta característica."
+"popular red freenode dispone de esta característica."
#: C/irc-nick-password.page:46(p)
msgid "To set an IRC server password:"
@@ -1353,7 +1346,6 @@ msgstr ""
"usar para registrar su apodo."
#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
-#: C/add-account.page:70(p)
msgid "Click <gui style=\"button\">Apply</gui>."
msgstr "Pulse <gui style=\"button\">Aplicar</gui>."
@@ -1371,23 +1363,31 @@ msgstr ""
msgid "How to use IRC with <app>Empathy</app>."
msgstr "Cómo usar el IRC con <app>Empathy</app>."
-#: C/irc-manage.page:33(title)
+#: C/irc-manage.page:34(title)
msgid "Internet Relay Chat (IRC)"
msgstr "Internet Relay Chat (IRC)"
-#: C/irc-manage.page:37(title)
+#: C/irc-manage.page:37(p) C/account-irc.page:39(p)
+msgid ""
+"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
+"<app>Empathy</app>."
+msgstr ""
+"Debe tener instalado el paquete <sys>telepathy-idle</sys> para poder usar el "
+"IRC en <app>Empathy</app>."
+
+#: C/irc-manage.page:43(title)
msgid "IRC Chat Rooms and Conversations"
msgstr "Salas de chat y conversaciones en el IRC"
-#: C/irc-manage.page:39(title)
+#: C/irc-manage.page:45(title)
msgid "Chat Rooms and Conversations"
msgstr "Salas de chat y conversaciones"
-#: C/irc-manage.page:44(title)
+#: C/irc-manage.page:50(title)
msgid "Common IRC Problems"
msgstr "Problemas comunes en el IRC"
-#: C/irc-manage.page:46(title) C/index.page:52(title)
+#: C/irc-manage.page:52(title) C/index.page:52(title)
msgid "Common Problems"
msgstr "Problemas comunes"
@@ -1457,27 +1457,23 @@ msgstr "Unirse a una sala de chat protegida en el IRC"
#: C/irc-join-pwd.page:27(p)
msgid ""
-"On some IRC networks, private IRC rooms may be protected with a password."
+"On some IRC networks, private IRC rooms may be protected with a password. If "
+"you know the password, use the following steps to join:"
msgstr ""
"En algunas redes IRC las salas privadas de IRC pueden estar protegidas por "
-"contraseña."
-
-#: C/irc-join-pwd.page:30(p)
-msgid "To join such a room, if you know the password:"
-msgstr "Para unirse a una sala así, si sabe la contraseña:"
+"contraseña. Si sabe la contraseña, realice los siguientes pasos para unirse:"
-#: C/irc-join-pwd.page:35(p)
-msgid "<link xref=\"irc-join-room\">Join the room</link>."
-msgstr "<link xref=\"irc-join-room\">Unirse a la sala</link>."
+#: C/irc-join-pwd.page:33(p)
+msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
+msgstr "<link xref=\"irc-join-room\">Unirse a la sala</link> de forma normal."
-#: C/irc-join-pwd.page:40(p)
+#: C/irc-join-pwd.page:38(p)
msgid ""
-"In the <gui>This room is protected by a password</gui> text box, type the "
-"IRC room password, and click on <gui style=\"button\">Join</gui>."
+"Empathy will prompt you for a password. Enter the password for the IRC chat "
+"room and click <gui style=\"button\">Join</gui>."
msgstr ""
-"Escriba la contraseña para la sala de chat IRC en la caja de texto <gui>Esta "
-"sala está protegida por contraseña</gui> y pulse <gui style=\"button"
-"\">Unirse</gui>."
+"Empathy le preguntará la contraseña. Introduzca la contrseña para la sala de "
+"chat IRC y pulse <gui style=\"button\">Unirse</gui>."
#: C/irc-commands.page:7(desc)
msgid "The supported IRC commands."
@@ -1503,7 +1499,7 @@ msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: C/introduction.page:48(None)
+#: C/introduction.page:41(None)
msgid ""
"@@image: 'figures/empathy-main-window.png'; "
"md5=489ba00b0fc377aba4c691210b6e0650"
@@ -1515,22 +1511,28 @@ msgstr ""
msgid "Introduction to the <app>Empathy</app> instant messenger."
msgstr "Introducción al programa de mensajería instantánea <app>Empathy</app>."
-#: C/introduction.page:28(title)
+#: C/introduction.page:21(title)
msgid "Introduction"
msgstr "Introducción"
-#: C/introduction.page:30(p)
+#: C/introduction.page:23(p)
+#| msgid ""
+#| "<app>Empathy</app> is an instant messaging application for the GNOME "
+#| "Desktop. It supports text messaging, voice &amp; video call, file "
+#| "transfers and all the most used messaging systems such as MSN and Google "
+#| "Talk."
msgid ""
"<app>Empathy</app> is an instant messaging application for the GNOME "
-"Desktop. It supports text messaging, voice &amp; video call, file transfers "
-"and all the most used messaging systems such as MSN and Google Talk."
+"Desktop. It supports text messaging, voice &amp; video calls, file "
+"transfers, and all the most used messaging systems such as MSN and Google "
+"Talk."
msgstr ""
"<app>Empathy</app> es una aplicación de mensajería instantánea para el "
-"Escritorio GNOME. soporte mensajes de texto, voz y vídeollamadas, "
-"trasnferencias de archivos y los sistemas de mensajería más populares como "
-"MSN y Google Talk."
+"Escritorio GNOME. soporte mensajes de texto, llamadas de voz y "
+"vídeollamadas, transferencias de archivos y los sistemas de mensajería más "
+"populares como MSN y Google Talk."
-#: C/introduction.page:35(p)
+#: C/introduction.page:28(p)
msgid ""
"<app>Empathy</app> includes features that help you better collaborate while "
"at work, and that let you easily keep in touch with your friends."
@@ -1538,26 +1540,31 @@ msgstr ""
"<app>Empathy</app> incluye características que le ayudarán a colaborar mejor "
"en el trabajo y le permitirán mantener en contacto con sus amigos fácilmente."
-#: C/introduction.page:39(p)
+#: C/introduction.page:32(p)
+#| msgid ""
+#| "You can group all the conversations in a single window, have multiple "
+#| "windows for different kind of conversations, easily search through your "
+#| "previous conversations and share your desktop in just two clicks."
msgid ""
-"You can group all the conversations in a single window, or have multiple "
-"windows for different kind of conversations; easily search through your "
-"previous conversations, and share your desktop in just two clicks."
+"Using <app>Empathy</app>, you can group all the conversations in a single "
+"window, have multiple windows for different kind of conversations, easily "
+"search through your previous conversations, and share your desktop in just "
+"two clicks."
msgstr ""
-"Puede agrupar las conversaciones en una sola ventana o tener múltiples "
-"ventanas para los diferentes tipos de conversaciones; búsqueda fácil de sus "
-"conversaciones anteriores y compartición de su escritorio con sólo un par de "
-"pulsaciones de ratón."
+"Usando <app>Empathy</app> puede agrupar las conversaciones en una sola "
+"ventana o tener múltiples ventanas para los diferentes tipos de "
+"conversaciones; búsqueda fácil de sus conversaciones anteriores y "
+"compartición de su escritorio con sólo un par de pulsaciones de ratón."
-#: C/introduction.page:46(title)
+#: C/introduction.page:39(title)
msgid "<gui>Contact List</gui> window"
msgstr "Ventana de <gui>Lista de contactos</gui>"
-#: C/introduction.page:47(desc)
+#: C/introduction.page:40(desc)
msgid "<app>Empathy</app> main window"
msgstr "Ventana principal de <app>Empathy</app>"
-#: C/introduction.page:49(p)
+#: C/introduction.page:42(p)
msgid "<app>Empathy</app> main window."
msgstr "Ventana principal de <app>Empathy</app>."
@@ -2286,11 +2293,11 @@ msgstr ""
msgid "Register for an account with one of the supported messaging services."
msgstr "Registre una cuenta con uno de los servicios de mensajería soportados."
-#: C/create-account.page:32(title)
+#: C/create-account.page:33(title)
msgid "Register for a new account"
msgstr "Registrar una cuenta nueva"
-#: C/create-account.page:34(p)
+#: C/create-account.page:35(p)
msgid ""
"Most account types require you to create an account with a account provider "
"before you can connect using instant messaging applications like "
@@ -2305,11 +2312,16 @@ msgstr ""
"mismos pasos que seguiría en <link xref=\"add-account\">añadir una cuenta</"
"link>."
-#: C/create-account.page:40(p)
+#: C/create-account.page:41(p)
+#| msgid ""
+#| "This page provides information on creating a new account for various "
+#| "types of accounts. Your account provider should give you a login ID and a "
+#| "password, as well as any additional information you need to connect with "
+#| "<app>Empathy</app>."
msgid ""
"This page provides information on creating a new account for various types "
"of accounts. Your account provider should give you a login ID and a "
-"password, as well as any additional information you need to connect with "
+"password, as well as any additional information you need to connect using "
"<app>Empathy</app>."
msgstr ""
"Esta página proporciona información acerca de crear una cuenta nueva para "
@@ -2317,11 +2329,33 @@ msgstr ""
"de inicio de sesión y una contraseña, así como otra información adicional "
"que puede necesitar para conectarse con <app>Empathy</app>."
-#: C/create-account.page:45(title) C/audio-video.page:170(p)
+#: C/create-account.page:46(title)
+msgid "Facebook"
+msgstr "Facebook"
+
+#: C/create-account.page:47(p)
+msgid ""
+"Facebook is one of the most-used social networks. It allows users to create "
+"their own profile and to communicate with their friends."
+msgstr ""
+"Facebook es una de las redes sociales más usadas. Permite a los usuarios "
+"crear su propio perfil y comunicarse con sus amigos."
+
+#: C/create-account.page:51(p)
+msgid ""
+"To use Facebook to communicate with your friends, you will need to create a "
+"new account from the website: <link href=\"http://www.facebook.com\">www."
+"facebook.com</link>."
+msgstr ""
+"Para usar Facebook para comunicarse con sus amigos necesita crear una cuenta "
+"nueva desde el sitio web: <link href=\"http://www.facebook.com\">www."
+"facebook.com</link>."
+
+#: C/create-account.page:59(title) C/audio-video.page:170(p)
msgid "Jabber"
msgstr "Jabber"
-#: C/create-account.page:47(p)
+#: C/create-account.page:61(p)
msgid ""
"Jabber is an open instant messaging system. Like email, Jabber allows you to "
"choose your account provider and communicate with all other Jabber users, "
@@ -2331,7 +2365,7 @@ msgstr ""
"Jabber le permite elegir su proveedor de la cuenta y comunicarse con otros "
"usuarios de Jabber, independientemente del proveedor de la cuenta."
-#: C/create-account.page:51(p)
+#: C/create-account.page:65(p)
msgid ""
"You will need to create a new account with a Jabber provider. There are many "
"free providers; one popular provider is <link href=\"http://register.jabber."
@@ -2341,7 +2375,7 @@ msgstr ""
"proveedores libres; un proveedor popular es <link href=\"http://register."
"jabber.org/\">Jabber.org</link>."
-#: C/create-account.page:56(p)
+#: C/create-account.page:70(p)
msgid ""
"If you use Google Mail or Google Talk, you already have a Jabber account. "
"Google Talk is a Jabber service. Simply use your Google Mail address and "
@@ -2351,11 +2385,11 @@ msgstr ""
"servicio Jabber. Simplemente use en <app>Empathy</app> su dirección de "
"Google Mail y su contraseña para conectarse."
-#: C/create-account.page:63(title) C/audio-video.page:190(p)
+#: C/create-account.page:77(title) C/audio-video.page:190(p)
msgid "People Nearby"
msgstr "Gente cerca"
-#: C/create-account.page:65(p)
+#: C/create-account.page:79(p)
msgid ""
"You do not need to create an account with a service provider to use this "
"feature. This service works whenever you are connected to a local network, "
@@ -2367,16 +2401,16 @@ msgstr ""
"local, tal como un punto inalámbrico. Automáticamente encuentra otros "
"usuarios en la red que estén usando este servicio."
-#: C/create-account.page:70(p)
+#: C/create-account.page:84(p)
msgid "For more information, see <link xref=\"salut-protocol\"/>."
msgstr ""
"Para obtener más información consulte la <link xref=\"salut-protocol\"/>."
-#: C/create-account.page:74(title) C/audio-video.page:205(p)
+#: C/create-account.page:88(title) C/audio-video.page:205(p)
msgid "SIP"
msgstr "SIP"
-#: C/create-account.page:76(p)
+#: C/create-account.page:90(p)
msgid ""
"SIP is an open system which allows users to have audio and video "
"conversations over the Internet. You need to create an account with a SIP "
@@ -2388,7 +2422,7 @@ msgstr ""
"Puede comunicarse con todos los usuarios SIP, independientemente del "
"proveedor SIP que usen."
-#: C/create-account.page:81(p)
+#: C/create-account.page:95(p)
msgid ""
"There are a number of popular free SIP account providers; one popular "
"provider is <link href=\"https://signup.sipphone.com/new-users/app?"
@@ -2398,7 +2432,7 @@ msgstr ""
"popular es <link href=\"https://signup.sipphone.com/new-users/app?"
"class=NewUser;proc=start\">Sipphone</link>."
-#: C/create-account.page:86(p)
+#: C/create-account.page:100(p)
msgid ""
"Due to technical differences, the free <link href=\"https://www.ekiga.net/"
"index.php?page=register\">Ekiga.net</link> service does not currently work "
@@ -2408,7 +2442,7 @@ msgstr ""
"\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> no "
"funciona con <app>Empathy</app>."
-#: C/create-account.page:91(p)
+#: C/create-account.page:105(p)
msgid ""
"Some SIP providers allow you to call normal phones from your computer. "
"Generally, you will need to subscribe to a paid service for this feature."
@@ -2417,11 +2451,11 @@ msgstr ""
"equipo. Generalmente deberá suscribirse a un servicio de pago para usar esta "
"característica."
-#: C/create-account.page:96(title) C/audio-video.page:165(p)
+#: C/create-account.page:110(title) C/audio-video.page:165(p)
msgid "IRC"
msgstr "IRC"
-#: C/create-account.page:98(p)
+#: C/create-account.page:112(p)
msgid ""
"You do not need to register for an account to use IRC. Although you specify "
"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
@@ -2433,16 +2467,16 @@ msgstr ""
"establece cada vez que se conecta. Si otro usuario está usando el nombre, "
"deberá elegir un apodo nuevo."
-#: C/create-account.page:103(p)
+#: C/create-account.page:117(p)
msgid ""
"Some IRC networks use a service called NickServ to allow users to protect "
-"thier nicknames. See <link xref=\"irc-nick-password\"/> for more information."
+"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
msgstr ""
"Algunas redes IRC usan un servicio llamado NickServ para permitir a los "
"usuarios proteger sus apodos. Para obtener más información consulte la <link "
"xref=\"irc-nick-password\"/>."
-#: C/create-account.page:106(p)
+#: C/create-account.page:120(p)
msgid ""
"Some IRC servers are password protected. You will need to know the password "
"to connect to these servers. Generally, these are private IRC networks."
@@ -2451,11 +2485,11 @@ msgstr ""
"conocer la contraseña para conectarse a esos servidores. Generalmente son "
"redes de IRC privadas."
-#: C/create-account.page:111(title)
+#: C/create-account.page:125(title)
msgid "Proprietary Services"
msgstr "Servicios propietarios"
-#: C/create-account.page:113(p)
+#: C/create-account.page:127(p)
msgid ""
"There are many proprietary instant messaging services that have been "
"developed by different companies or organizations. <app>Empathy</app> allows "
@@ -2469,19 +2503,19 @@ msgstr ""
"Para crear una cuenta nueva con uno de esos servicios deberá visitar el "
"servicio web del sitio y aceptar los términos de uso."
-#: C/create-account.page:122(link) C/audio-video.page:135(p)
+#: C/create-account.page:136(link) C/audio-video.page:135(p)
msgid "AIM"
msgstr "AIM"
-#: C/create-account.page:127(link) C/audio-video.page:160(p)
+#: C/create-account.page:141(link) C/audio-video.page:160(p)
msgid "ICQ"
msgstr "ICQ"
-#: C/create-account.page:132(link) C/audio-video.page:175(p)
+#: C/create-account.page:146(link) C/audio-video.page:175(p)
msgid "MSN"
msgstr "MSN"
-#: C/create-account.page:137(link) C/audio-video.page:210(p)
+#: C/create-account.page:151(link) C/audio-video.page:210(p)
msgid "Yahoo!"
msgstr "Yahoo!"
@@ -2760,7 +2794,7 @@ msgstr ""
"Alternativamente pulse con el botón derecho del ratón sobre el contacto y "
"elija <gui style=\"menuitem\">Llamada de sonido<gui>."
-#: C/audio-call.page:61(p)
+#: C/audio-call.page:63(p)
msgid ""
"To turn an audio conversation into a video conversation, choose <guiseq><gui "
"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>, "
@@ -2829,11 +2863,11 @@ msgstr ""
msgid "Add a new account to <app>Empathy</app>."
msgstr "Añadir una cuenta nueva en <app>Empathy</app>."
-#: C/add-account.page:38(title)
+#: C/add-account.page:39(title)
msgid "Add a new account"
msgstr "Añadir una cuenta nueva"
-#: C/add-account.page:40(p)
+#: C/add-account.page:41(p)
msgid ""
"You can add instant messaging accounts from any supported service to "
"communicate with all of your contacts in <app>Empathy</app>. For some "
@@ -2846,11 +2880,11 @@ msgstr ""
"cuenta nueva. Para obtener más detalles consulte la <link xref=\"create-"
"account\"/>."
-#: C/add-account.page:51(p)
+#: C/add-account.page:52(p)
msgid "Click <gui style=\"button\">Add</gui>."
msgstr "Pulse <gui style=\"button\">Añadir</gui>."
-#: C/add-account.page:56(p)
+#: C/add-account.page:57(p)
msgid ""
"From the <gui>Protocol</gui> drop-down list, select the type of account you "
"wish to add."
@@ -2858,7 +2892,7 @@ msgstr ""
"Desde la lista desplegable <gui>Protocolo</gui> seleccione el tipo de cuenta "
"que quiere añadir."
-#: C/add-account.page:60(p)
+#: C/add-account.page:61(p)
msgid ""
"If you do not already have a registered account, select <gui>Create a new "
"account on the server</gui>. This feature is not available for all account "
@@ -2870,7 +2904,7 @@ msgstr ""
"tipos de cuentas y puede no funcionar con algunos proveedores de cuentas. "
"Para obtener más información consulte la <link xref=\"create-account\"/>."
-#: C/add-account.page:65(p)
+#: C/add-account.page:66(p)
msgid ""
"Enter the required information. For most accounts, you will only need a "
"login ID and a password. Some accounts may require additional information. "
@@ -2881,7 +2915,11 @@ msgstr ""
"pueden requerir información adicional. Para obtener más información consulte "
"la <link xref=\"accounts-window#details\"/>."
-#: C/add-account.page:77(p)
+#: C/add-account.page:71(p)
+msgid "Click <gui style=\"button\">Log in</gui>."
+msgstr "Pulse <gui style=\"button\">Iniciar sesión</gui>."
+
+#: C/add-account.page:78(p)
msgid ""
"To change the name that identifies the account in the <gui>Accounts</gui> "
"window, select the account from the list on the left and either click on the "
@@ -2928,7 +2966,7 @@ msgid "Advanced options for Jabber and Google Talk accounts."
msgstr "Opciones avanzadas para cuentas Jabber y Google Talk."
#: C/account-jabber.page:29(title)
-msgid "Jabber Account Details"
+msgid "Jabber account details"
msgstr "Detalles de la cuenta Jabber"
#: C/account-jabber.page:31(p)
@@ -3037,26 +3075,26 @@ msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:104(None)
+#: C/account-irc.page:106(None)
msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:110(None)
+#: C/account-irc.page:112(None)
msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
msgstr ""
"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
-#: C/account-irc.page:7(desc)
+#: C/account-irc.page:8(desc)
msgid "Additional information necessary for connecting to IRC networks."
msgstr "Información adicional necesaria para conectarse a redes IRC."
-#: C/account-irc.page:29(title)
-msgid "IRC Account Details"
+#: C/account-irc.page:31(title)
+msgid "IRC account details"
msgstr "Detalles de la cuenta IRC"
-#: C/account-irc.page:31(p)
+#: C/account-irc.page:33(p)
msgid ""
"IRC accounts require different information than many other types of "
"accounts. To create an IRC account, you must specify at least an IRC network "
@@ -3068,19 +3106,11 @@ msgstr ""
"apodo. Esta página detalla la información que puede proporcionar para una "
"cuenta de IRC."
-#: C/account-irc.page:37(p)
-msgid ""
-"You must have the <sys>telepathy-idle</sys> package installed in order to "
-"use IRC in <app>Empathy</app>."
-msgstr ""
-"Debe tener instalado el paquete <sys>telepathy-idle</sys> para poder usar "
-"IRC en <app>Empathy</app>."
-
-#: C/account-irc.page:43(gui) C/account-irc.page:118(gui)
+#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
msgid "Network"
msgstr "Red"
-#: C/account-irc.page:44(p)
+#: C/account-irc.page:46(p)
msgid ""
"IRC is an open system that allows people to run separate IRC networks. Each "
"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
@@ -3093,11 +3123,11 @@ msgstr ""
"<gui>Red</gui>. Puede añadir redes adicionales. Consulte debajo la <link "
"xref=\"#networks\"/>."
-#: C/account-irc.page:51(gui)
+#: C/account-irc.page:53(gui)
msgid "Nickname"
msgstr "Apodo"
-#: C/account-irc.page:52(p)
+#: C/account-irc.page:54(p)
msgid ""
"Your nickname is your unique name on the IRC network. Only one person on a "
"network may use a given nickname. If you get an error message that says "
@@ -3108,11 +3138,11 @@ msgstr ""
"usar cierto apodo. Si obtiene un mensaje que dice <link xref=\"prob-conn-name"
"\" role=\"error-msg\"/> deberá cambiar su apodo."
-#: C/account-irc.page:58(gui)
+#: C/account-irc.page:60(gui)
msgid "Password"
msgstr "Contraseña"
-#: C/account-irc.page:59(p)
+#: C/account-irc.page:61(p)
msgid ""
"Some servers, particularly those on private networks, require a password to "
"connect. If you are authorized to use the network, the network "
@@ -3122,31 +3152,31 @@ msgstr ""
"una contraseña para la conexión. Si está autorizado a usar la red, los "
"administradores de la red le proporcionarán una contraseña."
-#: C/account-irc.page:63(title)
+#: C/account-irc.page:65(title)
msgid "NickServ Passwords"
msgstr "Contraseñas NickServ"
-#: C/account-irc.page:64(p)
+#: C/account-irc.page:66(p)
msgid ""
"On some networks, nicknames can be registered using a service known as "
"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
-"On some networks, including the popular FreeNode network, server passwords "
+"On some networks, including the popular freenode network, server passwords "
"are automatically forwarded to NickServ, allowing you to set this field to "
"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
"more details."
msgstr ""
"En algunas redes los apodos se pueden registrar con un servicio conocido "
"como NickServ. <app>Empathy</app> no soporta directamente contraseñas para "
-"apodos. En algunas redes, incluyendo la popular red FreeNode, las "
+"apodos. En algunas redes, incluyendo la popular red freenode, las "
"contraseñas de servidor se redireccionan automáticamente a NickServ, "
"permitiéndole usar este campo para identificarse con NickServ. Para obtener "
"más información consulte la <link xref=\"irc-nick-password\"/>."
-#: C/account-irc.page:74(gui)
+#: C/account-irc.page:76(gui)
msgid "Real name"
msgstr "Nombre real"
-#: C/account-irc.page:75(p)
+#: C/account-irc.page:77(p)
msgid ""
"You can provide your real name in addition to your nickname. Other users "
"will be able to see this when they view your information."
@@ -3154,11 +3184,11 @@ msgstr ""
"Puede proporcionar su nombre real además de su apodo. Otros usuarios podrán "
"verlo al ver su información."
-#: C/account-irc.page:79(gui)
+#: C/account-irc.page:81(gui)
msgid "Quit message"
msgstr "Mensaje de salida"
-#: C/account-irc.page:80(p)
+#: C/account-irc.page:82(p)
msgid ""
"When you go offline, a quit message is sent to all the chat rooms you’re in "
"and to all the users you’re having a private conversation with. Use this "
@@ -3168,15 +3198,15 @@ msgstr ""
"en las que está y a todos los usuarios con los que tiene una conversación "
"privada. Use este campo para proporcionar un mensaje personalizado."
-#: C/account-irc.page:92(title)
+#: C/account-irc.page:94(title)
msgid "IRC Networks"
msgstr "Redes IRC"
-#: C/account-irc.page:95(title)
+#: C/account-irc.page:97(title)
msgid "Networks"
msgstr "Redes"
-#: C/account-irc.page:97(p)
+#: C/account-irc.page:99(p)
msgid ""
"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
"another IRC network, you can add it to the list. You can also modify "
@@ -3186,7 +3216,7 @@ msgstr ""
"otra red IRC puede añadirla a la lista. También puede modificar y quitar "
"redes de la lista."
-#: C/account-irc.page:102(p)
+#: C/account-irc.page:104(p)
msgid ""
"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
@@ -3194,7 +3224,7 @@ msgstr ""
"Para añadir una red a la lista pulse <media type=\"image\" mime=\"image/png"
"\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Añadir</media>."
-#: C/account-irc.page:105(p)
+#: C/account-irc.page:107(p)
msgid ""
"To modify a network in the list, select the network and click <media type="
"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
@@ -3204,7 +3234,7 @@ msgstr ""
"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
"height=\"16\">Editar</media>."
-#: C/account-irc.page:108(p)
+#: C/account-irc.page:110(p)
msgid ""
"To remove a network from the list, select the network and click <media type="
"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
@@ -3214,24 +3244,24 @@ msgstr ""
"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16"
"\">Quitar</media>."
-#: C/account-irc.page:113(p)
+#: C/account-irc.page:115(p)
msgid ""
"When adding or modifying a network, you can enter the following information:"
msgstr ""
"Al añadir o modificar una red puede introducir la siguiente información:"
-#: C/account-irc.page:119(p)
+#: C/account-irc.page:121(p)
msgid ""
"This is the name of the network as you want it to appear in the list of "
"networks."
msgstr ""
"Este es el nombre de la red como quiere que aparezca en la lista de redes."
-#: C/account-irc.page:123(gui)
+#: C/account-irc.page:125(gui)
msgid "Charset"
msgstr "Conjunto de caracteres"
-#: C/account-irc.page:124(p)
+#: C/account-irc.page:126(p)
msgid ""
"This specifies the character encoding that is typically used on this "
"network. A character encoding is a specific way of recording characters "
@@ -3247,7 +3277,7 @@ msgstr ""
#. Translators: Recommend character encodings that are common
#. for your language.
-#: C/account-irc.page:133(p)
+#: C/account-irc.page:135(p)
msgid ""
"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
"can handle text from most of the world's languages. Another common encoding "
@@ -3258,11 +3288,11 @@ msgstr ""
"del mundo. Otra configuración de caracteres común para inglés y otros "
"idiomas occidentales es ISO-8859-1."
-#: C/account-irc.page:139(gui)
+#: C/account-irc.page:141(gui)
msgid "Servers"
msgstr "Servidores"
-#: C/account-irc.page:140(p)
+#: C/account-irc.page:142(p)
msgid ""
"An IRC network may have many servers you can connect to. When you are "
"connected to a server on a particular network, you can communicate with all "
@@ -3275,7 +3305,7 @@ msgstr ""
"añadir y quitar servidores para esa red usando los botones <gui>Añadir</gui> "
"y <gui>Quitar</gui>."
-#: C/account-irc.page:145(p)
+#: C/account-irc.page:147(p)
msgid ""
"When a server is selected, click the field under <gui>Server</gui> or "
"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
@@ -3286,7 +3316,7 @@ msgstr ""
"izquierda y derecha para dar el foco al campo y pulse la barra espaciadora "
"para comenzar a editarlo."
-#: C/account-irc.page:149(p)
+#: C/account-irc.page:151(p)
msgid ""
"Select the check box in the <gui>SSL</gui> column to encrypt all "
"communication with a server. Note that this does not prevent other users on "
@@ -3302,6 +3332,15 @@ msgid "translator-credits"
msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2008-2010"
#~ msgid ""
+#~ "Click on the trash icon next to the account name to remove the account."
+#~ msgstr ""
+#~ "Para quitar la cuenta pulse el icono de la papelera junto al nombre de la "
+#~ "cuenta."
+
+#~ msgid "To join such a room, if you know the password:"
+#~ msgstr "Para unirse a una sala así, si sabe la contraseña:"
+
+#~ msgid ""
#~ "<app>Empathy</app> does not currently support password-protected IRC chat "
#~ "rooms."
#~ msgstr ""
@@ -3330,10 +3369,6 @@ msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2008-2010"
#~ "En el caso de una cuenta de IRC, escriba su apodo en la caja de texto "
#~ "<gui>Apodo</gui>."
-#~| msgid "Click <gui style=\"button\">Apply</gui>."
-#~ msgid "Click <gui style=\"button\">Save</gui>."
-#~ msgstr "Pulse <gui style=\"button\">Guardar</gui>."
-
#~ msgid ""
#~ "As a special exception, the copyright holders give you permission to "
#~ "copy, modify, and distribute the example code contained in this document "
diff --git a/help/it/it.po b/help/it/it.po
index 3f2af4351..6051088d8 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy help\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-12 21:03+0000\n"
-"PO-Revision-Date: 2010-03-14 20:56+0100\n"
+"POT-Creation-Date: 2010-04-22 21:00+0000\n"
+"PO-Revision-Date: 2010-04-25 15:29+0200\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -17,8 +17,8 @@ msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: C/video-call.page:45(None) C/video-call.page:61(None)
-#: C/audio-video.page:70(None) C/audio-call.page:63(None)
+#: C/video-call.page:45(None) C/video-call.page:63(None)
+#: C/audio-video.page:70(None) C/audio-call.page:65(None)
msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
msgstr "non serve"
@@ -29,11 +29,11 @@ msgstr "Avviare una conversazione video con i propri contatti."
#: C/video-call.page:21(name) C/status-icons.page:16(name)
#: C/share-desktop.page:13(name) C/set-custom-status.page:19(name)
#: C/send-file.page:21(name) C/salut-protocol.page:18(name)
-#: C/remove-account.page:17(name) C/prob-conn-neterror.page:18(name)
+#: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
#: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
#: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
#: C/irc-start-conversation.page:15(name) C/irc-send-file.page:16(name)
-#: C/irc-nick-password.page:18(name) C/irc-manage.page:18(name)
+#: C/irc-nick-password.page:18(name) C/irc-manage.page:19(name)
#: C/irc-join-room.page:16(name) C/irc-join-pwd.page:17(name)
#: C/irc-commands.page:10(name) C/introduction.page:13(name)
#: C/index.page:18(name) C/import-account.page:23(name)
@@ -42,19 +42,19 @@ msgstr "Avviare una conversazione video con i propri contatti."
#: C/geolocation-supported.page:16(name) C/geolocation-privacy.page:17(name)
#: C/geolocation-not-showing.page:17(name) C/geolocation.page:17(name)
#: C/favorite-rooms.page:14(name) C/disable-account.page:20(name)
-#: C/create-account.page:17(name) C/audio-video.page:17(name)
-#: C/audio-call.page:18(name) C/add-account.page:19(name)
+#: C/create-account.page:18(name) C/audio-video.page:17(name)
+#: C/audio-call.page:18(name) C/add-account.page:20(name)
msgid "Milo Casagrande"
msgstr "Milo Casagrande"
#: C/video-call.page:22(email) C/status-icons.page:17(email)
#: C/share-desktop.page:14(email) C/set-custom-status.page:20(email)
#: C/send-file.page:22(email) C/salut-protocol.page:19(email)
-#: C/remove-account.page:18(email) C/prob-conn-neterror.page:19(email)
+#: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
#: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
#: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
#: C/irc-start-conversation.page:16(email) C/irc-send-file.page:17(email)
-#: C/irc-nick-password.page:19(email) C/irc-manage.page:19(email)
+#: C/irc-nick-password.page:19(email) C/irc-manage.page:20(email)
#: C/irc-join-room.page:17(email) C/irc-join-pwd.page:18(email)
#: C/irc-commands.page:11(email) C/introduction.page:14(email)
#: C/index.page:19(email) C/import-account.page:24(email)
@@ -63,20 +63,20 @@ msgstr "Milo Casagrande"
#: C/geolocation-supported.page:17(email) C/geolocation-privacy.page:18(email)
#: C/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
#: C/favorite-rooms.page:15(email) C/disable-account.page:21(email)
-#: C/create-account.page:18(email) C/audio-video.page:18(email)
-#: C/audio-call.page:19(email) C/add-account.page:20(email)
+#: C/create-account.page:19(email) C/audio-video.page:18(email)
+#: C/audio-call.page:19(email) C/add-account.page:21(email)
msgid "milo@ubuntu.com"
msgstr "milo@ubuntu.com"
#: C/video-call.page:25(p) C/status-icons.page:24(p)
#: C/share-desktop.page:17(p) C/set-custom-status.page:23(p)
#: C/send-message.page:20(p) C/send-file.page:25(p)
-#: C/salut-protocol.page:22(p) C/remove-account.page:21(p)
+#: C/salut-protocol.page:22(p) C/remove-account.page:22(p)
#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p)
#: C/prob-conn-name.page:21(p) C/prob-conn-auth.page:25(p)
#: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p)
#: C/irc-start-conversation.page:19(p) C/irc-send-file.page:20(p)
-#: C/irc-nick-password.page:22(p) C/irc-manage.page:22(p)
+#: C/irc-nick-password.page:22(p) C/irc-manage.page:23(p)
#: C/irc-join-room.page:20(p) C/irc-join-pwd.page:21(p)
#: C/irc-commands.page:14(p) C/introduction.page:17(p) C/index.page:22(p)
#: C/import-account.page:31(p) C/hide-contacts.page:15(p)
@@ -84,11 +84,11 @@ msgstr "milo@ubuntu.com"
#: C/geolocation-turn.page:22(p) C/geolocation-supported.page:20(p)
#: C/geolocation-privacy.page:21(p) C/geolocation-not-showing.page:21(p)
#: C/geolocation.page:21(p) C/favorite-rooms.page:18(p)
-#: C/disable-account.page:28(p) C/create-account.page:21(p)
+#: C/disable-account.page:28(p) C/create-account.page:22(p)
#: C/change-status.page:23(p) C/audio-video.page:21(p) C/audio-call.page:22(p)
-#: C/add-contact.page:22(p) C/add-account.page:27(p)
+#: C/add-contact.page:22(p) C/add-account.page:28(p)
#: C/accounts-window.page:22(p) C/account-jabber.page:18(p)
-#: C/account-irc.page:18(p)
+#: C/account-irc.page:20(p)
msgid "Creative Commons Share Alike 3.0"
msgstr "Creative Commons Share Alike 3.0"
@@ -134,14 +134,15 @@ msgstr ""
"gui> assieme al tempo tascorso della conversazione."
#: C/video-call.page:55(p) C/audio-call.page:57(p)
-msgid ""
-"To end the conversation, choose <guiseq><gui style=\"menu\">Call</gui><gui "
-"style=\"menuitem\">Hang up</gui></guiseq>."
+#| msgid ""
+#| "To end the conversation, choose <guiseq><gui style=\"menu\">Call</"
+#| "gui><gui style=\"menuitem\">Hang up</gui></guiseq>."
+msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
msgstr ""
-"Per terminare la conversazione, scegliere <guiseq><gui style=\"menu"
-"\">Chiamata</gui><gui style=\"menuitem>Chiudi</gui></guiseq>."
+"Per terminare la conversazione, fare clic su <gui style=\"button\">Chiudi</"
+"gui>."
-#: C/video-call.page:59(p)
+#: C/video-call.page:61(p)
msgid ""
"To turn a video conversation into an audio conversation, choose <guiseq><gui "
"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>, "
@@ -186,15 +187,15 @@ msgstr "Comprendere i vari stati e le icone di stato."
#: C/prev-conv.page:20(name) C/prev-conv.page:38(cite)
#: C/import-account.page:27(name) C/disable-account.page:24(name)
#: C/audio-video.page:109(cite) C/audio-video.page:117(cite)
-#: C/add-account.page:23(name) C/accounts-window.page:18(name)
-#: C/account-jabber.page:14(name) C/account-irc.page:14(name)
+#: C/add-account.page:24(name) C/accounts-window.page:18(name)
+#: C/account-jabber.page:14(name) C/account-irc.page:16(name)
msgid "Shaun McCance"
msgstr "Shaun McCance"
#: C/status-icons.page:21(email) C/prev-conv.page:21(email)
#: C/import-account.page:28(email) C/disable-account.page:25(email)
-#: C/add-account.page:24(email) C/accounts-window.page:19(email)
-#: C/account-jabber.page:15(email) C/account-irc.page:15(email)
+#: C/add-account.page:25(email) C/accounts-window.page:19(email)
+#: C/account-jabber.page:15(email) C/account-irc.page:17(email)
msgid "shaunm@gnome.org"
msgstr "shaunm@gnome.org"
@@ -724,11 +725,11 @@ msgstr ""
msgid "Completely remove an account from <app>Empathy</app>."
msgstr "Rimuovere completamente un account da <app>Empathy</app>."
-#: C/remove-account.page:32(title)
+#: C/remove-account.page:33(title)
msgid "Remove an account"
msgstr "Rimuovere un account"
-#: C/remove-account.page:34(p)
+#: C/remove-account.page:35(p)
msgid ""
"You can completely remove an account from <app>Empathy</app> if you no "
"longer wish to use the account. If you wish to use the account in "
@@ -740,8 +741,8 @@ msgstr ""
"stesso account con <app>Empathy</app>, è necessario aggiungere nuovamente "
"tutti i dettagli."
-#: C/remove-account.page:41(p) C/irc-nick-password.page:50(p)
-#: C/disable-account.page:48(p) C/add-account.page:47(p)
+#: C/remove-account.page:42(p) C/irc-nick-password.page:50(p)
+#: C/disable-account.page:48(p) C/add-account.page:48(p)
msgid ""
"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
@@ -749,7 +750,7 @@ msgstr ""
"Dalla finestra <gui>Elenco contatti</gui>, scegliere <guiseq><gui>Modifica</"
"gui><gui>Account</gui></guiseq> o premere <key>F4</key>."
-#: C/remove-account.page:45(p)
+#: C/remove-account.page:46(p)
msgid ""
"Select the account you wish to remove from the accounts list on the left "
"side of the window."
@@ -757,12 +758,12 @@ msgstr ""
"Selezionare l'account da rimuovere dall'elenco degli account nel riquadro a "
"sinistra della finestra."
-#: C/remove-account.page:49(p)
-msgid "Click on the trash icon next to the account name to remove the account."
-msgstr ""
-"Fare clic sull'icona a forma di cestino accanto all'account per rimuoverlo."
+#: C/remove-account.page:50(p)
+#| msgid "Click <gui style=\"button\">Add</gui>."
+msgid "Click on <gui style=\"button\">Remove</gui>."
+msgstr "Fare clic su <gui style=\"button\">Rimuovi</gui>."
-#: C/remove-account.page:52(p)
+#: C/remove-account.page:53(p)
msgid ""
"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
"button to permanently remove the account."
@@ -770,7 +771,7 @@ msgstr ""
"Viene mostrato un dialogo per la conferma dell'operazione. Fare clic sul "
"pulsante <gui>Rimuovi</gui> per rimuovere definitivamente l'account."
-#: C/remove-account.page:58(p)
+#: C/remove-account.page:59(p)
msgid ""
"Even after removing an account, <app>Empathy</app> does not delete your "
"conversation history for that account."
@@ -790,7 +791,7 @@ msgstr "Problemi nel connettersi ai servizi di messaggistica"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/prob-conn-neterror.page:58(None) C/prob-conn-name.page:43(None)
-#: C/prob-conn-auth.page:58(None) C/account-irc.page:107(None)
+#: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None)
msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
msgstr "non serve"
@@ -998,9 +999,12 @@ msgstr ""
"selezionare l'account che non funziona."
#: C/prob-conn-acctdisabled.page:65(p)
+#| msgid ""
+#| "Check that the <gui style=\"checkbox\">Enabled</gui> check-box is "
+#| "selected. If it is not, select the check-box to enalbe the account."
msgid ""
"Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. "
-"If it is not, select the check-box to enalbe the account."
+"If it is not, select the check-box to enable the account."
msgstr ""
"Verificare che la casella di scelta <gui style=\"checkbox\">Abilitato</gui> "
"sia selezionata. Se non lo è, selezionarla per abilitare l'account."
@@ -1365,7 +1369,6 @@ msgstr ""
"proprio soprannome."
#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
-#: C/add-account.page:70(p)
msgid "Click <gui style=\"button\">Apply</gui>."
msgstr "Fare clic su <gui style=\"button\">Applica</gui>."
@@ -1383,23 +1386,34 @@ msgstr ""
msgid "How to use IRC with <app>Empathy</app>."
msgstr "Come usare IRC con <app>Empathy</app>."
-#: C/irc-manage.page:33(title)
+#: C/irc-manage.page:34(title)
msgid "Internet Relay Chat (IRC)"
msgstr "Internet Relay Chat (IRC)"
-#: C/irc-manage.page:37(title)
+#: C/irc-manage.page:37(p) C/account-irc.page:39(p)
+#| msgid ""
+#| "You must have the <sys>telepathy-idle</sys> package installed in order to "
+#| "use IRC in <app>Empathy</app>."
+msgid ""
+"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
+"<app>Empathy</app>."
+msgstr ""
+"Per poter usare IRC con <app>Empathy</app> è necessario avere installato il "
+"pacchetto <sys>telepathy-idle</sys>."
+
+#: C/irc-manage.page:43(title)
msgid "IRC Chat Rooms and Conversations"
msgstr "Stanze di conversazione e conversazioni IRC"
-#: C/irc-manage.page:39(title)
+#: C/irc-manage.page:45(title)
msgid "Chat Rooms and Conversations"
msgstr "Stanze di conversazione e conversazioni"
-#: C/irc-manage.page:44(title)
+#: C/irc-manage.page:50(title)
msgid "Common IRC Problems"
msgstr "Problemi comuni con IRC"
-#: C/irc-manage.page:46(title) C/index.page:52(title)
+#: C/irc-manage.page:52(title) C/index.page:52(title)
msgid "Common Problems"
msgstr "Problemi comuni"
@@ -1459,7 +1473,6 @@ msgstr ""
"passi precedenti per ciascuna stanza."
#: C/irc-join-pwd.page:9(desc)
-#| msgid "Join a protected IRC chat room"
msgid "Enter password-protected IRC chat rooms."
msgstr "Entrare in stanze di conversazione IRC protette da password."
@@ -1672,15 +1685,10 @@ msgstr ""
"Nascondere i contatti fuori rete dal proprio <gui>Elenco contatti</gui>."
#: C/hide-contacts.page:19(title)
-#| msgid "Show offline contacts"
msgid "Hide offline contacts"
msgstr "Nascondere i contatti fuori rete"
#: C/hide-contacts.page:21(p)
-#| msgid ""
-#| "Normally, <app>Empathy</app> only shows your contacts that are currently "
-#| "online. You can show all of your contacts instead, including those that "
-#| "are offline."
msgid ""
"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
"with which you can have a conversation, and also those that are offline."
@@ -1704,7 +1712,6 @@ msgstr ""
"premere <keyseq><key>Ctrl</key><key>H</key></keyseq>."
#: C/hide-contacts.page:36(p)
-#| msgid "To hide the offline contacts again, repeat the same procedure above."
msgid "To show the offline contacts again, repeat the same procedure above."
msgstr ""
"Per mostrare nuovamente i contatti fuori rete, ripetere la procedura "
@@ -2311,11 +2318,11 @@ msgstr ""
msgid "Register for an account with one of the supported messaging services."
msgstr "Registrare un account con uno dei servizi di messaggistica supportati."
-#: C/create-account.page:32(title)
+#: C/create-account.page:33(title)
msgid "Register for a new account"
msgstr "Registrare un nuovo account"
-#: C/create-account.page:34(p)
+#: C/create-account.page:35(p)
msgid ""
"Most account types require you to create an account with a account provider "
"before you can connect using instant messaging applications like "
@@ -2330,7 +2337,7 @@ msgstr ""
"account utilizzando gli stessi passi per <link xref=\"add-account"
"\">aggiungere un account</link>."
-#: C/create-account.page:40(p)
+#: C/create-account.page:41(p)
msgid ""
"This page provides information on creating a new account for various types "
"of accounts. Your account provider should give you a login ID and a "
@@ -2342,11 +2349,35 @@ msgstr ""
"identificativo di accesso e una password, oltre a tutte le altre "
"informazioni necessarie per potersi collegare utilizzando <app>Empathy</app>."
-#: C/create-account.page:45(title) C/audio-video.page:170(p)
+#: C/create-account.page:46(title)
+#| msgid "Facebook Chat"
+msgid "Facebook"
+msgstr "Facebook"
+
+#: C/create-account.page:47(p)
+msgid ""
+"Facebook is one of the most used social network. It provides users with the "
+"opportunity to create their own profile, and to communicate with their "
+"friends."
+msgstr ""
+"Facebook è uno dei più utilizzati social network. Consente agli utenti di "
+"creare un proprio profili e di comunicare con i propri amici."
+
+#: C/create-account.page:52(p)
+msgid ""
+"In order to use Facebook to communicate with your friends, you will need to "
+"create a new account from the website: <link href=\"http://www.facebook.com"
+"\">www.facebook.com</link>."
+msgstr ""
+"Per poter utilizzare Facebook per comunicare con i propri amici, è "
+"necessario creare un nuovo account dal sito web: <link href=\"http://www."
+"facebook.com\">www.facebook.com</link>."
+
+#: C/create-account.page:60(title) C/audio-video.page:170(p)
msgid "Jabber"
msgstr "Jabber"
-#: C/create-account.page:47(p)
+#: C/create-account.page:62(p)
msgid ""
"Jabber is an open instant messaging system. Like email, Jabber allows you to "
"choose your account provider and communicate with all other Jabber users, "
@@ -2356,7 +2387,7 @@ msgstr ""
"di scegliere il proprio fornitore di servizio e di comunicare con tutti gli "
"altri utenti Jabber, indipendentemente dal loro fornitore."
-#: C/create-account.page:51(p)
+#: C/create-account.page:66(p)
msgid ""
"You will need to create a new account with a Jabber provider. There are many "
"free providers; one popular provider is <link href=\"http://register.jabber."
@@ -2366,7 +2397,7 @@ msgstr ""
"disponibili molti fornitori, uno molto diffuso è <link href=\"http://"
"register.jabber.org/\">Jabber.org</link>."
-#: C/create-account.page:56(p)
+#: C/create-account.page:71(p)
msgid ""
"If you use Google Mail or Google Talk, you already have a Jabber account. "
"Google Talk is a Jabber service. Simply use your Google Mail address and "
@@ -2376,11 +2407,11 @@ msgstr ""
"Google Talk è un servizio Jabber. Basta semplicemente usare l'indirizzo "
"email e la password di Google in <app>Empathy</app>."
-#: C/create-account.page:63(title) C/audio-video.page:190(p)
+#: C/create-account.page:78(title) C/audio-video.page:190(p)
msgid "People Nearby"
msgstr "Persone nelle vicinanze"
-#: C/create-account.page:65(p)
+#: C/create-account.page:80(p)
msgid ""
"You do not need to create an account with a service provider to use this "
"feature. This service works whenever you are connected to a local network, "
@@ -2393,15 +2424,15 @@ msgstr ""
"automaticamente tutti gli utenti che utilizzano lo stesso servizio "
"all'interno della rete."
-#: C/create-account.page:70(p)
+#: C/create-account.page:85(p)
msgid "For more information, see <link xref=\"salut-protocol\"/>."
msgstr "Per maggiori informazioni, consultare <link xref=\"salut-protocol\"/>."
-#: C/create-account.page:74(title) C/audio-video.page:205(p)
+#: C/create-account.page:89(title) C/audio-video.page:205(p)
msgid "SIP"
msgstr "SIP"
-#: C/create-account.page:76(p)
+#: C/create-account.page:91(p)
msgid ""
"SIP is an open system which allows users to have audio and video "
"conversations over the Internet. You need to create an account with a SIP "
@@ -2413,7 +2444,7 @@ msgstr ""
"servizi SIP. È possibile comunicare con tutti gli utenti SIP "
"indipendentemente dal fornitore SIP utilizzato."
-#: C/create-account.page:81(p)
+#: C/create-account.page:96(p)
msgid ""
"There are a number of popular free SIP account providers; one popular "
"provider is <link href=\"https://signup.sipphone.com/new-users/app?"
@@ -2423,7 +2454,7 @@ msgstr ""
"\"https://signup.sipphone.com/new-users/app?class=NewUser;proc=start"
"\">Sipphone</link>."
-#: C/create-account.page:86(p)
+#: C/create-account.page:101(p)
msgid ""
"Due to technical differences, the free <link href=\"https://www.ekiga.net/"
"index.php?page=register\">Ekiga.net</link> service does not currently work "
@@ -2433,7 +2464,7 @@ msgstr ""
"<ulink type=\"http\" url=\"https://www.ekiga.net/index.php?page=register"
"\">Ekiga</ulink> non funziona con <app>Empathy</app>."
-#: C/create-account.page:91(p)
+#: C/create-account.page:106(p)
msgid ""
"Some SIP providers allow you to call normal phones from your computer. "
"Generally, you will need to subscribe to a paid service for this feature."
@@ -2442,11 +2473,11 @@ msgstr ""
"normali dal proprio computer. Generalmente è necessario abbonarsi a un "
"servizio a pagamento per poter usufruire di questa possibilità."
-#: C/create-account.page:96(title) C/audio-video.page:165(p)
+#: C/create-account.page:111(title) C/audio-video.page:165(p)
msgid "IRC"
msgstr "IRC"
-#: C/create-account.page:98(p)
+#: C/create-account.page:113(p)
msgid ""
"You do not need to register for an account to use IRC. Although you specify "
"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
@@ -2459,16 +2490,20 @@ msgstr ""
"colleghi. Se un altro utente sta usando quel soprannome, è necessario "
"sceglierne un altro."
-#: C/create-account.page:103(p)
+#: C/create-account.page:118(p)
+#| msgid ""
+#| "Some IRC networks use a service called NickServ to allow users to protect "
+#| "thier nicknames. See <link xref=\"irc-nick-password\"/> for more "
+#| "information."
msgid ""
"Some IRC networks use a service called NickServ to allow users to protect "
-"thier nicknames. See <link xref=\"irc-nick-password\"/> for more information."
+"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
msgstr ""
"Alcune reti IRC mettono a disposizione un servizio chiamato «NickServ» per "
"consentire agli utenti di proteggere il proprio soprannome. Per maggiori "
"informazioni, consultare <link xref=\"irc-nick-password\"/>."
-#: C/create-account.page:106(p)
+#: C/create-account.page:121(p)
msgid ""
"Some IRC servers are password protected. You will need to know the password "
"to connect to these servers. Generally, these are private IRC networks."
@@ -2476,11 +2511,11 @@ msgstr ""
"Alcuni server IRC sono protetti da password ed è necessario conoscere la "
"password per potersi collegare. Generalmente queste sono reti IRC private."
-#: C/create-account.page:111(title)
+#: C/create-account.page:126(title)
msgid "Proprietary Services"
msgstr "Servizi proprietari"
-#: C/create-account.page:113(p)
+#: C/create-account.page:128(p)
msgid ""
"There are many proprietary instant messaging services that have been "
"developed by different companies or organizations. <app>Empathy</app> allows "
@@ -2494,19 +2529,19 @@ msgstr ""
"Per creare un nuovo account con uno di questi servizi, è necessario "
"visitarne il sito web e acconsentire ai termini d'uso."
-#: C/create-account.page:122(link) C/audio-video.page:135(p)
+#: C/create-account.page:137(link) C/audio-video.page:135(p)
msgid "AIM"
msgstr "AIM"
-#: C/create-account.page:127(link) C/audio-video.page:160(p)
+#: C/create-account.page:142(link) C/audio-video.page:160(p)
msgid "ICQ"
msgstr "ICQ"
-#: C/create-account.page:132(link) C/audio-video.page:175(p)
+#: C/create-account.page:147(link) C/audio-video.page:175(p)
msgid "MSN"
msgstr "MSN"
-#: C/create-account.page:137(link) C/audio-video.page:210(p)
+#: C/create-account.page:152(link) C/audio-video.page:210(p)
msgid "Yahoo!"
msgstr "Yahoo!"
@@ -2788,7 +2823,7 @@ msgstr ""
"alternativa, fare clic col pulsante destro del mouse sul contatto e "
"scegliere <gui style=\"menuitem\">Chiamata audio</gui>."
-#: C/audio-call.page:61(p)
+#: C/audio-call.page:63(p)
msgid ""
"To turn an audio conversation into a video conversation, choose <guiseq><gui "
"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>, "
@@ -2858,11 +2893,11 @@ msgstr ""
msgid "Add a new account to <app>Empathy</app>."
msgstr "Aggiungere un nuovo account in <application>Empathy</application>"
-#: C/add-account.page:38(title)
+#: C/add-account.page:39(title)
msgid "Add a new account"
msgstr "Aggiungere un nuovo account"
-#: C/add-account.page:40(p)
+#: C/add-account.page:41(p)
msgid ""
"You can add instant messaging accounts from any supported service to "
"communicate with all of your contacts in <app>Empathy</app>. For some "
@@ -2875,11 +2910,11 @@ msgstr ""
"passi qui descritti consentono anche di registrare un nuovo account. Per "
"maggiori informazioni, consultare <link xref=\"create-account\"/>."
-#: C/add-account.page:51(p)
+#: C/add-account.page:52(p)
msgid "Click <gui style=\"button\">Add</gui>."
msgstr "Fare clic su <gui style=\"button\">Aggiungi</gui>."
-#: C/add-account.page:56(p)
+#: C/add-account.page:57(p)
msgid ""
"From the <gui>Protocol</gui> drop-down list, select the type of account you "
"wish to add."
@@ -2887,7 +2922,7 @@ msgstr ""
"Dall'elenco a discesa <gui>Protocollo</gui>, scegliere il tipo di account da "
"aggiungere."
-#: C/add-account.page:60(p)
+#: C/add-account.page:61(p)
msgid ""
"If you do not already have a registered account, select <gui>Create a new "
"account on the server</gui>. This feature is not available for all account "
@@ -2900,7 +2935,7 @@ msgstr ""
"di servizi di messaggistica. Per maggiori informazioni, consultare <link "
"xref=\"create-account\"/>."
-#: C/add-account.page:65(p)
+#: C/add-account.page:66(p)
msgid ""
"Enter the required information. For most accounts, you will only need a "
"login ID and a password. Some accounts may require additional information. "
@@ -2911,7 +2946,12 @@ msgstr ""
"richiedere informazioni aggiuntive. Per maggiori informazioni, consultare "
"<link xref=\"accounts-window#details\"/>."
-#: C/add-account.page:77(p)
+#: C/add-account.page:71(p)
+#| msgid "Click <gui style=\"button\">Add</gui>."
+msgid "Click <gui style=\"button\">Log in</gui>."
+msgstr "Fare clic su <gui style=\"button\">Accedi</gui>."
+
+#: C/add-account.page:78(p)
msgid ""
"To change the name that identifies the account in the <gui>Accounts</gui> "
"window, select the account from the list on the left and either click on the "
@@ -2958,8 +2998,9 @@ msgid "Advanced options for Jabber and Google Talk accounts."
msgstr "Opzioni avanzate degli account Jabber e Google Talk."
#: C/account-jabber.page:29(title)
-msgid "Jabber Account Details"
-msgstr "Dettagli dell'account Jabber"
+#| msgid "Jabber Account Details"
+msgid "Jabber account details"
+msgstr "Dettagli per l'account Jabber"
#: C/account-jabber.page:31(p)
msgid ""
@@ -3067,25 +3108,26 @@ msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:104(None)
+#: C/account-irc.page:106(None)
msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
msgstr "non serve"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:110(None)
+#: C/account-irc.page:112(None)
msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
msgstr "non serve"
-#: C/account-irc.page:7(desc)
+#: C/account-irc.page:8(desc)
msgid "Additional information necessary for connecting to IRC networks."
msgstr "Informazioni necessarie per collegarsi alle reti IRC."
-#: C/account-irc.page:29(title)
-msgid "IRC Account Details"
-msgstr "Dettagli dell'account IRC"
+#: C/account-irc.page:31(title)
+#| msgid "IRC Account Details"
+msgid "IRC account details"
+msgstr "Dettagli per l'account IRC"
-#: C/account-irc.page:31(p)
+#: C/account-irc.page:33(p)
msgid ""
"IRC accounts require different information than many other types of "
"accounts. To create an IRC account, you must specify at least an IRC network "
@@ -3097,19 +3139,11 @@ msgstr ""
"un soprannome. Questa pagina espone le informazioni che è possibile fornire "
"per un account IRC."
-#: C/account-irc.page:37(p)
-msgid ""
-"You must have the <sys>telepathy-idle</sys> package installed in order to "
-"use IRC in <app>Empathy</app>."
-msgstr ""
-"Per poter usare IRC con <app>Empathy</app> è necessario avere installato il "
-"pacchetto <sys>telepathy-idle</sys>."
-
-#: C/account-irc.page:43(gui) C/account-irc.page:118(gui)
+#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
msgid "Network"
msgstr "Rete"
-#: C/account-irc.page:44(p)
+#: C/account-irc.page:46(p)
msgid ""
"IRC is an open system that allows people to run separate IRC networks. Each "
"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
@@ -3122,11 +3156,11 @@ msgstr ""
"attraverso l'elenco a discesa <gui>Rete</gui>. È comunque possibile "
"aggiungere altre reti. Consultare <link xref=\"#networks\"/> più sotto."
-#: C/account-irc.page:51(gui)
+#: C/account-irc.page:53(gui)
msgid "Nickname"
msgstr "Soprannome"
-#: C/account-irc.page:52(p)
+#: C/account-irc.page:54(p)
msgid ""
"Your nickname is your unique name on the IRC network. Only one person on a "
"network may use a given nickname. If you get an error message that says "
@@ -3138,11 +3172,11 @@ msgstr ""
"indicante <link xref=\"prob-conn-name\" role=\"error-msg\"/>, è necessario "
"cambiare il proprio soprannome."
-#: C/account-irc.page:58(gui)
+#: C/account-irc.page:60(gui)
msgid "Password"
msgstr "Password"
-#: C/account-irc.page:59(p)
+#: C/account-irc.page:61(p)
msgid ""
"Some servers, particularly those on private networks, require a password to "
"connect. If you are authorized to use the network, the network "
@@ -3153,11 +3187,11 @@ msgstr ""
"utilizzare una di queste reti, l'amministratore della rete dovrebbe fornire "
"la password adatta. "
-#: C/account-irc.page:63(title)
+#: C/account-irc.page:65(title)
msgid "NickServ Passwords"
msgstr "Password del NickServ"
-#: C/account-irc.page:64(p)
+#: C/account-irc.page:66(p)
msgid ""
"On some networks, nicknames can be registered using a service known as "
"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
@@ -3173,11 +3207,11 @@ msgstr ""
"consentendo di usare questo campo per identificarsi con il «NickServ». Per "
"maggiori informazioni, consultare <link xref=\"irc-nick-password\"/>."
-#: C/account-irc.page:74(gui)
+#: C/account-irc.page:76(gui)
msgid "Real name"
msgstr "Nome reale"
-#: C/account-irc.page:75(p)
+#: C/account-irc.page:77(p)
msgid ""
"You can provide your real name in addition to your nickname. Other users "
"will be able to see this when they view your information."
@@ -3186,11 +3220,11 @@ msgstr ""
"altri utenti lo potranno vedere quando visualizzano le informazioni "
"personali."
-#: C/account-irc.page:79(gui)
+#: C/account-irc.page:81(gui)
msgid "Quit message"
msgstr "Messaggio di uscita"
-#: C/account-irc.page:80(p)
+#: C/account-irc.page:82(p)
msgid ""
"When you go offline, a quit message is sent to all the chat rooms you’re in "
"and to all the users you’re having a private conversation with. Use this "
@@ -3201,15 +3235,15 @@ msgstr ""
"si teneva una conversazione privata. Usare questo campo per fornire un "
"messaggio di uscita personalizzato."
-#: C/account-irc.page:92(title)
+#: C/account-irc.page:94(title)
msgid "IRC Networks"
msgstr "Reti IRC"
-#: C/account-irc.page:95(title)
+#: C/account-irc.page:97(title)
msgid "Networks"
msgstr "Reti"
-#: C/account-irc.page:97(p)
+#: C/account-irc.page:99(p)
msgid ""
"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
"another IRC network, you can add it to the list. You can also modify "
@@ -3219,7 +3253,7 @@ msgstr ""
"aggiungere un'altra rete IRC è sufficiente aggiungerla a questo elenco. È "
"anche possibile modificare le reti presenti e rimuoverle dall'elenco."
-#: C/account-irc.page:102(p)
+#: C/account-irc.page:104(p)
msgid ""
"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
@@ -3228,7 +3262,7 @@ msgstr ""
"\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16"
"\">Aggiungi</media>."
-#: C/account-irc.page:105(p)
+#: C/account-irc.page:107(p)
msgid ""
"To modify a network in the list, select the network and click <media type="
"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
@@ -3238,7 +3272,7 @@ msgstr ""
"<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width="
"\"16\" height=\"16\">Modifica</media>."
-#: C/account-irc.page:108(p)
+#: C/account-irc.page:110(p)
msgid ""
"To remove a network from the list, select the network and click <media type="
"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
@@ -3248,14 +3282,14 @@ msgstr ""
"<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" "
"width=\"16\" height=\"16\">Rimuovi</media>."
-#: C/account-irc.page:113(p)
+#: C/account-irc.page:115(p)
msgid ""
"When adding or modifying a network, you can enter the following information:"
msgstr ""
"Quando si aggiunge o si modifica una rete, è possibile inserire le seguenti "
"informazioni:"
-#: C/account-irc.page:119(p)
+#: C/account-irc.page:121(p)
msgid ""
"This is the name of the network as you want it to appear in the list of "
"networks."
@@ -3263,11 +3297,11 @@ msgstr ""
"Questo è il nome della rete come viene visualizzato nell'elenco di tutte le "
"reti."
-#: C/account-irc.page:123(gui)
+#: C/account-irc.page:125(gui)
msgid "Charset"
msgstr "Codifica caratteri"
-#: C/account-irc.page:124(p)
+#: C/account-irc.page:126(p)
msgid ""
"This specifies the character encoding that is typically used on this "
"network. A character encoding is a specific way of recording characters "
@@ -3283,7 +3317,7 @@ msgstr ""
#. Translators: Recommend character encodings that are common
#. for your language.
-#: C/account-irc.page:133(p)
+#: C/account-irc.page:135(p)
msgid ""
"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
"can handle text from most of the world's languages. Another common encoding "
@@ -3294,11 +3328,11 @@ msgstr ""
"lingue del mondo. Una codifica molto diffusa per l'inglese e per alcune "
"lingue occidentali è la ISO-8859-1."
-#: C/account-irc.page:139(gui)
+#: C/account-irc.page:141(gui)
msgid "Servers"
msgstr "Server"
-#: C/account-irc.page:140(p)
+#: C/account-irc.page:142(p)
msgid ""
"An IRC network may have many servers you can connect to. When you are "
"connected to a server on a particular network, you can communicate with all "
@@ -3311,7 +3345,7 @@ msgstr ""
"possibile aggiungere e rimuovere server da questa rete utilizzando i "
"pulsanti <gui>Aggiungi</gui> e <gui>Rimuovi</gui>."
-#: C/account-irc.page:145(p)
+#: C/account-irc.page:147(p)
msgid ""
"When a server is selected, click the field under <gui>Server</gui> or "
"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
@@ -3322,7 +3356,7 @@ msgstr ""
"le frecce destra e sinistra per spostare il focus sul campo e premere la "
"barra spaziatrice per avviare la modifica."
-#: C/account-irc.page:149(p)
+#: C/account-irc.page:151(p)
msgid ""
"Select the check box in the <gui>SSL</gui> column to encrypt all "
"communication with a server. Note that this does not prevent other users on "
diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index ef4185ae9..97818554f 100644
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -313,9 +313,7 @@ empathy_avatar_image_set (EmpathyAvatarImage *avatar_image,
}
if (!priv->pixbuf) {
- gtk_image_set_from_icon_name (GTK_IMAGE (priv->image),
- "stock_person",
- GTK_ICON_SIZE_DIALOG);
+ gtk_image_clear (GTK_IMAGE (priv->image));
return;
}
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 0165052e1..0a9d4dcf7 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -38,7 +38,6 @@
#include "libempathy/empathy-enum-types.h"
#include "libempathy/empathy-location.h"
-#include "libempathy/empathy-tp-contact-factory.h"
#include "libempathy/empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
@@ -183,6 +182,16 @@ empathy_location_manager_class_init (EmpathyLocationManagerClass *class)
}
static void
+publish_location_cb (TpConnection *connection,
+ const GError *error,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ if (error != NULL)
+ DEBUG ("Error setting location: %s", error->message);
+}
+
+static void
publish_location (EmpathyLocationManager *self,
TpConnection *conn,
gboolean force_publication)
@@ -191,7 +200,6 @@ publish_location (EmpathyLocationManager *self,
guint connection_status = -1;
gboolean can_publish;
EmpathyConf *conf = empathy_conf_get ();
- EmpathyTpContactFactory *factory;
if (!conn)
return;
@@ -215,9 +223,8 @@ publish_location (EmpathyLocationManager *self,
(g_hash_table_size (priv->location) == 0 ? "empty" : ""),
conn);
- factory = empathy_tp_contact_factory_dup_singleton (conn);
- empathy_tp_contact_factory_set_location (factory, priv->location);
- g_object_unref (factory);
+ tp_cli_connection_interface_location_call_set_location (conn, -1,
+ priv->location, publish_location_cb, NULL, NULL, G_OBJECT (self));
}
typedef struct
diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c
index 3a600a81d..29fb934f4 100644
--- a/libempathy-gtk/empathy-theme-boxes.c
+++ b/libempathy-gtk/empathy-theme-boxes.c
@@ -47,7 +47,6 @@
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyThemeBoxes)
typedef struct {
gboolean show_avatars;
- guint notify_show_avatars_id;
} EmpathyThemeBoxesPriv;
G_DEFINE_TYPE (EmpathyThemeBoxes, empathy_theme_boxes, EMPATHY_TYPE_CHAT_TEXT_VIEW);
@@ -362,27 +361,6 @@ theme_boxes_append_message (EmpathyChatTextView *view,
}
static void
-theme_boxes_notify_show_avatars_cb (EmpathyConf *conf,
- const gchar *key,
- gpointer user_data)
-{
- EmpathyThemeBoxesPriv *priv = GET_PRIV (user_data);
-
- empathy_conf_get_bool (conf, key, &priv->show_avatars);
-}
-
-static void
-theme_boxes_finalize (GObject *object)
-{
- EmpathyThemeBoxesPriv *priv = GET_PRIV (object);
-
- empathy_conf_notify_remove (empathy_conf_get (),
- priv->notify_show_avatars_id);
-
- G_OBJECT_CLASS (empathy_theme_boxes_parent_class)->finalize (object);
-}
-
-static void
empathy_theme_boxes_class_init (EmpathyThemeBoxesClass *class)
{
GObjectClass *object_class;
@@ -391,7 +369,6 @@ empathy_theme_boxes_class_init (EmpathyThemeBoxesClass *class)
object_class = G_OBJECT_CLASS (class);
chat_text_view_class = EMPATHY_CHAT_TEXT_VIEW_CLASS (class);
- object_class->finalize = theme_boxes_finalize;
chat_text_view_class->append_message = theme_boxes_append_message;
g_type_class_add_private (object_class, sizeof (EmpathyThemeBoxesPriv));
@@ -405,17 +382,11 @@ empathy_theme_boxes_init (EmpathyThemeBoxes *theme)
theme->priv = priv;
- theme_boxes_create_tags (theme);
-
- priv->notify_show_avatars_id =
- empathy_conf_notify_add (empathy_conf_get (),
- EMPATHY_PREFS_UI_SHOW_AVATARS,
- theme_boxes_notify_show_avatars_cb,
- theme);
+ /* This is just hard-coded to TRUE until someone adds a tickybox in the
+ * Theme tab for it. */
+ priv->show_avatars = TRUE;
- empathy_conf_get_bool (empathy_conf_get (),
- EMPATHY_PREFS_UI_SHOW_AVATARS,
- &priv->show_avatars);
+ theme_boxes_create_tags (theme);
/* Define margin */
g_object_set (theme,
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 35cfd3a98..1d544d8e8 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -26,6 +26,7 @@
#include <glib/gi18n-lib.h>
#include <telepathy-glib/account-manager.h>
+#include <telepathy-glib/interfaces.h>
#include <telepathy-glib/util.h>
#ifdef ENABEL_TPL
#include <telepathy-logger/contact.h>
@@ -80,6 +81,9 @@ static void update_geocode (EmpathyContact *contact);
static void empathy_contact_set_location (EmpathyContact *contact,
GHashTable *location);
+static void set_capabilities_from_tp_caps (EmpathyContact *self,
+ TpCapabilities *caps);
+
G_DEFINE_TYPE (EmpathyContact, empathy_contact, G_TYPE_OBJECT);
enum
@@ -138,6 +142,11 @@ tp_contact_notify_cb (TpContact *tp_contact,
/* This will start a geoclue search to find the address if needed */
empathy_contact_set_location (EMPATHY_CONTACT (contact), location);
}
+ else if (!tp_strdiff (param->name, "capabilities"))
+ {
+ set_capabilities_from_tp_caps (EMPATHY_CONTACT (contact),
+ tp_contact_get_capabilities (tp_contact));
+ }
}
static void
@@ -337,6 +346,9 @@ set_tp_contact (EmpathyContact *contact,
if (location != NULL)
empathy_contact_set_location (contact, location);
+ set_capabilities_from_tp_caps (contact,
+ tp_contact_get_capabilities (tp_contact));
+
g_signal_connect (priv->tp_contact, "notify",
G_CALLBACK (tp_contact_notify_cb), contact);
}
@@ -1382,3 +1394,74 @@ update_geocode (EmpathyContact *contact)
g_hash_table_unref (address);
}
#endif
+
+static EmpathyCapabilities
+tp_caps_to_capabilities (TpCapabilities *caps)
+{
+ EmpathyCapabilities capabilities = 0;
+ guint i;
+ GPtrArray *classes;
+
+ classes = tp_capabilities_get_channel_classes (caps);
+
+ for (i = 0; i < classes->len; i++)
+ {
+ GValueArray *class_struct;
+ GHashTable *fixed_prop;
+ GStrv allowed_prop;
+ TpHandleType handle_type;
+ const gchar *chan_type;
+
+ class_struct = g_ptr_array_index (classes, i);
+ tp_value_array_unpack (class_struct, 2,
+ &fixed_prop,
+ &allowed_prop);
+
+ handle_type = tp_asv_get_uint32 (fixed_prop,
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL);
+ if (handle_type != TP_HANDLE_TYPE_CONTACT)
+ continue;
+
+ chan_type = tp_asv_get_string (fixed_prop,
+ TP_PROP_CHANNEL_CHANNEL_TYPE);
+
+ if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
+ {
+ capabilities |= EMPATHY_CAPABILITIES_FT;
+ }
+ else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE))
+ {
+ capabilities |= EMPATHY_CAPABILITIES_STREAM_TUBE;
+ }
+ else if (!tp_strdiff (chan_type,
+ TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA))
+ {
+ guint j;
+
+ for (j = 0; allowed_prop[j] != NULL; j++)
+ {
+ if (!tp_strdiff (allowed_prop[j],
+ TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO))
+ capabilities |= EMPATHY_CAPABILITIES_AUDIO;
+ else if (!tp_strdiff (allowed_prop[j],
+ TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO))
+ capabilities |= EMPATHY_CAPABILITIES_VIDEO;
+ }
+ }
+ }
+
+ return capabilities;
+}
+
+static void
+set_capabilities_from_tp_caps (EmpathyContact *self,
+ TpCapabilities *caps)
+{
+ EmpathyCapabilities capabilities;
+
+ if (caps == NULL)
+ return;
+
+ capabilities = tp_caps_to_capabilities (caps);
+ empathy_contact_set_capabilities (self, capabilities);
+}
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index 6610a8f18..068c62d62 100644
--- a/libempathy/empathy-tp-contact-factory.c
+++ b/libempathy/empathy-tp-contact-factory.c
@@ -47,13 +47,6 @@ typedef struct {
guint avatar_max_width;
guint avatar_max_height;
guint avatar_max_size;
- /* can_request_ft and can_request_st are meaningful only if the connection
- * doesn't implement ContactCapabilities. If it's implemented, we use it to
- * check if contacts support file transfer and stream tubes. */
- gboolean can_request_ft;
- gboolean can_request_st;
- /* TRUE if ContactCapabilities is implemented by the Connection */
- gboolean contact_caps_supported;
} EmpathyTpContactFactoryPriv;
G_DEFINE_TYPE (EmpathyTpContactFactory, empathy_tp_contact_factory, G_TYPE_OBJECT);
@@ -74,6 +67,7 @@ static TpContactFeature contact_features[] = {
TP_CONTACT_FEATURE_ALIAS,
TP_CONTACT_FEATURE_PRESENCE,
TP_CONTACT_FEATURE_LOCATION,
+ TP_CONTACT_FEATURE_CAPABILITIES,
};
static EmpathyContact *
@@ -131,17 +125,6 @@ tp_contact_factory_set_aliases_cb (TpConnection *connection,
}
static void
-tp_contact_factory_set_location_cb (TpConnection *tp_conn,
- const GError *error,
- gpointer user_data,
- GObject *weak_object)
-{
- if (error != NULL) {
- DEBUG ("Error setting location: %s", error->message);
- }
-}
-
-static void
tp_contact_factory_avatar_retrieved_cb (TpConnection *connection,
guint handle,
const gchar *token,
@@ -292,218 +275,6 @@ tp_contact_factory_avatar_updated_cb (TpConnection *connection,
}
static void
-tp_contact_factory_update_capabilities (EmpathyTpContactFactory *tp_factory,
- guint handle,
- const gchar *channel_type,
- guint generic,
- guint specific)
-{
- EmpathyContact *contact;
- EmpathyCapabilities capabilities;
-
- contact = tp_contact_factory_find_by_handle (tp_factory, handle);
- if (!contact) {
- return;
- }
-
- capabilities = empathy_contact_get_capabilities (contact);
- capabilities &= ~EMPATHY_CAPABILITIES_UNKNOWN;
-
- if (strcmp (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA) == 0) {
- capabilities &= ~EMPATHY_CAPABILITIES_AUDIO;
- capabilities &= ~EMPATHY_CAPABILITIES_VIDEO;
- if (specific & TP_CHANNEL_MEDIA_CAPABILITY_AUDIO) {
- capabilities |= EMPATHY_CAPABILITIES_AUDIO;
- }
- if (specific & TP_CHANNEL_MEDIA_CAPABILITY_VIDEO) {
- capabilities |= EMPATHY_CAPABILITIES_VIDEO;
- }
- }
-
- DEBUG ("Changing capabilities for contact %s (%d) to %d",
- empathy_contact_get_id (contact),
- empathy_contact_get_handle (contact),
- capabilities);
-
- empathy_contact_set_capabilities (contact, capabilities);
-}
-
-static void
-tp_contact_factory_got_capabilities (TpConnection *connection,
- const GPtrArray *capabilities,
- const GError *error,
- gpointer user_data,
- GObject *weak_object)
-{
- EmpathyTpContactFactory *tp_factory;
- guint i;
-
- tp_factory = EMPATHY_TP_CONTACT_FACTORY (weak_object);
-
- if (error) {
- DEBUG ("Error: %s", error->message);
- /* FIXME Should set the capabilities of the contacts for which this request
- * originated to NONE */
- return;
- }
-
- for (i = 0; i < capabilities->len; i++) {
- GValueArray *values;
- guint handle;
- const gchar *channel_type;
- guint generic;
- guint specific;
-
- values = g_ptr_array_index (capabilities, i);
- handle = g_value_get_uint (g_value_array_get_nth (values, 0));
- channel_type = g_value_get_string (g_value_array_get_nth (values, 1));
- generic = g_value_get_uint (g_value_array_get_nth (values, 2));
- specific = g_value_get_uint (g_value_array_get_nth (values, 3));
-
- tp_contact_factory_update_capabilities (tp_factory,
- handle,
- channel_type,
- generic,
- specific);
- }
-}
-
-static void
-tp_contact_factory_capabilities_changed_cb (TpConnection *connection,
- const GPtrArray *capabilities,
- gpointer user_data,
- GObject *weak_object)
-{
- EmpathyTpContactFactory *tp_factory = EMPATHY_TP_CONTACT_FACTORY (weak_object);
- guint i;
-
- for (i = 0; i < capabilities->len; i++) {
- GValueArray *values;
- guint handle;
- const gchar *channel_type;
- guint generic;
- guint specific;
-
- values = g_ptr_array_index (capabilities, i);
- handle = g_value_get_uint (g_value_array_get_nth (values, 0));
- channel_type = g_value_get_string (g_value_array_get_nth (values, 1));
- generic = g_value_get_uint (g_value_array_get_nth (values, 3));
- specific = g_value_get_uint (g_value_array_get_nth (values, 5));
-
- tp_contact_factory_update_capabilities (tp_factory,
- handle,
- channel_type,
- generic,
- specific);
- }
-}
-
-static EmpathyCapabilities
-channel_classes_to_capabilities (GPtrArray *classes,
- gboolean audio_video)
-{
- EmpathyCapabilities capabilities = 0;
- guint i;
-
- for (i = 0; i < classes->len; i++) {
- GValueArray *class_struct;
- GHashTable *fixed_prop;
- GStrv allowed_prop;
- TpHandleType handle_type;
- const gchar *chan_type;
-
- class_struct = g_ptr_array_index (classes, i);
- fixed_prop = g_value_get_boxed (g_value_array_get_nth (class_struct, 0));
- allowed_prop = g_value_get_boxed (g_value_array_get_nth (class_struct, 1));
-
- handle_type = tp_asv_get_uint32 (fixed_prop,
- TP_IFACE_CHANNEL ".TargetHandleType", NULL);
- if (handle_type != TP_HANDLE_TYPE_CONTACT)
- continue;
-
- chan_type = tp_asv_get_string (fixed_prop,
- TP_IFACE_CHANNEL ".ChannelType");
-
- if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) {
- capabilities |= EMPATHY_CAPABILITIES_FT;
- }
-
- else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE)) {
- capabilities |= EMPATHY_CAPABILITIES_STREAM_TUBE;
- }
- else if (audio_video && !tp_strdiff (chan_type,
- TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) {
- guint j;
-
- for (j = 0; allowed_prop[j] != NULL; j++) {
- if (!tp_strdiff (allowed_prop[j],
- TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio"))
- capabilities |= EMPATHY_CAPABILITIES_AUDIO;
- else if (!tp_strdiff (allowed_prop[j],
- TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo"))
- capabilities |= EMPATHY_CAPABILITIES_VIDEO;
- }
- }
- }
-
- return capabilities;
-}
-
-static void
-get_requestable_channel_classes_cb (TpProxy *connection,
- const GValue *value,
- const GError *error,
- gpointer user_data,
- GObject *weak_object)
-{
- EmpathyTpContactFactory *self = EMPATHY_TP_CONTACT_FACTORY (weak_object);
- EmpathyTpContactFactoryPriv *priv = GET_PRIV (self);
- GPtrArray *classes;
- GList *l;
- EmpathyCapabilities capabilities;
-
- if (error != NULL) {
- DEBUG ("Error: %s", error->message);
- return;
- }
-
- classes = g_value_get_boxed (value);
-
- DEBUG ("ContactCapabilities is not implemented; use RCC");
- capabilities = channel_classes_to_capabilities (classes, FALSE);
- if ((capabilities & EMPATHY_CAPABILITIES_FT) != 0) {
- DEBUG ("Assume all contacts support FT as CM implements it");
- priv->can_request_ft = TRUE;
- }
-
- if ((capabilities & EMPATHY_CAPABILITIES_STREAM_TUBE) != 0) {
- DEBUG ("Assume all contacts support stream tubes as CM implements them");
- priv->can_request_st = TRUE;
- }
-
- if (!priv->can_request_ft && !priv->can_request_st)
- return ;
-
- /* Update the capabilities of all contacts */
- for (l = priv->contacts; l != NULL; l = g_list_next (l)) {
- EmpathyContact *contact = l->data;
- EmpathyCapabilities caps;
-
- caps = empathy_contact_get_capabilities (contact);
-
- /* ContactCapabilities is not supported; assume all contacts can do file
- * transfer if it's implemented in the CM */
- if (priv->can_request_ft)
- caps |= EMPATHY_CAPABILITIES_FT;
-
- if (priv->can_request_st)
- caps |= EMPATHY_CAPABILITIES_STREAM_TUBE;
-
- empathy_contact_set_capabilities (contact, caps);
- }
-}
-
-static void
tp_contact_factory_got_avatar_requirements_cb (TpConnection *proxy,
const gchar **mime_types,
guint min_width,
@@ -534,55 +305,6 @@ tp_contact_factory_got_avatar_requirements_cb (TpConnection *proxy,
}
static void
-update_contact_capabilities (EmpathyTpContactFactory *self,
- GHashTable *caps)
-{
- GHashTableIter iter;
- gpointer key, value;
-
- g_hash_table_iter_init (&iter, caps);
- while (g_hash_table_iter_next (&iter, &key, &value)) {
- TpHandle handle = GPOINTER_TO_UINT (key);
- GPtrArray *classes = value;
- EmpathyContact *contact;
- EmpathyCapabilities capabilities;
-
- contact = tp_contact_factory_find_by_handle (self, handle);
- if (contact == NULL)
- continue;
-
- capabilities = empathy_contact_get_capabilities (contact);
- capabilities &= ~EMPATHY_CAPABILITIES_UNKNOWN;
-
- capabilities |= channel_classes_to_capabilities (classes, TRUE);
-
- DEBUG ("Changing capabilities for contact %s (%d) to %d",
- empathy_contact_get_id (contact),
- empathy_contact_get_handle (contact),
- capabilities);
-
- empathy_contact_set_capabilities (contact, capabilities);
- }
-}
-
-static void
-tp_contact_factory_got_contact_capabilities (TpConnection *connection,
- GHashTable *caps,
- const GError *error,
- gpointer user_data,
- GObject *weak_object)
-{
- EmpathyTpContactFactory *self = EMPATHY_TP_CONTACT_FACTORY (weak_object);
-
- if (error != NULL) {
- DEBUG ("Error: %s", error->message);
- return;
- }
-
- update_contact_capabilities (self, caps);
-}
-
-static void
tp_contact_factory_add_contact (EmpathyTpContactFactory *tp_factory,
EmpathyContact *contact)
{
@@ -590,7 +312,6 @@ tp_contact_factory_add_contact (EmpathyTpContactFactory *tp_factory,
TpHandle self_handle;
TpHandle handle;
GArray handles = {(gchar *) &handle, 1};
- EmpathyCapabilities caps;
/* Keep a weak ref to that contact */
g_object_weak_ref (G_OBJECT (contact),
@@ -603,24 +324,6 @@ tp_contact_factory_add_contact (EmpathyTpContactFactory *tp_factory,
g_object_ref (tp_factory),
g_object_unref);
- caps = empathy_contact_get_capabilities (contact);
-
- /* Set the FT capability */
- if (!priv->contact_caps_supported) {
- /* ContactCapabilities is not supported; assume all contacts can do file
- * transfer if it's implemented in the CM */
- if (priv->can_request_ft) {
- caps |= EMPATHY_CAPABILITIES_FT;
- }
-
- /* Set the Stream Tube capability */
- if (priv->can_request_st) {
- caps |= EMPATHY_CAPABILITIES_STREAM_TUBE;
- }
- }
-
- empathy_contact_set_capabilities (contact, caps);
-
/* Set is-user property. Note that it could still be the handle is
* different from the connection's self handle, in the case the handle
* comes from a group interface. */
@@ -637,20 +340,6 @@ tp_contact_factory_add_contact (EmpathyTpContactFactory *tp_factory,
G_OBJECT (tp_factory));
}
- if (priv->contact_caps_supported) {
- tp_cli_connection_interface_contact_capabilities_call_get_contact_capabilities (
- priv->connection, -1, &handles,
- tp_contact_factory_got_contact_capabilities, NULL, NULL,
- G_OBJECT (tp_factory));
- }
- else if (tp_proxy_has_interface_by_id (priv->connection,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES)) {
- tp_cli_connection_interface_capabilities_call_get_capabilities (
- priv->connection, -1, &handles,
- tp_contact_factory_got_capabilities, NULL, NULL,
- G_OBJECT (tp_factory));
- }
-
DEBUG ("Contact added: %s (%d)",
empathy_contact_get_id (contact),
empathy_contact_get_handle (contact));
@@ -1031,24 +720,6 @@ empathy_tp_contact_factory_set_alias (EmpathyTpContactFactory *tp_factory,
g_hash_table_destroy (new_alias);
}
-void
-empathy_tp_contact_factory_set_location (EmpathyTpContactFactory *tp_factory,
- GHashTable *location)
-{
- EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-
- g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
-
- DEBUG ("Setting location");
-
- tp_cli_connection_interface_location_call_set_location (priv->connection,
- -1,
- location,
- tp_contact_factory_set_location_cb,
- NULL, NULL,
- G_OBJECT (tp_factory));
-}
-
static void
tp_contact_factory_get_property (GObject *object,
guint param_id,
@@ -1127,17 +798,6 @@ tp_contact_factory_finalize (GObject *object)
}
static void
-tp_contact_factory_contact_capabilities_changed_cb (TpConnection *connection,
- GHashTable *caps,
- gpointer user_data,
- GObject *weak_object)
-{
- EmpathyTpContactFactory *self = EMPATHY_TP_CONTACT_FACTORY (weak_object);
-
- update_contact_capabilities (self, caps);
-}
-
-static void
connection_ready_cb (TpConnection *connection,
const GError *error,
gpointer user_data)
@@ -1160,36 +820,12 @@ connection_ready_cb (TpConnection *connection,
G_OBJECT (tp_factory),
NULL);
- if (tp_proxy_has_interface_by_id (connection,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES)) {
- priv->contact_caps_supported = TRUE;
-
- tp_cli_connection_interface_contact_capabilities_connect_to_contact_capabilities_changed (
- priv->connection, tp_contact_factory_contact_capabilities_changed_cb,
- NULL, NULL, G_OBJECT (tp_factory), NULL);
- }
- else {
- tp_cli_connection_interface_capabilities_connect_to_capabilities_changed (priv->connection,
- tp_contact_factory_capabilities_changed_cb,
- NULL, NULL,
- G_OBJECT (tp_factory),
- NULL);
- }
-
tp_cli_connection_interface_avatars_call_get_avatar_requirements (priv->connection,
-1,
tp_contact_factory_got_avatar_requirements_cb,
NULL, NULL,
G_OBJECT (tp_factory));
- if (!priv->contact_caps_supported) {
- tp_cli_dbus_properties_call_get (priv->connection, -1,
- TP_IFACE_CONNECTION_INTERFACE_REQUESTS,
- "RequestableChannelClasses",
- get_requestable_channel_classes_cb, NULL, NULL,
- G_OBJECT (tp_factory));
- }
-
out:
g_object_unref (tp_factory);
}
@@ -1307,9 +943,6 @@ empathy_tp_contact_factory_init (EmpathyTpContactFactory *tp_factory)
EMPATHY_TYPE_TP_CONTACT_FACTORY, EmpathyTpContactFactoryPriv);
tp_factory->priv = priv;
- priv->can_request_ft = FALSE;
- priv->can_request_st = FALSE;
- priv->contact_caps_supported = FALSE;
}
static GHashTable *factories = NULL;
diff --git a/libempathy/empathy-tp-contact-factory.h b/libempathy/empathy-tp-contact-factory.h
index 4cce6ec6a..d2572f298 100644
--- a/libempathy/empathy-tp-contact-factory.h
+++ b/libempathy/empathy-tp-contact-factory.h
@@ -104,8 +104,6 @@ void empathy_tp_contact_factory_get_from_handle (EmpathyTpC
void empathy_tp_contact_factory_set_alias (EmpathyTpContactFactory *tp_factory,
EmpathyContact *contact,
const gchar *alias);
-void empathy_tp_contact_factory_set_location (EmpathyTpContactFactory *tp_factory,
- GHashTable *location);
G_END_DECLS
#endif /* __EMPATHY_TP_CONTACT_FACTORY_H__ */
diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
index c43fa0be7..ed0bdb2d8 100644
--- a/libempathy/empathy-tp-file.c
+++ b/libempathy/empathy-tp-file.c
@@ -30,6 +30,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
+#include <netinet/in.h>
#include <glib/gi18n-lib.h>
diff --git a/libempathy/irc-networks.xml b/libempathy/irc-networks.xml
index 4373eba93..da99ec9bf 100644
--- a/libempathy/irc-networks.xml
+++ b/libempathy/irc-networks.xml
@@ -211,7 +211,7 @@
<server ssl="FALSE" port="6667" address="irc.vendetta.com"/>
</servers>
</network>
- <network name="FreeNode" id="freenode">
+ <network name="freenode" id="freenode">
<servers>
<server ssl="FALSE" port="6667" address="chat.freenode.net"/>
<server ssl="FALSE" port="6667" address="irc.freenode.net"/>
diff --git a/po/de.po b/po/de.po
index 67c188de3..b5dc0733d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,10 +11,11 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-20 11:30+0100\n"
-"PO-Revision-Date: 2010-03-20 11:38+0100\n"
-"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2010-04-22 21:00+0000\n"
+"PO-Revision-Date: 2010-05-02 15:29+0100\n"
+"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
"Language-Team: Deutsch <gnome-de@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -115,214 +116,225 @@ msgid "Empathy has migrated butterfly logs"
msgstr "Empathy hat die Mitschnitte von Butterfly migriert"
#: ../data/empathy.schemas.in.h:18
+#| msgid "Empathy should auto-connect on startup"
+msgid "Empathy should auto-away when idle"
+msgstr "Automatisch in Abwesend-Status bei Untätigkeit"
+
+#: ../data/empathy.schemas.in.h:19
msgid "Empathy should auto-connect on startup"
msgstr "Automatisch beim Start verbinden"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:20
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy soll die Genauigkeit der Ortsangabe verringern"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
"Legt fest, ob Empathy das Benutzerbild des Kontaktes als Symbol des Chat-"
"Fensters verwenden soll"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
msgid "Enable WebKit Developer Tools"
msgstr "WebKit-Entwicklerwerkzeuge aktivieren"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
msgid "Enable popup notifications for new messages"
msgstr "Einblendende Benachrichtigungen für neue Nachrichten aktivieren"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
msgid "Enable spell checker"
msgstr "Rechtschreibprüfung aktivieren"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:25
msgid "Hide main window"
msgstr "Hauptfenster verstecken"
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:26
msgid "Hide the main window."
msgstr "Das Hauptfenster verstecken."
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:27
msgid "MC 4 accounts have been imported"
msgstr "MC-4-Konten wurden importiert"
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:28
msgid "MC 4 accounts have been imported."
msgstr "MC-4-Konten wurden importiert."
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:29
msgid "Nick completed character"
msgstr "Zeichen nach der Spitznamen-Vervollständigung"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:30
msgid "Open new chats in separate windows"
msgstr "Neue Chats in eigenen Fenstern öffnen"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:31
msgid "Path of the Adium theme to use"
msgstr "Pfad zum zu verwendenden Adium-Thema"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr ""
"Pfad zum zu verwendenden Adium-Thema, wenn das Thema für den Chat »Adium« ist."
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:33
msgid "Play a sound for incoming messages"
msgstr "Bei einkommender Nachricht Klang abspielen"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:34
msgid "Play a sound for new conversations"
msgstr "Bei neuen Unterhaltungen Klang abspielen"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:35
msgid "Play a sound for outgoing messages"
msgstr "Bei ausgehender Nachricht Klang abspielen"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:36
msgid "Play a sound when a contact logs in"
msgstr "Bei Anmelden eines Kontaktes Klang abspielen"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:37
msgid "Play a sound when a contact logs out"
msgstr "Bei Abmelden eines Kontaktes Klang abspielen"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:38
msgid "Play a sound when we log in"
msgstr "Bei eigenem Anmelden Klang abspielen"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:39
msgid "Play a sound when we log out"
msgstr "Bei eigenem Abmelden Klang abspielen"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:40
msgid "Pop up notifications if the chat isn't focused"
msgstr "Benachrichtigungen einblenden, wenn der Chat nicht fokussiert ist"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:41
msgid "Pop up notifications when a contact logs in"
msgstr "Benachrichtigungen einblenden, wenn sich ein Kontakt anmeldet"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:42
msgid "Pop up notifications when a contact logs out"
msgstr "Benachrichtigungen einblenden, wenn sich ein Kontakt abmeldet"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:43
msgid "Show avatars"
msgstr "Benutzerbilder anzeigen"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:44
msgid "Show contact list in rooms"
msgstr "Kontaktliste in Chaträumen anzeigen"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:45
msgid "Show hint about closing the main window"
msgstr "Hinweis über das Schließen des Hauptfensters anzeigen"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:46
msgid "Show offline contacts"
msgstr "Abgemeldete Kontakte anzeigen"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:47
msgid "Show protocols"
msgstr "Protokolle anzeigen"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:48
msgid "Spell checking languages"
msgstr "Rechtschreibprüfungssprachen"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:49
msgid "The default folder to save file transfers in."
msgstr "Der vorgegebene Ordner zum Speichern der Dateiübertragungen"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:50
msgid "The last directory that an avatar image was chosen from."
msgstr "Der letzte Ordner, aus welchem ein Benutzerbild gewählt wurde."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:51
msgid "The theme that is used to display the conversation in chat windows."
msgstr ""
"Das Erscheinungsbild, das für das Anzeigen von Unterhaltungen in Chat-"
"Fenstern verwendet wird."
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:52
msgid "Use graphical smileys"
msgstr "Grafische Emoticons verwenden"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:53
msgid "Use notification sounds"
msgstr "Benachrichtigen mit Klängen"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:54
msgid "Use theme for chat rooms"
msgstr "Erscheinungsbild für Chaträume verwenden"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:55
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
-"Legt fest, ob Empathy den Ort des Benutzers dessen Kontakten übermitteln "
-"darf."
+"Legt fest, ob Empathy den Ort des Benutzers dessen Kontakten übermitteln darf."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:56
msgid "Whether Empathy can use the GPS to guess the location."
-msgstr ""
-"Legt fest, ob Empathy das GPS nutzen darf, um den Standort zu schätzen."
+msgstr "Legt fest, ob Empathy das GPS nutzen darf, um den Standort zu schätzen."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:57
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Legt fest, ob Empathy das Mobilfunknetz nutzen darf, um den Standort zu "
"schätzen."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:58
msgid "Whether Empathy can use the network to guess the location."
msgstr ""
"Legt fest, ob Empathy das Netzwerk nutzen darf, um den Standort zu schätzen."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:59
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr ""
"Legt fest, ob Empathy danach gefragt hat, Benutzerkonten aus anderen "
"Programmen zu importieren."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:60
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Legt fest, ob Empathy Mitschnitte von Butterfly migriert hat."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:61
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr ""
"Legt fest, ob Empathy sich automatisch beim Start bei allen Konten anmelden "
"soll."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:62
+#| msgid ""
+#| "Whether Empathy should automatically log into your accounts on startup."
+msgid "Whether Empathy should go into away mode automatically if user is idle."
+msgstr ""
+"Legt fest, ob Empathy automatisch in den Abwesend-Modus versetzt werden soll, "
+"wenn der Benutzer untätig ist."
+
+#: ../data/empathy.schemas.in.h:63
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Legt fest, ob Empathy die Genauigkeit der Positionsangabe aus "
"Datenschutzgründen reduzieren soll."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:64
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Legt fest, ob Empathy das Benutzerbild des Kontakts als Symbol des Chat-"
"Fensters verwenden soll."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:65
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Legt fest, ob die WebKit-Entwicklerwerkzeuge, wie der Web Inspector, "
"aktiviert werden sollen."
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:66
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -330,137 +342,137 @@ msgstr ""
"Legt fest, ob Verbindungsverwaltungen für das automatische Verbinden und "
"Trennen verwendet werden sollen."
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:67
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
"Legt fest, ob die Rechtschreibung eingegebener Wörter geprüft werden soll."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:68
msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
"Legt fest, ob bei Unterhaltungen Emoticons als grafische Bilder dargestellt "
"werden sollen."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:69
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Legt fest, ob auf das Anmelden von Kontakten am Netzwerk mit einem Klang "
"hingewiesen werden soll."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:70
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Legt fest, ob auf das Abmelden von Kontakten am Netzwerk mit einem Klang "
"hingewiesen werden soll."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:71
msgid "Whether to play a sound to notify of events."
msgstr "Legt fest, ob bei Ereignissen Klänge abgespielt werden sollen."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:72
msgid "Whether to play a sound to notify of incoming messages."
msgstr ""
"Legt fest, ob bei eingehenden Nachrichten ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:73
msgid "Whether to play a sound to notify of new conversations."
msgstr "Legt fest, ob bei neuen Gesprächen ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:74
msgid "Whether to play a sound to notify of outgoing messages."
msgstr ""
"Legt fest, ob bei ausgehenden Nachrichten ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:75
msgid "Whether to play a sound when logging into a network."
msgstr ""
"Legt fest, ob beim Anmelden ans Netzwerk ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:76
msgid "Whether to play a sound when logging out of a network."
msgstr ""
"Legt fest, ob beim Abmelden vom Netzwerk ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:77
msgid "Whether to play sound notifications when away or busy."
msgstr ""
"Legt fest, ob bei Abwesenheit oder Beschäftigung Klänge abgespielt werden "
"sollen."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:78
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
-"Legt fest, ob beim Abmelden eines Kontakts eine Benachrichtigung "
-"eingeblendet werden soll."
+"Legt fest, ob beim Abmelden eines Kontakts eine Benachrichtigung eingeblendet "
+"werden soll."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:79
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
-"Legt fest, ob beim Anmelden eines Kontakts eine Benachrichtigung "
-"eingeblendet werden soll."
+"Legt fest, ob beim Anmelden eines Kontakts eine Benachrichtigung eingeblendet "
+"werden soll."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:80
msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if the "
+"chat is already opened, but not focused."
msgstr ""
"Legt fest, ob eine eine Benachrichtigung beim Empfang einer neuen Nachricht "
"auch dann eingeblendet werden soll, wenn der Chat bereits geöffnet, aber "
"nicht fokussiert ist."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:81
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Legt fest, ob eine eine Benachrichtigung beim Empfang einer neuen Nachricht "
"eingeblendet werden soll."
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:82
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Legt fest, ob Benutzerbilder für Kontakte in der Kontaktliste und den Chat-"
"Fenstern angezeigt werden sollen."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:83
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
"Legt fest, ob abgemeldete Kontakte in der Kontaktliste angezeigt werden."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:84
msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Legt fest, ob bei Abwesenheit oder Beschäftigung Benachrichtigungen "
"eingeblendet werden sollen."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to show protocols for contacts in the contact list."
msgstr ""
"Legt fest, ob Protokolle für Kontakte in der Kontaktliste angezeigt werden "
"sollen."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:86
msgid "Whether to show the contact list in chat rooms."
msgstr "Legt fest, ob die Kontaktliste in Chaträumen angezeigt werden soll."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:87
msgid "Whether to show the contact list in compact mode."
msgstr "Legt fest, ob die Kontaktliste im Kompaktmodus angezeigt werden soll."
-#: ../data/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:88
msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
+"Whether to show the message dialog about closing the main window with the 'x' "
+"button in the title bar."
msgstr ""
"Legt fest, ob der Dialog zum Schließen des Hauptfensters mit dem »x«-Knopf in "
"der Titelleiste angezeigt werden soll."
-#: ../data/empathy.schemas.in.h:87
+#: ../data/empathy.schemas.in.h:89
msgid "Whether to use the theme for chat rooms."
msgstr "Legt fest, ob das Thema für Chaträume verwendet werden soll."
-#: ../data/empathy.schemas.in.h:88
+#: ../data/empathy.schemas.in.h:90
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -477,7 +489,7 @@ msgstr "Sofortnachrichten- und VoIP-Konten verwalten"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243
+#: ../src/empathy-accounts-dialog.c:2064 ../src/cc-empathy-accounts-page.c:243
#: ../src/cc-empathy-accounts-panel.c:91
msgid "Messaging and VoIP Accounts"
msgstr "Sofortnachrichten- und VoIP-Konten"
@@ -500,11 +512,6 @@ msgstr "Die ausgewählte Datei ist keine normale Datei"
msgid "The selected file is empty"
msgstr "Die ausgewählte Datei ist leer"
-#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:77
-msgid "People nearby"
-msgstr "Personen in der Nähe"
-
#: ../libempathy/empathy-tp-file.c:280
msgid "Socket type not supported"
msgstr "Socket-Typ nicht unterstützt"
@@ -533,7 +540,7 @@ msgstr "Fehler beim Versuch, die Datei zu übertragen"
msgid "The other participant is unable to transfer the file"
msgstr "Der andere Teilnehmer kann die Datei nicht übertragen"
-#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:315
msgid "Unknown reason"
msgstr "Unbekannter Grund"
@@ -557,71 +564,77 @@ msgstr "Unsichtbar"
msgid "Offline"
msgstr "Abgemeldet"
-#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:249
+#| msgctxt "file transfer percent"
+#| msgid "Unknown"
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: ../libempathy/empathy-utils.c:287
msgid "No reason specified"
msgstr "Es wurde kein Grund angegeben"
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:289
msgid "Status is set to offline"
msgstr "Der Status ist nun »abgemeldet«"
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:291
msgid "Network error"
msgstr "Netzwerk-Fehler"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:293
msgid "Authentication failed"
msgstr "Legitimierung fehlgeschlagen"
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
msgid "Encryption error"
msgstr "Verschlüsselungsfehler"
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:297
msgid "Name in use"
msgstr "Name bereits in Benutzung"
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:299
msgid "Certificate not provided"
msgstr "Zertifikat wurde nicht bereitgestellt"
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:301
msgid "Certificate untrusted"
msgstr "Zertifikat nicht vertrauenswürdig"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:303
msgid "Certificate expired"
msgstr "Zertifikat ausgelaufen"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:305
msgid "Certificate not activated"
msgstr "Zertifikat nicht aktiviert"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:307
msgid "Certificate hostname mismatch"
msgstr "Zertifikat und Hostname unterschiedlich"
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:309
msgid "Certificate fingerprint mismatch"
msgstr "Zertifikat und Fingerprint unterschiedlich"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
msgid "Certificate self-signed"
msgstr "Selbstsigniertes Zertifikat"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:313
msgid "Certificate error"
msgstr "Zertifikat-Fehler"
-#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:430 ../src/empathy-import-mc4-accounts.c:104
msgid "People Nearby"
msgstr "Personen in der Nähe"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:435
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:436
msgid "Facebook Chat"
msgstr "Facebook-Chat"
@@ -671,25 +684,25 @@ msgstr[1] "Vor %d Monaten"
msgid "in the future"
msgstr "in der Zukunft"
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:463
msgid "All"
msgstr "Alle"
-#: ../libempathy-gtk/empathy-account-widget.c:538
-#: ../libempathy-gtk/empathy-account-widget.c:594
+#: ../libempathy-gtk/empathy-account-widget.c:549
+#: ../libempathy-gtk/empathy-account-widget.c:605
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1126
+#: ../libempathy-gtk/empathy-account-widget.c:1136
msgid "Username:"
msgstr "Benutzername:"
-#: ../libempathy-gtk/empathy-account-widget.c:1474
+#: ../libempathy-gtk/empathy-account-widget.c:1479
msgid "L_og in"
msgstr "_Anmelden"
-#: ../libempathy-gtk/empathy-account-widget.c:1542
+#: ../libempathy-gtk/empathy-account-widget.c:1547
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
@@ -697,15 +710,15 @@ msgstr "_Anmelden"
msgid "Account:"
msgstr "Konto:"
-#: ../libempathy-gtk/empathy-account-widget.c:1553
+#: ../libempathy-gtk/empathy-account-widget.c:1558
msgid "Enabled"
msgstr "Aktiviert"
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1623
msgid "This account already exists on the server"
msgstr "Dieses Konto ist bereits auf dem Server vorhanden"
-#: ../libempathy-gtk/empathy-account-widget.c:1621
+#: ../libempathy-gtk/empathy-account-widget.c:1626
msgid "Create a new account on the server"
msgstr "Ein neues Konto auf dem Server anlegen"
@@ -714,19 +727,19 @@ msgstr "Ein neues Konto auf dem Server anlegen"
#. * like: "MyUserName on chat.freenode.net".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1995
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s auf %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2039
+#: ../libempathy-gtk/empathy-account-widget.c:2021
#, c-format
msgid "%s Account"
msgstr "%s-Konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2043
+#: ../libempathy-gtk/empathy-account-widget.c:2025
msgid "New account"
msgstr "Neues Konto"
@@ -751,7 +764,7 @@ msgstr "Fortgeschritten"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "Pass_wort:"
@@ -771,7 +784,7 @@ msgstr "Wie lautet Ihr AIM AOL-Name?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
@@ -780,7 +793,7 @@ msgstr "P_ort:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -831,36 +844,36 @@ msgstr "_Zeichensatz:"
msgid "New Network"
msgstr "Neues Netzwerk"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:183
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
msgid "Auto"
msgstr "Automatisch"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:186
msgid "UDP"
msgstr "UDP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:189
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:192
msgid "TLS"
msgstr "TLS"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:221
msgid "Register"
msgstr "Registrieren (Anmelden)"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:226
msgid "Options"
msgstr "Einstellungen"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
msgid "None"
msgstr "Kein"
@@ -916,7 +929,8 @@ msgstr "P_riorität:"
msgid "Reso_urce:"
msgstr "_Ressource:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -925,50 +939,50 @@ msgid ""
msgstr ""
"Dies ist Ihr Benutzername, nicht Ihr gewöhnlicher Facebook-Anmeldename.\n"
"Falls Sie facebook.com/<b>dachs</b> sind, geben Sie <b>dachs</b> ein.\n"
-"Wählen Sie auf <a href=\"http://www.facebook.com/username/\">dieser Seite</"
-"a> einen Facebook-Benutzernamen, falls Sie noch keinen besitzen."
+"Wählen Sie auf <a href=\"http://www.facebook.com/username/\">dieser Seite</a> "
+"einen Facebook-Benutzernamen, falls Sie noch keinen besitzen."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid "Use old SS_L"
msgstr "Alte SS_L-Verschlüsselung verwenden"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
msgid "What is your Facebook password?"
msgstr "Wie lautet Ihr Facebook-Passwort?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "What is your Facebook username?"
msgstr "Wie lautet Ihr Facebook-Benutzername?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Google ID?"
msgstr "Wie lautet Ihre Google-ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Google password?"
msgstr "Wie lautet Ihr Passwort bei Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Jabber ID?"
msgstr "Wie lautet Ihre Jabber-Kennung?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Jabber password?"
msgstr "Wie lautet Ihr Jabber-Passwort?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your desired Jabber ID?"
msgstr "Wie lautet Ihre gewünschte Jabber-Kennung?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your desired Jabber password?"
msgstr "Wie lautet Ihr gewünschtes Jabber-Passwort?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "_Encryption required (TLS/SSL)"
msgstr "_Verschlüsselung erforderlich (TLS/SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "_Ignore SSL certificate errors"
msgstr "SSL-Zertifikat-_Fehler ignorieren"
@@ -1025,96 +1039,58 @@ msgid "Discover the STUN server automatically"
msgstr "Den STUN-Server automatisch suchen"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Hostname of the proxy for outbound requests."
-msgstr "Rechnername des Proxy für ausgehende Anfragen."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "Intervall (Sekunden)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Keep-Alive Options"
msgstr "Einstellungen zu Keep-Alive"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid ""
-"Look up the DNS SRV record at the service's domain for the host name of a "
-"STUN server."
-msgstr ""
-"Den SRV-Eintrag im DNS in der Dienstdomäne für den Rechnernamen des STUN-"
-"Servers nachschlagen"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Loose Routing"
msgstr "Freies Routing"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Mechanism:"
msgstr "Mechanismus:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Miscellaneous Options"
msgstr "Verschiedene Einstellungen"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "NAT Traversal Options"
msgstr "Einstellungen zu NAT-Traversal"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Port of the proxy for outbound requests."
-msgstr "Port des Proxy für ausgehende Anfragen."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
msgid "Port:"
msgstr "Port:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Proxy Options"
msgstr "Proxy-Einstellungen"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "STUN Server:"
msgstr "STUN-Server:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Server:"
msgstr "Server:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid ""
-"The username for SIP authentication, if different from the SIP URI\n"
-"username."
-msgstr ""
-"Der Benutzername zur SIP-Authentifizierung, falls vom Namen der SIP-Adresse "
-"abweichend"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Transport:"
msgstr "Transport:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid ""
-"Update the registration binding if the external address for the client is "
-"discovered to be different from the local binding."
-msgstr ""
-"Die Registrierungs-Bindung aktualisieren, falls die externe Adresse für den "
-"Client von der lokalen Bindung abweicht"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid ""
-"Use the loose routing behavior and the Route header as recommended in RFC "
-"3261."
-msgstr "»Freies Routing« und den in RFC 3261 empfohlenen Route-Kopf verwenden."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "What is your SIP account password?"
msgstr "Wie lautet Ihr SIP-Passwort?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP login ID?"
msgstr "Wie lautet Ihre SIP-Anmeldekennung?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "_Username:"
msgstr "Benutzer_name:"
@@ -1172,153 +1148,156 @@ msgstr "Alle Dateien"
msgid "Click to enlarge"
msgstr "Zum Vergrößern klicken"
-#: ../libempathy-gtk/empathy-chat.c:233
+#: ../libempathy-gtk/empathy-chat.c:235
msgid "Failed to reconnect this chat"
-msgstr ""
-"Verbindung für diese Unterhaltung konnte nicht wiederaufgenommen werden"
+msgstr "Verbindung für diese Unterhaltung konnte nicht wiederaufgenommen werden"
-#: ../libempathy-gtk/empathy-chat.c:655
+#: ../libempathy-gtk/empathy-chat.c:657
msgid "Failed to join chat room"
msgstr "Beitritt in den Chatraum ist fehlgeschlagen"
-#: ../libempathy-gtk/empathy-chat.c:673
+#: ../libempathy-gtk/empathy-chat.c:675
msgid "Failed to open private chat"
msgstr "Eine private Unterhaltung konnte nicht geöffnet werden"
-#: ../libempathy-gtk/empathy-chat.c:712
+#: ../libempathy-gtk/empathy-chat.c:714
msgid "Topic not supported on this conversation"
msgstr "Ein Thema wird in dieser Unterhaltung nicht unterstützt"
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:720
msgid "You are not allowed to change the topic"
msgstr "Sie sind nicht berechtigt, das Thema zu ändern"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:849
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: Alle Nachrichten der aktuellen Unterhaltung löschen"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:852
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <Thema>: Das Thema der aktuellen Unterhaltung festlegen"
-#: ../libempathy-gtk/empathy-chat.c:853
+#: ../libempathy-gtk/empathy-chat.c:855
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <Chatraum-Kennung>: Einem neuen Chatraum beitreten"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:858
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <Chatraum-Kennung>: Einem neuen Chatraum beitreten"
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:861
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr ""
"/query <Kontaktkennung> [<Nachricht>]: Eine private Unterhaltung starten"
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:864
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <Kontaktkennung> <Nachricht>: Eine private Unterhaltung starten"
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:867
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <Spitzname>: Den Spitznamen auf dem aktuellen Server wechseln"
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:870
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr ""
"/me <Nachricht>: Eine »ACTION«-Nachricht zur aktuellen Unterhaltung senden"
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:873
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
-"send a message starting with a '/'. For example: \"/say /join is used to "
-"join a new chat room\""
+"send a message starting with a '/'. For example: \"/say /join is used to join "
+"a new chat room\""
msgstr ""
"/say <Nachricht>: <Nachricht> zur aktuellen Unterhaltung senden. Es wird "
"verwendet, um eine Nachricht zu senden, die mit »/« beginnt, wie z.B. »/say /"
"join tritt einem Chatraum bei«"
-#: ../libempathy-gtk/empathy-chat.c:876
+#: ../libempathy-gtk/empathy-chat.c:878
msgid ""
-"/help [<command>]: show all supported commands. If <command> is defined, "
-"show its usage."
+"/help [<command>]: show all supported commands. If <command> is defined, show "
+"its usage."
msgstr ""
"/help [<Befehl>]: Alle verfügbaren Befehle zeigen. Falls <Befehl> angegeben "
"wird, so wird dessen Verwendung erklärt."
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:888
#, c-format
msgid "Usage: %s"
msgstr "Aufruf: %s"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:917
msgid "Unknown command"
msgstr "Unbekannter Befehl"
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1038
msgid "Unknown command; see /help for the available commands"
msgstr "Unbekannter Befehl; Bitte lesen Sie /help zu verfügbaren Befehlen"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1176
msgid "offline"
msgstr "Abgemeldet"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1179
msgid "invalid contact"
msgstr "Ungültiger Kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1182
msgid "permission denied"
msgstr "Erlaubnis verweigert"
-#: ../libempathy-gtk/empathy-chat.c:1183
+#: ../libempathy-gtk/empathy-chat.c:1185
msgid "too long message"
msgstr "Zu lange Nachricht"
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1188
msgid "not implemented"
msgstr "Nicht implementiert"
-#: ../libempathy-gtk/empathy-chat.c:1189
+#: ../libempathy-gtk/empathy-chat.c:1191
msgid "unknown"
msgstr "Unbekannt"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1195
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Fehler beim Senden der Nachricht »%s«: %s"
-#: ../libempathy-gtk/empathy-chat.c:1228
+#: ../libempathy-gtk/empathy-chat.c:1305 ../src/empathy-chat-window.c:676
+msgid "Topic:"
+msgstr "Thema:"
+
+#: ../libempathy-gtk/empathy-chat.c:1317
#, c-format
msgid "Topic set to: %s"
msgstr "Thema wurde gesetzt auf: %s"
-#: ../libempathy-gtk/empathy-chat.c:1230
+#: ../libempathy-gtk/empathy-chat.c:1319
msgid "No topic defined"
msgstr "Kein Thema gesetzt"
-#: ../libempathy-gtk/empathy-chat.c:1629
+#: ../libempathy-gtk/empathy-chat.c:1715
msgid "(No Suggestions)"
msgstr "(Keine Vorschläge)"
-#: ../libempathy-gtk/empathy-chat.c:1683
+#: ../libempathy-gtk/empathy-chat.c:1769
msgid "Insert Smiley"
msgstr "Emoticon einfügen"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1701
-#: ../libempathy-gtk/empathy-ui-utils.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1787
+#: ../libempathy-gtk/empathy-ui-utils.c:1682
msgid "_Send"
msgstr "_Senden"
-#: ../libempathy-gtk/empathy-chat.c:1735
+#: ../libempathy-gtk/empathy-chat.c:1821
msgid "_Spelling Suggestions"
msgstr "Vor_schläge zur Rechtschreibung"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#: ../libempathy-gtk/empathy-chat.c:1915
msgid "Failed to retrieve recent logs"
msgstr "Letzte Protokolle konnten nicht geholt werden"
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:2046
#, c-format
msgid "%s has disconnected"
msgstr "%s hat sich abgemeldet"
@@ -1326,12 +1305,12 @@ msgstr "%s hat sich abgemeldet"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1967
+#: ../libempathy-gtk/empathy-chat.c:2053
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s wurde von %2$s rausgeworfen"
-#: ../libempathy-gtk/empathy-chat.c:1970
+#: ../libempathy-gtk/empathy-chat.c:2056
#, c-format
msgid "%s was kicked"
msgstr "%s wurde rausgeworfen"
@@ -1339,17 +1318,17 @@ msgstr "%s wurde rausgeworfen"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1978
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s wurde von %2$s verbannt"
-#: ../libempathy-gtk/empathy-chat.c:1981
+#: ../libempathy-gtk/empathy-chat.c:2067
#, c-format
msgid "%s was banned"
msgstr "%s wurde verbannt"
-#: ../libempathy-gtk/empathy-chat.c:1985
+#: ../libempathy-gtk/empathy-chat.c:2071
#, c-format
msgid "%s has left the room"
msgstr "%s hat den Raum verlassen"
@@ -1359,54 +1338,50 @@ msgstr "%s hat den Raum verlassen"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1994
+#: ../libempathy-gtk/empathy-chat.c:2080
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2019
+#: ../libempathy-gtk/empathy-chat.c:2105
#, c-format
msgid "%s has joined the room"
msgstr "%s hat den Raum betreten"
-#: ../libempathy-gtk/empathy-chat.c:2044
+#: ../libempathy-gtk/empathy-chat.c:2130
#, c-format
msgid "%s is now known as %s"
msgstr "%s ist jetzt bekannt als %s"
-#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1532
+#: ../libempathy-gtk/empathy-chat.c:2269 ../src/empathy-call-window.c:1643
msgid "Disconnected"
msgstr "Getrennt"
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2799
msgid "Wrong password; please try again:"
msgstr "Falsches Kennwort; Bitte versuchen Sie es erneut:"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2800
msgid "Retry"
msgstr "Wiederholen"
-#: ../libempathy-gtk/empathy-chat.c:2707
+#: ../libempathy-gtk/empathy-chat.c:2805
msgid "This room is protected by a password:"
msgstr "Dieser Raum ist durch ein Kennwort geschützt:"
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2806
msgid "Join"
msgstr "Beitreten"
-#: ../libempathy-gtk/empathy-chat.c:2848
+#: ../libempathy-gtk/empathy-chat.c:2946
msgid "Connected"
msgstr "Verbunden"
-#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-chat.c:2999
#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Unterhaltung"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:684
-msgid "Topic:"
-msgstr "Thema:"
-
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:318
#: ../libempathy-gtk/empathy-theme-adium.c:786
@@ -1445,84 +1420,84 @@ msgstr "_Später entscheiden"
msgid "Subscription Request"
msgstr "Abonnementanfrage"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1633
+#: ../libempathy-gtk/empathy-contact-list-view.c:1632
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Möchten Sie wirklich die Gruppe »%s« entfernen?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1635
+#: ../libempathy-gtk/empathy-contact-list-view.c:1634
msgid "Removing group"
msgstr "Gruppe entfernen"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1684
-#: ../libempathy-gtk/empathy-contact-list-view.c:1761
+#: ../libempathy-gtk/empathy-contact-list-view.c:1683
+#: ../libempathy-gtk/empathy-contact-list-view.c:1760
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "_Entfernen"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1714
+#: ../libempathy-gtk/empathy-contact-list-view.c:1713
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Möchten Sie wirklich den Kontakt »%s« entfernen?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1716
+#: ../libempathy-gtk/empathy-contact-list-view.c:1715
msgid "Removing contact"
msgstr "Kontakt entfernen"
-#: ../libempathy-gtk/empathy-contact-menu.c:206
+#: ../libempathy-gtk/empathy-contact-menu.c:209
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "Kontakt _hinzufügen …"
-#: ../libempathy-gtk/empathy-contact-menu.c:233
+#: ../libempathy-gtk/empathy-contact-menu.c:236
#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Chat"
-#: ../libempathy-gtk/empathy-contact-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:267
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Audioanruf"
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:299
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videoanruf"
-#: ../libempathy-gtk/empathy-contact-menu.c:347
+#: ../libempathy-gtk/empathy-contact-menu.c:350
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "_Vorherige Unterhaltungen"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:372
msgid "Send file"
msgstr "Datei senden"
-#: ../libempathy-gtk/empathy-contact-menu.c:392
+#: ../libempathy-gtk/empathy-contact-menu.c:395
msgid "Share my desktop"
msgstr "Meine Arbeitsumgebung freigeben"
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-contact-widget.c:1379
+#: ../libempathy-gtk/empathy-contact-menu.c:435
+#: ../libempathy-gtk/empathy-contact-widget.c:1444
msgid "Favorite"
msgstr "Favorit"
-#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-contact-menu.c:465
msgid "Infor_mation"
msgstr "Infor_mationen"
-#: ../libempathy-gtk/empathy-contact-menu.c:508
+#: ../libempathy-gtk/empathy-contact-menu.c:511
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Bearbeiten"
-#: ../libempathy-gtk/empathy-contact-menu.c:562
-#: ../src/empathy-chat-window.c:869
+#: ../libempathy-gtk/empathy-contact-menu.c:565
+#: ../src/empathy-chat-window.c:861
msgid "Inviting you to this room"
msgstr "Sie werden in diesen Chatraum eingeladen"
-#: ../libempathy-gtk/empathy-contact-menu.c:593
+#: ../libempathy-gtk/empathy-contact-menu.c:596
msgid "_Invite to chat room"
msgstr "In den Chatraum _einladen"
@@ -1535,7 +1510,7 @@ msgid "Select"
msgstr "Wählen"
#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1072
msgid "Group"
msgstr "Gruppe"
@@ -1917,15 +1892,15 @@ msgstr "Sauber"
msgid "Blue"
msgstr "Blau"
-#: ../libempathy-gtk/empathy-ui-utils.c:1501
+#: ../libempathy-gtk/empathy-ui-utils.c:1557
msgid "Unable to open URI"
msgstr "Adresse konnte nicht geöffnet werden"
-#: ../libempathy-gtk/empathy-ui-utils.c:1618
+#: ../libempathy-gtk/empathy-ui-utils.c:1674
msgid "Select a file"
msgstr "Eine Datei auswählen"
-#: ../libempathy-gtk/empathy-ui-utils.c:1682
+#: ../libempathy-gtk/empathy-ui-utils.c:1738
msgid "Select a destination"
msgstr "Ein Ziel auswählen"
@@ -2112,15 +2087,15 @@ msgstr "Keine Fehlermeldung"
msgid "Instant Message (Empathy)"
msgstr "Sofortnachricht (Empathy)"
-#: ../src/empathy.c:596
+#: ../src/empathy.c:598
msgid "Don't connect on startup"
msgstr "Nicht automatisch beim Start verbinden"
-#: ../src/empathy.c:600
+#: ../src/empathy.c:602
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Kontaktliste und andere Dialoge nicht automatisch beim Start anzeigen"
-#: ../src/empathy.c:612
+#: ../src/empathy.c:614
msgid "- Empathy IM Client"
msgstr "- Empathy Sofortnachrichtenprogramm"
@@ -2133,15 +2108,14 @@ msgid ""
msgstr ""
"Empathy ist freie Software, Sie können sie weitergeben und/oder verändern "
"solange Sie sich an die Regeln der GNU General Public License halten, so wie "
-"sie von der Free Software Foundation festgelegt wurden; entweder in Version "
-"2 der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Lizenz."
+"sie von der Free Software Foundation festgelegt wurden; entweder in Version 2 "
+"der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Lizenz."
#: ../src/empathy-about-dialog.c:89
msgid ""
"Empathy 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 General Public License for more "
-"details."
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR "
+"A PARTICULAR PURPOSE. See the GNU General Public License for more details."
msgstr ""
"Empathy wurde mit dem Ziel veröffentlicht, dass Sie es nützlich finden, "
"jedoch OHNE JEDWEDE GARANTIE, sogar ohne eine implizite Garantie der "
@@ -2204,7 +2178,7 @@ msgstr ""
"Assistenten beenden und später über das »Bearbeiten»-Menü Konten hinzufügen."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1303
+#: ../src/empathy-account-assistant.c:1308
msgid "An error occurred"
msgstr "Ein Fehler ist aufgetreten"
@@ -2213,36 +2187,36 @@ msgstr "Ein Fehler ist aufgetreten"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:579
#, c-format
msgid "New %s account"
msgstr "Neues %s-Konto"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:507
msgid "What kind of chat account do you have?"
msgstr "Welche Art Chat-Konto haben Sie?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:513
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Haben Sie weitere Chat-Konten, die Sie einrichten wollen?"
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:519
msgid "Enter your account details"
msgstr "Geben Sie Ihre Kontodetails ein"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:524
msgid "What kind of chat account do you want to create?"
msgstr "Welche Art von Chat-Konto wollen Sie anlegen?"
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:530
msgid "Do you want to create other chat accounts?"
msgstr "Möchten Sie weitere Chat-Konten anlegen?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:537
msgid "Enter the details for the new account"
msgstr "Geben Sie die Details für das neue Konto ein"
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:652
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2254,43 +2228,43 @@ msgstr ""
"Programme verwenden. Mit einem Mikrofon oder einer Webcam können Sie auch "
"Audio- bzw. Videoanrufe tätigen."
-#: ../src/empathy-account-assistant.c:670
+#: ../src/empathy-account-assistant.c:669
msgid "Do you have an account you've been using with another chat program?"
msgstr ""
"Haben Sie ein Konto, das Sie zuvor mit einem anderen Chat-Programm verwendet "
"haben?"
-#: ../src/empathy-account-assistant.c:693
+#: ../src/empathy-account-assistant.c:692
msgid "Yes, import my account details from "
msgstr "Ja, meine Kontodetails importieren von "
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:713
msgid "Yes, I'll enter my account details now"
msgstr "Ja, ich möchte jetzt meine Kontodetails eingeben"
-#: ../src/empathy-account-assistant.c:736
+#: ../src/empathy-account-assistant.c:735
msgid "No, I want a new account"
msgstr "Nein, ich möchte ein neues Konto"
-#: ../src/empathy-account-assistant.c:746
+#: ../src/empathy-account-assistant.c:745
msgid "No, I just want to see people online nearby for now"
msgstr "Nein, ich möchte nur Personen in der Nähe sehen"
-#: ../src/empathy-account-assistant.c:767
+#: ../src/empathy-account-assistant.c:766
msgid "Select the accounts you want to import:"
msgstr "Wählen Sie die zu importierenden Konten:"
-#: ../src/empathy-account-assistant.c:851
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-account-assistant.c:850
+#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:608
msgid "Yes"
msgstr "Ja"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:857
msgid "No, that's all for now"
msgstr "Nein, das ist alles"
-#: ../src/empathy-account-assistant.c:1117
+#: ../src/empathy-account-assistant.c:1122
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
@@ -2302,16 +2276,16 @@ msgstr ""
"bitte die Angaben unten auf Vollständigkeit. Sie können sie später leicht "
"ändern oder das Merkmal im Dialog »Konten« ausschalten"
-#: ../src/empathy-account-assistant.c:1123
-#: ../src/empathy-account-assistant.c:1179
+#: ../src/empathy-account-assistant.c:1128
+#: ../src/empathy-account-assistant.c:1184
msgid "Edit->Accounts"
msgstr "Bearbeiten→Konten"
-#: ../src/empathy-account-assistant.c:1139
+#: ../src/empathy-account-assistant.c:1144
msgid "I don't want to enable this feature for now"
msgstr "Nein, ich möchte dieses Funktionsmerkmal derzeit nicht aktivieren"
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1180
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2323,66 +2297,66 @@ msgstr ""
"wollen, so installieren Sie bitte das Paket telepathy-salut\n"
"und erstellen Sie ein Konto vom Typ »Personen in der Nähe« im Dialog »Konten«."
-#: ../src/empathy-account-assistant.c:1181
+#: ../src/empathy-account-assistant.c:1186
msgid "telepathy-salut not installed"
msgstr "telepathy-salut ist nicht installiert"
-#: ../src/empathy-account-assistant.c:1227
+#: ../src/empathy-account-assistant.c:1232
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Assistent für Sofortnachrichten- und VoIP-Konten"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1266
msgid "Welcome to Empathy"
msgstr "Willkommen bei Empathy"
-#: ../src/empathy-account-assistant.c:1270
+#: ../src/empathy-account-assistant.c:1275
msgid "Import your existing accounts"
msgstr "Bestehende Konten importieren"
-#: ../src/empathy-account-assistant.c:1288
+#: ../src/empathy-account-assistant.c:1293
msgid "Please enter personal details"
msgstr "Bitte geben Sie persönliche Informationen ein"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:66
+#: ../src/empathy-accounts-dialog.c:65
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "Es sind nicht gespeicherte Änderungen zu Ihrem Konto »%s« vorhanden."
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:70
+#: ../src/empathy-accounts-dialog.c:69
msgid "Your new account has not been saved yet."
msgstr "Ihr neues Konto ist noch nicht gespeichert worden."
-#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:262 ../src/empathy-call-window.c:789
msgid "Connecting…"
msgstr "Verbindung wird aufgebaut …"
-#: ../src/empathy-accounts-dialog.c:290
+#: ../src/empathy-accounts-dialog.c:289
#, c-format
msgid "Disconnected — %s"
msgstr "Getrennt — %s"
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:294
#, c-format
msgid "Offline — %s"
msgstr "Abgemeldet — %s"
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:307
msgid "Offline — No Network Connection"
msgstr "Abgemeldet — Keine Netzwerkverbindung"
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:315
msgid "Unknown Status"
msgstr "Unbekannter Status"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:326
msgid "Offline — Account Disabled"
msgstr "Abgemeldet — Konto ist deaktiviert"
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:767
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2391,16 +2365,16 @@ msgstr ""
"Ihre Änderungen verworfen. Sind Sie sicher, dass Sie\n"
"fortfahren möchten?"
-#: ../src/empathy-accounts-dialog.c:1115
+#: ../src/empathy-accounts-dialog.c:1114
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Möchten Sie %s wirklich von Ihrem Rechner entfernen?"
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1118
msgid "This will not remove your account on the server."
msgstr "Dadurch wird Ihr Konto nicht vom Server entfernt."
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1355
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2409,7 +2383,7 @@ msgstr ""
"Ihre Änderungen verworfen. Sind Sie sicher, dass Sie\n"
"fortfahren möchten?"
-#: ../src/empathy-accounts-dialog.c:1933
+#: ../src/empathy-accounts-dialog.c:1932
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2442,62 +2416,66 @@ msgstr "_Hinzufügen …"
msgid "_Import…"
msgstr "_Importieren …"
-#: ../src/empathy-call-window.c:453
+#: ../src/empathy-auto-salut-account-helper.c:77
+msgid "People nearby"
+msgstr "Personen in der Nähe"
+
+#: ../src/empathy-call-window.c:462
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:465
msgid "Brightness"
msgstr "Helligkeit"
-#: ../src/empathy-call-window.c:459
+#: ../src/empathy-call-window.c:468
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:567
+#: ../src/empathy-call-window.c:573
msgid "Volume"
msgstr "Lautstärke"
-#: ../src/empathy-call-window.c:1022
+#: ../src/empathy-call-window.c:1120
msgid "_Sidebar"
msgstr "_Seitenleiste"
-#: ../src/empathy-call-window.c:1041
+#: ../src/empathy-call-window.c:1139
msgid "Audio input"
msgstr "Audio-Eingang"
-#: ../src/empathy-call-window.c:1045
+#: ../src/empathy-call-window.c:1143
msgid "Video input"
msgstr "Video-Eingang"
-#: ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1147
msgid "Dialpad"
msgstr "Wählfeld"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1117
+#: ../src/empathy-call-window.c:1218
#, c-format
msgid "Call with %s"
msgstr "Mit %s anrufen"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1198
+#: ../src/empathy-call-window.c:1299
msgid "Call"
msgstr "Anrufen"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1695
+#: ../src/empathy-call-window.c:1956
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Verbunden — %d:%02dm"
-#: ../src/empathy-call-window.c:1756
+#: ../src/empathy-call-window.c:2017
msgid "Technical Details"
msgstr "Technische Details"
-#: ../src/empathy-call-window.c:1794
+#: ../src/empathy-call-window.c:2055
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2506,7 +2484,7 @@ msgstr ""
"Die Software von %s unterstützt keines der Audioformate, die von Ihrem "
"Rechner unterstützt werden"
-#: ../src/empathy-call-window.c:1799
+#: ../src/empathy-call-window.c:2060
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2515,7 +2493,7 @@ msgstr ""
"Die Software von %s unterstützt keines der Videoformate, die von Ihrem "
"Rechner unterstützt werden"
-#: ../src/empathy-call-window.c:1805
+#: ../src/empathy-call-window.c:2066
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2524,25 +2502,25 @@ msgstr ""
"Mit %s kann keine Verbindung hergestellt werden. Eventuell verhindert das "
"Netzwerk des Gegenüber oder Ihres direkte Verbindungen."
-#: ../src/empathy-call-window.c:1811
+#: ../src/empathy-call-window.c:2072
msgid "There was a failure on the network"
msgstr "Es gab im Netzwerk einen Fehler"
-#: ../src/empathy-call-window.c:1815
+#: ../src/empathy-call-window.c:2076
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
-"Die für diesen Anruf erforderlichen Audioformate sind nicht auf Ihrem "
-"Rechner installiert"
+"Die für diesen Anruf erforderlichen Audioformate sind nicht auf Ihrem Rechner "
+"installiert"
-#: ../src/empathy-call-window.c:1818
+#: ../src/empathy-call-window.c:2079
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
-"Die für diesen Anruf erforderlichen Videoformate sind nicht auf Ihrem "
-"Rechner installiert"
+"Die für diesen Anruf erforderlichen Videoformate sind nicht auf Ihrem Rechner "
+"installiert"
-#: ../src/empathy-call-window.c:1828
+#: ../src/empathy-call-window.c:2089
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2553,15 +2531,15 @@ msgstr ""
"\">berichten Sie diesen Fehler</a> und fügen Sie die Protokollmeldungen aus "
"dem Fenster »Fehlerdiagnose« im Menü »Hilfe« anbei."
-#: ../src/empathy-call-window.c:1836
+#: ../src/empathy-call-window.c:2097
msgid "There was a failure in the call engine"
msgstr "Es gab einen Fehler im Anrufsystem"
-#: ../src/empathy-call-window.c:1875
+#: ../src/empathy-call-window.c:2136
msgid "Can't establish audio stream"
msgstr "Es kann kein Audio-Strom aufgebaut werden"
-#: ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:2146
msgid "Can't establish video stream"
msgstr "Es kann kein Video-Strom aufgebaut werden"
@@ -2661,7 +2639,7 @@ msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d von allen nicht gelesen)"
msgstr[1] "%s (%d von allen nicht gelesene)"
-#: ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:680
msgid "Typing a message."
msgstr "Schreibt eine Nachricht."
@@ -2733,6 +2711,10 @@ msgstr "Kontaktliste an_zeigen"
msgid "_Tabs"
msgstr "_Reiter"
+#: ../src/empathy-chat-window.ui.h:18
+msgid "_Undo Close Tab"
+msgstr "Reiter _zurückholen"
+
#: ../src/empathy-chatrooms-window.c:256
msgid "Name"
msgstr "Name"
@@ -2798,8 +2780,7 @@ msgstr "%s lädt Sie ein, %s beizutreten"
msgid "_Decline"
msgstr "A_blehnen"
-#: ../src/empathy-event-manager.c:595
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:595 ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Beitreten"
@@ -2957,8 +2938,8 @@ msgid ""
"No accounts to import could be found. Empathy currently only supports "
"importing accounts from Pidgin."
msgstr ""
-"Es wurden keine Benutzerkonten gefunden. Empathy unterstützt momentan nur "
-"den Import von Benutzerkonten aus Pidgin."
+"Es wurden keine Benutzerkonten gefunden. Empathy unterstützt momentan nur den "
+"Import von Benutzerkonten aus Pidgin."
#: ../src/empathy-import-dialog.c:199
msgid "Import Accounts"
@@ -2982,23 +2963,23 @@ msgstr "Quelle"
msgid "%s account"
msgstr "%s-Konto"
-#: ../src/empathy-main-window.c:437
+#: ../src/empathy-main-window.c:440
msgid "Reconnect"
msgstr "Erneut verbinden"
-#: ../src/empathy-main-window.c:443
+#: ../src/empathy-main-window.c:446
msgid "Edit Account"
msgstr "Konto bearbeiten"
-#: ../src/empathy-main-window.c:449
+#: ../src/empathy-main-window.c:452
msgid "Close"
msgstr "Schließen"
-#: ../src/empathy-main-window.c:1033
+#: ../src/empathy-main-window.c:1055
msgid "Contact"
msgstr "Kontakt"
-#: ../src/empathy-main-window.c:1414
+#: ../src/empathy-main-window.c:1436
msgid "Show and edit accounts"
msgstr "Konten anzeigen und bearbeiten"
@@ -3086,17 +3067,17 @@ msgstr "_Persönliche Informationen"
msgid "_Room"
msgstr "_Raum"
-#: ../src/empathy-new-chatroom-dialog.c:338
+#: ../src/empathy-new-chatroom-dialog.c:379
msgid "Chat Room"
msgstr "Chatraum"
-#: ../src/empathy-new-chatroom-dialog.c:354
+#: ../src/empathy-new-chatroom-dialog.c:395
msgid "Members"
msgstr "Teilnehmer"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:539
+#: ../src/empathy-new-chatroom-dialog.c:605
#, c-format
msgid ""
"<b>%s</b>\n"
@@ -3109,16 +3090,16 @@ msgstr ""
"Passwort erforderlich: %s\n"
"Teilnehmer: %s"
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:608
msgid "No"
msgstr "Nein"
-#: ../src/empathy-new-chatroom-dialog.c:569
+#: ../src/empathy-new-chatroom-dialog.c:635
msgid "Could not start room listing"
msgstr "Raumauflistung konnte nicht begonnen werden"
-#: ../src/empathy-new-chatroom-dialog.c:579
+#: ../src/empathy-new-chatroom-dialog.c:645
msgid "Could not stop room listing"
msgstr "Raumauflistung konnte nicht angehalten werden"
@@ -3320,7 +3301,7 @@ msgstr "_Position an meine Kontakte übermitteln"
msgid "_Reduce location accuracy"
msgstr "Positionsgenauigkeit ve_rringern"
-#: ../src/empathy-status-icon.c:176
+#: ../src/empathy-status-icon.c:178
msgid "Respond"
msgstr "Antworten"
@@ -3336,63 +3317,63 @@ msgstr "_Beenden"
msgid "Contact Map View"
msgstr "Kartenansicht mit Kontakten"
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1078
msgid "Save"
msgstr "Speichern"
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1251
msgid "Debug Window"
msgstr "Fehlerdiagnosefenster"
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1331
msgid "Pause"
msgstr "Pause"
-#: ../src/empathy-debug-window.c:1311
+#: ../src/empathy-debug-window.c:1343
msgid "Level "
msgstr "Stufe"
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1363
msgid "Debug"
msgstr "Fehlerdiagnose"
-#: ../src/empathy-debug-window.c:1337
+#: ../src/empathy-debug-window.c:1369
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+#: ../src/empathy-debug-window.c:1375 ../src/empathy-debug-window.c:1424
msgid "Message"
msgstr "Nachricht"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1381
msgid "Warning"
msgstr "Warnung"
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1387
msgid "Critical"
msgstr "Kritisch"
-#: ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1393
msgid "Error"
msgstr "Fehler"
-#: ../src/empathy-debug-window.c:1380
+#: ../src/empathy-debug-window.c:1412
msgid "Time"
msgstr "Zeit"
-#: ../src/empathy-debug-window.c:1383
+#: ../src/empathy-debug-window.c:1415
msgid "Domain"
msgstr "Domäne"
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1417
msgid "Category"
msgstr "Kategorie"
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1419
msgid "Level"
msgstr "Stufe"
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1456
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3441,6 +3422,39 @@ msgstr "Empathy-Konten"
msgid "Empathy Debugger"
msgstr "Empathy-Fehlerdiagnose"
+#~ msgid "Hostname of the proxy for outbound requests."
+#~ msgstr "Rechnername des Proxy für ausgehende Anfragen."
+
+#~ msgid ""
+#~ "Look up the DNS SRV record at the service's domain for the host name of a "
+#~ "STUN server."
+#~ msgstr ""
+#~ "Den SRV-Eintrag im DNS in der Dienstdomäne für den Rechnernamen des STUN-"
+#~ "Servers nachschlagen"
+
+#~ msgid "Port of the proxy for outbound requests."
+#~ msgstr "Port des Proxy für ausgehende Anfragen."
+
+#~ msgid ""
+#~ "The username for SIP authentication, if different from the SIP URI\n"
+#~ "username."
+#~ msgstr ""
+#~ "Der Benutzername zur SIP-Authentifizierung, falls vom Namen der SIP-"
+#~ "Adresse abweichend"
+
+#~ msgid ""
+#~ "Update the registration binding if the external address for the client is "
+#~ "discovered to be different from the local binding."
+#~ msgstr ""
+#~ "Die Registrierungs-Bindung aktualisieren, falls die externe Adresse für "
+#~ "den Client von der lokalen Bindung abweicht"
+
+#~ msgid ""
+#~ "Use the loose routing behavior and the Route header as recommended in RFC "
+#~ "3261."
+#~ msgstr ""
+#~ "»Freies Routing« und den in RFC 3261 empfohlenen Route-Kopf verwenden."
+
#~ msgid "Accounts"
#~ msgstr "Konten"
@@ -3458,15 +3472,14 @@ msgstr "Empathy-Fehlerdiagnose"
#~ msgid "Whether the Salut account has been created on the first Empathy run."
#~ msgstr ""
-#~ "Legt fest, ob ein Salut-Konto beim ersten Start von Empathy erstellt "
-#~ "wurde."
+#~ "Legt fest, ob ein Salut-Konto beim ersten Start von Empathy erstellt wurde."
#~ msgid ""
#~ "Try to import any recognized accounts and display an assistant if that "
#~ "fails"
#~ msgstr ""
-#~ "Versuchen, erkannte Konten zu importieren und im Fall des Scheiterns "
-#~ "einen Assistenten anzeigen"
+#~ "Versuchen, erkannte Konten zu importieren und im Fall des Scheiterns einen "
+#~ "Assistenten anzeigen"
#~ msgid "Show the accounts dialog"
#~ msgstr "Konten-Dialog anzeigen"
@@ -3507,8 +3520,8 @@ msgstr "Empathy-Fehlerdiagnose"
#~ msgid ""
#~ "The contact to display in the applet. Empty means no contact is displayed."
#~ msgstr ""
-#~ "Der Kontakt, der im Applet angezeigt werden soll. Leer bedeutet, dass "
-#~ "kein Kontakt angezeigt wird."
+#~ "Der Kontakt, der im Applet angezeigt werden soll. Leer bedeutet, dass kein "
+#~ "Kontakt angezeigt wird."
#~ msgid "The contact's avatar token. Empty means contact has no avatar."
#~ msgstr ""
@@ -3547,8 +3560,8 @@ msgstr "Empathy-Fehlerdiagnose"
#~ "Any associated conversations and chat rooms will NOT be removed if you "
#~ "decide to proceed.\n"
#~ "\n"
-#~ "Should you decide to add the account back at a later time, they will "
-#~ "still be available."
+#~ "Should you decide to add the account back at a later time, they will still "
+#~ "be available."
#~ msgstr ""
#~ "Jegliche zugehörigen Unterhaltungen und Chaträume werden NICHT entfernt, "
#~ "wenn Sie fortfahren.\n"
diff --git a/po/es.po b/po/es.po
index 93a88c5dd..a0d592363 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,13 +2,14 @@
# Copyright (C) 2003 Free Software Foundation
# This file is distributed under the same license as the Gossip package.
# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010.
+#
msgid ""
msgstr ""
"Project-Id-Version: empathy.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-03-31 19:12+0000\n"
-"PO-Revision-Date: 2010-04-16 08:44+0200\n"
+"POT-Creation-Date: 2010-05-03 17:02+0000\n"
+"PO-Revision-Date: 2010-05-03 23:09+0200\n"
"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
"Language-Team: Español <gnome-es-list@gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -109,7 +110,6 @@ msgid "Empathy has migrated butterfly logs"
msgstr "Empathy ha migrado los registros de butterfly"
#: ../data/empathy.schemas.in.h:18
-#| msgid "Empathy should auto-connect on startup"
msgid "Empathy should auto-away when idle"
msgstr "Empathy debería mostrar ausencia en inactividad"
@@ -196,7 +196,7 @@ msgstr "Reproducir un sonido cuando inicio sesión"
#: ../data/empathy.schemas.in.h:39
msgid "Play a sound when we log out"
-msgstr "Reproducir un sonido cuando finalizo una sesión"
+msgstr "Reproducir un sonido al finalizar una sesión"
#: ../data/empathy.schemas.in.h:40
msgid "Pop up notifications if the chat isn't focused"
@@ -296,8 +296,6 @@ msgstr ""
"inicio."
#: ../data/empathy.schemas.in.h:62
-#| msgid ""
-#| "Whether Empathy should automatically log into your accounts on startup."
msgid "Whether Empathy should go into away mode automatically if user is idle."
msgstr ""
"Indica si Empathy debe entrar en modo de ausencia automáticamente si el "
@@ -478,7 +476,7 @@ msgstr "Gestionar las cuentas de mensajería y Voz IP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243
+#: ../src/empathy-accounts-dialog.c:2064 ../src/cc-empathy-accounts-page.c:243
#: ../src/cc-empathy-accounts-panel.c:91
msgid "Messaging and VoIP Accounts"
msgstr "Cuentas de mensajería y Voz IP"
@@ -499,35 +497,35 @@ msgstr "El archivo seleccionado no es un archivo regular"
msgid "The selected file is empty"
msgstr "El archivo seleccionado está vacío"
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:281
msgid "Socket type not supported"
msgstr "El tipo de socket no está soportado"
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:400
msgid "No reason was specified"
msgstr "No se especificó ninguna razón"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:403
msgid "The change in state was requested"
msgstr "Se requirió un cambio en el estado"
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:406
msgid "You canceled the file transfer"
msgstr "Canceló la transferencia del archivo"
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:409
msgid "The other participant canceled the file transfer"
msgstr "El otro participante canceló la transferencia del archivo"
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:412
msgid "Error while trying to transfer the file"
msgstr "Error la intentar transferir el archivo"
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:415
msgid "The other participant is unable to transfer the file"
msgstr "El otro participante no puede transferir el archivo"
-#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:315
+#: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:315
msgid "Unknown reason"
msgstr "Razón desconocida"
@@ -552,8 +550,6 @@ msgid "Offline"
msgstr "Desconectado"
#: ../libempathy/empathy-utils.c:249
-#| msgctxt "file transfer percent"
-#| msgid "Unknown"
msgid "Unknown"
msgstr "Desconocido"
@@ -671,7 +667,7 @@ msgstr[1] "hace %d meses"
msgid "in the future"
msgstr "en el futuro"
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:463
msgid "All"
msgstr "Todo"
@@ -1130,63 +1126,63 @@ msgstr "Imágenes"
msgid "All Files"
msgstr "Todos los archivos"
-#: ../libempathy-gtk/empathy-avatar-image.c:327
+#: ../libempathy-gtk/empathy-avatar-image.c:325
msgid "Click to enlarge"
msgstr "Pulse para agrandar"
-#: ../libempathy-gtk/empathy-chat.c:233
+#: ../libempathy-gtk/empathy-chat.c:235
msgid "Failed to reconnect this chat"
msgstr "Falló al reconectar a este chat"
-#: ../libempathy-gtk/empathy-chat.c:655
+#: ../libempathy-gtk/empathy-chat.c:657
msgid "Failed to join chat room"
msgstr "Falló al unirse a la sala de chat"
-#: ../libempathy-gtk/empathy-chat.c:673
+#: ../libempathy-gtk/empathy-chat.c:675
msgid "Failed to open private chat"
msgstr "Falló al abrir el chat privado"
-#: ../libempathy-gtk/empathy-chat.c:712
+#: ../libempathy-gtk/empathy-chat.c:714
msgid "Topic not supported on this conversation"
msgstr "El tema no está soportado en esta conversación"
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:720
msgid "You are not allowed to change the topic"
msgstr "No le está permitido cambiar el tema"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:849
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: limpiar todos los mensajes de la conversación actual"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:852
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <tema>: establecer el tema para la conversación actual"
-#: ../libempathy-gtk/empathy-chat.c:853
+#: ../libempathy-gtk/empathy-chat.c:855
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <id de sala de chat>: unirse a una sala de chat nueva"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:858
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <id de sala de chat>: unirse a una sala de chat nueva"
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:861
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:864
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:867
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <apodo>: cambiar su apodo en el servidor actual"
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:870
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <mensaje>: enviar un mensaje de ACCIÓN a la conversación actual"
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:873
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1196,7 +1192,7 @@ msgstr ""
"para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se usa "
"para unirse a una sala de chat nueva»"
-#: ../libempathy-gtk/empathy-chat.c:876
+#: ../libempathy-gtk/empathy-chat.c:878
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1204,80 +1200,84 @@ msgstr ""
"/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está "
"definido, muestra su uso."
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:888
#, c-format
msgid "Usage: %s"
msgstr "Uso: %s"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:917
msgid "Unknown command"
msgstr "Comando desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1038
msgid "Unknown command; see /help for the available commands"
msgstr "Comando desconocido; consulte /help para ver los comandos disponibles"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1176
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1179
msgid "invalid contact"
msgstr "contacto no válido"
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1182
msgid "permission denied"
msgstr "permiso denegado"
-#: ../libempathy-gtk/empathy-chat.c:1183
+#: ../libempathy-gtk/empathy-chat.c:1185
msgid "too long message"
msgstr "mensaje demasiado largo"
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1188
msgid "not implemented"
msgstr "no implementado"
-#: ../libempathy-gtk/empathy-chat.c:1189
+#: ../libempathy-gtk/empathy-chat.c:1191
msgid "unknown"
msgstr "desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1195
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Error al enviar el mensaje «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1228
+#: ../libempathy-gtk/empathy-chat.c:1305 ../src/empathy-chat-window.c:676
+msgid "Topic:"
+msgstr "Tema:"
+
+#: ../libempathy-gtk/empathy-chat.c:1317
#, c-format
msgid "Topic set to: %s"
msgstr "El tema se ha establecido a: %s"
-#: ../libempathy-gtk/empathy-chat.c:1230
+#: ../libempathy-gtk/empathy-chat.c:1319
msgid "No topic defined"
msgstr "No se ha definido el tema"
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1715
msgid "(No Suggestions)"
msgstr "(Sin sugerencias)"
-#: ../libempathy-gtk/empathy-chat.c:1680
+#: ../libempathy-gtk/empathy-chat.c:1769
msgid "Insert Smiley"
msgstr "Insertar emoticono"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1698
-#: ../libempathy-gtk/empathy-ui-utils.c:1682
+#: ../libempathy-gtk/empathy-chat.c:1787
+#: ../libempathy-gtk/empathy-ui-utils.c:1642
msgid "_Send"
msgstr "E_nviar"
-#: ../libempathy-gtk/empathy-chat.c:1732
+#: ../libempathy-gtk/empathy-chat.c:1821
msgid "_Spelling Suggestions"
msgstr "_Sugerencias ortográficas"
-#: ../libempathy-gtk/empathy-chat.c:1826
+#: ../libempathy-gtk/empathy-chat.c:1915
msgid "Failed to retrieve recent logs"
msgstr "Falló al recibir los registros recientes"
-#: ../libempathy-gtk/empathy-chat.c:1957
+#: ../libempathy-gtk/empathy-chat.c:2046
#, c-format
msgid "%s has disconnected"
msgstr "%s se ha desconectado"
@@ -1285,12 +1285,12 @@ msgstr "%s se ha desconectado"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:2053
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s expulsó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1967
+#: ../libempathy-gtk/empathy-chat.c:2056
#, c-format
msgid "%s was kicked"
msgstr "%s fue expulsado"
@@ -1298,17 +1298,17 @@ msgstr "%s fue expulsado"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1975
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s vetó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1978
+#: ../libempathy-gtk/empathy-chat.c:2067
#, c-format
msgid "%s was banned"
msgstr "%s fue vetado"
-#: ../libempathy-gtk/empathy-chat.c:1982
+#: ../libempathy-gtk/empathy-chat.c:2071
#, c-format
msgid "%s has left the room"
msgstr "%s ha dejado la sala"
@@ -1318,54 +1318,50 @@ msgstr "%s ha dejado la sala"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1991
+#: ../libempathy-gtk/empathy-chat.c:2080
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2016
+#: ../libempathy-gtk/empathy-chat.c:2105
#, c-format
msgid "%s has joined the room"
msgstr "%s ha entrado en la sala"
-#: ../libempathy-gtk/empathy-chat.c:2041
+#: ../libempathy-gtk/empathy-chat.c:2130
#, c-format
msgid "%s is now known as %s"
msgstr "Ahora %s se llama %s"
-#: ../libempathy-gtk/empathy-chat.c:2176 ../src/empathy-call-window.c:1537
+#: ../libempathy-gtk/empathy-chat.c:2269 ../src/empathy-call-window.c:1643
msgid "Disconnected"
msgstr "Desconectado"
-#: ../libempathy-gtk/empathy-chat.c:2698
+#: ../libempathy-gtk/empathy-chat.c:2799
msgid "Wrong password; please try again:"
msgstr "Contraseña incorrecta; inténtelo de nuevo:"
-#: ../libempathy-gtk/empathy-chat.c:2699
+#: ../libempathy-gtk/empathy-chat.c:2800
msgid "Retry"
msgstr "Volver a intentarlo"
-#: ../libempathy-gtk/empathy-chat.c:2704
+#: ../libempathy-gtk/empathy-chat.c:2805
msgid "This room is protected by a password:"
msgstr "Esta sala está protegida por contraseña:"
-#: ../libempathy-gtk/empathy-chat.c:2705
+#: ../libempathy-gtk/empathy-chat.c:2806
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:2845
+#: ../libempathy-gtk/empathy-chat.c:2946
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:2898
+#: ../libempathy-gtk/empathy-chat.c:2999
#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Conversación"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:682
-msgid "Topic:"
-msgstr "Tema:"
-
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:318
#: ../libempathy-gtk/empathy-theme-adium.c:786
@@ -1429,59 +1425,59 @@ msgstr "¿Realmente quiere quitar el contacto «%s»?"
msgid "Removing contact"
msgstr "Quitando el contacto"
-#: ../libempathy-gtk/empathy-contact-menu.c:206
+#: ../libempathy-gtk/empathy-contact-menu.c:209
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Añadir contacto…"
-#: ../libempathy-gtk/empathy-contact-menu.c:233
+#: ../libempathy-gtk/empathy-contact-menu.c:236
#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Chat"
-#: ../libempathy-gtk/empathy-contact-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:267
msgctxt "menu item"
msgid "_Audio Call"
-msgstr "Llamada de _sonido"
+msgstr "Llamada de vo_z"
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:299
msgctxt "menu item"
msgid "_Video Call"
msgstr "Llamada de _vídeo"
-#: ../libempathy-gtk/empathy-contact-menu.c:347
+#: ../libempathy-gtk/empathy-contact-menu.c:350
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "Conversaciones an_teriores"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:372
msgid "Send file"
msgstr "Enviar archivo"
-#: ../libempathy-gtk/empathy-contact-menu.c:392
+#: ../libempathy-gtk/empathy-contact-menu.c:395
msgid "Share my desktop"
msgstr "Compartir mi escritorio"
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-contact-widget.c:1379
+#: ../libempathy-gtk/empathy-contact-menu.c:435
+#: ../libempathy-gtk/empathy-contact-widget.c:1444
msgid "Favorite"
msgstr "Favorita"
-#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-contact-menu.c:465
msgid "Infor_mation"
msgstr "Infor_mación"
-#: ../libempathy-gtk/empathy-contact-menu.c:508
+#: ../libempathy-gtk/empathy-contact-menu.c:511
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Editar"
-#: ../libempathy-gtk/empathy-contact-menu.c:562
-#: ../src/empathy-chat-window.c:867
+#: ../libempathy-gtk/empathy-contact-menu.c:565
+#: ../src/empathy-chat-window.c:861
msgid "Inviting you to this room"
msgstr "Invitándolo a esta sala"
-#: ../libempathy-gtk/empathy-contact-menu.c:593
+#: ../libempathy-gtk/empathy-contact-menu.c:596
msgid "_Invite to chat room"
msgstr "_Invitar a la sala de chat"
@@ -1494,7 +1490,7 @@ msgid "Select"
msgstr "Seleccionar"
#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1070
+#: ../src/empathy-main-window.c:1072
msgid "Group"
msgstr "Grupo"
@@ -1842,7 +1838,7 @@ msgstr "Llamada de voz saliente"
#: ../libempathy-gtk/empathy-sound.c:69
msgid "Voice call ended"
-msgstr "Finalizó la llamada de vz"
+msgstr "Finalizó la llamada de voz"
#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
msgid "Enter Custom Message"
@@ -1876,15 +1872,15 @@ msgstr "Limpio"
msgid "Blue"
msgstr "Azul"
-#: ../libempathy-gtk/empathy-ui-utils.c:1557
+#: ../libempathy-gtk/empathy-ui-utils.c:1517
msgid "Unable to open URI"
msgstr "No se pudo abrir el URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1674
+#: ../libempathy-gtk/empathy-ui-utils.c:1634
msgid "Select a file"
msgstr "Seleccionar un archivo"
-#: ../libempathy-gtk/empathy-ui-utils.c:1738
+#: ../libempathy-gtk/empathy-ui-utils.c:1698
msgid "Select a destination"
msgstr "Seleccionar un destino"
@@ -2156,7 +2152,7 @@ msgstr ""
"Editar."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1303
+#: ../src/empathy-account-assistant.c:1308
msgid "An error occurred"
msgstr "Ocurrió un error"
@@ -2165,36 +2161,36 @@ msgstr "Ocurrió un error"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:579
#, c-format
msgid "New %s account"
msgstr "Cuenta de %s nueva"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:507
msgid "What kind of chat account do you have?"
msgstr "¿Qué tipo de cuenta tiene?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:513
msgid "Do you have any other chat accounts you want to set up?"
msgstr "¿Tiene otras cuentas de chat que quiera configurar?"
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:519
msgid "Enter your account details"
msgstr "Introducir los detalles de su cuenta"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:524
msgid "What kind of chat account do you want to create?"
msgstr "¿Qué tipo de cuenta quiere crear?"
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:530
msgid "Do you want to create other chat accounts?"
msgstr "¿Quiere crear otras cuentas de chat?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:537
msgid "Enter the details for the new account"
msgstr "Introducir los detalles para la cuenta nueva"
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:652
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2203,43 +2199,43 @@ msgid ""
msgstr ""
"Con Empathy puede charlar con gente cerca y con amigos y colegas que usen "
"Google Talk, AIM, Windows Live y muchos otros programas de chat. Con un "
-"micrófono o una cámara web puede hacer incluso llamadas de sonido o vídeo."
+"micrófono o una cámara web puede hacer incluso llamadas de voz o vídeo."
-#: ../src/empathy-account-assistant.c:670
+#: ../src/empathy-account-assistant.c:669
msgid "Do you have an account you've been using with another chat program?"
msgstr "¿Tiene una cuenta que haya estado usando con otro programa de chat?"
-#: ../src/empathy-account-assistant.c:693
+#: ../src/empathy-account-assistant.c:692
msgid "Yes, import my account details from "
msgstr "Sí, importar los detalles de mi cuenta desde "
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:713
msgid "Yes, I'll enter my account details now"
msgstr "Sí, introduciré ahora los detalles de mi cuenta"
-#: ../src/empathy-account-assistant.c:736
+#: ../src/empathy-account-assistant.c:735
msgid "No, I want a new account"
msgstr "No, quiero crear una cuenta nueva"
-#: ../src/empathy-account-assistant.c:746
+#: ../src/empathy-account-assistant.c:745
msgid "No, I just want to see people online nearby for now"
msgstr "No, por ahora sólo quiero ver la gente conectada cerca"
-#: ../src/empathy-account-assistant.c:767
+#: ../src/empathy-account-assistant.c:766
msgid "Select the accounts you want to import:"
msgstr "Seleccione las cuentas que quiere importar:"
-#: ../src/empathy-account-assistant.c:851
+#: ../src/empathy-account-assistant.c:850
+#: ../src/empathy-new-chatroom-dialog.c:607
#: ../src/empathy-new-chatroom-dialog.c:608
-#: ../src/empathy-new-chatroom-dialog.c:609
msgid "Yes"
msgstr "Sí"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:857
msgid "No, that's all for now"
msgstr "No, eso es todo por ahora"
-#: ../src/empathy-account-assistant.c:1117
+#: ../src/empathy-account-assistant.c:1122
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
@@ -2252,16 +2248,16 @@ msgstr ""
"estos detalles posteriormente o desactivar esta característica usando el "
"diálogo «Cuentas»."
-#: ../src/empathy-account-assistant.c:1123
-#: ../src/empathy-account-assistant.c:1179
+#: ../src/empathy-account-assistant.c:1128
+#: ../src/empathy-account-assistant.c:1184
msgid "Edit->Accounts"
msgstr "Editar->Cuentas"
-#: ../src/empathy-account-assistant.c:1139
+#: ../src/empathy-account-assistant.c:1144
msgid "I don't want to enable this feature for now"
msgstr "No quiero activar esta característica por ahora"
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1180
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2273,66 +2269,66 @@ msgstr ""
"instale el paquete telepathy-salut y cree una cuenta de Gente cerca desde el "
"diálogo Cuentas."
-#: ../src/empathy-account-assistant.c:1181
+#: ../src/empathy-account-assistant.c:1186
msgid "telepathy-salut not installed"
msgstr "telepathy-salut no está instalado"
-#: ../src/empathy-account-assistant.c:1227
+#: ../src/empathy-account-assistant.c:1232
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Asistente de cuentas de mensajería y Voz IP"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1266
msgid "Welcome to Empathy"
msgstr "Bienvenido a Empathy"
-#: ../src/empathy-account-assistant.c:1270
+#: ../src/empathy-account-assistant.c:1275
msgid "Import your existing accounts"
msgstr "Importar sus cuentas existentes"
-#: ../src/empathy-account-assistant.c:1288
+#: ../src/empathy-account-assistant.c:1293
msgid "Please enter personal details"
msgstr "Introduzca los detalles personales"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:66
+#: ../src/empathy-accounts-dialog.c:65
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "Existen modificaciones sin guardar en su cuenta %s."
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:70
+#: ../src/empathy-accounts-dialog.c:69
msgid "Your new account has not been saved yet."
msgstr "Aún no se ha guardado su cuenta nueva."
-#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:262 ../src/empathy-call-window.c:789
msgid "Connecting…"
msgstr "Conectando…"
-#: ../src/empathy-accounts-dialog.c:290
+#: ../src/empathy-accounts-dialog.c:289
#, c-format
msgid "Disconnected — %s"
msgstr "Desconectado: %s"
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:294
#, c-format
msgid "Offline — %s"
msgstr "Desconectado: %s"
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:307
msgid "Offline — No Network Connection"
msgstr "Desconectado: sin conexión de red"
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:315
msgid "Unknown Status"
msgstr "Estado desconocido"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:326
msgid "Offline — Account Disabled"
msgstr "Desconectado: cuenta desactivada"
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:767
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2340,16 +2336,16 @@ msgstr ""
"Va a crear una cuenta nueva que descartará sus cambios.\n"
"¿Seguro que quiere continuar?"
-#: ../src/empathy-accounts-dialog.c:1115
+#: ../src/empathy-accounts-dialog.c:1114
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "¿Quiere quitar %s de su equipo?"
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1118
msgid "This will not remove your account on the server."
msgstr "Esto no quitará su cuenta del servidor."
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1355
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2357,7 +2353,7 @@ msgstr ""
"Va a seleccionar otra cuenta lo que descartará sus cambios.\n"
"¿Seguro que quiere continuar?"
-#: ../src/empathy-accounts-dialog.c:1933
+#: ../src/empathy-accounts-dialog.c:1932
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2393,62 +2389,62 @@ msgstr "_Importar…"
msgid "People nearby"
msgstr "Gente cerca"
-#: ../src/empathy-call-window.c:453
+#: ../src/empathy-call-window.c:462
msgid "Contrast"
msgstr "Contraste"
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:465
msgid "Brightness"
msgstr "Brillo"
-#: ../src/empathy-call-window.c:459
+#: ../src/empathy-call-window.c:468
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:567
+#: ../src/empathy-call-window.c:573
msgid "Volume"
msgstr "Volumen"
-#: ../src/empathy-call-window.c:1022
+#: ../src/empathy-call-window.c:1120
msgid "_Sidebar"
msgstr "Barra _lateral"
-#: ../src/empathy-call-window.c:1041
+#: ../src/empathy-call-window.c:1139
msgid "Audio input"
-msgstr "Entrada de sonido"
+msgstr "Entrada de voz"
-#: ../src/empathy-call-window.c:1045
+#: ../src/empathy-call-window.c:1143
msgid "Video input"
msgstr "Entrada de vídeo"
-#: ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1147
msgid "Dialpad"
msgstr "Teclado de llamada"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1117
+#: ../src/empathy-call-window.c:1218
#, c-format
msgid "Call with %s"
msgstr "Llamada con %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1198
+#: ../src/empathy-call-window.c:1299
msgid "Call"
msgstr "Llamar"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1842
+#: ../src/empathy-call-window.c:1956
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Conectado — %d:%02dm"
-#: ../src/empathy-call-window.c:1903
+#: ../src/empathy-call-window.c:2017
msgid "Technical Details"
msgstr "Detalles técnicos"
-#: ../src/empathy-call-window.c:1941
+#: ../src/empathy-call-window.c:2055
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2457,7 +2453,7 @@ msgstr ""
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-call-window.c:1946
+#: ../src/empathy-call-window.c:2060
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2466,7 +2462,7 @@ msgstr ""
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-call-window.c:1952
+#: ../src/empathy-call-window.c:2066
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2475,25 +2471,25 @@ msgstr ""
"No se puede establecer una conexión con %s. Uno de los dos puede estar en "
"una red que no acepta conexiones directas."
-#: ../src/empathy-call-window.c:1958
+#: ../src/empathy-call-window.c:2072
msgid "There was a failure on the network"
msgstr "Hubo un fallo en la red"
-#: ../src/empathy-call-window.c:1962
+#: ../src/empathy-call-window.c:2076
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"No están instalados en su equipo los formatos de sonido necesarios para esta "
"llamada"
-#: ../src/empathy-call-window.c:1965
+#: ../src/empathy-call-window.c:2079
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"No están instalados en su equipo los formatos de vídeo necesarios para esta "
"llamada"
-#: ../src/empathy-call-window.c:1975
+#: ../src/empathy-call-window.c:2089
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2504,15 +2500,15 @@ msgstr ""
"\">Informe de este error</a> y añada los registros obtenidos de la ventana "
"de «Depuración» en el menú de Ayuda."
-#: ../src/empathy-call-window.c:1983
+#: ../src/empathy-call-window.c:2097
msgid "There was a failure in the call engine"
msgstr "Hubo un fallo en el motor de llamadas"
-#: ../src/empathy-call-window.c:2022
+#: ../src/empathy-call-window.c:2136
msgid "Can't establish audio stream"
-msgstr "No se puede establecer el flujo de sonido"
+msgstr "No se puede establecer el flujo de voz"
-#: ../src/empathy-call-window.c:2032
+#: ../src/empathy-call-window.c:2146
msgid "Can't establish video stream"
msgstr "No se puede establecer el flujo de vídeo"
@@ -2558,11 +2554,11 @@ msgstr "Volver a llamar"
#: ../src/empathy-call-window.ui.h:11
msgid "Send Audio"
-msgstr "Enviar sonido"
+msgstr "Enviar voz"
#: ../src/empathy-call-window.ui.h:12
msgid "Toggle audio transmission"
-msgstr "Conmutar la transmisión de sonido"
+msgstr "Conmutar la transmisión de voz"
#: ../src/empathy-call-window.ui.h:13
msgid "V_ideo"
@@ -2584,35 +2580,35 @@ msgstr "Vista preliminar del vídeo"
msgid "_View"
msgstr "_Ver"
-#: ../src/empathy-chat-window.c:446 ../src/empathy-chat-window.c:466
+#: ../src/empathy-chat-window.c:440 ../src/empathy-chat-window.c:460
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d sin leer)"
msgstr[1] "%s (%d sin leer)"
-#: ../src/empathy-chat-window.c:458
+#: ../src/empathy-chat-window.c:452
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (y otro)"
msgstr[1] "%s (y otros %u)"
-#: ../src/empathy-chat-window.c:474
+#: ../src/empathy-chat-window.c:468
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d sin leer de otros)"
msgstr[1] "%s (%d sin leer de otros)"
-#: ../src/empathy-chat-window.c:483
+#: ../src/empathy-chat-window.c:477
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d sin leer de todos)"
msgstr[1] "%s (%d sin leer de todos)"
-#: ../src/empathy-chat-window.c:686
+#: ../src/empathy-chat-window.c:680
msgid "Typing a message."
msgstr "Tecleando un mensaje."
@@ -2949,11 +2945,11 @@ msgstr "Editar cuenta"
msgid "Close"
msgstr "Cerrar"
-#: ../src/empathy-main-window.c:1053
+#: ../src/empathy-main-window.c:1055
msgid "Contact"
msgstr "Contacto"
-#: ../src/empathy-main-window.c:1435
+#: ../src/empathy-main-window.c:1436
msgid "Show and edit accounts"
msgstr "Mostrar y editar cuentas"
@@ -3041,17 +3037,17 @@ msgstr "Información p_ersonal"
msgid "_Room"
msgstr "_Sala"
-#: ../src/empathy-new-chatroom-dialog.c:382
+#: ../src/empathy-new-chatroom-dialog.c:379
msgid "Chat Room"
msgstr "Sala de chat"
-#: ../src/empathy-new-chatroom-dialog.c:398
+#: ../src/empathy-new-chatroom-dialog.c:395
msgid "Members"
msgstr "Miembros"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:606
+#: ../src/empathy-new-chatroom-dialog.c:605
#, c-format
msgid ""
"<b>%s</b>\n"
@@ -3064,16 +3060,16 @@ msgstr ""
"Se necesita contraseña: %s\n"
"Miembros: %s"
+#: ../src/empathy-new-chatroom-dialog.c:607
#: ../src/empathy-new-chatroom-dialog.c:608
-#: ../src/empathy-new-chatroom-dialog.c:609
msgid "No"
msgstr "No"
-#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:635
msgid "Could not start room listing"
msgstr "No se pudo iniciar la lista de la sala"
-#: ../src/empathy-new-chatroom-dialog.c:646
+#: ../src/empathy-new-chatroom-dialog.c:645
msgid "Could not stop room listing"
msgstr "No se pudo parar la lista de la sala"
@@ -3274,7 +3270,7 @@ msgstr "_Publicar mi ubicación a mis contactos"
msgid "_Reduce location accuracy"
msgstr "_Reducir la precisión de la ubicación"
-#: ../src/empathy-status-icon.c:176
+#: ../src/empathy-status-icon.c:178
msgid "Respond"
msgstr "Respuesta"
@@ -3290,63 +3286,63 @@ msgstr "_Salir"
msgid "Contact Map View"
msgstr "Vista del mapa de contactos"
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1078
msgid "Save"
msgstr "Guardar"
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1251
msgid "Debug Window"
msgstr "Depurar ventana"
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1331
msgid "Pause"
msgstr "Pausar"
-#: ../src/empathy-debug-window.c:1311
+#: ../src/empathy-debug-window.c:1343
msgid "Level "
msgstr "Nivel "
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1363
msgid "Debug"
msgstr "Depurar"
-#: ../src/empathy-debug-window.c:1337
+#: ../src/empathy-debug-window.c:1369
msgid "Info"
msgstr "Información"
-#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+#: ../src/empathy-debug-window.c:1375 ../src/empathy-debug-window.c:1424
msgid "Message"
msgstr "Mensaje"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1381
msgid "Warning"
msgstr "Advertencia"
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1387
msgid "Critical"
msgstr "Crítico"
-#: ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1393
msgid "Error"
msgstr "Error"
-#: ../src/empathy-debug-window.c:1380
+#: ../src/empathy-debug-window.c:1412
msgid "Time"
msgstr "Hora"
-#: ../src/empathy-debug-window.c:1383
+#: ../src/empathy-debug-window.c:1415
msgid "Domain"
msgstr "Dominio"
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1417
msgid "Category"
msgstr "Categoría"
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1419
msgid "Level"
msgstr "Nivel"
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1456
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
diff --git a/po/fr.po b/po/fr.po
index 49a7bd5ca..e36fadf09 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -928,6 +928,7 @@ msgstr "Pri_orité :"
msgid "Reso_urce:"
msgstr "Resso_urce :"
+# 'blaireau' has been judged an offensive name in French
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
msgid ""
"This is your username, not your normal Facebook login.\n"
@@ -936,7 +937,7 @@ msgid ""
"Facebook username if you don't have one."
msgstr ""
"C'est votre nom d'utilisateur, pas votre nom de connexion Facebook.\n"
-"Si vous êtes facebook.com/<b>blaireau</b>, saisissez <b>blaireau</b>.\n"
+"Si vous êtes facebook.com/<b>castor</b>, saisissez <b>castor</b>.\n"
"Utilisez <a href=\"http://www.facebook.com/username/\">cette page</a> pour "
"choisir un nom d'utilisateur Facebook si vous n'en avez pas un."
diff --git a/po/gl.po b/po/gl.po
index b9954e339..7eb1dae7c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,10 +12,10 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-17 16:10+0200\n"
-"PO-Revision-Date: 2010-04-14 12:29+0200\n"
+"POT-Creation-Date: 2010-04-25 16:49+0200\n"
+"PO-Revision-Date: 2010-04-25 16:43+0200\n"
"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
-"Language-Team: Galician <gnome@g11.net>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -224,7 +224,7 @@ msgstr "Reproducir un son cando un contacto inicia unha sesión"
# rever
#: ../data/empathy.schemas.in.h:37
msgid "Play a sound when a contact logs out"
-msgstr "Reproducir un son cando un contacto termina a sesión"
+msgstr "Reproducir un son cando un contacto saia da sesión"
# rever
#: ../data/empathy.schemas.in.h:38
@@ -561,7 +561,7 @@ msgstr "Xestionar as contas de mensaxería e VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243
+#: ../src/empathy-accounts-dialog.c:2064 ../src/cc-empathy-accounts-page.c:243
#: ../src/cc-empathy-accounts-panel.c:91
msgid "Messaging and VoIP Accounts"
msgstr "Contas de mensaxería e VoIP"
@@ -1633,7 +1633,7 @@ msgid "Select"
msgstr "Seleccionar"
#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1070
+#: ../src/empathy-main-window.c:1072
msgid "Group"
msgstr "Grupo"
@@ -2337,7 +2337,7 @@ msgstr "Produciuse un erro"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:580
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:579
#, c-format
msgid "New %s account"
msgstr "Conta nova de %s"
@@ -2404,8 +2404,8 @@ msgid "Select the accounts you want to import:"
msgstr "Seleccione as contas que quere importar:"
#: ../src/empathy-account-assistant.c:850
+#: ../src/empathy-new-chatroom-dialog.c:607
#: ../src/empathy-new-chatroom-dialog.c:608
-#: ../src/empathy-new-chatroom-dialog.c:609
msgid "Yes"
msgstr "Si"
@@ -2470,45 +2470,45 @@ msgstr "Insira os detalles persoais"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:66
+#: ../src/empathy-accounts-dialog.c:65
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "Hai modificacións sen gardar respecto da súa conta %s."
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:70
+#: ../src/empathy-accounts-dialog.c:69
msgid "Your new account has not been saved yet."
msgstr "A súa nova conta aínda non foi gardada."
-#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:789
+#: ../src/empathy-accounts-dialog.c:262 ../src/empathy-call-window.c:789
msgid "Connecting…"
msgstr "Conectando..."
-#: ../src/empathy-accounts-dialog.c:290
+#: ../src/empathy-accounts-dialog.c:289
#, c-format
msgid "Disconnected — %s"
msgstr "Desconectado — %s"
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:294
#, c-format
msgid "Offline — %s"
msgstr "Desconectado — %s"
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:307
msgid "Offline — No Network Connection"
msgstr "Desconectado — Sen conexión de rede"
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:315
msgid "Unknown Status"
msgstr "Estado descoñecido"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:326
msgid "Offline — Account Disabled"
msgstr "Desconectado — Conta desactivada"
# rever
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:767
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2517,17 +2517,17 @@ msgstr ""
"Está seguro de que quere proceder?"
# rever
-#: ../src/empathy-accounts-dialog.c:1115
+#: ../src/empathy-accounts-dialog.c:1114
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Está seguro de que quere eliminar o grupo '%s' do seu computador?"
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1118
msgid "This will not remove your account on the server."
msgstr "Isto non eliminará a súa conta no servidor."
# rever
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1355
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2536,7 +2536,7 @@ msgstr ""
"Está seguro de que quere proceder?"
# rever
-#: ../src/empathy-accounts-dialog.c:1933
+#: ../src/empathy-accounts-dialog.c:1932
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3166,12 +3166,12 @@ msgstr "Editar a conta"
msgid "Close"
msgstr "Pechar"
-#: ../src/empathy-main-window.c:1053
+#: ../src/empathy-main-window.c:1055
msgid "Contact"
msgstr "Contacto"
# rever
-#: ../src/empathy-main-window.c:1435
+#: ../src/empathy-main-window.c:1436
msgid "Show and edit accounts"
msgstr "Mostrar e editar contas"
@@ -3264,17 +3264,17 @@ msgid "_Room"
msgstr "Sa_la"
# rever
-#: ../src/empathy-new-chatroom-dialog.c:382
+#: ../src/empathy-new-chatroom-dialog.c:379
msgid "Chat Room"
msgstr "Salas de conversa"
-#: ../src/empathy-new-chatroom-dialog.c:398
+#: ../src/empathy-new-chatroom-dialog.c:395
msgid "Members"
msgstr "Membros"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:606
+#: ../src/empathy-new-chatroom-dialog.c:605
#, c-format
msgid ""
"<b>%s</b>\n"
@@ -3287,16 +3287,16 @@ msgstr ""
"Contrasinal requirido: %s\n"
"Membros: %s"
+#: ../src/empathy-new-chatroom-dialog.c:607
#: ../src/empathy-new-chatroom-dialog.c:608
-#: ../src/empathy-new-chatroom-dialog.c:609
msgid "No"
msgstr "Non"
-#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:635
msgid "Could not start room listing"
msgstr "Non foi posíbel arrincar a lista da sala"
-#: ../src/empathy-new-chatroom-dialog.c:646
+#: ../src/empathy-new-chatroom-dialog.c:645
msgid "Could not stop room listing"
msgstr "Non foi posíbel deter a lista da sala"
diff --git a/po/nb.po b/po/nb.po
index 4b56bffc7..f2c8894b5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,10 +4,10 @@
# Sigurd Gartmann <sigurdga@yahoo-inc.com>, 2005, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: empathy 2.29.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-27 11:08+0100\n"
-"PO-Revision-Date: 2010-03-27 11:16+0100\n"
+"Project-Id-Version: empathy 2.30.x\n"
+"Report-Msgid-Bugs-To:\n"
+"POT-Creation-Date: 2010-05-01 19:15+0200\n"
+"PO-Revision-Date: 2010-05-01 19:16+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
"MIME-Version: 1.0\n"
@@ -107,301 +107,311 @@ msgid "Empathy has migrated butterfly logs"
msgstr ""
#: ../data/empathy.schemas.in.h:18
-msgid "Empathy should auto-connect on startup"
+#, fuzzy
+msgid "Empathy should auto-away when idle"
msgstr "Empathy skal koble til automatisk ved oppstart"
#: ../data/empathy.schemas.in.h:19
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy skal koble til automatisk ved oppstart"
+
+#: ../data/empathy.schemas.in.h:20
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy skal redusere nøyaktighet for lokasjonen"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
"Empathy skal bruke personbildet for kontakten som ikon for pratevinduet"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
msgid "Enable WebKit Developer Tools"
msgstr "Slå på utviklerverktøy for WebKit"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
msgid "Enable popup notifications for new messages"
msgstr "Aktiver varsling oppsprettmeldinger for nye meldinger"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
msgid "Enable spell checker"
msgstr "Bruk stavekontroll"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:25
msgid "Hide main window"
msgstr "Skjul hovedvinduet"
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:26
msgid "Hide the main window."
msgstr "Skjul hovedvinduet."
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:27
msgid "MC 4 accounts have been imported"
msgstr "MC 4-kontoer ble importert"
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:28
msgid "MC 4 accounts have been imported."
msgstr "MC 4-kontoer ble importert."
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:29
msgid "Nick completed character"
msgstr "Tegn for fullføring av kallenavn"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:30
msgid "Open new chats in separate windows"
msgstr "Åpne nye samtaler i egne vinduer"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:31
msgid "Path of the Adium theme to use"
msgstr "Sti til Adium-tema som skal brukes"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "Sti til Adium-tema skal brukes hvis tema for prat er Adium."
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:33
msgid "Play a sound for incoming messages"
msgstr "Spill av lyd når meldinger kommer inn"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:34
msgid "Play a sound for new conversations"
msgstr "Spill av lyd ved nye samtaler"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:35
msgid "Play a sound for outgoing messages"
msgstr "Spill av lyd for utgående meldinger"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:36
msgid "Play a sound when a contact logs in"
msgstr "Spill av lyd når kontakter logger inn"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:37
msgid "Play a sound when a contact logs out"
msgstr "Spill av lyd når kontakter logger ut"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:38
msgid "Play a sound when we log in"
msgstr "Spill av lyd når du logger inn"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:39
msgid "Play a sound when we log out"
msgstr "Spill av lyd når du logger ut"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:40
msgid "Pop up notifications if the chat isn't focused"
msgstr "Vis varsling når prat ikke er fokusert"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:41
msgid "Pop up notifications when a contact logs in"
msgstr "Vis varsling når en kontakt logger inn"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:42
msgid "Pop up notifications when a contact logs out"
msgstr "Vis varsling når en kontakt logger ut"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:43
msgid "Show avatars"
msgstr "Vis personbilder"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:44
msgid "Show contact list in rooms"
msgstr "Vis kontaktliste i rom"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:45
msgid "Show hint about closing the main window"
msgstr "Vis hint om lukking av hovedvinduet"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:46
msgid "Show offline contacts"
msgstr "Vis frakoblede kontakter"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:47
msgid "Show protocols"
msgstr "Vis protokoller"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:48
msgid "Spell checking languages"
msgstr "Stavekontrollspråk"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:49
msgid "The default folder to save file transfers in."
msgstr "Forvalgt mappe for lagring av filoverføringer."
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:50
msgid "The last directory that an avatar image was chosen from."
msgstr "Den forrige mappen et personbilde ble valgt fra."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:51
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Temaet som brukes til å vise samtaler."
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:52
msgid "Use graphical smileys"
msgstr "Vis smilefjes grafisk"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:53
msgid "Use notification sounds"
msgstr "Bruk varslingslyder"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:54
msgid "Use theme for chat rooms"
msgstr "Bruk tema for samtalerom"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:55
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Om Empathy kan publisere brukers lokasjon til kontakter."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:56
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Om Empathy kan bruke GPS for å gjette lokasjon."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:57
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Om Empathy kan bruke mobilnettverk for å gjette lokasjon."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:58
msgid "Whether Empathy can use the network to guess the location."
msgstr "Om Empathy kan bruke nettverket for å gjette lokasjon."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:59
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr "Om Empathy har spurt om å importere kontoer fra andre programmer."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:60
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Om Empathy har migrert logger for butterfly."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:61
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Om Empathy skal logge inn til dine kontoer automatisk ved oppstart."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:62
+#, fuzzy
+msgid "Whether Empathy should go into away mode automatically if user is idle."
+msgstr "Om Empathy skal logge inn til dine kontoer automatisk ved oppstart."
+
+#: ../data/empathy.schemas.in.h:63
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Om Empathy skal redusere nøyaktighet for lokasjon av personvernhensyn."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:64
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:65
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "Om utviklerverktøy for WebKit, som Web Inspector, skal slås på."
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:66
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "Om tilkoblingshåndterere skal brukes til å koble til/fra automatisk."
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:67
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "Om stavekontroll skal sjekke ord mot de språkene du ønsker å bruke."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:68
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Om smilefjes skal konverteres til grafiske bilder i samtaler."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:69
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Om en lyd skal spilles av for å varsle om at kontakter logger inn på "
"nettverket."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:70
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Om en lyd skal spilles av for å varsle at kontakter logger ut av nettverket."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:71
msgid "Whether to play a sound to notify of events."
msgstr "Om lyder skal spilles av for å varsle om hendelser."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:72
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Om lyder skal spilles av for å varsle om innkommende meldinger."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:73
msgid "Whether to play a sound to notify of new conversations."
msgstr "Om lyder skal spilles av for å varsle om nye samtaler."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:74
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Om lyder skal spilles av for å varsle om utgående meldinger."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:75
msgid "Whether to play a sound when logging into a network."
msgstr "Om lyder skal spilles av når du logger inn på et nettverk."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:76
msgid "Whether to play a sound when logging out of a network."
msgstr "Om lyder skal spilles av når du logger ut av et nettverk."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:77
msgid "Whether to play sound notifications when away or busy."
msgstr "Om lyder skal spilles av når du er borte eller opptatt."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:78
#, fuzzy
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Om lyder skal spilles av når du er borte eller opptatt."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:79
#, fuzzy
msgid "Whether to show a popup notification when a contact goes online."
msgstr "Om lyder skal spilles av når du er borte eller opptatt."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:80
#, fuzzy
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
msgstr "Om lyder skal spilles av når du er borte eller opptatt."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:81
#, fuzzy
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Om lyder skal spilles av når du er borte eller opptatt."
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:82
#, fuzzy
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "Om bilder av kontakter skal vises i kontaktlisten og samtalevinduer."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:83
#, fuzzy
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Om kontakter som er frakoblet skal vises i kontaktlisten."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:84
#, fuzzy
msgid "Whether to show popup notifications when away or busy."
msgstr "Om lyder skal spilles av når du er borte eller opptatt."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:85
#, fuzzy
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Om bilder av kontakter skal vises i kontaktlisten og samtalevinduer."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:86
msgid "Whether to show the contact list in chat rooms."
msgstr "Om kontaktlisten skal vises i praterom."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:87
msgid "Whether to show the contact list in compact mode."
msgstr "Om kontaktlisten skal vises i kompakt modus."
-#: ../data/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:88
#, fuzzy
msgid ""
"Whether to show the message dialog about closing the main window with the "
@@ -410,12 +420,12 @@ msgstr ""
"Om meldingsdialog om lukking av vinduet med «x»-knappen i tittelfeltet skal "
"vises."
-#: ../data/empathy.schemas.in.h:87
+#: ../data/empathy.schemas.in.h:89
#, fuzzy
msgid "Whether to use the theme for chat rooms."
msgstr "Om tema skal brukes for praterom eller ikke."
-#: ../data/empathy.schemas.in.h:88
+#: ../data/empathy.schemas.in.h:90
#, fuzzy
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
@@ -432,7 +442,7 @@ msgstr "Håndter meldings- og VoIP-kontoer"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243
+#: ../src/empathy-accounts-dialog.c:2064 ../src/cc-empathy-accounts-page.c:243
#: ../src/cc-empathy-accounts-panel.c:91
msgid "Messaging and VoIP Accounts"
msgstr "Meldings- og VoIP-kontoer"
@@ -453,40 +463,35 @@ msgstr "Valgt fil er ikke en vanlig fil"
msgid "The selected file is empty"
msgstr "Valgt fil er tom"
-#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:77
-msgid "People nearby"
-msgstr "Personer i nærheten"
-
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:281
msgid "Socket type not supported"
msgstr "Type plugg er ikke støttet"
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:400
msgid "No reason was specified"
msgstr "Ingen årsak oppgitt"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:403
msgid "The change in state was requested"
msgstr "Tilstandsendring ble etterspurt"
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:406
msgid "You canceled the file transfer"
msgstr "Du avbrøt filoverføringen"
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:409
msgid "The other participant canceled the file transfer"
msgstr "Avsender avbrøt filoverføringen"
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:412
msgid "Error while trying to transfer the file"
msgstr "Feil under overføring av filen"
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:415
msgid "The other participant is unable to transfer the file"
msgstr "Avsender kan ikke overføre filen"
-#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:315
msgid "Unknown reason"
msgstr "Ukjent årsak"
@@ -510,71 +515,75 @@ msgstr "Usynlig"
msgid "Offline"
msgstr "Frakoblet"
-#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:249
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: ../libempathy/empathy-utils.c:287
msgid "No reason specified"
msgstr "Ingen årsak oppgitt"
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:289
msgid "Status is set to offline"
msgstr "Status er satt til frakoblet"
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:291
msgid "Network error"
msgstr "Nettverksfeil"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:293
msgid "Authentication failed"
msgstr "Autentiseringen feilet"
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
msgid "Encryption error"
msgstr "Krypteringsfeil"
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:297
msgid "Name in use"
msgstr "Navn i bruk"
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:299
msgid "Certificate not provided"
msgstr "Sertifikat ikke oppgitt"
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:301
msgid "Certificate untrusted"
msgstr "Stoler ikke på sertifikat"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:303
msgid "Certificate expired"
msgstr "Sertifikat utgått"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:305
msgid "Certificate not activated"
msgstr "Sertifikat ikke aktivert"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:307
msgid "Certificate hostname mismatch"
msgstr "Feil vertsnavn i forhold til sertifikat"
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:309
msgid "Certificate fingerprint mismatch"
msgstr "Fingeravtrykk stemmer ikke for sertifikat"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
msgid "Certificate self-signed"
msgstr "Selvsignert sertifikat"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:313
msgid "Certificate error"
msgstr "Sertifikatsfeil"
-#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:430 ../src/empathy-import-mc4-accounts.c:104
msgid "People Nearby"
msgstr "Personer i nærheten"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:435
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:436
msgid "Facebook Chat"
msgstr "Facebook-prat"
@@ -624,25 +633,25 @@ msgstr[1] "%d måneder siden"
msgid "in the future"
msgstr "i fremtiden"
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:463
msgid "All"
msgstr "Alle"
-#: ../libempathy-gtk/empathy-account-widget.c:538
-#: ../libempathy-gtk/empathy-account-widget.c:594
+#: ../libempathy-gtk/empathy-account-widget.c:549
+#: ../libempathy-gtk/empathy-account-widget.c:605
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1126
+#: ../libempathy-gtk/empathy-account-widget.c:1136
msgid "Username:"
msgstr "Brukernavn:"
-#: ../libempathy-gtk/empathy-account-widget.c:1474
+#: ../libempathy-gtk/empathy-account-widget.c:1479
msgid "L_og in"
msgstr "L_ogg inn"
-#: ../libempathy-gtk/empathy-account-widget.c:1542
+#: ../libempathy-gtk/empathy-account-widget.c:1547
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
@@ -650,15 +659,15 @@ msgstr "L_ogg inn"
msgid "Account:"
msgstr "Konto:"
-#: ../libempathy-gtk/empathy-account-widget.c:1553
+#: ../libempathy-gtk/empathy-account-widget.c:1558
msgid "Enabled"
msgstr "Aktivert"
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1623
msgid "This account already exists on the server"
msgstr "Denne kontoen eksisterer allerede på tjeneren"
-#: ../libempathy-gtk/empathy-account-widget.c:1621
+#: ../libempathy-gtk/empathy-account-widget.c:1626
msgid "Create a new account on the server"
msgstr "Lag en ny konto på tjeneren"
@@ -667,19 +676,19 @@ msgstr "Lag en ny konto på tjeneren"
#. * like: "MyUserName on chat.freenode.net".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1995
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s av %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2039
+#: ../libempathy-gtk/empathy-account-widget.c:2021
#, c-format
msgid "%s Account"
msgstr "%s-konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2043
+#: ../libempathy-gtk/empathy-account-widget.c:2025
msgid "New account"
msgstr "Ny konto"
@@ -704,7 +713,7 @@ msgstr "Avansert"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "_Passord:"
@@ -784,36 +793,36 @@ msgstr "_Tegnsett:"
msgid "New Network"
msgstr "Nytt nettverk"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:183
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
msgid "Auto"
msgstr "Auto"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:186
msgid "UDP"
msgstr "UDP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:189
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:192
msgid "TLS"
msgstr "TLS"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:221
msgid "Register"
msgstr "Register"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:226
msgid "Options"
msgstr "Alternativer"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
msgid "None"
msgstr "Ingen"
@@ -975,92 +984,58 @@ msgid "Discover the STUN server automatically"
msgstr "Søk opp STUN-tjener automatisk"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Hostname of the proxy for outbound requests."
-msgstr "Vertsnavn på proxy for utgående forespørsler."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "Intervall (sekunder)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Keep-Alive Options"
msgstr "Alternativer for Keep-Alive"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid ""
-"Look up the DNS SRV record at the service's domain for the host name of a "
-"STUN server."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Loose Routing"
msgstr "Løs ruting"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Mechanism:"
msgstr "Mekanisme:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Miscellaneous Options"
msgstr "Forskjellige alternativer"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "NAT Traversal Options"
msgstr "Alternativer for NAT"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Port of the proxy for outbound requests."
-msgstr "Port på proxy for utgående forespørsler."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
msgid "Port:"
msgstr "Port:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Proxy Options"
msgstr "Alternativer for proxy"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "STUN Server:"
msgstr "STUN-tjener:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Server:"
msgstr "Tjener:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid ""
-"The username for SIP authentication, if different from the SIP URI\n"
-"username."
-msgstr ""
-"Brukernavn for SIP-autentisering hvis denne er forskjellig fra brukernavn i\n"
-"SIP URI."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Transport:"
msgstr "Transport:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid ""
-"Update the registration binding if the external address for the client is "
-"discovered to be different from the local binding."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid ""
-"Use the loose routing behavior and the Route header as recommended in RFC "
-"3261."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "What is your SIP account password?"
msgstr "Hva er passordet for din SIP-konto?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP login ID?"
msgstr "Hva er din påloggings-ID for SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "_Username:"
msgstr "Br_ukernavn:"
@@ -1117,145 +1092,149 @@ msgstr "Alle filer"
msgid "Click to enlarge"
msgstr "Klikk for å forstørre"
-#: ../libempathy-gtk/empathy-chat.c:233
+#: ../libempathy-gtk/empathy-chat.c:235
msgid "Failed to reconnect this chat"
msgstr "Klarte ikke å koble til denne praten på nytt"
-#: ../libempathy-gtk/empathy-chat.c:655
+#: ../libempathy-gtk/empathy-chat.c:657
msgid "Failed to join chat room"
msgstr "Klarte ikke å bli med i praterom"
-#: ../libempathy-gtk/empathy-chat.c:673
+#: ../libempathy-gtk/empathy-chat.c:675
msgid "Failed to open private chat"
msgstr "Klarte ikke å åpne privat prat"
-#: ../libempathy-gtk/empathy-chat.c:712
+#: ../libempathy-gtk/empathy-chat.c:714
msgid "Topic not supported on this conversation"
msgstr "Emne er ikke støttet for denne samtalen"
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:720
msgid "You are not allowed to change the topic"
msgstr "Du har ikke lov til å bytte emne"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:849
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: tøm alle meldinger fra aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:852
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <emne>: sett emne for aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:853
+#: ../libempathy-gtk/empathy-chat.c:855
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID for praterom>: bli med i et nytt praterom"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:858
msgid "/j <chat room ID>: join a new chat room"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:861
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:864
msgid "/msg <contact ID> <message>: open a private chat"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:867
msgid "/nick <nickname>: change your nickname on the current server"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:870
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <melding>: send en HANDLINGS-melding til aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:873
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:876
+#: ../libempathy-gtk/empathy-chat.c:878
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:888
#, c-format
msgid "Usage: %s"
msgstr "Bruk: %s"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:917
msgid "Unknown command"
msgstr "Ukjent kommando"
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1038
msgid "Unknown command; see /help for the available commands"
msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1176
msgid "offline"
msgstr "frakoblet"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1179
msgid "invalid contact"
msgstr "ugyldig kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1182
msgid "permission denied"
msgstr "tilgang nektet"
-#: ../libempathy-gtk/empathy-chat.c:1183
+#: ../libempathy-gtk/empathy-chat.c:1185
msgid "too long message"
msgstr "meldingen er for lang"
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1188
msgid "not implemented"
msgstr "ikke implementert"
-#: ../libempathy-gtk/empathy-chat.c:1189
+#: ../libempathy-gtk/empathy-chat.c:1191
msgid "unknown"
msgstr "ukjent"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1195
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Feil ved sending av melding «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1228
+#: ../libempathy-gtk/empathy-chat.c:1305 ../src/empathy-chat-window.c:676
+msgid "Topic:"
+msgstr "Emne:"
+
+#: ../libempathy-gtk/empathy-chat.c:1317
#, c-format
msgid "Topic set to: %s"
msgstr "Emnet er satt til: %s"
-#: ../libempathy-gtk/empathy-chat.c:1230
+#: ../libempathy-gtk/empathy-chat.c:1319
msgid "No topic defined"
msgstr "Emne ikke definert"
-#: ../libempathy-gtk/empathy-chat.c:1629
+#: ../libempathy-gtk/empathy-chat.c:1715
msgid "(No Suggestions)"
msgstr "(Ingen forslag)"
-#: ../libempathy-gtk/empathy-chat.c:1683
+#: ../libempathy-gtk/empathy-chat.c:1769
msgid "Insert Smiley"
msgstr "Sett inn smilefjes"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1701
-#: ../libempathy-gtk/empathy-ui-utils.c:1675
+#: ../libempathy-gtk/empathy-chat.c:1787
+#: ../libempathy-gtk/empathy-ui-utils.c:1642
msgid "_Send"
msgstr "_Send"
-#: ../libempathy-gtk/empathy-chat.c:1735
+#: ../libempathy-gtk/empathy-chat.c:1821
msgid "_Spelling Suggestions"
msgstr "_Staveforslag"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#: ../libempathy-gtk/empathy-chat.c:1915
msgid "Failed to retrieve recent logs"
msgstr "Klarte ikke å hente siste logger"
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:2046
#, c-format
msgid "%s has disconnected"
msgstr "%s har koblet fra"
@@ -1263,12 +1242,12 @@ msgstr "%s har koblet fra"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1967
+#: ../libempathy-gtk/empathy-chat.c:2053
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s ble sparket av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1970
+#: ../libempathy-gtk/empathy-chat.c:2056
#, c-format
msgid "%s was kicked"
msgstr "%s ble sparket"
@@ -1276,17 +1255,17 @@ msgstr "%s ble sparket"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1978
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s ble bannlyst av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1981
+#: ../libempathy-gtk/empathy-chat.c:2067
#, c-format
msgid "%s was banned"
msgstr "%s ble bannlyst"
-#: ../libempathy-gtk/empathy-chat.c:1985
+#: ../libempathy-gtk/empathy-chat.c:2071
#, c-format
msgid "%s has left the room"
msgstr "%s har forlatt rommet"
@@ -1296,54 +1275,50 @@ msgstr "%s har forlatt rommet"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1994
+#: ../libempathy-gtk/empathy-chat.c:2080
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2019
+#: ../libempathy-gtk/empathy-chat.c:2105
#, c-format
msgid "%s has joined the room"
msgstr "%s har blitt med i rommet"
-#: ../libempathy-gtk/empathy-chat.c:2044
+#: ../libempathy-gtk/empathy-chat.c:2130
#, c-format
msgid "%s is now known as %s"
msgstr "%s er nå kjent som %s"
-#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1532
+#: ../libempathy-gtk/empathy-chat.c:2269 ../src/empathy-call-window.c:1643
msgid "Disconnected"
msgstr "Koblet fra"
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2799
msgid "Wrong password; please try again:"
msgstr "Feil passord; vennligst prøv igjen:"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2800
msgid "Retry"
msgstr "Prøv igjen"
-#: ../libempathy-gtk/empathy-chat.c:2707
+#: ../libempathy-gtk/empathy-chat.c:2805
msgid "This room is protected by a password:"
msgstr "Dette rommet er beskyttet med et passord:"
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2806
msgid "Join"
msgstr "Bli med"
-#: ../libempathy-gtk/empathy-chat.c:2848
+#: ../libempathy-gtk/empathy-chat.c:2946
msgid "Connected"
msgstr "Koblet til"
-#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-chat.c:2999
#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Samtale"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:672
-msgid "Topic:"
-msgstr "Emne:"
-
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:318
#: ../libempathy-gtk/empathy-theme-adium.c:786
@@ -1382,84 +1357,84 @@ msgstr "A_vgjør senere"
msgid "Subscription Request"
msgstr "Abonnementsforespørsel"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1633
+#: ../libempathy-gtk/empathy-contact-list-view.c:1632
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Vil du virkelig fjerne gruppen «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1635
+#: ../libempathy-gtk/empathy-contact-list-view.c:1634
msgid "Removing group"
msgstr "Fjerner gruppe"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1684
-#: ../libempathy-gtk/empathy-contact-list-view.c:1761
+#: ../libempathy-gtk/empathy-contact-list-view.c:1683
+#: ../libempathy-gtk/empathy-contact-list-view.c:1760
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "Fje_rn"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1714
+#: ../libempathy-gtk/empathy-contact-list-view.c:1713
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Vil du virkelig fjerne kontakten «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1716
+#: ../libempathy-gtk/empathy-contact-list-view.c:1715
msgid "Removing contact"
msgstr "Fjerner kontakt"
-#: ../libempathy-gtk/empathy-contact-menu.c:206
+#: ../libempathy-gtk/empathy-contact-menu.c:209
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Legg til kontakt..."
-#: ../libempathy-gtk/empathy-contact-menu.c:233
+#: ../libempathy-gtk/empathy-contact-menu.c:236
#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Prat"
-#: ../libempathy-gtk/empathy-contact-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:267
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Lydsamtale"
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:299
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videosamtale"
-#: ../libempathy-gtk/empathy-contact-menu.c:347
+#: ../libempathy-gtk/empathy-contact-menu.c:350
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "_Tidligere samtaler"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:372
msgid "Send file"
msgstr "Send fil"
-#: ../libempathy-gtk/empathy-contact-menu.c:392
+#: ../libempathy-gtk/empathy-contact-menu.c:395
msgid "Share my desktop"
msgstr "Del mitt skrivebord"
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-contact-widget.c:1379
+#: ../libempathy-gtk/empathy-contact-menu.c:435
+#: ../libempathy-gtk/empathy-contact-widget.c:1444
msgid "Favorite"
msgstr "Favoritt"
-#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-contact-menu.c:465
msgid "Infor_mation"
msgstr "Infor_masjon"
-#: ../libempathy-gtk/empathy-contact-menu.c:508
+#: ../libempathy-gtk/empathy-contact-menu.c:511
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "R_ediger"
-#: ../libempathy-gtk/empathy-contact-menu.c:562
-#: ../src/empathy-chat-window.c:857
+#: ../libempathy-gtk/empathy-contact-menu.c:565
+#: ../src/empathy-chat-window.c:861
msgid "Inviting you to this room"
msgstr "Inviterer deg til dette rommet"
-#: ../libempathy-gtk/empathy-contact-menu.c:593
+#: ../libempathy-gtk/empathy-contact-menu.c:596
msgid "_Invite to chat room"
msgstr "_Inviter til praterom"
@@ -1472,7 +1447,7 @@ msgid "Select"
msgstr "Velg"
#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1072
msgid "Group"
msgstr "Gruppe"
@@ -1854,15 +1829,15 @@ msgstr "Tøm"
msgid "Blue"
msgstr "Blå"
-#: ../libempathy-gtk/empathy-ui-utils.c:1550
+#: ../libempathy-gtk/empathy-ui-utils.c:1517
msgid "Unable to open URI"
msgstr "Kan ikke åpne URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1667
+#: ../libempathy-gtk/empathy-ui-utils.c:1634
msgid "Select a file"
msgstr "Velg en fil"
-#: ../libempathy-gtk/empathy-ui-utils.c:1731
+#: ../libempathy-gtk/empathy-ui-utils.c:1698
msgid "Select a destination"
msgstr "Velg en destinasjon"
@@ -2049,15 +2024,15 @@ msgstr "Ingen feilmelding"
msgid "Instant Message (Empathy)"
msgstr "Lynmelding (Empathy)"
-#: ../src/empathy.c:584
+#: ../src/empathy.c:598
msgid "Don't connect on startup"
msgstr "Ikke koble til ved oppstart"
-#: ../src/empathy.c:588
+#: ../src/empathy.c:602
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Ikke vis kontaktlisten eller andre dialoger ved oppstart"
-#: ../src/empathy.c:600
+#: ../src/empathy.c:614
msgid "- Empathy IM Client"
msgstr "- Empathy lynmeldingsprogram"
@@ -2135,7 +2110,7 @@ msgstr ""
"avslutte assistenten og legge til kontoer senere fra Rediger-menyen."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1303
+#: ../src/empathy-account-assistant.c:1308
msgid "An error occurred"
msgstr "En feil oppsto"
@@ -2144,36 +2119,36 @@ msgstr "En feil oppsto"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:579
#, c-format
msgid "New %s account"
msgstr "Ny %s-konto"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:507
msgid "What kind of chat account do you have?"
msgstr "Hvilken type konto har du?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:513
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Har du noen andre lynmeldingskontoer du vil sette opp?"
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:519
msgid "Enter your account details"
msgstr "Oppgi detaljer for konto"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:524
msgid "What kind of chat account do you want to create?"
msgstr "Hvilken type lynmeldingskonto vil du lage?"
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:530
msgid "Do you want to create other chat accounts?"
msgstr "Vil du lage flere lynmeldingskontoer?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:537
msgid "Enter the details for the new account"
msgstr "Oppgi detaljer for den nye kontoen"
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:652
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2185,41 +2160,41 @@ msgstr ""
"prateprogrammer. Hvis du har en mikrofon eller et nettkamera kan du også ha "
"lyd- og bildesamtaler."
-#: ../src/empathy-account-assistant.c:670
+#: ../src/empathy-account-assistant.c:669
msgid "Do you have an account you've been using with another chat program?"
msgstr "Har du en konto som du har brukt med et annet lynmeldingsprogram?"
-#: ../src/empathy-account-assistant.c:693
+#: ../src/empathy-account-assistant.c:692
msgid "Yes, import my account details from "
msgstr "Ja, importer mine kontodetaljer fra "
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:713
msgid "Yes, I'll enter my account details now"
msgstr "Ja, jeg vil skrive inn mine kontodetaljer nå"
-#: ../src/empathy-account-assistant.c:736
+#: ../src/empathy-account-assistant.c:735
msgid "No, I want a new account"
msgstr "Nei, jeg vil ha en ny konto"
-#: ../src/empathy-account-assistant.c:746
+#: ../src/empathy-account-assistant.c:745
msgid "No, I just want to see people online nearby for now"
msgstr "Nei, jeg vil bare se personer i nærheten foreløpig"
-#: ../src/empathy-account-assistant.c:767
+#: ../src/empathy-account-assistant.c:766
msgid "Select the accounts you want to import:"
msgstr "Velg kontoer du vil importere:"
-#: ../src/empathy-account-assistant.c:851
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-account-assistant.c:850
+#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:608
msgid "Yes"
msgstr "Ja"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:857
msgid "No, that's all for now"
msgstr "Nei, det var alt for nå"
-#: ../src/empathy-account-assistant.c:1117
+#: ../src/empathy-account-assistant.c:1122
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
@@ -2227,16 +2202,16 @@ msgid ""
"disable this feature by using the 'Accounts' dialog"
msgstr ""
-#: ../src/empathy-account-assistant.c:1123
-#: ../src/empathy-account-assistant.c:1179
+#: ../src/empathy-account-assistant.c:1128
+#: ../src/empathy-account-assistant.c:1184
msgid "Edit->Accounts"
msgstr "Rediger->Kontoer"
-#: ../src/empathy-account-assistant.c:1139
+#: ../src/empathy-account-assistant.c:1144
msgid "I don't want to enable this feature for now"
msgstr "Jeg vil ikke slå på denne funksjonen ennå"
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1180
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2244,66 +2219,66 @@ msgid ""
"the Accounts dialog"
msgstr ""
-#: ../src/empathy-account-assistant.c:1181
+#: ../src/empathy-account-assistant.c:1186
msgid "telepathy-salut not installed"
msgstr "telepathy-salut er ikke installert"
-#: ../src/empathy-account-assistant.c:1227
+#: ../src/empathy-account-assistant.c:1232
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Assistent for meldings- og VoIP-kontoer"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1266
msgid "Welcome to Empathy"
msgstr "Velkommen til Empathy"
-#: ../src/empathy-account-assistant.c:1270
+#: ../src/empathy-account-assistant.c:1275
msgid "Import your existing accounts"
msgstr "Importer dine eksisterende kontoer"
-#: ../src/empathy-account-assistant.c:1288
+#: ../src/empathy-account-assistant.c:1293
msgid "Please enter personal details"
msgstr "Vennligst oppgi personlige detaljer"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:66
+#: ../src/empathy-accounts-dialog.c:65
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "Det finnes ikke-lagrede endringer for din %s-konto."
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:70
+#: ../src/empathy-accounts-dialog.c:69
msgid "Your new account has not been saved yet."
msgstr "Din nye konto er ikke lagret ennå."
-#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:262 ../src/empathy-call-window.c:789
msgid "Connecting…"
msgstr "Kobler til..."
-#: ../src/empathy-accounts-dialog.c:290
+#: ../src/empathy-accounts-dialog.c:289
#, c-format
msgid "Disconnected — %s"
msgstr "Koblet fra - %s"
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:294
#, c-format
msgid "Offline — %s"
msgstr "Frakoblet - %s"
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:307
msgid "Offline — No Network Connection"
msgstr "Frakoblet - Ingen nettverkstilkobling"
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:315
msgid "Unknown Status"
msgstr "Ukjent status"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:326
msgid "Offline — Account Disabled"
msgstr "Frakoblet - Konto deaktivert"
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:767
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2311,16 +2286,16 @@ msgstr ""
"Du er i ferd med å lage en ny konto hvilket vil forkaste\n"
"dine endringer. Er du sikker på at du vil fortsette?"
-#: ../src/empathy-accounts-dialog.c:1115
+#: ../src/empathy-accounts-dialog.c:1114
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Vil du fjerne %s fra din datamaskin?"
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1118
msgid "This will not remove your account on the server."
msgstr "Dette vil ikke fjerne din konto på tjeneren."
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1355
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2328,7 +2303,7 @@ msgstr ""
"Du er i ferd med å velge en annen konto hvilket vil forkaste\n"
"dine endringer. Er du sikker på at du vil fortsette?"
-#: ../src/empathy-accounts-dialog.c:1933
+#: ../src/empathy-accounts-dialog.c:1932
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2360,62 +2335,66 @@ msgstr "_Legg til..."
msgid "_Import…"
msgstr "Importer"
-#: ../src/empathy-call-window.c:453
+#: ../src/empathy-auto-salut-account-helper.c:77
+msgid "People nearby"
+msgstr "Personer i nærheten"
+
+#: ../src/empathy-call-window.c:462
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:465
msgid "Brightness"
msgstr "Lysstyrke"
-#: ../src/empathy-call-window.c:459
+#: ../src/empathy-call-window.c:468
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:567
+#: ../src/empathy-call-window.c:573
msgid "Volume"
msgstr "Volum"
-#: ../src/empathy-call-window.c:1022
+#: ../src/empathy-call-window.c:1120
msgid "_Sidebar"
msgstr "_Sidelinje"
-#: ../src/empathy-call-window.c:1041
+#: ../src/empathy-call-window.c:1139
msgid "Audio input"
msgstr "Lydinngang"
-#: ../src/empathy-call-window.c:1045
+#: ../src/empathy-call-window.c:1143
msgid "Video input"
msgstr "Videoinngang"
-#: ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1147
msgid "Dialpad"
msgstr "Nummertavle"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1117
+#: ../src/empathy-call-window.c:1218
#, c-format
msgid "Call with %s"
msgstr "Samtale med %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1198
+#: ../src/empathy-call-window.c:1299
msgid "Call"
msgstr "Ring"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1695
+#: ../src/empathy-call-window.c:1956
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Koblet til - %d:%02dm"
-#: ../src/empathy-call-window.c:1756
+#: ../src/empathy-call-window.c:2017
msgid "Technical Details"
msgstr "Tekniske detaljer"
-#: ../src/empathy-call-window.c:1794
+#: ../src/empathy-call-window.c:2055
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2424,7 +2403,7 @@ msgstr ""
"Programvaren til %s forstår ikke noen av lydformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:1799
+#: ../src/empathy-call-window.c:2060
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2433,7 +2412,7 @@ msgstr ""
"Programvaren til %s forstår ikke noen av videoformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:1805
+#: ../src/empathy-call-window.c:2066
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2442,25 +2421,25 @@ msgstr ""
"Kan ikke etablere tilkobling til %s. En av dere kan være på et nettverk som "
"ikke tillater direkte tilkoblinger."
-#: ../src/empathy-call-window.c:1811
+#: ../src/empathy-call-window.c:2072
msgid "There was a failure on the network"
msgstr "Det oppsto en feil på nettverket"
-#: ../src/empathy-call-window.c:1815
+#: ../src/empathy-call-window.c:2076
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Lydformatene som kreves for denne samtalen er ikke installert på din "
"datamaskin"
-#: ../src/empathy-call-window.c:1818
+#: ../src/empathy-call-window.c:2079
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Videoformatene som kreves for denne samtalen er ikke installert på din "
"datamaskin"
-#: ../src/empathy-call-window.c:1828
+#: ../src/empathy-call-window.c:2089
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2468,15 +2447,15 @@ msgid ""
"the Help menu."
msgstr ""
-#: ../src/empathy-call-window.c:1836
+#: ../src/empathy-call-window.c:2097
msgid "There was a failure in the call engine"
msgstr "Det oppsto en feil i samtalemotoren"
-#: ../src/empathy-call-window.c:1875
+#: ../src/empathy-call-window.c:2136
msgid "Can't establish audio stream"
msgstr "Kan ikke etablere lydstrøm"
-#: ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:2146
msgid "Can't establish video stream"
msgstr "Kan ikke etablere videostrøm"
@@ -2548,35 +2527,35 @@ msgstr "Forhåndsvis video"
msgid "_View"
msgstr "_Vis"
-#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#: ../src/empathy-chat-window.c:440 ../src/empathy-chat-window.c:460
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/empathy-chat-window.c:448
+#: ../src/empathy-chat-window.c:452
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:468
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/empathy-chat-window.c:473
+#: ../src/empathy-chat-window.c:477
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/empathy-chat-window.c:676
+#: ../src/empathy-chat-window.c:680
msgid "Typing a message."
msgstr "Skriver en melding"
@@ -2648,6 +2627,10 @@ msgstr "Vi_s kontaktliste"
msgid "_Tabs"
msgstr "_Faner"
+#: ../src/empathy-chat-window.ui.h:18
+msgid "_Undo Close Tab"
+msgstr ""
+
#: ../src/empathy-chatrooms-window.c:256
msgid "Name"
msgstr "Navn"
@@ -2893,23 +2876,23 @@ msgstr "Kilde"
msgid "%s account"
msgstr "%s-konto"
-#: ../src/empathy-main-window.c:437
+#: ../src/empathy-main-window.c:440
msgid "Reconnect"
msgstr "Koble til på nytt"
-#: ../src/empathy-main-window.c:443
+#: ../src/empathy-main-window.c:446
msgid "Edit Account"
msgstr "Rediger konto"
-#: ../src/empathy-main-window.c:449
+#: ../src/empathy-main-window.c:452
msgid "Close"
msgstr "Lukk"
-#: ../src/empathy-main-window.c:1033
+#: ../src/empathy-main-window.c:1055
msgid "Contact"
msgstr "Kontakt"
-#: ../src/empathy-main-window.c:1414
+#: ../src/empathy-main-window.c:1436
msgid "Show and edit accounts"
msgstr "Vis og rediger kontoer"
@@ -2997,17 +2980,17 @@ msgstr "Personlig _informasjon"
msgid "_Room"
msgstr "_Rom"
-#: ../src/empathy-new-chatroom-dialog.c:338
+#: ../src/empathy-new-chatroom-dialog.c:379
msgid "Chat Room"
msgstr "Samtalerom"
-#: ../src/empathy-new-chatroom-dialog.c:354
+#: ../src/empathy-new-chatroom-dialog.c:395
msgid "Members"
msgstr "Medlemmer"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:539
+#: ../src/empathy-new-chatroom-dialog.c:605
#, c-format
msgid ""
"<b>%s</b>\n"
@@ -3020,16 +3003,16 @@ msgstr ""
"Passord kreves: %s\n"
"Medlemmer: %s"
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:608
msgid "No"
msgstr "Nei"
-#: ../src/empathy-new-chatroom-dialog.c:569
+#: ../src/empathy-new-chatroom-dialog.c:635
msgid "Could not start room listing"
msgstr "Kunne ikke starte romliste"
-#: ../src/empathy-new-chatroom-dialog.c:579
+#: ../src/empathy-new-chatroom-dialog.c:645
msgid "Could not stop room listing"
msgstr "Kune ikke stoppe romliste"
@@ -3226,7 +3209,7 @@ msgstr "_Publiser lokasjon til mine kontakter"
msgid "_Reduce location accuracy"
msgstr "_Reduser nøyaktighet for lokasjon"
-#: ../src/empathy-status-icon.c:176
+#: ../src/empathy-status-icon.c:178
msgid "Respond"
msgstr "Svar"
@@ -3242,63 +3225,63 @@ msgstr "_Avslutt"
msgid "Contact Map View"
msgstr "Kartvisning for kontakter"
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1078
msgid "Save"
msgstr "Lagre"
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1251
msgid "Debug Window"
msgstr "Feilsøkingsvindu"
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1331
msgid "Pause"
msgstr "Pause"
-#: ../src/empathy-debug-window.c:1311
+#: ../src/empathy-debug-window.c:1343
msgid "Level "
msgstr "Nivå "
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1363
msgid "Debug"
msgstr "Feilsøk"
-#: ../src/empathy-debug-window.c:1337
+#: ../src/empathy-debug-window.c:1369
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+#: ../src/empathy-debug-window.c:1375 ../src/empathy-debug-window.c:1424
msgid "Message"
msgstr "Melding"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1381
msgid "Warning"
msgstr "Advarsel"
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1387
msgid "Critical"
msgstr "Kritisk"
-#: ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1393
msgid "Error"
msgstr "Feil"
-#: ../src/empathy-debug-window.c:1380
+#: ../src/empathy-debug-window.c:1412
msgid "Time"
msgstr "Tid"
-#: ../src/empathy-debug-window.c:1383
+#: ../src/empathy-debug-window.c:1415
msgid "Domain"
msgstr "Domene"
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1417
msgid "Category"
msgstr "Kategori"
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1419
msgid "Level"
msgstr "Nivå"
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1456
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
diff --git a/src/Makefile.am b/src/Makefile.am
index 9b35e9bc1..41020dd11 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,6 +66,7 @@ libempathy_accounts_panel_la_SOURCES = \
libempathy_accounts_panel_la_CPPFLAGS = \
$(CPPFLAGS_COMMON) \
$(CONTROL_CENTER_EMBEDDING_CFLAGS) \
+ -DLOCALEDIR=\""$(datadir)/locale"\" \
$(NULL)
libempathy_accounts_panel_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'
diff --git a/src/cc-empathy-accounts-panel.c b/src/cc-empathy-accounts-panel.c
index d69325b7b..e22dc0c11 100644
--- a/src/cc-empathy-accounts-panel.c
+++ b/src/cc-empathy-accounts-panel.c
@@ -151,6 +151,10 @@ cc_empathy_accounts_panel_init (CcEmpathyAccountsPanel *panel)
void
cc_empathy_accounts_panel_register (GIOModule *module)
{
+ /* Setup gettext */
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
cc_empathy_accounts_panel_register_type (G_TYPE_MODULE (module));
g_io_extension_point_implement (CC_PANEL_EXTENSION_POINT_NAME,
CC_TYPE_EMPATHY_ACCOUNTS_PANEL, "empathy-accounts", 10);
diff --git a/src/empathy-accounts-module.c b/src/empathy-accounts-module.c
index 76a747804..e83b357c5 100644
--- a/src/empathy-accounts-module.c
+++ b/src/empathy-accounts-module.c
@@ -30,8 +30,6 @@
void
g_io_module_load (GIOModule *module)
{
- textdomain (GETTEXT_PACKAGE);
-
cc_empathy_accounts_panel_register (module);
}