aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS54
-rw-r--r--configure.ac118
-rw-r--r--data/empathy.convert1
-rw-r--r--data/org.gnome.Empathy.gschema.xml.in5
-rw-r--r--extensions/Channel_Interface_Conference.xml635
-rw-r--r--extensions/Makefile.am1
-rw-r--r--extensions/misc.xml1
-rw-r--r--help/.gitignore2
-rw-r--r--help/C/create-account.page5
-rw-r--r--help/C/geolocation-turn.page2
-rw-r--r--help/C/irc-start-conversation.page2
-rw-r--r--help/Makefile.am2
-rw-r--r--help/de/de.po844
-rw-r--r--help/el/el.po342
-rw-r--r--help/es/es.po44
-rw-r--r--help/fr/fr.po17
-rw-r--r--help/gl/gl.po31
-rw-r--r--help/hu/hu.po3383
-rw-r--r--help/it/it.po646
-rw-r--r--libempathy-gtk/Makefile.am2
-rw-r--r--libempathy-gtk/empathy-account-widget-irc.ui1
-rw-r--r--libempathy-gtk/empathy-avatar-image.c6
-rw-r--r--libempathy-gtk/empathy-cell-renderer-activatable.c15
-rw-r--r--libempathy-gtk/empathy-cell-renderer-expander.c20
-rw-r--r--libempathy-gtk/empathy-cell-renderer-text.c18
-rw-r--r--libempathy-gtk/empathy-chat-text-view.c4
-rw-r--r--libempathy-gtk/empathy-chat.c40
-rw-r--r--libempathy-gtk/empathy-contact-dialogs.c4
-rw-r--r--libempathy-gtk/empathy-contact-dialogs.ui1
-rw-r--r--libempathy-gtk/empathy-contact-list-view.c4
-rw-r--r--libempathy-gtk/empathy-contact-menu.c1
-rw-r--r--libempathy-gtk/empathy-contact-selector-dialog.c2
-rw-r--r--libempathy-gtk/empathy-contact-widget.c63
-rw-r--r--libempathy-gtk/empathy-geometry.c109
-rw-r--r--libempathy-gtk/empathy-geometry.h9
-rw-r--r--libempathy-gtk/empathy-groups-widget.c3
-rw-r--r--libempathy-gtk/empathy-individual-dialogs.c1
-rw-r--r--libempathy-gtk/empathy-individual-edit-dialog.c1
-rw-r--r--libempathy-gtk/empathy-individual-information-dialog.c1
-rw-r--r--libempathy-gtk/empathy-individual-linker.c26
-rw-r--r--libempathy-gtk/empathy-individual-menu.c2
-rw-r--r--libempathy-gtk/empathy-individual-view.c4
-rw-r--r--libempathy-gtk/empathy-individual-widget.c4
-rw-r--r--libempathy-gtk/empathy-irc-network-chooser-dialog.c3
-rw-r--r--libempathy-gtk/empathy-kludge-label.c92
-rw-r--r--libempathy-gtk/empathy-kludge-label.h53
-rw-r--r--libempathy-gtk/empathy-linking-dialog.c1
-rw-r--r--libempathy-gtk/empathy-live-search.c18
-rw-r--r--libempathy-gtk/empathy-presence-chooser.c4
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.c110
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.h11
-rw-r--r--libempathy-gtk/empathy-search-bar.c24
-rw-r--r--libempathy-gtk/empathy-search-bar.ui4
-rw-r--r--libempathy-gtk/empathy-status-preset-dialog.c1
-rw-r--r--libempathy-gtk/empathy-ui-utils.c10
-rw-r--r--libempathy-gtk/empathy-ui-utils.h16
-rw-r--r--libempathy-gtk/empathy-video-widget.c22
-rw-r--r--libempathy/empathy-account-settings.c54
-rw-r--r--libempathy/empathy-account-settings.h4
-rw-r--r--libempathy/empathy-contact.c111
-rw-r--r--libempathy/empathy-gsettings.h1
-rw-r--r--libempathy/empathy-tls-verifier.c5
-rw-r--r--libempathy/empathy-tp-chat.c12
-rw-r--r--libempathy/empathy-tp-roomlist.c76
-rw-r--r--libempathy/empathy-utils.c34
-rw-r--r--libempathy/empathy-utils.h1
-rw-r--r--po/POTFILES.in2
-rw-r--r--po/ar.po567
-rw-r--r--po/bg.po1957
-rw-r--r--po/cs.po112
-rw-r--r--po/da.po112
-rw-r--r--po/de.po415
-rw-r--r--po/el.po642
-rw-r--r--po/en_GB.po112
-rw-r--r--po/es.po578
-rw-r--r--po/et.po21
-rw-r--r--po/eu.po1926
-rw-r--r--po/fr.po321
-rw-r--r--po/gl.po335
-rw-r--r--po/he.po338
-rw-r--r--po/hu.po342
-rw-r--r--po/it.po126
-rw-r--r--po/ja.po85
-rw-r--r--po/lt.po325
-rw-r--r--po/nb.po127
-rw-r--r--po/nl.po2098
-rw-r--r--po/pa.po329
-rw-r--r--po/pl.po1933
-rw-r--r--po/pt.po141
-rw-r--r--po/pt_BR.po350
-rw-r--r--po/ro.po2561
-rw-r--r--po/ru.po1751
-rw-r--r--po/sl.po760
-rw-r--r--po/zh_CN.po93
-rw-r--r--po/zh_HK.po83
-rw-r--r--po/zh_TW.po83
-rw-r--r--src/Makefile.am9
-rw-r--r--src/empathy-about-dialog.c14
-rw-r--r--src/empathy-account-assistant.c60
-rw-r--r--src/empathy-accounts-dialog.c83
-rw-r--r--src/empathy-accounts.c10
-rw-r--r--src/empathy-auto-salut-account-helper.c2
-rw-r--r--src/empathy-call-window-fullscreen.c27
-rw-r--r--src/empathy-call-window.c87
-rw-r--r--src/empathy-chat-window.c127
-rw-r--r--src/empathy-chat-window.h18
-rw-r--r--src/empathy-debug-window.c4
-rw-r--r--src/empathy-ft-manager.c4
-rw-r--r--src/empathy-ft-manager.ui1
-rw-r--r--src/empathy-import-dialog.c5
-rw-r--r--src/empathy-main-window.c3
-rw-r--r--src/empathy-new-chatroom-dialog.ui1
-rw-r--r--src/empathy-preferences.c5
-rw-r--r--src/empathy-sidebar.c608
-rw-r--r--src/empathy-sidebar.h85
-rw-r--r--src/empathy-status-icon.c2
-rw-r--r--src/empathy.c10
-rw-r--r--src/ev-sidebar.c338
-rw-r--r--src/ev-sidebar.h76
119 files changed, 16361 insertions, 10986 deletions
diff --git a/NEWS b/NEWS
index c05ac9086..9beea0bd0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,57 @@
+NEW in 2.32.0 (27/09/2010)
+=============
+
+Not a lot of code changes since 2.31.92 as we were in hard code freeze but we
+still fixed 2 crashes.
+Most of the work has been done by the awesome GNOME Translation Team. Thanks
+to them Empathy 2.32.0 is translated in more than 30 languages.
+See http://l10n.gnome.org/module/empathy/
+
+Bugs fixed:
+ - Fixed #629380, Double contacts after adding new contact in group "Ungrouped" (Philip Withnall)
+ - Fixed #629736, Blacklist Haze's sip protocol (Guillaume Desmottes)
+ - Fixed #629957, Failed assertion in contact_widget_details_feature_prepared_cb() (Guillaume Desmottes)
+ - Fixed #630168, empathy-accounts assert failure: *** glibc detected *** /usr/bin/empathy-accounts: free(): invalid pointer: 0x0809d5b6 *** (Guillaume Desmottes)
+ - Fixed #630214, File missing from POTFILES.in (Gabor Kelemen)
+ - Fixed #630400, Untranslatable strings (Gabor Kelemen)
+ - Fixed #630476, Typo in user guide: witn (Gabor Kelemen)
+
+Translations:
+ - Updated an Translation (Daniel Martinez Cucalon)
+ - Updated ar Translation (Khaled Hosny)
+ - Updated bg Translation (Damyan Ivanov)
+ - Updated cs Translation (Marek Černocký)
+ - Updated da Translation (Kenneth Nielsen)
+ - Updated de Translation (Christian Kirbach)
+ - Updated en_GB Translation (Bruce Cowan)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated eu Translation (Inaki Larranaga Murgoitio)
+ - Updated fr Translation (Claude Paroz)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated hu Translation (Gabor Kelemen)
+ - Updated it Translation (Milo Casagrande)
+ - Updated ja Translation (Takayuki KUSANO)
+ - Updated lt Translation (Žygimantas BeruÄka)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated pa Translation (A S Alam)
+ - Updated pl Translation (Piotr DrÄ…g)
+ - Updated pt_BR Translation (Djavan Fagundes)
+ - Updated pt Translation (Duarte Loreto)
+ - Updated ro Translation (Lucian Adrian Grijincu)
+ - Updated ru Translation (Yuri Myasoedov)
+ - Updated sl Translation (Matej UrbanÄiÄ)
+ - Updated zh_CN Translation (Xhacker Liu, Aron Xu)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+
+Documentation translations:
+ - Updated de Documentation translation (Mario Blättermann, Christian Kirbach)
+ - Updated es Documentation translation (Jorge González)
+ - Updated fr Documentation translation (Claude Paroz)
+ - Updated gl Documentation translation (Fran Diéguez)
+ - Updated hu Documentation translation (Gabor Kelemen)
+
NEW in 2.31.92 (14/09/2010)
==============
diff --git a/configure.ac b/configure.ac
index 40ce9922e..e44f28090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl If not 1, append datestamp to the version number
m4_define(empathy_released, 0)
m4_define([empathy_major_version], [2])
-m4_define([empathy_minor_version], [31])
-m4_define([empathy_micro_version], [92])
+m4_define([empathy_minor_version], [90])
+m4_define([empathy_micro_version], [99])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
@@ -35,28 +35,26 @@ FOLKS_REQUIRED=0.1.15
GCONF_REQUIRED=1.2.0
GLIB_REQUIRED=2.25.9
GNUTLS_REQUIRED=2.8.5
-GTK_REQUIRED=2.21.2
+GTK_REQUIRED=2.90.8
KEYRING_REQUIRED=2.26.0
LIBCANBERRA_GTK_REQUIRED=0.4
-LIBNOTIFY_REQUIRED=0.4.4
-LIBNOTIFY_REQUIRED_GTK3=0.5.1
+LIBNOTIFY_REQUIRED=0.5.1
TELEPATHY_FARSIGHT_REQUIRED=0.0.14
-TELEPATHY_GLIB_REQUIRED=0.11.15
+TELEPATHY_GLIB_REQUIRED=0.11.16
TELEPATHY_LOGGER=0.1.5
UNIQUE_REQUIRED=1.1.2
# Optionnal deps
-CLUTTER_GTK_REQUIRED=0.10
+CLUTTER_GTK_REQUIRED=0.90.3
ENCHANT_REQUIRED=1.2.0
GEOCLUE_REQUIRED=0.11
ISO_CODES_REQUIRED=0.35
LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
LIBCHAMPLAIN_REQUIRED=0.7.1
-NAUTILUS_SENDTO_REQUIRED=2.31.7
-NAUTILUS_SENDTO_REQUIRED_GTK3=2.90.0
+NAUTILUS_SENDTO_REQUIRED=2.90.0
NETWORK_MANAGER_REQUIRED=0.7.0
WEBKIT_REQUIRED=1.1.15
-GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4
+GNOME_CONTROL_CENTER_REQUIRED=2.31.4
# Use --enable-maintainer-mode to disable deprecated symbols,
# disable single include and enable GSEAL. If this is not a released empathy,
@@ -180,47 +178,12 @@ fi
# -----------------------------------------------------------
# GTK+
# -----------------------------------------------------------
-AC_ARG_ENABLE(gtk3,
- AS_HELP_STRING([--enable-gtk3=@<:@no/yes/auto@:>@],
- [build with GTK+3]), ,
- enable_gtk3=auto)
-
-# Try to use GTK+3 if available
-if test "x$enable_gtk3" != "xno"; then
- PKG_CHECK_MODULES(GTK,
- [
- gtk+-3.0 >= $GTK_REQUIRED
- ], have_gtk3="yes", have_gtk3="no")
-else
- have_gtk3="no"
-fi
-
-if test "x$enable_gtk3" = "xyes" -a "x$have_gtk3" != "xyes"; then
- AC_MSG_ERROR([Could not find gtk3 dependencies.])
-fi
-
-if test "x$have_gtk3" == "xyes"; then
- # GTK3 specific deps
- PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
- PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_GTK3)
- PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED)
- PKG_CHECK_MODULES(GCR, gcr-3 >= $KEYRING_REQUIRED)
-
- AC_DEFINE(HAVE_GTK3, 1, [Define if we're compiling against GTK+ 3])
-else
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
-
- # GTK2 specific deps
- PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED)
- PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
- PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
- PKG_CHECK_MODULES(GCR, gcr-0 >= $KEYRING_REQUIRED)
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
- # Enable GSEAL checks if needed
- if test $USE_MAINTAINER_MODE = yes; then
- AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors])
- fi
-fi
+PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
+PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
+PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED)
+PKG_CHECK_MODULES(GCR, gcr-3 >= $KEYRING_REQUIRED)
# -----------------------------------------------------------
# Enable debug
@@ -301,14 +264,8 @@ AC_ARG_ENABLE(webkit,
enable_webkit=auto)
if test "x$enable_webkit" != "xno"; then
-
- if test "x$have_gtk3" == "xno"; then
- PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= $WEBKIT_REQUIRED],
- have_webkit="yes", have_webkit="no")
- else
- PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_REQUIRED],
- have_webkit="yes", have_webkit="no")
- fi
+ PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_REQUIRED],
+ have_webkit="yes", have_webkit="no")
if test "x$have_webkit" = "xyes"; then
AC_DEFINE(HAVE_WEBKIT, 1, [Define if you have libwebkitgtk])
@@ -370,17 +327,13 @@ AC_ARG_ENABLE(map,
if test "x$enable_map" != "xno"; then
- if test "x$have_gtk3" == "xno"; then
- PKG_CHECK_MODULES(LIBCHAMPLAIN,
- [
- champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
- champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
- clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
- ], have_libchamplain="yes", have_libchamplain="no")
- else
- # FIXME: check deps once clutter-gtk and champlain have been ported to GTK3
- have_libchamplain="no"
- fi
+ PKG_CHECK_MODULES(LIBCHAMPLAIN,
+ [
+ champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
+# champplain-gtk3 doesn't exist. Fix the name once bgo #631009
+ champlain-gtk3-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
+ clutter-gtk >= $CLUTTER_GTK_REQUIRED
+ ], have_libchamplain="yes", have_libchamplain="no")
if test "x$have_libchamplain" = "xyes"; then
AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [Define if you have libchamplain])
@@ -462,19 +415,10 @@ AC_ARG_ENABLE(nautilus-sendto,
enable_nautilus_sendto=auto)
if test "x$enable_nautilus_sendto" != "xno"; then
- if test "x$have_gtk3" == "xno"; then
- # Newer NST requires GTK+3 so we can't use it
- PKG_CHECK_MODULES(NST,
- [
- nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
- nautilus-sendto < 2.90.0
- ], have_nst="yes", have_nst="no")
- else
- PKG_CHECK_MODULES(NST,
- [
- nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED_GTK3
- ], have_nst="yes", have_nst="no")
- fi
+ PKG_CHECK_MODULES(NST,
+ [
+ nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
+ ], have_nst="yes", have_nst="no")
else
have_nst=no
fi
@@ -495,13 +439,8 @@ AC_ARG_ENABLE(control_center_embedding,
if test "x$enable_control_center_embedding" != "xno"; then
- if test "x$have_gtk3" == "xno"; then
- PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center < GNOME_CONTROL_CENTER_GTK3_REQUIRED],
- have_control_center_embedding="yes", have_control_center_embedding="no")
- else
- PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center >= GNOME_CONTROL_CENTER_GTK3_REQUIRED],
- have_control_center_embedding="yes", have_control_center_embedding="no")
- fi
+ PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center >= GNOME_CONTROL_CENTER_REQUIRED],
+ have_control_center_embedding="yes", have_control_center_embedding="no")
if test "x$have_control_center_embedding" = "xyes"; then
AC_DEFINE(HAVE_CONTROL_CENTER_EMBEDDING, 1, [Define if you have the single-window control center])
@@ -564,7 +503,6 @@ Configure summary:
Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS}
Prefix......................: ${prefix}
Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS}
- Use GTK+3...................: ${have_gtk3}
Features:
Spell checking (enchant)....: ${have_enchant}
diff --git a/data/empathy.convert b/data/empathy.convert
index 02ef97137..71353248a 100644
--- a/data/empathy.convert
+++ b/data/empathy.convert
@@ -4,7 +4,6 @@
use-conn = /apps/empathy/use_conn
autoconnect = /apps/empathy/autoconnect
autoaway = /apps/empathy/autoaway
-import-asked = /apps/empathy/import_asked
butterfly-logs-migrated = /apps/empathy/butterfly_logs_migrated
file-transfer-default-folder = /apps/empathy/file_transfer_default_folder
diff --git a/data/org.gnome.Empathy.gschema.xml.in b/data/org.gnome.Empathy.gschema.xml.in
index 27a8cb375..f889adf95 100644
--- a/data/org.gnome.Empathy.gschema.xml.in
+++ b/data/org.gnome.Empathy.gschema.xml.in
@@ -15,11 +15,6 @@
<_summary>Empathy should auto-away when idle</_summary>
<_description>Whether Empathy should go into away mode automatically if the user is idle.</_description>
</key>
- <key name="import-asked" type="b">
- <default>false</default>
- <_summary>Empathy has asked about importing accounts</_summary>
- <_description>Whether Empathy has asked about importing accounts from other programs.</_description>
- </key>
<key name="butterfly-logs-migrated" type="b">
<default>false</default>
<_summary>Empathy has migrated butterfly logs</_summary>
diff --git a/extensions/Channel_Interface_Conference.xml b/extensions/Channel_Interface_Conference.xml
deleted file mode 100644
index afb99c5ca..000000000
--- a/extensions/Channel_Interface_Conference.xml
+++ /dev/null
@@ -1,635 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/Channel_Interface_Conference"
- xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
- <tp:copyright>Copyright © 2009 Collabora Limited</tp:copyright>
- <tp:copyright>Copyright © 2009 Nokia Corporation</tp:copyright>
- <tp:license xmlns="http://www.w3.org/1999/xhtml">
- <p>This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.</p>
-
- <p>This library 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
- Lesser General Public License for more details.</p>
-
- <p>You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.</p>
- </tp:license>
- <interface
- name="org.freedesktop.Telepathy.Channel.Interface.Conference">
- <tp:added version="0.19.13">(as stable API)</tp:added>
- <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
- <tp:requires
- interface="org.freedesktop.Telepathy.Channel.Interface.Group"/>
-
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>An interface for multi-user conference channels that can "continue
- from" one or more individual channels. This could be used to invite
- other contacts to an existing 1-1 text conversation, combine two phone
- calls into one conference call, and so on, with roughly the same API in
- each case.</p>
-
- <tp:rationale>
- <p>This interface addresses freedesktop.org <a
- href="http://bugs.freedesktop.org/show_bug.cgi?id=24906">bug
- #24906</a> (GSM-compatible conference calls) and <a
- href="http://bugs.freedesktop.org/show_bug.cgi?id=24939">bug
- #24939</a> (upgrading calls and chats to multi-user).
- See those bugs for more rationale and use cases.</p>
- </tp:rationale>
-
- <p>Existing channels are upgraded by requesting a new channel of the same
- <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Channel">ChannelType</tp:dbus-ref>,
- listing the channels to be merged into the new conference in the
- <tp:member-ref>InitialChannels</tp:member-ref> property of the request.
- If <tp:member-ref>InitialInviteeHandles</tp:member-ref> and
- <tp:member-ref>InitialInviteeIDs</tp:member-ref> are
- <var>Allowed_Properties</var> in <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref>,
- ad-hoc conferences to a set of contacts may be created by requesting a
- channel, specifying
- <tp:member-ref>InitialInviteeHandles</tp:member-ref> and/or
- <tp:member-ref>InitialInviteeIDs</tp:member-ref> to be the contacts in
- question. A request may specify these alongside
- <tp:member-ref>InitialChannels</tp:member-ref>, to simultaneously
- upgrade a channel to a conference and invite others to join it.</p>
-
- <p>Channels with this interface MAY also implement <tp:dbus-ref
- namespace='ofdT.Channel.Interface'>MergeableConference.DRAFT</tp:dbus-ref>
- to support merging more 1-1 channels into an ongoing conference.
- Similarly, 1-1 channels MAY implement <tp:dbus-ref
- namespace='ofdT.Channel.Interface'>Splittable.DRAFT</tp:dbus-ref> to
- support being broken out of a Conference channel.</p>
-
- <p>The <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Channel.Interface"
- >Group</tp:dbus-ref> interface on Conference channels MAY use
- channel-specific handles for participants; clients SHOULD support
- both Conferences that have channel-specific handles, and those that
- do not.</p>
-
- <tp:rationale>
- <p>In the GSM case, the Conference's Group interface MAY have
- channel-specific handles, to represent the fact that the same
- phone number may be in a conference twice (for instance, it could be
- the number of a corporate switchboard).</p>
-
- <p>In the XMPP case, the Conference's Group interface SHOULD have
- channel-specific handles, to reflect the fact that the participants
- have MUC-specific identities, and the user might also be able to see
- their global identities, or not.</p>
-
- <p>In most other cases, including MSN and link-local XMPP, the
- Conference's Group interface SHOULD NOT have channel-specific
- handles, since users' identities are always visible.</p>
- </tp:rationale>
-
- <p>Connection managers implementing channels with this interface
- MUST NOT allow the object paths of channels that could be merged
- into a Conference to be re-used, unless the channel re-using the
- object path is equivalent to the channel that previously used it.</p>
-
- <tp:rationale>
- <p>If you upgrade some channels into a conference, and then close
- the original channels, <tp:member-ref>InitialChannels</tp:member-ref>
- (which is immutable) will contain paths to channels which no longer
- exist. This implies that you should not re-use channel object paths,
- unless future incarnations of the path are equivalent.</p>
-
- <p>For instance, on protocols where you can only have
- zero or one 1-1 text channels with Emily at one time, it would
- be OK to re-use the same object path for every 1-1 text channel
- with Emily; but on protocols where this is not true, it would
- be misleading.</p>
- </tp:rationale>
-
- <h4>Examples of usage</h4>
-
- <p>A pair of 1-1 GSM calls <var>C1</var> and <var>C2</var> can be merged
- into a single conference call by calling:</p>
-
- <blockquote>
- <code><tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>({
- ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">ChannelType</tp:dbus-ref>: ...Call,
- ...<tp:member-ref>InitialChannels</tp:member-ref>: [C1, C2]
- })</code>
- </blockquote>
-
- <p>which returns a new channel <var>Cn</var> implementing the conference
- interface. (As a quirk of GSM, both 1-1 will cease to function normally
- until they are <tp:dbus-ref
- namespace="ofdT.Channel.Interface.Splittable.DRAFT">Split</tp:dbus-ref>
- from the conference, or the conference ends.)</p>
-
- <p>An XMPP 1-1 conversation <var>C3</var> (with
- <tt>chris@example.com</tt>, say) can be continued in a newly created
- multi-user chatroom by calling:</p>
-
- <blockquote>
- <code>CreateChannel({
- ...ChannelType: ...Text,
- ...<tp:member-ref>InitialChannels</tp:member-ref>: [C3]
- })</code>
- </blockquote>
-
- <p>Or, to invite <tt>emily@example.net</tt> to join the newly-created MUC
- at the same time:</p>
-
- <blockquote>
- <code>CreateChannel({
- ...ChannelType: ...Text,
- ...<tp:member-ref>InitialChannels</tp:member-ref>: [C3],
- ...<tp:member-ref>InitialInviteeIDs</tp:member-ref>: ['emily@example.net']
- })</code>
- </blockquote>
-
- <p>To continue <var>C3</var> in a particular multi-user
- chatroom (rather than the implementation inventing a unique name for
- the room), call:</p>
-
- <blockquote>
- <code><tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">EnsureChannel</tp:dbus-ref>({
- ...ChannelType: ...Text,
- ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref>: ...Room,
- ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref>: 'telepathy@conf.example.com',
- ...<tp:member-ref>InitialChannels</tp:member-ref>: [C3]
- })</code>
- </blockquote>
-
- <p>Note the use of EnsureChannel — if a channel for
- <tt>telepathy@conf.example.com</tt> is already open, this SHOULD be
- equivalent to inviting <tt>chris@example.com</tt> to the existing
- channel.</p>
-
- <p>In the above cases, the text channel <var>C3</var> SHOULD remain open
- and fully functional (until explicitly closed by a client); new
- incoming 1-1 messages from <tt>chris@example.com</tt> SHOULD appear in
- <var>C3</var>, and messages sent using <var>C3</var> MUST be relayed
- only to <tt>chris@example.com</tt>.</p>
-
- <tp:rationale>
- <p>If there is an open 1-1 text channel with a contact, in every
- other situation new messages will appear in that channel. Given
- that the old channel remains open — which is the least surprising
- behaviour, and eases us towards a beautiful world where channels
- never close themselves — it stands to reason that it should be
- where new messages from Chris should appear. On MSN, creating a
- conference from <var>C3</var> should migrate the underlying
- switchboard from <var>C3</var> to the new channel; this is an
- implementation detail, and should not affect the representation on
- D-Bus. With a suitable change of terminology, Skype has the same
- behaviour.</p>
-
- <p>If the current handler of that channel doesn't want this to happen
- (maybe it transformed the existing tab into the group chat window,
- and so there'd be no UI element still around to show new messages),
- then it should just <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Channel">Close</tp:dbus-ref> the
- old 1-1 channel; it'll respawn if necessary.</p>
- </tp:rationale>
-
- <p>Either of the XMPP cases could work for Call channels, to
- upgrade from 1-1 Jingle to multi-user Jingle. Any of the XMPP cases
- could in principle work for link-local XMPP (XEP-0174).</p>
-
- <p>XMPP and MSN do not natively have a concept of merging two or more
- channels C1, C2... into one channel, Cn. However, the GSM-style
- merging API can be supported on XMPP and MSN, as an API short-cut
- for upgrading C1 into a conference Cn (which invites the
- TargetHandle of C1 into Cn), then immediately inviting the
- TargetHandle of C2, the TargetHandle of C3, etc. into Cn as well.</p>
-
- <h4>Sample <tp:dbus-ref namespace='ofdT.Connection.Interface.Requests'
- >RequestableChannelClasses</tp:dbus-ref></h4>
-
- <p>A GSM connection might advertise the following channel class for
- conference calls:</p>
-
- <blockquote>
- <code>
-( Fixed = {<br/>
-    ...<tp:dbus-ref namespace='ofdT.Channel'>ChannelType</tp:dbus-ref>:
- ...<tp:dbus-ref namespace='ofdT.Channel.Type'>StreamedMedia</tp:dbus-ref><br/>
-  },<br/>
-  Allowed = [ <tp:member-ref>InitialChannels</tp:member-ref>,
- <tp:dbus-ref namespace='ofdT.Channel.Type.StreamedMedia'
- >InitialAudio</tp:dbus-ref>
- ]<br/>
-)
- </code>
- </blockquote>
-
- <p>This indicates support for starting audio-only conference calls by
- merging two or more existing channels (since
- <tp:member-ref>InitialInviteeHandles</tp:member-ref> and
- <tp:member-ref>InitialInviteeIDs</tp:member-ref> are not allowed).</p>
-
- <p>An XMPP connection might advertise the following classes for ad-hoc
- multi-user text chats:</p>
-
- <blockquote>
- <code>
-( Fixed = {<br/>
-    ...<tp:dbus-ref namespace='ofdT.Channel'>ChannelType</tp:dbus-ref>:
- ...<tp:dbus-ref namespace='ofdT.Channel.Type'>Text</tp:dbus-ref><br/>
-  },<br/>
-  Allowed = [ <tp:member-ref>InitialChannels</tp:member-ref>,
- <tp:member-ref>InitialInviteeHandles</tp:member-ref>,
- <tp:member-ref>InitialInviteeIDs</tp:member-ref>,
- <tp:member-ref>InvitationMessage</tp:member-ref>
- ]<br/>
-),<br/>
-( Fixed = {<br/>
-    ...<tp:dbus-ref namespace='ofdT.Channel'>ChannelType</tp:dbus-ref>:
- ...<tp:dbus-ref namespace='ofdT.Channel.Type'>Text</tp:dbus-ref>,<br/>
-    ...<tp:dbus-ref namespace='ofdT.Channel'>TargetHandleType</tp:dbus-ref>:
- Room<br/>
-  },<br/>
-  Allowed = [ <tp:dbus-ref namespace='ofdT.Channel'>TargetHandle</tp:dbus-ref>,
- <tp:dbus-ref namespace='ofdT.Channel'>TargetID</tp:dbus-ref>,<br/>
-              <tp:member-ref>InitialChannels</tp:member-ref>,
- <tp:member-ref>InitialInviteeHandles</tp:member-ref>,
- <tp:member-ref>InitialInviteeIDs</tp:member-ref>,
- <tp:member-ref>InvitationMessage</tp:member-ref>
- ]<br/>
-)
- </code>
- </blockquote>
-
- <p>The first class indicates support for starting ad-hoc (nameless) chat
- rooms, upgraded from existing 1-1 channels and/or inviting new
- contacts, along with a message to be sent along with the invitations.
- The second indicates support for upgrading to a particular named chat
- room.</p>
- </tp:docstring>
-
- <property name="Channels" tp:name-for-bindings="Channels"
- access="read" type="ao">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The individual <tp:dbus-ref
- namespace="org.freedesktop.Telepathy">Channel</tp:dbus-ref>s that
- are continued by this conference, which have the same <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Channel"
- >ChannelType</tp:dbus-ref> as this one, but with <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Channel"
- >TargetHandleType</tp:dbus-ref> = CONTACT.</p>
-
- <p>This property MUST NOT be requestable; instead, the
- <tp:member-ref>InitialChannels</tp:member-ref> property may be
- specified when requesting a channel.</p>
-
- <tp:rationale>
- <p>This is consistent with requesting
- <tp:member-ref>InitialInviteeHandles</tp:member-ref> and
- <tp:member-ref>InitialInviteeIDs</tp:member-ref>, rather than
- requesting <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Channel.Interface">Group.Members</tp:dbus-ref>
- and some hypothetical ID version of that property.</p>
- </tp:rationale>
-
- <p>Change notification is via the
- <tp:member-ref>ChannelMerged</tp:member-ref> and
- <tp:member-ref>ChannelRemoved</tp:member-ref> signals.</p>
- </tp:docstring>
- </property>
-
- <signal name="ChannelMerged" tp:name-for-bindings="Channel_Merged">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>Emitted when a new channel is added to the value of
- <tp:member-ref>Channels</tp:member-ref>.</p>
- </tp:docstring>
-
- <arg name="Channel" type="o">
- <tp:docstring>The channel that was added to
- <tp:member-ref>Channels</tp:member-ref>.</tp:docstring>
- </arg>
-
- <arg name="Channel_Specific_Handle" type="u" tp:type="Contact_Handle">
- <tp:docstring>A new channel-specific handle for the <tp:dbus-ref
- namespace="ofdT.Channel">TargetHandle</tp:dbus-ref> of
- <var>Channel</var>, as will appear in
- <tp:member-ref>OriginalChannels</tp:member-ref>, or <tt>0</tt> if a
- global handle is used for
- <var>Channel</var>'s TargetHandle on the <tp:dbus-ref
- namespace="ofdT.Channel.Interface">Group</tp:dbus-ref> interface
- of this channel.</tp:docstring>
- </arg>
-
- <arg name="Properties" type="a{sv}"
- tp:type="Qualified_Property_Value_Map">
- <tp:docstring><var>Channel</var>'s immutable properties.</tp:docstring>
- </arg>
- </signal>
-
- <signal name="ChannelRemoved" tp:name-for-bindings="Channel_Removed">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>Emitted when a channel is removed from the value of
- <tp:member-ref>Channels</tp:member-ref>, either because it closed
- or because it was split using the <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Channel.Interface"
- >Splittable.DRAFT.Split</tp:dbus-ref> method.</p>
-
- <p>If a channel is removed because it was closed, <tp:dbus-ref
- namespace='ofdT.Channel'>Closed</tp:dbus-ref> should be emitted
- before this signal.</p>
- </tp:docstring>
-
- <arg name="Channel" type="o">
- <tp:docstring>The channel that was removed from
- <tp:member-ref>Channels</tp:member-ref>.</tp:docstring>
- </arg>
-
- <arg name="Details" type="a{sv}" tp:type="String_Variant_Map">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- Additional information about the removal, which may include
- the same well-known keys as the Details argument of
- <tp:dbus-ref namespace="ofdT.Channel.Interface.Group"
- >MembersChangedDetailed</tp:dbus-ref>, with the same semantics.
- </tp:docstring>
- </arg>
- </signal>
-
- <property name="InitialChannels" tp:name-for-bindings="Initial_Channels"
- access="read" type="ao">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The initial value of <tp:member-ref>Channels</tp:member-ref>.</p>
-
- <p>This property SHOULD be requestable. Omitting it from a request is
- equivalent to providing it with an empty list as value. Requests
- where its value has at least two channel paths SHOULD be expected to
- succeed on any implementation of this interface. If
- <tp:member-ref>InitialInviteeHandles</tp:member-ref> and
- <tp:member-ref>InitialInviteeIDs</tp:member-ref> are
- <var>Allowed_Properties</var> in <tp:dbus-ref
- namespace='ofdT.Connection.Interface.Requests'
- >RequestableChannelClasses</tp:dbus-ref>, then requests with zero
- or one channel paths SHOULD also succeed; otherwise, clients SHOULD
- NOT make requests with zero or one paths for this property.</p>
-
- <tp:rationale>
- <p>In GSM, a pair of calls can be merged into a conference, but you
- can't start a conference call from zero or one existing calls. In
- XMPP and MSN, you can create a new chatroom, or upgrade one 1-1
- channel into a chatroom; however, on these protocols, it is also
- possible to fake GSM-style merging by upgrading the first channel,
- then inviting the targets of all the other channels into it.</p>
- </tp:rationale>
-
- <p>If possible, the <tp:member-ref>Channels</tp:member-ref>' states SHOULD
- NOT be altered by merging them into a conference. However, depending on
- the protocol, the Channels MAY be placed in a "frozen" state by placing
- them in this property's value or by calling
- <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Channel.Interface"
- >MergeableConference.DRAFT.Merge</tp:dbus-ref> on them.</p>
-
- <tp:rationale>
- <p>In Jingle, nothing special will happen to merged calls. UIs MAY
- automatically place calls on hold before merging them, if that is
- the desired behaviour; this SHOULD always work. Not doing
- an implicit hold/unhold seems to preserve least-astonishment.</p>
-
- <p>In GSM, the calls that are merged go into a state similar to
- Hold, but they cannot be unheld, only split from the conference
- call using <tp:dbus-ref namespace="org.freedesktop.Telepathy"
- >Channel.Interface.Splittable.DRAFT.Split</tp:dbus-ref>.</p>
- </tp:rationale>
-
- <p>Depending on the protocol, it might be signalled to remote users
- that this channel is a continuation of all the requested channels,
- or that it is only a continuation of the first channel in the
- list.</p>
-
- <tp:rationale>
- <p>In MSN, the conference steals the underlying switchboard (protocol
- construct) from one of its component channels, so the conference
- appears to remote users to be a continuation of that channel and no
- other. The connection manager has to make some arbitrary choice, so
- we arbitrarily mandate that it SHOULD choose the first channel in
- the list as the one to continue.</p>
- </tp:rationale>
-
- <p>This property is immutable.</p>
- </tp:docstring>
- </property>
-
- <property name="InitialInviteeHandles"
- tp:name-for-bindings="Initial_Invitee_Handles"
- access="read" type="au" tp:type="Contact_Handle[]">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>A list of additional contacts invited to this conference when it
- was created.</p>
-
- <p>If it is possible to invite new contacts when creating a conference
- (as opposed to merging several channels into one new conference
- channel), this property SHOULD be requestable, and appear in the allowed
- properties in <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Connection.Interface.Requests"
- >RequestableChannelClasses</tp:dbus-ref>. Otherwise, this property
- SHOULD NOT be requestable, and its value SHOULD always be the empty
- list.</p>
-
- <tp:rationale>
- <p>On GSM you have to place a 1-1 call before you can merge it into a
- conference; on the other hand, you can invite new contacts to XMPP
- Muji calls and XMPP/MSN/Skype ad-hoc chat rooms without starting a
- 1-1 channel with them first.</p>
- </tp:rationale>
-
- <p>If included in a request, the given contacts are automatically
- invited into the new channel, as if they had been added with
- <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface"
- >Group.AddMembers</tp:dbus-ref>(InitialInviteeHandles,
- <tp:member-ref>InvitationMessage</tp:member-ref>) immediately after
- the channel was created.</p>
-
- <tp:rationale>
- <p>This is a simple convenience API for the common case that a UI
- upgrades a 1-1 chat to a multi-user chat solely in order to invite
- someone else to participate.</p>
- </tp:rationale>
-
- <p>If the local user was not the initiator of this channel, the
- <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface"
- >Group.SelfHandle</tp:dbus-ref> SHOULD appear in the value of this
- property, together with any other contacts invited at the same time
- (if that information is known).</p>
-
- <p>This property is immutable.</p>
-
- <p>InitialInviteeHandles, InitialInviteeIDs and InitialChannels MAY be
- combined in a single request.</p>
-
- <tp:rationale>
- <p>For example, if you have a 1-1 channel C1 with Rob, and you want
- to invite Sjoerd to join the discussion, you can do so by
- requesting a channel with InitialChannels=[C1] and
- InitialInviteeHandles=[sjoerd],
- or InitialChannels=[C1] and
- InitialInviteeIDs=["sjoerd@example.com"].</p>
- </tp:rationale>
-
- <p>If a request includes some combination of InitialInviteeHandles,
- InitialInviteeIDs and InitialChannels, then the value of
- InitialInviteeHandles on the resulting channel SHOULD be the union of
- the handles from InitialInviteeHandles, the handles corresponding
- to the InitialInviteeIDs, and the target handles of the
- InitialChannels, with any duplicate handles removed. Because this
- property is immutable, its value SHOULD be computed before the
- channel is announced via the NewChannels signal.</p>
-
- <tp:rationale>
- <p>This simplifies identification of new channels in clients - they
- only have to look at one of the properties, not both. For example,
- after either of the requests mentioned above, the NewChannels
- signal would announce the channel with InitialChannels=[C1],
- InitialInviteeHandles=[rob, sjoerd], and
- InitialInviteeIDs=["rob@example.net", "sjoerd.example.com"].</p>
- </tp:rationale>
- </tp:docstring>
- </property>
-
- <property name="InitialInviteeIDs"
- tp:name-for-bindings="Initial_Invitee_IDs"
- access="read" type="as">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>A list of additional contacts invited to this conference when it
- was created.</p>
-
- <p>This property SHOULD be requestable if and only if
- <tp:member-ref>InitialInviteeHandles</tp:member-ref> is requestable.
- Its semantics are the same, except that it takes a list of the
- string representations of contact handles; invitations are sent to
- any contact present in either or both of these properties.</p>
-
- <p>When a channel is created, the values of InitialInviteeHandles and
- InitialInviteeIDs MUST correspond to each other. In particular, this
- means that the value of InitialInviteeIDs will include the TargetID
- of each channel in InitialChannels, and the ID corresponding to each
- handle in InitialInviteeHandles.</p>
-
- <p>This property is immutable.</p>
- </tp:docstring>
- </property>
-
- <property name="InvitationMessage" tp:name-for-bindings="Invitation_Message"
- access="read" type="s">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The message that was sent to the
- <tp:member-ref>InitialInviteeHandles</tp:member-ref> when they were
- invited.</p>
-
- <p>This property SHOULD be requestable, and appear in the allowed
- properties in <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Connection.Interface.Requests"
- >RequestableChannelClasses</tp:dbus-ref>, in protocols where
- invitations can have an accompanying text message.</p>
-
- <tp:rationale>
- <p>This allows invitations with a message to be sent when using
- <tp:member-ref>InitialInviteeHandles</tp:member-ref> or
- <tp:member-ref>InitialInviteeIDs</tp:member-ref>.</p>
- </tp:rationale>
-
- <p>If the local user was not the initiator of this channel, the
- message with which they were invited (if any) SHOULD appear in the
- value of this property.</p>
-
- <p>This property is immutable.</p>
- </tp:docstring>
- </property>
-
- <property name="OriginalChannels" tp:name-for-bindings="Original_Channels"
- type="a{uo}" tp:type="Channel_Originator_Map"
- access="read">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>On GSM conference calls, it is possible to have the same phone
- number in a conference twice; for instance, it could be the number of
- a corporate switchboard. This is represented using channel-specific
- handles; whether or not a channel uses channel-specific handles is
- reported in <tp:dbus-ref
- namespace='ofdT.Channel.Interface'>Group.GroupFlags</tp:dbus-ref>.
- The <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Channel.Interface">Group.HandleOwners</tp:dbus-ref>
- property specifies the mapping from opaque channel-specific handles
- to actual numbers; this property specifies the original 1-1 channel
- corresponding to each channel-specific handle in the conference.</p>
-
- <p>In protocols where this situation cannot arise, such as XMPP,
- this property MAY remain empty.</p>
-
- <p>For example, consider this situation:</p>
-
- <ol>
- <li>Place a call (with path <tt>/call/to/simon</tt>) to the contact
- <tt>+441234567890</tt> (which is assigned the handle <var>h</var>,
- say), and ask to be put through to Simon McVittie;</li>
- <li>Put that call on hold;</li>
- <li>Place another call (with path <tt>/call/to/jonny</tt>) to
- <tt>+441234567890</tt>, and ask to be put
- through to Jonny Lamb;</li>
- <li>Request a new channel with
- <tp:member-ref>InitialChannels</tp:member-ref>:
- <tt>['/call/to/simon', '/call/to/jonny']</tt>.</li>
- </ol>
-
- <p>The new channel will have the following properties, for some handles
- <var>s</var> and <var>j</var>:</p>
-
- <blockquote>
- <code>{<br/>
- ...<tp:dbus-ref
- namespace="ofdT.Channel.Interface">Group.GroupFlags</tp:dbus-ref>:
- Channel_Specific_Handles | (other flags),<br/>
- ...<tp:dbus-ref
- namespace="ofdT.Channel.Interface">Group.Members</tp:dbus-ref>:
- [self_handle, s, j],<br/>
- ...<tp:dbus-ref
- namespace="ofdT.Channel.Interface">Group.HandleOwners</tp:dbus-ref>:
- { s: h, j: h },<br/>
- ...<tp:member-ref>InitialChannels</tp:member-ref>:
- ['/call/to/simon', '/call/to/jonny'],<br/>
- ...<tp:member-ref>Channels</tp:member-ref>:
- ['/call/to/simon', '/call/to/jonny'],<br/>
- ...<tp:member-ref>OriginalChannels</tp:member-ref>:
- { s: '/call/to/simon', j: '/call/to/jonny' },<br/>
- # ...standard properties like ChannelType: Group elided...<br/>
- }</code>
- </blockquote>
-
- <p>Change notification is via the
- <tp:member-ref>ChannelMerged</tp:member-ref> and
- <tp:member-ref>ChannelRemoved</tp:member-ref> signals: if
- <var>Channel_Specific_Handle</var> in the former is non-zero, this
- property SHOULD be updated to map that handle to the merged channel's
- path.</p>
- </tp:docstring>
- </property>
-
- <tp:mapping name="Channel_Originator_Map">
- <tp:member name="Channel_Specific_Handle" type="u" tp:type="Contact_Handle">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- A channel-specific handle for a participant in this conference.
- </tp:docstring>
- </tp:member>
- <tp:member name="Original_Channel" type="o">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- The object path of <tp:member-ref>Channels</tp:member-ref>
- representing the original 1-1 channel with
- <var>Channel_Specific_Handle</var>.
- </tp:docstring>
- </tp:member>
-
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- A mapping from members of a conference to the original 1-1 channel with
- that contact, if any. See
- <tp:member-ref>OriginalChannels</tp:member-ref> for details.
- </tp:docstring>
- </tp:mapping>
- </interface>
-</node>
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 8f4c8e581..843793a4c 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -13,7 +13,6 @@ EXTRA_DIST = \
generic-types.xml \
misc.xml \
Debug.xml \
- Channel_Interface_Conference.xml \
Logger.xml \
Authentication_TLS_Certificate.xml \
Channel_Type_Server_TLS_Connection.xml \
diff --git a/extensions/misc.xml b/extensions/misc.xml
index 320d488fd..39a987efc 100644
--- a/extensions/misc.xml
+++ b/extensions/misc.xml
@@ -5,7 +5,6 @@
<tp:title>Misc extensions for Empathy</tp:title>
<xi:include href="Debug.xml" />
-<xi:include href="Channel_Interface_Conference.xml" />
<xi:include href="Logger.xml" />
<xi:include href="Authentication_TLS_Certificate.xml" />
<xi:include href="Channel_Type_Server_TLS_Connection.xml" />
diff --git a/help/.gitignore b/help/.gitignore
index 1a5b9ea2a..4432357d7 100644
--- a/help/.gitignore
+++ b/help/.gitignore
@@ -7,6 +7,7 @@ de/*.xml
el/*.xml
en_GB/*.xml
es/*.xml
+hu/*.xml
fi/*.xml
fr/*.xml
gl/*.xml
@@ -21,6 +22,7 @@ de/*.page
el/*.page
en_GB/*.page
es/*.page
+hu/*.page
fi/*.page
fr/*.page
gl/*.page
diff --git a/help/C/create-account.page b/help/C/create-account.page
index 4aa01710b..e87e117e1 100644
--- a/help/C/create-account.page
+++ b/help/C/create-account.page
@@ -14,6 +14,7 @@
-->
</revision>
<revision pkgversion="2.30" version="0.3" date="2010-04-19" status="review"/>
+ <revision pkgversion="2.30" version="0.4" date="2010-10-01" status="review"/>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
@@ -92,10 +93,6 @@
a SIP provider. You can communicate with all other SIP users,
regardless of which SIP provider they use.</p>
- <p>There are a number of popular free SIP account providers; one
- popular provider is <link
- href="https://signup.sipphone.com/new-users/app?class=NewUser;proc=start">Sipphone</link>.</p>
-
<note style="warning">
<p>Due to technical differences, the free <link
href="https://www.ekiga.net/index.php?page=register">Ekiga.net</link>
diff --git a/help/C/geolocation-turn.page b/help/C/geolocation-turn.page
index a3e620c1b..96e79dbd6 100644
--- a/help/C/geolocation-turn.page
+++ b/help/C/geolocation-turn.page
@@ -60,7 +60,7 @@
<item>
<p>
If you have an external device like a GPS or want to send a more accurate
- position, select the appropriate option in the <gui>Geoclue Settings</gui>
+ position, select the appropriate option in the <gui>Location sources</gui>
section.
</p>
</item>
diff --git a/help/C/irc-start-conversation.page b/help/C/irc-start-conversation.page
index 3d04c8db3..ad51ca53d 100644
--- a/help/C/irc-start-conversation.page
+++ b/help/C/irc-start-conversation.page
@@ -5,7 +5,7 @@
<info>
<link type="guide" xref="irc-manage#manage" group="two"/>
- <desc>Start a conversation witn an IRC contact.</desc>
+ <desc>Start a conversation with an IRC contact.</desc>
<revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review">
<!--
<e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
diff --git a/help/Makefile.am b/help/Makefile.am
index 4c1a5f264..f2b407275 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -61,5 +61,5 @@ DOC_PAGES = \
status-icons.page \
video-call.page
-DOC_LINGUAS = ca cs de el en_GB es fi fr gl it ru sv zh_CN
+DOC_LINGUAS = ca cs de el en_GB es fi fr gl hu it ru sv zh_CN
dist-hook: doc-dist-hook
diff --git a/help/de/de.po b/help/de/de.po
index a767312ba..3c05b66a2 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy help\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 16:50+0000\n"
-"PO-Revision-Date: 2010-09-14 14:49+0200\n"
-"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
+"POT-Creation-Date: 2010-09-25 13:09+0000\n"
+"PO-Revision-Date: 2010-09-25 21:11+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"
@@ -77,27 +77,27 @@ msgstr "Milo Casagrande"
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:21(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/link-contacts.page:19(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:23(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:22(p) C/change-status.page:23(p)
-#: C/audio-video.page:21(p) C/audio-call.page:23(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:20(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:21(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/link-contacts.page:19(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:23(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:22(p)
+#: C/change-status.page:23(p) C/audio-video.page:21(p) C/audio-call.page:23(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:20(p)
msgid "Creative Commons Share Alike 3.0"
msgstr "Creative Commons Share Alike 3.0"
@@ -119,15 +119,15 @@ msgstr ""
#: C/video-call.page:37(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>."
+"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>."
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>."
+"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>."
#: C/video-call.page:43(p) C/audio-call.page:42(p)
msgid ""
@@ -135,9 +135,9 @@ 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:48(p) C/audio-call.page:48(p)
msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
@@ -150,9 +150,9 @@ msgid ""
"To turn a video conversation into an audio conversation, choose <guiseq><gui "
"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
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>."
+"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>."
#: C/video-call.page:60(title)
msgid "Start a video conversation with a meta-contact"
@@ -174,9 +174,9 @@ msgstr ""
#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p)
msgid ""
"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
-"contact in the <gui>Contact List</gui> window, and stop over it for a "
-"second: a small pop-up message will appear showing the number of the "
-"contacts that form the meta-contact."
+"contact in the <gui>Contact List</gui> window, and stop over it for a second: "
+"a small pop-up message will appear showing the number of the contacts that "
+"form the meta-contact."
msgstr ""
"Bewegen und halten Sie den Mauszeiger über einen Kontakt im Fenster "
"<gui>Kontaktliste</gui>, um erkennen zu können, ob es sich um einen <em>Meta-"
@@ -258,18 +258,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"
@@ -292,8 +292,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"
@@ -305,14 +305,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"
@@ -366,8 +365,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</"
@@ -378,16 +376,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 "
@@ -425,8 +423,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"
@@ -446,8 +443,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 ""
@@ -466,17 +463,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 "
@@ -485,13 +482,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 ""
@@ -520,8 +517,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."
@@ -538,19 +535,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 ""
@@ -610,8 +606,8 @@ msgstr "Jemandem eine Nachricht senden"
#: C/send-message.page:36(p)
msgid ""
-"From the <gui>Contact List</gui> window, double-click the name of the "
-"contact that you want to have a conversation with."
+"From the <gui>Contact List</gui> window, double-click the name of the contact "
+"that you want to have a conversation with."
msgstr ""
"Klicken Sie im Fenster <gui>Kontaktliste</gui> doppelt auf den Namen des "
"Kontakts, mit dem Sie eine Unterhaltung beginnen wollen."
@@ -622,8 +618,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-message.page:50(title)
msgid "Send a message to a meta-contact"
@@ -651,8 +647,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 ""
@@ -694,10 +690,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 ""
@@ -709,8 +704,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."
@@ -733,8 +728,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 ""
@@ -759,8 +754,8 @@ 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>."
@@ -772,10 +767,9 @@ msgstr "Löschen eines Kontos"
#: 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 "
@@ -793,8 +787,8 @@ msgstr ""
#: 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."
@@ -906,8 +900,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."
@@ -961,10 +955,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 ""
@@ -977,8 +970,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."
@@ -999,13 +992,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 ""
@@ -1016,8 +1009,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."
@@ -1041,8 +1034,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 ""
@@ -1050,8 +1043,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."
@@ -1078,8 +1071,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 "
@@ -1101,16 +1094,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 "
@@ -1135,8 +1127,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 ""
@@ -1164,8 +1156,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."
@@ -1197,8 +1189,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)
@@ -1309,8 +1301,8 @@ msgid ""
"select <gui style=\"menuitem\">Link Contacts...</gui>."
msgstr ""
"Wählen Sie in der <gui>Kontakliste</gui> den Kontakt mit der rechten "
-"Maustaste aus, den Sie aufteilen möchten, und wählen Sie <gui style="
-"\"menuitem\">Kontakte verknüpfen …</gui>."
+"Maustaste aus, den Sie aufteilen möchten, und wählen Sie <gui style=\"menuitem"
+"\">Kontakte verknüpfen …</gui>."
#: C/link-contacts.page:100(p)
msgid "Click <gui style=\"button\">Unlink</gui>."
@@ -1364,13 +1356,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"
@@ -1389,10 +1381,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</"
@@ -1400,7 +1392,7 @@ msgstr ""
"org/licenses/by-sa/3.0/\">Commons Deed</link> lesen."
#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation witn an IRC contact."
+msgid "Start a conversation with an IRC contact."
msgstr "Eine Unterhaltung mit einem IRC-Kontakt starten."
#: C/irc-start-conversation.page:30(title)
@@ -1413,8 +1405,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 ""
@@ -1429,20 +1421,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 "
@@ -1465,8 +1457,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"
@@ -1487,18 +1479,18 @@ msgstr ""
#: 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."
+"<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:"
@@ -1511,8 +1503,8 @@ 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."
@@ -1688,15 +1680,14 @@ msgstr "Einführung"
#: 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 calls, 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 calls, 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:28(p)
msgid ""
@@ -1773,8 +1764,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"
@@ -1794,9 +1784,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 ""
@@ -1808,8 +1798,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>."
@@ -1866,8 +1856,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"
@@ -1875,8 +1864,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."
@@ -1945,8 +1934,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>."
@@ -1964,8 +1953,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."
@@ -1977,8 +1966,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."
@@ -2008,8 +1997,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:"
@@ -2080,12 +2069,12 @@ msgstr ""
#: C/geolocation-turn.page:61(p)
msgid ""
"If you have an external device like a GPS or want to send a more accurate "
-"position, select the appropriate option in the <gui>Geoclue Settings</gui> "
+"position, select the appropriate option in the <gui>Location sources</gui> "
"section."
msgstr ""
"Falls Sie über ein externes Gerät verfügen, z.B. GPS, oder eine genauere "
"Position senden wollen, wählen Sie die entsprechende Option im Abschnitt "
-"<gui>Geoclue-Einstellungen</gui>."
+"<gui>Positionsquellen</gui>."
#: C/geolocation-supported.page:7(desc)
msgid "Services that supports geolocation and compatibility."
@@ -2153,9 +2142,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 "
@@ -2163,9 +2152,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 "
@@ -2174,8 +2163,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 "
@@ -2222,8 +2211,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."
@@ -2245,8 +2233,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)
@@ -2269,9 +2257,9 @@ 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 "
@@ -2313,19 +2301,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 ""
@@ -2345,8 +2333,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."
@@ -2359,8 +2347,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."
@@ -2382,8 +2370,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."
@@ -2398,8 +2386,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."
@@ -2414,7 +2402,7 @@ msgstr "Sobald Sie fertig sind, klicken Sie auf <gui>Schließen</gui>."
#: C/disable-account.page:9(desc)
msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
msgstr ""
-"app>Empathy</app> daran hindern, die Verbindung zu einem Konto automatisch "
+"<app>Empathy</app> daran hindern, die Verbindung zu einem Konto automatisch "
"herzustellen."
#: C/disable-account.page:39(title)
@@ -2431,8 +2419,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 ""
@@ -2452,8 +2440,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>."
@@ -2474,19 +2461,19 @@ 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: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 using "
-"<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 using <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 "
@@ -2502,9 +2489,9 @@ 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."
+"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 ""
@@ -2527,8 +2514,8 @@ msgid ""
"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:65(p)
msgid ""
@@ -2546,10 +2533,9 @@ msgid ""
"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:77(title) C/audio-video.page:190(p)
msgid "People Nearby"
@@ -2565,8 +2551,8 @@ 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:84(p)
msgid "For more information, see <link xref=\"salut-protocol\"/>."
@@ -2585,8 +2571,8 @@ 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:95(p)
msgid ""
@@ -2613,9 +2599,9 @@ 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:110(title) C/audio-video.page:165(p)
msgid "IRC"
@@ -2623,16 +2609,16 @@ msgstr "IRC"
#: 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:117(p)
msgid ""
@@ -2640,8 +2626,8 @@ msgid ""
"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
msgstr ""
"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\"/>."
+"ermöglichen, ihre Spitznamen zu schützen. Weitere Informationen finden Sie in "
+"<link xref=\"irc-nick-password\"/>."
#: C/create-account.page:120(p)
msgid ""
@@ -2719,22 +2705,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.
@@ -2756,8 +2742,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 ""
@@ -2792,8 +2778,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."
@@ -2816,10 +2802,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 ""
@@ -2829,21 +2814,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)
@@ -2940,8 +2925,8 @@ msgstr "Eine Audio-Unterhaltung starten"
#: C/audio-call.page:29(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. "
@@ -2950,24 +2935,24 @@ msgstr ""
#: C/audio-call.page:34(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\">Audio 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"
+"\">Audio 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>."
+"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>."
#: C/audio-call.page:55(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>."
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>."
+"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>."
#: C/audio-call.page:63(title)
msgid "Start an audio conversation with a meta-contact"
@@ -3002,8 +2987,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 ""
@@ -3019,8 +3004,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."
@@ -3030,8 +3015,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."
@@ -3047,9 +3032,9 @@ msgstr "Hinzufügen eines neuen Kontos"
#: 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 "
@@ -3084,9 +3069,9 @@ msgstr ""
#: 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 "
@@ -3101,8 +3086,8 @@ msgstr "Klicken Sie auf <gui style=\"button\">Anmelden</gui>."
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 "
@@ -3120,8 +3105,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."
@@ -3152,16 +3136,16 @@ msgstr "Jabber-Kontendetails"
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 ""
@@ -3182,17 +3166,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 ""
@@ -3224,15 +3208,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 "
@@ -3246,13 +3230,13 @@ 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.
@@ -3277,9 +3261,9 @@ msgstr "IRC-Kontendetails"
#: 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 "
@@ -3295,15 +3279,14 @@ msgstr "Netzwerk"
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:53(gui)
msgid "Nickname"
@@ -3312,13 +3295,13 @@ msgstr "Spitzname"
#: 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:60(gui)
@@ -3328,8 +3311,8 @@ msgstr "Passwort"
#: 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 "
@@ -3343,9 +3326,9 @@ msgstr "NickServ-Passwörter"
#: 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 "
+"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 ""
@@ -3362,8 +3345,8 @@ msgstr "Realname"
#: 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 "
@@ -3395,31 +3378,31 @@ msgstr "Netzwerke"
#: 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: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"
-"\">Hinzufügen</media>."
+"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: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:110(p)
msgid ""
@@ -3427,9 +3410,9 @@ msgid ""
"\"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:115(p)
msgid ""
@@ -3452,17 +3435,16 @@ msgstr "Zeichensatz"
#: 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.
@@ -3501,10 +3483,10 @@ msgid ""
"<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:151(p)
msgid ""
@@ -3513,9 +3495,9 @@ msgid ""
"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)
@@ -3532,12 +3514,12 @@ msgstr ""
#~ "<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>."
#~ msgid "To join such a room, if you know the password:"
#~ msgstr ""
@@ -3546,8 +3528,7 @@ msgstr ""
#~ 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."
+#~ "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 "
@@ -3565,9 +3546,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 "
@@ -3578,8 +3559,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</"
@@ -3606,9 +3586,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 "
@@ -3997,8 +3977,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/>."
@@ -4026,16 +4006,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."
@@ -4081,9 +4061,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/el/el.po b/help/el/el.po
index 841c3c1e2..62f7262ac 100644
--- a/help/el/el.po
+++ b/help/el/el.po
@@ -4,9 +4,9 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy-master-help-el-4325__.merged\n"
-"POT-Creation-Date: 2010-08-30 11:19+0000\n"
-"PO-Revision-Date: 2010-08-31 22:32+0200\n"
-"Last-Translator: Michael Kotsarinis <mk73628@gmail.com>\n"
+"POT-Creation-Date: 2010-09-29 11:54+0000\n"
+"PO-Revision-Date: 2010-09-30 22:46+0200\n"
+"Last-Translator: Michael Kotsarinis <mk73628@hotmail.com>\n"
"Language-Team: Greek <team@gnome.gr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,10 +17,9 @@ 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:63(None)
+#: C/video-call.page:38(None)
#: C/audio-video.page:70(None)
-#: C/audio-call.page:65(None)
+#: C/audio-call.page:36(None)
msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
msgstr "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
@@ -40,6 +39,7 @@ msgstr "ΈναÏξη βιντεοσυζήτησης με τις επαφές σÎ
#: C/prob-conn-auth.page:21(name)
#: C/prob-conn-acctdisabled.page:18(name)
#: C/prev-conv.page:16(name)
+#: C/link-contacts.page:15(name)
#: C/irc-start-conversation.page:15(name)
#: C/irc-send-file.page:16(name)
#: C/irc-nick-password.page:18(name)
@@ -48,7 +48,7 @@ msgstr "ΈναÏξη βιντεοσυζήτησης με τις επαφές σÎ
#: C/irc-join-pwd.page:17(name)
#: C/irc-commands.page:10(name)
#: C/introduction.page:13(name)
-#: C/index.page:18(name)
+#: C/index.page:19(name)
#: C/import-account.page:23(name)
#: C/hide-contacts.page:11(name)
#: C/group-conversations.page:19(name)
@@ -62,7 +62,7 @@ msgstr "ΈναÏξη βιντεοσυζήτησης με τις επαφές σÎ
#: C/disable-account.page:20(name)
#: C/create-account.page:18(name)
#: C/audio-video.page:17(name)
-#: C/audio-call.page:18(name)
+#: C/audio-call.page:19(name)
#: C/add-account.page:20(name)
msgid "Milo Casagrande"
msgstr "Milo Casagrande"
@@ -79,6 +79,7 @@ msgstr "Milo Casagrande"
#: C/prob-conn-auth.page:22(email)
#: C/prob-conn-acctdisabled.page:19(email)
#: C/prev-conv.page:17(email)
+#: C/link-contacts.page:16(email)
#: C/irc-start-conversation.page:16(email)
#: C/irc-send-file.page:17(email)
#: C/irc-nick-password.page:19(email)
@@ -87,7 +88,7 @@ msgstr "Milo Casagrande"
#: C/irc-join-pwd.page:18(email)
#: C/irc-commands.page:11(email)
#: C/introduction.page:14(email)
-#: C/index.page:19(email)
+#: C/index.page:20(email)
#: C/import-account.page:24(email)
#: C/hide-contacts.page:12(email)
#: C/group-conversations.page:20(email)
@@ -101,7 +102,7 @@ msgstr "Milo Casagrande"
#: C/disable-account.page:21(email)
#: C/create-account.page:19(email)
#: C/audio-video.page:18(email)
-#: C/audio-call.page:19(email)
+#: C/audio-call.page:20(email)
#: C/add-account.page:21(email)
msgid "milo@ubuntu.com"
msgstr "milo@ubuntu.com"
@@ -110,7 +111,7 @@ msgstr "milo@ubuntu.com"
#: 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-message.page:21(p)
#: C/send-file.page:25(p)
#: C/salut-protocol.page:22(p)
#: C/remove-account.page:22(p)
@@ -120,6 +121,7 @@ msgstr "milo@ubuntu.com"
#: C/prob-conn-auth.page:25(p)
#: C/prob-conn-acctdisabled.page:22(p)
#: C/prev-conv.page:24(p)
+#: C/link-contacts.page:19(p)
#: C/irc-start-conversation.page:19(p)
#: C/irc-send-file.page:20(p)
#: C/irc-nick-password.page:22(p)
@@ -128,7 +130,7 @@ msgstr "milo@ubuntu.com"
#: C/irc-join-pwd.page:21(p)
#: C/irc-commands.page:14(p)
#: C/introduction.page:17(p)
-#: C/index.page:22(p)
+#: C/index.page:23(p)
#: C/import-account.page:31(p)
#: C/hide-contacts.page:15(p)
#: C/group-conversations.page:23(p)
@@ -143,7 +145,7 @@ msgstr "milo@ubuntu.com"
#: 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/audio-call.page:23(p)
#: C/add-contact.page:22(p)
#: C/add-account.page:28(p)
#: C/accounts-window.page:22(p)
@@ -152,35 +154,76 @@ msgstr "milo@ubuntu.com"
msgid "Creative Commons Share Alike 3.0"
msgstr "Creative Commons Share Alike 3.0"
-#: C/video-call.page:35(title)
+#: C/video-call.page:28(title)
msgid "Start a video conversation"
msgstr "ΈναÏξη βιντεοκλήσης"
-#: C/video-call.page:37(p)
-msgid "If you have a webcam, you can call your contacts and have an video conversation with them. This features only works with certain types of accounts, and it requires the other person to have an application that supports video calls."
+#: C/video-call.page:30(p)
+#| msgid ""
+#| "If you have a webcam, you can call your contacts and have an video "
+#| "conversation with them. This features only works with certain types of "
+#| "accounts, and it requires the other person to have an application that "
+#| "supports video calls."
+msgid "If you have a webcam, you can call your contacts and have a video conversation with them. This features only works with certain types of accounts, and it requires the other person to have an application that supports video calls."
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>."
+#: C/video-call.page:37(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>."
+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>."
msgstr "Από το παÏάθυÏο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλέσετε, και επιλέξτε <gui style=\"menuitem\">Βιντεοκλήση</gui>. Εναλλακτικά, κάνετε δεξί κλικ στο όνομα της επαφής και επιλέξτε <gui>Βιντεοκλήση</gui>."
-#: C/video-call.page:50(p)
-#: C/audio-call.page:52(p)
+#: C/video-call.page:43(p)
+#: C/audio-call.page:42(p)
msgid "A new window will open. When the connection is established, you will see <gui>Connected</gui> at the bottom of the window, along with the total conversation time."
msgstr "Θα ανοίξει ένα νέο παÏάθυÏο. Όταν επιτευχθεί η σÏνδεση, θα δείτε το μήνυμα <gui>Σε σÏνδεση</gui> στο κάτω μέÏος του παÏαθÏÏου, μαζί με τη διάÏκεια της συνομιλίας."
-#: 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>."
+#: C/video-call.page:48(p)
+#: C/audio-call.page:48(p)
msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
msgstr "Για να τεÏματίσετε τη συνομιλία, επιλέξτε <gui style=\"button\">Κλείσιμο</gui>."
-#: 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."
+#: C/video-call.page:54(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."
+msgid "To turn a video conversation into an audio conversation, choose <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
msgstr "Για να μετατÏέψετε μια βιντεοκλήση σε φωνητική συνομιλία, επιλέξτε <guiseq><gui style=\"menu\">Βίντεο</gui><gui style=\"menuitem\">Βίντεο ανενεÏγό</gui></guiseq>, ή πατήστε το κουμπί <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</media> της εÏγαλειοθήκης για να το αποεπιλέξετε."
+#: C/video-call.page:60(title)
+#| msgid "Start a video conversation with one of your contacts."
+msgid "Start a video conversation with a meta-contact"
+msgstr "ΈναÏξη βιντεοσυζήτησης με μια μετα-επαφή"
+
+#: C/video-call.page:63(p)
+#: C/send-message.page:53(p)
+#: C/audio-call.page:66(p)
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click on the drop-down list at "
+#| "the top."
+msgid "From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr "Στο παÏάθυÏο <gui>Λίστα επαφών</gui>, κάντε δεξί κλικ στη μετα-επαφή."
+
+#: C/video-call.page:68(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Video Call</gui>."
+msgstr "Επιλέξτε την επαφή με την οποία θέλετε να συζητήσετε, και από το Î¼ÎµÎ½Î¿Ï ÎµÏ€Î¹Î»Î­Î¾Ï„Îµ <gui style=\"menuitem\">Βιντεοκλήση</gui>."
+
+#: C/video-call.page:75(p)
+#: C/send-message.page:65(p)
+#: C/audio-call.page:78(p)
+msgid "To recognize if a contact is a <em>meta-contact</em>, move your mouse on a contact in the <gui>Contact List</gui> window, and stop over it for a second: a small pop-up message will appear showing the number of the contacts that form the meta-contact."
+msgstr "Για να αναγνωÏίσετε αν μια επαφή είναι μια <em>μετα-επαφή</em>, μετακινήστε το ποντίκι σε μια επαφή στο παÏάθυÏο της <gui>Λίστας επαφών</gui> και σταματήστε το πάνω της για ένα δευτεÏόλεπτο: θα εμφανιστεί ένα μικÏÏŒ αναδυόμενο μήνυμα που θα δείχνει τον αÏιθμό των επαφών που απαÏτίζουν τη μετα-επαφή."
+
#. 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/status-icons.page:39(None)
@@ -314,7 +357,6 @@ msgid "In order to be able to share your desktop or to remotely use your contact
msgstr "Για να μποÏείτε να μοιÏαστείτε την επιφάνεια εÏγασίας σας ή να χÏησιμοποιήσετε απομακÏυσμένα την επιφάνεια εÏγασίας μιας επαφής σας, θα Ï€Ïέπει να έχετε εγκατεστημένη μια εφαÏμογή Ï€Ïοβολής απομακÏυσμένης επιφάνειας εÏγασίας."
#: C/share-desktop.page:46(p)
-#: C/send-message.page:35(p)
#: C/send-file.page:40(p)
#: C/favorite-rooms.page:66(p)
msgid "From the <gui>Contact List</gui> window, perform one of the following:"
@@ -449,7 +491,7 @@ msgstr "Όταν Ï„Ïοποποιείτε ή Ï€Ïοσθέτετε ένα Ï€ÏοÏ
msgid "Send a message to one of your contacts."
msgstr "Αποστολή μηνυμάτων στις επαφές σας."
-#: C/send-message.page:16(name)
+#: C/send-message.page:17(name)
#: C/send-file.page:17(name)
#: C/prob-conn.page:14(name)
#: C/prob-conn-neterror.page:14(name)
@@ -460,7 +502,7 @@ msgstr "Αποστολή μηνυμάτων στις επαφές σας."
msgid "Phil Bull"
msgstr "Phil Bull"
-#: C/send-message.page:17(email)
+#: C/send-message.page:18(email)
#: C/send-file.page:18(email)
#: C/prob-conn.page:15(email)
#: C/prob-conn-neterror.page:15(email)
@@ -471,22 +513,33 @@ msgstr "Phil Bull"
msgid "philbull@gmail.com"
msgstr "philbull@gmail.com"
-#: C/send-message.page:31(title)
+#: C/send-message.page:32(title)
msgid "Send a message to someone"
msgstr "Αποστολή μηνυμάτων"
-#: C/send-message.page:40(p)
-msgid "Double click the name of the contact that you want to have a conversation with."
-msgstr "Κάνετε διπλό κλικ στο όνομα της επαφής με την οποία θέλετε να συζητήσετε."
-
-#: 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 "Κάνετε δεξί κλικ στο όνομα της επαφής με την οποία θέλετε να συζητήσετε, και επιλέξτε <gui>Συζήτηση</gui>."
+#: C/send-message.page:36(p)
+#| msgid ""
+#| "Double click the name of the contact that you want to have a conversation "
+#| "with."
+msgid "From the <gui>Contact List</gui> window, double-click the name of the contact that you want to have a conversation with."
+msgstr "Στο παÏάθυÏο <gui>Λίστα επαφών</gui>, κάντε διπλό κλικ στο όνομα της επαφής με την οποία θέλετε να συζητήσετε."
-#: C/send-message.page:54(p)
+#: C/send-message.page:42(p)
msgid "A new window will open. Type a message into the box at the bottom of the window and press <key>Enter</key> to send it."
msgstr "Θα ανοίξει ένα νέο παÏάθυÏο. Εισάγετε το μήνυμά σας στο πεδίο κειμένου στο κάτω μέÏος του παÏαθÏÏου και πατήστε <key>Enter</key> για να το στείλετε."
+#: C/send-message.page:50(title)
+#| msgid "Send a message to someone"
+msgid "Send a message to a meta-contact"
+msgstr "Αποστολή μηνÏματος σε μια μετα-επαφή"
+
+#: C/send-message.page:58(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Chat</gui>."
+msgstr "Επιλέξτε την επαφή με την οποία θέλετε να συζητήσετε, και από το Î¼ÎµÎ½Î¿Ï ÎµÏ€Î¹Î»Î­Î¾Ï„Îµ <gui style=\"menuitem\">Συζήτηση</gui>."
+
#: C/send-file.page:8(desc)
msgid "Send a file from your computer to one of your contacts."
msgstr "Αποστολή αÏχείων από των υπολογιστή σας στις επαφές σας."
@@ -583,7 +636,6 @@ msgid "Select the account you wish to remove from the accounts list on the left
msgstr "Επιλέξτε το λογαÏιασμό που θέλετε να διαγÏάψετε από τη λίστα στην αÏιστεÏή πλευÏά του παÏαθÏÏου."
#: C/remove-account.page:50(p)
-#| msgid "Click <gui style=\"button\">Add</gui>."
msgid "Click on <gui style=\"button\">Remove</gui>."
msgstr "Πατήστε <gui style=\"button\">ΑφαίÏεση</gui>."
@@ -816,6 +868,82 @@ msgstr "ΜποÏείτε να κάνετε αναζήτηση στη συζήτÎ
msgid "You can quickly view the previous conversations with one of your contacts from the <gui>Contact List</gui> window. Simply right click the contact and choose <gui>View Previous Conversations</gui>. The <gui>Previous Conversations</gui> window will open with that contact already selected."
msgstr "ΥπάÏχει ένας γÏήγοÏος Ï„Ïόπος για να Ï€Ïοβάλετε τις Ï€ÏοηγοÏμενες συζητήσεις σας με μία επαφή. Από το παÏάθυÏο <gui>Λίστα επαφών</gui>, κάνετε δεξί κλικ στην επαφή και επιλέξτε <gui>ΠÏοβολή Ï€ÏοηγοÏμενων συζητήσεων</gui>. Θα εμφανιστεί το παÏάθυÏο <gui>ΠÏοηγοÏμενες συζητήσεις</gui>, με τη συγκεκÏιμένη επαφή επιλεγμένη."
+#: C/link-contacts.page:11(desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "ΣυγχωνεÏστε και διαχωÏίστε διαφοÏετικές επαφές σε μία."
+
+#: C/link-contacts.page:25(title)
+msgid "Combine and separate contacts"
+msgstr "Συνδυάστε και διαχωÏίστε επαφές"
+
+#: C/link-contacts.page:26(p)
+msgid "If one, or more, of your contacts has multiple accounts with different messaging services, you can combine these contacts into a single one."
+msgstr "Αν μία, ή πεÏισσότεÏες, από τις επαφές σας έχει πολλαπλοÏÏ‚ λογαÏιασμοÏÏ‚ με διαφοÏετικές υπηÏεσίες μηνυμάτων, μποÏείτε να συνδυάσετε αυτές τις επαφές σε μία."
+
+#: C/link-contacts.page:30(p)
+msgid "The resulting contact is called a <em>meta-contact</em>: a contact composed from different single contacts."
+msgstr "Η επαφή που Ï€ÏοκÏπτει ονομάζεται <em>μετα-επαφή</em>: μια επαφή αποτελοÏμενη από διαφοÏετικές απλές επαφές."
+
+#: C/link-contacts.page:34(p)
+msgid "If you have a Jane Smith contact that is using three different messaging services like:"
+msgstr "Αν έχετε μια επαφή ΜαÏία ΠαπαδοποÏλου που χÏησιμοποιεί Ï„Ïεις διαφοÏετικές υπηÏεσίες μηνυμάτων όπως:"
+
+#: C/link-contacts.page:40(p)
+#| msgid "Facebook"
+msgid "janes@facebook"
+msgstr "mariap@facebook"
+
+#: C/link-contacts.page:45(p)
+msgid "jane.smith@gmail"
+msgstr "maria.papad@gmail"
+
+#: C/link-contacts.page:50(p)
+msgid "jane_smith@hotmail"
+msgstr "maria_papad@hotmail"
+
+#: C/link-contacts.page:55(p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr "ΜποÏείτε να συνδυάσετε αυτές τις επαφές σε μία μόνο ΜαÏία ΠαπαδοποÏλου."
+
+#: C/link-contacts.page:60(title)
+#| msgid "Hide offline contacts"
+msgid "Combining contacts"
+msgstr "Συνδυασμός επαφών"
+
+#: C/link-contacts.page:63(p)
+msgid "From the <gui>Contact List</gui> window, right-click one of the contact that has different accounts, and select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr "Από το παÏάθυÏο <gui>Λίστα επαφών</gui>, κάντε δεξί κλικ σε μια επαφή που έχει διαφοÏετικοÏÏ‚ λογαÏιασμοÏÏ‚ και επιλέξτε <gui style=\"menuitem\">Συγχώνευση επαφών…</gui>."
+
+#: C/link-contacts.page:70(p)
+#| msgid ""
+#| "From the <gui>Saved Presets</gui> box, select the status message you want "
+#| "to remove."
+msgid "From the left pane in the <gui>Link Contacts</gui> window, select the contacts you want to combine."
+msgstr "Από το αÏιστεÏÏŒ πλαίσιο στο παÏάθυÏο <gui>Συγχώνευση επαφών</gui>, επιλέξτε τις επαφές που θέλετε να συγχωνεÏσετε."
+
+#: C/link-contacts.page:76(p)
+#| msgid "Click <gui style=\"button\">Log in</gui>."
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "Πατήστε <gui style=\"button\">Συγχώνευση</gui>."
+
+#: C/link-contacts.page:82(p)
+msgid "When a meta-contact has been created, the default contact that will be used to have a conversation with when you double-click on it, is the contact with the highest presence on-line."
+msgstr "Όταν έχει δημιουÏγηθεί μια μετα-επαφή, η Ï€Ïοεπιλεγμένη επαφή που θα χÏησιμοποιηθεί για να έχετε μια συζήτηση με αυτή όταν κάνετε διπλό κλικ σε αυτή, είναι η επαφή με τη μεγαλÏτεÏη διαδικτυακή παÏουσία."
+
+#: C/link-contacts.page:91(title)
+#| msgid "Hide offline contacts"
+msgid "Separating contacts"
+msgstr "ΔιαχωÏισμός επαφών"
+
+#: C/link-contacts.page:94(p)
+msgid "From the <gui>Contact List</gui>, right-click the contact to separate, and select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr "Από το παÏάθυÏο <gui>Λίστα επαφών</gui>, κάντε δεξί κλικ στην επαφή που θα διαχωÏίσετε και επιλέξτε <gui style=\"menuitem\">Συγχώνευση επαφών…</gui>."
+
+#: C/link-contacts.page:100(p)
+#| msgid "Click <gui style=\"button\">Log in</gui>."
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "Πατήστε <gui style=\"button\">ΔιαχωÏισμός</gui>."
+
#: C/license.page:8(desc)
msgid "Legal information."
msgstr "Îομικές πληÏοφοÏίες."
@@ -873,7 +1001,8 @@ msgid "For the full text of the license, see the <link href=\"http://creativecom
msgstr "Για το πλήÏες κείμενο της άδειας, δείτε τον <link href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\">ιστότοπο CreativeCommons</link>, ή διαβάστε όλη την <link href=\"http://creativecommons.org/licenses/by-sa/3.0/\">ΠÏάξη Commons</link>."
#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation witn an IRC contact."
+#| msgid "Start a conversation witn an IRC contact."
+msgid "Start a conversation with an IRC contact."
msgstr "ΈναÏξη συζήτησης με επαφή στο IRC."
#: C/irc-start-conversation.page:30(title)
@@ -921,12 +1050,6 @@ msgid "On some IRC networks, you can register your nickname with a service calle
msgstr "Σε οÏισμένα δίκτυα IRC μποÏείτε να καταχωÏήσετε το ψευδώνυμό σας στην υπηÏεσία NickServ. ΟÏίζετε το συνθηματικό σας στέλνοντας ειδικά μηνÏματα στο NickServ, και το χÏησιμοποιείτε για να εισέÏχεστε. ΟÏισμένα δωμάτια συζήτησης IRC δεν επιτÏέπουν την είσοδο χωÏίς καταχωÏημένο ψευδώνυμο."
#: 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."
msgstr "ΠÏος το παÏόν, το <app>Empathy</app> δεν υποστηÏίζει την καταχώÏηση ψευδωνÏμων. Ωστόσο, οÏισμένα δίκτυα IRC Ï€ÏοωθοÏν αυτόματα το <em>συνθηματικό εξυπηÏετητή</em> στο NickServ. Σε αυτά τα δίκτυα, μποÏείτε να χÏησιμοποιείτε το συνθηματικό του IRC στο <app>Empathy</app> για να κάνετε την πιστοποίηση στο NickServ. Το δημοφιλές δίκτυο FreeNode ανήκει σε αυτήν την κατηγοÏία δικτÏων."
@@ -961,9 +1084,6 @@ msgstr "Internet Relay Chat (IRC)"
#: 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 "Για να χÏησιμοποιήσετε το IRC στο <app>Empathy</app>, θα Ï€Ïέπει να έχετε εγκατεστημένο το πακέτο <sys>telepathy-idle</sys>."
@@ -980,7 +1100,7 @@ msgid "Common IRC Problems"
msgstr "Κοινά Ï€Ïοβλήματα του IRC"
#: C/irc-manage.page:52(title)
-#: C/index.page:52(title)
+#: C/index.page:55(title)
msgid "Common Problems"
msgstr "Κοινά Ï€Ïοβλήματα"
@@ -1027,20 +1147,14 @@ msgid "Join a protected IRC chat room"
msgstr "Είσοδος σε Ï€Ïοστατευμένο δωμάτιο συζήτησης 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. If you know the password, use the following steps to join:"
msgstr "Σε μεÏικά δίκτυα IRC, κάποια ιδιωτικά δωμάτια συζήτησης μποÏεί να Ï€ÏοστατεÏονται με ένα συνθηματικό. Αν το γνωÏίζετε, χÏησιμοποιήστε τα ακόλουθα βήματα για να συνδεθείτε:"
#: 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\">Συνδεθείτε στο δωμάτιο</link> κανονικά."
#: 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 "Empathy will prompt you for a password. Enter the password for the IRC chat room and click <gui style=\"button\">Join</gui>."
msgstr "Το Empathy θα σας ζητήσει συνθηματικό. ΠληκτÏολογήστε το συνθηματικό του δωματίου του IRC, και πατήστε το <gui style=\"button\">Είσοδος</gui>."
@@ -1075,11 +1189,6 @@ msgid "Introduction"
msgstr "Εισαγωγή"
#: 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 calls, file transfers, and all the most used messaging systems such as MSN and Google Talk."
msgstr "Το <app>Empathy</app> είναι μια εφαÏμογή αποστολής άμεσων μηνυμάτων για την επιφάνεια εÏγασίας του GNOME. ΠαÏέχει υποστήÏιξη για αποστολή γÏαπτών μηνυμάτων, φωνητικές κλήσεις &amp; βιντεοκλήσεις, μεταφοÏά αÏχείων, και όλα τα πιο δημοφιλή συστήματα αποστολής μηνυμάτων, όπως το MSN και το Google Talk."
@@ -1088,10 +1197,6 @@ msgid "<app>Empathy</app> includes features that help you better collaborate whi
msgstr "Το <app>Empathy</app> πεÏιλαμβάνει λειτουÏγίες που διευκολÏνουν τις επαγγελματικές σας συνεÏγασίες και σας επιτÏέπουν να παÏαμένετε σε επαφή με τους φίλους σας."
#: C/introduction.page:32(p)
-#| 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."
msgid "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 "Η χÏήση του <app>Empathy</app>, σας επιτÏέπει να ομαδοποιείτε όλες τις συζητήσεις σας σε ένα παÏάθυÏο, ή να χÏησιμοποιείτε διαφοÏετικά παÏάθυÏα για κάθε συζήτηση. Σας δίνει τη δυνατότητα να κάνετε εÏκολα αναζητήσεις στις Ï€ÏοηγοÏμενες συζητήσεις σας και να μοιÏάζεστε την επιφάνεια εÏγασίας σας με δÏο μόνο κλικ."
@@ -1109,36 +1214,40 @@ msgstr "Βασικό παÏάθυÏο του <app>Empathy</app>"
#. 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/index.page:27(None)
+#: C/index.page:28(None)
msgid "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
msgstr "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
#: C/index.page:7(title)
#: C/index.page:8(title)
-msgid "Empathy Instant Messenger"
+#| msgid "Empathy Instant Messenger"
+msgid "Empathy Internet Messenger"
msgstr "Αποστολέας άμεσων μηνυμάτων Empathy"
-#: C/index.page:26(title)
-msgid "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
+#: C/index.page:27(title)
+#| msgid ""
+#| "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
+#| "\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
+msgid "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> Empathy Internet Messenger logo </media> Empathy Internet Messenger"
msgstr "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\">λογότυπο του Αποστολέα άμεσων μηνυμάτων Empathy</media> Αποστολέας άμεσων μηνυμάτων Empathy"
-#: C/index.page:32(title)
+#: C/index.page:35(title)
msgid "Account Management"
msgstr "ΔιαχείÏιση λογαÏιασμών"
-#: C/index.page:36(title)
+#: C/index.page:39(title)
msgid "Contact Management"
msgstr "ΔιαχείÏιση επαφών"
-#: C/index.page:40(title)
+#: C/index.page:43(title)
msgid "Text Conversations"
msgstr "ΓÏαπτές συζητήσεις"
-#: C/index.page:44(title)
+#: C/index.page:47(title)
msgid "Audio and Video Conversations"
msgstr "Φωνητικές κλήσεις και βιντεοκλήσεις"
-#: C/index.page:48(title)
+#: C/index.page:51(title)
msgid "Advanced Actions"
msgstr "Για Ï€ÏοχωÏημένους"
@@ -1339,8 +1448,12 @@ msgid "To increase the accuracy of your position, deselect <gui>Reduce location
msgstr "Για να αυξήσετε την ακÏίβεια του εντοπισμοÏ, αποεπιλέξτε το <gui>Μείωση της ακÏίβειας της τοποθεσίας μου</gui>."
#: C/geolocation-turn.page:61(p)
-msgid "If you have an external device like a GPS or want to send a more accurate position, select the appropriate option in the <gui>Geoclue Settings</gui> section."
-msgstr "Αν διαθέτετε εξωτεÏική συσκευή (Ï€.χ. GPS), ή αν θέλετε να στέλνετε πιο ακÏιβή στοιχεία για την τοποθεσία σας, σημειώστε την κατάλληλη επιλογή στην ενότητα <gui>Ρυθμίσεις Geoclue</gui>."
+#| msgid ""
+#| "If you have an external device like a GPS or want to send a more accurate "
+#| "position, select the appropriate option in the <gui>Geoclue Settings</"
+#| "gui> section."
+msgid "If you have an external device like a GPS or want to send a more accurate position, select the appropriate option in the <gui>Location sources</gui> section."
+msgstr "Αν διαθέτετε μια εξωτεÏική συσκευή (Ï€.χ. GPS), ή αν θέλετε να στέλνετε πιο ακÏιβή στοιχεία για την τοποθεσία σας, σημειώστε την κατάλληλη επιλογή στην ενότητα <gui>Πηγές τοποθεσίας</gui>."
#: C/geolocation-supported.page:7(desc)
msgid "Services that supports geolocation and compatibility."
@@ -1591,16 +1704,10 @@ msgid "Most account types require you to create an account with a account provid
msgstr "Οι πεÏισσότεÏες υπηÏεσίες απαιτοÏν τη δημιουÏγία λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎµ συγκεκÏιμένο πάÏοχο, Ï€Ïιν σας επιτÏέψουν να στέλνετε άμεσα μηνÏματα, χÏησιμοποιώντας εφαÏμογές όπως το <app>Empathy</app>. Για οÏισμένους παÏόχους μποÏείτε να χÏησιμοποιήσετε το <app>Empathy</app> για να δημιουÏγήσετε νέο λογαÏιασμό, ακολουθώντας την ίδια διαδικασία που θα χÏησιμοποιοÏσατε και για <link xref=\"add-account\">Ï€Ïοσθήκη λογαÏιασμοÏ</link>."
#: 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 using <app>Empathy</app>."
msgstr "Αυτή η σελίδα παÏέχει πληÏοφοÏίες για τη δημιουÏγία νέου λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎµ διάφοÏες υπηÏεσίες. Ο πάÏοχος του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï Î¸Î± Ï€Ïέπει να σας παÏέχει το όνομα χÏήστη και το συνθηματικό σας, καθώς και οποιεσδήποτε άλλες πληÏοφοÏίες απαιτοÏνται για τη σÏνδεση μέσω <app>Empathy</app>."
#: C/create-account.page:46(title)
-#| msgid "Facebook Chat"
msgid "Facebook"
msgstr "Facebook"
@@ -1673,10 +1780,6 @@ msgid "You do not need to register for an account to use IRC. Although you speci
msgstr "Δε χÏειάζεται να διαθέτετε λογαÏιασμό για να χÏησιμοποιήσετε το IRC. ΠαÏόλο που Ï€Ïέπει να επιλέξετε ένα ψευδώνυμο για να Ï€Ïοσθέσετε ένα λογαÏιασμό IRC στο <app>Empathy</app>, το ψευδώνυμο αυτό μποÏεί να αλλάζει κάθε φοÏά που συνδέεστε. Επίσης, αν υπάÏχει άλλος χÏήστης με το ίδιο ψευδώνυμο, θα Ï€Ïέπει να αλλάξετε το δικό σας."
#: 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."
msgid "Some IRC networks use a service called NickServ to allow users to protect their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
msgstr "ΟÏισμένα δίκτυα IRC χÏησιμοποιοÏν μία υπηÏεσία που ονομάζεται NickServ και η οποία επιτÏέπει στους χÏήστες να Ï€ÏοστατεÏουν τα ψευδώνυμά τους. Δείτε το <link xref=\"irc-nick-password\"/> για πεÏισσότεÏες πληÏοφοÏίες."
@@ -1743,7 +1846,6 @@ 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/audio-video.page:58(None)
-#: C/audio-call.page:47(None)
msgid "@@image: 'figures/audio-input-microphone.png'; md5=8d89026b66a263a3bc5b1f0665948567"
msgstr "@@image: 'figures/audio-input-microphone.png'; md5=8d89026b66a263a3bc5b1f0665948567"
@@ -1903,21 +2005,44 @@ msgstr "zephyr"
msgid "Call your contacts over the Internet."
msgstr "Κλήση των επαφών σας μέσω διαδικτÏου."
-#: C/audio-call.page:33(title)
+#: C/audio-call.page:27(title)
msgid "Start an audio conversation"
msgstr "ΈναÏξη φωνητικής κλήσης"
-#: C/audio-call.page:35(p)
+#: C/audio-call.page:29(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."
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>."
-msgstr "Στο παÏάθυÏο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-microphone.png\">φωνητική κλήση</media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλέσετε, και επιλέξτε <gui style=\"menuitem\">Φωνητική κλήση</gui>. Εναλλακτικά, κάνετε δεξί κλικ στο όνομα της επαφής και επιλέξτε <gui style=\"menuitem\">Φωνητική κλήση</gui>."
-
-#: 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 "Για να μετατÏέψετε μια φωνητική κλήση σε βιντεοκλήση, επιλέξτε <guiseq><gui style=\"menu\">Βίντεο</gui><gui style=\"menuitem\">Βίντεο ενεÏγό</gui></guiseq>, ή πατήστε το κουμπί <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</media> της εÏγαλειοθήκης."
+#: C/audio-call.page:34(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>."
+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\">Audio Call</gui>."
+msgstr "Από το παÏάθυÏο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλέσετε, και επιλέξτε <gui style=\"menuitem\">Φωνητική κλήση</gui>."
+
+#: C/audio-call.page:55(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."
+msgid "To turn an audio conversation into a video conversation, choose <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
+msgstr "Για να μετατÏέψετε μια φωνητική κλήση σε βιντεοκλήση, επιλέξτε <guiseq><gui style=\"menu\">Βίντεο</gui><gui style=\"menuitem\">Βίντεο ενεÏγό</gui></guiseq>."
+
+#: C/audio-call.page:63(title)
+#| msgid "Start a conversation witn an IRC contact."
+msgid "Start an audio conversation with a meta-contact"
+msgstr "ΈναÏξη φωνητικής συζήτησης με μια μετα-επαφή"
+
+#: C/audio-call.page:71(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Audio Call</gui>."
+msgstr "Επιλέξτε την επαφή με την οποία θέλετε να συζητήσετε, και από το Î¼ÎµÎ½Î¿Ï ÎµÏ€Î¹Î»Î­Î¾Ï„Îµ <gui style=\"menuitem\">Φωνητική κλήση</gui>."
#: C/add-contact.page:9(desc)
msgid "Add someone to the contact list."
@@ -1980,7 +2105,6 @@ msgid "Enter the required information. For most accounts, you will only need a l
msgstr "Εισάγετε τις απαιτοÏμενες πληÏοφοÏίες. Για τους πεÏισσότεÏους Ï„Ïπους λογαÏιασμών, αÏκοÏν το όνομα χÏήστη και το συνθηματικό. Ωστόσο, οÏισμένοι Ï„Ïποι μποÏεί να απαιτοÏν και επιπλέον στοιχεία. Δείτε την <link xref=\"accounts-window#details\"/> για πεÏισσότεÏες πληÏοφοÏίες."
#: C/add-account.page:71(p)
-#| msgid "Click <gui style=\"button\">Add</gui>."
msgid "Click <gui style=\"button\">Log in</gui>."
msgstr "Πατήστε <gui style=\"button\">ΣÏνδεση</gui>."
@@ -2013,7 +2137,6 @@ msgid "Advanced options for Jabber and Google Talk accounts."
msgstr "Επιλογές για Ï€ÏοχωÏημένους σε λογαÏιασμοÏÏ‚ Jabber και Google Talk."
#: C/account-jabber.page:29(title)
-#| msgid "Jabber Account Details"
msgid "Jabber account details"
msgstr "Στοιχεία λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï Jabber"
@@ -2082,7 +2205,6 @@ msgid "Additional information necessary for connecting to IRC networks."
msgstr "Επιπλέον στοιχεία που απαιτοÏνται για τη σÏνδεση σε δίκτυα IRC."
#: C/account-irc.page:31(title)
-#| msgid "IRC Account Details"
msgid "IRC account details"
msgstr "Στοιχεία λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï IRC"
@@ -2120,13 +2242,6 @@ msgid "NickServ Passwords"
msgstr "Συνθηματικά NickServ"
#: 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 identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for more details."
msgstr "Σε οÏισμένα δίκτυα, είναι δυνατόν να καταχωÏήσετε το ψευδώνυμό σας, χÏησιμοποιώντας την υπηÏεσία NickServ. Το <app>Empathy</app> δεν υποστηÏίζει απευθείας τη χÏήση συνθηματικών για τα ψευδώνυμα. Σε οÏισμένα δίκτυα, όπως το δημοφιλές δίκτυο FreeNode, τα συνθηματικά του εξυπηÏετητή Ï€ÏοωθοÏνται αυτόματα στο NickServ, και άÏα μποÏείτε να εισάγετε το συνθηματικό σας στο πεδίο αυτό. Για πεÏισσότεÏες λεπτομέÏειες, δείτε την <link xref=\"irc-nick-password\"/>."
@@ -2220,6 +2335,19 @@ msgstr ""
"Για πεÏισσότεÏες πληÏοφοÏίες, επισκεφθείτε τη σελίδα http://www.gnome.gr/"
#~ 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>."
+#~ msgstr ""
+#~ "Στο παÏάθυÏο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type="
+#~ "\"image\" mime=\"image/png\" src=\"figures/audio-input-microphone.png"
+#~ "\">φωνητική κλήση</media> δίπλα από το όνομα της επαφής που επιθυμείτε να "
+#~ "καλέσετε, και επιλέξτε <gui style=\"menuitem\">Φωνητική κλήση</gui>. "
+#~ "Εναλλακτικά, κάνετε δεξί κλικ στο όνομα της επαφής και επιλέξτε <gui "
+#~ "style=\"menuitem\">Φωνητική κλήση</gui>."
+#~ msgid ""
#~ "Click on the trash icon next to the account name to remove the account."
#~ msgstr ""
#~ "Κάνετε κλικ στο εικονίδιο των αποÏÏιμμάτων δίπλα στο όνομα του "
diff --git a/help/es/es.po b/help/es/es.po
index 25d732684..c7cb153ec 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy-help.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-15 12:05+0000\n"
-"PO-Revision-Date: 2010-09-16 18:49+0200\n"
+"POT-Creation-Date: 2010-09-25 13:09+0000\n"
+"PO-Revision-Date: 2010-09-26 11:28+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"
@@ -139,12 +139,6 @@ msgstr ""
"Para finalizar una conversación pulse <gui style=\"button\">Colgar</gui>."
#: C/video-call.page:54(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."
msgid ""
"To turn a video conversation into an audio conversation, choose <guiseq><gui "
"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
@@ -1265,10 +1259,6 @@ msgid "Click <gui style=\"button\">Link</gui>."
msgstr "Pulse <gui style=\"button\">Enlazar</gui>."
#: C/link-contacts.page:82(p)
-#| msgid ""
-#| "When a meta-contact has been created, the default contact that will be "
-#| "used to have a conversation with when you double-click on it, is the last "
-#| "contact you select to link from the <gui>Link Contacts</gui> window."
msgid ""
"When a meta-contact has been created, the default contact that will be used "
"to have a conversation with when you double-click on it, is the contact with "
@@ -1283,9 +1273,6 @@ msgid "Separating contacts"
msgstr "Separar contactos"
#: C/link-contacts.page:94(p)
-#| msgid ""
-#| "From the <gui>Contact List</gui>, right-click the contact to separate, "
-#| "and select <gui style=\"menuitem\">Unlink...</gui>."
msgid ""
"From the <gui>Contact List</gui>, right-click the contact to separate, and "
"select <gui style=\"menuitem\">Link Contacts...</gui>."
@@ -1295,7 +1282,6 @@ msgstr ""
"contactos...</gui>."
#: C/link-contacts.page:100(p)
-#| msgid "Click on <gui style=\"button\">Unlink</gui>."
msgid "Click <gui style=\"button\">Unlink</gui>."
msgstr "Pulse <gui style=\"button\">Desenlazar</gui>."
@@ -1379,7 +1365,7 @@ msgstr ""
"sa/3.0/\">Escrito de Commons</link>."
#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation witn an IRC contact."
+msgid "Start a conversation with an IRC contact."
msgstr "Iniciar una conversación con un contacto del IRC."
#: C/irc-start-conversation.page:30(title)
@@ -1714,14 +1700,10 @@ msgstr ""
"@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
#: C/index.page:7(title) C/index.page:8(title)
-#| msgid "Empathy Instant Messenger"
msgid "Empathy Internet Messenger"
msgstr "Mensajería para Internet Empathy"
#: C/index.page:27(title)
-#| msgid ""
-#| "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-#| "\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
msgid ""
"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
@@ -2056,14 +2038,18 @@ msgstr ""
"precisión de la ubicación</gui>."
#: C/geolocation-turn.page:61(p)
+#| msgid ""
+#| "If you have an external device like a GPS or want to send a more accurate "
+#| "position, select the appropriate option in the <gui>Geoclue Settings</"
+#| "gui> section."
msgid ""
"If you have an external device like a GPS or want to send a more accurate "
-"position, select the appropriate option in the <gui>Geoclue Settings</gui> "
+"position, select the appropriate option in the <gui>Location sources</gui> "
"section."
msgstr ""
"Si tiene un dispositivo externo como un GPS y quiere enviar una posición más "
-"precisa, seleccione la opción apropiada en la sección <gui>Configuración de "
-"Geoclue</gui>."
+"precisa, seleccione la opción apropiada en la sección <gui>Orígenes de las "
+"ubicaciones</gui>."
#: C/geolocation-supported.page:7(desc)
msgid "Services that supports geolocation and compatibility."
@@ -2916,11 +2902,6 @@ msgstr ""
"la otra persona tenga una aplicación que soporte llamadas de sonido."
#: C/audio-call.page:34(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>."
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 "
@@ -2933,11 +2914,6 @@ msgstr ""
"style=\"menuitem\">Llamada de voz</gui>."
#: C/audio-call.page:55(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."
msgid ""
"To turn an audio conversation into a video conversation, choose <guiseq><gui "
"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
diff --git a/help/fr/fr.po b/help/fr/fr.po
index a4100c113..831b51564 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -11,8 +11,8 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy help fr\n"
-"POT-Creation-Date: 2010-09-11 17:27+0000\n"
-"PO-Revision-Date: 2010-09-10 20:17+0200\n"
+"POT-Creation-Date: 2010-09-25 13:09+0000\n"
+"PO-Revision-Date: 2010-09-27 10:54+0200\n"
"Last-Translator: Bruno Brouard <annoa.b@gmail.com>\n"
"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
"MIME-Version: 1.0\n"
@@ -1294,7 +1294,8 @@ msgid ""
"select <gui style=\"menuitem\">Link Contacts...</gui>."
msgstr ""
"Dans la fenêtre <gui>Liste des contacts</gui>, faites un clic droit sur le "
-"contact à séparer et sélectionnez <gui style=\"menuitem\">Lier des contacts...</gui>."
+"contact à séparer et sélectionnez <gui style=\"menuitem\">Lier des "
+"contacts...</gui>."
#: C/link-contacts.page:100(p)
msgid "Click <gui style=\"button\">Unlink</gui>."
@@ -1381,7 +1382,7 @@ msgstr ""
"licenses/by-sa/3.0/\">le contrat complet de Commons</link>."
#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation witn an IRC contact."
+msgid "Start a conversation with an IRC contact."
msgstr "Démarrer une conversation avec un contact IRC."
#: C/irc-start-conversation.page:30(title)
@@ -1733,8 +1734,7 @@ msgid ""
"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
msgstr ""
"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Logo de Messagerie internet Empathy</media> Messagerie internet "
-"Empathy"
+"\">Logo de Messagerie internet Empathy</media> Messagerie internet Empathy"
#: C/index.page:35(title)
msgid "Account Management"
@@ -2066,12 +2066,12 @@ msgstr ""
#: C/geolocation-turn.page:61(p)
msgid ""
"If you have an external device like a GPS or want to send a more accurate "
-"position, select the appropriate option in the <gui>Geoclue Settings</gui> "
+"position, select the appropriate option in the <gui>Location sources</gui> "
"section."
msgstr ""
"Si vous disposez d'un périphérique externe comme un GPS ou que vous vouliez "
"envoyer une position plus précise, choisissez l'option appropriée dans la "
-"section <gui>Paramètres Geoclue</gui>."
+"section <gui>Sources d'emplacements</gui>."
#: C/geolocation-supported.page:7(desc)
msgid "Services that supports geolocation and compatibility."
@@ -3516,4 +3516,3 @@ msgstr ""
"Bruno Brouard <annoa.b@gmail.com>, 2007,2010\n"
"Frédéric Péters <fpeters@0d.be>, 2008\n"
"Rémi Peixoto <remi.peixoto@gmail.com>, 2009"
-
diff --git a/help/gl/gl.po b/help/gl/gl.po
index 98e81d326..521c2494e 100644
--- a/help/gl/gl.po
+++ b/help/gl/gl.po
@@ -1,13 +1,12 @@
#
# Fran Diéguez <frandieguez@ubuntu.com>, 2010.
-# Fran Dieguez <frandieguez@ubuntu.com>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy.help.master\n"
"POT-Creation-Date: 2010-09-11 17:27+0000\n"
-"PO-Revision-Date: 2010-09-13 13:09+0200\n"
-"Last-Translator: Fran Dieguez <frandieguez@ubuntu.com>\n"
+"PO-Revision-Date: 2010-09-18 19:50+0200\n"
+"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
"Language-Team: Galician <gnome-gl-list@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -139,8 +138,9 @@ msgid ""
"<gui>Connected</gui> at the bottom of the window, along with the total "
"conversation time."
msgstr ""
-"Abrirase unha nova xanela. Cando a conexión se estabeleza verá <placeholder-"
-"2/> na parte inferior da xanela, ao carón do tempo de conversa total."
+"Abrirase unha nova xanela. Cando a conexión se estabeleza verá "
+"<placeholder-2/> na parte inferior da xanela, ao carón do tempo de conversa "
+"total."
#: C/video-call.page:48(p) C/audio-call.page:48(p)
msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
@@ -928,8 +928,8 @@ msgid ""
"An error message which says “<gui>Name in use</gui>†appears in the main "
"window."
msgstr ""
-"Aparecen na xanela principal unha mensaxe de erro que dice «<gui>Nome en uso</"
-"gui>»"
+"Aparecen na xanela principal unha mensaxe de erro que dice «<gui>Nome en "
+"uso</gui>»"
#: C/prob-conn-name.page:32(title)
msgid "I get a message that says “Name in useâ€"
@@ -1157,12 +1157,16 @@ 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."
msgstr ""
+"Seleccione unha conta desde a lista despregábel na parte superior esquerda. "
+"Mostrarase unha lista de contactos e salas de conversa para dita conta."
#: C/prev-conv.page:107(p)
msgid ""
"Select a contact or chat room to view your previous conversations from. By "
"default the most recent conversation will be shown."
msgstr ""
+"Seleccione un contacto ou sala de conversa desde a que ver as anteriores "
+"conversas. Por omisión mostrarase a conversa máis recente."
#: C/prev-conv.page:111(p)
msgid ""
@@ -1171,20 +1175,29 @@ msgid ""
"date to select it. Click the arrows next to the month and year to browse "
"earlier dates."
msgstr ""
+"Pode explorar as súas conversas por data. Mostraranse os días nos que tipo "
+"unha conversa co contacto seleccionado en texto en negriña. Prema na data "
+"para seleccionala e prema nas frechas ao lado do mes e ano para explorar as "
+"datas máis cercanas."
#: C/prev-conv.page:117(p)
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 ""
+"Pode buscar dentro do texto das conversas mostradas escribindo na caixa de "
+"busca na parte superior. O texto coincidente resaltarase."
#: C/prev-conv.page:121(p)
+#, fuzzy
msgid ""
"You can quickly view the previous conversations with one of your contacts "
"from the <gui>Contact List</gui> window. Simply right click the contact and "
"choose <gui>View Previous Conversations</gui>. The <gui>Previous "
"Conversations</gui> window will open with that contact already selected."
msgstr ""
+"Pode ver de forma rápida as conversas anteriores con un dos seus contactos "
+"desde a lista de "
#: C/link-contacts.page:11(desc)
msgid "Merge and separate different contacts into a single one."
@@ -3155,8 +3168,8 @@ msgid ""
"height=\"16\">Remove</media>."
msgstr ""
"Para eliminar unha rede da lista seleccione e prema <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16"
-"\">Eliminar</media>."
+"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height="
+"\"16\">Eliminar</media>."
#: C/account-irc.page:115(p)
msgid ""
diff --git a/help/hu/hu.po b/help/hu/hu.po
new file mode 100644
index 000000000..83ecff071
--- /dev/null
+++ b/help/hu/hu.po
@@ -0,0 +1,3383 @@
+# Hungarian translation of empathy-docs
+# Copyright (C) 2010. Free Software Foundation, Inc.
+# This file is distributed under the same license as the empathy package.
+#
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: empathy-docs master\n"
+"POT-Creation-Date: 2010-09-25 16:27+0000\n"
+"PO-Revision-Date: 2010-09-25 18:29+0200\n"
+"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
+"Language-Team: Hungarian <gnome at fsf dot hu>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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:38(None) C/audio-video.page:70(None)
+#: C/audio-call.page:36(None)
+msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+msgstr "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+
+#: C/video-call.page:10(desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "Videobeszélgetés kezdése egyik partnerével."
+
+#: 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: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/link-contacts.page:15(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: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:19(name)
+#: C/import-account.page:23(name) C/hide-contacts.page:11(name)
+#: C/group-conversations.page:19(name) C/geolocation-what-is.page:18(name)
+#: C/geolocation-turn.page:18(name) 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:18(name)
+#: C/audio-video.page:17(name) C/audio-call.page:19(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: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/link-contacts.page:16(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: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:20(email)
+#: C/import-account.page:24(email) C/hide-contacts.page:12(email)
+#: C/group-conversations.page:20(email) C/geolocation-what-is.page:19(email)
+#: C/geolocation-turn.page:19(email) 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:19(email) C/audio-video.page:18(email)
+#: C/audio-call.page:20(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:21(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/link-contacts.page:19(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:23(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:22(p) C/change-status.page:23(p)
+#: C/audio-video.page:21(p) C/audio-call.page:23(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:20(p)
+msgid "Creative Commons Share Alike 3.0"
+msgstr "Creative Commons Share Alike 3.0"
+
+#: C/video-call.page:28(title)
+msgid "Start a video conversation"
+msgstr "Videobeszélgetés kezdése"
+
+#: C/video-call.page:30(p)
+msgid ""
+"If you have a webcam, you can call your contacts and have a video "
+"conversation with them. This features only works with certain types of "
+"accounts, and it requires the other person to have an application that "
+"supports video calls."
+msgstr ""
+"Ha rendelkezik webkamerával, akkor felhívhatja partnereit, és "
+"videobeszélgetést folytathat velük. Ezek a szolgáltatások csak bizonyos "
+"fióktípusokkal működnek, és a másik félnek is rendelkeznie kell a "
+"videohívásokat támogató alkalmazással."
+
+#: C/video-call.page:37(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>."
+msgstr ""
+"A <gui>Partnerlista</gui> ablakban kattintson a <media type=\"image\" mime="
+"\"image/png\" src=\"figures/camera-web.png\">videohívás</media> ikonra a "
+"felhívni kívánt partner neve mellett, és válassza a <gui style=\"menuitem"
+"\">Videohívás</gui> menüpontot."
+
+#: C/video-call.page:43(p) C/audio-call.page:42(p)
+msgid ""
+"A new window will open. When the connection is established, you will see "
+"<gui>Connected</gui> at the bottom of the window, along with the total "
+"conversation time."
+msgstr ""
+"Egy új ablak nyílik meg. A kapcsolat létrejöttekor az ablak alján a "
+"<gui>Kapcsolódva</gui> felirat jelenik meg, a beszélgetés teljes idejével "
+"együtt."
+
+#: C/video-call.page:48(p) C/audio-call.page:48(p)
+msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
+msgstr ""
+"A beszélgetés befejezéséhez kattintson a <gui style=\"button\">Befejezés</"
+"gui> gombra."
+
+#: C/video-call.page:54(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>."
+msgstr ""
+"Videobeszélgetás hangbeszélgetéssé alakításához válassza a <guiseq><gui "
+"style=\"menu\">Videó</gui><gui style=\"menuitem\">Videó ki</gui></guiseq> "
+"menüpontot."
+
+#: C/video-call.page:60(title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "Videobeszélgetés indítása metapartnerrel"
+
+#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p)
+msgid "From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr ""
+"A <gui>Partnerlista</gui> ablakban kattintson a jobb egérgombbal a "
+"metapartnerre."
+
+#: C/video-call.page:68(p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Video Call</gui>."
+msgstr ""
+"Válassza ki a partnert, akivel beszélgetni szeretne, és a menüből válassza a "
+"<gui style=\"menuitem\">Videohívás</gui> lehetőséget."
+
+#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p)
+msgid ""
+"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
+"contact in the <gui>Contact List</gui> window, and stop over it for a "
+"second: a small pop-up message will appear showing the number of the "
+"contacts that form the meta-contact."
+msgstr ""
+"Annak eldöntéséhez, hogy egy partnert <em>metapartner</em>-e, vigye "
+"egérmutatóját a partnerre a <gui>Partnerlista</gui> ablakban, és a megjelenő "
+"üzenet megadja a metapartnert alkotó partnerek számát."
+
+#. 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/status-icons.page:39(None)
+msgid "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+msgstr "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+
+#. 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/status-icons.page:45(None)
+msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+msgstr "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+
+#. 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/status-icons.page:53(None)
+msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+msgstr "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+
+#. 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/status-icons.page:62(None) C/status-icons.page:69(None)
+msgid "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
+msgstr "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
+
+#: C/status-icons.page:7(desc)
+msgid "Understanding the various statuses and status icons."
+msgstr "A különböző állapotok és állapotikonok ismertetése."
+
+#: C/status-icons.page:20(name) C/salut-protocol.page:36(cite)
+#: 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: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: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"
+
+#: C/status-icons.page:35(title)
+msgid "Status Types and Icons"
+msgstr "Ãllapottípusok és ikonok"
+
+#: C/status-icons.page:39(media)
+msgid "Available icon"
+msgstr "Elérhető ikon"
+
+#: C/status-icons.page:40(gui)
+msgid "Available"
+msgstr "Elérhető"
+
+#: C/status-icons.page:41(p)
+msgid ""
+"Use the <em>Available</em> status when you are at your computer and able to "
+"chat with your contacts. You can set a custom message for this status."
+msgstr ""
+"Az <em>Elérhető</em> állapottal jelezheti, hogy a számítógépénél van, és "
+"ráér partnereivel csevegni. Ehhez az állapothoz beállíthat egyéni üzenetet."
+
+#: C/status-icons.page:45(media)
+msgid "Busy icon"
+msgstr "Elfoglalt ikon"
+
+#: C/status-icons.page:46(gui)
+msgid "Busy"
+msgstr "Elfoglalt"
+
+#: 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 "
+"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 ""
+"Az <em>Elfoglalt</em> állapottal hozhatja partnerei tudomására, hogy éppen "
+"nem szeretne csevegni velük. Ennek ellenére felvehetik Önnel a kapcsolatot, "
+"ha valami igazán sürgős megbeszélnivalójuk van. Alapértelmezésben az "
+"<app>Empathy</app> értesítési buborékokat és hangokat használ, ha Ön "
+"elfoglalt. Ehhez az állapothoz beállíthat egyéni üzenetet."
+
+#: C/status-icons.page:53(media)
+msgid "Away icon"
+msgstr "Távol ikon"
+
+#: C/status-icons.page:54(gui)
+msgid "Away"
+msgstr "Távol"
+
+#: C/status-icons.page:55(p)
+msgid ""
+"Use the <em>Away</em> status when you are going away from your computer. "
+"<app>Empathy</app> automatically sets your status to Away if you do not use "
+"your computer for a while, or if your screensaver is on. By default, "
+"<app>Empathy</app> will not use notification bubbles and sounds when you are "
+"away. You can set a custom message for this status."
+msgstr ""
+"A <em>Távol</em> állapotot akkor használja, ha eltávolodik számítógépétől. "
+"Az <app>Empathy</app> automatikusan Távolra állítja állapotát, ha egy ideig "
+"nem használja számítógépét, vagy a képernyővédő aktiválódik. "
+"Alapértelmezésben az <app>Empathy</app> nem használ értesítő buborékokat és "
+"hangokat, ha Ön távol van. Ehhez az állapothoz beállíthat egyéni üzenetet."
+
+#: C/status-icons.page:62(media) C/status-icons.page:69(media)
+msgid "Offline icon"
+msgstr "Kilépett ikon"
+
+#: C/status-icons.page:63(gui)
+msgid "Invisible"
+msgstr "Láthatatlan"
+
+#: 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."
+msgstr ""
+"Amikor állapotát <em>Láthatatlanra</em> állítja, partnerei számára "
+"kilépettként jelenik meg. Fiókjaihoz ekkor is csatlakozni fog, láthatja "
+"partnerei állapotát, és társalgásokat indíthat velük."
+
+#: C/status-icons.page:70(gui)
+msgid "Offline"
+msgstr "Kilépett"
+
+#: C/status-icons.page:71(p)
+msgid ""
+"Setting your status to <em>Offline</em> disconnects you from all of your "
+"accounts."
+msgstr "Ãllapotának <em>Kilépettre</em> állítása megszünteti kapcsolatát fiókjaihoz."
+
+#: C/share-desktop.page:7(desc)
+msgid "Share the desktop with your contacts."
+msgstr "Asztalának megosztása partnereivel."
+
+#: C/share-desktop.page:28(title)
+msgid "Share your desktop"
+msgstr "Asztal megosztása"
+
+#: C/share-desktop.page:30(p)
+msgid ""
+"It is possible, with some of your contacts, to share your desktop with them, "
+"or to start using your contacts desktop. You can use this functionality to "
+"show your desktop to your contacts, to ask for help or to help your contacts "
+"resolve a problem."
+msgstr ""
+"Egyes partnereivel megoszthatja asztalát, vagy elkezdheti használni az "
+"övéket. Ezt a funkciót asztala partnereinek való megmutatására használhatja, "
+"így segítséget kérhet vagy segíthet megoldani egy problémát."
+
+#: C/share-desktop.page:38(p)
+msgid ""
+"In order to be able to share your desktop or to remotely use your contacts "
+"desktop, it is necessary to have a remote desktop viewer application "
+"installed in your system."
+msgstr ""
+"Ahhoz, hogy megoszthassa asztalát, vagy távolról használhassa partnereiét, a "
+"távoliasztal-megjelenítő alkalmazásnak telepítve kell lennie rendszerén."
+
+#: C/share-desktop.page:46(p) C/send-file.page:40(p)
+#: C/favorite-rooms.page:66(p)
+msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+msgstr "A <gui>Partnerlista</gui> ablakban hajtsa végre a következők egyikét:"
+
+#: 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>."
+msgstr ""
+"Válassza ki a partnert, akivel meg szeretné osztani az asztalát, és válassza "
+"a <guiseq><gui>Szerkesztés</gui><gui>Partner</gui><gui>Az asztalom "
+"megosztása</gui></guiseq> menüpontot."
+
+#: C/share-desktop.page:57(p)
+msgid ""
+"Right-click on the name of the contact you want to share your desktop with, "
+"and select <gui>Share my desktop</gui>."
+msgstr ""
+"Kattintson a jobb egérgombbal a partner nevére, akivel meg szeretné osztani "
+"az asztalát, és válassza a <gui>Az asztalom megosztása</gui> menüpontot."
+
+#: 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."
+msgstr ""
+"Elküldésre kerül egy kérés a partnerének, akivel meg szeretné osztani az "
+"asztalát. Ha elfogadja, elindul az alapértelmezett távoliasztal-megjelenítő, "
+"ezzel lehetővé téve az asztalát vezérlő felhasználó kapcsolatának "
+"megszakítását."
+
+#: C/share-desktop.page:70(p)
+msgid ""
+"For more information about how to use the remote desktop viewer application, "
+"refer to its help."
+msgstr ""
+"A távoliasztal-megjelenítő alkalmazás használatával kapcsolatos további "
+"információkért nézze meg annak súgóját."
+
+#: C/share-desktop.page:77(p)
+msgid ""
+"When you share your desktop with someone else, it is possible to experience "
+"system performance slowdown and low Internet speed."
+msgstr ""
+"Amikor megosztja asztalát, a rendszer teljesítményének romlását és az "
+"internetkapcsolat lassulását tapasztalhatja."
+
+#: C/share-desktop.page:83(p)
+msgid ""
+"Not all your contacts might be able to support this functionality. It is "
+"necessary for them to have at least the 2.28 version of <app>Empathy</app> "
+"and a remote desktop viewer application installed in their system."
+msgstr ""
+"Nem minden partnere lehet képes ezt a funkciót használni. Ehhez a "
+"rendszerükre az <app>Empathy</app> és a távoliasztal-megjelenítő legalább "
+"2.28-as verziójának kell telepítve lennie."
+
+#: C/set-custom-status.page:9(desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr "Személyes állapotüzenetek hozzáadása, szerkesztése vagy törlése."
+
+#: C/set-custom-status.page:15(name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
+
+#: C/set-custom-status.page:16(email)
+msgid "jwcampbell@gmail.com"
+msgstr "jwcampbell@gmail.com"
+
+#: C/set-custom-status.page:34(title)
+msgid "Set a custom message"
+msgstr "Egyéni üzenet beállítása"
+
+#: C/set-custom-status.page:36(p)
+msgid ""
+"Sometimes you may want to set a custom message for your status, for example "
+"to let people know that you will be unavailable for a certain period of time."
+msgstr ""
+"Egyes esetekben szüksége lehet egyéni állapotüzenet beállítására, például "
+"közölni ismerőseivel, hogy egy ideig nem lesz elérhető."
+
+#: C/set-custom-status.page:40(p)
+msgid ""
+"It is possible to set a custom message based on the different statuses "
+"available."
+msgstr ""
+"A különböző elérhető állapotok alapján lehetőség van egyéni üzenet "
+"beállítására."
+
+#: C/set-custom-status.page:46(p) C/set-custom-status.page:82(p)
+msgid ""
+"From the <gui>Contact List</gui> window, click on the drop-down list at the "
+"top."
+msgstr "A <gui>Partnerlista</gui> ablakban kattintson a felső legördülő listára."
+
+#: 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>."
+msgstr ""
+"Ãllítsa be azt az állapotot, amelyhez az egyéni üzenetet meg kívánja adni. "
+"Az <gui>Egyéni üzenet</gui> címkével jelöltet válassza."
+
+#: 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."
+msgstr ""
+"Adja meg egyéni üzenetét az ablak tetején lévő szövegdobozba, és nyomja meg "
+"az <key>Enter</key> billentyűt az üzenet beállításához."
+
+#: 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."
+msgstr ""
+"Ha az egyéni üzenetet szeretné kedvencként beállítani, így elmentve az "
+"ismételt felhasználáshoz, akkor kattintson az egyéni üzenetet tartalmazó "
+"szövegdoboz jobb oldalán lévő csillagra."
+
+#: C/set-custom-status.page:69(p)
+msgid ""
+"If you do not do it, the custom message will not be available the next time "
+"you use <app>Empathy</app>. It will be saved only for the current session."
+msgstr ""
+"Ha ezt nem teszi meg, akkor az egyéni üzenet nem lesz elérhető az "
+"<app>Empathy</app> következő használatakor. Az üzenet alapértelmezésben csak "
+"az aktuális munkamenetben marad meg."
+
+#: C/set-custom-status.page:78(title)
+msgid "Edit, remove and add a custom message"
+msgstr "Egyéni üzenet szerkesztése, eltávolítása és hozzáadása"
+
+#: C/set-custom-status.page:88(p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Válassza az <gui>Egyéni üzenetek szerkesztése</gui> lehetőséget."
+
+#: C/set-custom-status.page:95(p)
+msgid "To edit a custom message:"
+msgstr "Egyéni üzenet szerkesztéséhez:"
+
+#: C/set-custom-status.page:100(p)
+msgid ""
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"edit and double-click on it."
+msgstr ""
+"A <gui>Mentett érték</gui> dobozból válassza ki a szerkeszteni kívánt "
+"állapotüzenetet, és kattintson rá duplán."
+
+#: C/set-custom-status.page:106(p)
+msgid "Type the new custom message and press <key>Enter</key> to modify it."
+msgstr ""
+"Ãrja be az új egyéni üzenetet, és nyomja meg az <key>Enter</key> billentyűt "
+"a módosításához."
+
+#: C/set-custom-status.page:113(p)
+msgid "To remove a custom message:"
+msgstr "Egyéni üzenet eltávolításához:"
+
+#: C/set-custom-status.page:118(p)
+msgid ""
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"remove."
+msgstr ""
+"A <gui>Mentett érték</gui> dobozból válassza ki az eltávolítani kívánt "
+"állapotüzenetet."
+
+#: C/set-custom-status.page:124(p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "Kattintson az <gui>Eltávolítás</gui> gombra."
+
+#: C/set-custom-status.page:131(p)
+msgid "To add a new custom message, from the <gui>Add New Preset</gui> section:"
+msgstr "Egyéni üzenet hozzáadásához az <gui>Új érték hozzáadása</gui> szakaszban:"
+
+#: C/set-custom-status.page:136(p)
+msgid ""
+"Click on the drop-down list to select the status you want to set a custom "
+"message to."
+msgstr ""
+"Kattintson a legördülő listára azon állapot kiválasztásához, amelyhez új "
+"egyéni üzenetet kíván megadni."
+
+#: C/set-custom-status.page:142(p)
+msgid "Click on the text box, and type the new custom message."
+msgstr "Kattintson a szövegdobozba, és írja be az új egyéni üzenetet."
+
+#: C/set-custom-status.page:147(p)
+msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+msgstr ""
+"Kattintson a <gui>Hozzáadás</gui> gombra az új üzenet felvételéhez a Mentett "
+"értékek közé."
+
+#: C/set-custom-status.page:156(p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "Ha elkészült, kattintson a <gui>Bezárás</gui> gombra."
+
+#: C/set-custom-status.page:163(p)
+msgid ""
+"When you edit or add a new custom message, it will not be set as the current "
+"status message. You will need to select it from the <gui>Contact List</gui> "
+"window."
+msgstr ""
+"Új egyéni üzenet szerkesztésekor vagy hozzáadásakor nem kerül beállításra "
+"aktuális állapotüzenetként. Ehhez ki kell választania azt a "
+"<gui>Partnerlista</gui> ablakban."
+
+#: C/send-message.page:8(desc)
+msgid "Send a message to one of your contacts."
+msgstr "Üzenet küldése egyik partnerének."
+
+#: C/send-message.page:17(name) C/send-file.page:17(name)
+#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:14(name)
+#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:14(name)
+#: C/change-status.page:19(name) C/add-contact.page:18(name)
+msgid "Phil Bull"
+msgstr "Phil Bull"
+
+#: C/send-message.page:18(email) C/send-file.page:18(email)
+#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:15(email)
+#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:15(email)
+#: C/change-status.page:20(email) C/add-contact.page:19(email)
+msgid "philbull@gmail.com"
+msgstr "philbull@gmail.com"
+
+#: C/send-message.page:32(title)
+msgid "Send a message to someone"
+msgstr "Üzenetek küldése"
+
+#: C/send-message.page:36(p)
+msgid ""
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
+msgstr ""
+"A <gui>Partnerlista</gui> ablakban kattintson duplán azon partner nevére, "
+"akivel csevegni szeretne."
+
+#: C/send-message.page:42(p)
+msgid ""
+"A new window will open. Type a message into the box at the bottom of the "
+"window and press <key>Enter</key> to send it."
+msgstr ""
+"Megnyílik egy új ablak. Ãrja be az üzenetet az ablak alján lévÅ‘ "
+"szövegmezőbe, és nyomja meg az <key>Enter</key> billentyűt az elküldéséhez."
+
+#: C/send-message.page:50(title)
+msgid "Send a message to a meta-contact"
+msgstr "Üzenet küldése metapartnernek"
+
+#: C/send-message.page:58(p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
+msgstr ""
+"Válassza ki a partnert, akivel csevegni szeretne, és a menüből válassza a "
+"<gui style=\"menuitem\">Csevegés</gui> pontot."
+
+#: C/send-file.page:8(desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Fájl küldése a számítógépéről egy partnerének."
+
+#: C/send-file.page:36(title)
+msgid "Send files"
+msgstr "Fájlok küldése"
+
+#: C/send-file.page:45(p)
+msgid ""
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
+msgstr ""
+"Kattintson a jobb egérgombbal a partnerre, akinek fájlt szeretne küldeni, és "
+"válassza a <gui>Fájl küldése</gui> menüpontot."
+
+#: C/send-file.page:50(p)
+msgid ""
+"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
+"gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
+msgstr ""
+"Kattintson a partnerre, akinek fájlt szeretne küldeni, majd válassza a "
+"<guiseq><gui>Szerkesztés</gui><gui>Partner</gui><gui>Fájl küldése</gui></"
+"guiseq> menüpontot."
+
+#: C/send-file.page:58(p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr ""
+"Válassza ki az elküldeni kívánt fájlt, és kattintson a <gui>Küldés</gui> "
+"gombra."
+
+#: C/send-file.page:63(p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "Megjelenik a <gui>Fájlátvitelek</gui> ablak."
+
+#: C/send-file.page:66(p)
+msgid ""
+"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
+"to halt the transfer."
+msgstr ""
+"Várjon, amíg partnere elfogadja a fájlátvitelt, vagy kattintson a "
+"<gui>Leállítás</gui> gombra az átvitel leállításához."
+
+#: C/send-file.page:72(p)
+msgid ""
+"Once the transfer is finished, it is possible to close the <gui>File "
+"Transfers</gui> window."
+msgstr "Az átvitel befejeződése után bezárhatja a <gui>Fájlátvitelek</gui> ablakot."
+
+#: C/send-file.page:80(p)
+msgid ""
+"If you have multiple finished transfers listed in the window, click on "
+"<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 ""
+"Ha az ablakban több befejeződött átvitel is fel van sorolva, akkor "
+"kattintson a <gui>Törlés</gui> gombra a lista kiürítéséhez. Ez a fájlokat "
+"csak a listából törli, a számítógépéről nem."
+
+#: C/send-file.page:87(p)
+msgid ""
+"It is possible to send files only using the following services: <em>Jabber</"
+"em>, <em>Google Talk</em> and <em>People Nearby</em>."
+msgstr ""
+"Fájlok küldése csak a következő szolgáltatások használatával lehetséges: "
+"<em>Jabber</em>, <em>Google Talk</em> és <em>Közeli emberek</em>."
+
+#: 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."
+msgstr ""
+"Ahhoz, hogy valakinek fájlt tudjon küldeni, csatlakoznia kell az "
+"internethez, vagy helyi hálózathoz."
+
+#: C/salut-protocol.page:8(desc)
+msgid "Understanding the People Nearby feature."
+msgstr "A Közeli emberek szolgáltatás bemutatása."
+
+#: C/salut-protocol.page:33(title)
+msgid "What is People Nearby?"
+msgstr "Mi az a Közeli emberek?"
+
+#: C/salut-protocol.page:37(p)
+msgid "I'd like to see this played up a bit more."
+msgstr "<komment>"
+
+#: C/salut-protocol.page:40(p)
+msgid ""
+"The People Nearby service is a serverless communication service: you do not "
+"need to connect and authenticate to a central server in order to use it."
+msgstr ""
+"A Közeli emberek egy kiszolgáló nélküli kommunikációs szolgáltatás: "
+"használatához nincs szükség központi kiszolgálóhoz való csatlakozásra és "
+"bejelentkezésre."
+
+#: C/salut-protocol.page:45(p)
+msgid ""
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
+msgstr ""
+"Ez a fajta kiszolgáló nélküli üzenetküldő rendszer a helyi hálózatra van "
+"korlátozva, és használatához nincs szükség internetkapcsolatra."
+
+#: C/salut-protocol.page:49(p)
+msgid ""
+"The people that use this service inside the same local area network will be "
+"auto-discovered, and it will be possible to send them messages and files as "
+"with other services."
+msgstr ""
+"Az azonos helyi hálózaton ezt a szolgáltatást használó embereket a program "
+"automatikusan megtalálja, és ugyanúgy küldhet nekik üzeneteket és fájlokat, "
+"mint más szolgáltatások esetén."
+
+#: C/salut-protocol.page:54(p)
+msgid ""
+"All the modern local area networks should be able to support this kind of "
+"service."
+msgstr ""
+"Ezt a szolgáltatástípust minden korszerű helyi hálózatnak tudnia kell "
+"támogatni."
+
+#: C/remove-account.page:8(desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "Fiók teljes eltávolítása az <app>Empathyból</app>."
+
+#: C/remove-account.page:33(title)
+msgid "Remove an account"
+msgstr "Fiók eltávolítása"
+
+#: 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."
+msgstr ""
+"Ha egy fiókot már nem kíván használni, teljesen eltávolíthatja azt az "
+"<app>Empathyból</app>. Ha a fiókot később újra használni szeretné az "
+"<app>Empathyból</app>, akkor újra meg kell adnia a fiók részleteit."
+
+#: 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>."
+msgstr ""
+"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Szerkesztés</"
+"gui><gui>Fiókok</gui></guiseq> menüpontot, vagy nyomja meg az <key>F4</key> "
+"billentyűt."
+
+#: 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."
+msgstr "Az ablak bal oldalán válassza ki a fióklistából eltávolítani kívánt fiókot."
+
+#: C/remove-account.page:50(p)
+msgid "Click on <gui style=\"button\">Remove</gui>."
+msgstr "Kattintson az <gui style=\"button\">Eltávolítás</gui> gombra."
+
+#: 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."
+msgstr ""
+"Megjelenik egy megerősítést kérő ablak. Kattintson az <gui>Eltávolítás</gui> "
+"gombra a fiók végleges eltávolításához."
+
+#: C/remove-account.page:59(p)
+msgid ""
+"Even after removing an account, <app>Empathy</app> does not delete your "
+"conversation history for that account."
+msgstr ""
+"Az <app>Empathy</app> még a fiók eltávolítása után sem törli a fiókhoz "
+"tartozó csevegéselőzményeket."
+
+#: C/prob-conn.page:7(desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr ""
+"Üzenetküldő-szolgáltatásokhoz való kapcsolódás általános problémáinak "
+"felismerése."
+
+#: C/prob-conn.page:29(title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Azonnaliüzenet-küldő szolgáltatásokhoz kapcsolódás problémái"
+
+#. 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:109(None)
+msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+
+#: C/prob-conn-neterror.page:7(desc)
+msgid ""
+"An error message which says “<gui>Network error</gui>†appears in the main "
+"window."
+msgstr "A főablakban a „<gui>Hálózati hiba</gui>†üzenet jelenik meg."
+
+#: C/prob-conn-neterror.page:33(title)
+msgid "I get a message that says “Network errorâ€"
+msgstr "A „Hálózati hiba†üzenetet kapom"
+
+#: C/prob-conn-neterror.page:36(cite)
+msgid "shaunm"
+msgstr "shaunm"
+
+#: C/prob-conn-neterror.page:37(p)
+msgid ""
+"Empathy no longer allows you to create an IRC account without a valid nick. "
+"I've removed the guide link. Remove the text."
+msgstr "<komment>"
+
+#: C/prob-conn-neterror.page:41(p)
+msgid ""
+"This kind of error happens when <app>Empathy</app> cannot communicate with "
+"the instant messaging service for some reason."
+msgstr ""
+"Ez a hiba akkor következik be, ha az <app>Empathy</app> valamilyen okból nem "
+"tud kommunikálni az azonnaliüzenő-szolgáltatással."
+
+#: C/prob-conn-neterror.page:45(p)
+msgid ""
+"Also, this kind of error happens when you try to use an IRC account without "
+"setting a nickname."
+msgstr ""
+"Ez a hiba következik be akkor is, ha becenév megadása nélkül próbál IRC-"
+"fiókot használni."
+
+#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p)
+#: C/prob-conn-acctdisabled.page:43(p)
+msgid "Make sure that you are connected to the Internet, or to a local area network."
+msgstr "Győződjön meg róla, hogy csatlakozik az internethez vagy helyi hálózathoz."
+
+#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
+#: C/prob-conn-auth.page:57(p)
+msgid ""
+"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
+"\">edit</media> icon in the error message."
+msgstr ""
+"Kattintson a hibaüzenetben a <media type=\"image\" mime=\"image/png\" src="
+"\"figures/gtk-edit.png\">Szerkesztés</media> ikonra."
+
+#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p)
+msgid ""
+"Check in the <gui>Advanced</gui> section that all the details are correct. "
+"You should be able to find these details from the website of the messaging "
+"service."
+msgstr ""
+"Ellenőrzze a <gui>Speciális</gui> szakaszban, hogy minden részlet helyes. "
+"Ezeket a részleteket az üzenetküldő szolgáltatás weboldalán találhatja meg."
+
+#: 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."
+msgstr ""
+"Törölje az <gui>Engedélyezett</gui> jelölését, majd jelölje be újra a "
+"szolgáltatáshoz való ismételt csatlakozás megpróbálásához."
+
+#: C/prob-conn-neterror.page:90(title)
+msgid "Proxy support"
+msgstr "Proxytámogatás"
+
+#: C/prob-conn-neterror.page:91(p)
+msgid "At the moment <app>Empathy</app> can not be configured to work with a proxy."
+msgstr "Jelenleg az <app>Empathy</app> nem állítható be proxyval való használatra."
+
+#: C/prob-conn-name.page:9(title)
+msgid "“Name in useâ€"
+msgstr "„A név használatbanâ€"
+
+#: C/prob-conn-name.page:10(desc)
+msgid ""
+"An error message which says “<gui>Name in use</gui>†appears in the main "
+"window."
+msgstr "A főablakban az „<gui>A név használatban</gui>†üzenet jelenik meg."
+
+#: C/prob-conn-name.page:32(title)
+msgid "I get a message that says “Name in useâ€"
+msgstr "Az „A név használatban†üzenetet kapom"
+
+#: C/prob-conn-name.page:34(p)
+msgid ""
+"This kind of error happens when you try to connect to your IRC account and "
+"you are using a nickname that is already being used by someone else on that "
+"particular network."
+msgstr ""
+"Ez a hiba akkor következik be, ha az IRC-fiókjához próbál csatlakozni, és "
+"olyan becenevet használ, amit az adott hálózaton már valaki más használ."
+
+#: C/prob-conn-name.page:50(p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr "A <gui>Becenév</gui> szövegdobozban adjon meg egy új becenevet."
+
+#: C/prob-conn-name.page:55(p)
+msgid ""
+"If you have registered that nickname within the network you are using, set "
+"the password for that nickname. For more information, see <link xref=\"irc-"
+"nick-password\"/>."
+msgstr ""
+"Ha regisztrálta a becenevet az éppen használt hálózaton, akkor állítsa be a "
+"jelszót az adott becenévhez. További információkért lásd a <link xref=\"irc-"
+"nick-password\"/> részt."
+
+#: C/prob-conn-name.page:64(p)
+msgid ""
+"Deselect the <gui>Enabled</gui> check-box next to the name of your account, "
+"and then select it again to try to reconnect to the service."
+msgstr ""
+"Törölje az <gui>Engedélyezett</gui> négyzet jelölését a fiók neve mellett, "
+"majd jelölje be újra a szolgáltatáshoz való ismételt csatlakozás "
+"megpróbálásához."
+
+#: C/prob-conn-auth.page:8(desc)
+msgid ""
+"An error message which says “<gui>Authentication failed</gui>†appears in "
+"the main window."
+msgstr "A főablakban a „<gui>A hitelesítés meghiúsult</gui>†üzenet jelenik meg."
+
+#: C/prob-conn-auth.page:36(title)
+msgid "I get a message that says “Authentication failedâ€"
+msgstr "Az „A hitelesítés meghiúsult†üzenetet kapom"
+
+#: C/prob-conn-auth.page:38(p)
+msgid ""
+"This kind of error happens when your instant messaging service is not "
+"allowing you to connect because it does not recognize your username or "
+"password for some reason."
+msgstr ""
+"Ez a hiba akkor következik be, ha az azonnaliüzenő-szolgáltatás nem "
+"engedélyezi a csatlakozást, mert valamiért nem ismeri fel az Ön "
+"felhasználónevét vagy jelszavát."
+
+#: 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."
+msgstr ""
+"Győződjön meg róla, hogy már regisztrált fiókot annál a szolgáltatásnál, "
+"amelyhez csatlakozni próbál. Ha nincs fiókja, a legtöbb szolgáltatás nem "
+"engedélyezi a csatlakozást."
+
+#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p)
+msgid "Type your username and password again to make sure that they are correct."
+msgstr ""
+"Ãrja be újra felhasználónevét és jelszavát, így ellenÅ‘rizve hogy nem gépelte "
+"el azokat."
+
+#: 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."
+msgstr "A használni kívánt azonnaliüzenő-fiókja nincs engedélyezve a fióklistában."
+
+#: C/prob-conn-acctdisabled.page:33(title)
+msgid "My account is not enabled"
+msgstr "A fiókom nincs engedélyezve"
+
+#: C/prob-conn-acctdisabled.page:35(p)
+msgid ""
+"If the instant messaging account that you want to use is not enabled in the "
+"drop-down account list when you try to start a new conversation or join a "
+"room, your account details may not be correct."
+msgstr ""
+"Ha a használni kívánt azonnaliüzenő-fiók nincs engedélyezve a legördülő "
+"fióklistában, amikor új társalgást akar kezdeni vagy be akar lépni egy "
+"csevegőszobába, akkor a fiók adatai hibásak lehetnek."
+
+#: C/prob-conn-acctdisabled.page:48(p)
+msgid ""
+"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
+"account that is not working."
+msgstr ""
+"Válassza a <guiseq><gui>Szerkesztés</gui><gui>Fiókok</gui></guiseq> "
+"menüpontot, majd a nem működő fiókot."
+
+#: 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 enable the account."
+msgstr ""
+"Ellenőrizze, hogy az <gui style=\"checkbox\">Engedélyezve</gui> "
+"jelölőnégyzet be van-e jelölve. Ha nincs, akkor jelölje be a négyzetet a "
+"fiók engedélyezéséhez."
+
+#: C/prev-conv.page:8(desc)
+msgid "Browse or search your previous conversations."
+msgstr "Böngéssze korábbi társalgásait, vagy keressen bennük."
+
+#: C/prev-conv.page:35(title)
+msgid "View previous conversations"
+msgstr "Korábbi társalgások megjelenítése"
+
+#: C/prev-conv.page:39(p)
+msgid ""
+"Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug."
+"cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, "
+"independent of the selection (like in yellow or something), we can use the "
+"term \"highlight\". Otherwise we need to use the term \"select\". Watch that "
+"bug."
+msgstr "<komment>"
+
+#: 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 "
+"conversations</link> by contact and date."
+msgstr ""
+"Az <app>Empathy</app> automatikusan menti az összes szöveges társalgását "
+"partnereivel. Lehetősége van <link xref=\"#search\">keresni az összes "
+"korábbi társalgásában</link>, vagy partner és dátum szerint <link xref="
+"\"#browse\">böngészni a korábbi társalgásokat</link>."
+
+#: C/prev-conv.page:54(p)
+msgid ""
+"You do not need to be connected to the Internet to view and search your "
+"previous conversations."
+msgstr ""
+"A korábbi társalgások megjelenítéséhez és az azokban való kereséshez nem "
+"kell az internethez kapcsolódni."
+
+#: C/prev-conv.page:61(title)
+msgid "Search previous conversations"
+msgstr "Keresés korábbi társalgásokban"
+
+#: C/prev-conv.page:63(p)
+msgid ""
+"You can perform a full-text search through all of your previous "
+"conversations."
+msgstr "Teljes szöveges keresést végezhet minden korábbi társalgásban."
+
+#: 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>."
+msgstr ""
+"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Nézet</"
+"gui><gui>Korábbi társalgások</gui></guiseq> menüpontot. Az <key>F3</key> "
+"billentyűt is megnyomhatja."
+
+#: C/prev-conv.page:71(p)
+msgid "Select the <gui>Search</gui> tab."
+msgstr "Válassza a <gui>Keresés</gui> lapot."
+
+#: C/prev-conv.page:74(p)
+msgid ""
+"In the <gui>For</gui> field, type the text you want to search for. Click "
+"<gui>Find</gui> or press <key>Enter</key>."
+msgstr ""
+"Az <gui>Erre</gui> mezőbe írja be a keresendő szöveget. Nyomja meg a "
+"<gui>Keresés</gui> gombot, vagy az <key>Enter</key> billentyűt."
+
+#: C/prev-conv.page:78(p)
+msgid ""
+"Any conversations that matched your search terms will be shown in the list "
+"below the search field. By default, conversations are ordered by date."
+msgstr ""
+"A keresőmező alatt megjelennek azok a társalgások, amelyekben megtalálható a "
+"keresőkifejezés. A társalgások alapértelmezésben dátum szerint vannak "
+"rendezve."
+
+#: C/prev-conv.page:82(p)
+msgid ""
+"Click on a conversation to view it. <app>Empathy</app> will select the text "
+"in the conversation that matched your search terms."
+msgstr ""
+"Kattintson a társalgásra a megjelenítéséhez. Az <app>Empathy</app> kijelöli "
+"a társalgás szövegének a keresőkifejezésre illeszkedő részét."
+
+#: C/prev-conv.page:89(title)
+msgid "Browse previous conversations"
+msgstr "Korábbi társalgások tallózása"
+
+#: C/prev-conv.page:91(p)
+msgid ""
+"You can browse your previous conversations with your contacts or in chat "
+"rooms by date."
+msgstr ""
+"A partnereivel vagy a csevegőszobákban folytatott korábbi társalgásokat "
+"dátum szerint tallózhatja."
+
+#: C/prev-conv.page:100(p)
+msgid "Select the <gui>Conversations</gui> tab."
+msgstr "Válassza a <gui>Társalgások</gui> lapot."
+
+#: 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."
+msgstr ""
+"Válassza ki a fiókot a bal felső legördülő listából. A fiókhoz tartozó "
+"partnerek és csevegőszobák listája alul megjelenik."
+
+#: C/prev-conv.page:107(p)
+msgid ""
+"Select a contact or chat room to view your previous conversations from. By "
+"default the most recent conversation will be shown."
+msgstr ""
+"Válassza ki a partnert vagy csevegőszobát a korábbi társalgások "
+"megjelenítéséhez. Alapértelmezésben a legújabb társalgás jelenik meg."
+
+#: C/prev-conv.page:111(p)
+msgid ""
+"You can browse your conversations by date. Days on which you had a "
+"conversation with the selected contact will be shown in bold text. Click a "
+"date to select it. Click the arrows next to the month and year to browse "
+"earlier dates."
+msgstr ""
+"A társalgásokat dátum szerint böngészheti. Azok a napok, amelyeken a "
+"kiválasztott partnerrel társalgást folytatott, félkövéren jelenik meg. "
+"Kattintson a dátumra a kiválasztásához. Kattintson a hónap és az év melletti "
+"nyilakra a korábbi dátumok böngészéséhez."
+
+#: C/prev-conv.page:117(p)
+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 ""
+"A megjelenített társalgásban a felső keresőmezőbe gépelve kereshet szöveget. "
+"Az illeszkedő szöveg kiemelésre kerül."
+
+#: C/prev-conv.page:121(p)
+msgid ""
+"You can quickly view the previous conversations with one of your contacts "
+"from the <gui>Contact List</gui> window. Simply right click the contact and "
+"choose <gui>View Previous Conversations</gui>. The <gui>Previous "
+"Conversations</gui> window will open with that contact already selected."
+msgstr ""
+"A <gui>Partnerlista</gui> ablakból gyorsan megjelenítheti az egyes "
+"partnereivel folytatott korábbi társalgásait. Csak kattintson a jobb "
+"egérgombbal a partnerre, és válassza a <gui>Korábbi társalgások</gui> "
+"menüpontot. Megnyílik a <gui>Korábbi társalgások</gui> ablak, és az adott "
+"partner lesz kiválasztva."
+
+#: C/link-contacts.page:11(desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "Különböző partnerek egyesítése és szétválasztása"
+
+#: C/link-contacts.page:25(title)
+msgid "Combine and separate contacts"
+msgstr "Partnerek egyesítése és szétválasztása"
+
+#: C/link-contacts.page:26(p)
+msgid ""
+"If one, or more, of your contacts has multiple accounts with different "
+"messaging services, you can combine these contacts into a single one."
+msgstr ""
+"Ha egy partnere több fiókkal is rendelkezik különböző szolgáltatásokhoz, "
+"akkor ezeket a partnerbejegyzéseket egyesítheti."
+
+#: C/link-contacts.page:30(p)
+msgid ""
+"The resulting contact is called a <em>meta-contact</em>: a contact composed "
+"from different single contacts."
+msgstr ""
+"Az eredményül kapott partnert <em>metapartnernek</em> hívjuk: ez egy több "
+"önálló partnerbejegyzésből álló partner."
+
+#: C/link-contacts.page:34(p)
+msgid ""
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
+msgstr ""
+"Ha rendelkezik egy Kovács Erzsébet nevű partnerrel, aki három különböző "
+"üzenetküldő szolgáltatást használ:"
+
+#: C/link-contacts.page:40(p)
+msgid "janes@facebook"
+msgstr "ekovacs@facebook"
+
+#: C/link-contacts.page:45(p)
+msgid "jane.smith@gmail"
+msgstr "erzsebet.kovacs@gmail"
+
+#: C/link-contacts.page:50(p)
+msgid "jane_smith@hotmail"
+msgstr "erzsebet_kovacs@hotmail"
+
+#: C/link-contacts.page:55(p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr ""
+"Ezeket a partnerbejegyzéseket egyetlen Kovács Erzsébet bejegyzéssé "
+"egyesítheti."
+
+#: C/link-contacts.page:60(title)
+msgid "Combining contacts"
+msgstr "Partnerek egyesítése"
+
+#: C/link-contacts.page:63(p)
+msgid ""
+"From the <gui>Contact List</gui> window, right-click one of the contact that "
+"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
+"gui>."
+msgstr ""
+"A <gui>Partnerlista</gui> ablakban kattintson a jobb egérgombbal a különböző "
+"fiókokkal rendelkező partnerre, és válassza a <gui style=\"menuitem"
+"\">Partnerek összekapcsolása…</gui> menüpontot."
+
+#: C/link-contacts.page:70(p)
+msgid ""
+"From the left pane in the <gui>Link Contacts</gui> window, select the "
+"contacts you want to combine."
+msgstr ""
+"A <gui>Partnerek összekapcsolása</gui> ablak bal oldalán válassza ki az "
+"egyesíteni kívánt partnereket."
+
+#: C/link-contacts.page:76(p)
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "Nyomja meg az <gui style=\"button\">Összekapcsolás</gui> gombot."
+
+#: C/link-contacts.page:82(p)
+msgid ""
+"When a meta-contact has been created, the default contact that will be used "
+"to have a conversation with when you double-click on it, is the contact with "
+"the highest presence on-line."
+msgstr ""
+"Metapartner létrehozása esetén az alapértelmezett partner, amellyel dupla "
+"kattintáskor társalgást kezdeményez, a leghosszabb online jelenléttel "
+"rendelkező partnerbejegyzés lesz."
+
+#: C/link-contacts.page:91(title)
+msgid "Separating contacts"
+msgstr "Metapartnerek szétválasztása"
+
+#: C/link-contacts.page:94(p)
+msgid ""
+"From the <gui>Contact List</gui>, right-click the contact to separate, and "
+"select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr ""
+"A <gui>Partnerlistában</gui> kattintson a jobb egérgombbal a szétválasztani "
+"kívánt metapartnerre, és válassza a <gui style=\"menuitem\">Partnerek "
+"összekapcsolása</gui> menüpontot."
+
+#: C/link-contacts.page:100(p)
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "Nyomja meg a <gui style=\"button\">Szétválasztás</gui> gombot."
+
+#: C/license.page:8(desc)
+msgid "Legal information."
+msgstr "Jogi információk."
+
+#: C/license.page:11(title)
+msgid "License"
+msgstr "Licenc"
+
+#: C/license.page:12(p)
+msgid ""
+"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
+"Unported license."
+msgstr ""
+"Ez a mű a CreativeCommons Attribution-Share Alike 3.0 Unported licenc "
+"feltételei szerint terjeszthető."
+
+#: C/license.page:20(p)
+msgid "You are free:"
+msgstr "Jogában áll:"
+
+#: C/license.page:25(em)
+msgid "To share"
+msgstr "Megosztani"
+
+#: C/license.page:26(p)
+msgid "To copy, distribute and transmit the work."
+msgstr "Másolni, terjeszteni és továbbítani a művet."
+
+#: C/license.page:29(em)
+msgid "To remix"
+msgstr "Feldolgozni"
+
+#: C/license.page:30(p)
+msgid "To adapt the work."
+msgstr "Módosítani a művet."
+
+#: C/license.page:33(p)
+msgid "Under the following conditions:"
+msgstr "A következő feltételek szerint:"
+
+#: C/license.page:38(em)
+msgid "Attribution"
+msgstr "Nevezd meg!"
+
+#: 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)."
+msgstr ""
+"A szerző vagy a jogosult által meghatározott módon fel kell tüntetned a "
+"műhöz kapcsolódó információkat (pl. a szerző nevét vagy álnevét, a Mű címét)."
+
+#: C/license.page:46(em)
+msgid "Share Alike"
+msgstr "Ãgy add tovább!"
+
+#: C/license.page:47(p)
+msgid ""
+"If you alter, transform, or build upon this work, you may distribute the "
+"resulting work only under the same, similar or a compatible license."
+msgstr ""
+"Ha megváltoztatod, átalakítod, feldolgozod ezt a művet, az így létrejött "
+"alkotást csak a jelenlegivel megegyező licenc alatt terjesztheted."
+
+#: 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>."
+msgstr ""
+"A licenc teljes szövegéért lásd a <link href=\"http://creativecommons.org/"
+"licenses/by-sa/3.0/legalcode\">CreativeCommons weboldalát</link>, vagy "
+"olvassa el a teljes <link href=\"http://creativecommons.org/licenses/by-"
+"sa/3.0/\">Commons összefoglalót</link>."
+
+#: C/irc-start-conversation.page:8(desc)
+#| msgid "Start a conversation witn an IRC contact."
+msgid "Start a conversation with an IRC contact."
+msgstr "Társalgás kezdése IRC-partnerrel."
+
+#: C/irc-start-conversation.page:30(title)
+msgid "Chat with somebody on IRC"
+msgstr "Csevegjen IRC-n"
+
+#: C/irc-start-conversation.page:32(p)
+msgid ""
+"You can hold private conversations with other IRC users, outside of the "
+"public IRC chat rooms. To start a conversation with another IRC user:"
+msgstr ""
+"Személyes társalgást folytathat más IRC-felhasználókkal a nyilvános IRC-"
+"csevegőszobákon kívül. Társalgás kezdeményezéséhez egy másik IRC-"
+"felhasználóval:"
+
+#: C/irc-start-conversation.page:37(p)
+msgid ""
+"In the contact list for an IRC chat room, double click the name of the user "
+"you want to chat with. Alternatively, right click the name of the user and "
+"choose <gui>Chat</gui>."
+msgstr ""
+"Egy IRC-csevegőszoba partnerlistájában kattintson duplán a felhasználó "
+"nevére, akivel csevegni szeretne. Ezen kívül rákattinthat a jobb egérgombbal "
+"a felhasználó nevére is, és kiválaszthatja a <gui>Csevegés</gui> menüpontot."
+
+#: 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."
+msgstr ""
+"Az IRC-szoba partnerlistája nem azonos az <app>Empathy</app> "
+"partnerlistájával. Ez az adott IRC-szoba felhasználóinak listáját "
+"tartalmazza. A különböző szobákban különböző partnerek vannak felsorolva."
+
+#: 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>."
+msgstr ""
+"Az IRC-szoba partnerlistája általában az IRC-szoba ablakának jobb oldalán "
+"van. Ha nem látja, akkor válassza a <guiseq><gui>Társalgás</"
+"gui><gui>Partnerlista megjelenítése</gui></guiseq> menüpontot."
+
+#: C/irc-send-file.page:9(desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr "Az <app>Empathy</app> jelenleg nem támogatja a fájlküldést IRC használatával."
+
+#: C/irc-send-file.page:31(title)
+msgid "Send files over IRC"
+msgstr "Fájlok küldése IRC használatával."
+
+#: C/irc-send-file.page:33(p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "Jelenleg nem lehetséges a fájlok küldése IRC használatával."
+
+#: C/irc-nick-password.page:10(desc)
+msgid "Protect your nickname to prevent other IRC users from using it."
+msgstr "Védje meg becenevét, hogy más IRC-felhasználók ne használhassák azt."
+
+#: C/irc-nick-password.page:33(title)
+msgid "Use a nickname password on IRC"
+msgstr "Jelszó használata IRC becenévhez"
+
+#: C/irc-nick-password.page:35(p)
+msgid ""
+"On some IRC networks, you can register your nickname with a service called "
+"NickServ. By sending special messages to NickServ, you can set your password "
+"and identify yourself. Some IRC chat rooms may not allow you to join without "
+"a registered nickname."
+msgstr ""
+"Egyes IRC-hálózatokon lehetősége van becenevének regisztrálására a NickServ "
+"nevű szolgáltatásnál. A NickServnek küldött speciális üzenetekkel "
+"beállíthatja jelszavát, és azonosíthatja magát. Egyes IRC-csevegőszobák nem "
+"engedik belépni regisztrált becenév nélkül."
+
+#: 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."
+msgstr ""
+"Az <app>Empathy</app> jelenleg nem támogatja a becenév regisztrálását. Egyes "
+"IRC-hálózatok azonban automatikusan továbbítanak egy <em>kiszolgálójelszót</"
+"em> a NickServnek. Ezeken a hálózatokon az IRC-jelszavát az <app>Empathy</"
+"app> segítségével használhatja azonosításra a NickServ felé. A népszerű "
+"FreeNode hálózat rendelkezik ezzel a szolgáltatással."
+
+#: C/irc-nick-password.page:46(p)
+msgid "To set an IRC server password:"
+msgstr "IRC-kiszolgálójelszó beállítása:"
+
+#: C/irc-nick-password.page:54(p)
+msgid "Select the IRC account from the list on the left of the dialog."
+msgstr "Válassza ki az IRC-fiókot az ablak bal oldalán lévő listából."
+
+#: C/irc-nick-password.page:57(p)
+msgid ""
+"In the <gui>Password</gui> field, type the password you used to register "
+"your nikcname."
+msgstr ""
+"A <gui>Jelszó</gui> mezőben írja be a beceneve regisztrálásához használt "
+"jelszót."
+
+#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
+msgid "Click <gui style=\"button\">Apply</gui>."
+msgstr "Nyomja meg az <gui style=\"button\">Alkalmaz</gui> gombot."
+
+#: C/irc-nick-password.page:69(p)
+msgid ""
+"These instructions only allow you to use a password-protected nickname on "
+"certain IRC networks. It is not currently possible to register an IRC "
+"nickname or change your nickname password using <app>Empathy</app>."
+msgstr ""
+"Ezek az utasítások csak bizonyos IRC-hálózatokon teszik lehetővé jelszóval "
+"védett becenév használatát. Jelenleg az <app>Empathy</app> használatával nem "
+"lehet IRC-becenevet regisztrálni, vagy a becenév jelszavát módosítani."
+
+#: C/irc-manage.page:9(desc)
+msgid "How to use IRC with <app>Empathy</app>."
+msgstr "IRC használata az <app>Empathyval</app>."
+
+#: C/irc-manage.page:34(title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "Interneten továbbított csevegés (IRC)"
+
+#: 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 ""
+"Az IRC az <app>Empathyval</app> való használatához telepíteni kell a "
+"<sys>telepathy-idle</sys> csomagot."
+
+#: C/irc-manage.page:43(title)
+msgid "IRC Chat Rooms and Conversations"
+msgstr "IRC-csevegőszobák és társalgások"
+
+#: C/irc-manage.page:45(title)
+msgid "Chat Rooms and Conversations"
+msgstr "Csevegőszobák és társalgások"
+
+#: C/irc-manage.page:50(title)
+msgid "Common IRC Problems"
+msgstr "Gyakori IRC-problémák"
+
+#: C/irc-manage.page:52(title) C/index.page:55(title)
+msgid "Common Problems"
+msgstr "Gyakori problémák"
+
+#: C/irc-join-room.page:8(desc)
+msgid "Join an IRC channel."
+msgstr "Csatlakozás IRC-csatornához."
+
+#: C/irc-join-room.page:31(title)
+msgid "Join an IRC chat room"
+msgstr "Csatlakozás IRC-csevegőszobához"
+
+#: C/irc-join-room.page:33(p)
+msgid ""
+"You can join IRC chat rooms (also known as IRC channels) on any IRC network "
+"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
+"account\"/> and <link xref=\"account-irc\"/>."
+msgstr ""
+"Az IRC-csevegőszobákba (IRC-csatornákra) bármely IRC-hálózaton beléphet, "
+"amelyhez csatlakozva van. Az IRC-hálózatíokhoz csatlakozással kapcsolatban "
+"lásd az <link xref=\"add-account\"/> és <link xref=\"account-irc\"/> témákat."
+
+#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p)
+#: C/group-conversations.page:122(p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Join</gui></guiseq>."
+msgstr ""
+"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Szoba</"
+"gui><gui>Csatlakozás</gui></guiseq> menüpontot."
+
+#: C/irc-join-room.page:45(p)
+msgid ""
+"From the <gui>Account</gui> drop-down list, select the IRC account that "
+"corresponds to the network you want to use."
+msgstr ""
+"A <gui>Felhasználói fiók</gui> legördülő listában válassza ki a használni "
+"kívánt hálózatnak megfelelő IRC-fiókot."
+
+#: C/irc-join-room.page:51(p)
+msgid ""
+"In the <gui>Room</gui> text box, type the name of the channel you want to "
+"join. IRC channel names start with the hash character (<sys>#</sys>)."
+msgstr ""
+"A <gui>Szoba</gui> szövegmezőbe írja be a csatorna nevét, amelyhez "
+"csatlakozni kíván. Az IRC-csatornák neve a kettős kereszt karakterrel "
+"(<sys>#</sys>) kezdődik."
+
+#: C/irc-join-room.page:57(p)
+msgid "Click <gui>Join</gui> to enter the room."
+msgstr "Nyomja meg a <gui>Csatlakozás</gui> gombot a szobába való belépéshez."
+
+#: C/irc-join-room.page:64(p)
+msgid "To join multiple rooms, you need to repeat the steps above for each room."
+msgstr ""
+"Több szobához csatlakozáskor minden szobához meg kell ismételni a fenti "
+"lépéseket."
+
+#: C/irc-join-pwd.page:9(desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Belépés jelszóval védett IRC-csevegőszobákba."
+
+#: C/irc-join-pwd.page:25(title)
+msgid "Join a protected IRC chat room"
+msgstr "Csatlakozás védett IRC-csevegőszobához"
+
+#: C/irc-join-pwd.page:27(p)
+msgid ""
+"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 ""
+"Egyes IRC-hálózatokon a privát IRC-szobák jelszóval védettek lehetnek. Ha "
+"ismeri a jelszót, akkor tegye a következőket a csatlakozáshoz:"
+
+#: 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\">Csatlakozzon a szobához</link> a szokásos módon."
+
+#: C/irc-join-pwd.page:38(p)
+msgid ""
+"Empathy will prompt you for a password. Enter the password for the IRC chat "
+"room and click <gui style=\"button\">Join</gui>."
+msgstr ""
+"Az Empathy bekéri a jelszót. Adja meg az IRC-csevegőszoba jelszavát, és "
+"nyomja meg a <gui style=\"button\">Csatlakozás</gui> gombot."
+
+#: C/irc-commands.page:7(desc)
+msgid "The supported IRC commands."
+msgstr "A támogatott IRC-parancsok."
+
+#: C/irc-commands.page:18(title)
+msgid "Supported IRC commands"
+msgstr "Támogatott IRC-parancsok"
+
+#: C/irc-commands.page:19(p)
+msgid ""
+"To see the list of the supported IRC commands, in a chat room type <input>/"
+"help</input> and press <key>Enter</key>."
+msgstr ""
+"A támogatott IRC-parancsok listájának megjelenítéséhez a csevegőszobában "
+"írja be a <input>/help</input> utasítást, és nyomja meg az <key>Enter</key> "
+"billentyűt."
+
+#: C/irc-commands.page:24(p)
+msgid "All commands available have a small description on their usage."
+msgstr "Minden elérhető parancshoz tartozik egy rövid használati utasítás."
+
+#. 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:41(None)
+msgid ""
+"@@image: 'figures/empathy-main-window.png'; "
+"md5=489ba00b0fc377aba4c691210b6e0650"
+msgstr ""
+"@@image: 'figures/empathy-main-window.png'; "
+"md5=489ba00b0fc377aba4c691210b6e0650"
+
+#: C/introduction.page:9(desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "Az <app>Empathy</app> üzenetküldő bemutatása."
+
+#: C/introduction.page:21(title)
+msgid "Introduction"
+msgstr "Bevezetés"
+
+#: 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 calls, file "
+"transfers, and all the most used messaging systems such as MSN and Google "
+"Talk."
+msgstr ""
+"Az <app>Empathy</app> egy üzenetküldő alkalmazás a GNOME asztali "
+"környezethez. Támogatja a szöveges üzenetküldést, hang- és videohívásokat, "
+"fájlátvitelt és a legtöbbet használt üzenetküldő rendszereket, mint az MSN "
+"és a Google Talk."
+
+#: 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."
+msgstr ""
+"Az <app>Empathy</app> szolgáltatásai segítik a jobb együttműködést "
+"munkahelyén, és lehetővé teszik a kapcsolattartást barátaival."
+
+#: C/introduction.page:32(p)
+msgid ""
+"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 ""
+"Az <app>Empathy</app> segítségével összes társalgását egyetlen ablakba "
+"csoportosíthatja, több ablakban tarthatja a különböző társalgásokat, "
+"egyszerűen kereshet a korábbi társalgásokban, és két kattintással "
+"megoszthatja asztalát."
+
+#: C/introduction.page:39(title)
+msgid "<gui>Contact List</gui> window"
+msgstr "<gui>Partnerlista</gui> ablak"
+
+#: C/introduction.page:40(desc)
+msgid "<app>Empathy</app> main window"
+msgstr "Az <app>Empathy</app> főablaka"
+
+#: C/introduction.page:42(p)
+msgid "<app>Empathy</app> main window."
+msgstr "Az <app>Empathy</app> főablaka."
+
+#. 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/index.page:28(None)
+msgid "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
+msgstr "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
+
+#: C/index.page:7(title) C/index.page:8(title)
+msgid "Empathy Internet Messenger"
+msgstr "Empathy üzenetküldő"
+
+#: C/index.page:27(title)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy üzenetküldő logója </media> Empathy üzenetküldő"
+
+#: C/index.page:35(title)
+msgid "Account Management"
+msgstr "Fiókkezelés"
+
+#: C/index.page:39(title)
+msgid "Contact Management"
+msgstr "Partnerkezelés"
+
+#: C/index.page:43(title)
+msgid "Text Conversations"
+msgstr "Szöveges csevegések"
+
+#: C/index.page:47(title)
+msgid "Audio and Video Conversations"
+msgstr "Hang- és videocsevegések"
+
+#: C/index.page:51(title)
+msgid "Advanced Actions"
+msgstr "Speciális műveletek"
+
+#: C/import-account.page:10(desc)
+msgid "Import an account from another instant messaging application."
+msgstr "Felhasználói fiók importálása másik azonnaliüzenő alkalmazásból."
+
+#: C/import-account.page:19(name)
+msgid "Peter Haslam"
+msgstr "Peter Haslam"
+
+#: C/import-account.page:20(email)
+msgid "peter.haslam@freenet.de"
+msgstr "peter.haslam@freenet.de"
+
+#: C/import-account.page:42(title)
+msgid "Import an existing account"
+msgstr "Meglévő fiók importálása"
+
+#: C/import-account.page:44(p)
+msgid ""
+"The first time you run <app>Empathy</app>, it will offer to import your "
+"accounts from other instant messaging applications. Currently, the only "
+"supported application is <app>Pidgin</app>."
+msgstr ""
+"Az <app>Empathy</app> első futtatásakor felajánlja felhasználói fiókjainak "
+"importálását más azonnaliüzenő alkalmazásokból. Jelenleg az egyetlen "
+"támogatott ilyen alkalmazás a <app>Pidgin</app>."
+
+#: C/import-account.page:50(p)
+msgid ""
+"Run <app>Empathy</app> for the first time. An assistant will offer you a "
+"number of options to create new accounts."
+msgstr ""
+"Futtassa az <app>Empathyt</app> első alkalommal. Egy asszisztens számos "
+"lehetőséget kínál fel új felhasználói fiókok létrehozásához."
+
+#: C/import-account.page:54(p)
+msgid ""
+"Select <gui>Yes, import my account details from</gui> and click "
+"<gui>Forward</gui>."
+msgstr ""
+"Válassza az <gui>Igen, fiókadatok importálása ebből:</gui> lehetőséget, és "
+"nyomja meg a <gui>Tovább</gui> gombot."
+
+#: C/import-account.page:58(p)
+msgid "Select the check box next to each account you wish to import."
+msgstr "Válassza ki az egyes importálni kívánt fiókok melletti jelölőnégyzeteket."
+
+#: C/import-account.page:66(p)
+msgid ""
+"It is not currently possible to import accounts after you have completed the "
+"first-run assistant."
+msgstr ""
+"Jelenleg nincs lehetőség fiókok importálására az első futtatáskor megjelenő "
+"asszisztens bezárása után."
+
+#: C/hide-contacts.page:8(desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr "A kilépett partnerek elrejtése a <gui>Partnerlistáról</gui>."
+
+#: C/hide-contacts.page:19(title)
+msgid "Hide offline contacts"
+msgstr "Kilépett partnerek elrejtése"
+
+#: C/hide-contacts.page:21(p)
+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."
+msgstr ""
+"Ãltalában az <app>Empathy</app> megjeleníti az összes partnert: az "
+"elérhetőket, akikkel társalgást kezdhet, és a kilépetteket is."
+
+#: C/hide-contacts.page:25(p)
+msgid "To hide the contacts that are offline:"
+msgstr "A kilépett partnerek elrejtése:"
+
+#: C/hide-contacts.page:31(p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
+"gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</"
+"key><key>H</key></keyseq>."
+msgstr ""
+"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Nézet</"
+"gui><gui>Kilépett partnerek</gui></guiseq> menüpontot, vagy nyomja meg a "
+"<keyseq><key>Ctrl</key><key>H</key></keyseq> billentyűkombinációt."
+
+#: C/hide-contacts.page:36(p)
+msgid "To show the offline contacts again, repeat the same procedure above."
+msgstr ""
+"A kilépett partnerek ismételt megjelenítéséhez ismételje meg a fenti "
+"eljárást."
+
+#: C/group-conversations.page:8(desc)
+msgid "Start or join a group conversation with your contacts."
+msgstr "Csoportos társalgás indítása partnereivel, vagy csatlakozás egyhez"
+
+#: C/group-conversations.page:34(title)
+msgid "Group conversations"
+msgstr "Csoportos társalgások"
+
+#: C/group-conversations.page:36(p)
+msgid ""
+"Group conversations permits you to have text conversations with more than "
+"one contact at the same time."
+msgstr ""
+"A csoportos társalgások lehetővé teszik a szöveges társalgást egyszerre több "
+"partnerrel."
+
+#: C/group-conversations.page:40(p)
+msgid ""
+"To have a group conversation you need to have a registered account with "
+"either Jabber or Google Talk, or a People Nearby account."
+msgstr ""
+"Csoportos társalgáshoz regisztrált Jabber, Google Talk vagy Közeli emberek "
+"fiókkal kell rendelkeznie."
+
+#: C/group-conversations.page:46(p)
+msgid ""
+"You can have a group conversation only with the contacts that are using the "
+"same service as yours."
+msgstr ""
+"Csak az Ön által is használt szolgáltatást használó partnerekkel folytathat "
+"csoportos társalgást."
+
+#: C/group-conversations.page:54(title)
+msgid "Start a group conversation"
+msgstr "Csoportos társalgás indítása"
+
+#: C/group-conversations.page:63(p)
+msgid ""
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"use for the group conversation."
+msgstr ""
+"A <gui>Felhasználói fiók</gui> legördülő listában válassza ki a csoportos "
+"társalgáshoz használandó fiókot."
+
+#: C/group-conversations.page:69(p)
+msgid ""
+"In the <gui>Server</gui> text box, type the name of server in which the "
+"conversation will be hosted."
+msgstr ""
+"A <gui>Kiszolgáló</gui> szövegmezőbe írja be a kiszolgáló nevét, amelyen a "
+"társalgás helyet kap."
+
+#: C/group-conversations.page:73(p)
+msgid "Leave it empty if it will be on the current server."
+msgstr "Üresen hagyva az aktuális kiszolgáló lesz használatban."
+
+#: C/group-conversations.page:78(p)
+msgid ""
+"In the <gui>Room</gui> text box, type the name you want to give to the "
+"conversation."
+msgstr "A <gui>Szoba</gui> szövegmezőbe írja be a társalgásnak adandó nevet."
+
+#: C/group-conversations.page:82(p)
+msgid ""
+"This will be the name of the room you are going to have a conversation. This "
+"name will be publicly available for other people to join. It is not possible "
+"to create a private room."
+msgstr ""
+"Ez a szoba neve lesz, amelyben a társalgás folyni fog. Ez a név nyilvánosan "
+"elérhető lesz mások számára, és szabadon csatlakozhatnak. Privát szoba "
+"létrehozása nem lehetséges."
+
+#: C/group-conversations.page:90(p)
+msgid ""
+"To invite other contacts to join the group conversation, from the "
+"<gui>Contact List</gui> window, select the contact you want to invite, and "
+"perform one of the following:"
+msgstr ""
+"Más partnerek a csoportos társalgásba való meghívásához a <gui>Partnerlista</"
+"gui> ablakban válassza ki a meghívni kívánt partnert, és tegye a következők "
+"egyikét:"
+
+#: C/group-conversations.page:97(p)
+msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
+msgstr ""
+"Kattintson a jobb egérgombbal a partnerre, és válassza a <gui>Meghívás "
+"csevegőszobába</gui> menüpontot."
+
+#: C/group-conversations.page:102(p)
+msgid ""
+"Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</"
+"gui></guiseq>."
+msgstr ""
+"Válassza a <guiseq><gui>Szerkesztés</gui><gui>Partner</gui><gui>Meghívás "
+"csevegőszobába</gui></guiseq> menüpontot."
+
+#: 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."
+msgstr ""
+"Ha több csoportos társalgás is meg van nyitva, akkor válassza ki azt, "
+"amelyikbe meg szeretné hívni partnereit."
+
+#: C/group-conversations.page:118(title)
+msgid "Join a group conversation"
+msgstr "Csatlakozás csoportos társalgáshoz"
+
+#: C/group-conversations.page:128(p)
+msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
+msgstr ""
+"Nyissa ki a <gui>Szobalista</gui> fejezetet az összes létező szoba "
+"megjelenítéséhez."
+
+#: C/group-conversations.page:133(p)
+msgid "Double-click on the name of a room to join it."
+msgstr "Kattintson duplán a szoba nevére a belépéshez."
+
+#: C/group-conversations.page:139(p)
+msgid ""
+"It is not possible to join all existing rooms. Some of the rooms might "
+"require a password, or might be invitation only. <app>Empathy</app> does not "
+"support these kind of rooms."
+msgstr ""
+"Nem feltétlenül lehet minden létező szobába belépni. Egyes szobák jelszót "
+"kérhetnek, vagy csak meghívással lehetnek láthatók. Az <app>Empathy</app> "
+"nem támogatja az ilyen szobákat."
+
+#: C/geolocation-what-is.page:9(desc)
+msgid "Understanding geolocation."
+msgstr "A helymeghatározás bemutatása."
+
+#: C/geolocation-what-is.page:33(title)
+msgid "What is geolocation"
+msgstr "Mi az a helymeghatározás"
+
+#: C/geolocation-what-is.page:35(p)
+msgid ""
+"Geolocation allows you to identify the real geographical location of a "
+"computer or a device connected to the Internet."
+msgstr ""
+"A helymeghatározás lehetővé teszi egy internetre csatlakozó számítógép vagy "
+"eszköz valódi földrajzi helyét."
+
+#: C/geolocation-what-is.page:37(p)
+msgid "With geolocation in <app>Empathy</app> you can:"
+msgstr "Az <app>Empathy</app> helymeghatározása segítségével:"
+
+#: C/geolocation-what-is.page:42(p)
+msgid "Publish your geographical location to your contacts."
+msgstr "Közzéteheti földrajzi helyét partnerei számára."
+
+#: C/geolocation-what-is.page:47(p)
+msgid "See your contacts’ geographical location and quickly contact them."
+msgstr "Láthatja partnerei földrajzi helyét."
+
+#: C/geolocation-what-is.page:52(p)
+msgid ""
+"Set the accuracy of your location and the device used to discover your "
+"location."
+msgstr ""
+"Beállíthatja a földrajzi hely és a hely meghatározására használt eszköz "
+"pontosságát."
+
+#: C/geolocation-what-is.page:60(p)
+msgid ""
+"In order to see your contacts’ geographical locations, they need to use a "
+"service and an application that supports geolocation."
+msgstr ""
+"A partnerei földrajzi helyének megjelenítéséhez partnereinek "
+"helymeghatározást támogató szolgáltatást és alkalmazást kell használniuk."
+
+#: C/geolocation-turn.page:9(desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
+msgstr "Helymeghatározás be- és kikapcsolása <app>Empathyban</app>."
+
+#: C/geolocation-turn.page:33(title)
+msgid "Activate/Deactivate geolocation"
+msgstr "Helymeghatározás be- és kikapcsolása"
+
+#: C/geolocation-turn.page:37(p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
+msgstr ""
+"Válassza a <guiseq><gui>Szerkesztés</gui><gui>Beállítások</gui></guiseq> "
+"menüpontot."
+
+#: C/geolocation-turn.page:42(p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr "Válassza a <gui>Hely</gui> lapot."
+
+#: C/geolocation-turn.page:47(p)
+msgid "Select <gui>Publish location to my contacts</gui> to activate geolocation."
+msgstr ""
+"Jelölje be a <gui>Hely közzététele a partnereimnek</gui> négyzetet a "
+"helymeghatározás aktiválásához."
+
+#: C/geolocation-turn.page:50(p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "A helymeghatározás kikapcsolásához törölje a négyzetet."
+
+#: C/geolocation-turn.page:55(p)
+msgid ""
+"To increase the accuracy of your position, deselect <gui>Reduce location "
+"accuracy</gui>."
+msgstr ""
+"A földrajzi hely pontosságának növeléséhez törölje a <gui>Hely pontosságának "
+"csökkentése</gui> négyzetet."
+
+#: C/geolocation-turn.page:61(p)
+#| msgid ""
+#| "If you have an external device like a GPS or want to send a more accurate "
+#| "position, select the appropriate option in the <gui>Geoclue Settings</"
+#| "gui> section."
+msgid ""
+"If you have an external device like a GPS or want to send a more accurate "
+"position, select the appropriate option in the <gui>Location sources</gui> "
+"section."
+msgstr ""
+"Ha rendelkezik külső eszközzel, például GPS-szel, vagy pontosabb helyet "
+"szeretne küldeni, akkor válassza ki a megfelelő lehetőséget a "
+"<gui>Helyforrások</gui> szakaszban."
+
+#: C/geolocation-supported.page:7(desc)
+msgid "Services that supports geolocation and compatibility."
+msgstr "A helymeghatározást támogató szolgáltatások és kompatibilitás."
+
+#: C/geolocation-supported.page:31(title)
+msgid "Supported services"
+msgstr "Támogatott szolgáltatások"
+
+#: C/geolocation-supported.page:33(p)
+msgid ""
+"The geolocation feature at the moment is compatible only with the Jabber "
+"service. In order to use it, you and your contacts need to have a Jabber "
+"account."
+msgstr ""
+"Jelenleg a helymeghatározási szolgáltatás csak a Jabber szolgáltatással "
+"kompatibilis. Használatához Önnek és partnereinek is Jabber fiókot kell "
+"használniuk."
+
+#: C/geolocation-supported.page:39(p)
+msgid ""
+"It is necessary that also the server you are using supports the geolocation "
+"feature. Most of the Jabber servers support it. See your service website "
+"documentation for more information."
+msgstr ""
+"Az Ön által használt kiszolgálónak is támogatnia kell a helymeghatározási "
+"szolgáltatást. A legtöbb Jabber kiszolgáló támogatja. További információkért "
+"nézze meg a szolgáltatás webhelyének dokumentációját."
+
+#: C/geolocation-supported.page:47(title)
+msgid "Compatibility"
+msgstr "Kompatibilitás"
+
+#: C/geolocation-supported.page:49(p)
+msgid ""
+"<app>Empathy</app> geolocation feature is not compatible with other "
+"geographical position services such as <em>Google Latitude</em>, <em>Yahoo "
+"Fire Eagle</em> or <em>Brightkite</em>."
+msgstr ""
+"Az <app>Empathy</app> helymeghatározási szolgáltatása nem kompatibilis más "
+"helymeghatározási szolgáltatásokkal, mint például a <em>Google Latitude</"
+"em>, <em>Yahoo Fire Eagle</em> vagy <em>Brightkite</em>."
+
+#: C/geolocation-privacy.page:8(desc)
+msgid "What information are sent and to who."
+msgstr "Milyen információk kerülnek elküldésre és kinek."
+
+#: C/geolocation-privacy.page:32(title)
+msgid "Geolocation Privacy"
+msgstr "Helymeghatározás és adatvédelem"
+
+#: C/geolocation-privacy.page:35(title)
+msgid "What information is sent"
+msgstr "Milyen információk kerülnek elküldésre"
+
+#: C/geolocation-privacy.page:36(p)
+msgid ""
+"What is possible to send is: your country, region, locality, area, street, "
+"building, floor, room, and postal code, longitude, latitude and altitude, "
+"speed and bearing."
+msgstr ""
+"A következők elküldése lehetséges: ország, régió, helység, terület, utca, "
+"épület, emelet, szoba, irányítószám, hosszúság, szélesség, magasság, "
+"sebesség és irány."
+
+#: 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."
+msgstr ""
+"A földrajzi helyével kapcsolatos információk pontossága és mennyisége a "
+"szoftveren, vagy a helymeghatározásra használt infrastruktúrán alapul."
+
+#: 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."
+msgstr ""
+"A különböző hálózatok különböző pontossági beállításokkal rendelkezhetnek, "
+"és különböző információkat küldhetnek. A külső eszközök, például GPS vagy "
+"mobiltelefonok használata növeli az elküldött információk pontosságát."
+
+#: 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."
+msgstr ""
+"Az adatvédelmi módot bekapcsolva a városnál pontosabb információ nem kerül "
+"elküldésre, még ha külső eszközt is használ."
+
+#: C/geolocation-privacy.page:56(title)
+msgid "Who can see the information sent"
+msgstr "Ki láthatja az elküldött információkat"
+
+#: C/geolocation-privacy.page:57(p)
+msgid "Only your contacts can see your geographical position."
+msgstr "Csak partnerei láthatják az Ön földrajzi helyzetét."
+
+#: C/geolocation-privacy.page:63(title)
+msgid "What is the privacy mode"
+msgstr "Mi az adatvédelmi mód"
+
+#: C/geolocation-privacy.page:64(p)
+msgid ""
+"The privacy mode, enabled by default, is a reduced accuracy mode that will "
+"decrease the accuracy of the geographical position sent to your contacts."
+msgstr ""
+"Az alapértelmezésben engedélyezett adatvédelmi mód egy csökkentett "
+"pontosságú mód, amely csökkenti a partnereinek küldött földrajzi hely "
+"pontosságát."
+
+#: C/geolocation-privacy.page:71(title)
+msgid "Privacy overview"
+msgstr "Adatvédelem áttekintése"
+
+#: C/geolocation-privacy.page:72(p)
+msgid "Overview of the various geolocation privacy settings in <app>Empathy</app>."
+msgstr ""
+"Az <app>Empathy</app> helymeghatározással kapcsolatos adatvédelmi "
+"beállításainak áttekintése."
+
+#: C/geolocation-privacy.page:77(p)
+msgid "Geolocation is not enabled by default."
+msgstr "A helymeghatározás alapértelmezésben nincs bekapcsolva."
+
+#: C/geolocation-privacy.page:82(p)
+msgid "Privacy mode is enabled by default."
+msgstr "Az adatvédelmi mód alapértelmezésben be van kapcsolva."
+
+#: C/geolocation-privacy.page:87(p)
+msgid "Privacy mode prevails even when using external and more precise devices."
+msgstr ""
+"Az adatvédelmi mód külső és pontosabb eszközök használata esetén is "
+"bekapcsolva marad."
+
+#: C/geolocation-privacy.page:92(p)
+msgid "Only your contacts can see your position."
+msgstr "Csak partnerei láthatják földrajzi helyét."
+
+#: C/geolocation-not-showing.page:8(desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "Az <app>Empathy</app> nem teszi közzé a földrajzi helyet."
+
+#: C/geolocation-not-showing.page:32(title)
+msgid "Geographical position not published"
+msgstr "A földrajzi hely nem kerül közzétételre"
+
+#: C/geolocation-not-showing.page:34(p)
+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 ""
+"Ha partnerei nem látják földrajzi helyét, akkor az <app>Empathy</app> lehet, "
+"hogy nem képes elégséges pontossággal meghatározni azt."
+
+#: C/geolocation-not-showing.page:38(p)
+msgid ""
+"In this case, your position will not be published, but you are still able to "
+"see the location of your contacts."
+msgstr ""
+"Ebben az esetben az Ön földrajzi helye nem kerül közzétételre, de partnerei "
+"helyét továbbra is látni fogja."
+
+#: C/geolocation-not-showing.page:42(p)
+msgid ""
+"If you want to publish your geographical position, you can try to use an "
+"external device such as a GPS."
+msgstr ""
+"Ha közzé szeretné tenni földrajzi helyét, akkor megpróbálhat külső eszközt, "
+"például GPS-t használni."
+
+#: C/geolocation-not-showing.page:48(p)
+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."
+msgstr ""
+"Földrajzi helyének közzétételéhez az Ön által használt Jabber kiszolgálónak "
+"támogatnia kell a PEP specifikációt. A <link href=\"http://coccinella.im/"
+"servers/servers_by_pubsub_pep.html\">PEP-et támogató kiszolgálók</link> "
+"listája online elérhető. A Google Talk jelenleg nem támogatja ezt a "
+"szolgáltatást."
+
+#: C/geolocation.page:8(desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "A helymeghatározás megismerése és használata az <app>Empathyban</app>."
+
+#: C/geolocation.page:32(title)
+msgid "Geographical position"
+msgstr "Földrajzi hely"
+
+#: C/geolocation.page:35(title)
+msgid "Geolocation"
+msgstr "Helymeghatározás"
+
+#: C/geolocation.page:39(title)
+msgid "Fix common problems"
+msgstr "Gyakori problémák javítása"
+
+#: C/favorite-rooms.page:10(desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "Kedvenc szobák beállítása, kezelése és csatlakozás azokhoz."
+
+#: C/favorite-rooms.page:29(title)
+msgid "Favorite rooms"
+msgstr "Kedvenc szobák"
+
+#: C/favorite-rooms.page:32(title)
+msgid "Set a room as a favorite"
+msgstr "Szoba beállítása kedvencként"
+
+#: C/favorite-rooms.page:35(p)
+msgid "Join a room."
+msgstr "Csatlakozás szobához."
+
+#: C/favorite-rooms.page:40(p)
+msgid ""
+"See <link xref=\"irc-join-room\"/> for more information on how to join an "
+"IRC room."
+msgstr ""
+"IRC-szobához csatlakozással kapcsolatos további információkért lásd a <link "
+"xref=\"irc-join-room\"/> oldalt."
+
+#: C/favorite-rooms.page:46(p)
+msgid ""
+"See <link xref=\"group-conversations\"/> for more information on how to "
+"start or join a group conversation."
+msgstr ""
+"Csoportos társalgáshoz csatlakozással kapcsolatos további információkért "
+"lásd a <link xref=\"group-conversations\"/> oldalt."
+
+#: C/favorite-rooms.page:54(p)
+msgid ""
+"From the conversation window, choose <guiseq><gui>Conversation</"
+"gui><gui>Favorite Chat Room</gui></guiseq>."
+msgstr ""
+"A társalgás ablakban válassza a <guiseq><gui>Társalgás</gui><gui>Kedvenc "
+"csevegőszoba</gui></guiseq> menüpontot."
+
+#: C/favorite-rooms.page:63(title)
+msgid "Join favorite rooms"
+msgstr "Belépés kedvenc szobákba"
+
+#: C/favorite-rooms.page:71(p)
+msgid "Press <key>F5</key>."
+msgstr "Nyomja meg az <key>F5</key> billentyűt."
+
+#: C/favorite-rooms.page:76(p)
+msgid ""
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
+"all your favorite rooms."
+msgstr ""
+"Válassza a <guiseq><gui>Szoba</gui><gui>Csatlakozás a kedvencekhez</gui></"
+"guiseq> menüpontot az összes kedvenc szobába való belépéshez."
+
+#: C/favorite-rooms.page:82(p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
+msgstr ""
+"Válassza a <gui>Szoba</gui> menüpontot, majd a kedvenc szobát, amelybe be "
+"szeretne lépni."
+
+#: C/favorite-rooms.page:90(p)
+msgid ""
+"To join a favorite room, you need to be connected to the Internet and to "
+"your account."
+msgstr ""
+"Kedvenc szobába való belépéshez csatlakozva kell lennie az internethez és "
+"fiókjához."
+
+#: C/favorite-rooms.page:98(title)
+msgid "Manage favorite rooms"
+msgstr "Kedvenc szobák kezelése"
+
+#: C/favorite-rooms.page:101(p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Manage Favorites</gui></guiseq>."
+msgstr ""
+"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Szoba</"
+"gui><gui>Kedvencek kezelése</gui></guiseq> menópontot."
+
+#: C/favorite-rooms.page:107(p)
+msgid ""
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"manage the favorite rooms of."
+msgstr ""
+"A <gui>Felhasználói fiók</gui> legördülő listából válassza ki azt a fiókot, "
+"amelynek kedvenc szobáit módosítani szeretné."
+
+#: C/favorite-rooms.page:111(p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
+msgstr ""
+"Válassza az <gui>Összes</gui> lehetőséget az összes kedvenc szoba "
+"megjelenítéséhez."
+
+#: C/favorite-rooms.page:116(p)
+msgid "Select the favorite room you want to manage:"
+msgstr "Válassza ki a kezelni kívánt kedvenc szobát:"
+
+#: C/favorite-rooms.page:121(p)
+msgid ""
+"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
+"that room when you connect to your account."
+msgstr ""
+"Jelölje be az <gui>Automatikus kapcsolódás</gui> négyzetet a szobába való "
+"automatikus belépéshez a fiókjához kapcsolódáskor."
+
+#: C/favorite-rooms.page:127(p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
+msgstr ""
+"Kattintson az <gui>Eltávolítás</gui> gombra a szoba eltávolításához "
+"kedvencei közül."
+
+#: C/favorite-rooms.page:134(p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "Ha befejezte, nyomja meg a <gui>Bezárás</gui> gombot."
+
+#: C/disable-account.page:9(desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+msgstr "A fiókba való automatikus bejelentkezés megtiltása az <app>Empathynak</app>."
+
+#: C/disable-account.page:39(title)
+msgid "Disable an account"
+msgstr "Fiók letiltása"
+
+#: C/disable-account.page:41(p)
+msgid ""
+"You can disable an account to prevent <app>Empathy</app> from logging in to "
+"it without removing the account entirely. You may wish to disable and re-"
+"enable an account if you only want to be logged in to the account at certain "
+"times, but you still want to use <app>Empathy</app> for other accounts."
+msgstr ""
+"A fiókok letilthatók, ekkor az <app>Empathy</app> nem fog bejelentkezni, de "
+"a fiók sem kerül eltávolításra. Bizonyos helyzetekben szükség lehet a fiók "
+"letiltására és újraengedélyezésére, ha csak néha szeretne bejelentkezni a "
+"fiókra, de más fiókokhoz továbbra is az <app>Empathyt</app> szeretné "
+"használni."
+
+#: C/disable-account.page:52(p)
+msgid ""
+"Select the account you wish to disable from the accounts list on the left "
+"side of the window."
+msgstr "Az ablak bal oldalán lévő fióklistában válassza ki a letiltani kívánt fiókot."
+
+#: C/disable-account.page:56(p)
+msgid ""
+"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
+"window."
+msgstr ""
+"Törölje az <gui style=\"checkbox\">Engedélyezve</gui> négyzetet az ablak "
+"jobb oldalán."
+
+#: C/disable-account.page:62(p)
+msgid ""
+"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
+"gui>."
+msgstr ""
+"Fiók újraengedélyezéséhez csak válassza ki az <gui style=\"checkbox"
+"\">Engedélyezve</gui> négyzetet."
+
+#: C/create-account.page:9(desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "Fiók regisztrálása valamelyik támogatott üzenetküldő szolgáltatással."
+
+#: C/create-account.page:33(title)
+msgid "Register for a new account"
+msgstr "Új fiók regisztrálása"
+
+#: 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 "
+"<app>Empathy</app>. With some account providers, you can use <app>Empathy</"
+"app> to register for a new account, using the same steps as you would to "
+"<link xref=\"add-account\">add an account</link>."
+msgstr ""
+"A legtöbb fióktípus megköveteli fiók létrehozását egy szolgáltatónál ahhoz, "
+"hogy az <app>Empathyhoz</app> hasonló azonnaliüzenő alkalmazásokkal "
+"csatlakozhatna. Egyes szolgáltatók esetén használhatja az <app>Empathyt</"
+"app> új fiók regisztrálására, a <link xref=\"add-account\">fiók "
+"hozzáadásához</link> használt lépéseket követve."
+
+#: 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 using "
+"<app>Empathy</app>."
+msgstr ""
+"Ez az oldal új fiók létrehozásával kapcsolatos információkat biztosít "
+"különböző fióktípusokhoz. A szolgáltatónak meg kell adnia a bejelentkezési "
+"azonosítót és jelszót, valamint az <app>Empathy</app> használatával való "
+"csatlakozáshoz esetleg szükséges további információkat."
+
+#: 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 ""
+"A Facebook az egyik legtöbbet használt közösségi hálózat. Segítségével a "
+"felhasználók saját profilt hozhatnak létre, és kommunikálhatnak barátaikkal."
+
+#: 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 ""
+"A Facebook használatához a barátaival való kommunikációra a <link href="
+"\"http://www.facebook.com\">www.facebook.com</link> weboldalon kell "
+"létrehoznia egy új fiókot."
+
+#: C/create-account.page:59(title) C/audio-video.page:170(p)
+msgid "Jabber"
+msgstr "Jabber"
+
+#: 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 ""
+"A Jabber egy nyílt azonnaliüzenő-rendszer. Az e-mailhez hasonlóan a Jabber "
+"lehetővé teszi a szolgáltató megválasztását, és az összes Jabber "
+"felhasználóval való kommunikációt a szolgáltatótól függetlenül."
+
+#: 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."
+"org/\">Jabber.org</link>."
+msgstr ""
+"Egy Jabber szolgáltatónál létre kell hoznia az új fiókot. Számos ingyenes "
+"szolgáltató van, az egyik népszerű a <link href=\"http://register.jabber.org/"
+"\">Jabber.org</link>."
+
+#: 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 ""
+"Ha a Google Mail vagy a Google Talk szolgáltatást használja, akkor már van "
+"Jabber fiókja. A Google Talk egy Jabber szolgáltatás. Google Mail címét és "
+"jelszavát használhatja az <app>Empathyban</app> a kapcsolódáshoz."
+
+#: C/create-account.page:77(title) C/audio-video.page:190(p)
+msgid "People Nearby"
+msgstr "Közeli emberek"
+
+#: 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, "
+"such as a wireless hotspot. It automatically finds all other users on the "
+"network who are also using this service."
+msgstr ""
+"Ezen szolgáltatás használatához nem szükséges fiókot létrehoznia egy "
+"szolgáltatónál. Ez a szolgáltatás akkor működik, amikor helyi hálózathoz, "
+"például vezeték nélküli hotspothoz kapcsolódik. Ez képes automatikusan "
+"megtalálni a szolgáltatás többi felhasználóját az adott hálózaton."
+
+#: C/create-account.page:84(p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr "További információkért lásd a <link xref=\"salut-protocol\"/> oldalt."
+
+#: C/create-account.page:88(title) C/audio-video.page:205(p)
+msgid "SIP"
+msgstr "SIP"
+
+#: 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 "
+"provider. You can communicate with all other SIP users, regardless of which "
+"SIP provider they use."
+msgstr ""
+"A SIP egy nyílt rendszer, amely lehetővé teszi felhasználóinak hang- és "
+"videohívások bonyolítását az interneten. Létre kell hoznia egy fiókot egy "
+"SIP-szolgáltatónál. Az összes SIP-felhasználóval kommunikálhat, függetlenül "
+"az általuk használt szolgáltatótól."
+
+#: 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?"
+"class=NewUser;proc=start\">Sipphone</link>."
+msgstr ""
+"Számos népszerű ingyenes SIP-szolgáltató van, ezek egyike a <link href="
+"\"https://signup.sipphone.com/new-users/app?class=NewUser;proc=start"
+"\">Sipphone</link>."
+
+#: 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 "
+"with <app>Empathy</app>."
+msgstr ""
+"Technikai nehézségek miatt az ingyenes <link href=\"https://www.ekiga.net/"
+"index.php?page=register\">Ekiga.net</link> szolgáltatás jelenleg nem működik "
+"az <app>Empathyval</app>."
+
+#: 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 ""
+"Egyes SIP-szolgáltatók lehetővé teszik normál telefonok hívását a "
+"számítógépéről. Ehhez a szolgáltatáshoz általában fizetős szolgáltatásra "
+"kell előfizetni."
+
+#: C/create-account.page:110(title) C/audio-video.page:165(p)
+msgid "IRC"
+msgstr "IRC"
+
+#: 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 "
+"nickname, you will need to choose a new nickname."
+msgstr ""
+"Az IRC használatához nem kell fiókot regisztrálni. Noha meg kell adnia egy "
+"becenevet az IRC-fiók felvételekor az <app>Empathyba</app>, ez a becenév "
+"csak az egyes csatlakozásokkor jön létre. Ha másik felhasználó használja a "
+"becenevet, akkor újat kell választania."
+
+#: C/create-account.page:117(p)
+msgid ""
+"Some IRC networks use a service called NickServ to allow users to protect "
+"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
+msgstr ""
+"Egyes IRC-hálózatíok egy NickServ nevű szolgáltatást használnak, amely "
+"lehetővé teszi felhasználóiknak beceneveik megvédését. További "
+"információkért lásd a <link xref=\"irc-nick-password\"/> oldalt."
+
+#: 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."
+msgstr ""
+"Egyes IRC-kiszolgálók jelszóval védettek. Az ilyen kiszolgálókhoz "
+"csatlakozáskor ismernie kell a jelszót. Ezek általában privát IRC-hálózatok."
+
+#: C/create-account.page:125(title)
+msgid "Proprietary Services"
+msgstr "Zárt szolgáltatások"
+
+#: 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 "
+"you to connect to an existing account for most popular services. To create a "
+"new account with one of these services, you will need to visit the service’s "
+"web site and agree to its terms of use."
+msgstr ""
+"Számos zárt azonnaliüzenő-szolgáltatást fejlesztettek különböző cégek és "
+"szervezetek. Az <app>Empathy</app> lehetővé teszi a kapcsolódást meglévő "
+"fiókjával a legnépszerűbb szolgáltatásokhoz. Ezen szolgáltatásokhoz tartozó "
+"új fiók létrehozásához fel kell keresnie a szolgáltató weboldalát, és el "
+"kell fogadnia a felhasználási feltételeket."
+
+#: C/create-account.page:136(link) C/audio-video.page:135(p)
+msgid "AIM"
+msgstr "AIM"
+
+#: C/create-account.page:141(link) C/audio-video.page:160(p)
+msgid "ICQ"
+msgstr "ICQ"
+
+#: C/create-account.page:146(link) C/audio-video.page:175(p)
+msgid "MSN"
+msgstr "MSN"
+
+#: C/create-account.page:151(link) C/audio-video.page:210(p)
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: C/change-status.page:9(desc)
+msgid "Change your status to advertise your availability to your contacts."
+msgstr "Módosítsa állapotát elérhetőségének közzétételéhez a partnerei számára."
+
+#: C/change-status.page:34(title)
+msgid "Change your status"
+msgstr "Módosítsa állapotát"
+
+#: C/change-status.page:36(p)
+msgid ""
+"You can set your status to indicate your availability to your contacts. "
+"<app>Empathy</app> allows you to select from a list of defined statuses."
+msgstr ""
+"Beállíthatja állapotát az elérhetőségének jelzéséhez partnerei felé. Az "
+"<app>Empathy</app> lehetővé teszi a mentett állapotok listából való "
+"kiválasztását."
+
+#: C/change-status.page:41(p)
+msgid "Click on the drop-down list at the top of the <gui>Contact List</gui> window."
+msgstr "Kattintson a <gui>Partnerlista</gui> ablak tetején lévő legördülő listára."
+
+#: C/change-status.page:46(p)
+msgid "Select a status from the list."
+msgstr "Válasszon egy állapotot a listából."
+
+#: C/change-status.page:52(p)
+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."
+msgstr ""
+"A beépített állapotok listájával és jelentésével kapcsolatban lásd a <link "
+"xref=\"status-icons\"/> oldalt. Felvehet <link xref=\"set-custom-message"
+"\">egyéni állapotüzeneteket</link> további információk közléséhez "
+"partnereivel az elérhetőségéről."
+
+#: 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."
+msgstr ""
+"Ha egy ideig nem használja a számítógépet, vagy a képernyővédő bekapcsol, az "
+"állapot automatikusan „Távol†lesz."
+
+#. 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/audio-video.page:58(None)
+msgid ""
+"@@image: 'figures/audio-input-microphone.png'; "
+"md5=8d89026b66a263a3bc5b1f0665948567"
+msgstr ""
+"@@image: 'figures/audio-input-microphone.png'; "
+"md5=8d89026b66a263a3bc5b1f0665948567"
+
+#: C/audio-video.page:8(desc)
+msgid "Information on when it is possible to have an audio or video conversation."
+msgstr "Információk arról, hogy mikor kezdhet hang- vagy videohívást."
+
+#: C/audio-video.page:32(title)
+msgid "Audio and video support"
+msgstr "Hang- és videotámogatás"
+
+#: 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 "
+"audio or video conversations, you will see the following icons next to their "
+"names in the contact list:"
+msgstr ""
+"Csak olyan partnerekkel folytathat hang- és videohívást, akik maguk is ezt a "
+"szolgáltatást támogató klienst használnak. Ha partnerei támogatják a hang- "
+"vagy videohívást, akkor a partnerlistában nevük mellett a következő ikont "
+"láthatja:"
+
+#: C/audio-video.page:43(p)
+msgid "Icon"
+msgstr "Ikon"
+
+#: C/audio-video.page:48(p)
+msgid "Description"
+msgstr "Leírás"
+
+#: C/audio-video.page:58(media)
+msgid "Icon for audio conversation"
+msgstr "Hanghívások ikonja"
+
+#: C/audio-video.page:64(p)
+msgid "The contact is able to have an audio conversation."
+msgstr "A partner képes hanghívás fogadására."
+
+#: C/audio-video.page:70(media)
+msgid "Icon for video conversation"
+msgstr "Videohívások ikonja"
+
+#: C/audio-video.page:76(p)
+msgid "The contact is able to have a video conversation."
+msgstr "A partner képes videohívás fogadására."
+
+#: 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."
+msgstr ""
+"Hanghíváshoz az operációs rendszer által támogatott hangkártyára, és működő "
+"mikrofonra van szüksége."
+
+#: C/audio-video.page:87(p)
+msgid ""
+"In order to have a video conversation, you need to have a webcam that is "
+"supported by your operating system, and a working microphone."
+msgstr ""
+"Videohíváshoz az operációs rendszer által támogatott webkamerára, és működő "
+"mikrofonra van szüksége."
+
+#: C/audio-video.page:95(title)
+msgid "Supported Account Types"
+msgstr "Támogatott fióktípusok"
+
+#: C/audio-video.page:97(p)
+msgid ""
+"You can only have audio and video conversations using accounts on certain "
+"supported services. The following table lists whether audio and video is "
+"supported for each type of account."
+msgstr ""
+"Csak bizonyos támogatott szolgáltatások fiókjainak használatakor van "
+"lehetősége hang- és videohívásokra. A következő táblázat felsorolja, hogy a "
+"hang és videó támogatott-e az egyes fióktípusokon."
+
+#: C/audio-video.page:102(p)
+msgid ""
+"Account types are provided by plugins. Your system may not have all of the "
+"following types available, or it may have types not listed here. Updated "
+"plugins may make audio or video conversations possible on account types that "
+"are listed as unsupported here."
+msgstr ""
+"A fióktípusokat bővítmények biztosítják. Rendszerén lehet, hogy a következő "
+"típusok nem mindegyike érhető el, de rendelkezhet itt fel nem sorolt "
+"típusokkal is. A frissített bővítmények lehetővé tehetik a hang- és "
+"videohívásokat az itt támogatottként fel nem sorolt fióktípusokkal."
+
+#: 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 "
+"accessibility team</link> for input."
+msgstr "<komment>"
+
+#: C/audio-video.page:118(p)
+msgid ""
+"There's recent work on telepathy-butterfly and papyon to support audio and "
+"video for MSN. It might be released in time for 2.28, but since it doesn't "
+"follow the Gnome release schedule, I can't be sure. If it looks like it's "
+"going to ship, let's mark it Yes."
+msgstr "<komment>"
+
+#: C/audio-video.page:128(p)
+msgid "Service"
+msgstr "Szolgáltatás"
+
+#: C/audio-video.page:129(p)
+msgid "Audio"
+msgstr "Hang"
+
+#: C/audio-video.page:130(p)
+msgid "Video"
+msgstr "Videó"
+
+#: C/audio-video.page:136(p) C/audio-video.page:137(p)
+#: C/audio-video.page:141(p) C/audio-video.page:142(p)
+#: C/audio-video.page:146(p) C/audio-video.page:147(p)
+#: C/audio-video.page:156(p) C/audio-video.page:157(p)
+#: C/audio-video.page:161(p) C/audio-video.page:162(p)
+#: C/audio-video.page:166(p) C/audio-video.page:167(p)
+#: C/audio-video.page:181(p) C/audio-video.page:182(p)
+#: C/audio-video.page:186(p) C/audio-video.page:187(p)
+#: C/audio-video.page:191(p) C/audio-video.page:192(p)
+#: C/audio-video.page:196(p) C/audio-video.page:197(p)
+#: C/audio-video.page:201(p) C/audio-video.page:202(p)
+#: C/audio-video.page:211(p) C/audio-video.page:212(p)
+#: C/audio-video.page:216(p) C/audio-video.page:217(p)
+msgid "No"
+msgstr "Nem"
+
+#: C/audio-video.page:140(p)
+msgid "Facebook Chat"
+msgstr "Facebook csevegés"
+
+#: C/audio-video.page:145(p)
+msgid "gadugadu"
+msgstr "Gadu-Gadu"
+
+#: C/audio-video.page:150(p)
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: C/audio-video.page:151(p) C/audio-video.page:152(p)
+#: C/audio-video.page:171(p) C/audio-video.page:172(p)
+#: C/audio-video.page:176(p) C/audio-video.page:177(p)
+#: C/audio-video.page:206(p) C/audio-video.page:207(p)
+msgid "Yes"
+msgstr "Igen"
+
+#: C/audio-video.page:155(p)
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: C/audio-video.page:180(p)
+msgid "myspace"
+msgstr "MySpace"
+
+#: C/audio-video.page:185(p)
+msgid "qq"
+msgstr "QQ"
+
+#: C/audio-video.page:195(p)
+msgid "sametime"
+msgstr "Sametime"
+
+#: C/audio-video.page:200(p)
+msgid "silc"
+msgstr "Silc"
+
+#: C/audio-video.page:215(p)
+msgid "zephyr"
+msgstr "Zephyr"
+
+#: C/audio-call.page:9(desc)
+msgid "Call your contacts over the Internet."
+msgstr "Hívja fel partnereit az interneten."
+
+#: C/audio-call.page:27(title)
+msgid "Start an audio conversation"
+msgstr "Hanghívás kezdeményezése"
+
+#: C/audio-call.page:29(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."
+msgstr ""
+"Felhívhatja partnereit, és beszélgethet velük. Ez a szolgáltatás csak "
+"bizonyos fióktípusokkal működik, és a másik személynek is a hanghívásokat "
+"támogató alkalmazást kell használnia."
+
+#: C/audio-call.page:34(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\">Audio Call</gui>."
+msgstr ""
+"A <gui>Partnerlista</gui> ablakban kattintson a <media type=\"image\" mime="
+"\"image/png\" src=\"figures/camera-web.png\">videohívás</media> ikonra a "
+"felhívni kívánt partner neve mellett, és válassza a <gui style=\"menuitem"
+"\">Hanghívás</gui> lehetőséget."
+
+#: C/audio-call.page:55(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>."
+msgstr ""
+"Hanghívás videohívássá változtatásához válassza a <guiseq><gui style=\"menu"
+"\">Videó</gui><gui style=\"menuitem\">Videó be</gui></guiseq> menüpontot."
+
+#: C/audio-call.page:63(title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Hanghívás indítása metapartnerrel"
+
+#: C/audio-call.page:71(p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
+msgstr ""
+"Válssza ki a felhívni kívánt partnert, és a menüből válassza a <gui style="
+"\"menuitem\">Hanghívás</gui> menüpontot."
+
+#: C/add-contact.page:9(desc)
+msgid "Add someone to the contact list."
+msgstr "A partnerlista bővítése."
+
+#: C/add-contact.page:33(title)
+msgid "Add someone to your list of contacts"
+msgstr "Egy személy felvétele a partnerei listájára"
+
+#: C/add-contact.page:37(p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+msgstr ""
+"Válassza a <guiseq><gui>Csevegés</gui><gui>Partner felvétele</gui></guiseq> "
+"menüpontot."
+
+#: C/add-contact.page:40(p)
+msgid ""
+"From the <gui>Account</gui> drop-down list, select the account you wish to "
+"use to connect to your contact. Your contact will need to be using the same "
+"service as the account you select."
+msgstr ""
+"A <gui>Felhasználói fiók</gui> legördülő listából válassza ki a partneréhez "
+"csatlakozáshoz használandó fiókot. A partnerének az itt kiválasztott "
+"fiókéval egyező szolgáltatást kell használnia."
+
+#: C/add-contact.page:45(p)
+msgid ""
+"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
+"screen name, or other appropriate identifier for the service type."
+msgstr ""
+"Az <gui>Azonosító</gui> mezőben adja meg partnere bejelentkezési "
+"azonosítóját, felhasználónevét, becenevét, vagy a szolgáltatástípushoz "
+"megfelelő egyéb azonosítóját."
+
+#: C/add-contact.page:49(p)
+msgid ""
+"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
+"to appear in your contact list."
+msgstr ""
+"Az <gui>Ãlnév</gui> mezÅ‘ben adja meg a partner nevét, ahogyan azt a "
+"partnerlistában szeretné látni."
+
+#: C/add-contact.page:53(p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+msgstr ""
+"Kattintson a <gui>Hozzáadás</gui> gombra a személy felvételéhez a partnerei "
+"listájába."
+
+#: 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."
+msgstr ""
+"Új személy partnerlistára való felvételéhez csatlakoznia kell az internethez "
+"és fiókjához."
+
+#: C/add-account.page:9(desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "Új fiók felvétele az <app>Empathyba</app>."
+
+#: C/add-account.page:39(title)
+msgid "Add a new account"
+msgstr "Új fiók hozzáadása"
+
+#: 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\"/>."
+msgstr ""
+"Az <app>Empathyba</app> bármely támogatott szolgáltatás azonnaliüzenő-"
+"fiókjait felveheti, hogy kommunikálhasson partnereivel. Egyes szolgáltatók "
+"esetén ezekkel a lépésekkel egy új fiók regisztrálását is elvégezheti. "
+"További részletekért lásd a <link xref=\"create-account\"/> oldalt."
+
+#: C/add-account.page:52(p)
+msgid "Click <gui style=\"button\">Add</gui>."
+msgstr "Nyomja meg a <gui style=\"button\">Hozzáadás</gui> gombot."
+
+#: C/add-account.page:57(p)
+msgid ""
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
+"wish to add."
+msgstr ""
+"A <gui>Protokoll</gui> legördülő listából válassza ki a felvenni kívánt fiók "
+"típusát."
+
+#: 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 "
+"types, and may not work with some account providers. See <link xref=\"create-"
+"account\"/> for more information."
+msgstr ""
+"Ha még nincs regisztrált fiókja, válassza az <gui>Új fiók létrehozása a "
+"kiszolgálón</gui> lehetőséget. Ez a szolgáltatás nem érhető el minden "
+"fióktípushoz, és egyes szolgáltatók esetén lehet hogy nem működik. További "
+"információkért lásd az <link xref=\"create-account\"/> oldalt."
+
+#: 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."
+msgstr ""
+"Adja meg a szükséges információkat. A legtöbb fiókhoz csak egy "
+"bejelentkezési azonosító és jelszó kell. Egyes fiókok további információkat "
+"igényelhetnek, lásd: <link xref=\"accounts-window#details\"/>."
+
+#: C/add-account.page:71(p)
+msgid "Click <gui style=\"button\">Log in</gui>."
+msgstr "Nyomja meg a <gui style=\"button\">Bejelentkezés</gui> gombot."
+
+#: 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."
+msgstr ""
+"A fiókot a <gui>Fiókok</gui> ablakban azonosító név módosításához válassza "
+"ki a fiókot a bal oldali listából, és kattintson a nevére, vagy nyomja meg a "
+"szóköz billentyűt. Módosítsa a fiók nevét, és nyomja meg az <key>Enter</key> "
+"billentyűt ha befejezte."
+
+#: C/accounts-window.page:11(desc)
+msgid "Add, modify, and delete accounts."
+msgstr "Fiókok hozzáadása, módosítása és törlése."
+
+#: C/accounts-window.page:33(title)
+msgid "Accounts Window"
+msgstr "Fiókok ablak"
+
+#: C/accounts-window.page:35(p)
+msgid ""
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
+msgstr ""
+"A <gui>Fiókok</gui> ablak lehetővé teszi fiókok hozzáadását, módosítását és "
+"törlését."
+
+#: C/accounts-window.page:43(title)
+msgid "Account Details"
+msgstr "Fiók részletei"
+
+#: C/accounts-window.page:44(p)
+msgid ""
+"For most types of accounts, you can simply enter a login ID and a password. "
+"Certain accounts or account types, however, may require additional "
+"information."
+msgstr ""
+"A legtöbb fióktípushoz csak a bejelentkezési azonosítót és a jelszót kell "
+"megadnia. Bizonyos fiókok vagy fióktípusok azonban további információkat is "
+"igényelhetnek."
+
+#: C/account-jabber.page:7(desc)
+msgid "Advanced options for Jabber and Google Talk accounts."
+msgstr "Speciális beállítások Jabber és Google Talk fiókokhoz."
+
+#: C/account-jabber.page:29(title)
+msgid "Jabber account details"
+msgstr "Jabber fiókok részletei"
+
+#: 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 "
+"adding an account, see <link xref=\"add-account\"/>."
+msgstr ""
+"A legtöbb Jabber fiók csak bejelentkezési azonosítót és jelszót igényel a "
+"csatlakozáshoz. Egyes fiókokhoz, vagy bizonyos hálózattípusokon további "
+"információk megadására lehet szükség a <gui>Speciális</gui> szakaszban. "
+"Ãltalában nincs szükség a lentebbi speciális beállítások használatára. Fiók "
+"hozzáadásával kapcsolatban lásd az <link xref=\"add-account\"/> oldalt."
+
+#: C/account-jabber.page:39(p)
+msgid ""
+"Google Talk is a type of Jabber account. These instructions hold for Google "
+"Talk accounts as well."
+msgstr ""
+"A Google Talk a Jabber fiókok egy fajtája. Ezek az utasítások Google Talk "
+"fiókokra is érvényesek."
+
+#: C/account-jabber.page:45(gui)
+msgid "Encryption required (TLS/SSL)"
+msgstr "Titkosítás szükséges (TLS/SSL)"
+
+#: C/account-jabber.page:46(gui)
+msgid "Ignore SSL certificate errors"
+msgstr "SSL-tanúsítványhibák figyelmen kívül hagyása"
+
+#: 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 "
+"<app>Empathy</app> from communicating with the Jabber server when encryption "
+"is not possible."
+msgstr ""
+"Amikor csak lehetséges, az <app>Empathy</app> és a Jabber kiszolgáló közötti "
+"kommunikáció titkosított. Ha a titkosított kommunikáció nem lehetséges, az "
+"üzenetek titkosítatlanul kerülhetnek elküldésre. Válassza ki a "
+"<gui>Titkosítás szükséges</gui> négyzetet a Jabber kiszolgálóval való "
+"kommunikáció megtiltásához az <app>Empathynak</app>, ha a titkosítás nem "
+"lehetséges."
+
+#: C/account-jabber.page:52(p)
+msgid ""
+"Some Jabber servers may encrypt data using invalid certificates, or using "
+"certificates from unknown authorities. If you trust the server you are "
+"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to "
+"allow encrypted communication with invalid certificates."
+msgstr ""
+"Egyes Jabber kiszolgálók az adatokat érvénytelen, vagy ismeretlen "
+"hitelesítésszolgáltatóktól származó tanúsítványokkal titkosíthatják. Ha "
+"megbízik a kiszolgálóban, amelyhez csatlakozik, akkor kiválaszthatja az "
+"<gui>SSL-tanúsítványhibák figyelmen kívül hagyása</gui> négyzetet az "
+"érvénytelen tanúsítvánnyal történő titkosított kommunikáció engedélyezéséhez."
+
+#: C/account-jabber.page:59(gui)
+msgid "Resource"
+msgstr "Erőforrás"
+
+#: C/account-jabber.page:60(gui)
+msgid "Priority"
+msgstr "Prioritás"
+
+#: C/account-jabber.page:61(p)
+msgid ""
+"If you have multiple applications (for instance, on separate computers) "
+"connected to your account at the same time, you can set a resource to "
+"uniquely identify each one. By default, <app>Empathy</app> will use "
+"<input>Telepathy</input> as the resource."
+msgstr ""
+"Ha több alkalmazással (például más számítógépekről) kapcsolódik egyidejűleg "
+"fiókjához, akkor beállíthat egy erőforrást ezek egyedi azonosításához. "
+"Alapértelmezésben az <app>Empathy</app> erőforrásként a <input>Telepathy</"
+"input> értéket használja."
+
+#: 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."
+msgstr ""
+"Beállíthatja a prioritást annak megadásához, hogy melyik alkalmazás kapja "
+"partnereitől a bejövő üzeneteket. Az új üzenetek a legmagasabb prioritású "
+"alkalmazásnak kerülnek elküldésre."
+
+#: C/account-jabber.page:70(gui)
+msgid "Override server settings"
+msgstr "Kiszolgáló beállításainak felülbírálása"
+
+#: C/account-jabber.page:71(p)
+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."
+msgstr ""
+"Az <app>Empathy</app> az alapértelmezett beállításokat használja a Jabber "
+"kiszolgálóhoz való kapcsolódáshoz a bejelentkezési azonosítója alapján. "
+"Egyes Jabber kiszolgálókhoz saját kezűleg kell egyéni "
+"kiszolgálóbeállításokat megadnia. Ezeket a beállításokat a Jabber "
+"szolgáltatója biztosítja."
+
+#. 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: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:112(None)
+msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+msgstr "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+
+#: C/account-irc.page:8(desc)
+msgid "Additional information necessary for connecting to IRC networks."
+msgstr "IRC-hálózatokhoz való csatlakozáshoz szükséges további információk"
+
+#: C/account-irc.page:31(title)
+msgid "IRC account details"
+msgstr "IRC-fiók részletei"
+
+#: 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 "
+"account."
+msgstr ""
+"Az IRC-fiókok sok más fióktípustól eltérő információkat igényelnek. IRC-fiók "
+"létrehozásához meg kell adnia legalább az IRC-hálózatot és egy becenevet. Ez "
+"az oldal részletesen leírja az IRC-fiókhoz megadható információkat."
+
+#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
+msgid "Network"
+msgstr "Hálózat"
+
+#: 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."
+msgstr ""
+"Az IRC egy nyílt rendszer, amely lehetővé teszi független IRC-hálózatok "
+"futtatását. Az egyes hálózatok egyediek, és saját felhasználókkal és "
+"csevegőszobákkal rendelkeznek. Az <app>Empathy</app> a <gui>Hálózat</gui> "
+"legördülő listában felsorolja a legnépszerűbb hálózatokat. Ezen kívül "
+"továbbiakat is felvehet. Részletekért lásd a <link xref=\"#networks\"/> "
+"részt lentebb."
+
+#: C/account-irc.page:53(gui)
+msgid "Nickname"
+msgstr "Becenév"
+
+#: 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."
+msgstr ""
+"Beceneve az Ön egyedi neve az IRC-hálózaton. A hálózaton csak egy személy "
+"rendelkezhet egy adott becenévvel. Ha a <link xref=\"prob-conn-name\" role="
+"\"error-msg\"/> hibaüzenetet kapja, akkor módosítania kell becenevét."
+
+#: C/account-irc.page:60(gui)
+msgid "Password"
+msgstr "Jelszó"
+
+#: 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."
+msgstr ""
+"Egyes kiszolgálók, különösen a magánhálózatokon lévők, jelszót igényelnek a "
+"csatlakozáshoz. Ha jogosult a hálózat használatára, akkor a hálózat "
+"rendszergazdái megadják a jelszót."
+
+#: C/account-irc.page:65(title)
+msgid "NickServ Passwords"
+msgstr "NickServ jelszavak"
+
+#: 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."
+msgstr ""
+"Egyes hálózatokon a becenevek regisztrálhatók a NickServ néven ismert "
+"szolgáltatással. Az <app>Empathy</app> közvetlenül nem támogatja a becenevek "
+"jelszavait. Egyes hálózatokon, beléertve a népszerű FreeNode-ot, a "
+"kiszolgálójelszavak automatikusan továbbításra kerülnek a NickServnek, így "
+"ezen mező beállításával azonosíthatja magát a NickServ felé. További "
+"részeletekért lásd a <link xref=\"irc-nick-password\"/> oldalt."
+
+#: C/account-irc.page:76(gui)
+msgid "Real name"
+msgstr "Valódi név"
+
+#: 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."
+msgstr ""
+"Beceneve mellett megadhatja valódi nevét is. Más felhasználók láthatják ezt "
+"az Ön információinak megjelenítésekor."
+
+#: C/account-irc.page:81(gui)
+msgid "Quit message"
+msgstr "Kilépési üzenet"
+
+#: 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 "
+"field to provide a custom quit message."
+msgstr ""
+"Amikor kilép, egy kilépési üzenet kerül elküldésre minden csevegőszobába, "
+"amelyben jelen van, és minden felhasználónak, akivel éppen társalog. Ebben a "
+"mezőben megadhat egy egyéni kilépési üzenetet."
+
+#: C/account-irc.page:94(title)
+msgid "IRC Networks"
+msgstr "IRC-hálózatok"
+
+#: C/account-irc.page:97(title)
+msgid "Networks"
+msgstr "Hálózatok"
+
+#: 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."
+msgstr ""
+"Az <app>Empathy</app> tartalmazza a népszerű IRC-hálózatok listáját. Ha "
+"másik IRC-hálózathoz szeretne csatlakozni, akkor hozzá kell adnia a "
+"listához. A hálózatokat módosíthatja is, és a listából is eltávolíthatja "
+"azokat."
+
+#: 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 ""
+"Hálózat listához adásához nyomja meg a <media type=\"image\" mime=\"image/png"
+"\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Hozzáadás</media> "
+"gombot."
+
+#: 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>."
+msgstr ""
+"A lista egy hálózatának módosításához válassza ki a hálózatot, és nyomja meg "
+"a <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" "
+"width=\"16\" height=\"16\">Szerkesztés</media> gombot."
+
+#: 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 ""
+"A lista egy hálózatának eltávolításához válassza ki a hálózatot, és nyomja "
+"meg az <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png"
+"\" width=\"16\" height=\"16\">Eltávolítás</media> gombot."
+
+#: C/account-irc.page:115(p)
+msgid "When adding or modifying a network, you can enter the following information:"
+msgstr ""
+"Hálózat hozzáadásakor vagy módosításakor a következő információkat adhatja "
+"meg:"
+
+#: 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 "Ez a hálózat neve, ahogyan a hálózatok listájában meg szeretné jeleníteni."
+
+#: C/account-irc.page:125(gui)
+msgid "Charset"
+msgstr "Karakterkészlet"
+
+#: 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."
+msgstr ""
+"Itt megadhatja a hálózaton általában használt karakterkódolást. A "
+"karakterkódolás a karakterek egy adott, számítógépen belüli tárolási módja. "
+"Számos karakterkódolás van, és az üzeneteik megfelelő megjelenítéséhez "
+"ugyanazt a karakterkódolást kell használnia, mint a többi felhasználó."
+
+#. Translators: Recommend character encodings that are common
+#. for your language.
+#: 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 "
+"for English and some other Western languages is ISO-8859-1."
+msgstr ""
+"Alapértelmezésben az <app>Empathy</app> az UTF-8-at használja, ez a modern "
+"karakterkódolás képes a világ sok nyelvének szövegei kezelésére, így a "
+"magyaréra is. A magyar nyelv gyakori kódolása még az ISO-8859-2."
+
+#: C/account-irc.page:141(gui)
+msgid "Servers"
+msgstr "Kiszolgálók"
+
+#: 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 "
+"users on all other servers on that network. You can add and remove servers "
+"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
+msgstr ""
+"Az IRC-hálózat több kiszolgálóval rendelkezhet. Ha egy adott hálózat egy "
+"kiszolgálójához csatlakozik, a hálózat többi kiszolgálójához csatlakozó "
+"összes felhasználóval is képes kommunikálni. Ehhez a hálózathoz a "
+"<gui>Hozzáadás</gui> és <gui>Eltávolítás</gui> gombokkal vehet fel "
+"kiszolgálókat."
+
+#: 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 ""
+"Amikor egy kiszolgáló ki van választva, kattintson a <gui>Kiszolgáló</gui> "
+"vagy a <gui>Port</gui> alatti mezőre annak szerkesztéséhez. Ennek "
+"alternatívájaként a balra és jobbra nyilakkal is átviheti a fókuszt a mezők "
+"közt, és a szóköz megnyomásával szerkesztheti azokat."
+
+#: 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 ""
+"Jelölje be az <gui>SSL</gui> oszlop alatti jelölőnégyzetet a kiszolgálóval "
+"történő összes kommunikáció titkosításához. Ne feledje, hogy ez nem "
+"akadályoz meg senkit a hálózaton a nyilvános csevegőszobákba írt szavai "
+"elolvasásában."
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: C/index.page:0(None)
+msgid "translator-credits"
+msgstr "Kelemen Gábor <kelemeng@gnome.hu>"
+
diff --git a/help/it/it.po b/help/it/it.po
index 6051088d8..4f3b1369b 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-04-22 21:00+0000\n"
-"PO-Revision-Date: 2010-04-25 15:29+0200\n"
+"POT-Creation-Date: 2010-09-29 11:54+0000\n"
+"PO-Revision-Date: 2010-10-02 10:42+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:63(None)
-#: C/audio-video.page:70(None) C/audio-call.page:65(None)
+#: C/video-call.page:38(None) C/audio-video.page:70(None)
+#: C/audio-call.page:36(None)
msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
msgstr "non serve"
@@ -32,18 +32,19 @@ msgstr "Avviare una conversazione video con i propri contatti."
#: 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: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)
-#: C/hide-contacts.page:11(name) C/group-conversations.page:19(name)
-#: C/geolocation-what-is.page:18(name) C/geolocation-turn.page:18(name)
-#: 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:18(name) C/audio-video.page:17(name)
-#: C/audio-call.page:18(name) C/add-account.page:20(name)
+#: C/link-contacts.page:15(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: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:19(name)
+#: C/import-account.page:23(name) C/hide-contacts.page:11(name)
+#: C/group-conversations.page:19(name) C/geolocation-what-is.page:18(name)
+#: C/geolocation-turn.page:18(name) 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:18(name)
+#: C/audio-video.page:17(name) C/audio-call.page:19(name)
+#: C/add-account.page:20(name)
msgid "Milo Casagrande"
msgstr "Milo Casagrande"
@@ -53,52 +54,58 @@ msgstr "Milo Casagrande"
#: 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: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)
-#: C/hide-contacts.page:12(email) C/group-conversations.page:20(email)
-#: C/geolocation-what-is.page:19(email) C/geolocation-turn.page:19(email)
-#: C/geolocation-supported.page:17(email) C/geolocation-privacy.page:18(email)
+#: C/link-contacts.page:16(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: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:20(email)
+#: C/import-account.page:24(email) C/hide-contacts.page:12(email)
+#: C/group-conversations.page:20(email) C/geolocation-what-is.page:19(email)
+#: C/geolocation-turn.page:19(email) 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:19(email) C/audio-video.page:18(email)
-#: C/audio-call.page:19(email) C/add-account.page:21(email)
+#: C/audio-call.page:20(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/send-message.page:21(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: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:28(p)
-#: C/accounts-window.page:22(p) C/account-jabber.page:18(p)
-#: C/account-irc.page:20(p)
+#: C/link-contacts.page:19(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:23(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:22(p) C/change-status.page:23(p)
+#: C/audio-video.page:21(p) C/audio-call.page:23(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:20(p)
msgid "Creative Commons Share Alike 3.0"
msgstr "Creative Commons Share Alike 3.0"
-#: C/video-call.page:35(title)
+#: C/video-call.page:28(title)
msgid "Start a video conversation"
msgstr "Avviare una conversazione video"
-#: C/video-call.page:37(p)
+#: C/video-call.page:30(p)
+#| msgid ""
+#| "If you have a webcam, you can call your contacts and have an video "
+#| "conversation with them. This features only works with certain types of "
+#| "accounts, and it requires the other person to have an application that "
+#| "supports video calls."
msgid ""
-"If you have a webcam, you can call your contacts and have an video "
+"If you have a webcam, you can call your contacts and have a video "
"conversation with them. This features only works with certain types of "
"accounts, and it requires the other person to have an application that "
"supports video calls."
@@ -108,22 +115,25 @@ msgstr ""
"con l'utilizzo di alcuni tipi di account e richiede che i propri contatti "
"dispongano di un programma che supporti le conversazioni video."
-#: C/video-call.page:44(p)
+#: C/video-call.page:37(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>."
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>."
+"\"menuitem\">Video Call</gui>."
msgstr ""
"Dalla finestra <gui>Elenco contatti</gui>, fare clic sull'icona <media type="
"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">della chiamata "
"video</media> a fianco del nome del contatto da chiamare e scegliere <gui "
-"style=\"menuitem>Chiamata video</gui>. In alternativa, fare clic col "
-"pulsante destro del mouse sul contatto e scegliere <gui style=\"menuitem"
-"\">Chiamata video</gui>."
+"style=\"menuitem>Chiamata video</gui>."
-#: C/video-call.page:50(p) C/audio-call.page:52(p)
+#: C/video-call.page:43(p) C/audio-call.page:42(p)
msgid ""
"A new window will open. When the connection is established, you will see "
"<gui>Connected</gui> at the bottom of the window, along with the total "
@@ -133,27 +143,63 @@ msgstr ""
"viene visualizzato, in basso nella finestra, il messaggio <gui>Connessi</"
"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>."
+#: C/video-call.page:48(p) C/audio-call.page:48(p)
msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
msgstr ""
"Per terminare la conversazione, fare clic su <gui style=\"button\">Chiudi</"
"gui>."
-#: C/video-call.page:61(p)
+#: C/video-call.page:54(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."
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."
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
msgstr ""
"Per convertire una conversazione video in una conversazione audio, scegliere "
"<guiseq style=\"menu\"><gui>Video</gui><gui style=\"menuitem\">Disattivato</"
-"gui></guiseq> oppure fare clic sul pulsante <media type=\"image\" mime="
-"\"image/png\" src=\"figures/camera-web.png\">della chiamata video</media> "
-"nella barra degli strumenti."
+"gui></guiseq>."
+
+#: C/video-call.page:60(title)
+#| msgid "Start a video conversation with one of your contacts."
+msgid "Start a video conversation with a meta-contact"
+msgstr "Avviare una conversazione video con un meta-contatto"
+
+#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p)
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click on the drop-down list at "
+#| "the top."
+msgid ""
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr "Dalla finestra <gui>Elenco contatti</gui>, fare clic sul meta-contatto"
+
+#: C/video-call.page:68(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Video Call</gui>."
+msgstr ""
+"Selezionare il contatto con cui iniziare una conversazione e dal menù "
+"selezionare <gui style=\"menuitem\">Chiamata video</gui>."
+
+#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p)
+msgid ""
+"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
+"contact in the <gui>Contact List</gui> window, and stop over it for a "
+"second: a small pop-up message will appear showing the number of the "
+"contacts that form the meta-contact."
+msgstr ""
+"Per riconoscere un <em>meta-contatto</em> da uno normale, spostare il "
+"puntatore del mouse su un contatto all'interno della finestra <gui>Elenco "
+"contatti</gui> e fermarsi su di esso per almeno un secondo: apparirà un "
+"piccolo messaggio in cui è indicato il numero dei contatti che compongono il "
+"meta-contatto."
#. 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.
@@ -326,7 +372,7 @@ msgstr ""
"utilizzare il loro da remoto, è necessario avere installato un programma di "
"visualizzazione di desktop remoti."
-#: C/share-desktop.page:46(p) C/send-message.page:35(p) C/send-file.page:40(p)
+#: C/share-desktop.page:46(p) C/send-file.page:40(p)
#: C/favorite-rooms.page:66(p)
msgid "From the <gui>Contact List</gui> window, perform one of the following:"
msgstr ""
@@ -557,40 +603,36 @@ msgstr ""
msgid "Send a message to one of your contacts."
msgstr "Inviare un messaggio a uno dei propri contatti."
-#: C/send-message.page:16(name) C/send-file.page:17(name)
+#: C/send-message.page:17(name) C/send-file.page:17(name)
#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:14(name)
#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:14(name)
#: C/change-status.page:19(name) C/add-contact.page:18(name)
msgid "Phil Bull"
msgstr "Phil Bull"
-#: C/send-message.page:17(email) C/send-file.page:18(email)
+#: C/send-message.page:18(email) C/send-file.page:18(email)
#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:15(email)
#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:15(email)
#: C/change-status.page:20(email) C/add-contact.page:19(email)
msgid "philbull@gmail.com"
msgstr "philbull@gmail.com"
-#: C/send-message.page:31(title)
+#: C/send-message.page:32(title)
msgid "Send a message to someone"
msgstr "Inviare un messaggio"
-#: C/send-message.page:40(p)
-msgid ""
-"Double click the name of the contact that you want to have a conversation "
-"with."
-msgstr ""
-"Fare doppio-clic sul nome del contatto con cui iniziare una conversazione."
-
-#: C/send-message.page:46(p)
+#: C/send-message.page:36(p)
+#| msgid ""
+#| "Double click the name of the contact that you want to have a conversation "
+#| "with."
msgid ""
-"Right-click on the name of the contact you want to have a conversation with, "
-"and choose <gui>Chat</gui>."
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
msgstr ""
-"Fare clic col pulsante destro del mouse sul contatto con cui iniziare una "
-"conversazione e scegliere <gui>Conversazione</gui>."
+"Dalla finestra <gui>Elenco contatti</gui>, fare doppio-clic sul contatto con "
+"cui avere una conversazione."
-#: C/send-message.page:54(p)
+#: C/send-message.page:42(p)
msgid ""
"A new window will open. Type a message into the box at the bottom of the "
"window and press <key>Enter</key> to send it."
@@ -599,6 +641,22 @@ msgstr ""
"testo nella parte inferiore della finestra e premere <key>Invio</key> per "
"inviarlo."
+#: C/send-message.page:50(title)
+#| msgid "Send a message to someone"
+msgid "Send a message to a meta-contact"
+msgstr "Inviare un messaggio a un meta-contatto"
+
+#: C/send-message.page:58(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
+msgstr ""
+"Selezionare il contatto con cui iniziare una conversazione e dal menù "
+"selezionare <gui style=\"menuitem\">Conversazione</gui>."
+
#: C/send-file.page:8(desc)
msgid "Send a file from your computer to one of your contacts."
msgstr "Inviare un file dal proprio computer a uno dei propri contatti."
@@ -759,7 +817,6 @@ msgstr ""
"sinistra della finestra."
#: 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>."
@@ -999,9 +1056,6 @@ 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 enable the account."
@@ -1172,6 +1226,116 @@ msgstr ""
"precedenti</gui>. La finestra <gui>Conversazioni precedenti</gui> viene "
"aperta con quel contatto già selezionato."
+#: C/link-contacts.page:11(desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "Unire e separare diversi contatti in uno solo."
+
+#: C/link-contacts.page:25(title)
+msgid "Combine and separate contacts"
+msgstr "Unire e dividere contatti"
+
+#: C/link-contacts.page:26(p)
+msgid ""
+"If one, or more, of your contacts has multiple accounts with different "
+"messaging services, you can combine these contacts into a single one."
+msgstr ""
+"Se uno o più dei propri contatti presenta molteplici account con differenti "
+"servizi di messaggistica, è possibile unire questi contatti in uno solo."
+
+#: C/link-contacts.page:30(p)
+msgid ""
+"The resulting contact is called a <em>meta-contact</em>: a contact composed "
+"from different single contacts."
+msgstr ""
+"Il risultato di questa unione è un nuovo contatto chiamato <em>meta-"
+"contatto</em>: un contatto composto da molteplici contatti singoli."
+
+#: C/link-contacts.page:34(p)
+msgid ""
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
+msgstr ""
+"Se nell'elenco dei contatti è presente un contatto Mario Rossi che utilizza "
+"tre diversi servizi di messaggistica come:"
+
+#: C/link-contacts.page:40(p)
+#| msgid "Facebook"
+msgid "janes@facebook"
+msgstr "mario@facebook"
+
+#: C/link-contacts.page:45(p)
+msgid "jane.smith@gmail"
+msgstr "mario.rossi@gmail"
+
+#: C/link-contacts.page:50(p)
+msgid "jane_smith@hotmail"
+msgstr "mario_rossi@hotmail"
+
+#: C/link-contacts.page:55(p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr ""
+"È possibile unire questi contatti in un singolo contatto per Mario Rossi."
+
+#: C/link-contacts.page:60(title)
+#| msgid "Hide offline contacts"
+msgid "Combining contacts"
+msgstr "Unire i contatti"
+
+#: C/link-contacts.page:63(p)
+msgid ""
+"From the <gui>Contact List</gui> window, right-click one of the contact that "
+"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
+"gui>."
+msgstr ""
+"Dalla finestra <gui>Elenco contatti</gui>, fare clic col pulsante destro del "
+"mouse su uno dei contatti che presenta molteplici account e selezionare <gui "
+"style=\"menuitem\">Unisci contatti...</gui>."
+
+#: C/link-contacts.page:70(p)
+#| msgid ""
+#| "From the <gui>Saved Presets</gui> box, select the status message you want "
+#| "to remove."
+msgid ""
+"From the left pane in the <gui>Link Contacts</gui> window, select the "
+"contacts you want to combine."
+msgstr ""
+"Dal riquadro a sinistra nella finestra <gui>Unisci contatti</gui>, "
+"selezionare i contatti da unire assieme."
+
+#: C/link-contacts.page:76(p)
+#| msgid "Click <gui style=\"button\">Log in</gui>."
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "Fare clic su <gui style=\"button\">Unisci</gui>."
+
+#: C/link-contacts.page:82(p)
+msgid ""
+"When a meta-contact has been created, the default contact that will be used "
+"to have a conversation with when you double-click on it, is the contact with "
+"the highest presence on-line."
+msgstr ""
+"Quando viene creato un meta-contatto, l'account del contatto utilizzato in "
+"modo predefinito per avere una conversazione è quello con la maggiore "
+"presenza online."
+
+#: C/link-contacts.page:91(title)
+#| msgid "Hide offline contacts"
+msgid "Separating contacts"
+msgstr "Dividere i contatti"
+
+#: C/link-contacts.page:94(p)
+msgid ""
+"From the <gui>Contact List</gui>, right-click the contact to separate, and "
+"select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr ""
+"Dalla finestra <gui>Elenco contatti</gui>, fare clic col pulsante destro del "
+"mouse sul contatto da separare e selezionare <gui style=\"menuitem\">Unisci "
+"contatti...</gui>."
+
+#: C/link-contacts.page:100(p)
+#| msgid "Click <gui style=\"button\">Log in</gui>."
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "Fare clic su <gui style=\"button\">Dividi</gui>."
+
#: C/license.page:8(desc)
msgid "Legal information."
msgstr "Informazioni legali."
@@ -1253,7 +1417,8 @@ msgstr ""
"org/licenses/by-sa/3.0/deed.it\">commons deed</link>."
#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation witn an IRC contact."
+#| msgid "Start a conversation witn an IRC contact."
+msgid "Start a conversation with an IRC contact."
msgstr "Avviare una conversazione con un contatto IRC."
#: C/irc-start-conversation.page:30(title)
@@ -1338,11 +1503,17 @@ msgstr ""
"prive di un soprannome registrato."
#: 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 "
+"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
"network is known to have this feature."
msgstr ""
"Attualmente <app>Empathy</app> non supporta la registrazione del soprannome. "
@@ -1391,9 +1562,6 @@ msgid "Internet Relay Chat (IRC)"
msgstr "Internet Relay Chat (IRC)"
#: 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>."
@@ -1413,7 +1581,7 @@ msgstr "Stanze di conversazione e conversazioni"
msgid "Common IRC Problems"
msgstr "Problemi comuni con IRC"
-#: C/irc-manage.page:52(title) C/index.page:52(title)
+#: C/irc-manage.page:52(title) C/index.page:55(title)
msgid "Common Problems"
msgstr "Problemi comuni"
@@ -1481,28 +1649,30 @@ msgid "Join a protected IRC chat room"
msgstr "Entrare in una stanza di conversazione IRC protetta"
#: 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 alcune reti IRC, le stanze IRC private possono essere protette tramite "
-"una password."
+"una password. Se si conosce la password della stanza, procedere come segue:"
-#: C/irc-join-pwd.page:30(p)
-msgid "To join such a room, if you know the password:"
-msgstr "Per entrare in tali stanze, se si conosce la password:"
-
-#: C/irc-join-pwd.page:35(p)
-msgid "<link xref=\"irc-join-room\">Join the room</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\">Entrare nella stanza</link>."
-#: 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 ""
-"Nella casella di testo <gui>Questa stanza è protetta da una password</gui>, "
-"digitare la password della stanza e fare clic su <gui style=\"button"
-"\">Entra</gui>."
+"Verrà richiesto di inserire una password. Digitare la password per quella "
+"stanza e fare clic su <gui style=\"button\">Entra</gui>."
#: C/irc-commands.page:7(desc)
msgid "The supported IRC commands."
@@ -1527,7 +1697,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"
@@ -1538,21 +1708,27 @@ msgid "Introduction to the <app>Empathy</app> instant messenger."
msgstr ""
"Introduzione al programma di messaggistica istantanea <app>Empathy</app>."
-#: C/introduction.page:28(title)
+#: C/introduction.page:21(title)
msgid "Introduction"
msgstr "Introduzione"
-#: 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> è un'applicazione per la messaggistica istantanea per lo "
"GNOME Desktop. Supporta messaggi testuali, chiamate audio e video, invio di "
"file e tutti i più usati sistemi di messaggistica come MSN e 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."
@@ -1561,66 +1737,75 @@ msgstr ""
"meglio quando si è al lavoro e di mantenere facilmente i contatti con i "
"propri amici."
-#: C/introduction.page:39(p)
+#: C/introduction.page:32(p)
+#| 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."
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 ""
-"È possibile raggruppare le conversazioni in una singola finestra o avere "
-"diverse finestre in base al tipo di conversazione; è possibile eseguire "
-"ricerche tra le conversazioni precedenti e condividere il proprio desktop in "
-"pochi clic."
+"Utilizzando <app>Empathy</app> è possibile raggruppare le conversazioni in "
+"una singola finestra o avere diverse finestre in base al tipo di "
+"conversazione; è possibile eseguire ricerche tra le conversazioni precedenti "
+"e condividere il proprio desktop in pochi clic."
-#: C/introduction.page:46(title)
+#: C/introduction.page:39(title)
msgid "<gui>Contact List</gui> window"
msgstr "Finestra <gui>Elenco contatti</gui>"
-#: C/introduction.page:47(desc)
+#: C/introduction.page:40(desc)
msgid "<app>Empathy</app> main window"
msgstr "La finestra principale di <app>Empathy</app>"
-#: C/introduction.page:49(p)
+#: C/introduction.page:42(p)
msgid "<app>Empathy</app> main window."
msgstr "Finestra principale di <app>Empathy</app>."
#. 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/index.page:27(None)
+#: C/index.page:28(None)
msgid ""
"@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
msgstr "non serve"
#: C/index.page:7(title) C/index.page:8(title)
-msgid "Empathy Instant Messenger"
-msgstr "Messaggistica istantanea Empathy"
+#| msgid "Empathy Instant Messenger"
+msgid "Empathy Internet Messenger"
+msgstr "Messaggistica Internet Empathy"
-#: C/index.page:26(title)
+#: C/index.page:27(title)
+#| msgid ""
+#| "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
+#| "\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
msgstr ""
"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Logo di Messaggistica istantanea Empathy</media> Messaggistica istantanea "
+"\">Logo di Messaggistica Internet Empathy</media> Messaggistica Internet "
"Empathy"
-#: C/index.page:32(title)
+#: C/index.page:35(title)
+msgid "Account Management"
+msgstr "Gestione degli account"
+
+#: C/index.page:39(title)
+msgid "Contact Management"
+msgstr "Gestione dei contatti"
+
+#: C/index.page:43(title)
msgid "Text Conversations"
msgstr "Conversazioni testuali"
-#: C/index.page:36(title)
+#: C/index.page:47(title)
msgid "Audio and Video Conversations"
msgstr "Conversazioni audio e video"
-#: C/index.page:40(title)
-msgid "Contact Management"
-msgstr "Gestione dei contatti"
-
-#: C/index.page:44(title)
-msgid "Account Management"
-msgstr "Gestione degli account"
-
-#: C/index.page:48(title)
+#: C/index.page:51(title)
msgid "Advanced Actions"
msgstr "Operazioni avanzate"
@@ -1760,7 +1945,7 @@ msgid ""
"From the <gui>Account</gui> drop-down list, select the account you want to "
"use for the group conversation."
msgstr ""
-"Dall'elenco a discesa <gui>Account</gui>, scegliere l'account da usare per "
+"Dall'elenco a discesa <gui>Account</gui>, selezionare l'account da usare per "
"la conversazione di gruppo."
#: C/group-conversations.page:69(p)
@@ -1806,7 +1991,8 @@ msgstr ""
#: C/group-conversations.page:97(p)
msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
msgstr ""
-"Fare clic sul nome del contatto e scegliere <gui>Invita nella stanza</gui>."
+"Fare clic col pulsante destro del mouse sul nome del contatto e scegliere "
+"<gui>Invita nella stanza</gui>."
#: C/group-conversations.page:102(p)
msgid ""
@@ -1933,14 +2119,18 @@ msgstr ""
"<gui>Ridurre la precisione della posizione geografica</gui>."
#: C/geolocation-turn.page:61(p)
+#| msgid ""
+#| "If you have an external device like a GPS or want to send a more accurate "
+#| "position, select the appropriate option in the <gui>Geoclue Settings</"
+#| "gui> section."
msgid ""
"If you have an external device like a GPS or want to send a more accurate "
-"position, select the appropriate option in the <gui>Geoclue Settings</gui> "
+"position, select the appropriate option in the <gui>Location sources</gui> "
"section."
msgstr ""
"Se si dispone di un dispositivo esterno come un GPS o per inviare "
"informazioni più precise sulla posizione, selezionare le opzioni appropriate "
-"nella sezione <gui>Impostazioni Geoclue</gui> section."
+"nella sezione <gui>Sorgenti per la posizione</gui>."
#: C/geolocation-supported.page:7(desc)
msgid "Services that supports geolocation and compatibility."
@@ -2295,7 +2485,7 @@ msgid ""
"Select the account you wish to disable from the accounts list on the left "
"side of the window."
msgstr ""
-"Selezionare l'account da disabilitare dall'elenco degli account nella parte "
+"Selezionare l'account da disabilitare dall'elenco degli account nel riquadro "
"sinistra della finestra."
#: C/disable-account.page:56(p)
@@ -2338,10 +2528,15 @@ msgstr ""
"\">aggiungere un account</link>."
#: 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 ""
"Questa pagina fornisce informazioni su come creare un nuovo account per "
@@ -2350,34 +2545,40 @@ msgstr ""
"informazioni necessarie per potersi collegare utilizzando <app>Empathy</app>."
#: 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."
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."
+"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 è uno dei più utilizzati social network. Consente agli utenti di "
-"creare un proprio profili e di comunicare con i propri amici."
+"creare un proprio profilo e di comunicare con i propri amici."
-#: C/create-account.page:52(p)
+#: 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 ""
-"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>."
+"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)
+#: C/create-account.page:59(title) C/audio-video.page:170(p)
msgid "Jabber"
msgstr "Jabber"
-#: C/create-account.page:62(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, "
@@ -2387,7 +2588,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:66(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."
@@ -2397,7 +2598,7 @@ msgstr ""
"disponibili molti fornitori, uno molto diffuso è <link href=\"http://"
"register.jabber.org/\">Jabber.org</link>."
-#: C/create-account.page:71(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 "
@@ -2407,11 +2608,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:78(title) C/audio-video.page:190(p)
+#: C/create-account.page:77(title) C/audio-video.page:190(p)
msgid "People Nearby"
msgstr "Persone nelle vicinanze"
-#: C/create-account.page:80(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, "
@@ -2424,15 +2625,15 @@ msgstr ""
"automaticamente tutti gli utenti che utilizzano lo stesso servizio "
"all'interno della rete."
-#: C/create-account.page:85(p)
+#: C/create-account.page:84(p)
msgid "For more information, see <link xref=\"salut-protocol\"/>."
msgstr "Per maggiori informazioni, consultare <link xref=\"salut-protocol\"/>."
-#: C/create-account.page:89(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:91(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 "
@@ -2444,7 +2645,7 @@ msgstr ""
"servizi SIP. È possibile comunicare con tutti gli utenti SIP "
"indipendentemente dal fornitore SIP utilizzato."
-#: C/create-account.page:96(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?"
@@ -2454,7 +2655,7 @@ msgstr ""
"\"https://signup.sipphone.com/new-users/app?class=NewUser;proc=start"
"\">Sipphone</link>."
-#: C/create-account.page:101(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 "
@@ -2464,7 +2665,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:106(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."
@@ -2473,11 +2674,11 @@ msgstr ""
"normali dal proprio computer. Generalmente è necessario abbonarsi a un "
"servizio a pagamento per poter usufruire di questa possibilità."
-#: C/create-account.page:111(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:113(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 "
@@ -2490,11 +2691,7 @@ msgstr ""
"colleghi. Se un altro utente sta usando quel soprannome, è necessario "
"sceglierne un altro."
-#: 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."
+#: C/create-account.page:117(p)
msgid ""
"Some IRC networks use a service called NickServ to allow users to protect "
"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
@@ -2503,7 +2700,7 @@ msgstr ""
"consentire agli utenti di proteggere il proprio soprannome. Per maggiori "
"informazioni, consultare <link xref=\"irc-nick-password\"/>."
-#: C/create-account.page:121(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."
@@ -2511,11 +2708,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:126(title)
+#: C/create-account.page:125(title)
msgid "Proprietary Services"
msgstr "Servizi proprietari"
-#: C/create-account.page:128(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 "
@@ -2529,19 +2726,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:137(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:142(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:147(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:152(link) C/audio-video.page:210(p)
+#: C/create-account.page:151(link) C/audio-video.page:210(p)
msgid "Yahoo!"
msgstr "Yahoo!"
@@ -2597,7 +2794,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/audio-video.page:58(None) C/audio-call.page:47(None)
+#: C/audio-video.page:58(None)
msgid ""
"@@image: 'figures/audio-input-microphone.png'; "
"md5=8d89026b66a263a3bc5b1f0665948567"
@@ -2793,11 +2990,11 @@ msgstr "zephyr"
msgid "Call your contacts over the Internet."
msgstr "Chiamare i propri contatti via Internet."
-#: C/audio-call.page:33(title)
+#: C/audio-call.page:27(title)
msgid "Start an audio conversation"
msgstr "Avviare una conversazione audio"
-#: C/audio-call.page:35(p)
+#: C/audio-call.page:29(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 "
@@ -2808,33 +3005,53 @@ msgstr ""
"account ed è necessario che l'altra persona abbia un'applicazione in grado "
"di supportare le chiamate audio."
-#: C/audio-call.page:46(p)
+#: C/audio-call.page:34(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>."
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>."
+"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\">Audio Call</gui>."
msgstr ""
"Dalla finestra <gui>Elenco contatti</gui>, fare clic sull'icona <media type="
-"\"image\" mime=\"image/png\" src=\"figures/audio-input-microphone.png"
-"\">della conversazione audio</media> a fianco del nome del contatto da "
-"chiamare e scegliere <gui style=\"menuitem\">Chiamata audio</gui>. In "
-"alternativa, fare clic col pulsante destro del mouse sul contatto e "
-"scegliere <gui style=\"menuitem\">Chiamata audio</gui>."
+"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">della chiamata "
+"video</media> a fianco del nome del contatto da chiamare e scegliere <gui "
+"style=\"menuitem>Chiamata video</gui>."
-#: C/audio-call.page:63(p)
+#: C/audio-call.page:55(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."
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."
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
msgstr ""
"Per convertire una conversazione audio in una conversazione video, scegliere "
-"<guiseq><gui style=\"menu\">Chiamata</gui><gui style=\"menuitem\">Invia "
-"video</gui></guiseq> oppure fare clic sul pulsante <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">della chiamata video</"
-"media> nella barra degli strumenti."
+"<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Abilitato</"
+"gui></guiseq>."
+
+#: C/audio-call.page:63(title)
+#| msgid "Start a conversation witn an IRC contact."
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Avviare una conversazione audio con un meta-contatto"
+
+#: C/audio-call.page:71(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
+msgstr ""
+"Selezionare il contatto con cui iniziare una conversazione e dal menù "
+"selezionare <gui>Chiamata audio</gui>."
#: C/add-contact.page:9(desc)
msgid "Add someone to the contact list."
@@ -2947,7 +3164,6 @@ msgstr ""
"<link xref=\"accounts-window#details\"/>."
#: 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>."
@@ -2998,7 +3214,6 @@ 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"
msgid "Jabber account details"
msgstr "Dettagli per l'account Jabber"
@@ -3123,7 +3338,6 @@ msgid "Additional information necessary for connecting to IRC networks."
msgstr "Informazioni necessarie per collegarsi alle reti IRC."
#: C/account-irc.page:31(title)
-#| msgid "IRC Account Details"
msgid "IRC account details"
msgstr "Dettagli per l'account IRC"
@@ -3192,17 +3406,24 @@ msgid "NickServ Passwords"
msgstr "Password del NickServ"
#: 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 "
+"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 ""
"All'interno di alcune reti è possibile registrare i soprannomi utilizzando "
"un servizio chiamato «NickServ». <app>Empathy</app> non supporta direttamente "
-"le password per i soprannomi, ma alcune reti, compresa la molto diffusa "
+"le password per i soprannomi, ma con alcune reti, compresa la molto diffusa "
"FreeNode, le password relative al server vengono inoltrare al «NickServ», "
"consentendo di usare questo campo per identificarsi con il «NickServ». Per "
"maggiori informazioni, consultare <link xref=\"irc-nick-password\"/>."
@@ -3371,3 +3592,20 @@ msgstr ""
#: C/index.page:0(None)
msgid "translator-credits"
msgstr "Milo Casagrande <milo@ubuntu.com>"
+
+#~ msgid "To join such a room, if you know the password:"
+#~ msgstr "Per entrare in tali stanze, se si conosce la password:"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Dalla finestra <gui>Elenco contatti</gui>, fare clic sull'icona <media "
+#~ "type=\"image\" mime=\"image/png\" src=\"figures/audio-input-microphone.png"
+#~ "\">della conversazione audio</media> a fianco del nome del contatto da "
+#~ "chiamare e scegliere <gui style=\"menuitem\">Chiamata audio</gui>. In "
+#~ "alternativa, fare clic col pulsante destro del mouse sul contatto e "
+#~ "scegliere <gui style=\"menuitem\">Chiamata audio</gui>."
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 1cc65532c..6cc6c0992 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -67,7 +67,6 @@ libempathy_gtk_handwritten_source = \
empathy-irc-network-chooser.c \
empathy-irc-network-chooser-dialog.c \
empathy-irc-network-dialog.c \
- empathy-kludge-label.c \
empathy-log-window.c \
empathy-new-message-dialog.c \
empathy-new-call-dialog.c \
@@ -129,7 +128,6 @@ libempathy_gtk_headers = \
empathy-irc-network-chooser.h \
empathy-irc-network-chooser-dialog.h \
empathy-irc-network-dialog.h \
- empathy-kludge-label.h \
empathy-log-window.h \
empathy-new-message-dialog.h \
empathy-new-call-dialog.h \
diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui
index 545fe679d..559e0809b 100644
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@ -10,7 +10,6 @@
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
- <property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox10">
<property name="visible">True</property>
diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index cfc73b702..a8041d2ba 100644
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -160,13 +160,13 @@ avatar_image_add_filter (EmpathyAvatarImage *avatar_image)
gdk_error_trap_push ();
if (gdkwindow) {
XWindowAttributes attrs;
- XGetWindowAttributes (gdk_display, window, &attrs);
+ XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), window, &attrs);
mask |= attrs.your_event_mask;
}
- XSelectInput (gdk_display, window, mask);
+ XSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), window, mask);
- gdk_error_trap_pop ();
+ gdk_error_trap_pop_ignored ();
gdk_window_add_filter (NULL, avatar_image_filter_func, avatar_image);
}
diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 6aedb0306..d24f1782c 100644
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -145,13 +145,12 @@ cell_renderer_activatable_activate (GtkCellRenderer *cell,
static void
cell_renderer_activatable_render (
- GtkCellRenderer *cell,
- GdkWindow *window,
- GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GdkRectangle *expose_area,
- GtkCellRendererState flags)
+ GtkCellRenderer *cell,
+ cairo_t *cr,
+ GtkWidget *widget,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
+ GtkCellRendererState flags)
{
EmpathyCellRendererActivatablePriv *priv = GET_PRIV (cell);
@@ -160,7 +159,7 @@ cell_renderer_activatable_render (
GTK_CELL_RENDERER_CLASS
(empathy_cell_renderer_activatable_parent_class)->render (
- cell, window, widget, background_area, cell_area, expose_area, flags);
+ cell, cr, widget, background_area, cell_area, flags);
}
static void
diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index fb360431f..d9067e06d 100644
--- a/libempathy-gtk/empathy-cell-renderer-expander.c
+++ b/libempathy-gtk/empathy-cell-renderer-expander.c
@@ -73,11 +73,10 @@ static void empathy_cell_renderer_expander_get_size (GtkCellRenderer
gint *width,
gint *height);
static void empathy_cell_renderer_expander_render (GtkCellRenderer *cell,
- GdkWindow *window,
+ cairo_t *cr,
GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GdkRectangle *expose_area,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
GtkCellRendererState flags);
static gboolean empathy_cell_renderer_expander_activate (GtkCellRenderer *cell,
GdkEvent *event,
@@ -294,11 +293,10 @@ empathy_cell_renderer_expander_get_size (GtkCellRenderer *cell,
static void
empathy_cell_renderer_expander_render (GtkCellRenderer *cell,
- GdkWindow *window,
+ cairo_t *cr,
GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GdkRectangle *expose_area,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
GtkCellRendererState flags)
{
EmpathyCellRendererExpander *expander;
@@ -328,7 +326,8 @@ empathy_cell_renderer_expander_render (GtkCellRenderer *cell,
} else
expander_style = priv->expander_style;
- empathy_cell_renderer_expander_get_size (cell, widget, cell_area,
+ empathy_cell_renderer_expander_get_size (cell, widget,
+ (GdkRectangle *) cell_area,
&x_offset, &y_offset,
NULL, NULL);
@@ -338,9 +337,8 @@ empathy_cell_renderer_expander_render (GtkCellRenderer *cell,
NULL);
gtk_paint_expander (gtk_widget_get_style (widget),
- window,
+ cr,
GTK_STATE_NORMAL,
- expose_area,
widget,
"treeview",
cell_area->x + x_offset + xpad + priv->expander_size / 2,
diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c
index eb4ccb073..321b71028 100644
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -58,11 +58,10 @@ static void cell_renderer_text_get_size (GtkCellRenderer *c
gint *width,
gint *height);
static void cell_renderer_text_render (GtkCellRenderer *cell,
- GdkDrawable *window,
+ cairo_t *cr,
GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GdkRectangle *expose_area,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
GtkCellRendererState flags);
static void cell_renderer_text_update_text (EmpathyCellRendererText *cell,
GtkWidget *widget,
@@ -266,11 +265,10 @@ cell_renderer_text_get_size (GtkCellRenderer *cell,
static void
cell_renderer_text_render (GtkCellRenderer *cell,
- GdkWindow *window,
+ cairo_t *cr,
GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GdkRectangle *expose_area,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
GtkCellRendererState flags)
{
EmpathyCellRendererText *celltext;
@@ -282,11 +280,11 @@ cell_renderer_text_render (GtkCellRenderer *cell,
(flags & GTK_CELL_RENDERER_SELECTED));
(GTK_CELL_RENDERER_CLASS (empathy_cell_renderer_text_parent_class)->render) (
- cell, window,
+ cell, cr,
widget,
background_area,
cell_area,
- expose_area, flags);
+ flags);
}
static void
diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c
index c05b92fb9..5b6d5727b 100644
--- a/libempathy-gtk/empathy-chat-text-view.c
+++ b/libempathy-gtk/empathy-chat-text-view.c
@@ -274,11 +274,11 @@ chat_text_view_populate_popup (EmpathyChatTextView *view,
/* Clear menu item */
if (gtk_text_buffer_get_char_count (priv->buffer) > 0) {
item = gtk_separator_menu_item_new ();
- gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CLEAR, NULL);
- gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
g_signal_connect_swapped (item, "activate",
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 166944885..295ee6af1 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -59,7 +59,7 @@
#define CHAT_DIR_CREATE_MODE (S_IRUSR | S_IWUSR | S_IXUSR)
#define CHAT_FILE_CREATE_MODE (S_IRUSR | S_IWUSR)
-#define IS_ENTER(v) (v == GDK_Return || v == GDK_ISO_Enter || v == GDK_KP_Enter)
+#define IS_ENTER(v) (v == GDK_KEY_Return || v == GDK_KEY_ISO_Enter || v == GDK_KEY_KP_Enter)
#define MAX_INPUT_HEIGHT 150
#define COMPOSING_STOP_TIMEOUT 5
@@ -1483,15 +1483,15 @@ chat_input_key_press_event_cb (GtkWidget *widget,
/* Catch ctrl+up/down so we can traverse messages we sent */
if ((event->state & GDK_CONTROL_MASK) &&
- (event->keyval == GDK_Up ||
- event->keyval == GDK_Down)) {
+ (event->keyval == GDK_KEY_Up ||
+ event->keyval == GDK_KEY_Down)) {
GtkTextBuffer *buffer;
const gchar *str;
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (chat->input_text_view));
chat_input_history_update (chat, buffer);
- if (event->keyval == GDK_Up) {
+ if (event->keyval == GDK_KEY_Up) {
str = chat_input_history_get_next (chat);
} else {
str = chat_input_history_get_prev (chat);
@@ -1537,24 +1537,24 @@ chat_input_key_press_event_cb (GtkWidget *widget,
return FALSE;
}
if (!(event->state & GDK_CONTROL_MASK) &&
- event->keyval == GDK_Page_Up) {
+ event->keyval == GDK_KEY_Page_Up) {
adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (text_view_sw));
gtk_adjustment_set_value (adj, gtk_adjustment_get_value (adj) - gtk_adjustment_get_page_size (adj));
return TRUE;
}
if ((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK &&
- event->keyval == GDK_Page_Down) {
+ event->keyval == GDK_KEY_Page_Down) {
adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (text_view_sw));
val = MIN (gtk_adjustment_get_value (adj) + gtk_adjustment_get_page_size (adj),
gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj));
gtk_adjustment_set_value (adj, val);
return TRUE;
}
- if (event->keyval == GDK_Escape) {
+ if (event->keyval == GDK_KEY_Escape) {
empathy_search_bar_hide (EMPATHY_SEARCH_BAR (priv->search_bar));
}
if (!(event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) &&
- event->keyval == GDK_Tab) {
+ event->keyval == GDK_KEY_Tab) {
GtkTextBuffer *buffer;
GtkTextIter start, current;
gchar *nick, *completed;
@@ -2536,29 +2536,6 @@ chat_create_ui (EmpathyChat *chat)
}
static void
-chat_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
-{
- GtkBin *bin = GTK_BIN (widget);
- GtkWidget *child;
-
- requisition->width = gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2;
- requisition->height = gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2;
-
- child = gtk_bin_get_child (bin);
-
- if (child && gtk_widget_get_visible (child))
- {
- GtkRequisition child_requisition;
-
- gtk_widget_size_request (child, &child_requisition);
-
- requisition->width += child_requisition.width;
- requisition->height += child_requisition.height;
- }
-}
-
-static void
chat_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
@@ -2674,7 +2651,6 @@ empathy_chat_class_init (EmpathyChatClass *klass)
object_class->set_property = chat_set_property;
object_class->constructed = chat_constructed;
- widget_class->size_request = chat_size_request;
widget_class->size_allocate = chat_size_allocate;
g_object_class_install_property (object_class,
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index 6da181087..9189d41e6 100644
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -178,7 +178,6 @@ empathy_contact_information_dialog_show (EmpathyContact *contact,
/* Create dialog */
dialog = gtk_dialog_new ();
- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_window_set_title (GTK_WINDOW (dialog),
empathy_contact_get_alias (contact));
@@ -238,7 +237,6 @@ empathy_contact_edit_dialog_show (EmpathyContact *contact,
/* Create dialog */
dialog = gtk_dialog_new ();
- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Contact Information"));
@@ -290,7 +288,6 @@ empathy_contact_personal_dialog_show (GtkWindow *parent)
/* Create dialog */
personal_dialog = gtk_dialog_new ();
- empathy_dialog_remove_separator (GTK_DIALOG (personal_dialog));
gtk_window_set_resizable (GTK_WINDOW (personal_dialog), FALSE);
gtk_window_set_title (GTK_WINDOW (personal_dialog), _("Personal Information"));
@@ -396,7 +393,6 @@ empathy_new_contact_dialog_show_with_contact (GtkWindow *parent,
/* Create dialog */
dialog = gtk_dialog_new ();
- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_window_set_title (GTK_WINDOW (dialog), _("New Contact"));
diff --git a/libempathy-gtk/empathy-contact-dialogs.ui b/libempathy-gtk/empathy-contact-dialogs.ui
index 0986de1f5..c18bfabb4 100644
--- a/libempathy-gtk/empathy-contact-dialogs.ui
+++ b/libempathy-gtk/empathy-contact-dialogs.ui
@@ -8,7 +8,6 @@
<property name="resizable">False</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox4">
<property name="visible">True</property>
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index ce586420e..f7a946a71 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -856,7 +856,7 @@ contact_list_view_key_press_event_cb (EmpathyContactListView *view,
GdkEventKey *event,
gpointer user_data)
{
- if (event->keyval == GDK_Menu) {
+ if (event->keyval == GDK_KEY_Menu) {
MenuPopupData *data;
data = g_slice_new (MenuPopupData);
@@ -1282,7 +1282,7 @@ contact_list_view_search_key_navigation_cb (GtkWidget *search,
GdkEventKey *eventkey = ((GdkEventKey *) event);
gboolean ret = FALSE;
- if (eventkey->keyval == GDK_Up || eventkey->keyval == GDK_Down) {
+ if (eventkey->keyval == GDK_KEY_Up || eventkey->keyval == GDK_KEY_Down) {
GdkEvent *new_event;
new_event = gdk_event_copy (event);
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 651622554..921e8d783 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -363,7 +363,6 @@ empathy_contact_file_transfer_menu_item_new (EmpathyContact *contact)
return item;
}
-/* FIXME we should check if the contact supports vnc stream tube */
GtkWidget *
empathy_contact_share_my_desktop_menu_item_new (EmpathyContact *contact)
{
diff --git a/libempathy-gtk/empathy-contact-selector-dialog.c b/libempathy-gtk/empathy-contact-selector-dialog.c
index 7989e9ccc..62b902746 100644
--- a/libempathy-gtk/empathy-contact-selector-dialog.c
+++ b/libempathy-gtk/empathy-contact-selector-dialog.c
@@ -316,8 +316,6 @@ empathy_contact_selector_dialog_init (EmpathyContactSelectorDialog *dialog)
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
/* Tweak the dialog */
- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
-
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT);
gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 15dda50f3..eaacc6316 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -50,7 +50,6 @@
#include "empathy-groups-widget.h"
#include "empathy-ui-utils.h"
#include "empathy-string-parser.h"
-#include "empathy-kludge-label.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include <libempathy/empathy-debug.h>
@@ -147,6 +146,15 @@ enum
COL_COUNT
};
+static gboolean
+field_value_is_empty (TpContactInfoField *field)
+{
+ if (field->field_value == NULL)
+ return TRUE;
+
+ return field->field_value[0] == NULL;
+}
+
static void
contact_widget_save (EmpathyContactWidget *information)
{
@@ -161,7 +169,7 @@ contact_widget_save (EmpathyContactWidget *information)
TpContactInfoField *field = l->data;
next = l->next;
- if (field->field_value == NULL || EMP_STR_EMPTY (field->field_value[0]))
+ if (field_value_is_empty (field))
{
DEBUG ("Drop empty field: %s", field->field_name);
tp_contact_info_field_free (field);
@@ -277,46 +285,67 @@ contact_widget_details_update_edit (EmpathyContactWidget *information)
TpConnection *connection;
GList *specs, *l;
guint n_rows = 0;
+ GList *info;
g_assert (information->details_to_set == NULL);
contact = empathy_contact_get_tp_contact (information->contact);
connection = tp_contact_get_connection (contact);
+ info = tp_contact_get_contact_info (contact);
specs = tp_connection_get_contact_info_supported_fields (connection);
specs = g_list_sort (specs, (GCompareFunc) contact_info_field_spec_cmp);
for (l = specs; l != NULL; l = l->next)
{
TpContactInfoFieldSpec *spec = l->data;
- TpContactInfoField *field;
+ TpContactInfoField *field = NULL;
InfoFieldData *field_data;
- GList *info, *ll;
- GStrv value = NULL;
+ GList *ll;
GtkWidget *w;
field_data = find_info_field_data (spec->name);
if (field_data == NULL)
{
DEBUG ("Unhandled ContactInfo field spec: %s", spec->name);
- continue;
}
/* Search initial value */
- info = tp_contact_get_contact_info (contact);
- for (ll = info; ll != NULL; ll = ll->next)
+ for (ll = info; ll != NULL && field == NULL; ll = ll->next)
{
- field = ll->data;
- if (!tp_strdiff (field->field_name, spec->name))
- {
- value = field->field_value;
- break;
- }
+ TpContactInfoField *tmp = ll->data;
+
+ if (!tp_strdiff (tmp->field_name, spec->name))
+ field = tmp;
+ }
+
+ if (field != NULL)
+ {
+ /* We found the field, make a copy for the details_to_set list */
+ field = tp_contact_info_field_copy (field);
+ DEBUG ("Field %s is in our vCard", spec->name);
+ }
+ else
+ {
+ /* Empathy doesn't support editing this field and it's not in the
+ * contact's fields so we can't do much with it. */
+ DEBUG ("Field %s is not in our vCard", spec->name);
+
+ if (field_data == NULL)
+ continue;
+
+ field = tp_contact_info_field_new (spec->name, spec->parameters,
+ NULL);
}
- field = tp_contact_info_field_new (spec->name, spec->parameters, value);
information->details_to_set = g_list_prepend (information->details_to_set,
field);
+ /* Empathy doesn't display this field so we can't change it. But we put
+ * it in the details_to_set list so it won't be erased when calling
+ * SetContactInfo (bgo #630427) */
+ if (field_data == NULL)
+ continue;
+
/* Add Title */
w = gtk_label_new (_(field_data->title));
gtk_table_attach (GTK_TABLE (information->table_details),
@@ -338,6 +367,7 @@ contact_widget_details_update_edit (EmpathyContactWidget *information)
n_rows++;
}
g_list_free (specs);
+ g_list_free (info);
return n_rows;
}
@@ -1397,8 +1427,7 @@ favourite_toggled_cb (GtkToggleButton *button,
static void
contact_widget_contact_setup (EmpathyContactWidget *information)
{
- /* Setup label_status as a KludgeLabel */
- information->label_status = empathy_kludge_label_new ("");
+ information->label_status = gtk_label_new ("");
gtk_label_set_line_wrap_mode (GTK_LABEL (information->label_status),
PANGO_WRAP_WORD_CHAR);
gtk_label_set_line_wrap (GTK_LABEL (information->label_status),
diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c
index 9cf63817e..b549b8bad 100644
--- a/libempathy-gtk/empathy-geometry.c
+++ b/libempathy-gtk/empathy-geometry.c
@@ -126,26 +126,27 @@ geometry_get_key_file (void)
return key_file;
}
-void
-empathy_geometry_save (GtkWindow *window,
- const gchar *name)
+static void
+empathy_geometry_save (GtkWindow *window)
{
GKeyFile *key_file;
GdkWindow *gdk_window;
GdkWindowState window_state;
- gchar *escaped_name;
gint x, y, w, h;
gboolean maximized;
+ gchar *position_str = NULL;
+ GHashTable *names;
+ GHashTableIter iter;
+ const gchar *name;
+
+ names = g_object_get_data (G_OBJECT (window), GEOMETRY_NAME_KEY);
g_return_if_fail (GTK_IS_WINDOW (window));
- g_return_if_fail (!EMP_STR_EMPTY (name));
+ g_return_if_fail (names != NULL);
if (!gtk_widget_get_visible (GTK_WIDGET (window)))
return;
- /* escape the name so that unwanted characters such as # are removed */
- escaped_name = g_uri_escape_string (name, NULL, TRUE);
-
/* Get window geometry */
gtk_window_get_position (window, &x, &y);
gtk_window_get_size (window, &w, &h);
@@ -162,22 +163,33 @@ empathy_geometry_save (GtkWindow *window,
/* Save window size only if not maximized */
if (!maximized)
{
- gchar *str;
+ position_str = g_strdup_printf (GEOMETRY_POSITION_FORMAT, x, y, w, h);
+ }
- str = g_strdup_printf (GEOMETRY_POSITION_FORMAT, x, y, w, h);
- g_key_file_set_string (key_file, GEOMETRY_POSITION_GROUP,
- escaped_name, str);
- g_free (str);
+ g_hash_table_iter_init (&iter, names);
+ while (g_hash_table_iter_next (&iter, (gpointer) &name, NULL))
+ {
+ gchar *escaped_name;
+
+ /* escape the name so that unwanted characters such as # are removed */
+ escaped_name = g_uri_escape_string (name, NULL, TRUE);
+
+ g_key_file_set_boolean (key_file, GEOMETRY_MAXIMIZED_GROUP,
+ escaped_name, maximized);
+
+ if (position_str != NULL)
+ g_key_file_set_string (key_file, GEOMETRY_POSITION_GROUP,
+ escaped_name, position_str);
+
+ g_free (escaped_name);
}
- g_key_file_set_boolean (key_file, GEOMETRY_MAXIMIZED_GROUP,
- escaped_name, maximized);
geometry_schedule_store (key_file);
- g_free (escaped_name);
+ g_free (position_str);
}
-void
+static void
empathy_geometry_load (GtkWindow *window,
const gchar *name)
{
@@ -224,10 +236,7 @@ geometry_configure_event_cb (GtkWindow *window,
GdkEventConfigure *event,
gpointer user_data)
{
- gchar *name;
-
- name = g_object_get_data (G_OBJECT (window), GEOMETRY_NAME_KEY);
- empathy_geometry_save (window, name);
+ empathy_geometry_save (window);
return FALSE;
}
@@ -239,10 +248,7 @@ geometry_window_state_event_cb (GtkWindow *window,
{
if ((event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) != 0)
{
- gchar *name;
-
- name = g_object_get_data (G_OBJECT (window), GEOMETRY_NAME_KEY);
- empathy_geometry_save (window, name);
+ empathy_geometry_save (window);
}
return FALSE;
@@ -252,10 +258,19 @@ static void
geometry_map_cb (GtkWindow *window,
gpointer user_data)
{
- gchar *name;
+ GHashTable *names;
+ GHashTableIter iter;
+ const gchar *name;
/* The WM will replace this window, restore its last position */
- name = g_object_get_data (G_OBJECT (window), GEOMETRY_NAME_KEY);
+ names = g_object_get_data (G_OBJECT (window), GEOMETRY_NAME_KEY);
+
+ g_assert (names != NULL);
+
+ /* Use the first name we get in the hash table */
+ g_hash_table_iter_init (&iter, names);
+ g_assert (g_hash_table_iter_next (&iter, (gpointer) &name, NULL));
+
empathy_geometry_load (window, name);
}
@@ -263,23 +278,37 @@ void
empathy_geometry_bind (GtkWindow *window,
const gchar *name)
{
- gchar *str;
+ GHashTable *names;
+ gboolean connect_sigs = FALSE;
g_return_if_fail (GTK_IS_WINDOW (window));
g_return_if_fail (!EMP_STR_EMPTY (name));
/* Check if this window is already bound */
- str = g_object_get_data (G_OBJECT (window), GEOMETRY_NAME_KEY);
- if (str != NULL)
- return;
+ names = g_object_get_data (G_OBJECT (window), GEOMETRY_NAME_KEY);
+ if (names == NULL)
+ {
+ connect_sigs = TRUE;
+ names = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, NULL);
+
+ g_object_set_data_full (G_OBJECT (window), GEOMETRY_NAME_KEY, names,
+ (GDestroyNotify) g_hash_table_unref);
+ }
+ else if (g_hash_table_lookup (names, name) != NULL)
+ {
+ return;
+ }
/* Store the geometry name in the window's data */
- str = g_strdup (name);
- g_object_set_data_full (G_OBJECT (window), GEOMETRY_NAME_KEY, str, g_free);
+ g_hash_table_insert (names, g_strdup (name), GUINT_TO_POINTER (TRUE));
/* Load initial geometry */
empathy_geometry_load (window, name);
+ if (!connect_sigs)
+ return;
+
/* Track geometry changes */
g_signal_connect (window, "configure-event",
G_CALLBACK (geometry_configure_event_cb), NULL);
@@ -290,8 +319,20 @@ empathy_geometry_bind (GtkWindow *window,
}
void
-empathy_geometry_unbind (GtkWindow *window)
+empathy_geometry_unbind (GtkWindow *window,
+ const gchar *name)
{
+ GHashTable *names;
+
+ names = g_object_get_data (G_OBJECT (window), GEOMETRY_NAME_KEY);
+ if (names == NULL)
+ return;
+
+ g_hash_table_remove (names, name);
+
+ if (g_hash_table_size (names) > 0)
+ return;
+
g_signal_handlers_disconnect_by_func (window,
geometry_configure_event_cb, NULL);
g_signal_handlers_disconnect_by_func (window,
diff --git a/libempathy-gtk/empathy-geometry.h b/libempathy-gtk/empathy-geometry.h
index dc8fab650..80ea92ebf 100644
--- a/libempathy-gtk/empathy-geometry.h
+++ b/libempathy-gtk/empathy-geometry.h
@@ -29,16 +29,11 @@
G_BEGIN_DECLS
-void empathy_geometry_save (GtkWindow *window,
- const gchar *name);
-
-void empathy_geometry_load (GtkWindow *window,
- const gchar *name);
-
void empathy_geometry_bind (GtkWindow *window,
const gchar *name);
-void empathy_geometry_unbind (GtkWindow *window);
+void empathy_geometry_unbind (GtkWindow *window,
+ const gchar *name);
G_END_DECLS
diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c
index 7e50dfbe2..8d878b7d3 100644
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -394,7 +394,8 @@ set_up (EmpathyGroupsWidget *self)
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect (renderer, "toggled", (GCallback) cell_toggled_cb, self);
- column = gtk_tree_view_column_new_with_attributes (_("Select"), renderer,
+ column = gtk_tree_view_column_new_with_attributes (
+ C_("verb in a column header displaying group names", "Select"), renderer,
"active", COL_ENABLED,
NULL);
diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index 55682812e..edfb3fd48 100644
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -107,7 +107,6 @@ empathy_new_individual_dialog_show_with_individual (GtkWindow *parent,
/* Create dialog */
dialog = gtk_dialog_new ();
- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_window_set_title (GTK_WINDOW (dialog), _("New Contact"));
diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c
index 30ca1cc66..b49e29f8b 100644
--- a/libempathy-gtk/empathy-individual-edit-dialog.c
+++ b/libempathy-gtk/empathy-individual-edit-dialog.c
@@ -243,7 +243,6 @@ empathy_individual_edit_dialog_init (
dialog->priv = priv;
priv->individual = NULL;
- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Contact Information"));
diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c
index e6d4a90ad..bb52e7d85 100644
--- a/libempathy-gtk/empathy-individual-information-dialog.c
+++ b/libempathy-gtk/empathy-individual-information-dialog.c
@@ -273,7 +273,6 @@ empathy_individual_information_dialog_init (
dialog->priv = priv;
priv->individual = NULL;
- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
content_area = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
diff --git a/libempathy-gtk/empathy-individual-linker.c b/libempathy-gtk/empathy-individual-linker.c
index 8da456947..3aee55d78 100644
--- a/libempathy-gtk/empathy-individual-linker.c
+++ b/libempathy-gtk/empathy-individual-linker.c
@@ -566,31 +566,6 @@ finalize (GObject *object)
}
static void
-size_request (GtkWidget *widget,
- GtkRequisition *requisition)
-{
- GtkBin *bin = GTK_BIN (widget);
- GtkWidget *child;
-
- requisition->width =
- gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2;
- requisition->height =
- gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2;
-
- child = gtk_bin_get_child (bin);
-
- if (child && gtk_widget_get_visible (child))
- {
- GtkRequisition child_requisition;
-
- gtk_widget_size_request (child, &child_requisition);
-
- requisition->width += child_requisition.width;
- requisition->height += child_requisition.height;
- }
-}
-
-static void
size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
@@ -628,7 +603,6 @@ empathy_individual_linker_class_init (EmpathyIndividualLinkerClass *klass)
object_class->dispose = dispose;
object_class->finalize = finalize;
- widget_class->size_request = size_request;
widget_class->size_allocate = size_allocate;
/**
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 7747435e1..b1237cf8b 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -133,6 +133,8 @@ individual_menu_add_personas (GtkMenuShell *menu,
folks_persona_get_display_id (FOLKS_PERSONA (persona)), account);
contact_item = gtk_image_menu_item_new_with_label (label);
+ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (contact_item),
+ TRUE);
contact_submenu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (contact_item), contact_submenu);
image = gtk_image_new_from_icon_name (
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 907930311..ee0e06c65 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -882,7 +882,7 @@ individual_view_key_press_event_cb (EmpathyIndividualView *view,
GdkEventKey *event,
gpointer user_data)
{
- if (event->keyval == GDK_Menu)
+ if (event->keyval == GDK_KEY_Menu)
{
MenuPopupData *data;
@@ -1314,7 +1314,7 @@ individual_view_search_key_navigation_cb (GtkWidget *search,
GdkEventKey *eventkey = ((GdkEventKey *) event);
gboolean ret = FALSE;
- if (eventkey->keyval == GDK_Up || eventkey->keyval == GDK_Down)
+ if (eventkey->keyval == GDK_KEY_Up || eventkey->keyval == GDK_KEY_Down)
{
GdkEvent *new_event;
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 36cea8a5e..f30343638 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -45,7 +45,6 @@
#include "empathy-groups-widget.h"
#include "empathy-gtk-enum-types.h"
#include "empathy-individual-widget.h"
-#include "empathy-kludge-label.h"
#include "empathy-string-parser.h"
#include "empathy-ui-utils.h"
@@ -1267,8 +1266,7 @@ alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
FALSE, 0);
gtk_widget_show (image);
- /* Set up status_label as a KludgeLabel */
- label = empathy_kludge_label_new ("");
+ label = gtk_label_new ("");
gtk_label_set_line_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD_CHAR);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
index afe259364..f81ba80bb 100644
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
@@ -551,7 +551,8 @@ empathy_irc_network_chooser_dialog_constructed (GObject *object)
GTK_STOCK_REMOVE, GTK_RESPONSE_REJECT,
NULL);
- priv->select_button = gtk_dialog_add_button (dialog, _("Select"),
+ priv->select_button = gtk_dialog_add_button (dialog,
+ C_("verb displayed on a button to select an IRC network", "Select"),
GTK_RESPONSE_CLOSE);
fill_store (self);
diff --git a/libempathy-gtk/empathy-kludge-label.c b/libempathy-gtk/empathy-kludge-label.c
deleted file mode 100644
index 7ed4be62f..000000000
--- a/libempathy-gtk/empathy-kludge-label.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* vim: set ts=4 sts=4 sw=4 et: */
-/*
- * Copyright (C) 2009 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Authors: Davyd Madeley <davyd.madeley@collabora.co.uk>
- */
-
-#include "empathy-kludge-label.h"
-
-G_DEFINE_TYPE (EmpathyKludgeLabel, empathy_kludge_label, GTK_TYPE_LABEL);
-
-static void
-empathy_kludge_label_size_allocate (GtkWidget *self,
- GtkAllocation *allocation)
-{
- PangoLayout *layout;
-
- GTK_WIDGET_CLASS (empathy_kludge_label_parent_class)->size_allocate (
- self, allocation);
-
- /* force the width of the PangoLayout to be the width of the allocation */
- layout = gtk_label_get_layout (GTK_LABEL (self));
- pango_layout_set_width (layout, allocation->width * PANGO_SCALE);
-}
-
-static gboolean
-empathy_kludge_label_expose_event (GtkWidget *self,
- GdkEventExpose *event)
-{
- PangoLayout *layout;
- PangoRectangle rect;
- GtkAllocation real_allocation;
- GtkAllocation allocation;
- gboolean r;
-
- layout = gtk_label_get_layout (GTK_LABEL (self));
- pango_layout_get_pixel_extents (layout, NULL, &rect);
-
- /* this is mind-bendingly evil:
- * get_layout_location() is going to remove rect.x from the position of the
- * layout when painting it. This really sucks. We're going to compensate by
- * adding this value to the allocation.
- */
- gtk_widget_get_allocation (self, &allocation);
- real_allocation = allocation;
- allocation.x += rect.x;
- gtk_widget_set_allocation (self, &allocation);
-
- r = GTK_WIDGET_CLASS (empathy_kludge_label_parent_class)->expose_event (
- self, event);
-
- gtk_widget_set_allocation (self, &real_allocation);
-
- return r;
-}
-
-static void
-empathy_kludge_label_class_init (EmpathyKludgeLabelClass *klass)
-{
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
- widget_class->size_allocate = empathy_kludge_label_size_allocate;
- widget_class->expose_event = empathy_kludge_label_expose_event;
-}
-
-static void
-empathy_kludge_label_init (EmpathyKludgeLabel *self)
-{
-}
-
-GtkWidget *
-empathy_kludge_label_new (const char *str)
-{
- return g_object_new (EMPATHY_TYPE_KLUDGE_LABEL,
- "label", str,
- "xalign", 0.,
- NULL);
-}
diff --git a/libempathy-gtk/empathy-kludge-label.h b/libempathy-gtk/empathy-kludge-label.h
deleted file mode 100644
index f2ea1e938..000000000
--- a/libempathy-gtk/empathy-kludge-label.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2009 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Authors: Davyd Madeley <davyd.madeley@collabora.co.uk>
- */
-
-#ifndef __EMPATHY_KLUDGE_LABEL_H__
-#define __EMPATHY_KLUDGE_LABEL_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_KLUDGE_LABEL (empathy_kludge_label_get_type ())
-#define EMPATHY_KLUDGE_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_KLUDGE_LABEL, EmpathyKludgeLabel))
-#define EMPATHY_KLUDGE_LABEL_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), EMPATHY_TYPE_KLUDGE_LABEL, EmpathyKludgeLabelClass))
-#define EMPATHY_IS_KLUDGE_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_KLUDGE_LABEL))
-#define EMPATHY_IS_KLUDGE_LABEL_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), EMPATHY_TYPE_KLUDGE_LABEL))
-#define EMPATHY_KLUDGE_LABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_KLUDGE_LABEL, EmpathyKludgeLabelClass))
-
-typedef struct _EmpathyKludgeLabel EmpathyKludgeLabel;
-typedef struct _EmpathyKludgeLabelClass EmpathyKludgeLabelClass;
-
-struct _EmpathyKludgeLabel
-{
- GtkLabel parent;
-};
-
-struct _EmpathyKludgeLabelClass
-{
- GtkLabelClass parent_class;
-};
-
-GType empathy_kludge_label_get_type (void);
-GtkWidget *empathy_kludge_label_new (const char *str);
-
-G_END_DECLS
-
-#endif
diff --git a/libempathy-gtk/empathy-linking-dialog.c b/libempathy-gtk/empathy-linking-dialog.c
index 2e62e5d1e..d0a091053 100644
--- a/libempathy-gtk/empathy-linking-dialog.c
+++ b/libempathy-gtk/empathy-linking-dialog.c
@@ -108,7 +108,6 @@ empathy_linking_dialog_init (EmpathyLinkingDialog *self)
dialog = GTK_DIALOG (self);
/* Set up dialog */
- empathy_dialog_remove_separator (GTK_DIALOG (dialog));
gtk_window_set_resizable (GTK_WINDOW (self), TRUE);
/* Translators: this is the title of the linking dialogue (reached by
* right-clicking on a contact and selecting "Link…"). "Link" in this title
diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
index 2b5f54f98..a607939f3 100644
--- a/libempathy-gtk/empathy-live-search.c
+++ b/libempathy-gtk/empathy-live-search.c
@@ -60,7 +60,7 @@ enum
static guint signals[LAST_SIGNAL];
-static void live_search_hook_widget_destroy_cb (GtkObject *object,
+static void live_search_hook_widget_destroy_cb (GtkWidget *object,
gpointer user_data);
/**
@@ -255,15 +255,15 @@ live_search_entry_key_pressed_cb (GtkEntry *entry,
gboolean ret;
/* if esc key pressed, hide the search */
- if (event->keyval == GDK_Escape)
+ if (event->keyval == GDK_KEY_Escape)
{
gtk_widget_hide (GTK_WIDGET (self));
return TRUE;
}
/* emit key navigation signal, so other widgets can respond to it properly */
- if (event->keyval == GDK_Up || event->keyval == GDK_Down
- || event->keyval == GDK_Left || event->keyval == GDK_Right)
+ if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down
+ || event->keyval == GDK_KEY_Left || event->keyval == GDK_KEY_Right)
{
g_signal_emit (self, signals[KEYNAV], 0, event, &ret);
return ret;
@@ -319,20 +319,20 @@ live_search_key_press_event_cb (GtkWidget *widget,
/* dont forward this event to the entry, else the event is consumed by the
* entry and does not close the window */
if (!gtk_widget_get_visible (GTK_WIDGET (self)) &&
- event->keyval == GDK_Escape)
+ event->keyval == GDK_KEY_Escape)
return FALSE;
/* do not show the search if CTRL and/or ALT are pressed with a key
* this is needed, because otherwise the CTRL + F accel would not work,
* because the entry consumes it */
if (event->state & (GDK_MOD1_MASK | GDK_CONTROL_MASK) ||
- event->keyval == GDK_Control_L ||
- event->keyval == GDK_Control_R)
+ event->keyval == GDK_KEY_Control_L ||
+ event->keyval == GDK_KEY_Control_R)
return FALSE;
/* dont forward the up and down arrow keys to the entry, they are needed for
* navigation in the treeview and are not needed in the search entry */
- if (event->keyval == GDK_Up || event->keyval == GDK_Down)
+ if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down)
return FALSE;
/* realize the widget if it is not realized yet */
@@ -376,7 +376,7 @@ live_search_release_hook_widget (EmpathyLiveSearch *self)
}
static void
-live_search_hook_widget_destroy_cb (GtkObject *object,
+live_search_hook_widget_destroy_cb (GtkWidget *object,
gpointer user_data)
{
EmpathyLiveSearch *self = EMPATHY_LIVE_SEARCH (user_data);
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index cd9b4559c..8258688e2 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -525,12 +525,12 @@ presence_chooser_entry_key_press_event_cb (EmpathyPresenceChooser *self,
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
- if (priv->editing_status && event->keyval == GDK_Escape) {
+ if (priv->editing_status && event->keyval == GDK_KEY_Escape) {
/* the user pressed Escape, undo the editing */
presence_chooser_reset_status (self);
return TRUE;
}
- else if (event->keyval == GDK_Up || event->keyval == GDK_Down) {
+ else if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down) {
/* ignore */
return TRUE;
}
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 852f38174..689f6a28a 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -77,8 +77,7 @@ enum
COL_LABEL,
COL_CM,
COL_PROTOCOL_NAME,
- COL_IS_GTALK,
- COL_IS_FACEBOOK,
+ COL_SERVICE,
COL_COUNT
};
@@ -131,16 +130,18 @@ protocol_chooser_sort_func (GtkTreeModel *model,
* non-gtalk */
if (cmp == 0)
{
- gboolean is_gtalk, is_facebook;
+ gchar *service;
+
gtk_tree_model_get (model, iter_a,
- COL_IS_GTALK, &is_gtalk,
- COL_IS_FACEBOOK, &is_facebook,
+ COL_SERVICE, &service,
-1);
- if (is_gtalk || is_facebook)
+ if (service != NULL)
cmp = 1;
else
cmp = -1;
+
+ g_free (service);
}
}
@@ -224,10 +225,8 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
g_strdup (proto->name), g_strdup (cm->name));
icon_name = empathy_protocol_icon_name (proto->name);
- display_name = empathy_protocol_name_to_display_name (proto->name);
- if (display_name == NULL)
- display_name = proto->name;
+ display_name = empathy_protocol_name_to_display_name (proto->name);
gtk_list_store_insert_with_values (priv->store,
NULL, 0,
@@ -235,33 +234,29 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
COL_LABEL, display_name,
COL_CM, cm,
COL_PROTOCOL_NAME, proto->name,
- COL_IS_GTALK, FALSE,
- COL_IS_FACEBOOK, FALSE,
-1);
if (!tp_strdiff (proto->name, "jabber") &&
!tp_strdiff (cm->name, "gabble"))
{
- display_name = empathy_protocol_name_to_display_name ("gtalk");
+ display_name = empathy_service_name_to_display_name ("google-talk");
gtk_list_store_insert_with_values (priv->store,
NULL, 0,
COL_ICON, "im-google-talk",
COL_LABEL, display_name,
COL_CM, cm,
COL_PROTOCOL_NAME, proto->name,
- COL_IS_GTALK, TRUE,
- COL_IS_FACEBOOK, FALSE,
+ COL_SERVICE, "google-talk",
-1);
- display_name = empathy_protocol_name_to_display_name ("facebook");
+ display_name = empathy_service_name_to_display_name ("facebook");
gtk_list_store_insert_with_values (priv->store,
NULL, 0,
COL_ICON, "im-facebook",
COL_LABEL, display_name,
COL_CM, cm,
COL_PROTOCOL_NAME, proto->name,
- COL_IS_GTALK, FALSE,
- COL_IS_FACEBOOK, TRUE,
+ COL_SERVICE, "facebook",
-1);
}
@@ -312,8 +307,7 @@ protocol_chooser_constructed (GObject *object)
G_TYPE_STRING, /* Label */
G_TYPE_OBJECT, /* CM */
G_TYPE_STRING, /* protocol name */
- G_TYPE_BOOLEAN, /* is gtalk */
- G_TYPE_BOOLEAN); /* is facebook */
+ G_TYPE_STRING); /* service */
/* Set the protocol sort function */
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (priv->store),
@@ -426,13 +420,12 @@ protocol_chooser_filter_visible_func (GtkTreeModel *model,
TpConnectionManager *cm = NULL;
gchar *protocol_name = NULL;
gboolean visible = FALSE;
- gboolean is_gtalk, is_facebook;
+ gchar *service;
gtk_tree_model_get (model, iter,
COL_CM, &cm,
COL_PROTOCOL_NAME, &protocol_name,
- COL_IS_GTALK, &is_gtalk,
- COL_IS_FACEBOOK, &is_facebook,
+ COL_SERVICE, &service,
-1);
if (cm != NULL && protocol_name != NULL)
@@ -444,7 +437,7 @@ protocol_chooser_filter_visible_func (GtkTreeModel *model,
if (protocol != NULL)
{
- visible = priv->filter_func (cm, protocol, is_gtalk, is_facebook,
+ visible = priv->filter_func (cm, protocol, service,
priv->filter_user_data);
}
}
@@ -452,6 +445,7 @@ protocol_chooser_filter_visible_func (GtkTreeModel *model,
if (cm != NULL)
g_object_unref (cm);
+ g_free (service);
return visible;
}
@@ -470,8 +464,7 @@ TpConnectionManager *
empathy_protocol_chooser_dup_selected (
EmpathyProtocolChooser *protocol_chooser,
TpConnectionManagerProtocol **protocol,
- gboolean *is_gtalk,
- gboolean *is_facebook)
+ gchar **service)
{
GtkTreeIter iter;
TpConnectionManager *cm = NULL;
@@ -512,17 +505,10 @@ empathy_protocol_chooser_dup_selected (
}
}
- if (is_gtalk != NULL)
- {
- gtk_tree_model_get (GTK_TREE_MODEL (cur_model), &iter,
- COL_IS_GTALK, is_gtalk,
- -1);
- }
-
- if (is_facebook != NULL)
+ if (service != NULL)
{
gtk_tree_model_get (GTK_TREE_MODEL (cur_model), &iter,
- COL_IS_FACEBOOK, is_facebook,
+ COL_SERVICE, service,
-1);
}
}
@@ -571,3 +557,59 @@ empathy_protocol_chooser_set_visible (EmpathyProtocolChooser *protocol_chooser,
gtk_combo_box_set_active (GTK_COMBO_BOX (protocol_chooser), 0);
}
+
+EmpathyAccountSettings *
+empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
+{
+ EmpathyAccountSettings *settings;
+ gchar *str;
+ const gchar *display_name;
+ TpConnectionManager *cm;
+ TpConnectionManagerProtocol *proto;
+ gchar *service;
+
+ cm = empathy_protocol_chooser_dup_selected (self, &proto, &service);
+ if (cm == NULL || proto == NULL)
+ return NULL;
+
+ if (service != NULL)
+ display_name = empathy_service_name_to_display_name (service);
+ else
+ display_name = empathy_protocol_name_to_display_name (proto->name);
+
+ /* Create account */
+ /* To translator: %s is the name of the protocol, such as "Google Talk" or
+ * "Yahoo!"
+ */
+ str = g_strdup_printf (_("New %s account"), display_name);
+ settings = empathy_account_settings_new (cm->name, proto->name, service, str);
+
+ g_free (str);
+
+ if (!tp_strdiff (service, "google-talk"))
+ {
+ gchar *fallback_servers[] = {
+ "talkx.l.google.com",
+ "talkx.l.google.com:443,oldssl",
+ "talkx.l.google.com:80",
+ NULL};
+
+ empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
+ NULL, NULL);
+
+ empathy_account_settings_set_strv (settings, "fallback-servers",
+ fallback_servers);
+ }
+ else if (!tp_strdiff (service, "facebook"))
+ {
+ empathy_account_settings_set_icon_name_async (settings, "im-facebook",
+ NULL, NULL);
+
+ empathy_account_settings_set_string (settings, "server",
+ "chat.facebook.com");
+ }
+
+ g_object_unref (cm);
+ g_free (service);
+ return settings;
+}
diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h
index 88b23cba2..f3c577661 100644
--- a/libempathy-gtk/empathy-protocol-chooser.h
+++ b/libempathy-gtk/empathy-protocol-chooser.h
@@ -28,6 +28,8 @@
#include <telepathy-glib/connection-manager.h>
+#include <libempathy/empathy-account-settings.h>
+
G_BEGIN_DECLS
#define EMPATHY_TYPE_PROTOCOL_CHOOSER (empathy_protocol_chooser_get_type ())
@@ -60,8 +62,7 @@ struct _EmpathyProtocolChooserClass
typedef gboolean (*EmpathyProtocolChooserFilterFunc) (TpConnectionManager *cm,
TpConnectionManagerProtocol *protocol,
- gboolean is_gtalk,
- gboolean is_facebook,
+ const gchar *service,
gpointer user_data);
GType empathy_protocol_chooser_get_type (void) G_GNUC_CONST;
@@ -69,13 +70,15 @@ GtkWidget * empathy_protocol_chooser_new (void);
TpConnectionManager *empathy_protocol_chooser_dup_selected (
EmpathyProtocolChooser *protocol_chooser,
TpConnectionManagerProtocol **protocol,
- gboolean *is_gtalk,
- gboolean *is_facebook);
+ gchar **service);
void empathy_protocol_chooser_set_visible (
EmpathyProtocolChooser *protocol_chooser,
EmpathyProtocolChooserFilterFunc func,
gpointer user_data);
+EmpathyAccountSettings * empathy_protocol_chooser_create_account_settings (
+ EmpathyProtocolChooser *self);
+
G_END_DECLS
#endif /* __EMPATHY_PROTOCOL_CHOOSER_H__ */
diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c
index 2116d598a..9a27795a2 100644
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -58,27 +58,6 @@ empathy_search_bar_new (EmpathyChatView *view)
}
static void
-empathy_search_bar_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
-{
- GtkBin *bin;
- GtkWidget *child;
-
- bin = GTK_BIN (widget);
- child = gtk_bin_get_child (bin);
-
- if (child && gtk_widget_get_visible (child))
- {
- GtkRequisition child_requisition;
-
- gtk_widget_size_request (child, &child_requisition);
-
- requisition->width = child_requisition.width;
- requisition->height = child_requisition.height;
- }
-}
-
-static void
empathy_search_bar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
@@ -230,7 +209,7 @@ empathy_search_bar_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer user_data)
{
- if (event->keyval == GDK_Escape)
+ if (event->keyval == GDK_KEY_Escape)
{
empathy_search_bar_hide (EMPATHY_SEARCH_BAR (widget));
return TRUE;
@@ -311,7 +290,6 @@ empathy_search_bar_class_init (EmpathySearchBarClass *class)
g_type_class_add_private (gobject_class, sizeof (EmpathySearchBarPriv));
/* Neither GtkBin nor GtkContainer seems to do this for us :( */
- widget_class->size_request = empathy_search_bar_size_request;
widget_class->size_allocate = empathy_search_bar_size_allocate;
}
diff --git a/libempathy-gtk/empathy-search-bar.ui b/libempathy-gtk/empathy-search-bar.ui
index c88d2a0e4..b07bda3f2 100644
--- a/libempathy-gtk/empathy-search-bar.ui
+++ b/libempathy-gtk/empathy-search-bar.ui
@@ -41,7 +41,7 @@
</child>
<child>
<object class="GtkButton" id="search_previous">
- <property name="label">Find previous</property>
+ <property name="label" translatable="yes">Find Previous</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -54,7 +54,7 @@
</child>
<child>
<object class="GtkButton" id="search_next">
- <property name="label">Find next</property>
+ <property name="label" translatable="yes">Find Next</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c
index 2a5904bfb..2d7ecfe6e 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.c
+++ b/libempathy-gtk/empathy-status-preset-dialog.c
@@ -521,7 +521,6 @@ empathy_status_preset_dialog_init (EmpathyStatusPresetDialog *self)
gtk_window_set_title (GTK_WINDOW (self),
_("Edit Custom Messages"));
- empathy_dialog_remove_separator (GTK_DIALOG (self));
gtk_dialog_add_button (GTK_DIALOG (self),
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 0a2d4f4f4..667c11090 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1570,7 +1570,7 @@ empathy_window_iconify (GtkWindow *window, GtkStatusIcon *status_icon)
XChangeProperty (dpy,
GDK_WINDOW_XID (gdk_window),
gdk_x11_get_xatom_by_name_for_display (
- gdk_drawable_get_display (gdk_window),
+ gdk_window_get_display (gdk_window),
"_NET_WM_ICON_GEOMETRY"),
XA_CARDINAL, 32, PropModeReplace,
(guchar *)&data, 4);
@@ -1606,7 +1606,11 @@ empathy_window_present_with_time (GtkWindow *window,
gtk_widget_hide (GTK_WIDGET (window));
}
- gtk_window_present_with_time (window, timestamp);
+ if (timestamp == GDK_CURRENT_TIME)
+ gtk_window_present (window);
+ else
+ gtk_window_present_with_time (window, timestamp);
+
gtk_window_set_skip_taskbar_hint (window, FALSE);
gtk_window_deiconify (window);
}
@@ -1614,7 +1618,7 @@ empathy_window_present_with_time (GtkWindow *window,
void
empathy_window_present (GtkWindow *window)
{
- empathy_window_present_with_time (window, GDK_CURRENT_TIME);
+ empathy_window_present_with_time (window, gtk_get_current_event_time ());
}
GtkWindow *
diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 43da188db..0b76d09a3 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -129,22 +129,6 @@ void empathy_window_iconify (GtkWindow *windo
GtkStatusIcon *status_icon);
GtkWindow * empathy_get_toplevel_window (GtkWidget *widget);
-/**
- * empathy_dialog_remove_separator:
- * @d: a #GtkDialog
- *
- * Replacement for gtk_dialog_set_has_separator(), which was removed for GTK+ 3.
- * This is a no-op for GTK+ 3, and expands to a call to
- * gtk_dialog_set_has_separator() with %FALSE for GTK+ 2.
- *
- * FIXME: Once we depend on GTK+ 3 unconditionally, this macro can be removed.
- */
-#ifndef HAVE_GTK3
-#define empathy_dialog_remove_separator(d) gtk_dialog_set_has_separator(d, FALSE);
-#else
-#define empathy_dialog_remove_separator(d)
-#endif
-
/* URL */
gchar * empathy_make_absolute_url (const gchar *url);
diff --git a/libempathy-gtk/empathy-video-widget.c b/libempathy-gtk/empathy-video-widget.c
index a3b13fd12..26cc878b2 100644
--- a/libempathy-gtk/empathy-video-widget.c
+++ b/libempathy-gtk/empathy-video-widget.c
@@ -170,8 +170,10 @@ empathy_video_widget_constructed (GObject *object)
static void empathy_video_widget_dispose (GObject *object);
static void empathy_video_widget_finalize (GObject *object);
-static gboolean empathy_video_widget_expose_event (GtkWidget *widget,
- GdkEventExpose *event);
+
+static gboolean empathy_video_widget_draw (GtkWidget *widget,
+ cairo_t *cr);
+
static void
empathy_video_widget_element_set_sink_properties (EmpathyVideoWidget *self);
@@ -258,7 +260,7 @@ empathy_video_widget_class_init (
object_class->set_property = empathy_video_widget_set_property;
object_class->get_property = empathy_video_widget_get_property;
- widget_class->expose_event = empathy_video_widget_expose_event;
+ widget_class->draw = empathy_video_widget_draw;
param_spec = g_param_spec_object ("gst-element",
"gst-element", "The underlaying gstreamer element",
@@ -421,20 +423,22 @@ empathy_video_widget_sync_message_cb (GstBus *bus, GstMessage *message,
}
static gboolean
-empathy_video_widget_expose_event (GtkWidget *widget, GdkEventExpose *event)
+empathy_video_widget_draw (GtkWidget *widget,
+ cairo_t *cr)
{
EmpathyVideoWidget *self = EMPATHY_VIDEO_WIDGET (widget);
EmpathyVideoWidgetPriv *priv = GET_PRIV (self);
GtkAllocation allocation;
- if (event != NULL && event->count > 0)
- return TRUE;
-
if (priv->overlay == NULL)
{
gtk_widget_get_allocation (widget, &allocation);
- gdk_window_clear_area (gtk_widget_get_window (widget), 0, 0,
- allocation.width, allocation.height);
+
+ gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
+ GTK_STATE_NORMAL, GTK_SHADOW_NONE, widget, NULL,
+ 0, 0,
+ gtk_widget_get_allocated_width (widget),
+ gtk_widget_get_allocated_height (widget));
return TRUE;
}
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 43bba44e6..29ff3f1b7 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -43,6 +43,7 @@ enum {
PROP_ACCOUNT = 1,
PROP_CM_NAME,
PROP_PROTOCOL,
+ PROP_SERVICE,
PROP_DISPLAY_NAME,
PROP_DISPLAY_NAME_OVERRIDDEN,
PROP_READY
@@ -62,6 +63,7 @@ struct _EmpathyAccountSettingsPriv
TpAccount *account;
gchar *cm_name;
gchar *protocol;
+ gchar *service;
gchar *display_name;
gchar *icon_name;
gboolean display_name_overridden;
@@ -123,6 +125,9 @@ empathy_account_settings_set_property (GObject *object,
case PROP_PROTOCOL:
priv->protocol = g_value_dup_string (value);
break;
+ case PROP_SERVICE:
+ priv->service = g_value_dup_string (value);
+ break;
case PROP_DISPLAY_NAME:
priv->display_name = g_value_dup_string (value);
break;
@@ -155,6 +160,9 @@ empathy_account_settings_get_property (GObject *object,
case PROP_PROTOCOL:
g_value_set_string (value, priv->protocol);
break;
+ case PROP_SERVICE:
+ g_value_set_string (value, priv->service);
+ break;
case PROP_DISPLAY_NAME:
g_value_set_string (value, priv->display_name);
break;
@@ -180,11 +188,14 @@ empathy_account_settings_constructed (GObject *object)
{
g_free (priv->cm_name);
g_free (priv->protocol);
+ g_free (priv->service);
priv->cm_name =
g_strdup (tp_account_get_connection_manager (priv->account));
priv->protocol =
g_strdup (tp_account_get_protocol (priv->account));
+ priv->service =
+ g_strdup (tp_account_get_service (priv->account));
priv->icon_name = g_strdup
(tp_account_get_icon_name (priv->account));
}
@@ -248,6 +259,13 @@ empathy_account_settings_class_init (
NULL,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (object_class, PROP_SERVICE,
+ g_param_spec_string ("service",
+ "Service",
+ "The service of this account, or NULL",
+ NULL,
+ G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
g_object_class_install_property (object_class, PROP_DISPLAY_NAME,
g_param_spec_string ("display-name",
"display-name",
@@ -329,6 +347,7 @@ empathy_account_settings_finalize (GObject *object)
/* free any data held directly by the object here */
g_free (priv->cm_name);
g_free (priv->protocol);
+ g_free (priv->service);
g_free (priv->display_name);
g_free (priv->icon_name);
@@ -440,11 +459,13 @@ empathy_account_settings_managers_ready_cb (GObject *object,
EmpathyAccountSettings *
empathy_account_settings_new (const gchar *connection_manager,
const gchar *protocol,
+ const gchar *service,
const char *display_name)
{
return g_object_new (EMPATHY_TYPE_ACCOUNT_SETTINGS,
"connection-manager", connection_manager,
"protocol", protocol,
+ "service", service,
"display-name", display_name,
NULL);
}
@@ -502,6 +523,14 @@ empathy_account_settings_get_protocol (EmpathyAccountSettings *settings)
return priv->protocol;
}
+const gchar *
+empathy_account_settings_get_service (EmpathyAccountSettings *settings)
+{
+ EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
+
+ return priv->service;
+}
+
gchar *
empathy_account_settings_get_icon_name (EmpathyAccountSettings *settings)
{
@@ -865,6 +894,9 @@ empathy_account_settings_set_string (EmpathyAccountSettings *settings,
{
EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
+ g_return_if_fail (param != NULL);
+ g_return_if_fail (value != NULL);
+
tp_asv_set_string (priv->parameters, g_strdup (param), value);
account_settings_remove_from_unset (settings, param);
@@ -877,7 +909,10 @@ empathy_account_settings_set_strv (EmpathyAccountSettings *settings,
{
EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
- tp_asv_set_strv (priv->parameters, param, value);
+ g_return_if_fail (param != NULL);
+ g_return_if_fail (value != NULL);
+
+ tp_asv_set_strv (priv->parameters, g_strdup (param), value);
account_settings_remove_from_unset (settings, param);
}
@@ -889,6 +924,8 @@ empathy_account_settings_set_int32 (EmpathyAccountSettings *settings,
{
EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
+ g_return_if_fail (param != NULL);
+
tp_asv_set_int32 (priv->parameters, g_strdup (param), value);
account_settings_remove_from_unset (settings, param);
@@ -901,6 +938,8 @@ empathy_account_settings_set_int64 (EmpathyAccountSettings *settings,
{
EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
+ g_return_if_fail (param != NULL);
+
tp_asv_set_int64 (priv->parameters, g_strdup (param), value);
account_settings_remove_from_unset (settings, param);
@@ -913,6 +952,8 @@ empathy_account_settings_set_uint32 (EmpathyAccountSettings *settings,
{
EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
+ g_return_if_fail (param != NULL);
+
tp_asv_set_uint32 (priv->parameters, g_strdup (param), value);
account_settings_remove_from_unset (settings, param);
@@ -925,6 +966,8 @@ empathy_account_settings_set_uint64 (EmpathyAccountSettings *settings,
{
EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
+ g_return_if_fail (param != NULL);
+
tp_asv_set_uint64 (priv->parameters, g_strdup (param), value);
account_settings_remove_from_unset (settings, param);
@@ -937,6 +980,8 @@ empathy_account_settings_set_boolean (EmpathyAccountSettings *settings,
{
EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
+ g_return_if_fail (param != NULL);
+
tp_asv_set_boolean (priv->parameters, g_strdup (param), value);
account_settings_remove_from_unset (settings, param);
@@ -973,6 +1018,8 @@ empathy_account_settings_set_display_name_async (
EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
GSimpleAsyncResult *result;
+ g_return_if_fail (name != NULL);
+
result = g_simple_async_result_new (G_OBJECT (settings),
callback, user_data, empathy_account_settings_set_display_name_finish);
@@ -1047,6 +1094,8 @@ empathy_account_settings_set_icon_name_async (
EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
GSimpleAsyncResult *result;
+ g_return_if_fail (name != NULL);
+
result = g_simple_async_result_new (G_OBJECT (settings),
callback, user_data, empathy_account_settings_set_icon_name_finish);
@@ -1189,6 +1238,9 @@ empathy_account_settings_do_create_account (EmpathyAccountSettings *settings)
tp_asv_set_string (properties, TP_IFACE_ACCOUNT ".Icon",
priv->icon_name);
+ if (priv->service != NULL)
+ tp_asv_set_string (properties, TP_PROP_ACCOUNT_SERVICE, priv->service);
+
tp_account_manager_create_account_async (priv->account_manager,
priv->cm_name, priv->protocol, priv->display_name,
priv->parameters, properties,
diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
index 7b1a4d6f9..d3276e1a5 100644
--- a/libempathy/empathy-account-settings.h
+++ b/libempathy/empathy-account-settings.h
@@ -63,6 +63,7 @@ GType empathy_account_settings_get_type (void);
EmpathyAccountSettings * empathy_account_settings_new (
const gchar *connection_manager,
const gchar *protocol,
+ const gchar *service,
const char *display_name);
EmpathyAccountSettings * empathy_account_settings_new_for_account (
@@ -74,6 +75,9 @@ const gchar *empathy_account_settings_get_cm (EmpathyAccountSettings *settings);
const gchar *empathy_account_settings_get_protocol (
EmpathyAccountSettings *settings);
+const gchar *empathy_account_settings_get_service (
+ EmpathyAccountSettings *settings);
+
TpAccount *empathy_account_settings_get_account (
EmpathyAccountSettings *settings);
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index ec5d83ab6..6eaa8c3cd 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -1737,7 +1737,8 @@ empathy_contact_dup_from_tp_contact (TpContact *tp_contact)
}
static int
-presence_sort_func (EmpathyContact *a, EmpathyContact *b)
+presence_cmp_func (EmpathyContact *a,
+ EmpathyContact *b)
{
FolksPresence *presence_a, *presence_b;
@@ -1750,29 +1751,108 @@ presence_sort_func (EmpathyContact *a, EmpathyContact *b)
folks_presence_get_presence_type (presence_b));
}
-/* Sort by presence as with presence_sort_func(), but if the two contacts have
+static gint
+voip_cmp_func (EmpathyContact *a,
+ EmpathyContact *b)
+{
+ gboolean has_audio_a, has_audio_b;
+ gboolean has_video_a, has_video_b;
+
+ has_audio_a = empathy_contact_can_voip_audio (a);
+ has_audio_b = empathy_contact_can_voip_audio (b);
+ has_video_a = empathy_contact_can_voip_video (a);
+ has_video_b = empathy_contact_can_voip_video (b);
+
+ /* First check video */
+ if (has_video_a == has_video_b)
+ {
+ /* Use audio to to break tie */
+ if (has_audio_a == has_audio_b)
+ return 0;
+ else if (has_audio_a)
+ return -1;
+ else
+ return 1;
+ }
+ else if (has_video_a)
+ return -1;
+ else
+ return 1;
+}
+
+static gint
+ft_cmp_func (EmpathyContact *a,
+ EmpathyContact *b)
+{
+ gboolean can_send_files_a, can_send_files_b;
+
+ can_send_files_a = empathy_contact_can_send_files (a);
+ can_send_files_b = empathy_contact_can_send_files (b);
+
+ if (can_send_files_a == can_send_files_b)
+ return 0;
+ else if (can_send_files_a)
+ return -1;
+ else
+ return 1;
+}
+
+static gint
+rfb_stream_tube_cmp_func (EmpathyContact *a,
+ EmpathyContact *b)
+{
+ gboolean rfb_a, rfb_b;
+
+ rfb_a = empathy_contact_can_use_rfb_stream_tube (a);
+ rfb_b = empathy_contact_can_use_rfb_stream_tube (b);
+
+ if (rfb_a == rfb_b)
+ return 0;
+ else if (rfb_a)
+ return -1;
+ else
+ return 1;
+}
+
+/* Sort by presence as with presence_cmp_func(), but if the two contacts have
* the same presence, prefer the one which can do both audio *and* video calls,
* over the one which can only do one of the two. */
static int
voip_sort_func (EmpathyContact *a, EmpathyContact *b)
{
- gboolean has_audio_video_a, has_audio_video_b;
- gint presence_sort = presence_sort_func (a, b);
+ gint presence_sort = presence_cmp_func (a, b);
if (presence_sort != 0)
return presence_sort;
- has_audio_video_a = empathy_contact_can_voip_audio (a) &&
- empathy_contact_can_voip_video (a);
- has_audio_video_b = empathy_contact_can_voip_audio (b) &&
- empathy_contact_can_voip_video (b);
+ return voip_cmp_func (a, b);
+}
- if (has_audio_video_a && !has_audio_video_b)
- return -1;
- else if (!has_audio_video_a && has_audio_video_b)
- return 1;
- else
- return 0;
+/* Sort by presence as with presence_cmp_func() and then break ties using the
+ * most "capable" individual. So users will be able to pick more actions on
+ * the contact in the "Contact" menu of the chat window. */
+static gint
+chat_sort_func (EmpathyContact *a,
+ EmpathyContact *b)
+{
+ gint result;
+
+ result = presence_cmp_func (a, b);
+ if (result != 0)
+ return result;
+
+ /* Prefer individual supporting file transfer */
+ result = ft_cmp_func (a, b);
+ if (result != 0)
+ return result;
+
+ /* Check audio/video capabilities */
+ result = voip_cmp_func (a, b);
+ if (result != 0)
+ return result;
+
+ /* Check 'Share my destop' feature */
+ return rfb_stream_tube_cmp_func (a, b);
}
static GCompareFunc
@@ -1784,11 +1864,12 @@ get_sort_func_for_action (EmpathyActionType action_type)
case EMPATHY_ACTION_VIDEO_CALL:
return (GCompareFunc) voip_sort_func;
case EMPATHY_ACTION_CHAT:
+ return (GCompareFunc) chat_sort_func;
case EMPATHY_ACTION_VIEW_LOGS:
case EMPATHY_ACTION_SEND_FILE:
case EMPATHY_ACTION_SHARE_MY_DESKTOP:
default:
- return (GCompareFunc) presence_sort_func;
+ return (GCompareFunc) presence_cmp_func;
}
}
diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h
index 21d08ed5d..aba78c880 100644
--- a/libempathy/empathy-gsettings.h
+++ b/libempathy/empathy-gsettings.h
@@ -29,7 +29,6 @@ G_BEGIN_DECLS
#define EMPATHY_PREFS_USE_CONN "use-conn"
#define EMPATHY_PREFS_AUTOCONNECT "autoconnect"
#define EMPATHY_PREFS_AUTOAWAY "autoaway"
-#define EMPATHY_PREFS_IMPORT_ASKED "import-asked"
#define EMPATHY_PREFS_BUTTERFLY_LOGS_MIGRATED "butterfly-logs-migrated"
#define EMPATHY_PREFS_FILE_TRANSFER_DEFAULT_FOLDER "file-transfer-default-folder"
diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c
index 517ae9e5b..13727db17 100644
--- a/libempathy/empathy-tls-verifier.c
+++ b/libempathy/empathy-tls-verifier.c
@@ -260,10 +260,13 @@ real_start_verification (EmpathyTLSVerifier *self)
/* if the last certificate is self-signed, and we have a list of
* trusted CAs, ignore it, as we want to check the chain against our
* trusted CAs list first.
+ * if we have only one certificate in the chain, don't ignore it though,
+ * as it's the CA certificate itself.
*/
last_cert = g_ptr_array_index (priv->cert_chain, num_certs - 1);
- if (gnutls_x509_crt_check_issuer (last_cert, last_cert) > 0)
+ if (gnutls_x509_crt_check_issuer (last_cert, last_cert) > 0 &&
+ num_certs > 1)
num_certs--;
}
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 375683b62..c1e911e65 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -155,13 +155,13 @@ tp_chat_add (EmpathyContactList *list,
object_path = tp_proxy_get_object_path (priv->channel);
props = tp_asv_new (
- TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING,
+ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
TP_IFACE_CHANNEL_TYPE_TEXT,
- TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT,
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_NONE,
- EMP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialChannels",
+ TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS,
TP_ARRAY_TYPE_OBJECT_PATH_LIST, &channels,
- EMP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialInviteeIDs",
+ TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_IDS,
G_TYPE_STRV, invitees,
/* FIXME: InvitationMessage ? */
NULL);
@@ -907,7 +907,7 @@ tp_chat_update_remote_contact (EmpathyTpChat *chat)
* have the group interface. If it has the conference interface, then
* it is indeed a MUC. */
if (tp_proxy_has_interface_by_id (priv->channel,
- EMP_IFACE_QUARK_CHANNEL_INTERFACE_CONFERENCE)) {
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_CONFERENCE)) {
return;
}
@@ -1320,7 +1320,7 @@ tp_chat_constructor (GType type,
const char **oprops = g_value_get_boxed (
g_value_array_get_nth (array, 1));
- if (tp_strv_contains (oprops, EMP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialChannels")) {
+ if (tp_strv_contains (oprops, TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS)) {
priv->can_upgrade_to_muc = TRUE;
break;
}
diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c
index 2e95f3957..d66bfc0f1 100644
--- a/libempathy/empathy-tp-roomlist.c
+++ b/libempathy/empathy-tp-roomlist.c
@@ -261,68 +261,50 @@ stop_listing_cb (TpChannel *proxy,
}
static void
-channel_ready_cb (TpChannel *channel,
- const GError *error,
- gpointer user_data)
+tp_roomlist_create_channel_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
{
- EmpathyTpRoomlist *list = EMPATHY_TP_ROOMLIST (user_data);
- EmpathyTpRoomlistPriv *priv = GET_PRIV (list);
+ EmpathyTpRoomlist *self = user_data;
+ EmpathyTpRoomlistPriv *priv = GET_PRIV (self);
+ GError *error = NULL;
- if (error != NULL) {
- DEBUG ("Channel invalidated: %s", error->message);
- g_signal_emit (list, signals[DESTROY], 0);
+ priv->channel = tp_account_channel_request_create_and_handle_channel_finish (
+ TP_ACCOUNT_CHANNEL_REQUEST (source), result, NULL, &error);
+
+ if (priv->channel == NULL) {
+ DEBUG ("Error creating channel: %s", error->message);
+ g_error_free (error);
return;
}
g_signal_connect (priv->channel, "invalidated",
- G_CALLBACK (tp_roomlist_invalidated_cb),
- list);
+ G_CALLBACK (tp_roomlist_invalidated_cb), self);
tp_cli_channel_type_room_list_connect_to_listing_rooms (priv->channel,
tp_roomlist_listing_cb,
NULL, NULL,
- G_OBJECT (list),
+ G_OBJECT (self),
NULL);
tp_cli_channel_type_room_list_connect_to_got_rooms (priv->channel,
tp_roomlist_got_rooms_cb,
NULL, NULL,
- G_OBJECT (list),
+ G_OBJECT (self),
NULL);
tp_cli_channel_type_room_list_call_get_listing_rooms (priv->channel, -1,
tp_roomlist_get_listing_rooms_cb,
NULL, NULL,
- G_OBJECT (list));
+ G_OBJECT (self));
if (priv->start_requested == TRUE) {
tp_cli_channel_type_room_list_call_list_rooms (priv->channel, -1,
- call_list_rooms_cb, list, NULL, NULL);
+ call_list_rooms_cb, self, NULL, NULL);
priv->start_requested = FALSE;
}
}
static void
-tp_roomlist_request_channel_cb (TpConnection *connection,
- const gchar *object_path,
- const GError *error,
- gpointer user_data,
- GObject *list)
-{
- EmpathyTpRoomlistPriv *priv = GET_PRIV (list);
-
- if (error) {
- DEBUG ("Error requesting channel: %s", error->message);
- return;
- }
-
- priv->channel = tp_channel_new (priv->connection, object_path,
- TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
- TP_HANDLE_TYPE_NONE,
- 0, NULL);
- tp_channel_call_when_ready (priv->channel, channel_ready_cb, list);
-}
-
-static void
tp_roomlist_finalize (GObject *object)
{
EmpathyTpRoomlistPriv *priv = GET_PRIV (object);
@@ -351,18 +333,26 @@ static void
tp_roomlist_constructed (GObject *list)
{
EmpathyTpRoomlistPriv *priv = GET_PRIV (list);
+ GHashTable *request;
+ TpAccountChannelRequest *req;
+
+ request = tp_asv_new (
+ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+ TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_NONE,
+ NULL);
priv->connection = tp_account_get_connection (priv->account);
g_object_ref (priv->connection);
- tp_cli_connection_call_request_channel (priv->connection, -1,
- TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
- TP_HANDLE_TYPE_NONE,
- 0,
- TRUE,
- tp_roomlist_request_channel_cb,
- NULL, NULL,
- list);
+ req = tp_account_channel_request_new (priv->account, request,
+ TP_USER_ACTION_TIME_CURRENT_TIME);
+
+ tp_account_channel_request_create_and_handle_channel_async (req, NULL,
+ tp_roomlist_create_channel_cb, list);
+
+ g_hash_table_unref (request);
+ g_object_unref (req);
}
static void
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 85953f8f9..5e7befd27 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -539,7 +539,6 @@ empathy_protocol_name_to_display_name (const gchar *proto_name)
gboolean translated;
} names[] = {
{ "jabber", "Jabber", FALSE },
- { "gtalk", "Google Talk", FALSE },
{ "msn", "MSN", FALSE, },
{ "local-xmpp", N_("People Nearby"), TRUE },
{ "irc", "IRC", FALSE },
@@ -547,7 +546,6 @@ empathy_protocol_name_to_display_name (const gchar *proto_name)
{ "aim", "AIM", FALSE },
{ "yahoo", "Yahoo!", FALSE },
{ "yahoojp", N_("Yahoo! Japan"), TRUE },
- { "facebook", N_("Facebook Chat"), TRUE },
{ "groupwise", "GroupWise", FALSE },
{ "sip", "SIP", FALSE },
{ NULL, NULL }
@@ -558,13 +556,41 @@ empathy_protocol_name_to_display_name (const gchar *proto_name)
if (!tp_strdiff (proto_name, names[i].proto))
{
if (names[i].translated)
- return _(names[i].display);
+ return gettext (names[i].display);
else
return names[i].display;
}
}
- return NULL;
+ return proto_name;
+}
+
+const char *
+empathy_service_name_to_display_name (const gchar *service_name)
+{
+ int i;
+ static struct {
+ const gchar *service;
+ const gchar *display;
+ gboolean translated;
+ } names[] = {
+ { "google-talk", N_("Google Talk"), FALSE },
+ { "facebook", N_("Facebook Chat"), TRUE },
+ { NULL, NULL }
+ };
+
+ for (i = 0; names[i].service != NULL; i++)
+ {
+ if (!tp_strdiff (service_name, names[i].service))
+ {
+ if (names[i].translated)
+ return gettext (names[i].display);
+ else
+ return names[i].display;
+ }
+ }
+
+ return service_name;
}
/* Note: this function depends on the account manager having its core feature
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 6a67321d9..0f8adc33e 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -83,6 +83,7 @@ const gchar * empathy_account_get_error_message (TpAccount *account,
gchar *empathy_protocol_icon_name (const gchar *protocol);
const gchar *empathy_protocol_name_to_display_name (const gchar *proto_name);
+const gchar *empathy_service_name_to_display_name (const gchar *proto_name);
#define EMPATHY_ARRAY_TYPE_OBJECT (empathy_type_dbus_ao ())
GType empathy_type_dbus_ao (void);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fe5599c41..14f71a810 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -32,6 +32,7 @@ libempathy-gtk/empathy-chat.c
libempathy-gtk/empathy-chat-text-view.c
libempathy-gtk/empathy-contact-dialogs.c
[type: gettext/glade]libempathy-gtk/empathy-contact-dialogs.ui
+libempathy-gtk/empathy-contact-list-store.h
libempathy-gtk/empathy-contact-list-view.c
libempathy-gtk/empathy-contact-menu.c
libempathy-gtk/empathy-contact-selector.c
@@ -55,6 +56,7 @@ libempathy-gtk/empathy-log-window.c
libempathy-gtk/empathy-new-message-dialog.c
libempathy-gtk/empathy-new-call-dialog.c
libempathy-gtk/empathy-presence-chooser.c
+libempathy-gtk/empathy-protocol-chooser.c
[type: gettext/glade]libempathy-gtk/empathy-search-bar.ui
libempathy-gtk/empathy-sound.c
libempathy-gtk/empathy-status-preset-dialog.c
diff --git a/po/ar.po b/po/ar.po
index f4d7055c4..f7e48c18c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gossip.HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-02 19:59+0200\n"
-"PO-Revision-Date: 2010-09-02 19:59+0300\n"
+"POT-Creation-Date: 2010-09-23 13:37+0300\n"
+"PO-Revision-Date: 2010-09-23 13:37+0300\n"
"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
"Language-Team: Arabic <doc@arabeyes.org>\n"
"MIME-Version: 1.0\n"
@@ -445,7 +445,7 @@ msgstr "أدر حسابات التراسل والصوت عبر الشبكة"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2151
+#: ../src/empathy-accounts-dialog.c:2157
msgid "Messaging and VoIP Accounts"
msgstr "حسابات التراسل"
@@ -493,139 +493,139 @@ msgstr "حدثت مشكلة أثناء محاولة نقل الملÙ"
msgid "The other participant is unable to transfer the file"
msgstr "الشخص الآخر غير قادر على نقل الملÙ"
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "سبب مجهول"
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "موجود"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "مشغول"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "غائب"
-#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Ø®ÙÙŠ"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "غير متصل"
-#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883
-#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885
-#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
+#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
+#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "مجهول"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "لم يحدد أي سبب"
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "الحالة محددة على غير متصل."
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "خطأ شبكي"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "Ùشل التحقق"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "خطأ ÙÙŠ التعمية"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "الاسم مستخدم مسبقا"
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "الشهادة غير متوÙرة"
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "الشهادة غير موثوق بها"
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "انتهت صلاحية الشهادة"
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "الشهادة غير نشطة"
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "عدم تطابق الشهادة مع اسم الخادوم"
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "عدم تطابق الشهادة مع التوقيع"
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "شهادة موقعة ذاتيا"
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "خطأ ÙÙŠ الشهادة"
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:356
msgid "Encryption is not available"
msgstr "التعمية غير متاحة"
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:358
msgid "Certificate is invalid"
msgstr "الشّهادة ليست صالحة"
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:360
msgid "Connection has been refused"
msgstr "رÙÙÙض الاتصال"
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:362
msgid "Connection can't be established"
msgstr "تعذّر بناء الاتصال"
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:364
msgid "Connection has been lost"
msgstr "ÙÙÙ‚Ùد الاتصال"
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:366
msgid "This resource is already connected to the server"
msgstr "هذا المورد متصل مسبقا بالخادوم"
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:368
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "استبدل الاتصال باتصال جديد باستخدام Ù†Ùس المورÙد"
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:371
msgid "The account already exists on the server"
msgstr "الحساب موجود مسبقا على الخادوم"
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:373
msgid "Server is currently too busy to handle the connection"
msgstr "الحاسوب مشغول حاليا ولا يستطيع التعامل مع الاتصال"
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:375
msgid "Certificate has been revoked"
msgstr "Ù†ÙÙ‚Ùضت الشهادة"
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:377
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr "تستخدم الشهادة خوارزمية تعمية غير آمنة أو ضعيÙØ©"
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:380
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -633,15 +633,16 @@ msgstr ""
"طول شهادة الخادوم أو عمق شبكة شهادة الخادوم تتجاوز الحد الذي تÙرضه مكتبة "
"التعمية."
-#: ../libempathy/empathy-utils.c:540
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "الأشخاص القريبون"
-#: ../libempathy/empathy-utils.c:545
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "ياهو! اليابان"
-#: ../libempathy/empathy-utils.c:546
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "دردشة Ùيسبوك"
@@ -719,67 +720,67 @@ msgstr "ÙÙŠ المستقبل"
msgid "All"
msgstr "الكل"
-#: ../libempathy-gtk/empathy-account-widget.c:500
+#: ../libempathy-gtk/empathy-account-widget.c:514
#: ../libempathy-gtk/empathy-log-window.c:646
#: ../src/empathy-import-widget.c:312
msgid "Account"
msgstr "حساب"
-#: ../libempathy-gtk/empathy-account-widget.c:501
+#: ../libempathy-gtk/empathy-account-widget.c:515
msgid "Password"
msgstr "كلمة السر"
-#: ../libempathy-gtk/empathy-account-widget.c:502
+#: ../libempathy-gtk/empathy-account-widget.c:516
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "الخادوم"
-#: ../libempathy-gtk/empathy-account-widget.c:503
+#: ../libempathy-gtk/empathy-account-widget.c:517
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "المنÙØ°"
-#: ../libempathy-gtk/empathy-account-widget.c:575
-#: ../libempathy-gtk/empathy-account-widget.c:632
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "اسم المستخدم:"
-#: ../libempathy-gtk/empathy-account-widget.c:1502
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "_طبّق"
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "_Ù„Ùج"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1598
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1397
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "الحساب:"
-#: ../libempathy-gtk/empathy-account-widget.c:1609
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "_Ù…Ùعّل"
-#: ../libempathy-gtk/empathy-account-widget.c:1674
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "هذا الحساب موجود مسبقا على الخادوم"
-#: ../libempathy-gtk/empathy-account-widget.c:1677
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "أنشئ حسابا جديدا على الخادوم"
-#: ../libempathy-gtk/empathy-account-widget.c:1770
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "Ø£_لغÙ"
@@ -788,19 +789,19 @@ msgstr "Ø£_لغÙ"
#. * like: "MyUserName on freenode".
#. * 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:2058
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "â€%1$s على %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:2084
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "حساب %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2088
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "حساب جديد"
@@ -847,7 +848,7 @@ msgstr "ما اسم الشاشة ÙÙŠ AIMØŸ"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "ال_منْÙØ°:"
@@ -856,7 +857,7 @@ msgstr "ال_منْÙØ°:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "ال_خادوم:"
@@ -1164,22 +1165,18 @@ msgid "I_gnore conference and chat room invitations"
msgstr "_تجاهل دعوات المؤتمرات وغر٠الدردشة"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "استخدم يا_هو اليابان"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "ما معرÙÙƒ على ياهو!ØŸ"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "ما كلمة سرك على ياهو!؟"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "Ù…Ùعرّ٠_ياهو"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "محلية لائحة ال_غرÙ:"
@@ -1212,67 +1209,67 @@ msgstr "كل الملÙّات"
msgid "Click to enlarge"
msgstr "انقر للتكبير"
-#: ../libempathy-gtk/empathy-chat.c:639
+#: ../libempathy-gtk/empathy-chat.c:642
msgid "Failed to open private chat"
msgstr "Ùشل Ùتح دردشة خصوصية"
-#: ../libempathy-gtk/empathy-chat.c:679
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
msgstr "الموضوع غير مدعوم ÙÙŠ هذه المحادثة"
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
msgstr "لا ÙŠÙسمح لك بتغيير الموضوع"
-#: ../libempathy-gtk/empathy-chat.c:819
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr ""
"/clear:\n"
"يمسح كل الرسائل من المحادثة الحالية"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr ""
"/topic <موضوع>:\n"
"يحدد موضوع المحادثة الحالية"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
msgstr ""
"/join <معرّ٠غرÙØ© دردشة>:\n"
"انضم إلى غرÙØ© دردشة جديدة"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
msgstr ""
"/j <معرّ٠غرÙØ© دردشة>:\n"
"انضم إلى غرÙØ© دردشة جديدة"
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr ""
"/query <معرّ٠متراسل>‎ [<رسالة>]:\n"
"اÙتح دردشة خصوصية"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr ""
"/msg <معرّ٠متراسل>‎ <رسالة>:\n"
"اÙتح دردشة خصوصية"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
msgstr ""
"/nick <اسم مستعار>:\n"
"غيّر اسمك المستعار على الخادوم الحالي"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr ""
"/me <message>:\n"
"يرسل رسالة إجراء إلى المحادثة الحالية"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:849
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 "
@@ -1282,7 +1279,7 @@ msgstr ""
"يرسل <رسالة> إلى المحادثة الحالية. يستخدم هذا لإرسال رسالة تبدأ بشرطة مائلة "
"'/'. مثلا: \"‪/say /join‬ تستخدم للانضمام إلى غرÙØ© دردشة جديدة\""
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:854
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1290,84 +1287,84 @@ msgstr ""
"/help [<أمر>]:\n"
"اعرض كل الأوامر المدعومة. إذا كان <أمر> Ùسيعرض كيÙية استخدامه."
-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:864
#, c-format
msgid "Usage: %s"
msgstr "الاستخدام: %s"
-#: ../libempathy-gtk/empathy-chat.c:890
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "أمرٌ مجهول"
-#: ../libempathy-gtk/empathy-chat.c:1011
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
msgstr "أمرٌ مجهول؛ راجع ‪/help‬ لتعر٠الأوامر المتاحة"
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "غير متّصل"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "متراسل غير صحيح"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "رÙÙض التّصريح"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "الرسالة طويلة جدا"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "غير مطبق"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "مجهول"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
#, c-format
msgid "Error sending message '%s': %s"
msgstr "خطأ ÙÙŠ ارسال الرسالة '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
msgid "Topic:"
msgstr "الموضوع:"
-#: ../libempathy-gtk/empathy-chat.c:1291
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "الموضوع: %s"
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "لم يحدد أي موضوع"
-#: ../libempathy-gtk/empathy-chat.c:1772
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(لا اقتراحات)"
-#: ../libempathy-gtk/empathy-chat.c:1826
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "أدرج التعابير المرسومة"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1844
+#: ../libempathy-gtk/empathy-chat.c:1847
#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "_Send"
msgstr "أ_رسل"
-#: ../libempathy-gtk/empathy-chat.c:1878
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "ا_قتراحات الإملاء"
-#: ../libempathy-gtk/empathy-chat.c:1955
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
msgstr "Ùشل جلب السجلات الحديثة"
-#: ../libempathy-gtk/empathy-chat.c:2061
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "â€%s قطع الاتصال"
@@ -1375,12 +1372,12 @@ msgstr "â€%s قطع الاتصال"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2071
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "â€Ø·Ø±Ø¯ %1$s†%2$s"
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2074
#, c-format
msgid "%s was kicked"
msgstr "â€%s Ø·ÙرÙد"
@@ -1388,17 +1385,17 @@ msgstr "â€%s Ø·ÙرÙد"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2079
+#: ../libempathy-gtk/empathy-chat.c:2082
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "حظر %1$s†%2$s"
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
msgstr "â€%s Ø­ÙظÙر"
-#: ../libempathy-gtk/empathy-chat.c:2086
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
msgstr "â€%s غادر الغرÙØ©"
@@ -1408,46 +1405,46 @@ msgstr "â€%s غادر الغرÙØ©"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2095
+#: ../libempathy-gtk/empathy-chat.c:2098
#, c-format
msgid " (%s)"
msgstr "â€â€ (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2120
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
msgstr "انضم %s إلى الغرÙØ©"
-#: ../libempathy-gtk/empathy-chat.c:2145
+#: ../libempathy-gtk/empathy-chat.c:2148
#, c-format
msgid "%s is now known as %s"
msgstr "يعر٠%s الآن باسم %s"
-#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
msgid "Disconnected"
msgstr "غير متَصل"
-#: ../libempathy-gtk/empathy-chat.c:2922
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "كلمة سر خطأ؛ من Ùضلك أعد المحاولة:"
-#: ../libempathy-gtk/empathy-chat.c:2923
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "أعد المحاولة"
-#: ../libempathy-gtk/empathy-chat.c:2928
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "هذه الغرÙØ© محمية بكلمة سر:"
-#: ../libempathy-gtk/empathy-chat.c:2929
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
msgstr "انضم"
-#: ../libempathy-gtk/empathy-chat.c:3069
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "متَصل"
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3134
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "محادثة"
@@ -1471,7 +1468,7 @@ msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
msgid "Edit Contact Information"
msgstr "عدّل معلومات المتراسل"
@@ -1492,34 +1489,42 @@ msgstr "_سأقرر لاحقًا"
msgid "Subscription Request"
msgstr "طلب تسجيل"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "غير مجمّع"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "الأشخاص المÙضّلين"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2255
+#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "هل ترغب حقا بإزالة المجموعة '%s'؟"
#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2258
+#: ../libempathy-gtk/empathy-individual-view.c:2235
msgid "Removing group"
msgstr "إزالة مجموعة"
#. Remove
#: ../libempathy-gtk/empathy-contact-list-view.c:2055
#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2312
-#: ../libempathy-gtk/empathy-individual-view.c:2410
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "أ_زل"
#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2343
+#: ../libempathy-gtk/empathy-individual-view.c:2320
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "هل ترغب حقا بإزالة المتراسل '%s'؟"
#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2345
+#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
msgstr "حذ٠المتراسل"
@@ -1529,48 +1534,48 @@ msgid "_Add Contact…"
msgstr "أ_ض٠متراسلا…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:514
#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "_دردشة"
#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:595
+#: ../libempathy-gtk/empathy-individual-menu.c:557
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_مكالمة صوتية"
#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:637
+#: ../libempathy-gtk/empathy-individual-menu.c:599
msgctxt "menu item"
msgid "_Video Call"
msgstr "_مكالمة مرئية"
#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:695
+#: ../libempathy-gtk/empathy-individual-menu.c:642
#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "المحادثات ال_سابقة"
#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:736
+#: ../libempathy-gtk/empathy-individual-menu.c:683
msgid "Send File"
msgstr "أرسل ملÙا"
#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:778
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Share My Desktop"
msgstr "شارك سطح مكتبي"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
-#: ../libempathy-gtk/empathy-individual-menu.c:812
-#: ../libempathy-gtk/empathy-individual-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
msgstr "Ù…Ùضّل"
#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:786
msgid "Infor_mation"
msgstr "_معلومات"
@@ -1580,13 +1585,13 @@ msgid "_Edit"
msgstr "_حرّر"
#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:1023
+#: ../libempathy-gtk/empathy-individual-menu.c:970
#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "يدعوك إلى هذه الغرÙØ©"
#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1070
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
msgid "_Invite to Chat Room"
msgstr "ا_دع إلى غرÙØ© المحادثة"
@@ -1619,153 +1624,153 @@ msgstr "موقع الإنترنت:"
msgid "Birthday:"
msgstr "يوم الميلاد:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-contact-widget.c:578
+#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "رمز البلد"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:580
+#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "البلد:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "الولاية:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "المدينة:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "المنطقة:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:588
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "الرمز البريدي:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:590
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "الشارع:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:592
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "المبنى:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:594
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "الطابق:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:596
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "الغرÙØ©:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:598
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "النص:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "الوصÙ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:602
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "المسار:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "مستوى الدقة:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "خطأ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "خطأ رأسي (أمتار):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "خطأ Ø£Ùقي (أمتار):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "السرعة:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "الطريقة:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "سرعة التسلّق:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "آخر تحديث:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "خط الطول:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "دائرة العرض:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "الارتÙاع:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
-#: ../libempathy-gtk/empathy-individual-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "المكان"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
-#: ../libempathy-gtk/empathy-individual-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "â€%sØŒ â€%s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%e %BØŒ %Y ÙÙŠ %R ت‌ع‌م"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
-#: ../libempathy-gtk/empathy-individual-widget.c:837
+#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "احÙظ الصور الشخصية"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
-#: ../libempathy-gtk/empathy-individual-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "لا يمكن Ø­Ùظ الصورة الشخصية"
@@ -1775,7 +1780,7 @@ msgstr "<b>المكان</b> ÙÙŠ (تاريخ)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1223
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
msgstr "الكنية:"
@@ -1795,7 +1800,7 @@ msgstr "تÙاصيل المتراسل"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1427
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
msgid "Identifier:"
msgstr "المعرÙ:"
@@ -1838,13 +1843,8 @@ msgstr "حدّد"
msgid "Group"
msgstr "المجموعة"
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:253
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "أزل الراب_ط"
-
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:143
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
msgid "Linked Contacts"
msgstr "المتراسلين المترابطين"
@@ -1868,19 +1868,19 @@ msgstr "المتراسلين المحددين ÙÙŠ القائمة على اليÙ
msgid "%s (%s)"
msgstr "â€%s â€(%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:890
+#: ../libempathy-gtk/empathy-individual-menu.c:837
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_حرر"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:916
+#: ../libempathy-gtk/empathy-individual-menu.c:863
msgctxt "Link individual (contextual menu)"
-msgid "_Link…"
-msgstr "ار_بط…"
+msgid "_Link Contacts…"
+msgstr "ا_ربط المتراسلين…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1565
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1914,18 +1914,46 @@ msgstr "SSL"
#. Translators: this is the title of the linking dialogue (reached by
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:109
+#: ../libempathy-gtk/empathy-linking-dialog.c:116
msgid "Link Contacts"
msgstr "اربط المتراسلين"
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "ا_Ùصل…"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr "اÙصل المتراسل العام المعروض إلى المتراسلين الذين يحتويهم."
+
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
#. * used here as a verb meaning "to connect two contacts to form a
#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:122
+#: ../libempathy-gtk/empathy-linking-dialog.c:137
msgid "_Link"
msgstr "ار_بط"
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr "أأÙصل المتراسل العام '%s'ØŸ"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr ""
+"أمتأكد من رغبتك ÙÙŠ Ùصل هذا المترسل العام؟ سيÙصل هذا المتراسل العام إلى "
+"المتراسلين الذين يحتويهم."
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:191
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "ا_Ùصل"
+
#: ../libempathy-gtk/empathy-log-window.c:663
msgid "Date"
msgstr "التاريخ"
@@ -2461,7 +2489,7 @@ msgstr ""
"المساعد وإضاÙØ© الحساب لاحقا من قائمة \"تحرير\"."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1310
+#: ../src/empathy-account-assistant.c:1316
msgid "An error occurred"
msgstr "حدث خطأ"
@@ -2475,31 +2503,31 @@ msgstr "حدث خطأ"
msgid "New %s account"
msgstr "حساب %s جديد"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:515
msgid "What kind of chat account do you have?"
msgstr "ما نوع حساب الدردشة الذي تمتلكه؟"
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:521
msgid "Do you have any other chat accounts you want to set up?"
msgstr "ألديك حساب دردشة آخر تريد إعداده؟"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:527
msgid "Enter your account details"
msgstr "أدخل تÙاصيل الحساب"
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:532
msgid "What kind of chat account do you want to create?"
msgstr "ما نوع حساب الدردشة الذي تريد إنشاءه؟"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Do you want to create other chat accounts?"
msgstr "هل تريد إنشاء حسابات دردشة أخرى؟"
-#: ../src/empathy-account-assistant.c:539
+#: ../src/empathy-account-assistant.c:545
msgid "Enter the details for the new account"
msgstr "أدخل تÙاصيل الحساب الجديد"
-#: ../src/empathy-account-assistant.c:654
+#: ../src/empathy-account-assistant.c:660
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 "
@@ -2510,41 +2538,41 @@ msgstr ""
"أو Windows Live والكثير من برامج الدردشة الأخرى. وباستخدام ميكروÙون وكاميرا "
"تستطيع إجراء محادثات بالصوت والصورة."
-#: ../src/empathy-account-assistant.c:671
+#: ../src/empathy-account-assistant.c:677
msgid "Do you have an account you've been using with another chat program?"
msgstr "هل لديك حساب كنت تستخدمه مع برنامج دردشة آخر؟"
-#: ../src/empathy-account-assistant.c:694
+#: ../src/empathy-account-assistant.c:700
msgid "Yes, import my account details from "
msgstr "نعم، استورد معلومات حسابي من "
-#: ../src/empathy-account-assistant.c:715
+#: ../src/empathy-account-assistant.c:721
msgid "Yes, I'll enter my account details now"
msgstr "نعم، سأÙدخل معلومات حسابي الآن"
-#: ../src/empathy-account-assistant.c:737
+#: ../src/empathy-account-assistant.c:743
msgid "No, I want a new account"
msgstr "لا، أريد حسابا جديدا"
-#: ../src/empathy-account-assistant.c:747
+#: ../src/empathy-account-assistant.c:753
msgid "No, I just want to see people online nearby for now"
msgstr "لا، حاليا أريد رؤية الأشخاص المتصلين قريبا مني Ùقط"
-#: ../src/empathy-account-assistant.c:768
+#: ../src/empathy-account-assistant.c:774
msgid "Select the accounts you want to import:"
msgstr "اختر الحسابات التي تريد استيرادها:"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "نعم"
-#: ../src/empathy-account-assistant.c:859
+#: ../src/empathy-account-assistant.c:865
msgid "No, that's all for now"
msgstr "لا، يكÙÙŠ هذا الآن"
-#: ../src/empathy-account-assistant.c:1124
+#: ../src/empathy-account-assistant.c:1130
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 "
@@ -2555,16 +2583,16 @@ msgstr ""
"الشبكة. إذا أردت استخدام هذه الخاصية Ùتأكد من أن التÙاصيل أدناه صحيحة. يمكنك "
"تغيير هذه التÙاصيل بسهولة لاحقا أو حتى تعطيل هذه الخاصية من حوار 'الحسابات'."
-#: ../src/empathy-account-assistant.c:1130
-#: ../src/empathy-account-assistant.c:1186
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
msgid "Edit->Accounts"
msgstr "تحريرâ‡Ø§Ù„حسابات"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1152
msgid "I don't want to enable this feature for now"
msgstr "لا أريد تÙعيل هذه الخاصية الآن"
-#: ../src/empathy-account-assistant.c:1182
+#: ../src/empathy-account-assistant.c:1188
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 "
@@ -2575,23 +2603,23 @@ msgstr ""
"salut غير مثبت. إذا أردت تÙعيل هذه الخاصية Ùمن Ùضلك ثبّت حزمة telepathy-salut "
"ثم أنشئ حساب 'أشخاص قريبون' من حوار 'الحسابات"
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1194
msgid "telepathy-salut not installed"
msgstr "â€telepathy-salut غير مثبت"
-#: ../src/empathy-account-assistant.c:1234
+#: ../src/empathy-account-assistant.c:1240
msgid "Messaging and VoIP Accounts Assistant"
msgstr "مساعد حسابات التراسل والصوت عبر الشبكة"
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1274
msgid "Welcome to Empathy"
msgstr "مرحبا مع إمبثي"
-#: ../src/empathy-account-assistant.c:1277
+#: ../src/empathy-account-assistant.c:1283
msgid "Import your existing accounts"
msgstr "استورد حساباتك الموجودة"
-#: ../src/empathy-account-assistant.c:1295
+#: ../src/empathy-account-assistant.c:1301
msgid "Please enter personal details"
msgstr "من Ùضلك أدخل بيانات الشخصية"
@@ -2608,7 +2636,7 @@ msgstr "توجد تغييرات غير محÙوظة ÙÙŠ حساب %s."
msgid "Your new account has not been saved yet."
msgstr "لم ÙŠÙØ­Ùظ حسابك بعد."
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "يتّصل…"
@@ -2634,7 +2662,7 @@ msgstr "حالة مجهول"
msgid "Offline — Account Disabled"
msgstr "غير متصل — عÙطّل الحساب"
-#: ../src/empathy-accounts-dialog.c:805
+#: ../src/empathy-accounts-dialog.c:811
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2642,16 +2670,16 @@ msgstr ""
"أنت على وشك إنشاء حساب جديد، والذي سيتجاهل تعديلاتك.\n"
"أمÙتأكد أنك ترغب ÙÙŠ إتمام العملية؟"
-#: ../src/empathy-accounts-dialog.c:1152
+#: ../src/empathy-accounts-dialog.c:1158
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "هل ترغب بإزالة %s من حاسوبك؟"
-#: ../src/empathy-accounts-dialog.c:1156
+#: ../src/empathy-accounts-dialog.c:1162
msgid "This will not remove your account on the server."
msgstr "لن يزيل هذا حسابك على الخادوم."
-#: ../src/empathy-accounts-dialog.c:1394
+#: ../src/empathy-accounts-dialog.c:1400
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2659,7 +2687,7 @@ msgstr ""
"أنت على وشك اختيار حساب آخر، والذي سيتجاهل تعديلاتك.\n"
"أمÙتأكد أنك ترغب ÙÙŠ إتمام العملية؟"
-#: ../src/empathy-accounts-dialog.c:1997
+#: ../src/empathy-accounts-dialog.c:2003
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2731,84 +2759,84 @@ msgstr "جاما"
msgid "Volume"
msgstr "الحجم"
-#: ../src/empathy-call-window.c:1163
+#: ../src/empathy-call-window.c:1173
msgid "_Sidebar"
msgstr "الشريط ال_جانبي"
-#: ../src/empathy-call-window.c:1182
+#: ../src/empathy-call-window.c:1192
msgid "Audio input"
msgstr "مدخلات الصوت"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1196
msgid "Video input"
msgstr "مدخلات الÙيديو"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1200
msgid "Dialpad"
msgstr "لوحة الأرقام"
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1205
msgid "Details"
msgstr "التÙاصيل"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1263
+#: ../src/empathy-call-window.c:1273
#, c-format
msgid "Call with %s"
msgstr "اتصل باستخدام %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1342
+#: ../src/empathy-call-window.c:1352
msgid "Call"
msgstr "اتصل"
-#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-call-window.c:1506
msgid "The IP address as seen by the machine"
msgstr "رقم الإنترنت كما يراه الجهاز"
-#: ../src/empathy-call-window.c:1498
+#: ../src/empathy-call-window.c:1508
msgid "The IP address as seen by a server on the Internet"
msgstr "رقم الإنترنت كما يراه خادوم على الإنترنت"
-#: ../src/empathy-call-window.c:1500
+#: ../src/empathy-call-window.c:1510
msgid "The IP address of the peer as seen by the other side"
msgstr "رقم الإنترنت للند كما ÙŠÙرى على الجانب الآخر"
-#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1512
msgid "The IP address of a relay server"
msgstr "رقم الإنترنت لخادوم تقوية"
-#: ../src/empathy-call-window.c:1504
+#: ../src/empathy-call-window.c:1514
msgid "The IP address of the multicast group"
msgstr "رقم الإنترنت لمجموعة توصيل متعدد"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2247
#, c-format
msgid "Connected — %d:%02dm"
msgstr "متَصل — %d:%02dm"
-#: ../src/empathy-call-window.c:2298
+#: ../src/empathy-call-window.c:2308
msgid "Technical Details"
msgstr "التÙاصيل التقنية"
-#: ../src/empathy-call-window.c:2336
+#: ../src/empathy-call-window.c:2346
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "برمجية %s لا تÙهم أيا من أنساق الصوت المدعومة على حاسوبك"
-#: ../src/empathy-call-window.c:2341
+#: ../src/empathy-call-window.c:2351
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "برمجية %s لا تÙهم أيا من أنساق الÙيديو المدعومة على حاسوبك"
-#: ../src/empathy-call-window.c:2347
+#: ../src/empathy-call-window.c:2357
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2816,21 +2844,21 @@ msgid ""
msgstr ""
"تعذّر إنشاء اتصال مع %s. قد يكون أحدكما ÙÙŠ شبكة لا تسمح بالاتصالات المباشرة."
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2363
msgid "There was a failure on the network"
msgstr "حدث عطل ÙÙŠ الشبكة"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2367
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "أنساق الصوت المطلوبة لإجراء هذه المكالمة ليست مثبتة على حاسوبك"
-#: ../src/empathy-call-window.c:2360
+#: ../src/empathy-call-window.c:2370
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "أنساق الÙديو المطلوبة لإجراء هذه المكالمة ليست مثبتة على حاسوبك"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2380
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2840,19 +2868,19 @@ msgstr ""
"حدث أمر غير متوقع ÙÙŠ مكون تليباثي. من Ùضلك <a href=\"%s\">أبلغ عن هذه العلة</"
"a> وأرÙÙ‚ السجل المجمع ÙÙŠ ناÙذة 'نقح' من قائمة 'مساعدة'."
-#: ../src/empathy-call-window.c:2378
+#: ../src/empathy-call-window.c:2388
msgid "There was a failure in the call engine"
msgstr "حدث عطل ÙÙŠ محرك الاتصالات"
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-call-window.c:2391
msgid "The end of the stream was reached"
msgstr "ÙˆÙصÙÙ„ إلى نهاية الدÙÙ‚"
-#: ../src/empathy-call-window.c:2421
+#: ../src/empathy-call-window.c:2431
msgid "Can't establish audio stream"
msgstr "تعذر بناء دÙÙ‚ الصوت"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2441
msgid "Can't establish video stream"
msgstr "تعذر بناء دÙÙ‚ الÙديو"
@@ -3807,6 +3835,13 @@ msgstr "حسابات إمبثي"
msgid "Empathy Debugger"
msgstr "منقّح إمبثي"
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "استخدم يا_هو اليابان"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link…"
+#~ msgstr "ار_بط…"
+
#~ msgid "_Character set:"
#~ msgstr "ال_ترمير:"
diff --git a/po/bg.po b/po/bg.po
index 60d1fffca..61fa3aa98 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,45 +1,49 @@
# Bulgarian translation of empathy po-file.
# Copyright (C) 2004, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010 Damyan Ivanov
# This file is distributed under the same license as the empathy package.
# Yasen Pramatarov <yasen@lindeas.com>, 2004.
# Alexander Shopov <ash@kambanaria.org>, 2007, 2008, 2009, 2010.
# Yavor Doganov <yavor@gnu.org>, 2009.
-#
+# Damyan Ivanov <dam+gnome@ktnx.net>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-17 16:53+0200\n"
-"PO-Revision-Date: 2010-03-17 16:53+0200\n"
-"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
+"POT-Creation-Date: 2010-09-27 12:04+0300\n"
+"PO-Revision-Date: 2010-09-27 12:04+0300\n"
+"Last-Translator: Damyan Ivanov <dam+gnome@ktnx.net>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy"
-msgstr "Empathy"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Разговори чрез Google Talk, ФейÑбук, MSN и много други уÑлуги за моментни "
+"ÑъобщениÑ"
#: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
-msgstr "Моментни ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ (Empathy)"
+msgid "Empathy"
+msgstr "Empathy"
#: ../data/empathy.desktop.in.in.h:3
-msgid "IM Client"
-msgstr "Клиент за моментни ÑъобщениÑ"
+msgid "Empathy Internet Messaging"
+msgstr "Моментни ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñ Empathy"
#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "Изпращане и получаване на ÑъобщениÑ"
+msgid "IM Client"
+msgstr "Клиент за моментни ÑъобщениÑ"
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
msgid "Always open a separate chat window for new chats."
msgstr "Ðовите разговори да Ñе отварÑÑ‚ в отделни прозорци."
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -47,271 +51,296 @@ msgstr ""
"Знак, който да Ñе добави Ñлед пÑевдонима при ползване на допиÑване на "
"пÑевдоними (Ñ Ñ‚Ð°Ð±ÑƒÐ»Ð°Ñ‚Ð¾Ñ€) в прозореца за групови разговори."
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Chat window theme"
msgstr "Графична тема за прозореца за разговори"
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"СпиÑък от двубуквените ÑÑŠÐºÑ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð½Ð° езиците Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ° за Ð¿Ñ€Ð°Ð²Ð¾Ð¿Ð¸Ñ "
"разделени ÑÑŠÑ Ð·Ð°Ð¿ÐµÑ‚Ð°Ñ (напр. „bg, en, ru“)."
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Compact contact list"
msgstr "Стегнат ÑпиÑък Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸"
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Connection managers should be used"
msgstr "Да Ñе използва управление на връзката"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Contact list sort criterion"
msgstr "Критерий за подредбата на ÑпиÑъка Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸Ñ‚Ðµ"
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "Стандартна папка, в коÑто да Ñе Ñ‚ÑŠÑ€ÑÑÑ‚ Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° аватари"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Disable popup notifications when away"
msgstr "Без извеÑÑ‚Ñване Ñ Ð¸Ð·Ñкачащи прозорци в ÑÑŠÑтоÑние „ОтÑÑŠÑтващ“"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Disable sounds when away"
msgstr "Без звуци звуци в ÑÑŠÑтоÑние „ОтÑÑŠÑтващ“"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "Показване на входÑщи ÑÑŠÐ±Ð¸Ñ‚Ð¸Ñ Ð² облаÑтта за ÑÑŠÑтоÑнието"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Показване на входÑщите ÑÑŠÐ±Ð¸Ñ‚Ð¸Ñ Ð² облаÑтта за ÑÑŠÑтоÑнието. Ðко е лъжа, "
+"ÑъбитиÑта Ñе предÑтавÑÑ‚ незабавно на потребителÑ."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
msgstr "Empathy може да публикува меÑтоположението на потребителÑ"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy може да ползва GPS, за да отгатне меÑтоположението"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
msgstr ""
"Empathy може да използва мобилна телефонна мрежа, за да отгатне "
"меÑтоположението"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
msgstr "Empathy може да ползва мрежата, за да отгатне меÑтоположението"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy default download folder"
msgstr "Стандартна папка за получените файлове от Empathy"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy has asked about importing accounts"
msgstr "Empathy запита за внаÑÑнето на региÑтрации"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy извърши Ð¼Ð¸Ð³Ñ€Ð°Ñ†Ð¸Ñ Ð½Ð° данните от butterfly"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Empathy should auto-away when idle"
+msgstr "Ðвтоматично преминаване в ÑÑŠÑтоÑние „ОтÑÑŠÑтващ“ при бездейÑтвие"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should auto-connect on startup"
msgstr "Ðвтоматично Ñвързване при Ñтартиране"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should reduce the location's accuracy"
msgstr "ÐамалÑване на точноÑтта на меÑтоположението"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Иконата на прозореца за разговори да е аватарът на контакта"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable WebKit Developer Tools"
msgstr "Включване на инÑтрументите за разработка на WebKit"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable popup notifications for new messages"
msgstr "ИзвеÑÑ‚Ñване Ñ Ð¸Ð·Ñкачащи прозорци при нови ÑъобщениÑ"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable spell checker"
msgstr "Да Ñе ползва проверка на правопиÑа"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide main window"
msgstr "Скриване на оÑÐ½Ð¾Ð²Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€ÐµÑ†"
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Hide the main window."
msgstr "Скриване на оÑÐ½Ð¾Ð²Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€ÐµÑ†."
-#: ../data/empathy.schemas.in.h:26
-msgid "MC 4 accounts have been imported"
-msgstr "ВнеÑени Ñа региÑтрации тип MC 4"
-
-#: ../data/empathy.schemas.in.h:27
-msgid "MC 4 accounts have been imported."
-msgstr "ВнеÑени Ñа региÑтрации тип MC 4."
-
-#: ../data/empathy.schemas.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Nick completed character"
msgstr "Знак за допиÑване на пÑевдоними"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Open new chats in separate windows"
msgstr "ОтварÑне на разговорите в отделни прозорци"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use"
msgstr "Път до темата на Adium, коÑто да Ñе ползва"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr ""
"Път до темата на Adium, коÑто да Ñе ползва, ако темата за разговори е Adium."
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for incoming messages"
msgstr "ИзвеÑÑ‚Ñване ÑÑŠÑ Ð·Ð²ÑƒÐº при приÑтигане на Ñъобщение"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for new conversations"
msgstr "ИзвеÑÑ‚Ñване ÑÑŠÑ Ð·Ð²ÑƒÐº при нов разговор"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for outgoing messages"
msgstr "ИзвеÑÑ‚Ñване ÑÑŠÑ Ð·Ð²ÑƒÐº при изпращане на Ñъобщение"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs in"
msgstr "ИзвеÑÑ‚Ñване ÑÑŠÑ Ð·Ð²ÑƒÐº при влизане на контакт в мрежата"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when a contact logs out"
msgstr "ИзвеÑÑ‚Ñване ÑÑŠÑ Ð·Ð²ÑƒÐº при излизане на контакт от мрежата"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log in"
msgstr "ИзвеÑÑ‚Ñване ÑÑŠÑ Ð·Ð²ÑƒÐº при влизането ви в мрежата"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when we log out"
msgstr "ИзвеÑÑ‚Ñване ÑÑŠÑ Ð·Ð²ÑƒÐº при излизането ви от мрежата"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications if the chat isn't focused"
msgstr "ИзвеÑÑ‚Ñване Ñ Ð¸Ð·Ñкачащи прозорци, когато разговорът не е на фокуÑ"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs in"
msgstr "ИзвеÑÑ‚Ñване Ñ Ð¸Ð·Ñкачащи прозорци, когато контакт влезе в мрежата"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications when a contact logs out"
msgstr "ИзвеÑÑ‚Ñване Ñ Ð¸Ð·Ñкачащи прозорци, когато контакт излезе извън мрежата"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show avatars"
msgstr "Показване на аватари"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show contact list in rooms"
msgstr "Показване на ÑпиÑъка Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸ в Ñтаите"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show hint about closing the main window"
msgstr "ПодÑказване за затварÑнето на оÑÐ½Ð¾Ð²Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€ÐµÑ†"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show offline contacts"
msgstr "Показване на контактите, които не Ñа в мрежата"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show protocols"
msgstr "Показване на протокола"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Spell checking languages"
msgstr "Езици Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ° на правопиÑа"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The default folder to save file transfers in."
msgstr "Стандартната папка, в коÑто да Ñе запазват получените файлове."
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The last directory that an avatar image was chosen from."
msgstr "ПоÑледната папка, от коÑто е взето изображение за аватар."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The position for the chat window side pane"
+msgstr "Разположение на Ñтраничната лента в прозореца за разговори"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+"Запомненото разположение (в пикÑели) на Ñтраничната лента в прозореца за "
+"разговори."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Графичната тема за прозорците за разговори."
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use graphical smileys"
msgstr "Ð˜Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° емотикони"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use notification sounds"
msgstr "ИзвеÑÑ‚Ñване ÑÑŠÑ Ð·Ð²ÑƒÑ†Ð¸"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Use theme for chat rooms"
msgstr "Графична тема за прозорците за разговори"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
"Дали Empathy да публикува меÑтоположението на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ ÐºÑŠÐ¼ контактите."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Дали Empathy да използва GPS за изчиÑлÑване на меÑтоположението."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Дали Empathy да използва мрежа за мобилни телефони за изчиÑлÑване на "
"меÑтоположението."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the network to guess the location."
msgstr "Дали Empathy да използва мрежата за изчиÑлÑване на меÑтоположението."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr ""
"Дали програмата Empathy вече е запитвала за внаÑÑнето на региÑтрациите от "
"другите програми."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Дали програмата Empathy е извършила Ð¼Ð¸Ð³Ñ€Ð°Ñ†Ð¸Ñ Ð½Ð° данните от butterfly"
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Дали Empathy автоматично да включва региÑтрациите ви при Ñтартиране."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+"Дали Empathy автоматично да преминава в ÑÑŠÑтоÑние „ОтÑÑŠÑтващ“ при "
+"бездейÑтвие на потребителÑ."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Дали Empathy да намалÑва точноÑтта на меÑтоположението, за да защитава "
"личните данни."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Дали Empathy да ползва аватара на контакта за икона на прозореца за "
"разговори."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Дали инÑтрументите към WebKit за разработка (напр. уеб инÑпекторът) да Ñе "
"включат."
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -319,66 +348,66 @@ msgstr ""
"Дали да Ñе използват програми за управление на връзките за автоматичното им "
"прекъÑване и възÑтановÑване."
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
"Дали да Ñе прави проверка на правопиÑа на Ð²ÑŠÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ñ‚ÐµÐºÑÑ‚ ÑпрÑмо избраните "
"езици."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Дали емотиконите да Ñе преобразуват от ASCII в картинки."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "Дали влизането на контакти в мрежата да Ñе извеÑÑ‚Ñва ÑÑŠÑ Ð·Ð²ÑƒÐº."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr "Дали излизането на контакти от мрежата да Ñе извеÑÑ‚Ñва ÑÑŠÑ Ð·Ð²ÑƒÐº."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of events."
msgstr "Дали ÑъбитиÑта да Ñе извеÑÑ‚Ñват ÑÑŠÑ Ð·Ð²ÑƒÐº."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Дали приÑтигането на ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð° Ñе извеÑÑ‚Ñва ÑÑŠÑ Ð·Ð²ÑƒÐº."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of new conversations."
msgstr "Дали новите разговори да Ñе извеÑÑ‚Ñват ÑÑŠÑ Ð·Ð²ÑƒÐº."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Дали изпращането на ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð° Ñе извеÑÑ‚Ñва ÑÑŠÑ Ð·Ð²ÑƒÐº."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound when logging into a network."
msgstr "Дали влизането ви в мрежата да Ñе извеÑÑ‚Ñва ÑÑŠÑ Ð·Ð²ÑƒÐº."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound when logging out of a network."
msgstr "Дали излизането ви от мрежата да Ñе извеÑÑ‚Ñва ÑÑŠÑ Ð·Ð²ÑƒÐº."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play sound notifications when away or busy."
msgstr "Дали в ÑÑŠÑтоÑние „Зает“ или „ОтÑÑŠÑтващ“ да Ñе извеÑÑ‚Ñва ÑÑŠÑ Ð·Ð²ÑƒÐº."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
"Дали излизането на контакт извън мрежата да Ñе извеÑÑ‚Ñва Ñ Ð¸Ð·Ñкачащи "
"прозорци."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
"Дали влизането на контакт в мрежата да Ñе извеÑÑ‚Ñва Ñ Ð¸Ð·Ñкачащи прозорци."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -386,41 +415,41 @@ msgstr ""
"Дали получаването на ново Ñъобщение, когато отворениÑÑ‚ прозорец за разговори "
"не е на фокуÑ, да Ñе извеÑÑ‚Ñва Ñ Ð¸Ð·Ñкачащи прозорци."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Дали получаването на ново Ñъобщение да Ñе извеÑÑ‚Ñва Ñ Ð¸Ð·Ñкачащи прозорци."
-#: ../data/empathy.schemas.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Дали да Ñе показват аватари в ÑпиÑъците за контакти и прозорците за "
"разговори."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
"Дали контактите, които в момента не Ñа включени да Ñе показват в ÑпиÑъка."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Дали в ÑÑŠÑтоÑние „Зает“ или „ОтÑÑŠÑтващ“ да Ñе извеÑÑ‚Ñва Ñ Ð¸Ð·Ñкачащи прозорци."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Дали да Ñе показват протоколите в ÑпиÑъците за контакти."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show the contact list in chat rooms."
msgstr "Дали ÑпиÑъкът Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸ да Ñе показва в Ñтаите за разговори."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show the contact list in compact mode."
msgstr "Дали да Ñе ползва Ñтегнат изглед за ÑпиÑъка Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸Ñ‚Ðµ."
-#: ../data/empathy.schemas.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -428,11 +457,11 @@ msgstr ""
"Дали да Ñе показва Ñъобщение за затварÑнето на оÑÐ½Ð¾Ð²Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€ÐµÑ† при "
"натиÑкане на бутона „ד в заглавната лента."
-#: ../data/empathy.schemas.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to use the theme for chat rooms."
msgstr "Дали да Ñе ползва графична тема за Ñтаите за разговори."
-#: ../data/empathy.schemas.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
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 "
@@ -448,156 +477,208 @@ msgstr "Управление на региÑтрациите за Ñъобщен
#. 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/cc-empathy-accounts-panel.c:91
+#: ../src/empathy-accounts-dialog.c:2157
msgid "Messaging and VoIP Accounts"
msgstr "РегиÑтрации за ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð¸Ñ Ð¿Ñ€ÐµÐ· Интернет"
-#: ../libempathy/empathy-ft-handler.c:842
+#: ../libempathy/empathy-ft-handler.c:851
msgid "The hash of the received file and the sent one do not match"
msgstr "Извадките от Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¸ Ð¸Ð·Ð¿Ñ€Ð°Ñ‚ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð» не Ñъвпадат"
-#: ../libempathy/empathy-ft-handler.c:1102
+#: ../libempathy/empathy-ft-handler.c:1111
msgid "File transfer not supported by remote contact"
msgstr "ОтдалечениÑÑ‚ контакт не поддържа прехвърлÑне на файлове"
-#: ../libempathy/empathy-ft-handler.c:1160
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is not a regular file"
msgstr "ИзбраниÑÑ‚ файл не е обикновен файл"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is empty"
msgstr "ИзбраниÑÑ‚ файл е празен"
-# FIXME: Това е връзка чрез mDNS/DNS-SD, Ñиреч Avahi. „Хора наблизо“ е
-# доÑта объркващо, защото контакти от локалната мрежа не е задължително
-# да Ñа наблизо, както и контакти от други мрежи може да Ñа ÑъвÑем
-# наблизо.
-#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:77
-msgid "People nearby"
-msgstr "Хора наблизо"
-
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:283
msgid "Socket type not supported"
msgstr "Този вид гнездо не Ñе поддържа"
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:402
msgid "No reason was specified"
msgstr "Ðе е указана причина"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:405
msgid "The change in state was requested"
msgstr "ЗаÑвена бе промÑна в ÑÑŠÑтоÑнието"
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:408
msgid "You canceled the file transfer"
msgstr "ПреуÑтановихте прехвърлÑнето на файл"
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:411
msgid "The other participant canceled the file transfer"
msgstr "ОтÑрещната Ñтрана преуÑтанови прехвърлÑнето на файл"
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:414
msgid "Error while trying to transfer the file"
msgstr "Грешка по време на прехвърлÑнето на файл"
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:417
msgid "The other participant is unable to transfer the file"
msgstr "ОтÑрещната Ñтрана не може да Ð¿Ñ€ÐµÑ…Ð²ÑŠÑ€Ð»Ñ Ñ„Ð°Ð¹Ð»"
-#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "ÐеизвеÑтна причина"
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Ðа линиÑ"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Зает"
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "ОтÑÑŠÑтващ"
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Ðевидим"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Извън мрежата"
-#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
+#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
+#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
+msgid "Unknown"
+msgstr "ÐеизвеÑтно"
+
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "Ðе е указана причина"
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "СъÑтоÑнието е „Извън мрежата“."
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Мрежова грешка"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "ÐеуÑпешно идентифициране"
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Грешка в шифрирането"
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "Името е заето"
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "Ðе е предоÑтавен Ñертификат"
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "Сертификатът не е доверен"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "Сертификатът е изтекъл"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "Сертификатът не е влÑзъл в Ñила"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "ÐеÑъвпадение на името Ñ Ñ‚Ð¾Ð²Ð° в Ñертификата"
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "ÐеÑъвпадение на отпечатъка на Ñертификата"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "Сертификатът е ÑамоподпиÑан"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Грешка в Ñертификата"
-#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:356
+msgid "Encryption is not available"
+msgstr "Ðе е налично шифриране"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Certificate is invalid"
+msgstr "Сертификатът е неправилен"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been refused"
+msgstr "Връзката е отказана"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Connection can't be established"
+msgstr "Ðе може да Ñе уÑтанови връзка"
+
+#: ../libempathy/empathy-utils.c:364
+msgid "Connection has been lost"
+msgstr "Връзката прекъÑна"
+
+#: ../libempathy/empathy-utils.c:366
+msgid "This resource is already connected to the server"
+msgstr "РеÑурÑÑŠÑ‚ вече е Ñвързан към Ñървъра"
+
+#: ../libempathy/empathy-utils.c:368
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr "Връзката бе замеÑтена от нова връзка, използваща ÑÑŠÑ‰Ð¸Ñ Ñ€ÐµÑурÑ"
+
+#: ../libempathy/empathy-utils.c:371
+msgid "The account already exists on the server"
+msgstr "Ðа Ñървъра вече има региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñ Ñ‚Ð°ÐºÐ¾Ð²Ð° име."
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Server is currently too busy to handle the connection"
+msgstr ""
+"Ð’ момента Ñървърът е твърде натоварен, за да обработи заÑвката за Ñвързване"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Certificate has been revoked"
+msgstr "Сертификатът е анулиран"
+
+#: ../libempathy/empathy-utils.c:377
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "Сертификатът използва неÑигурен шифър или Ñлаб алгоритъм за шифриране"
+
+#: ../libempathy/empathy-utils.c:380
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"Дължината на Ñертификата на Ñървъра или дълбочината на Ñертификационната му "
+"верига Ð½Ð°Ð´Ñ…Ð²ÑŠÑ€Ð»Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñта на криптографÑката библиотека"
+
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Хора наблизо"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! от ЯпониÑ"
# Би Ñ‚Ñ€Ñбвало транÑÐ»Ð¸Ñ‚ÐµÑ€Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚ „ФейÑбук“ да е наложен вече
# Ñпоред http://www.ivosiromahov.com/2_article/a46.html.
# Иво Сиромахов като лингвиÑтичен трендÑетър, мали, мали!
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "Разговор във ФейÑбук"
@@ -647,62 +728,92 @@ msgstr[1] "преди %d меÑеца"
msgid "in the future"
msgstr "в бъдеще"
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:463
msgid "All"
msgstr "Ð’Ñички"
-#: ../libempathy-gtk/empathy-account-widget.c:538
-#: ../libempathy-gtk/empathy-account-widget.c:594
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "РегиÑтрациÑ"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+msgid "Password"
+msgstr "Парола"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "Сървър"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "Порт"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1126
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "ПотребителÑко име:"
-#: ../libempathy-gtk/empathy-account-widget.c:1474
+#: ../libempathy-gtk/empathy-account-widget.c:1521
+msgid "A_pply"
+msgstr "_Прилагане"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "_Включване в мрежата"
-#: ../libempathy-gtk/empathy-account-widget.c:1542
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "РегиÑтрациÑ:"
-#: ../libempathy-gtk/empathy-account-widget.c:1553
-msgid "Enabled"
-msgstr "Включена"
+#: ../libempathy-gtk/empathy-account-widget.c:1628
+msgid "_Enabled"
+msgstr "_Включена"
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Вече има региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñ Ñ‚Ð°ÐºÐ¾Ð²Ð° име на Ñървъра."
-#: ../libempathy-gtk/empathy-account-widget.c:1621
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Създаване на нова региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð½Ð° Ñървъра"
+#: ../libempathy-gtk/empathy-account-widget.c:1789
+msgid "Ca_ncel"
+msgstr "_Отказ"
+
#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
#. * 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:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s на %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:2103
#, c-format
msgid "%s Account"
msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð² %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2043
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Ðова региÑтрациÑ"
@@ -724,11 +835,11 @@ msgstr "Допълнителни"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "П_арола:"
@@ -747,18 +858,18 @@ msgstr "Какво е името ви в мрежата на AIM?"
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Порт:"
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Сървър:"
@@ -769,7 +880,7 @@ msgid "<b>Example:</b> username"
msgstr "<b>Пример:</b> потребителÑко_име"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "_Идентификатор:"
@@ -787,56 +898,52 @@ msgid "<b>Example:</b> 123456789"
msgstr "<b>Пример:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "_Кодиране:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
msgstr "И_дентификатор за ICQ:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
msgid "What is your ICQ UIN?"
msgstr "Какъв е идентификаторът ви за ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
msgid "What is your ICQ password?"
msgstr "Каква е паролата ви за ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "_Кодиране:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
-msgid "New Network"
-msgstr "Ðова мрежа"
-
-#: ../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 "Ðвтоматично"
-#: ../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 "ЗаÑвка за региÑтриране"
#. 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 "ÐаÑтройки"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
msgid "None"
msgstr "Без"
@@ -872,6 +979,14 @@ msgstr "ИÑтинÑко име:"
msgid "Servers"
msgstr "Сървъри"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "Какво е името ви в мрежата за IRC?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "ÐšÐ¾Ñ Ð¼Ñ€ÐµÐ¶Ð° за IRC?"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "<b>Example:</b> user@gmail.com"
msgstr "<b>Пример:</b> потребител@gmail.com"
@@ -880,19 +995,28 @@ msgstr "<b>Пример:</b> потребител@gmail.com"
msgid "<b>Example:</b> user@jabber.org"
msgstr "<b>Пример:</b> потребител@jabber.org"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Задължително шифрриране (TLS/SSL)"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr "_Пренебрегване на грешките в Ñертификата за SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Override server settings"
msgstr "Използване на ÑобÑтвените наÑтройки"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
-msgstr "_Приоритет:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
+msgstr "Пр_иоритет:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "Reso_urce:"
msgstr "_РеÑурÑ:"
-#: ../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:12
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -903,53 +1027,45 @@ msgstr ""
"Facebook.\n"
"Ðко Ñтраницата http://www.facebook.com/<b>Ivancho</b> е ваша, въведете "
"<b>Ivancho</b>.\n"
-"Ðко нÑмате такова име във Facebook, Ñъздайте Ñи чрез <a href=\"http://www."
+"Ðко нÑмате такова име във ФейÑбук, Ñъздайте Ñи чрез <a href=\"http://www."
"facebook.com/username/\">тази Ñтраница</a>."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "Use old SS_L"
msgstr "Използване на _Ñтар SSL"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Facebook password?"
-msgstr "Каква е паролата ви във Facebook?"
+msgstr "Каква е паролата ви във ФейÑбук?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook username?"
-msgstr "Какво е името ви във Facebook?"
+msgstr "Какво е името ви във ФейÑбук?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Google ID?"
msgstr "Какъв е идентификаторът ви в Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google password?"
msgstr "Каква е паролата ви в Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Jabber ID?"
msgstr "Какъв е идентификаторът ви за Джабър?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber password?"
msgstr "Каква е паролата ви за Джабър?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your desired Jabber ID?"
msgstr "Какъв е желаниÑÑ‚ от Ð²Ð°Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€ за Джабър?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber password?"
msgstr "Каква е желаната от Ð²Ð°Ñ Ð¿Ð°Ñ€Ð¾Ð»Ð° за Джабър?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
-msgid "_Encryption required (TLS/SSL)"
-msgstr "_Шифрирането е задължително (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Ignore SSL certificate errors"
-msgstr "_Пренебрегване на грешките в Ñертификата"
-
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Пример:</b> потребител@hotmail.com"
@@ -963,25 +1079,25 @@ msgid "What is your Windows Live password?"
msgstr "Каква е паролата ви за Windows Live?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr "_Е-поща:"
+msgid "E-_mail address:"
+msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° _е-поща:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "ПÑевдо_ним:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_First Name:"
msgstr "_Лично име:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID:"
msgstr "Ид_ентификатор за Джабър:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Last Name:"
msgstr "_Фамилно име:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "_ПÑевдоним:"
-
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "Име за п_убликуване:"
@@ -1003,212 +1119,162 @@ msgid "Discover the STUN server automatically"
msgstr "Ðвтоматично откриване на Ñървъра за STUN"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Hostname of the proxy for outbound requests."
-msgstr "Сървър-поÑредник за изходÑщи заÑвки."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "Интервал [Ñек.]"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Keep-Alive Options"
msgstr "ÐаÑтройки на поддържането на връзката"
-#: ../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 ""
-"Проверка на запиÑа „SRV“ за името на Ñървъра за STUN от DNS в домейна на "
-"уÑлугата."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Loose Routing"
msgstr "Свободна маршрутизациÑ"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Mechanism:"
msgstr "Механизъм:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Miscellaneous Options"
msgstr "Допълнителни наÑтройки"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "NAT Traversal Options"
msgstr "ÐаÑтройки за преминаването през NAT"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Port of the proxy for outbound requests."
-msgstr "Порт на Ñървъра-поÑредник за изходÑщи заÑвки."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
msgid "Port:"
msgstr "Порт:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Proxy Options"
msgstr "Сървър-поÑредник"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "STUN Server:"
msgstr "Сървър за STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Server:"
msgstr "Сървър:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid ""
-"The username for SIP authentication, if different from the SIP URI\n"
-"username."
-msgstr ""
-"ПотребителÑкото име за Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð·Ð° SIP, ако е различно\n"
-"от името за адреÑа на SIP."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Transport:"
msgstr "ТранÑпорт:"
-#: ../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 ""
-"Използване на Ñвободна Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¸ заглавната чаÑÑ‚ „Route“ както е "
-"Ñпоред RFC 3261."
-
-#: ../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 "Каква е паролата ви за SIP?"
-#: ../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 "Какво е потребителÑкото ви име за SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "_Username:"
msgstr "ПотребителÑко _име:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo! Japan"
-msgstr "Ползване на Yahoo от _ЯпониÑ"
+msgid "I_gnore conference and chat room invitations"
+msgstr ""
+"_Да не Ñе обръща внимание на поканите за конферентни разговори и Ñтаи за "
+"разговори"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! ID?"
msgstr "Какъв е идентификаторът ви в Yahoo?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Каква е паролата ви в Yahoo?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "И_дентификатор на Yahoo:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "_Да не Ñе обръща внимание на поканите за конферентни разговори и Ñтаи"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "_Локал на ÑпиÑъка ÑÑŠÑ Ñтаи:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
msgid "Couldn't convert image"
msgstr "Изображението не може да бъде преобразувано"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
msgid "None of the accepted image formats are supported on your system"
msgstr "СиÑтемата ви не поддържа никой от приетите формати за изображениÑ"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:915
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
msgid "Select Your Avatar Image"
msgstr "Избор на изображение за аватар"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:918
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "No Image"
msgstr "Без изображение"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:980
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
msgid "Images"
msgstr "ИзображениÑ"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:984
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
msgid "All Files"
msgstr "Ð’Ñички файлове"
-#: ../libempathy-gtk/empathy-avatar-image.c:327
+#: ../libempathy-gtk/empathy-avatar-image.c:323
msgid "Click to enlarge"
msgstr "ÐатиÑнете за увеличаване"
-#: ../libempathy-gtk/empathy-chat.c:233
-msgid "Failed to reconnect this chat"
-msgstr "ÐеуÑпешно Ñвързване към този разговор"
-
-#: ../libempathy-gtk/empathy-chat.c:655
-msgid "Failed to join chat room"
-msgstr "ÐеуÑпешно приÑъединÑване към ÑÑ‚Ð°Ñ Ð·Ð° разговор"
-
-#: ../libempathy-gtk/empathy-chat.c:673
+#: ../libempathy-gtk/empathy-chat.c:642
msgid "Failed to open private chat"
msgstr "ÐеуÑпешно започване на личен разговор"
-#: ../libempathy-gtk/empathy-chat.c:712
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
msgstr "Ð’ този разговор не Ñе поддържа тема"
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
msgstr "ÐÑмате право да Ñмените темата"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: изчиÑтване на вÑички ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <тема>: задаване на темата на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€"
-#: ../libempathy-gtk/empathy-chat.c:853
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
msgstr ""
"/join <идентификатор на ÑÑ‚Ð°Ñ Ð·Ð° разговор>: влизане в нова ÑÑ‚Ð°Ñ Ð·Ð° разговор"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
msgstr ""
"/j <идентификатор на ÑÑ‚Ð°Ñ Ð·Ð° разговор>: влизане в нова ÑÑ‚Ð°Ñ Ð·Ð° разговор"
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr ""
"/query <идентификатор на контакт> [<Ñъобщение>]: започване на личен разговор"
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr ""
"/msg <идентификатор на контакт> <Ñъобщение>: започване на личен разговор"
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <прÑкор>: ÑмÑна на прÑкора ви за Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ñървър"
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr ""
"/me <Ñъобщение>: изпращане на Ñъобщение „за дейÑтвие“ в Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€"
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:849
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 "
@@ -1218,7 +1284,7 @@ msgstr ""
"при ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¾Ñ‡Ð²Ð°Ñ‰Ð¸ Ñ â€ž/“. Ðапр.: „/say /join Ñе използва за влизане в "
"нова ÑÑ‚Ð°Ñ Ð·Ð° разговор“"
-#: ../libempathy-gtk/empathy-chat.c:876
+#: ../libempathy-gtk/empathy-chat.c:854
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1226,81 +1292,85 @@ msgstr ""
"/help [<команда>]: показване на вÑички поддържани команди. Ðко има такава "
"<команда>, Ñе показва нейната употреба."
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:864
#, c-format
msgid "Usage: %s"
msgstr "Употреба: %s"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "ÐеизвеÑтна команда"
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
msgstr ""
"ÐеизвеÑтна команда. Пробвайте Ñ â€ž/help“ — ще Ñе изведат поддържаните команди"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "изключен"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "грешен контакт"
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "липÑват права"
-#: ../libempathy-gtk/empathy-chat.c:1183
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "прекалено дълго Ñъобщение"
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "не е реализирано"
-#: ../libempathy-gtk/empathy-chat.c:1189
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "неизвеÑтна грешка"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1172
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Грешка при изпращането на Ñъобщението „%s“: %s"
-#: ../libempathy-gtk/empathy-chat.c:1228
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+msgid "Topic:"
+msgstr "Тема:"
+
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "Темата вече е: „%s“"
-#: ../libempathy-gtk/empathy-chat.c:1230
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "Ðе е зададена тема"
-#: ../libempathy-gtk/empathy-chat.c:1629
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(нÑма предложениÑ)"
-#: ../libempathy-gtk/empathy-chat.c:1683
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "Вмъкване на емотикон"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1701
-#: ../libempathy-gtk/empathy-ui-utils.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "_Send"
msgstr "_Изпращане"
-#: ../libempathy-gtk/empathy-chat.c:1735
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "_ÐŸÑ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° правопиÑ"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
msgstr "ÐеуÑпех при получаването на предишните разговори"
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "%s прекъÑна връзката"
@@ -1308,12 +1378,12 @@ msgstr "%s прекъÑна връзката"
#. 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:2071
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s бе изритан от %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1970
+#: ../libempathy-gtk/empathy-chat.c:2074
#, c-format
msgid "%s was kicked"
msgstr "%s бе изритан"
@@ -1321,17 +1391,17 @@ msgstr "%s бе изритан"
#. 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:2082
#, c-format
msgid "%1$s was banned by %2$s"
-msgstr "%1$s бе поÑтавен под запрет от %2$s"
+msgstr "%1$s бе поÑтавен под възбрана от %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1981
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
-msgstr "%s бе поÑтавен под запрет"
+msgstr "%s бе поÑтавен под възбрана"
-#: ../libempathy-gtk/empathy-chat.c:1985
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
msgstr "%s излезе от ÑтаÑта"
@@ -1341,81 +1411,79 @@ msgstr "%s излезе от ÑтаÑта"
#. * 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:2098
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2019
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
msgstr "%s влезе в ÑтаÑта"
-#: ../libempathy-gtk/empathy-chat.c:2044
+#: ../libempathy-gtk/empathy-chat.c:2148
#, c-format
msgid "%s is now known as %s"
msgstr "%s в момента е познат като %s"
-#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1532
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
msgid "Disconnected"
msgstr "Изключен"
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "Паролата е грешна, пробвайте отново:"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "Ðов опит"
-#: ../libempathy-gtk/empathy-chat.c:2707
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "СтаÑта изиÑква парола:"
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
msgstr "ПриÑъединÑване"
-#: ../libempathy-gtk/empathy-chat.c:2848
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "Свързан"
-#: ../libempathy-gtk/empathy-chat.c:2901
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "Разговор"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:684
-msgid "Topic:"
-msgstr "Тема:"
-
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:318
-#: ../libempathy-gtk/empathy-theme-adium.c:786
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:791
msgid "_Copy Link Address"
msgstr "_Копиране на адреÑа"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:325
-#: ../libempathy-gtk/empathy-theme-adium.c:793
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:798
msgid "_Open Link"
msgstr "_ОтварÑне на адреÑа"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:423
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
msgid "%A %B %d %Y"
msgstr "%d.%m.%Y, %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:243
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
msgid "Edit Contact Information"
msgstr "Редактиране на данните за контакта"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:301
+#: ../libempathy-gtk/empathy-contact-dialogs.c:295
msgid "Personal Information"
msgstr "Лични данни"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:406
+#: ../libempathy-gtk/empathy-contact-dialogs.c:401
+#: ../libempathy-gtk/empathy-individual-dialogs.c:112
msgid "New Contact"
msgstr "Ðов контакт"
@@ -1427,169 +1495,228 @@ msgstr "Отлагане на _решението"
msgid "Subscription Request"
msgstr "ИÑкане за запиÑване"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1633
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Без група"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Любими хора"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Сигурни ли Ñте, че иÑкате да изтриете групата „%s“?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1635
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2235
msgid "Removing group"
msgstr "Изтриване на група"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1684
-#: ../libempathy-gtk/empathy-contact-list-view.c:1761
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-contact-list-view.c:2055
+#: ../libempathy-gtk/empathy-contact-list-view.c:2132
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Изтриване"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1714
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2320
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Сигурни ли Ñте, че иÑкате да изтриете контакта „%s“?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1716
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
msgstr "Изтриване на контакт"
-#: ../libempathy-gtk/empathy-contact-menu.c:206
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "_ДобавÑне на контакт…"
-#: ../libempathy-gtk/empathy-contact-menu.c:233
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "_Разговор"
-#: ../libempathy-gtk/empathy-contact-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-individual-menu.c:557
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Ðудио разговор"
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-individual-menu.c:599
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Видео разговор"
-#: ../libempathy-gtk/empathy-contact-menu.c:347
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "_Предишни разговори"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:683
+msgid "Send File"
msgstr "Изпращане на файл"
-#: ../libempathy-gtk/empathy-contact-menu.c:392
-msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:375
+#: ../libempathy-gtk/empathy-individual-menu.c:725
+msgid "Share My Desktop"
msgstr "СподелÑне на работното мÑÑто"
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-contact-widget.c:1379
+#: ../libempathy-gtk/empathy-contact-menu.c:415
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
msgstr "Любимо"
-#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-contact-menu.c:444
+#: ../libempathy-gtk/empathy-individual-menu.c:786
msgid "Infor_mation"
msgstr "_Данни за контакта"
-#: ../libempathy-gtk/empathy-contact-menu.c:508
+#: ../libempathy-gtk/empathy-contact-menu.c:490
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Редактиране"
-#: ../libempathy-gtk/empathy-contact-menu.c:562
-#: ../src/empathy-chat-window.c:869
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+#: ../libempathy-gtk/empathy-individual-menu.c:970
+#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "Получена е покана за тази ÑтаÑ"
-#: ../libempathy-gtk/empathy-contact-menu.c:593
-msgid "_Invite to chat room"
+#: ../libempathy-gtk/empathy-contact-menu.c:575
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+msgid "_Invite to Chat Room"
msgstr "Изпращане на _покана за ÑтаÑта"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "Избор на контакт"
-#: ../libempathy-gtk/empathy-contact-widget.c:238
-msgid "Select"
-msgstr "Избор"
+#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-individual-widget.c:148
+msgid "Full name:"
+msgstr "Пълно име:"
-#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1050
-msgid "Group"
-msgstr "Група"
+#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-individual-widget.c:149
+msgid "Phone number:"
+msgstr "Телефонен номер:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-individual-widget.c:150
+msgid "E-mail address:"
+msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° е-поща:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-individual-widget.c:151
+msgid "Website:"
+msgstr "УебÑайт:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-individual-widget.c:152
+msgid "Birthday:"
+msgstr "Рожден ден:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:578
+#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Код на държавата по ISO:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:580
+#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Държава:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Щат:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Град:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "ОблаÑÑ‚:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:588
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "ПощенÑки код:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:590
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Улица:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:592
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Сграда:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:594
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Етаж:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:596
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "СтаÑ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:598
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "ТекÑÑ‚:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "ОпиÑание:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:602
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "ÐÐ´Ñ€ÐµÑ Ð² Интернет:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Ðиво на точноÑÑ‚:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Грешка:"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Вертикална грешка (метри):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Хоризонтална грешка (метри):"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "СкороÑÑ‚:"
@@ -1597,48 +1724,63 @@ msgstr "СкороÑÑ‚:"
# дадената позициÑ. От друга Ñтрана, пеленг може би е прекалено Ñ‚ÑÑно
# терминологично в Ñферата на морÑката/въздушната навигациÑ.
# Пеленг Ñтава
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Пеленг:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "СкороÑÑ‚ на изкачване:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "ПоÑледно обновÑване на:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Дължина:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Широчина:"
-#: ../libempathy-gtk/empathy-contact-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "ВиÑочина:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "МеÑтоположение"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-msgid "<b>Location</b>, "
-msgstr "<b>МеÑтоположение</b>, "
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:601
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B, %Y в %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Запазване на аватар"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "ÐеуÑпех при запазването на аватар"
@@ -1646,52 +1788,50 @@ msgstr "ÐеуÑпех при запазването на аватар"
msgid "<b>Location</b> at (date)\t"
msgstr "<b>МеÑтоположение</b> на (дата)\t"
+#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
msgstr "ПÑевдоним:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "Рожден ден:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client Information"
msgstr "Данни за клиента"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client:"
msgstr "Клиент:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
msgid "Contact Details"
msgstr "Подробни данни за контакта"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "E-mail address:"
-msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° е-поща:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Full name:"
-msgstr "Пълно име:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Groups"
-msgstr "Групи"
-
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
msgid "Identifier:"
msgstr "Идентификатор:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
msgstr "Пратена е заÑвка за информациÑ…"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "OS:"
msgstr "ОС:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "ВерÑиÑ:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "Групи"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:344
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -1699,56 +1839,157 @@ msgstr ""
"Изберете групите, в които контактът да Ñе поÑвÑва. Можете да изберете 0 или "
"повече групи."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
-msgid "Version:"
-msgstr "ВерÑиÑ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Website:"
-msgstr "УебÑайт:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-groups-widget.c:363
msgid "_Add Group"
msgstr "_ДобавÑне на група"
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+msgid "Select"
+msgstr "Избор"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-main-window.c:1247
+msgid "Group"
+msgstr "Група"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+msgid "Linked Contacts"
+msgstr "Свързани контакти"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+msgid "Select contacts to link"
+msgstr "Изберете контакти за Ñвързване"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:428
+msgid "New contact preview"
+msgstr "Преглед на нов контакт"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "Избраните контакти от ÑпиÑъка влÑво ще бъдат Ñвързани."
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:837
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "_ПромÑна"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:863
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr "_Свързване на контакти…"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] "Събирателен контакт, Ñъдържащ %u контакт"
+msgstr[1] "Събирателен контакт, Ñъдържащ %u контакта"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>МеÑтоположение</b> на (дата)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "Ðова мрежа"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+msgid "Choose an IRC network"
+msgstr "Избор на мрежа за IRC"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "нов Ñървър"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "Сървър"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "Порт"
-
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:700
-#: ../src/empathy-import-widget.c:310
-msgid "Account"
-msgstr "РегиÑтрациÑ"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:116
+msgid "Link Contacts"
+msgstr "Свързване на контакти"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "_РазделÑне…"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr "РаздробÑване на ÑÑŠÐ±Ð¸Ñ€Ð°Ñ‚ÐµÐ»Ð½Ð¸Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚ на Ñъдържаните в него контакти."
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:137
+msgid "_Link"
+msgstr "_Свързване"
-#: ../libempathy-gtk/empathy-log-window.c:717
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr "Да Ñе раздели ли ÑъбирателниÑÑ‚ контакт „%s“?"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr ""
+"Сигурни ли Ñте, че иÑкате да раздробите този Ñъбирателен контакт? ДейÑтвието "
+"ще раздели отделните контакти, които го ÑÑŠÑтавлÑват."
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:191
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "_РазделÑне"
+
+#: ../libempathy-gtk/empathy-log-window.c:663
msgid "Date"
msgstr "Дата"
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
msgid "Conversations"
msgstr "Разговори"
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "ТърÑене напред"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "ТърÑене назад"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
msgid "Previous Conversations"
msgstr "Предишни разговори"
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
msgid "Search"
msgstr "ТърÑене"
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "_For:"
msgstr "_За:"
@@ -1757,28 +1998,27 @@ msgid "Contact ID:"
msgstr "Идентификатор:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:144
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
msgid "C_hat"
msgstr "_Разговор"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:154
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
msgid "New Conversation"
msgstr "Ðов разговор"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
msgid "Send _Video"
msgstr "Изпращане на _видео"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:196
-#: ../src/empathy-call-window.ui.h:17
-msgid "_Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
msgstr "_Разговор"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
msgid "New Call"
msgstr "Ðов разговор"
@@ -1815,59 +2055,59 @@ msgid "Set your presence and current status"
msgstr "Задайте приÑÑŠÑтвието и текущото Ñи ÑÑŠÑтоÑние"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
msgid "Custom messages…"
msgstr "Други ÑъобщениÑ…"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "ТърÑене:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Зачитане на главни/малки"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Фразата не е открита"
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound.c:50
msgid "Received an instant message"
msgstr "Получено е бързо Ñъобщение"
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
msgid "Sent an instant message"
msgstr "Изпратено е бързо Ñъобщение"
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
msgid "Incoming chat request"
msgstr "ВходÑща заÑвка за разговор"
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
msgid "Contact connected"
msgstr "Контактът е в мрежата"
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
msgid "Contact disconnected"
msgstr "Контактът не е в мрежата"
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
msgid "Connected to server"
msgstr "Има връзка ÑÑŠÑ Ñървър"
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
msgid "Disconnected from server"
msgstr "ÐÑма връзка ÑÑŠÑ Ñървър"
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
msgid "Incoming voice call"
msgstr "ВходÑщ аудио разговор"
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
msgid "Outgoing voice call"
msgstr "ИзходÑщ аудио разговор"
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
msgid "Voice call ended"
msgstr "Ðудио разговорът завърши"
@@ -1903,17 +2143,88 @@ msgstr "ИзчиÑтена"
msgid "Blue"
msgstr "СинÑ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1501
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr "ИдентичноÑтта на Ñървъра за разговори не може да бъде проверена.\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certificate is not signed by a Certification Authority"
+msgstr "Сертификатът не е подпиÑан от упълномощен удоÑтоверител"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "Сертификатът е изтекъл"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "Сертификатът още не е в Ñила"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "Отпечатъкът на Ñертификата не Ñъвпада"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr "Името на хоÑта в Ñертификата не Ñъвпада Ñ Ð¸Ð¼ÐµÑ‚Ð¾ на Ñървъра"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "Сертификатът е ÑамоподпиÑан"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr "Сертификатът е отменен от Ð¸Ð·Ð´Ð°Ð»Ð¸Ñ Ð³Ð¾ упълномощен удоÑтоверител"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr "Сертификатът използва Ñлаба криптографиÑ"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "Дължината на Ñертификата Ð½Ð°Ð´Ñ…Ð²ÑŠÑ€Ð»Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñта"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "Сертификатът е повреден"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "Очаквано име на хоÑÑ‚: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "Име на хоÑÑ‚ в Ñертификата: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "Продължаване"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "Връзката не е надеждна. Желаете ли да продължите въпреки това?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "ЗапомнÑне на избора за бъдещи връзки"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ñертификата"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1698
msgid "Unable to open URI"
msgstr "ÐдреÑÑŠÑ‚ не може да бъде отворен"
-#: ../libempathy-gtk/empathy-ui-utils.c:1618
+#: ../libempathy-gtk/empathy-ui-utils.c:1793
msgid "Select a file"
msgstr "Избор на файл"
-#: ../libempathy-gtk/empathy-ui-utils.c:1682
-msgid "Select a destination"
-msgstr "Избор на получател"
+#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#, c-format
+msgid "Incoming file from %s"
+msgstr "ВходÑщ файл от %s"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -2098,15 +2409,15 @@ msgstr "ЛипÑва Ñъобщение за грешка"
msgid "Instant Message (Empathy)"
msgstr "Бързо Ñъобщение (Empathy)"
-#: ../src/empathy.c:596
+#: ../src/empathy.c:414
msgid "Don't connect on startup"
msgstr "Без автоматично Ñвързване при Ñтартиране"
-#: ../src/empathy.c:600
+#: ../src/empathy.c:418
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Без показване на ÑпиÑъка Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸ и други прозорци при Ñтартиране"
-#: ../src/empathy.c:612
+#: ../src/empathy.c:435
msgid "- Empathy IM Client"
msgstr "— моментни ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñ Empathy"
@@ -2188,7 +2499,7 @@ msgstr ""
"от менюто „Редактиране“."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1303
+#: ../src/empathy-account-assistant.c:1316
msgid "An error occurred"
msgstr "Възникна грешка"
@@ -2197,36 +2508,36 @@ msgstr "Възникна грешка"
#. 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:614
#, c-format
msgid "New %s account"
msgstr "Ðова региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð² %s"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:515
msgid "What kind of chat account do you have?"
msgstr "Какъв вид региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð¸Ð¼Ð°Ñ‚Ðµ?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:521
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Имате ли нÑкакви други региÑтрации, които иÑкате да наÑтроите?"
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:527
msgid "Enter your account details"
msgstr "Въведете данните за региÑтрациÑта ви"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:532
msgid "What kind of chat account do you want to create?"
msgstr "Какъв вид региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð¸Ñкате да Ñъздадете?"
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:538
msgid "Do you want to create other chat accounts?"
msgstr "ИÑкате ли да Ñъздадете друг вид региÑтрации?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:545
msgid "Enter the details for the new account"
msgstr "Въведете данните за новата региÑтрациÑ"
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:660
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 "
@@ -2238,42 +2549,42 @@ msgstr ""
"разговор. С микрофон или уеб-камера може да провеждате и аудио/видео "
"разговори."
-#: ../src/empathy-account-assistant.c:670
+#: ../src/empathy-account-assistant.c:677
msgid "Do you have an account you've been using with another chat program?"
msgstr ""
"Имате ли региÑтрациÑ, коÑто Ñте ползвали Ñ Ð´Ñ€ÑƒÐ³Ð° програма за разговори?"
-#: ../src/empathy-account-assistant.c:693
+#: ../src/empathy-account-assistant.c:700
msgid "Yes, import my account details from "
msgstr "Да, да Ñе внеÑат данните за региÑтрациÑта ми от "
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:721
msgid "Yes, I'll enter my account details now"
msgstr "Да, ще въведа данните за региÑтрациÑта ми Ñега"
-#: ../src/empathy-account-assistant.c:736
+#: ../src/empathy-account-assistant.c:743
msgid "No, I want a new account"
msgstr "Ðе, иÑкам нова региÑтрациÑ"
-#: ../src/empathy-account-assistant.c:746
+#: ../src/empathy-account-assistant.c:753
msgid "No, I just want to see people online nearby for now"
msgstr "Ðе, заÑега иÑкам проÑто да виждам хората в локалната мрежа"
-#: ../src/empathy-account-assistant.c:767
+#: ../src/empathy-account-assistant.c:774
msgid "Select the accounts you want to import:"
msgstr "Изберете региÑтрациите за внаÑÑне:"
-#: ../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:858
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Да"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:865
msgid "No, that's all for now"
msgstr "Ðе, това е вÑичко заÑега"
-#: ../src/empathy-account-assistant.c:1117
+#: ../src/empathy-account-assistant.c:1130
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 "
@@ -2286,16 +2597,16 @@ msgstr ""
"промените по-къÑно, както и да изключите изцÑло тази възможноÑÑ‚ от прозореца "
"„РегиÑтрации“."
-#: ../src/empathy-account-assistant.c:1123
-#: ../src/empathy-account-assistant.c:1179
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
msgid "Edit->Accounts"
msgstr "Редактиране→РегиÑтрации"
-#: ../src/empathy-account-assistant.c:1139
+#: ../src/empathy-account-assistant.c:1152
msgid "I don't want to enable this feature for now"
msgstr "Ðе, заÑега тази възможноÑÑ‚ да не Ñе включва"
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1188
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 "
@@ -2307,67 +2618,67 @@ msgstr ""
"инÑталирайте пакета и Ñъздайте региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ â€žÐ¥Ð¾Ñ€Ð° наблизо“ в прозореца за "
"региÑтрации."
-#: ../src/empathy-account-assistant.c:1181
+#: ../src/empathy-account-assistant.c:1194
msgid "telepathy-salut not installed"
msgstr "Пакетът telepathy-salut не е инÑталиран"
-#: ../src/empathy-account-assistant.c:1227
+#: ../src/empathy-account-assistant.c:1240
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Помощник за ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð¸Ñ Ð¿Ñ€ÐµÐ· Интернет"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1274
msgid "Welcome to Empathy"
msgstr "Добре дошли в Empathy"
-#: ../src/empathy-account-assistant.c:1270
+#: ../src/empathy-account-assistant.c:1283
msgid "Import your existing accounts"
msgstr "ВнаÑÑне на ÑъщеÑтвуващи региÑтрации"
-#: ../src/empathy-account-assistant.c:1288
+#: ../src/empathy-account-assistant.c:1301
msgid "Please enter personal details"
msgstr "Въведете още информациÑ"
#. 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 "Има незапазени промени отноÑно региÑтрациÑта ви в %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 "РегиÑтрациÑта ви вÑе още не е запазена."
-#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "Свързване…"
-#: ../src/empathy-accounts-dialog.c:290
-#, c-format
-msgid "Disconnected — %s"
-msgstr "Изключен — %s"
-
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:322
#, c-format
msgid "Offline — %s"
msgstr "Извън мрежата — %s"
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:334
+#, c-format
+msgid "Disconnected — %s"
+msgstr "Изключен — %s"
+
+#: ../src/empathy-accounts-dialog.c:345
msgid "Offline — No Network Connection"
msgstr "Извън мрежата — липÑва връзка"
# FIXME: термини за offine и disconnected
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:352
msgid "Unknown Status"
msgstr "ÐеизвеÑтно ÑÑŠÑтоÑние"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:364
msgid "Offline — Account Disabled"
msgstr "Извън мрежата — региÑтрациÑта е изключена"
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:811
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2375,16 +2686,16 @@ msgstr ""
"Ðа път Ñте да Ñъздадете нова региÑтрациÑ, което ще анулира\n"
"промените ви. ИÑкате ли да продължите?"
-#: ../src/empathy-accounts-dialog.c:1115
+#: ../src/empathy-accounts-dialog.c:1158
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Сигурни ли Ñте, че иÑкате да изтриете региÑтрациÑта „%s“?"
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1162
msgid "This will not remove your account on the server."
msgstr "Това нÑма да изтрие региÑтрациÑта ви от Ñървъра."
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1400
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2392,7 +2703,7 @@ msgstr ""
"Ðа път Ñте да изберете друга региÑтрациÑ, което ще анулира\n"
"промените ви. ИÑкате ли да продължите?"
-#: ../src/empathy-accounts-dialog.c:1933
+#: ../src/empathy-accounts-dialog.c:2003
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2401,14 +2712,18 @@ msgstr ""
"промените ви. ИÑкате ли да продължите?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "Зареждане на данните за контакта"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "No protocol installed"
msgstr "Ðе е инÑталиран протокол"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Protocol:"
msgstr "Протокол:"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -2416,70 +2731,118 @@ msgstr ""
"За да добавите нова региÑтрациÑ, Ñ‚Ñ€Ñбва да имате модул, който поддържа "
"Ð½ÐµÐ¹Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»."
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
msgstr "_ДобавÑне…"
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
msgstr "_ВнаÑÑне…"
-#: ../src/empathy-call-window.c:453
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr " — идентифициране Ñ Empathy"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Идентифициране Ñ Empathy"
+
+# FIXME: Това е връзка чрез mDNS/DNS-SD, Ñиреч Avahi. „Хора наблизо“ е
+# доÑта объркващо, защото контакти от локалната мрежа не е задължително
+# да Ñа наблизо, както и контакти от други мрежи може да Ñа ÑъвÑем
+# наблизо.
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "Хора наблизо"
+
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr " — телефонна/видео връзка Ñ Empathy"
+
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "Телефонна/видео връзка Ñ Empathy"
+
+#: ../src/empathy-call-window.c:479
msgid "Contrast"
msgstr "КонтраÑÑ‚"
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:482
msgid "Brightness"
msgstr "ЯркоÑÑ‚"
-#: ../src/empathy-call-window.c:459
+#: ../src/empathy-call-window.c:485
msgid "Gamma"
msgstr "Гама корекциÑ"
-#: ../src/empathy-call-window.c:567
+#: ../src/empathy-call-window.c:590
msgid "Volume"
msgstr "Сила на звука"
-#: ../src/empathy-call-window.c:1022
+#: ../src/empathy-call-window.c:1173
msgid "_Sidebar"
msgstr "_Странична лента"
-#: ../src/empathy-call-window.c:1041
+#: ../src/empathy-call-window.c:1192
msgid "Audio input"
msgstr "Ðудио вход"
-#: ../src/empathy-call-window.c:1045
+#: ../src/empathy-call-window.c:1196
msgid "Video input"
msgstr "Видео вход"
-#: ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1200
msgid "Dialpad"
msgstr "Циферблат"
+#: ../src/empathy-call-window.c:1205
+msgid "Details"
+msgstr "ПодробноÑти"
+
#. 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:1273
#, c-format
msgid "Call with %s"
msgstr "Разговор Ñ %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:1352
msgid "Call"
msgstr "Разговор"
+#: ../src/empathy-call-window.c:1506
+msgid "The IP address as seen by the machine"
+msgstr "МеÑтен адреÑ, както Ñе вижда оттук"
+
+#: ../src/empathy-call-window.c:1508
+msgid "The IP address as seen by a server on the Internet"
+msgstr "МеÑтен адреÑ, както Ñе вижда от Ñървър в Интернет"
+
+#: ../src/empathy-call-window.c:1510
+msgid "The IP address of the peer as seen by the other side"
+msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° отÑрещната Ñтрана, както Ñе вижда оттам"
+
+#: ../src/empathy-call-window.c:1512
+msgid "The IP address of a relay server"
+msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° Ð¿Ñ€ÐµÐ¿Ñ€ÐµÐ´Ð°Ð²Ð°Ñ‰Ð¸Ñ Ñървър"
+
+#: ../src/empathy-call-window.c:1514
+msgid "The IP address of the multicast group"
+msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° групата за разпръÑкване (multicast)"
+
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1695
+#: ../src/empathy-call-window.c:2247
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Връзка — %d:%02dm"
-#: ../src/empathy-call-window.c:1756
+#: ../src/empathy-call-window.c:2308
msgid "Technical Details"
msgstr "ТехничеÑки данни"
-#: ../src/empathy-call-window.c:1794
+#: ../src/empathy-call-window.c:2346
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2488,7 +2851,7 @@ msgstr ""
"Софтуерът на %s не поддържа никой от аудио форматите, поддържани на Ð²Ð°ÑˆÐ¸Ñ "
"компютър"
-#: ../src/empathy-call-window.c:1799
+#: ../src/empathy-call-window.c:2351
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2497,7 +2860,7 @@ msgstr ""
"Софтуерът на %s не поддържа никой от видео форматите, поддържани на Ð²Ð°ÑˆÐ¸Ñ "
"компютър"
-#: ../src/empathy-call-window.c:1805
+#: ../src/empathy-call-window.c:2357
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2506,25 +2869,25 @@ msgstr ""
"Ðе може да Ñе оÑъщеÑтви връзка Ñ %s, чиÑто мрежа, вероÑтно, не поддържа "
"преки връзки."
-#: ../src/empathy-call-window.c:1811
+#: ../src/empathy-call-window.c:2363
msgid "There was a failure on the network"
msgstr "Мрежова грешка"
-#: ../src/empathy-call-window.c:1815
+#: ../src/empathy-call-window.c:2367
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Програмите за аудио форматите, изиÑквани за този разговор, не Ñа инÑталирани "
"на компютъра ви"
-#: ../src/empathy-call-window.c:1818
+#: ../src/empathy-call-window.c:2370
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Програмите за видео форматите, изиÑквани за този разговор, не Ñа инÑталирани "
"на компютъра ви"
-#: ../src/empathy-call-window.c:1828
+#: ../src/empathy-call-window.c:2380
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2535,115 +2898,147 @@ msgstr ""
"\">докладвайте този проблем</a> и прикачете журналните файлове указани в "
"прозореца „ИзчиÑтване на грешки“ от менюто „Помощ“."
-#: ../src/empathy-call-window.c:1836
+#: ../src/empathy-call-window.c:2388
msgid "There was a failure in the call engine"
msgstr "Грешка в модула за разговори"
-#: ../src/empathy-call-window.c:1875
+#: ../src/empathy-call-window.c:2391
+msgid "The end of the stream was reached"
+msgstr "ДоÑтигнат е краÑÑ‚ на потока"
+
+#: ../src/empathy-call-window.c:2431
msgid "Can't establish audio stream"
msgstr "Потокът на аудио връзката не може да бъде оÑъщеÑтвен"
-#: ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:2441
msgid "Can't establish video stream"
msgstr "Потокът на видео връзката не може да бъде оÑъщеÑтвен"
#: ../src/empathy-call-window.ui.h:1
+msgid "Audio"
+msgstr "Звук"
+
+#: ../src/empathy-call-window.ui.h:2
msgid "Call the contact again"
msgstr "Ðов разговор Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð°"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:3
msgid "Camera Off"
msgstr "Включване на камерата"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:4
msgid "Camera On"
msgstr "Изключване на камерата"
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Декодиращ модул:"
+
+#: ../src/empathy-call-window.ui.h:6
msgid "Disable camera and stop sending video"
msgstr "Изключване на камерата и пращането на видео"
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.ui.h:7
msgid "Enable camera and send video"
msgstr "Включване на камерата и пращането на видео"
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:8
msgid "Enable camera but don't send video"
msgstr "Включване на камерата без пращане на видео"
-#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Кодиращ модул:"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Hang up"
msgstr "ЗатварÑне"
-#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-call-window.ui.h:11
msgid "Hang up current call"
msgstr "ЗатварÑне на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "МеÑтен кандидат:"
+
+#: ../src/empathy-call-window.ui.h:13
msgid "Preview"
msgstr "Преглед"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:14
msgid "Redial"
msgstr "Повторно набиране"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Отдалечен кандидат:"
+
+#: ../src/empathy-call-window.ui.h:16
msgid "Send Audio"
msgstr "Изпращане на аудио"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Превключване на пращането на аудио"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:19
msgid "V_ideo"
msgstr "_Видео"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:20
+msgid "Video"
+msgstr "Видео"
+
+#: ../src/empathy-call-window.ui.h:21
msgid "Video Off"
msgstr "Изключване на видеото"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:22
msgid "Video On"
msgstr "Включване на видеото"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:23
msgid "Video Preview"
msgstr "Преглед на видеото"
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr "_Разговор"
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
msgid "_View"
msgstr "_Преглед"
-#: ../src/empathy-chat-window.c:440 ../src/empathy-chat-window.c:460
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d непрочетено)"
msgstr[1] "%s (%d непрочетени)"
-#: ../src/empathy-chat-window.c:452
+#: ../src/empathy-chat-window.c:464
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (и %u друго)"
msgstr[1] "%s (и %u други)"
-#: ../src/empathy-chat-window.c:468
+#: ../src/empathy-chat-window.c:480
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d непрочетено от други)"
msgstr[1] "%s (%d непрочетени от други)"
-#: ../src/empathy-chat-window.c:477
+#: ../src/empathy-chat-window.c:489
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d непрочетено от вÑички)"
msgstr[1] "%s (%d непрочетени от вÑички)"
-#: ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:695
msgid "Typing a message."
msgstr "Пише Ñъобщение."
@@ -2675,55 +3070,63 @@ msgstr "ПремеÑтване на подпрозореца на_лÑво"
msgid "Move Tab _Right"
msgstr "ПремеÑтване на подпрозореца на_дÑÑно"
-#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "ИзвеÑÑ‚Ñване за вÑички ÑъобщениÑ"
+
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
msgid "_Contents"
msgstr "_РъководÑтво"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "_Разговор"
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:11
msgid "_Detach Tab"
msgstr "_ОтделÑне на подпрозореца"
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
msgid "_Edit"
msgstr "Р_едактиране"
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "_Любима ÑÑ‚Ð°Ñ Ð·Ð° разговор"
-#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
msgid "_Help"
msgstr "Помо_щ"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "_Следващ подпрозорец"
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:16
msgid "_Previous Tab"
msgstr "_Предишен подпрозорец"
-#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "_Показване на ÑпиÑъка Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸"
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:18
msgid "_Tabs"
msgstr "_Подпрозорци"
-#: ../src/empathy-chatrooms-window.c:256
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "_ОтмÑна на затварÑнето на подпрозорец"
+
+#: ../src/empathy-chatrooms-window.c:241
msgid "Name"
msgstr "Име"
-#: ../src/empathy-chatrooms-window.c:274
+#: ../src/empathy-chatrooms-window.c:259
msgid "Room"
msgstr "СтаÑ"
-#: ../src/empathy-chatrooms-window.c:282
+#: ../src/empathy-chatrooms-window.c:267
msgid "Auto-Connect"
msgstr "Ðвтоматично Ñвързване"
@@ -2731,76 +3134,86 @@ msgstr "Ðвтоматично Ñвързване"
msgid "Manage Favorite Rooms"
msgstr "Управление на Ñтаите в отметките"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming video call"
msgstr "ВходÑщ видео разговор"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming call"
msgstr "ВходÑщ разговор"
-#: ../src/empathy-event-manager.c:343
+#: ../src/empathy-event-manager.c:472
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s ви Ñ‚ÑŠÑ€Ñи Ñ Ð²Ð¸Ð´ÐµÐ¾, иÑкате ли да отговорите?"
-#: ../src/empathy-event-manager.c:344
+#: ../src/empathy-event-manager.c:473
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s ви Ñ‚ÑŠÑ€Ñи, иÑкате ли да отговорите?"
-#: ../src/empathy-event-manager.c:366
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#, c-format
+msgid "Incoming call from %s"
+msgstr "ВходÑщ разговор от %s"
+
+#: ../src/empathy-event-manager.c:501
msgid "_Reject"
msgstr "От_казване"
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:507
msgid "_Answer"
msgstr "_ОтговарÑне"
-#: ../src/empathy-event-manager.c:489
+#: ../src/empathy-event-manager.c:618
#, c-format
msgid "Incoming video call from %s"
msgstr "ВходÑщ видео разговор от %s"
-#: ../src/empathy-event-manager.c:489
-#, c-format
-msgid "Incoming call from %s"
-msgstr "ВходÑщ разговор от %s"
-
-#: ../src/empathy-event-manager.c:579
+#: ../src/empathy-event-manager.c:695
msgid "Room invitation"
msgstr "Покана за ÑтаÑ"
-#: ../src/empathy-event-manager.c:582
+#: ../src/empathy-event-manager.c:697
+#, c-format
+msgid "Invitation to join %s"
+msgstr "Покана за приÑъединÑване към %s"
+
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s ви кани да Ñе приÑъедините към %s"
-#: ../src/empathy-event-manager.c:590
+#: ../src/empathy-event-manager.c:712
msgid "_Decline"
msgstr "_Отказване"
-#: ../src/empathy-event-manager.c:595
+#: ../src/empathy-event-manager.c:717
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_ПриÑъединÑване"
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:743
#, c-format
msgid "%s invited you to join %s"
msgstr "%s ви кани да Ñе приÑъедините към %s"
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:749
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "КанÑÑ‚ ви да Ñе приÑъедините към %s"
+
+#: ../src/empathy-event-manager.c:797
#, c-format
msgid "Incoming file transfer from %s"
msgstr "ВходÑщ файл от %s"
-#: ../src/empathy-event-manager.c:818
+#: ../src/empathy-event-manager.c:1005
#, c-format
msgid "Subscription requested by %s"
msgstr "ИÑкане за запиÑване от %s"
-#: ../src/empathy-event-manager.c:822
+#: ../src/empathy-event-manager.c:1009
#, c-format
msgid ""
"\n"
@@ -2809,118 +3222,116 @@ msgstr ""
"\n"
"Съобщение: %s"
-#. someone is logging off
-#: ../src/empathy-event-manager.c:862
+#: ../src/empathy-event-manager.c:1052
#, c-format
msgid "%s is now offline."
msgstr "%s в момента е извън мрежата."
-#. someone is logging in
-#: ../src/empathy-event-manager.c:878
+#: ../src/empathy-event-manager.c:1072
#, c-format
msgid "%s is now online."
msgstr "%s в момента е в мрежата."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u ч., %02u м. и %02u Ñек."
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
#, c-format
msgid "%02u.%02u"
msgstr "%02u м. и %02u Ñек."
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "ÐеизвеÑтно"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s от общо %s, Ñ %s/Ñек."
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s"
msgstr "%s от общо %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Получаване на файла „%s“ от %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Изпращане на файла „%s“ до %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Грешка при получаване на „%s“ от %s"
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
msgid "Error receiving a file"
msgstr "Грешка при получаване на файл"
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Грешка при изпращане на „%s“ до %s"
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
msgid "Error sending a file"
msgstr "Грешка при изпращане на файл"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
#, c-format
msgid "\"%s\" received from %s"
msgstr "„%s“ получен от %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
#, c-format
msgid "\"%s\" sent to %s"
msgstr "„%s“ изпратен до %s"
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
msgid "File transfer completed"
msgstr "ПрехвърлÑнето на файл завърши"
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
msgid "Waiting for the other participant's response"
msgstr "Изчакване на отговора на Ð´Ñ€ÑƒÐ³Ð¸Ñ ÑƒÑ‡Ð°Ñтник"
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Проверка на целоÑтта на „%s“"
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "ИзчиÑлÑване на извадката на „%s“"
-#: ../src/empathy-ft-manager.c:991
+#: ../src/empathy-ft-manager.c:996
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1003
+#: ../src/empathy-ft-manager.c:1008
msgid "File"
msgstr "Файл"
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1030
msgid "Remaining"
msgstr "ОÑтават"
@@ -2947,163 +3358,162 @@ msgid "Import Accounts"
msgstr "ВнаÑÑне на региÑтрации"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:290
+#: ../src/empathy-import-widget.c:292
msgid "Import"
msgstr "ВнаÑÑне"
-#: ../src/empathy-import-widget.c:299
+#: ../src/empathy-import-widget.c:301
msgid "Protocol"
msgstr "Протокол"
-#: ../src/empathy-import-widget.c:323
+#: ../src/empathy-import-widget.c:325
msgid "Source"
msgstr "Източник"
-#: ../src/empathy-import-mc4-accounts.c:106
-#, c-format
-msgid "%s account"
-msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð² %s"
+#: ../src/empathy-main-window.c:383
+msgid "No match found"
+msgstr "Ðе е намерено Ñъвпадение"
-#: ../src/empathy-main-window.c:437
+#: ../src/empathy-main-window.c:535
msgid "Reconnect"
msgstr "Ðово Ñвързване"
-#: ../src/empathy-main-window.c:443
+#: ../src/empathy-main-window.c:541
msgid "Edit Account"
msgstr "Редактиране на региÑтрациÑ"
-#: ../src/empathy-main-window.c:449
+#: ../src/empathy-main-window.c:547
msgid "Close"
msgstr "ЗатварÑне"
-#: ../src/empathy-main-window.c:1033
+#: ../src/empathy-main-window.c:1229
msgid "Contact"
msgstr "Контакт"
-#: ../src/empathy-main-window.c:1414
+#: ../src/empathy-main-window.c:1554
+msgid "Contact List"
+msgstr "СпиÑък Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸"
+
+#: ../src/empathy-main-window.c:1663
msgid "Show and edit accounts"
msgstr "Показване и редактиране на региÑтрации"
#: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "СпиÑък Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸"
-
-#: ../src/empathy-main-window.ui.h:2
msgid "Contacts on a _Map"
msgstr "_Контакти на карта"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
msgid "Context"
msgstr "КонтекÑÑ‚"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
msgid "Join _Favorites"
msgstr "_ДобавÑне към отметките"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
msgid "Manage Favorites"
msgstr "Редактиране на отметките"
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
msgid "N_ormal Size"
msgstr "_Ðормален размер"
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "Ðов _разговор…"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
msgid "Normal Size With _Avatars"
msgstr "Ðормален размер Ñ _аватари"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
msgid "P_references"
msgstr "_ÐаÑтройки"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
msgid "Show P_rotocols"
msgstr "_Показване на протокола"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
msgid "Sort by _Name"
msgstr "Подреждане по _име"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Status"
msgstr "Подреждане по _ÑÑŠÑтоÑние"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
msgid "_Accounts"
msgstr "_РегиÑтрации"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
msgid "_Compact Size"
msgstr "_Стегнат режим"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17
msgid "_Debug"
msgstr "_ИзчиÑтване на грешки"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19
msgid "_File Transfers"
msgstr "_ПрехвърлÑÐ½Ð¸Ñ Ð½Ð° файлове"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21
msgid "_Join…"
msgstr "_ПриÑъединÑване…"
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_Ðов разговор…"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23
msgid "_Offline Contacts"
msgstr "_Изключени контакти"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24
msgid "_Personal Information"
msgstr "_Лични данни"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26
msgid "_Room"
msgstr "_СтаÑ"
-#: ../src/empathy-new-chatroom-dialog.c:338
+#: ../src/empathy-new-chatroom-dialog.c:379
msgid "Chat Room"
msgstr "Ð¡Ñ‚Ð°Ñ Ð·Ð° разговор"
-#: ../src/empathy-new-chatroom-dialog.c:354
+#: ../src/empathy-new-chatroom-dialog.c:395
msgid "Members"
msgstr "УчаÑтници"
#. 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:607
#, c-format
msgid ""
-"<b>%s</b>\n"
+"%s\n"
"Invite required: %s\n"
"Password required: %s\n"
"Members: %s"
msgstr ""
-"<b>%s</b>\n"
-"ИзиÑкване на покана: %s\n"
-"ИзиÑкване на парола: %s\n"
+"%s\n"
+"ИзиÑква Ñе покана: %s\n"
+"ИзиÑква Ñе парола: %s\n"
"Брой учаÑтници: %s"
# Ðалага Ñе Ñ Ð³Ð»Ð°Ð²Ð½Ð¸ букви, защото „да“ Ñе използва в помощника за нови
# региÑтрации, където има и отговори под формата на пълни Ð¸Ð·Ñ€ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ°Ñ‚Ð¾
# „Ðе, това е вÑичко заÑега“.
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "No"
msgstr "Ðе"
-#: ../src/empathy-new-chatroom-dialog.c:569
+#: ../src/empathy-new-chatroom-dialog.c:638
msgid "Could not start room listing"
msgstr "ИзброÑването на Ñтаите не може да започне"
-#: ../src/empathy-new-chatroom-dialog.c:579
+#: ../src/empathy-new-chatroom-dialog.c:648
msgid "Could not stop room listing"
msgstr "ИзброÑването на Ñтаите не може да Ñпре"
@@ -3138,62 +3548,66 @@ msgstr "СпиÑък ÑÑŠÑ Ñтаи"
msgid "_Room:"
msgstr "_СтаÑ:"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:138
msgid "Message received"
msgstr "Съобщението е получено"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:139
msgid "Message sent"
msgstr "Съобщението е изпратено"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:140
msgid "New conversation"
msgstr "Ðов разговор"
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:141
msgid "Contact goes online"
msgstr "Контактът е в мрежата"
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:142
msgid "Contact goes offline"
msgstr "Контактът е извън мрежата"
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:143
msgid "Account connected"
msgstr "РегиÑтрациÑта е включена"
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:144
msgid "Account disconnected"
msgstr "РегиÑтрациÑта е изключена"
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:445
msgid "Language"
msgstr "Език"
+#: ../src/empathy-preferences.c:882
+msgid "Preferences"
+msgstr "ÐаÑтройки"
+
#: ../src/empathy-preferences.ui.h:1
msgid "Appearance"
msgstr "Изглед"
#: ../src/empathy-preferences.ui.h:2
-msgid "Automatically _connect on startup "
-msgstr "_Ðвтоматично Ñвързване при Ñтартиране"
-
-#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Поведение"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
msgid "Chat Th_eme:"
msgstr "_Тема за прозорците за разговори:"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
msgid "Disable notifications when _away or busy"
msgstr "Без _извеÑÑ‚Ñване в ÑÑŠÑтоÑние „Зает“ или „ОтÑÑŠÑтващ“"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable sounds when _away or busy"
msgstr "Без _звуци в ÑÑŠÑтоÑние „Зает“ или „ОтÑÑŠÑтващ“"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "Показване на входÑщи ÑÑŠÐ±Ð¸Ñ‚Ð¸Ñ Ð² облаÑтта за уведомÑване"
+
#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
msgstr "ИзвеÑÑ‚Ñване, когато контактът влезе в мрежата"
@@ -3219,17 +3633,17 @@ msgid "Location sources:"
msgstr "Датчик за меÑтоположение:"
#: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr "Ðрхив на разговорите"
+
+#: ../src/empathy-preferences.ui.h:15
msgid "Notifications"
msgstr "ИзвеÑÑ‚Ñване"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:16
msgid "Play sound for events"
msgstr "Звуци при ÑъбитиÑ"
-#: ../src/empathy-preferences.ui.h:16
-msgid "Preferences"
-msgstr "ÐаÑтройки"
-
#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "Лични данни"
@@ -3271,41 +3685,62 @@ msgid "Themes"
msgstr "Графични теми"
#: ../src/empathy-preferences.ui.h:25
+msgid "_Automatically connect on startup"
+msgstr "_Ðвтоматично Ñвързване при Ñтартиране"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Cellphone"
msgstr "_Мобилен телефон"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable bubble notifications"
msgstr "Включване на извеÑÑ‚Ñването Ñ _прозорци"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable sound notifications"
msgstr "Включване на уведомÑването ÑÑŠÑ _звук"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "_Network (IP, Wi-Fi)"
msgstr "_Мрежа (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Open new chats in separate windows"
msgstr "_ОтварÑне на разговорите в отделни прозорци"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Publish location to my contacts"
msgstr "_Публикуване на меÑтоположението ви към контактите ви"
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
msgid "_Reduce location accuracy"
msgstr "_ÐиÑка точноÑÑ‚ на меÑтоположението"
-#: ../src/empathy-status-icon.c:176
+#: ../src/empathy-status-icon.c:141
msgid "Respond"
msgstr "ОтговарÑне"
+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "ОтхвърлÑне"
+
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "Отговор"
+
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "ОтклонÑване"
+
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "Приемане"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "СъÑтоÑние"
@@ -3314,67 +3749,67 @@ msgstr "СъÑтоÑние"
msgid "_Quit"
msgstr "_Спиране на програмата"
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:452
msgid "Contact Map View"
msgstr "Карта Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸Ñ‚Ðµ"
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1219
msgid "Save"
msgstr "Запазване"
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1395
msgid "Debug Window"
msgstr "Прозорец за изчиÑтване на грешки"
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1475
msgid "Pause"
msgstr "Пауза"
-#: ../src/empathy-debug-window.c:1311
+#: ../src/empathy-debug-window.c:1487
msgid "Level "
msgstr "Ðиво"
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1507
msgid "Debug"
msgstr "ПодробноÑÑ‚"
-#: ../src/empathy-debug-window.c:1337
+#: ../src/empathy-debug-window.c:1513
msgid "Info"
msgstr "ИнформациÑ"
-#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
msgid "Message"
msgstr "Съобщение"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1525
msgid "Warning"
msgstr "Предупреждение"
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1531
msgid "Critical"
msgstr "Критична"
-#: ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1537
msgid "Error"
msgstr "Грешка"
-#: ../src/empathy-debug-window.c:1380
+#: ../src/empathy-debug-window.c:1556
msgid "Time"
msgstr "Време"
-#: ../src/empathy-debug-window.c:1383
+#: ../src/empathy-debug-window.c:1559
msgid "Domain"
msgstr "ОблаÑÑ‚"
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1561
msgid "Category"
msgstr "КатегориÑ"
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1563
msgid "Level"
msgstr "Ðиво"
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1600
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3391,32 +3826,36 @@ msgstr "Поканване на учаÑтник"
msgid "Choose a contact to invite into the conversation:"
msgstr "Избор на контакт, за поканване в разговора:"
-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "Покана"
+
+#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
"Без показването на прозорци. Извършване на дейноÑÑ‚ (напр. внаÑÑне) и Ñпиране"
-#: ../src/empathy-accounts.c:217
-msgid "Don't display any dialogs if there are any non-salut accounts"
+#: ../src/empathy-accounts.c:186
+msgid "Don't display any dialogs if there are any non-Salut accounts"
msgstr ""
"Да не Ñе показват прозорци, ако има поне една региÑтрациÑ, коÑто не е по "
-"salut"
+"Salut"
-#: ../src/empathy-accounts.c:221
+#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Първоначално избиране на дадена региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ (напр. gabble/jabber/"
"foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:192
msgid "<account-id>"
msgstr "<ид-Ñ€ на региÑтрациÑ>"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:200
msgid "- Empathy Accounts"
msgstr "— РегиÑтрации на Empathy"
-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:216
msgid "Empathy Accounts"
msgstr "РегиÑтрации на Empathy"
diff --git a/po/cs.po b/po/cs.po
index 7667f8253..5e3ba5091 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,6 +2,7 @@
# Copyright (C) 2003, 2004, 2008, 2009, 2010 the author(s) of empathy.
# Copyright (C) 2003, 2004 Miloslav Trmac <mitr@volny.cz>.
# This file is distributed under the same license as the empathy package.
+#
# Miloslav Trmac <mitr@volny.cz>, 2003, 2004.
# Lucas Lommer <llommer@svn.gnome.org>, 2008, 2009, 2010.
# Adrian Guniš <andygun@seznam.cz>, 2008.
@@ -17,9 +18,9 @@ msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-09-11 23:20+0000\n"
-"PO-Revision-Date: 2010-09-12 08:46+0200\n"
-"Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
+"POT-Creation-Date: 2010-09-21 08:05+0000\n"
+"PO-Revision-Date: 2010-09-21 11:47+0200\n"
+"Last-Translator: Marek Černocký <marek@manet.cz>\n"
"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -661,6 +662,7 @@ msgstr ""
"přesáhla omezení dané kryptografickou knihovnou"
#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Lidé v okolí"
@@ -758,16 +760,16 @@ msgstr "%s:"
msgid "Username:"
msgstr "Uživatelské jméno:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "_Použít"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "Přip_ojit"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -776,19 +778,19 @@ msgstr "Přip_ojit"
msgid "Account:"
msgstr "ÚÄet:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "Povol_en"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Takový úÄet již existuje"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "VytvoÅ™it nový úÄet na serveru"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "_Zrušit"
@@ -797,19 +799,19 @@ msgstr "_Zrušit"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s na %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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "ÚÄet služby %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Nový úÄet"
@@ -856,7 +858,7 @@ msgstr "Jaké je vaše zobrazované jméno v AIM?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Port:"
@@ -865,7 +867,7 @@ msgstr "_Port:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Server:"
@@ -1174,22 +1176,18 @@ msgid "I_gnore conference and chat room invitations"
msgstr "I_gnorovat pozvání do konferencí a diskuzních místností"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Použít _Yahoo! Japan"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "Jaké je vaše Yahoo! ID?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Jaké je vaše heslo k Yahoo?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "Yahoo! I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "Ná_rodní prostředí seznamu místností:"
@@ -1486,6 +1484,14 @@ msgstr "_Rozhodnout se později"
msgid "Subscription Request"
msgstr "Požadavek na přihlášení"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Nezařazené do skupiny"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Oblíbení lidé"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1557,7 +1563,7 @@ msgid "Share My Desktop"
msgstr "Sdílet moji plochu"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1613,128 +1619,128 @@ msgstr "Webová stránka:"
msgid "Birthday:"
msgstr "Narozeniny:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Kód země ISO:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "ZemÄ›:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Kraj:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Město:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Oblast:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "PSČ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Ulice:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Budova:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Podlaží:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Místnost:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Popis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Úroveň přesnosti:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Chyba:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Vertikální chyba (v metrech):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Horizontální chyba (v metrech):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Rychlost:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Azimut:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Rychlost stoupání:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Poslední aktualizace:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Zeměpisná délka:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Zeměpisná šířka:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Nadmořská výška:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1742,23 +1748,23 @@ msgid "Location"
msgstr "Poloha"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y v %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Uložit avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Nelze uložit avatar"
diff --git a/po/da.po b/po/da.po
index 63804b72c..ae954ab39 100644
--- a/po/da.po
+++ b/po/da.po
@@ -26,8 +26,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 19:32+0200\n"
-"PO-Revision-Date: 2010-09-11 19:31+0200\n"
+"POT-Creation-Date: 2010-09-23 01:15+0200\n"
+"PO-Revision-Date: 2010-09-22 23:53+0200\n"
"Last-Translator: Kenneth Nielsen <k.nielsen81@gmail.com>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
"MIME-Version: 1.0\n"
@@ -684,6 +684,7 @@ msgstr ""
"overskrider krypteringsbibliotekets grænser"
#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Folk i nærheden"
@@ -775,16 +776,16 @@ msgstr "%s:"
msgid "Username:"
msgstr "Brugernavn:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "An_vend"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "L_og ind"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -793,19 +794,19 @@ msgstr "L_og ind"
msgid "Account:"
msgstr "Konto:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "_Aktiveret"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Denne konto findes allerede på serveren"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Opret en ny konto på serveren"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "_Annuller"
@@ -814,19 +815,19 @@ msgstr "_Annuller"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s på %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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "%s-konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Ny konto"
@@ -874,7 +875,7 @@ msgstr "Hvad er dit screen name til AIM?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Port:"
@@ -883,7 +884,7 @@ msgstr "_Port:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Server:"
@@ -1195,22 +1196,18 @@ msgid "I_gnore conference and chat room invitations"
msgstr "_Ignorér konference- og chatrumsinvitationer"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Brug _Yahoo! Japan"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "Hvad er dit Yahoo!-id?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Hvad er din Yahoo!-adgangskode?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "Yahoo!-i_d:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "_Rumliste-placering:"
@@ -1507,6 +1504,14 @@ msgstr "Beslut _senere"
msgid "Subscription Request"
msgstr "Abonneringsanmodning"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Ikke grupperet"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Favoritfolk"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1578,7 +1583,7 @@ msgid "Share My Desktop"
msgstr "Del mit skrivebord"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1634,128 +1639,128 @@ msgstr "Webside:"
msgid "Birthday:"
msgstr "Fødselsdag:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Lands ISO-kode:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Land:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Tilstand:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "By:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Område:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Postnummer:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Gade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Bygning:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Etage:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Rum:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Tekst:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Beskrivelse:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Niveau for nøjagtighed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Fejl:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Lodret fejl (meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Vandret fejl (meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Hastighed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Kurs:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Stigningshastighed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Sidst opdateret den:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Længdegrad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Breddegrad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Højde:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1763,23 +1768,23 @@ msgid "Location"
msgstr "Placering"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%e. %B, %Y klokken %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Gem profilbillede"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Kan ikke gemme profilbillede"
@@ -3872,6 +3877,9 @@ msgstr "Empathy-konti"
msgid "Empathy Debugger"
msgstr "Empathy-fejlfinding"
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "Brug _Yahoo! Japan"
+
#~ msgid "_Character set:"
#~ msgstr "_Tegnsæt:"
diff --git a/po/de.po b/po/de.po
index dea805110..c319cbb97 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,9 +13,10 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-12 01:19+0200\n"
-"PO-Revision-Date: 2010-09-11 22:32+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2010-09-29 10:55+0000\n"
+"PO-Revision-Date: 2010-09-29 13:26+0100\n"
"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
"Language-Team: Deutsch <gnome-de@gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -284,13 +285,11 @@ msgstr "Erscheinungsbild für Chaträume verwenden"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
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/org.gnome.Empathy.gschema.xml.in.h:58
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/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the cellular network to guess the location."
@@ -323,8 +322,8 @@ msgstr ""
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
-"Legt fest, ob Empathy automatisch in den Abwesend-Modus versetzt werden "
-"soll, wenn der Benutzer untätig ist."
+"Legt fest, ob Empathy automatisch in den Abwesend-Modus versetzt werden soll, "
+"wenn der Benutzer untätig ist."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
@@ -417,19 +416,19 @@ msgstr ""
#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
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/org.gnome.Empathy.gschema.xml.in.h:81
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/org.gnome.Empathy.gschema.xml.in.h:82
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 "
@@ -475,8 +474,8 @@ msgstr "Legt fest, ob die Kontaktliste im Kompaktmodus angezeigt werden soll."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
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."
@@ -502,7 +501,7 @@ msgstr "Sofortnachrichten- und VoIP-Konten verwalten"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2106
msgid "Messaging and VoIP Accounts"
msgstr "Sofortnachrichten- und VoIP-Konten"
@@ -576,9 +575,9 @@ msgstr "Unsichtbar"
msgid "Offline"
msgstr "Abgemeldet"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
-#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
-#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
+#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
+#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Unbekannt"
@@ -663,8 +662,7 @@ msgid "This resource is already connected to the server"
msgstr "Diese Ressource ist bereits mit dem Server verbunden"
#: ../libempathy/empathy-utils.c:368
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
+msgid "Connection has been replaced by a new connection using the same resource"
msgstr ""
"Die Verbindung wurde durch eine neue Verbindung mit der gleichen Ressource "
"ersetzt"
@@ -698,15 +696,20 @@ msgstr ""
"überschreiten die durch die kryptografische Bibliothek gegebenen "
"Beschränkungen"
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:543
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Personen in der Nähe"
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:548
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
msgstr "Facebook-Chat"
@@ -790,16 +793,16 @@ msgstr "%s:"
msgid "Username:"
msgstr "Benutzername:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "An_wenden"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "_Anmelden"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -808,19 +811,19 @@ msgstr "_Anmelden"
msgid "Account:"
msgstr "Konto:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "A_ktiviert"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Dieses Konto ist bereits auf dem Server vorhanden"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Ein neues Konto auf dem Server anlegen"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "A_bbrechen"
@@ -829,19 +832,19 @@ msgstr "A_bbrechen"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, 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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "%s-Konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Neues Konto"
@@ -888,7 +891,7 @@ msgstr "Wie lautet Ihr AIM AOL-Name?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "P_ort:"
@@ -897,7 +900,7 @@ msgstr "P_ort:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Server:"
@@ -1053,8 +1056,8 @@ 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:15
msgid "Use old SS_L"
@@ -1205,23 +1208,19 @@ msgid "I_gnore conference and chat room invitations"
msgstr "Konferenz- und Chatraumeinladungen i_gnorieren"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "_Yahoo! Japan verwenden"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "Wie lautet Ihre Yahoo!-ID?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Wie lautet Ihr Yahoo!-Passwort?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "Yahoo! I_D:"
# CHECK
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "Standorteinstellungen für _Raumliste:"
@@ -1302,8 +1301,8 @@ msgstr ""
#: ../libempathy-gtk/empathy-chat.c:849
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> zum aktuellen Chat senden. Es wird verwendet, "
"um eine Nachricht zu senden, die mit »/« beginnt, wie z.B. »/say /join tritt "
@@ -1311,8 +1310,8 @@ msgstr ""
#: ../libempathy-gtk/empathy-chat.c:854
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."
@@ -1359,7 +1358,7 @@ msgstr "Unbekannt"
msgid "Error sending message '%s': %s"
msgstr "Fehler beim Senden der Nachricht »%s«: %s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
msgid "Topic:"
msgstr "Thema:"
@@ -1382,7 +1381,7 @@ msgstr "Emoticon einfügen"
#. send button
#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "_Senden"
@@ -1450,7 +1449,7 @@ msgstr "%s hat den Raum betreten"
msgid "%s is now known as %s"
msgstr "%s ist jetzt bekannt als %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
msgid "Disconnected"
msgstr "Getrennt"
@@ -1497,17 +1496,17 @@ msgstr "Link _öffnen"
msgid "%A %B %d %Y"
msgstr "%A, %d. %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Kontaktinformationen bearbeiten"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
msgstr "Persönliche Informationen"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
msgid "New Contact"
msgstr "Neuer Kontakt"
@@ -1519,6 +1518,14 @@ msgstr "_Später entscheiden"
msgid "Subscription Request"
msgstr "Abonnementanfrage"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Nicht gruppiert"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Lieblingskontakte"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1590,7 +1597,7 @@ msgid "Share My Desktop"
msgstr "Meine Arbeitsumgebung freigeben"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1570
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1608,7 +1615,7 @@ msgstr "_Bearbeiten"
#: ../libempathy-gtk/empathy-contact-menu.c:544
#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../src/empathy-chat-window.c:917
msgid "Inviting you to this room"
msgstr "Sie werden in diesen Chatraum eingeladen"
@@ -1621,153 +1628,153 @@ msgstr "In den Chatraum _einladen"
msgid "Select a contact"
msgstr "Kontakt auswählen"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-contact-widget.c:226
#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Full name:"
msgstr "Voller Name:"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-contact-widget.c:227
#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "Phone number:"
msgstr "Telefonnummer:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-contact-widget.c:228
#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "E-mail address:"
msgstr "E-Mail-Adresse:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-contact-widget.c:229
#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Website:"
msgstr "Webseite:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-contact-widget.c:230
#: ../libempathy-gtk/empathy-individual-widget.c:152
msgid "Birthday:"
msgstr "Geburtstag:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:609
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "ISO-Länderkennung:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:611
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Land:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:613
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Bundesland/Kanton:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:615
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Stadt:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:617
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Region:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:619
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Postleitzahl:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:621
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Straße:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:623
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Gebäude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:625
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Etage::"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:627
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Raum:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:629
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:631
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Beschreibung:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:633
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "Adresse:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:635
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Genauigkeitsgrad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:637
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Fehler:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:639
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Vertikale Ungenauigkeit (Meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:641
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Horizontale Ungenauigkeit (Meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:643
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Geschwindigkeit:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:645
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Peilung:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:647
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Steiggeschwindigkeit:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:649
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Zuletzt aktualisiert am:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:651
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Längengrad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:653
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Breitengrad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:655
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Höhe:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:718
+#: ../libempathy-gtk/empathy-contact-widget.c:735
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1775,23 +1782,23 @@ msgid "Location"
msgstr "Position"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:737
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:789
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y um %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:872
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Benutzerbild speichern"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:928
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Benutzerbild konnte nicht gespeichert werden"
@@ -1855,18 +1862,18 @@ msgstr ""
msgid "_Add Group"
msgstr "Gruppe _hinzufügen"
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+msgctxt "verb in a column header displaying group names"
msgid "Select"
-msgstr "Wählen"
+msgstr "Auswählen"
-#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../libempathy-gtk/empathy-groups-widget.c:408
#: ../src/empathy-main-window.c:1247
msgid "Group"
msgstr "Gruppe"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
msgid "Linked Contacts"
msgstr "Verknüpfte Kontakte"
@@ -1922,6 +1929,11 @@ msgstr "Neues Netzwerk"
msgid "Choose an IRC network"
msgstr "Wählen Sie ein IRC-Netzwerk"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Auswählen"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "neuer Server"
@@ -1933,16 +1945,16 @@ msgstr "SSL"
#. Translators: this is the title of the linking dialogue (reached by
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:116
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
msgid "Link Contacts"
msgstr "Kontakte verknüpfen"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "Verknüpfung _aufheben …"
-#: ../libempathy-gtk/empathy-linking-dialog.c:122
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgid ""
"Completely split the displayed meta-contact into the contacts it contains."
msgstr ""
@@ -1952,25 +1964,25 @@ msgstr ""
#. Translators: this is an action button in the linking dialogue. "Link" is
#. * used here as a verb meaning "to connect two contacts to form a
#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:137
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
msgid "_Link"
msgstr "_Verknüpfen"
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "Verknüpfung des Meta-Kontakts »%s« lösen?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
msgid ""
-"Are you sure you want to unlink this meta-contact? This will completely "
-"split the meta-contact into the contacts it contains."
+"Are you sure you want to unlink this meta-contact? This will completely split "
+"the meta-contact into the contacts it contains."
msgstr ""
"Wollen Sie die Verknüpfung dieses Meta-Kontakts wirklich aufheben? Dadurch "
"wird der Meta-Kontakt wieder vollständig in die enthaltenen Einzelkontakte "
"zerlegt."
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "Verknüpfung _aufheben"
@@ -1985,10 +1997,12 @@ msgid "Conversations"
msgstr "Unterhaltungen"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "Weitersuchen"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "Rückwärts suchen"
@@ -2072,15 +2086,15 @@ msgstr "Ihren gegenwärtigen Anwesenheitsstatus setzen"
msgid "Custom messages…"
msgstr "Benutzerdefinierte Nachricht …"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Suchen:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Groß-/Kleinschreibung berücksichtigen"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Ausdruck nicht gefunden"
@@ -2158,8 +2172,7 @@ msgstr "Blau"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr ""
-"Die vom Chat-Server gelieferte Identität kann nicht überprüft werden.\n"
+msgstr "Die vom Chat-Server gelieferte Identität kann nicht überprüft werden.\n"
#: ../libempathy-gtk/empathy-tls-dialog.c:156
msgid "The certificate is not signed by a Certification Authority"
@@ -2230,15 +2243,15 @@ msgstr "Diese Wahl für zukünftige Verbindungen merken"
msgid "Certificate Details"
msgstr "Details zum Zertifikat"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "Adresse konnte nicht geöffnet werden"
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "Eine Datei auswählen"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
#, c-format
msgid "Incoming file from %s"
msgstr "Eingehende Datei von %s"
@@ -2447,15 +2460,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 "
@@ -2471,8 +2483,8 @@ msgid ""
msgstr ""
"Mit Empathy sollten Sie außerdem eine Kopie der GNU General Public License "
"erhalten haben. Wenn dem nicht so ist, so schreiben Sie bitte an die Free "
-"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
-"1301, USA."
+"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301, USA."
#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
@@ -2518,45 +2530,35 @@ msgstr ""
"Assistenten beenden und später über das »Bearbeiten»-Menü Konten hinzufügen."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1268
msgid "An error occurred"
msgstr "Ein Fehler ist aufgetreten"
-#. To translator: %s is the protocol name
-#. Create account
-#. 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:614
-#, c-format
-msgid "New %s account"
-msgstr "Neues %s-Konto"
-
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
msgstr "Welche Art Chat-Konto haben Sie?"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:473
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:527
+#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
msgstr "Geben Sie Ihre Kontodetails ein"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:484
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:538
+#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
msgstr "Möchten Sie weitere Chat-Konten anlegen?"
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
msgstr "Geben Sie die Details für das neue Konto ein"
-#: ../src/empathy-account-assistant.c:660
+#: ../src/empathy-account-assistant.c:612
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 "
@@ -2568,43 +2570,43 @@ msgstr ""
"Programme verwenden. Mit einem Mikrofon oder einer Webcam können Sie auch "
"Audio- bzw. Videoanrufe tätigen."
-#: ../src/empathy-account-assistant.c:677
+#: ../src/empathy-account-assistant.c:629
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:700
+#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
msgstr "Ja, meine Kontodetails importieren von "
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
msgstr "Ja, ich möchte jetzt meine Kontodetails eingeben"
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
msgstr "Nein, ich möchte ein neues Konto"
-#: ../src/empathy-account-assistant.c:753
+#: ../src/empathy-account-assistant.c:705
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:774
+#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
msgstr "Wählen Sie die zu importierenden Konten:"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:810
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Ja"
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:817
msgid "No, that's all for now"
msgstr "Nein, das ist alles"
-#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1082
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 "
@@ -2616,16 +2618,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:1136
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1088
+#: ../src/empathy-account-assistant.c:1144
msgid "Edit->Accounts"
msgstr "Bearbeiten→Konten"
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1104
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:1188
+#: ../src/empathy-account-assistant.c:1140
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 "
@@ -2637,23 +2639,23 @@ 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:1194
+#: ../src/empathy-account-assistant.c:1146
msgid "telepathy-salut not installed"
msgstr "telepathy-salut ist nicht installiert"
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1192
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Assistent für Sofortnachrichten- und VoIP-Konten"
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1226
msgid "Welcome to Empathy"
msgstr "Willkommen bei Empathy"
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1235
msgid "Import your existing accounts"
msgstr "Bestehende Konten importieren"
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1253
msgid "Please enter personal details"
msgstr "Bitte geben Sie persönliche Informationen ein"
@@ -2696,7 +2698,7 @@ msgstr "Unbekannter Status"
msgid "Offline — Account Disabled"
msgstr "Abgemeldet — Konto ist deaktiviert"
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:760
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2705,16 +2707,16 @@ msgstr ""
"Ihre Änderungen verworfen. Sind Sie sicher, dass Sie\n"
"fortfahren möchten?"
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1107
#, 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:1162
+#: ../src/empathy-accounts-dialog.c:1111
msgid "This will not remove your account on the server."
msgstr "Dadurch wird Ihr Konto nicht vom Server entfernt."
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1349
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2723,7 +2725,7 @@ msgstr ""
"Ihre Änderungen verworfen. Sind Sie sicher, dass Sie\n"
"fortfahren möchten?"
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:1952
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2796,71 +2798,71 @@ msgstr "Gamma"
msgid "Volume"
msgstr "Lautstärke"
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1175
msgid "_Sidebar"
msgstr "_Seitenleiste"
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1194
msgid "Audio input"
msgstr "Audio-Eingang"
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1198
msgid "Video input"
msgstr "Video-Eingang"
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1202
msgid "Dialpad"
msgstr "Wählfeld"
-#: ../src/empathy-call-window.c:1205
+#: ../src/empathy-call-window.c:1207
msgid "Details"
msgstr "Details"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1273
+#: ../src/empathy-call-window.c:1275
#, 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:1352
+#: ../src/empathy-call-window.c:1354
msgid "Call"
msgstr "Anrufen"
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1508
msgid "The IP address as seen by the machine"
msgstr "Die von der Maschine gesehene IP-Adresse"
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1510
msgid "The IP address as seen by a server on the Internet"
msgstr "Die von einem Server im Internet gesehene IP-Adresse"
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1512
msgid "The IP address of the peer as seen by the other side"
msgstr ""
"Die IP-Adresse des Kommunikationspartners, wie von der anderen Seite gesehen"
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1514
msgid "The IP address of a relay server"
msgstr "Die IP-Adresse eines Relay-Servers"
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1516
msgid "The IP address of the multicast group"
msgstr "Die IP-Adresse der Multicast-Gruppe"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2263
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Verbunden — %d:%02dm"
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2324
msgid "Technical Details"
msgstr "Technische Details"
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2362
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2869,7 +2871,7 @@ msgstr ""
"Die Software von %s unterstützt keines der Audioformate, die von Ihrem "
"Rechner unterstützt werden"
-#: ../src/empathy-call-window.c:2351
+#: ../src/empathy-call-window.c:2367
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2878,7 +2880,7 @@ msgstr ""
"Die Software von %s unterstützt keines der Videoformate, die von Ihrem "
"Rechner unterstützt werden"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2373
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2887,25 +2889,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:2363
+#: ../src/empathy-call-window.c:2379
msgid "There was a failure on the network"
msgstr "Es gab im Netzwerk einen Fehler"
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2383
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:2370
+#: ../src/empathy-call-window.c:2386
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:2380
+#: ../src/empathy-call-window.c:2396
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2916,19 +2918,19 @@ 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:2388
+#: ../src/empathy-call-window.c:2404
msgid "There was a failure in the call engine"
msgstr "Es gab einen Fehler im Anrufsystem"
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2407
msgid "The end of the stream was reached"
msgstr "Das Ende des Datenstroms wurde erreicht"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2447
msgid "Can't establish audio stream"
msgstr "Es kann kein Audio-Strom aufgebaut werden"
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2457
msgid "Can't establish video stream"
msgstr "Es kann kein Video-Strom aufgebaut werden"
@@ -3028,35 +3030,35 @@ msgstr "An_rufen"
msgid "_View"
msgstr "_Ansicht"
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ungelesen)"
msgstr[1] "%s (%d ungelesen)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:478
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (und %u weitere)"
msgstr[1] "%s (und %u weitere)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:494
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d von anderen ungelesen)"
msgstr[1] "%s (%d von anderen ungelesene)"
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:503
#, c-format
msgid "%s (%d unread from all)"
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:695
+#: ../src/empathy-chat-window.c:709
msgid "Typing a message."
msgstr "Schreibt eine Nachricht."
@@ -3206,8 +3208,7 @@ msgstr "%s lädt Sie ein, %s beizutreten"
msgid "_Decline"
msgstr "A_blehnen"
-#: ../src/empathy-event-manager.c:717
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:717 ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Beitreten"
@@ -3368,8 +3369,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"
@@ -3879,3 +3880,9 @@ msgstr "Empathy-Konten"
#: ../src/empathy-debugger.c:40
msgid "Empathy Debugger"
msgstr "Empathy-Fehlerdiagnose"
+
+#~ msgid "New %s account"
+#~ msgstr "Neues %s-Konto"
+
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "_Yahoo! Japan verwenden"
diff --git a/po/el.po b/po/el.po
index 460c1273f..9f24a4927 100644
--- a/po/el.po
+++ b/po/el.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy.HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-31 23:12+0300\n"
-"PO-Revision-Date: 2010-08-31 23:09+0300\n"
+"POT-Creation-Date: 2010-09-30 15:11+0300\n"
+"PO-Revision-Date: 2010-09-30 15:11+0300\n"
"Last-Translator: Simos Xenitellis <simos@gnome.org>\n"
"Language-Team: Greek <team@gnome.gr>\n"
"MIME-Version: 1.0\n"
@@ -486,7 +486,7 @@ msgstr "ΔιαχείÏιση λογαÏιασμών μηνυμάτων και Ï„
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2151
+#: ../src/empathy-accounts-dialog.c:2156
msgid "Messaging and VoIP Accounts"
msgstr "ΛογαÏιασμοί μηνυμάτων και τηλεφωνίας"
@@ -534,141 +534,141 @@ msgstr "Σφάλμα κατά τη μεταφοÏά του αÏχείου"
msgid "The other participant is unable to transfer the file"
msgstr "Ο συνομιλητής σας δεν μποÏεί να μεταφέÏει το αÏχείο"
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "Άγνωστος λόγος"
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Διαθέσιμος/η"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Απασχολημένος/η"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Απουσιάζει"
-#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "ΑόÏατος"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Εκτός σÏνδεσης"
-#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883
-#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885
-#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
+#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
+#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Άγνωστο"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "Δε διευκÏινίστηκε αιτία"
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "Η κατάσταση έχει καθοÏισθεί σε ανενεÏγός"
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Σφάλμα σÏνδεσης στο δίκτυο"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "Η πιστοποίηση απέτυχε"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Σφάλμα κÏυπτογÏάφησης"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "ΧÏησιμοποιοÏμενο όνομα"
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "Δεν παÏέχεται πιστοποιητικό"
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "Μη έμπιστο πιστοποιητικό"
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "Το πιστοποιητικό έχει λήξει"
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "Το πιστοποιητικό δεν είναι ενεÏγοποιημένο"
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "Αναντιστοιχία ονόματος συστήματος και πιστοποιητικοÏ"
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "Αναντιστοιχία αποτυπώματος και πιστοποιητικοÏ"
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "Αυτο-υπογεγÏαμμένο πιστοποιητικό "
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Σφάλμα πιστοποιητικοÏ"
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:356
msgid "Encryption is not available"
msgstr "Μη διαθέσιμη κÏυπτογÏάφηση"
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:358
msgid "Certificate is invalid"
msgstr "Το πιστοποιητικό δεν είναι έγκυÏο"
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:360
msgid "Connection has been refused"
msgstr "ΆÏνηση σÏνδεσης"
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:362
msgid "Connection can't be established"
msgstr "Αποτυχία σÏνδεσης"
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:364
msgid "Connection has been lost"
msgstr "Απώλεια σÏνδεσης"
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:366
msgid "This resource is already connected to the server"
msgstr "Αυτός ο πόÏος είναι ήδη συνδεδεμένος στον διακομιστή"
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:368
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "Η σÏνδεση αντικαταστάθηκε από νέα σÏνδεση με χÏήση του ίδιου πόÏου"
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:371
msgid "The account already exists on the server"
msgstr "Αυτός ο λογαÏιασμός υπάÏχει ήδη στο διακομιστή"
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:373
msgid "Server is currently too busy to handle the connection"
msgstr "Ο διακομιστής είναι Ï€Î¿Î»Ï Î±Ï€Î±ÏƒÏ‡Î¿Î»Î·Î¼Î­Î½Î¿Ï‚ για να χειÏισθεί τη σÏνδεση"
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:375
msgid "Certificate has been revoked"
msgstr "Το πιστοποιητικό έχει ανακληθεί"
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:377
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"Το πιστοποιητικό χÏησιμοποιεί ανασφαλές αλγόÏιθμο ή είναι κÏυπτογÏαφικά "
"αδÏναμο"
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:380
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -677,15 +677,16 @@ msgstr ""
"πιστοποιητικών, υπεÏβαίνει τα ÏŒÏια που τίθενται από τη βιβλιοθήκη "
"κÏυπτογÏάφησης"
-#: ../libempathy/empathy-utils.c:540
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Γειτονικά άτομα"
-#: ../libempathy/empathy-utils.c:545
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:546
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "Συζήτηση Facebook"
@@ -739,68 +740,88 @@ msgstr "στο μέλλον"
msgid "All"
msgstr "Όλα"
-#: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:606
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "ΛογαÏιασμός"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+msgid "Password"
+msgstr "Συνθηματικό:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "ΕξυπηÏετητής"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "ΘÏÏα"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1145
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "Όνομα χÏήστη: "
-#: ../libempathy-gtk/empathy-account-widget.c:1475
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "Ε_φαÏμογή"
-#: ../libempathy-gtk/empathy-account-widget.c:1505
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "_Είσοδος"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1571
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1397
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "ΛογαÏιασμός:"
-#: ../libempathy-gtk/empathy-account-widget.c:1582
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "_ΕνεÏγοποιημένο"
-#: ../libempathy-gtk/empathy-account-widget.c:1647
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Αυτός ο λογαÏιασμός υπάÏχει ήδη στον εξυπηÏετητή"
-#: ../libempathy-gtk/empathy-account-widget.c:1650
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "ΔημιουÏγία νέου λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÏ„Î¿Î½ εξυπηÏετητή"
-#: ../libempathy-gtk/empathy-account-widget.c:1743
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "Α_κÏÏωση"
#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
#. * 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:2028
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s στο %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:2054
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "ΛογαÏιασμός %s "
-#: ../libempathy-gtk/empathy-account-widget.c:2058
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Îέος λογαÏιασμός"
@@ -847,7 +868,7 @@ msgstr "Ποιο είναι το ψευδώνυμό σας στο AIM;"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_ΘÏÏα:"
@@ -856,7 +877,7 @@ msgstr "_ΘÏÏα:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_ΕξυπηÏετητής:"
@@ -1166,22 +1187,18 @@ msgid "I_gnore conference and chat room invitations"
msgstr "Α_γνόηση Ï€Ïοσκλήσεων σε δωμάτια συζήτησης ή διασκέψεις"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "ΧÏήση _Yahoo! Ιαπωνίας"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "Ποιο είναι το όνομα χÏήστη σας στο Yahoo!;"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Ποιο είναι το συνθηματικό σας στο Yahoo!;"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "Yahoo! I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "Τοπική λίστα _δωματίων:"
@@ -1215,51 +1232,51 @@ msgstr "Όλα τα αÏχεία"
msgid "Click to enlarge"
msgstr "Κλικ για μεγέθυνση"
-#: ../libempathy-gtk/empathy-chat.c:639
+#: ../libempathy-gtk/empathy-chat.c:642
msgid "Failed to open private chat"
msgstr "Αποτυχία ανοίγματος ιδιωτικής συζήτησης"
-#: ../libempathy-gtk/empathy-chat.c:679
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
msgstr "Η συζήτηση δεν υποστηÏίζει θέματα"
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
msgstr "Δεν έχετε δικαίωμα αλλαγής του θέματος"
-#: ../libempathy-gtk/empathy-chat.c:819
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: ΕκκαθάÏιση όλων των μηνυμάτων της Ï„Ïέχουσας συζήτησης"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <θέμα>: ΟÏισμός του θέματος της Ï„Ïέχουσας συζήτησης"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <όνομα δωματίου>: Είσοδος σε νέο δωμάτιο συζήτησης"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
msgstr "/ <όνομα δωματίου>: Είσοδος σε νέο δωμάτιο συζήτησης"
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <όνομα επαφής> [<μήνυμα>]: Άνοιγμα ιδιωτικής συζήτησης"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <όνομα επαφής> <μήνυμα>: Άνοιγμα ιδιωτικής συζήτησης"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <ψευδώνυμο>: Αλλαγή του ψευδωνÏμου σας στον Ï„Ïέχοντα εξυπηÏετητή"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <μήνυμα>: Αποστολή μηνÏματος ΕÎΕΡΓΕΙΑΣ στην Ï„Ïέχουσα συζήτηση"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:849
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 "
@@ -1269,7 +1286,7 @@ msgstr ""
"για την αποστολή μηνυμάτων που ξεκινοÏν από '/'. Π.χ.: \"/say /join - "
"χÏησιμοποιείται για είσοδο σε νέο δωμάτιο\""
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:854
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1277,85 +1294,85 @@ msgstr ""
"/help [<εντολή>]: Εμφάνιση όλων των υποστηÏιζόμενων εντολών. Αν έχει οÏιστεί "
"συγκεκÏιμένη <εντολή>, εμφάνιση του Ï„Ïόπου χÏήσης της."
-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:864
#, c-format
msgid "Usage: %s"
msgstr "ΧÏήση: %s"
-#: ../libempathy-gtk/empathy-chat.c:890
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "Άγνωστη εντολή"
-#: ../libempathy-gtk/empathy-chat.c:1011
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
msgstr ""
"Άγνωστη εντολή. ΠληκτÏολογήστε /help για να δείτε τις διαθέσιμες εντολές"
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "εκτός σÏνδεσης"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "μη έγκυÏη επαφή"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "δε δόθηκε άδεια"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "υπεÏβολικά μεγάλο μήνυμα"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "δεν υποστηÏίζεται"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "άγνωστο"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Σφάλμα κατά την αποστολή του μηνÏματος '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
msgid "Topic:"
msgstr "Θέμα:"
-#: ../libempathy-gtk/empathy-chat.c:1291
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "Το θέμα οÏίστηκε ως: %s"
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "Δεν έχει οÏιστεί θέμα"
-#: ../libempathy-gtk/empathy-chat.c:1772
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(Δεν υπάÏχουν υποδείξεις)"
-#: ../libempathy-gtk/empathy-chat.c:1826
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "Εισαγωγή χαμόγελου"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1844
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "Α_ποστολή"
-#: ../libempathy-gtk/empathy-chat.c:1878
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "_Υποδείξεις οÏθογÏαφίας"
-#: ../libempathy-gtk/empathy-chat.c:1955
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
msgstr "Αποτυχία ανάκτησης των Ï€Ïοσφάτων αÏχείων καταγÏαφής"
-#: ../libempathy-gtk/empathy-chat.c:2061
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "Ο/Η %s αποσυνδέθηκε"
@@ -1363,12 +1380,12 @@ msgstr "Ο/Η %s αποσυνδέθηκε"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2071
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "Ο/Η %2$s έδιωξε τον/την %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2074
#, c-format
msgid "%s was kicked"
msgstr "Ο/Η %s διώχτηκε"
@@ -1376,17 +1393,17 @@ msgstr "Ο/Η %s διώχτηκε"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2079
+#: ../libempathy-gtk/empathy-chat.c:2082
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "Ο/Η %2$s απαγόÏευσε την είσοδο στον/στην %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
msgstr "ΑπαγοÏεÏτηκε η είσοδος στον/στην %s"
-#: ../libempathy-gtk/empathy-chat.c:2086
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
msgstr "Ο/Η %s βγήκε από το δωμάτιο συζήτησης"
@@ -1396,46 +1413,46 @@ msgstr "Ο/Η %s βγήκε από το δωμάτιο συζήτησης"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2095
+#: ../libempathy-gtk/empathy-chat.c:2098
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2120
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
msgstr "Ο/Η %s μπήκε στο δωμάτιο συζήτησης"
-#: ../libempathy-gtk/empathy-chat.c:2145
+#: ../libempathy-gtk/empathy-chat.c:2148
#, c-format
msgid "%s is now known as %s"
msgstr "Ο/Η %s ονομάζεται πλέον %s"
-#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
msgid "Disconnected"
msgstr "Εκτός σÏνδεσης"
-#: ../libempathy-gtk/empathy-chat.c:2922
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "Λάθος συνθηματικό. ΠαÏακαλώ, Ï€Ïοσπαθήστε ξανά:"
-#: ../libempathy-gtk/empathy-chat.c:2923
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "ΠÏοσπάθεια ξανά"
-#: ../libempathy-gtk/empathy-chat.c:2928
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "Αυτό το δωμάτιο Ï€ÏοστατεÏεται με συνθηματικό:"
-#: ../libempathy-gtk/empathy-chat.c:2929
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
msgstr "Είσοδος"
-#: ../libempathy-gtk/empathy-chat.c:3069
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "Σε σÏνδεση"
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3134
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "Συζήτηση"
@@ -1458,17 +1475,17 @@ msgstr "Ά_νοιγμα συνδέσμου"
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "ΕπεξεÏγασία πληÏοφοÏιών επαφής"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
msgstr "ΠÏοσωπικές πληÏοφοÏίες"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
msgid "New Contact"
msgstr "Îέα επαφή"
@@ -1480,86 +1497,93 @@ msgstr "Θα αποφασίσω αÏ_γότεÏα"
msgid "Subscription Request"
msgstr "Αίτηση εγγÏαφής"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Μη ομαδοποιημένα"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Αγαπημένοι άνθÏωποι:"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2244
+#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "ΣίγουÏα θέλετε να διαγÏάψετε την ομάδα '%s';"
#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2247
+#: ../libempathy-gtk/empathy-individual-view.c:2235
msgid "Removing group"
msgstr "ΔιαγÏαφή ομάδας"
#. Remove
#: ../libempathy-gtk/empathy-contact-list-view.c:2055
#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2301
-#: ../libempathy-gtk/empathy-individual-view.c:2386
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_ΔιαγÏαφή"
#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2332
+#: ../libempathy-gtk/empathy-individual-view.c:2320
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "ΣίγουÏα θέλετε να διαγÏάψετε την επαφή '%s';"
#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2334
+#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
msgstr "ΔιαγÏαφή επαφής"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../libempathy-gtk/empathy-individual-menu.c:364
#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "ΠÏοσ_θήκη επαφής…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:489
+#: ../libempathy-gtk/empathy-individual-menu.c:514
#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "_Συζήτηση"
#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:530
+#: ../libempathy-gtk/empathy-individual-menu.c:557
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Φωνητική κλήση"
#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:572
+#: ../libempathy-gtk/empathy-individual-menu.c:599
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Βιντεοκλήση"
#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:630
+#: ../libempathy-gtk/empathy-individual-menu.c:642
#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "_ΠÏοηγοÏμενες συζητήσεις"
#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:671
+#: ../libempathy-gtk/empathy-individual-menu.c:683
msgid "Send File"
msgstr "Αποστολή αÏχείου"
#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:713
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Share My Desktop"
msgstr "Κοινή χÏήση της επιφάνειας εÏγασίας μου"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
-#: ../libempathy-gtk/empathy-individual-menu.c:747
-#: ../libempathy-gtk/empathy-individual-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1570
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
msgstr "Αγαπημένο"
#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:774
+#: ../libempathy-gtk/empathy-individual-menu.c:786
msgid "Infor_mation"
msgstr "ΠληÏοφο_Ïίες"
@@ -1569,13 +1593,13 @@ msgid "_Edit"
msgstr "_ΕπεξεÏγασία"
#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:967
+#: ../libempathy-gtk/empathy-individual-menu.c:970
#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "ΠÏόσκληση στο δωμάτιο"
#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1014
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
msgid "_Invite to Chat Room"
msgstr "_ΠÏόσκληση στο δωμάτιο συζήτησης"
@@ -1583,178 +1607,178 @@ msgstr "_ΠÏόσκληση στο δωμάτιο συζήτησης"
msgid "Select a contact"
msgstr "Επιλογή επαφής"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-contact-widget.c:226
#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Full name:"
msgstr "ΠλήÏες όνομα:"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-contact-widget.c:227
#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "Phone number:"
msgstr "ΑÏιθμός τηλεφώνου:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-contact-widget.c:228
#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "E-mail address:"
msgstr "Ηλ. διεÏθυνση:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-contact-widget.c:229
#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Website:"
msgstr "Ιστότοπος:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-contact-widget.c:230
#: ../libempathy-gtk/empathy-individual-widget.c:152
msgid "Birthday:"
msgstr "Γενέθλια:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Κωδικός ISO χώÏας:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "ΧώÏα:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Πολιτεία:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Πόλη:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "ΠεÏιοχή:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Ταχ. κώδικας:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Οδός:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "ΚτίÏιο:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "ÎŒÏοφος:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:627
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Δωμάτιο:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:629
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Κείμενο:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:631
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "ΠεÏιγÏαφή:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:633
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:635
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Επίπεδο ακÏίβειας:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:637
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Σφάλμα:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:639
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Κάθετο σφάλμα (σε μέτÏα):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:641
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "ΟÏιζόντιο σφάλμα (σε μέτÏα):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:643
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "ΤαχÏτητα:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:645
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "ΠÏοσανατολισμός:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:647
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "ΤαχÏτητα ανάβασης:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Τελευταία ενημέÏωση στις:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:651
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "ΓεωγÏ. μήκος:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "ΓεωγÏ. πλάτος:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:655
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "ΥψόμετÏο:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
-#: ../libempathy-gtk/empathy-individual-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:718
+#: ../libempathy-gtk/empathy-contact-widget.c:735
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Τοποθεσία"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
-#: ../libempathy-gtk/empathy-individual-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:737
+#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y στις %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
-#: ../libempathy-gtk/empathy-individual-widget.c:837
+#: ../libempathy-gtk/empathy-contact-widget.c:872
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Αποθήκευση Ï€Ïοσωπικής εικόνας"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
-#: ../libempathy-gtk/empathy-individual-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:928
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Αδυναμία αποθήκευσης Ï€Ïοσωπικής εικόνας"
@@ -1764,7 +1788,7 @@ msgstr "<b>Τοποθεσία</b> στις (ημεÏομηνία)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1223
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
msgstr "Ψευδώνυμο:"
@@ -1784,7 +1808,7 @@ msgstr "Στοιχεία επαφής"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1427
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
msgid "Identifier:"
msgstr "ΑναγνωÏιστικό:"
@@ -1827,25 +1851,20 @@ msgstr "Επιλογή"
msgid "Group"
msgstr "Ομάδα"
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:253
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_ΑποσÏνδεση"
-
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:143
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
msgid "Linked Contacts"
msgstr "Συνδεδεμένες επαφές"
-#: ../libempathy-gtk/empathy-individual-linker.c:353
+#: ../libempathy-gtk/empathy-individual-linker.c:354
msgid "Select contacts to link"
msgstr "Επιλογή επαφών για σÏνδεση"
-#: ../libempathy-gtk/empathy-individual-linker.c:426
+#: ../libempathy-gtk/empathy-individual-linker.c:428
msgid "New contact preview"
msgstr "ΠÏοεπισκόπηση νέας επαφής"
-#: ../libempathy-gtk/empathy-individual-linker.c:470
+#: ../libempathy-gtk/empathy-individual-linker.c:472
msgid "Contacts selected in the list on the left will be linked together."
msgstr ""
"Οι επαφές που επιλέχθηκαν στην αÏιστεÏή λίστα θα συνδεθοÏν Î¼ÎµÏ„Î±Î¾Ï Ï„Î¿Ï…Ï‚."
@@ -1853,24 +1872,24 @@ msgstr ""
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:112
+#: ../libempathy-gtk/empathy-individual-menu.c:132
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:825
+#: ../libempathy-gtk/empathy-individual-menu.c:837
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_ΕπεξεÏγασία"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:857
+#: ../libempathy-gtk/empathy-individual-menu.c:863
msgctxt "Link individual (contextual menu)"
-msgid "_Link…"
-msgstr "_ΣÏνδεση…"
+msgid "_Link Contacts…"
+msgstr "_ΣÏνδεση επαφών…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1565
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1893,14 +1912,6 @@ msgstr "Επιλέξτε ένα δίκτυο IRC"
msgid "new server"
msgstr "νέος εξυπηÏετητής"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "ΕξυπηÏετητής"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "ΘÏÏα"
-
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
@@ -1908,22 +1919,46 @@ msgstr "SSL"
#. Translators: this is the title of the linking dialogue (reached by
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:109
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
msgid "Link Contacts"
-msgstr "ΣÏνδεση επαφών"
+msgstr "Ένωση επαφών"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "Διά_σπαση επαφής…"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr ""
+"ΠλήÏης διάσπαση της εμφανιζόμενης μετά-επαφής στις επαφές που πεÏιέχει."
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
#. * used here as a verb meaning "to connect two contacts to form a
#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:122
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
msgid "_Link"
-msgstr "_ΣÏνδεση"
+msgstr "Έ_νωση"
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
-msgid "Account"
-msgstr "ΛογαÏιασμός"
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr "Διάσπαση μετα-επαφής «%s»;"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr ""
+"Θέλετε σίγουÏα να διασπάσετε τη μετα-επαφή; Η διαδικασία αυτή θα διασπάσει "
+"τη μετα-επαφή στις επαφές που πεÏιέχει."
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "_Διάσπαση"
#: ../libempathy-gtk/empathy-log-window.c:663
msgid "Date"
@@ -1935,10 +1970,12 @@ msgid "Conversations"
msgstr "Συζητήσεις"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "ΕÏÏεση επόμενου"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "ΕÏÏεση Ï€ÏοηγοÏμενου"
@@ -2022,15 +2059,15 @@ msgstr "ΟÏίστε την παÏουσία και την Ï„Ïέχουσα κα
msgid "Custom messages…"
msgstr "ΠÏοσαÏμοσμένα μηνÏματα…"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "ΕÏÏεση:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "ΔιάκÏιση πεζών/κεφαλαίων"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Δε βÏέθηκε η φÏάση"
@@ -2179,15 +2216,15 @@ msgstr "Απομνημόνευση αυτής της επιλογής για μÎ
msgid "Certificate Details"
msgstr "ΛεπτομέÏειες πιστοποιητικοÏ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "Αδυναμία ανοίγματος της διεÏθυνσης"
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "Επιλογή αÏχείου"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
#, c-format
msgid "Incoming file from %s"
msgstr "ΕισεÏχόμενο αÏχείο από %s"
@@ -2468,7 +2505,7 @@ msgstr ""
"λογαÏιασμοÏÏ‚ αÏγότεÏα, από το Î¼ÎµÎ½Î¿Ï Î•Ï€ÎµÎ¾ÎµÏγασία."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1310
+#: ../src/empathy-account-assistant.c:1315
msgid "An error occurred"
msgstr "ΠαÏουσιάστηκε σφάλμα"
@@ -2482,31 +2519,31 @@ msgstr "ΠαÏουσιάστηκε σφάλμα"
msgid "New %s account"
msgstr "Îέος λογαÏιασμός %s"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:514
msgid "What kind of chat account do you have?"
msgstr "Τι είδους λογαÏιασμό έχετε;"
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:520
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Θέλετε να Ïυθμίσετε και άλλους λογαÏιασμοÏÏ‚ σας;"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:526
msgid "Enter your account details"
msgstr "Εισάγετε τα στοιχεία του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ±Ï‚"
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:531
msgid "What kind of chat account do you want to create?"
msgstr "Τι είδους λογαÏιασμό θέλετε να δημιουÏγήσετε;"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:537
msgid "Do you want to create other chat accounts?"
msgstr "Θέλετε να δημιουÏγήσετε άλλους λογαÏιασμοÏÏ‚;"
-#: ../src/empathy-account-assistant.c:539
+#: ../src/empathy-account-assistant.c:544
msgid "Enter the details for the new account"
msgstr "Εισάγετε τα στοιχεία του νέου λογαÏιασμοÏ"
-#: ../src/empathy-account-assistant.c:654
+#: ../src/empathy-account-assistant.c:659
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 "
@@ -2518,42 +2555,42 @@ msgstr ""
"και πολλά άλλα Ï€ÏογÏάμματα Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï„Ïπου. Αν έχετε μικÏόφωνο ή κάμεÏα, "
"μποÏείτε επίσης να κάνετε φωνητικές κλήσεις ή βιντεοκλήσεις."
-#: ../src/empathy-account-assistant.c:671
+#: ../src/empathy-account-assistant.c:676
msgid "Do you have an account you've been using with another chat program?"
msgstr "Έχετε ήδη λογαÏιασμό που χÏησιμοποιοÏσατε με άλλο Ï€ÏόγÏαμμα μηνυμάτων;"
-#: ../src/empathy-account-assistant.c:694
+#: ../src/empathy-account-assistant.c:699
msgid "Yes, import my account details from "
msgstr "Îαι, να γίνει εισαγωγή των στοιχείων του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï Î¼Î¿Ï… από το "
-#: ../src/empathy-account-assistant.c:715
+#: ../src/empathy-account-assistant.c:720
msgid "Yes, I'll enter my account details now"
msgstr "Îαι, θα εισάγω τα στοιχεία του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï Î¼Î¿Ï…"
-#: ../src/empathy-account-assistant.c:737
+#: ../src/empathy-account-assistant.c:742
msgid "No, I want a new account"
msgstr "Όχι, θέλω να δημιουÏγήσω νέο λογαÏιασμό"
-#: ../src/empathy-account-assistant.c:747
+#: ../src/empathy-account-assistant.c:752
msgid "No, I just want to see people online nearby for now"
msgstr ""
"Όχι, αλλά Ï€Ïος το παÏόν θέλω μόνο να βλέπω τα συνδεδεμένα γειτονικά άτομα"
-#: ../src/empathy-account-assistant.c:768
+#: ../src/empathy-account-assistant.c:773
msgid "Select the accounts you want to import:"
msgstr "Επιλέξτε τους λογαÏιασμοÏÏ‚ που θέλετε να εισάγετε:"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:857
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Îαι"
-#: ../src/empathy-account-assistant.c:859
+#: ../src/empathy-account-assistant.c:864
msgid "No, that's all for now"
msgstr "Όχι, αυτά Ï€Ïος το παÏόν"
-#: ../src/empathy-account-assistant.c:1124
+#: ../src/empathy-account-assistant.c:1129
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 "
@@ -2566,16 +2603,16 @@ msgstr ""
"Φυσικά, μποÏείτε Ï€Î¿Î»Ï ÎµÏκολα να αλλάξετε τα στοιχεία ή να απενεÏγοποιήσετε "
"την υπηÏεσία από το διάλογο 'ΛογαÏιασμοί'."
-#: ../src/empathy-account-assistant.c:1130
-#: ../src/empathy-account-assistant.c:1186
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
msgid "Edit->Accounts"
msgstr "ΕπεξεÏγασία->ΛογαÏιασμοί"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1151
msgid "I don't want to enable this feature for now"
msgstr "ΠÏος το παÏόν δεν επιθυμώ να ενεÏγοποιήσω αυτή τη δυνατότητα"
-#: ../src/empathy-account-assistant.c:1182
+#: ../src/empathy-account-assistant.c:1187
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 "
@@ -2587,23 +2624,23 @@ msgstr ""
"αυτή τη δυνατότητα, παÏακαλώ εγκαταστήστε το πακέτο telepathy-salut και "
"δημιουÏγήστε λογαÏιασμό 'Γειτονικά άτομα' από το διάλογο ΛογαÏιασμοί"
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1193
msgid "telepathy-salut not installed"
msgstr "Δεν είναι εγκατεστημένο το telepathy-salut"
-#: ../src/empathy-account-assistant.c:1234
+#: ../src/empathy-account-assistant.c:1239
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Βοηθός λογαÏιασμών για άμεσα μηνÏματα και VoIP"
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1273
msgid "Welcome to Empathy"
msgstr "Καλώς ήλθατε στο Empathy"
-#: ../src/empathy-account-assistant.c:1277
+#: ../src/empathy-account-assistant.c:1282
msgid "Import your existing accounts"
msgstr "Εισαγωγή λογαÏιασμών"
-#: ../src/empathy-account-assistant.c:1295
+#: ../src/empathy-account-assistant.c:1300
msgid "Please enter personal details"
msgstr "ΠαÏακαλώ εισάγετε τα Ï€Ïοσωπικά σας στοιχεία"
@@ -2620,7 +2657,7 @@ msgstr "ΥπάÏχουν μη αποθηκευμένες αλλαγές στο Î
msgid "Your new account has not been saved yet."
msgstr "Ο νέος λογαÏιασμός δεν έχει αποθηκευτεί ακόμη."
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "Γίνεται σÏνδεση…"
@@ -2646,7 +2683,7 @@ msgstr "Άγνωστη κατάσταση"
msgid "Offline — Account Disabled"
msgstr "Εκτός σÏνδεσης — απενεÏγοποιημένος λογαÏιασμός"
-#: ../src/empathy-accounts-dialog.c:805
+#: ../src/empathy-accounts-dialog.c:810
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2654,16 +2691,16 @@ msgstr ""
"Αν δημιουÏγήσετε νέο λογαÏιασμό, θα αποÏÏιφθοÏν \n"
"οι αλλαγές σας. ΣίγουÏα θέλετε να συνεχίσετε;"
-#: ../src/empathy-accounts-dialog.c:1152
+#: ../src/empathy-accounts-dialog.c:1157
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Θέλετε να διαγÏάψετε το '%s' από τον υπολογιστή;"
-#: ../src/empathy-accounts-dialog.c:1156
+#: ../src/empathy-accounts-dialog.c:1161
msgid "This will not remove your account on the server."
msgstr "Ο λογαÏιασμός σας δε θα διαγÏαφεί από τον εξυπηÏετητή."
-#: ../src/empathy-accounts-dialog.c:1394
+#: ../src/empathy-accounts-dialog.c:1399
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2671,7 +2708,7 @@ msgstr ""
"Αν επιλέξετε άλλο λογαÏιασμό, θα αποÏÏιφθοÏν \n"
"οι αλλαγές σας. ΣίγουÏα θέλετε να συνεχίσετε;"
-#: ../src/empathy-accounts-dialog.c:1997
+#: ../src/empathy-accounts-dialog.c:2002
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2743,70 +2780,70 @@ msgstr "Γάμμα"
msgid "Volume"
msgstr "Ένταση ήχου"
-#: ../src/empathy-call-window.c:1163
+#: ../src/empathy-call-window.c:1175
msgid "_Sidebar"
msgstr "_ΠλευÏική στήλη"
-#: ../src/empathy-call-window.c:1182
+#: ../src/empathy-call-window.c:1194
msgid "Audio input"
msgstr "Είσοδος ήχου"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1198
msgid "Video input"
msgstr "Είσοδος βίντεο"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1202
msgid "Dialpad"
msgstr "ΚαντÏάν τηλ/νου"
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1207
msgid "Details"
msgstr "ΛεπτομέÏειες"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1263
+#: ../src/empathy-call-window.c:1275
#, c-format
msgid "Call with %s"
msgstr "Κλήση: %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1342
+#: ../src/empathy-call-window.c:1354
msgid "Call"
msgstr "Κλήση"
-#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-call-window.c:1508
msgid "The IP address as seen by the machine"
msgstr "Η διεÏθυνση IP όπως τη βλέπει το μηχάνημα"
-#: ../src/empathy-call-window.c:1498
+#: ../src/empathy-call-window.c:1510
msgid "The IP address as seen by a server on the Internet"
msgstr "Η διεÏθυνση IP όπως τη βλέπει ένας διακομιστής στο διαδίκτυο"
-#: ../src/empathy-call-window.c:1500
+#: ../src/empathy-call-window.c:1512
msgid "The IP address of the peer as seen by the other side"
msgstr "Η διεÏθυνση IP της ομότιμης σÏνδεσης όπως τη βλέπει η άλλη πλευÏά"
-#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1514
msgid "The IP address of a relay server"
msgstr "Η διεÏθυνση IP ενός διακομιστή συζητήσεων"
-#: ../src/empathy-call-window.c:1504
+#: ../src/empathy-call-window.c:1516
msgid "The IP address of the multicast group"
msgstr "Η διεÏθυνση IP μιας ομάδας πολλαπλής αναμετάδοσης (multicast)"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2263
#, c-format
msgid "Connected — %d:%02dm"
msgstr "ΔιάÏκεια -- %d:%02dλ."
-#: ../src/empathy-call-window.c:2298
+#: ../src/empathy-call-window.c:2324
msgid "Technical Details"
msgstr "Τεχνικές λεπτομέÏειες"
-#: ../src/empathy-call-window.c:2336
+#: ../src/empathy-call-window.c:2362
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2815,7 +2852,7 @@ msgstr ""
"Το λογισμικό του %s δεν υποστηÏίζει καμία από τις μοÏφές ήχου που "
"υποστηÏίζει ο υπολογιστής σας"
-#: ../src/empathy-call-window.c:2341
+#: ../src/empathy-call-window.c:2367
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2824,7 +2861,7 @@ msgstr ""
"Το λογισμικό του %s δεν υποστηÏίζει καμία από τις μοÏφές βίντεο που "
"υποστηÏίζει ο υπολογιστής σας"
-#: ../src/empathy-call-window.c:2347
+#: ../src/empathy-call-window.c:2373
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2833,25 +2870,25 @@ msgstr ""
"Αδυναμία σÏνδεσης με %s. Ένας από εσάς μποÏεί να χÏησιμοποιεί δίκτυο που δεν "
"επιτÏέπει άμεσες συνδέσεις."
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2379
msgid "There was a failure on the network"
msgstr "ΠαÏουσιάστηκε κώλυμα στο δίκτυο"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2383
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Δεν είναι εγκατεστημένη η υποστήÏιξη για τις μοÏφές ήχου που απαιτεί αυτή η "
"κλήση"
-#: ../src/empathy-call-window.c:2360
+#: ../src/empathy-call-window.c:2386
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Δεν είναι εγκατεστημένη η υποστήÏιξη για τις μοÏφές βίντεο που απαιτεί αυτή "
"η κλήση"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2396
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2862,19 +2899,19 @@ msgstr ""
"ΠαÏακαλώ, κάνετε <a href=\"%s\">αναφοÏά του σφάλματος</a>, επισυνάπτοντας "
"τις καταγÏαφές από το παÏάθυÏο 'Αποσφαλμάτωση' του Î¼ÎµÎ½Î¿Ï Î’Î¿Î®Î¸ÎµÎ¹Î±."
-#: ../src/empathy-call-window.c:2378
+#: ../src/empathy-call-window.c:2404
msgid "There was a failure in the call engine"
msgstr "Αποτυχία του Î¼Î·Ï‡Î±Î½Î¹ÏƒÎ¼Î¿Ï ÎºÎ»Î®ÏƒÎ·Ï‚"
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-call-window.c:2407
msgid "The end of the stream was reached"
msgstr "Έχει φθάσει στο τέλος της Ïοής"
-#: ../src/empathy-call-window.c:2421
+#: ../src/empathy-call-window.c:2447
msgid "Can't establish audio stream"
msgstr "Αδυναμία δημιουÏγίας Ïοής ήχου"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2457
msgid "Can't establish video stream"
msgstr "Αδυναμία δημιουÏγίας Ïοής βίντεο"
@@ -3824,6 +3861,13 @@ msgstr "ΛογαÏιασμοί Empathy"
msgid "Empathy Debugger"
msgstr "Αποσφαλματωτής Empathy"
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "ΧÏήση _Yahoo! Ιαπωνίας"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link…"
+#~ msgstr "_ΣÏνδεση…"
+
#~ msgid "_Character set:"
#~ msgstr "_Κωδικοποίηση χαÏακτήÏων:"
diff --git a/po/en_GB.po b/po/en_GB.po
index 7d86c9534..37df61300 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 17:34+0100\n"
-"PO-Revision-Date: 2010-09-11 17:39+0100\n"
+"POT-Creation-Date: 2010-09-22 19:36+0100\n"
+"PO-Revision-Date: 2010-09-22 19:37+0100\n"
"Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
"Language-Team: British English <en@li.org>\n"
"Language: en_GB\n"
@@ -646,6 +646,7 @@ msgstr ""
"chain, exceed the limits imposed by the cryptography library"
#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "People Nearby"
@@ -737,16 +738,16 @@ msgstr "%s:"
msgid "Username:"
msgstr "Username:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "A_pply"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "L_og in"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -755,19 +756,19 @@ msgstr "L_og in"
msgid "Account:"
msgstr "Account:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "_Enabled"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "This account already exists on the server"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Create a new account on the server"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "Ca_ncel"
@@ -776,19 +777,19 @@ msgstr "Ca_ncel"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s on %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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "%s Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "New account"
@@ -835,7 +836,7 @@ msgstr "What is your AIM screen name?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Port:"
@@ -844,7 +845,7 @@ msgstr "_Port:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Server:"
@@ -1152,22 +1153,18 @@ msgid "I_gnore conference and chat room invitations"
msgstr "I_gnore conference and chat room invitations"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Use _Yahoo! Japan"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "What is your Yahoo! ID?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "What is your Yahoo! password?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "Yahoo! I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "_Room List locale:"
@@ -1464,6 +1461,14 @@ msgstr "Decide _Later"
msgid "Subscription Request"
msgstr "Subscription Request"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Ungrouped"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Favourite People"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1535,7 +1540,7 @@ msgid "Share My Desktop"
msgstr "Share My Desktop"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1591,128 +1596,128 @@ msgstr "Website:"
msgid "Birthday:"
msgstr "Birthday:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Country ISO Code:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Country:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "County:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "City:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Area:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Postal Code:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Street:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Building:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Floor:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Room:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Description:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Accuracy Level:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Error:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Vertical Error (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Horizontal Error (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Speed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Bearing:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Climb Speed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Last Updated on:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Longitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Latitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Altitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1720,23 +1725,23 @@ msgid "Location"
msgstr "Location"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B, %Y at %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Save Avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Unable to save avatar"
@@ -3800,6 +3805,9 @@ msgstr "Empathy Accounts"
msgid "Empathy Debugger"
msgstr "Empathy Debugger"
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "Use _Yahoo! Japan"
+
#~ msgctxt "Link individual (contextual menu)"
#~ msgid "_Link…"
#~ msgstr "_Link…"
diff --git a/po/es.po b/po/es.po
index 562d51a71..2bca80a95 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,4 +1,4 @@
-# translation of empathy.HEAD.po to Español
+# translation of empathy.master.po to Español
# 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.
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: empathy.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-09-06 10:08+0000\n"
-"PO-Revision-Date: 2010-09-06 21:00+0200\n"
+"POT-Creation-Date: 2010-10-01 10:11+0000\n"
+"PO-Revision-Date: 2010-10-01 12:22+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"
@@ -114,230 +114,220 @@ msgid "Empathy default download folder"
msgstr "Carpeta de descargas predeterminada de Epiphany"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy le ha preguntado acerca de importar cuentas"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy ha migrado los registros de butterfly"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy should auto-away when idle"
msgstr "Empathy debería mostrar ausencia en inactividad"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy should auto-connect on startup"
msgstr "Empathy se debería autoconectar al inicio"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy debería reducir la precisión de la ubicación"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
"Empathy debería usar el avatar del contacto como icono de la ventana de chat"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
msgstr "Activar las herramientas de desarrollo de WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable popup notifications for new messages"
msgstr "Activar notificaciones emergentes para mensajes nuevos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable spell checker"
msgstr "Activar revisor ortográfico"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Hide main window"
msgstr "Ocultar la ventana principal"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide the main window."
msgstr "Ocultar la ventana principal."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Nick completed character"
msgstr "Carácter de completado de apodo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Open new chats in separate windows"
msgstr "Abrir chats nuevos en ventanas separadas"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Path of the Adium theme to use"
msgstr "Ruta del tema Adium que usar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "Ruta al tema Adium que usar si el tema usado para el chat es Adium."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Play a sound for incoming messages"
msgstr "Reproducir un sonido cuando lleguen mensajes"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for new conversations"
msgstr "Reproducir un sonido para conversaciones nuevas"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for outgoing messages"
msgstr "Reproducir un sonido al enviar mensajes"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound when a contact logs in"
msgstr "Reproducir un sonido cuando un contacto inicie sesión"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs out"
msgstr "Reproducir un sonido cuando un contacto finalice su sesión"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when we log in"
msgstr "Reproducir un sonido cuando inicio sesión"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log out"
msgstr "Reproducir un sonido al finalizar una sesión"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Pop up notifications if the chat isn't focused"
msgstr ""
"Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications when a contact logs in"
msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs out"
msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Show avatars"
msgstr "Mostrar avatares"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show contact list in rooms"
msgstr "Mostrar lista de contactos en salas"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show hint about closing the main window"
msgstr "Mostrar consejo sobre cómo cerrar la ventana principal"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show offline contacts"
msgstr "Mostrar contactos no conectados"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show protocols"
msgstr "Mostrar protocolos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Spell checking languages"
msgstr "Idiomas para revisión ortográfica"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "The default folder to save file transfers in."
msgstr "La carpeta predeterminada donde guardar los archivos transferidos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The last directory that an avatar image was chosen from."
msgstr "Último directorio del que fue elegido un avatar."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The position for the chat window side pane"
msgstr "La posición para el panel lateral de la ventana de charla"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "The stored position (in pixels) of the chat window side pane."
msgstr ""
"La posición almacenada (en píxeles) del panel lateral de la ventana de "
"charla."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The theme that is used to display the conversation in chat windows."
msgstr ""
"El tema que se usará para mostrar la conversación en las ventanas de chat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Use graphical smileys"
msgstr "Usar emoticonos gráficos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use notification sounds"
msgstr "Usar sonidos de notificación"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use theme for chat rooms"
msgstr "Usar tema para salas de chat"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
"Indica si Empathy puede publicar la ubicación del usuario a sus contactos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Indica si Empathy puede usar la red telefónica móvil para deducir la "
"ubicación."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the network to guess the location."
msgstr "Indica si Empathy puede usar la red para deducir la ubicación."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr ""
-"Indica si Empathy ha preguntado acerca de importar cuentas de otros "
-"programas."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Indica si Empathy ha migrado los registros de butterfly."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr ""
"Indica si Empathy debe iniciar sesión en sus cuentas automáticamente al "
"inicio."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
"Indica si Empathy debe entrar en modo de ausencia automáticamente si el "
"usuario está inactivo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Indica si Empathy debería reducir la precisión de la ubicación por motivos "
"de privacidad."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Indica si Empathy debería usar el avatar del contacto como el icono de la "
"ventana de chat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Indica si las herramientas de desarrollo de WebKit, tales como el Inspector "
"web, den activarse."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -345,78 +335,78 @@ msgstr ""
"Indica si se debe usan usar gestores de conectividad para desconectarse/"
"reconectarse automáticamente."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
"Indica si se deben revisar las palabras tecleadas con respecto a los idiomas "
"con los que quiere comprobarlo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
"Indica si se deben convertir los emoticonos en imágenes gráficas en las "
"conversaciones."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Indica si se debe reproducir un sonido para notificar los inicios de sesión "
"de los contactos en la red."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Indica si se debe reproducir un sonido para notificar las finalizaciones de "
"sesión de los contactos en la red."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of events."
msgstr "Indica si se debe reproducir un sonido para notificar eventos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to play a sound to notify of incoming messages."
msgstr ""
"Indica si se debe reproducir un sonido para notificar mensajes entrantes."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of new conversations."
msgstr ""
"Indica si se debe reproducir un sonido para notificar conversaciones nuevas."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of outgoing messages."
msgstr ""
"Indica si se debe reproducir un sonido para notificar mensajes salientes."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound when logging into a network."
msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound when logging out of a network."
msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play sound notifications when away or busy."
msgstr ""
"Indica si se deben reproducir sonidos de notificaciones cuando se esté "
"ausente u ocupado."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
"se desconecta."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
"se conecta."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.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."
@@ -424,46 +414,46 @@ msgstr ""
"Indica si de deben mostrar notificaciones emergentes al recibir un mensaje "
"nuevo incluso si la ventana de chat ya está abierta pero no tiene el foco."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Indica si se deben mostrar notificaciones emergentes al recibir un mensaje "
"nuevo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Indica si se deben mostrar los avatares para los contactos en la lista de "
"contactos y ventanas de chat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
"Indica si se debe mostrar los contactos que están desconectados en la lista "
"de contactos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Indica si se deben mostrar las notificaciones emergentes cuando se esté "
"ausente u ocupado."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show protocols for contacts in the contact list."
msgstr ""
"Indica si se deben mostrar los protocolos para los contactos en la lista de "
"contactos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show the contact list in chat rooms."
msgstr "Indica si se debe mostrar la lista de contactos en salas de chat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show the contact list in compact mode."
msgstr "Indica si se debe mostrar la lista de contactos en modo compacto."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -471,11 +461,11 @@ msgstr ""
"Indica si se debe mostrar un mensaje de diálogo sobre cómo cerrar la ventana "
"principal con el botón «x» en la barra de título."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to use the theme for chat rooms."
msgstr "Indica si se debe usar el tema para salas de chat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.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 "
@@ -491,7 +481,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:2151
+#: ../src/empathy-accounts-dialog.c:2105
msgid "Messaging and VoIP Accounts"
msgstr "Cuentas de mensajería y Voz IP"
@@ -539,143 +529,143 @@ msgstr "Error la intentar transferir el archivo"
msgid "The other participant is unable to transfer the file"
msgstr "El otro participante no puede transferir el archivo"
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "Razón desconocida"
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Disponible"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Ocupado"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Ausente"
-#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Invisible"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Desconectado"
-#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883
-#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885
-#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
+#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
+#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Desconocido"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "No se especificó ninguna razón"
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "El estado se ha establecido a desconectado"
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Error de red"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "Falló la autenticación"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Error de cifrado"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "Nombre en uso"
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "No se proporcionó el certificado"
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "Certificado sin confianza"
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "El certificado ha expirado"
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "El certificado no está activado"
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "El nombre del equipo del certificado no coincide"
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "La huella del certificado no coincide"
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "Certificado firmado consigo mismo"
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Error del certificado"
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:356
msgid "Encryption is not available"
msgstr "El cifrado no está disponible"
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:358
msgid "Certificate is invalid"
msgstr "El certificado no es válido"
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:360
msgid "Connection has been refused"
msgstr "Se rechazó la conexión"
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:362
msgid "Connection can't be established"
msgstr "No se pudo establecer la conexión"
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:364
msgid "Connection has been lost"
msgstr "Se perdió la conexión"
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:366
msgid "This resource is already connected to the server"
msgstr "El recurso ya está conectado al servidor"
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:368
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr ""
"Se ha reemplazado la conexión por una conexión nueva usando el mismo recurso"
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:371
msgid "The account already exists on the server"
msgstr "La cuenta ya existe en el servidor"
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:373
msgid "Server is currently too busy to handle the connection"
msgstr ""
"Actualmente el servidor está demasiado ocupado para gestionar la conexión"
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:375
msgid "Certificate has been revoked"
msgstr "Se revocó el certificado"
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:377
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"El certificado usa un algoritmo de cifrado inseguro o es criptográficamente "
"débil"
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:380
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -684,15 +674,20 @@ msgstr ""
"servidor de certificados exceden los límites impuestos por la biblioteca "
"cripotográfica"
-#: ../libempathy/empathy-utils.c:540
+#: ../libempathy/empathy-utils.c:543
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Gente cerca"
-#: ../libempathy/empathy-utils.c:545
+#: ../libempathy/empathy-utils.c:548
msgid "Yahoo! Japan"
msgstr "Yahoo Japón"
-#: ../libempathy/empathy-utils.c:546
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
msgstr "Chat de Facebook"
@@ -776,16 +771,16 @@ msgstr "%s:"
msgid "Username:"
msgstr "Nombre de usuario:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
-msgstr "_Aplilcar"
+msgstr "_Aplicar"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "Iniciar _sesión"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -794,19 +789,19 @@ msgstr "Iniciar _sesión"
msgid "Account:"
msgstr "Cuenta:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "_Activada"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Esta cuenta ya existe en el servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Crear una cuenta nueva en el servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "Ca_ncelar"
@@ -815,19 +810,19 @@ msgstr "Ca_ncelar"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s en %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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "Cuenta %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Cuenta nueva"
@@ -874,7 +869,7 @@ msgstr "¿Cuál es su nombre en pantalla para AIM?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Puerto:"
@@ -883,7 +878,7 @@ msgstr "_Puerto:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Servidor:"
@@ -1191,22 +1186,18 @@ msgid "I_gnore conference and chat room invitations"
msgstr "_Ignorar invitaciones a conferencias y salas de chat"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Usar _Yahoo! Japan"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "¿Cuál es su ID de Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "¿Cuál es su contraseña de Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "I_D de Yahoo!:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "Configuración de la lista de _salas:"
@@ -1343,7 +1334,7 @@ msgstr "desconocido"
msgid "Error sending message '%s': %s"
msgstr "Error al enviar el mensaje «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
msgid "Topic:"
msgstr "Tema:"
@@ -1366,7 +1357,7 @@ msgstr "Insertar emoticono"
#. send button
#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "E_nviar"
@@ -1434,7 +1425,7 @@ msgstr "%s ha entrado en la sala"
msgid "%s is now known as %s"
msgstr "Ahora %s se llama %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
msgid "Disconnected"
msgstr "Desconectado"
@@ -1481,17 +1472,17 @@ msgstr "_Abrir enlace"
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Editar información del contacto"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
msgstr "Información personal"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
msgid "New Contact"
msgstr "Contacto nuevo"
@@ -1503,6 +1494,14 @@ msgstr "Decidir _luego"
msgid "Subscription Request"
msgstr "Petición de suscripción"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Sin grupo"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Gente favorita"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1574,7 +1573,7 @@ msgid "Share My Desktop"
msgstr "Compartir mi escritorio"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1570
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1592,7 +1591,7 @@ msgstr "_Editar"
#: ../libempathy-gtk/empathy-contact-menu.c:544
#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../src/empathy-chat-window.c:917
msgid "Inviting you to this room"
msgstr "Invitándolo a esta sala"
@@ -1605,153 +1604,153 @@ msgstr "_Invitar a sala de chat"
msgid "Select a contact"
msgstr "Seleccionar un contacto"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-contact-widget.c:226
#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Full name:"
msgstr "Nombre completo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-contact-widget.c:227
#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "Phone number:"
msgstr "Número de teléfono:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-contact-widget.c:228
#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "E-mail address:"
msgstr "Dirección de correo-e:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-contact-widget.c:229
#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Website:"
msgstr "Página web:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-contact-widget.c:230
#: ../libempathy-gtk/empathy-individual-widget.c:152
msgid "Birthday:"
msgstr "Cumpleaños:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:609
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Código ISO de país:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:611
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "País:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:613
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Estado:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:615
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Ciudad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:617
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Ãrea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:619
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Código postal:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:621
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Calle:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:623
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Edificio:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:625
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Planta:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:627
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Habitación:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:629
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Texto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:631
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Descripción:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:633
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:635
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Nivel de precisión:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:637
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Error:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:639
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Error vertical (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:641
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Error horizontal (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:643
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Velocidad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:645
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Retardo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:647
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Velocidad de ascenso:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:649
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Actualizado por última vez:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:651
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Longitud_"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:653
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Latitud:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:655
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Altitud:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:718
+#: ../libempathy-gtk/empathy-contact-widget.c:735
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1759,23 +1758,23 @@ msgid "Location"
msgstr "Ubicación geográfica"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:737
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:789
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%e de %B de %Y a las %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:872
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Guardar avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:928
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "No se pudo guardar el avatar"
@@ -1839,18 +1838,19 @@ msgstr ""
msgid "_Add Group"
msgstr "_Añadir grupo"
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+#| msgid "Select"
+msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "Seleccionar"
-#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../libempathy-gtk/empathy-groups-widget.c:408
#: ../src/empathy-main-window.c:1247
msgid "Group"
msgstr "Grupo"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
msgid "Linked Contacts"
msgstr "Contactos enlazados"
@@ -1884,7 +1884,6 @@ msgstr "_Editar"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
#: ../libempathy-gtk/empathy-individual-menu.c:863
-#| msgid "Link Contacts"
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Enlazar contactos…"
@@ -1908,6 +1907,12 @@ msgstr "Red nueva"
msgid "Choose an IRC network"
msgstr "Elegir una red IRC"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+#| msgid "Select"
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Seleccionar"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "servidor nuevo"
@@ -1924,8 +1929,6 @@ msgid "Link Contacts"
msgstr "Enlazar contactos"
#: ../libempathy-gtk/empathy-linking-dialog.c:120
-#| msgctxt "Unlink individual (button)"
-#| msgid "_Unlink"
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "_Desenlazar…"
@@ -1973,10 +1976,12 @@ msgid "Conversations"
msgstr "Conversaciones"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "Buscar siguiente"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "Buscar anterior"
@@ -2060,15 +2065,24 @@ msgstr "Establecer su presencia y estado actual"
msgid "Custom messages…"
msgstr "Mensajes personalizados…"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "Cuenta de %s nueva"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Buscar:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Coincidir con capitalización"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "No se encontró la frase"
@@ -2217,15 +2231,15 @@ msgstr "Recordar esta opción para futuras conexiones"
msgid "Certificate Details"
msgstr "Detalles del certificado"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "No se pudo abrir el URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "Seleccionar un archivo"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
#, c-format
msgid "Incoming file from %s"
msgstr "Archivo entrante de %s"
@@ -2498,45 +2512,35 @@ msgstr ""
"Editar."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1310
+#: ../src/empathy-account-assistant.c:1268
msgid "An error occurred"
msgstr "Ocurrió un error"
-#. To translator: %s is the protocol name
-#. Create account
-#. 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:614
-#, c-format
-msgid "New %s account"
-msgstr "Cuenta de %s nueva"
-
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
msgstr "¿Qué tipo de cuenta tiene?"
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:473
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:521
+#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
msgstr "Introducir los detalles de su cuenta"
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:484
msgid "What kind of chat account do you want to create?"
msgstr "¿Qué tipo de cuenta quiere crear?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
msgstr "¿Quiere crear otras cuentas de chat?"
-#: ../src/empathy-account-assistant.c:539
+#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
msgstr "Introducir los detalles para la cuenta nueva"
-#: ../src/empathy-account-assistant.c:654
+#: ../src/empathy-account-assistant.c:612
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 "
@@ -2547,41 +2551,41 @@ msgstr ""
"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 voz o vídeo."
-#: ../src/empathy-account-assistant.c:671
+#: ../src/empathy-account-assistant.c:629
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:694
+#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
msgstr "Sí, importar los detalles de mi cuenta desde "
-#: ../src/empathy-account-assistant.c:715
+#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
msgstr "Sí, introduciré ahora los detalles de mi cuenta"
-#: ../src/empathy-account-assistant.c:737
+#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
msgstr "No, quiero crear una cuenta nueva"
-#: ../src/empathy-account-assistant.c:747
+#: ../src/empathy-account-assistant.c:705
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:768
+#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
msgstr "Seleccione las cuentas que quiere importar:"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:810
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Sí"
-#: ../src/empathy-account-assistant.c:859
+#: ../src/empathy-account-assistant.c:817
msgid "No, that's all for now"
msgstr "No, eso es todo por ahora"
-#: ../src/empathy-account-assistant.c:1124
+#: ../src/empathy-account-assistant.c:1082
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 "
@@ -2594,16 +2598,16 @@ msgstr ""
"estos detalles posteriormente o desactivar esta característica usando el "
"diálogo «Cuentas»."
-#: ../src/empathy-account-assistant.c:1130
-#: ../src/empathy-account-assistant.c:1186
+#: ../src/empathy-account-assistant.c:1088
+#: ../src/empathy-account-assistant.c:1144
msgid "Edit->Accounts"
msgstr "Editar->Cuentas"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1104
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:1182
+#: ../src/empathy-account-assistant.c:1140
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 "
@@ -2615,66 +2619,66 @@ msgstr ""
"instale el paquete telepathy-salut y cree una cuenta de Gente cerca desde el "
"diálogo Cuentas."
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1146
msgid "telepathy-salut not installed"
msgstr "telepathy-salut no está instalado"
-#: ../src/empathy-account-assistant.c:1234
+#: ../src/empathy-account-assistant.c:1192
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Asistente de cuentas de mensajería y Voz IP"
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1226
msgid "Welcome to Empathy"
msgstr "Bienvenido a Empathy"
-#: ../src/empathy-account-assistant.c:1277
+#: ../src/empathy-account-assistant.c:1235
msgid "Import your existing accounts"
msgstr "Importar sus cuentas existentes"
-#: ../src/empathy-account-assistant.c:1295
+#: ../src/empathy-account-assistant.c:1253
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:65
+#: ../src/empathy-accounts-dialog.c:64
#, 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:69
+#: ../src/empathy-accounts-dialog.c:68
msgid "Your new account has not been saved yet."
msgstr "Aún no se ha guardado su cuenta nueva."
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "Conectando…"
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:321
#, c-format
msgid "Offline — %s"
msgstr "Desconectado: %s"
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:333
#, c-format
msgid "Disconnected — %s"
msgstr "Desconectado: %s"
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:344
msgid "Offline — No Network Connection"
msgstr "Desconectado: sin conexión de red"
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:351
msgid "Unknown Status"
msgstr "Estado desconocido"
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:363
msgid "Offline — Account Disabled"
msgstr "Desconectado: cuenta desactivada"
-#: ../src/empathy-accounts-dialog.c:805
+#: ../src/empathy-accounts-dialog.c:759
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2682,16 +2686,16 @@ msgstr ""
"Va a crear una cuenta nueva que descartará sus cambios.\n"
"¿Seguro que quiere continuar?"
-#: ../src/empathy-accounts-dialog.c:1152
+#: ../src/empathy-accounts-dialog.c:1106
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "¿Quiere quitar %s de su equipo?"
-#: ../src/empathy-accounts-dialog.c:1156
+#: ../src/empathy-accounts-dialog.c:1110
msgid "This will not remove your account on the server."
msgstr "Esto no quitará su cuenta del servidor."
-#: ../src/empathy-accounts-dialog.c:1394
+#: ../src/empathy-accounts-dialog.c:1348
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2699,7 +2703,7 @@ msgstr ""
"Va a seleccionar otra cuenta lo que descartará sus cambios.\n"
"¿Seguro que quiere continuar?"
-#: ../src/empathy-accounts-dialog.c:1997
+#: ../src/empathy-accounts-dialog.c:1951
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2771,70 +2775,70 @@ msgstr "Gamma"
msgid "Volume"
msgstr "Volumen"
-#: ../src/empathy-call-window.c:1163
+#: ../src/empathy-call-window.c:1175
msgid "_Sidebar"
msgstr "Barra _lateral"
-#: ../src/empathy-call-window.c:1182
+#: ../src/empathy-call-window.c:1194
msgid "Audio input"
msgstr "Entrada de voz"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1198
msgid "Video input"
msgstr "Entrada de vídeo"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1202
msgid "Dialpad"
msgstr "Teclado de llamada"
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1207
msgid "Details"
msgstr "Detalles"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1263
+#: ../src/empathy-call-window.c:1275
#, 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:1342
+#: ../src/empathy-call-window.c:1354
msgid "Call"
msgstr "Llamar"
-#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-call-window.c:1508
msgid "The IP address as seen by the machine"
msgstr "La dirección IP como la ve la máquina"
-#: ../src/empathy-call-window.c:1498
+#: ../src/empathy-call-window.c:1510
msgid "The IP address as seen by a server on the Internet"
msgstr "La dirección IP como la ve el servidor de Internet"
-#: ../src/empathy-call-window.c:1500
+#: ../src/empathy-call-window.c:1512
msgid "The IP address of the peer as seen by the other side"
msgstr "La dirección IP del par como la ve la otra parte"
-#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1514
msgid "The IP address of a relay server"
msgstr "La dirección IP de un servidor de desvío"
-#: ../src/empathy-call-window.c:1504
+#: ../src/empathy-call-window.c:1516
msgid "The IP address of the multicast group"
msgstr "La dirección IP del grupo multicast"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2263
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Conectado — %d:%02dm"
-#: ../src/empathy-call-window.c:2298
+#: ../src/empathy-call-window.c:2324
msgid "Technical Details"
msgstr "Detalles técnicos"
-#: ../src/empathy-call-window.c:2336
+#: ../src/empathy-call-window.c:2362
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2843,7 +2847,7 @@ msgstr ""
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-call-window.c:2341
+#: ../src/empathy-call-window.c:2367
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2852,7 +2856,7 @@ msgstr ""
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-call-window.c:2347
+#: ../src/empathy-call-window.c:2373
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2861,25 +2865,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:2353
+#: ../src/empathy-call-window.c:2379
msgid "There was a failure on the network"
msgstr "Hubo un fallo en la red"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2383
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:2360
+#: ../src/empathy-call-window.c:2386
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:2370
+#: ../src/empathy-call-window.c:2396
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2890,19 +2894,19 @@ 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:2378
+#: ../src/empathy-call-window.c:2404
msgid "There was a failure in the call engine"
msgstr "Hubo un fallo en el motor de llamadas"
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-call-window.c:2407
msgid "The end of the stream was reached"
msgstr "Se llegó al final del flujo"
-#: ../src/empathy-call-window.c:2421
+#: ../src/empathy-call-window.c:2447
msgid "Can't establish audio stream"
msgstr "No se puede establecer el flujo de voz"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2457
msgid "Can't establish video stream"
msgstr "No se puede establecer el flujo de vídeo"
@@ -3002,35 +3006,35 @@ msgstr "_Llamar"
msgid "_View"
msgstr "_Ver"
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
#, 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:464
+#: ../src/empathy-chat-window.c:478
#, 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:480
+#: ../src/empathy-chat-window.c:494
#, 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:489
+#: ../src/empathy-chat-window.c:503
#, 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:695
+#: ../src/empathy-chat-window.c:709
msgid "Typing a message."
msgstr "Tecleando un mensaje."
@@ -3851,6 +3855,18 @@ msgstr "Cuentas en Empathy"
msgid "Empathy Debugger"
msgstr "Depurador de Empathy"
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy le ha preguntado acerca de importar cuentas"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr ""
+#~ "Indica si Empathy ha preguntado acerca de importar cuentas de otros "
+#~ "programas."
+
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "Usar _Yahoo! Japan"
+
#~ msgctxt "Link individual (contextual menu)"
#~ msgid "_Link…"
#~ msgstr "_Enlazar…"
diff --git a/po/et.po b/po/et.po
index b7214caf7..32ed27465 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,10 +11,11 @@ msgstr ""
"Project-Id-Version: empathy MASTER\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-09-07 19:35+0000\n"
-"PO-Revision-Date: 2010-09-08 15:27+0300\n"
+"POT-Creation-Date: 2010-09-22 00:00+0000\n"
+"PO-Revision-Date: 2010-09-22 11:05+0300\n"
"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
"Language-Team: Estonian <et@li.org>\n"
+"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -353,7 +354,7 @@ msgstr "Sõnumi- ja VoIP kontode haldamine"
#. Tweak the dialog
msgid "Messaging and VoIP Accounts"
-msgstr "Sõnumite ja VoIP kontod"
+msgstr "Sõnumi- ja VoIP kontod"
msgid "The hash of the received file and the sent one do not match"
msgstr "Vastuvõetud faili ja saadetud faili räsi ei kattu"
@@ -855,9 +856,6 @@ msgstr "_Kasutajanimi:"
msgid "I_gnore conference and chat room invitations"
msgstr "Konverentside ja jututubade kutseid _eiratakse"
-msgid "Use _Yahoo! Japan"
-msgstr "Jaapani _Yahoo! kasutamine"
-
msgid "What is your Yahoo! ID?"
msgstr "Mis on sinu Yahoo! ID?"
@@ -1094,6 +1092,12 @@ msgstr "Otsusta _hiljem"
msgid "Subscription Request"
msgstr "Tellimuse päring"
+msgid "Ungrouped"
+msgstr "Grupeerimata"
+
+msgid "Favorite People"
+msgstr "Lemmikud"
+
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Kas tahad tõesti eemaldada grupi '%s'?"
@@ -1535,7 +1539,7 @@ msgstr "Sinine"
msgid "The identity provided by the chat server cannot be verified.\n"
msgstr "Selle vestlusserveri identiteeti pole võimalik tõendada.\n"
-msgid "The certrificate is not signed by a Certification Authority"
+msgid "The certificate is not signed by a Certification Authority"
msgstr "Sertifikaat ei ole sertifitseerija poolt allkirjastatud"
msgid "The certificate has expired"
@@ -2821,3 +2825,6 @@ msgstr "Empathy kontod"
msgid "Empathy Debugger"
msgstr "Empathy siluja"
+
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "Jaapani _Yahoo! kasutamine"
diff --git a/po/eu.po b/po/eu.po
index b42a34a14..2faf80442 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: eu\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2010-03-23 02:43+0000\n"
-"PO-Revision-Date: 2010-03-27 15:30+0100\n"
+"POT-Creation-Date: 2010-09-26 09:33+0000\n"
+"PO-Revision-Date: 2010-09-27 10:20+0200\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
"MIME-Version: 1.0\n"
@@ -20,26 +20,28 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy"
-msgstr "Empathy"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Egin berriketa Google Talk, Facebook, MSN eta berriketako beste hainbat "
+"zerbitzutan"
#: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
-msgstr "Empathy BM bezeroa"
+msgid "Empathy"
+msgstr "Empathy"
#: ../data/empathy.desktop.in.in.h:3
-msgid "IM Client"
-msgstr "BM bezeroa"
+msgid "Empathy Internet Messaging"
+msgstr "Empathy interneteko mezularitza"
#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "Bidali eta jaso mezuak"
+msgid "IM Client"
+msgstr "BM bezeroa"
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
msgid "Always open a separate chat window for new chats."
msgstr "Ireki beti berriketa berriak beste leiho batean."
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -47,261 +49,283 @@ msgstr ""
"Karakterea goitizenaren atzean gehitzeko, taldeko berriketan goitizena "
"osatzea (tabuladorea) erabiltzean."
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Chat window theme"
msgstr "Berriketako leihoaren gaia"
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"Komaz bereiztu erabiltzea nahi diren hizkuntzen zuzentzaile ortografikoen "
"zerrenda (adib. \"de, ca, eu\")."
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Compact contact list"
msgstr "Trinkotu kontaktu-zerrenda"
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Connection managers should be used"
msgstr "Sare-kudeatzaileak erabili beharko lirateke"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Contact list sort criterion"
msgstr "Kontaktu-zerrenda ordenatzeko irizpidea"
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "Direktorio lehenetsia avatar baten irudia hautatzeko"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Disable popup notifications when away"
msgstr "Desgaitu jakinarazpen-leihoa aldentzean"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Disable sounds when away"
msgstr "Desgaitu soinuak aldentzean"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "Bistaratu sarrerako gertaerak egoeraren arean"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Bistaratu sarrerako gertaerak egoeraren arean. False (faltsua) bada, "
+"erakutsi hauek erabiltzaileari berehala."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
msgstr "Empathy-k erabiltzailearen kokalekua argitara dezake"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy-k GPSa erabil dezake kokalekua asmatzeko"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy-k mugikorren sarea erabil dezake kokalekua asmatzeko"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
msgstr "Empathy-k sarea erabil dezake kokalekua asmatzeko"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy default download folder"
msgstr "Empathy-ren deskargen karpeta lehenetsia"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy has asked about importing accounts"
msgstr "Empathy-k kontaktuak inportatzeari buruz galdetu du"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy-k 'butterfly'-ren erregistroak migratu ditu"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy-k automatikoki jarri behar duen 'kanpoan' moduan inaktibo dagoenean"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should auto-connect on startup"
msgstr "Empathy-k automatikoki konektatu behar duen abiatzean"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy-k kokalekuaren zehaztasuna gutxiagotu dezake"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa erabiltzea"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable WebKit Developer Tools"
msgstr "Gaitu WebKit garatzaileen tresnak"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable popup notifications for new messages"
msgstr "Gaitu jakinarazpen-leihoak mezu berrientzako"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable spell checker"
msgstr "Gaitu ortografia-egiaztapena"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide main window"
msgstr "Ezkutatu leiho nagusia"
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Hide the main window."
msgstr "Ezkutatu leiho nagusia."
-#: ../data/empathy.schemas.in.h:26
-msgid "MC 4 accounts have been imported"
-msgstr "MC 4 kontuak inportatu dira"
-
-#: ../data/empathy.schemas.in.h:27
-msgid "MC 4 accounts have been imported."
-msgstr "MC 4 kontuak inportatu dira."
-
-#: ../data/empathy.schemas.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Nick completed character"
msgstr "Goitizena osatzeko karakterea"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Open new chats in separate windows"
msgstr "Ireki berriketa berriak beste leihoetan"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use"
msgstr "Bide-izena Adium gaia erabiltzeko"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "Bide-izena Adium gaia erabiltzeko (berriketan erabiliko den gaia Adium bada)."
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for incoming messages"
msgstr "Jo soinua mezuak iristean"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for new conversations"
msgstr "Jo soinua berriketa berrietan"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for outgoing messages"
msgstr "Jo soinua mezuak bidaltzean"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs in"
msgstr "Jo soinua kontaktu batek saioa hastean"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when a contact logs out"
msgstr "Jo soinua kontaktu batek saioa amaitzean"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log in"
msgstr "Jo soinua zuk saioa hastean"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when we log out"
msgstr "Jo soinua zuk saioa amaitzean"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications if the chat isn't focused"
msgstr "Jakinarazpen-leihoa berriketak ez badu fokua"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs in"
msgstr "Jakinarazpen-leihoa kontaktu bat konektatzen denean"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications when a contact logs out"
msgstr "Jakinarazpen-leihoa kontaktu bat deskonektatzen denean"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show avatars"
msgstr "Erakutsi avatar-ak"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show contact list in rooms"
msgstr "Erakutsi kontaktu-zerrenda geletan"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show hint about closing the main window"
msgstr "Erakutsi leiho nagusia nola ixten den buruzko argibidea"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show offline contacts"
msgstr "Erakutsi konektatu gabeko kontaktuak"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show protocols"
msgstr "Erakutsi protokoloak"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Spell checking languages"
msgstr "Hizkuntzen zuzentzailea"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The default folder to save file transfers in."
msgstr "Karpeta lehenetsia transferitutako fitxategiak gordetzeko."
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The last directory that an avatar image was chosen from."
msgstr "Azken direktorioa, Avatar baten irudia aukeratu dena."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The position for the chat window side pane"
+msgstr "Berriketako leihoaren alboko panelaren posizioa"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Berriketako leihoaren alboko panelaren gordetako posizioa (pixeletan)."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Gaia berriketan bistaratzeko (berriketako leihoan)."
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use graphical smileys"
msgstr "Erabili aurpegierak"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use notification sounds"
msgstr "Erabili jakinarazpen-soinuak"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Use theme for chat rooms"
msgstr "Erabili gaia berriketa-gelan"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Empathy-k erabiltzailearen kokalekua bere kontaktuei erakutsiko dien edo ez."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Empathy-k kokalekua asmatzeko GPSa erabiliko duen edo ez."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Empathy-k kokalekua asmatzeko mugikorren sarea erabiliko duen edo ez."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the network to guess the location."
msgstr "Empathy-k kokalekua asmatzeko sarea erabiliko duen edo ez."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr ""
"Empathy-k beste programetatik kontuak inportatzeari buruz galdetu duen ala "
"ez."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Empathy-k 'butterfly'-ren erregistroak migratu dituen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy abiatzean zure kontuetan saioa automatikoki hasi behar den ala ez."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+"Empathy-k 'kanpoan' moduan automatikoki jarriko den erabiltzailea inaktibo "
+"dagoenean."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Arrazoi pribatuak direla eta Empathy-k kokalekuaren zehaztasuna gutxiagotuko "
"duen edo ez."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa erakutsi edo "
"ez adierazten du."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Webkit garatzeko tresnak, 'Web Inspector' bezalakoak, gaitu behar diren edo "
"ez."
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -309,71 +333,71 @@ msgstr ""
"Automatikoki deskonektatzeko/birkonektatzeko sare-kudeatzailea erabili behar "
"den edo ez adierazten du."
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether to check words typed against the languages you want to check with."
msgstr ""
"Idatzitako hitzen zuzenketa ortografikoa landu edo ez (nahi dituzun "
"hizkuntzetan)."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
"Elkarrizketetan aurpegierak irudi grafikoetara bihurtuko diren ala ez "
"adierazten du."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Kontaktuen sareko saio-hasierak jakinarazteko soinua joko duen ala ez "
"adierazten du."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Kontaktuen sareko saio-amaierak jakinarazteko soinua joko duen ala ez "
"adierazten du."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of events."
msgstr "Gertaerak jakinarazteko soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Sarrerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of new conversations."
msgstr "Berriketa berriak jakinarazteko soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Irteerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound when logging into a network."
msgstr "Sarean saioa hastean soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound when logging out of a network."
msgstr "Sareko saioa amaitzean soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play sound notifications when away or busy."
msgstr "Kanpoan edo lanpetuta zaudenean soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
"Kontaktu bat lineaz kanpo jartzean (deskonektatzean) jakinarazpen-leihoa "
"erakutsiko duen edo ez."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
"Kontaktu bat linean jartzean (konektatzean) jakinarazpen-leihoa erakutsiko "
"duen edo ez."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -382,45 +406,45 @@ msgstr ""
"adierazten du (nahiz eta berriketa jadanik irekita, baina fokurik gabe, "
"egon)."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Mezu berri bat jasotzean jakinarazpen-leihoa erakutsiko den ala ez "
"adierazten du."
-#: ../data/empathy.schemas.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Kontaktu-zerrendan eta berriketako leihoetan kontaktuen avatarrak erakutsi "
"ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
"Kontaktu-zerrendan deskonektatuak dauden kontaktuak erakutsiko dituen ala ez "
"adierazten du."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Kanpoan edo lanpetuta zaudenean jakinarazpen-leihoa erakutsiko den ala ez "
"adierazten du."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show protocols for contacts in the contact list."
msgstr ""
"Kontaktu-zerrendan eta berriketako leihoetan kontaktuen protokoloak erakutsi "
"edo ez adierazten du."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show the contact list in chat rooms."
msgstr "Kontaktu-zerrenda berriketa geletan erakutsi edo ez adierazten du."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show the contact list in compact mode."
msgstr "Kontaktu-zerrenda trinkotuta erakutsi edo ez adierazten du."
-#: ../data/empathy.schemas.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -428,11 +452,11 @@ msgstr ""
"Leiho nagusia titulu-barrako 'x' botoiarekin ixteari buruzko elkarrizketa-"
"koadroa erakutsi ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to use the theme for chat rooms."
msgstr "Berriketa-geletan gaia erabili edo ez adierazten du."
-#: ../data/empathy.schemas.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
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 "
@@ -448,149 +472,204 @@ msgstr "Kudeatu mezularitzako eta VoIP-ko kontuak"
#. 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/cc-empathy-accounts-panel.c:91
+#: ../src/empathy-accounts-dialog.c:2157
msgid "Messaging and VoIP Accounts"
msgstr "Mezularitzako eta VoIP-ko kontuak"
-#: ../libempathy/empathy-ft-handler.c:842
+#: ../libempathy/empathy-ft-handler.c:851
msgid "The hash of the received file and the sent one do not match"
msgstr "Jasotako fitxategiaren eta bidalitakoaren hash-ak ez datoz bat"
-#: ../libempathy/empathy-ft-handler.c:1102
+#: ../libempathy/empathy-ft-handler.c:1111
msgid "File transfer not supported by remote contact"
msgstr "Urruneko kontaktuak ez du fitxategi-transferentziarik onartzen"
-#: ../libempathy/empathy-ft-handler.c:1160
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is not a regular file"
msgstr "Hautatutako fitxategia ez da fitxategi arrunta"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is empty"
msgstr "Hautatutako fitxategia hutsik dago"
-#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:77
-msgid "People nearby"
-msgstr "Inguruko jendea"
-
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:283
msgid "Socket type not supported"
msgstr "Socket mota ez dago onartuta"
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:402
msgid "No reason was specified"
msgstr "Ez da arrazoirik zehaztu"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:405
msgid "The change in state was requested"
msgstr "Egoeraren aldaketa eskatu da"
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:408
msgid "You canceled the file transfer"
msgstr "Fitxategi-transferentzia bertan behera utzi duzu"
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:411
msgid "The other participant canceled the file transfer"
msgstr "Beste partaide batek fitxategi-transferentzia bertan behera utzi du"
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:414
msgid "Error while trying to transfer the file"
msgstr "Errorea fitxategia transferitzen saiatzean"
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:417
msgid "The other participant is unable to transfer the file"
msgstr "Beste partaide batek ezin du fitxategia transferitu"
-#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "Arrazoi ezezaguna"
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Prest"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Lanpetuta"
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Aldendua"
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Ikusezina"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Deskonektatuta"
-#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
+#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
+#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
+msgid "Unknown"
+msgstr "Ezezaguna"
+
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "Ez da arrazoirik zehaztu"
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "Egoera lineaz kanpo gisa ezarri da"
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Sareko errorea"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "Autentifikazioak huts egin du"
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Enkriptazioaren errorea"
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "Izena erabilita"
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "Ez da ziurtagiririk eman"
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "Ziurtagiria ez da fidagarria"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "Ziurtagiria iraungituta"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "Ziurtagiria aktibatu gabe"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "Ziurtagiriaren ostalari-izena ez dator bat"
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "Ziurtagiriaren hatz-marka ez dator bat"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "Ziurtagiria bere buruarekin sinatuta"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Ziurtagiriaren errorea"
-#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:356
+msgid "Encryption is not available"
+msgstr "Enkriptatzea ez dago erabilgarri"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Certificate is invalid"
+msgstr "Ziurtagiria baliogabea da"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been refused"
+msgstr "Konexioa ukatu egin da"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Connection can't be established"
+msgstr "Konexioa ezin da ezarri"
+
+#: ../libempathy/empathy-utils.c:364
+msgid "Connection has been lost"
+msgstr "Konexioa galdu egin da"
+
+#: ../libempathy/empathy-utils.c:366
+msgid "This resource is already connected to the server"
+msgstr "Baliabidea jadanik zerbitzariarekin konektatuta dago"
+
+#: ../libempathy/empathy-utils.c:368
+msgid "Connection has been replaced by a new connection using the same resource"
+msgstr "Konexioa ordeztu egin da baliabide berdina darabilen konexio berri batekin"
+
+#: ../libempathy/empathy-utils.c:371
+msgid "The account already exists on the server"
+msgstr "Kontu hau badago lehendik ere zerbitzarian"
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Server is currently too busy to handle the connection"
+msgstr "Zerbitzaria oso lanpetuegia dago konexioa kudeatzeko"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Certificate has been revoked"
+msgstr "Ziurtagiria errebokatu egin da"
+
+#: ../libempathy/empathy-utils.c:377
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"Ziurtagiriak zifratzeko algoritmo ez-segurua darabil, edo kriptografikoki "
+"ahula da"
+
+#: ../libempathy/empathy-utils.c:380
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"Zerbitzariaren ziurtagiriaren luzerak, edo zerbitzariaren ziurtagiriaren "
+"katearen sakonerak, liburutegi kriptografikoak ezartzen duen muga gainditu du"
+
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Inguruko jendea"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Japoniako Yahoo!"
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "Facebook berriketa"
@@ -640,62 +719,92 @@ msgstr[1] "Duela %d hilabete"
msgid "in the future"
msgstr "etorkizunean"
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:463
msgid "All"
msgstr "Denak"
-#: ../libempathy-gtk/empathy-account-widget.c:538
-#: ../libempathy-gtk/empathy-account-widget.c:594
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "Kontua"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+msgid "Password"
+msgstr "Pasahitza"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "Zerbitzaria"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "Ataka"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1126
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "Erabiltzaile-izena:"
-#: ../libempathy-gtk/empathy-account-widget.c:1474
+#: ../libempathy-gtk/empathy-account-widget.c:1521
+msgid "A_pply"
+msgstr "_Aplikatu"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "_Saio-hasiera"
-#: ../libempathy-gtk/empathy-account-widget.c:1542
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "Kontua:"
-#: ../libempathy-gtk/empathy-account-widget.c:1553
-msgid "Enabled"
-msgstr "Gaituta"
+#: ../libempathy-gtk/empathy-account-widget.c:1628
+msgid "_Enabled"
+msgstr "_Gaituta"
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Kontu hau badago lehendik ere zerbitzarian"
-#: ../libempathy-gtk/empathy-account-widget.c:1621
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Sortu kontu berria zerbitzarian"
+#: ../libempathy-gtk/empathy-account-widget.c:1789
+msgid "Ca_ncel"
+msgstr "_Utzi"
+
#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
#. * 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:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%s - %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:2103
#, c-format
msgid "%s Account"
msgstr "%s kontua"
-#: ../libempathy-gtk/empathy-account-widget.c:2043
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Kontu berria"
@@ -717,11 +826,11 @@ msgstr "Aurreratua"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "_Pasahitza:"
@@ -740,18 +849,18 @@ msgstr "Zein da zure AIM pantaila-izena?"
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Ataka:"
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Zerbitzaria:"
@@ -762,7 +871,7 @@ msgid "<b>Example:</b> username"
msgstr "<b>Adibidea:</b> erabiltzaile-izena"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "Saioko _IDa:"
@@ -780,56 +889,52 @@ msgid "<b>Example:</b> 123456789"
msgstr "<b>Adibidea:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "_Karaktere-jokoa:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
msgstr "ICQ _UIN:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
msgid "What is your ICQ UIN?"
msgstr "Zein da zure ICQ UIN?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
msgid "What is your ICQ password?"
msgstr "Zein da zure ICQ pasahitza?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "_Karaktere-jokoa:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
-msgid "New Network"
-msgstr "Sare berria"
-
-#: ../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 "Automatikoa"
-#: ../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 "Erregistratu"
#. 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 "Aukerak"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
msgid "None"
msgstr "Bat ere ez"
@@ -865,6 +970,14 @@ msgstr "Benetako izena:"
msgid "Servers"
msgstr "Zerbitzariak"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "Zein da zure IRCko goitizena?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "Zer IRC sare?"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "<b>Example:</b> user@gmail.com"
msgstr "<b>Adibidea:</b> erabiltzailea@gmail.com"
@@ -873,19 +986,28 @@ msgstr "<b>Adibidea:</b> erabiltzailea@gmail.com"
msgid "<b>Example:</b> user@jabber.org"
msgstr "<b>Adibidea:</b> erabiltzailea@jabber.org"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Enkriptatzea behar da (TLS/SSL)"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr "_Ez ikusi egin SSL ziurtagirien erroreei"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Override server settings"
msgstr "Gainidatzi zerbitzariaren ezarpenak"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
msgstr "_Lehentasuna:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "Reso_urce:"
msgstr "_Baliabidea:"
-#: ../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:12
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -898,50 +1020,42 @@ msgstr ""
"Erabili <a href=\"http://www.facebook.com/username/\">orrialde hau</a> "
"Facebook-eko erabiltzaile bat aukeratzeko aurrez ez badaukazu bat."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "Use old SS_L"
msgstr "Erabili SS_L zaharra"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Facebook password?"
msgstr "Zein da zure Facebook pasahitza?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook username?"
msgstr "Zein da zure Facebook erabiltzaile-izena?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Google ID?"
msgstr "Zein da zure Google-ko IDa?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google password?"
msgstr "Zein da zure Google-ko pasahitza?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Jabber ID?"
msgstr "Zein da zure Jabber IDa?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber password?"
msgstr "Zein da zure Jabber pasahitza?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your desired Jabber ID?"
msgstr "Zein da zure Jabber ID gogokoa?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber password?"
msgstr "Zein da zure Jabber pasahitz gogokoa?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
-msgid "_Encryption required (TLS/SSL)"
-msgstr "_Enkriptatzea behar da (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Ignore SSL certificate errors"
-msgstr "_Ez ikusi egin SSL ziurtagirien erroreei"
-
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Adibidea:</b> erabiltzailea@hotmail.com"
@@ -955,25 +1069,25 @@ msgid "What is your Windows Live password?"
msgstr "Zein da zure Windows Live pasahitza?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr "_Helb. elek.:"
+msgid "E-_mail address:"
+msgstr "_Helbide elektronikoa:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "_Goitizena:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_First Name:"
msgstr "_Izena:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID:"
msgstr "_Jabber IDa:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Last Name:"
msgstr "_Abizenak:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "_Goitizena:"
-
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "A_rgitaratutako izena:"
@@ -995,207 +1109,155 @@ msgid "Discover the STUN server automatically"
msgstr "Aurkitu STUN zerbitzaria automatikoki"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Hostname of the proxy for outbound requests."
-msgstr "Proxy-aren ostalari-izena irteerako eskaerentzat."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "Bitartea (seg.)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Keep-Alive Options"
msgstr "Konexio iraunkorren aukerak"
-#: ../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 ""
-"Bilatu DNS SRV erregistroa zerbitzuaren domeinuan STUN zerbitzari baten "
-"ostalari izenarentzako."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Loose Routing"
msgstr "Bideraketa ez zehatza"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Mechanism:"
msgstr "Mekanismoa:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Miscellaneous Options"
msgstr "Hainbat aukera"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "NAT Traversal Options"
msgstr "NAT zeiharbidearen aukerak"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Port of the proxy for outbound requests."
-msgstr "Proxy-aren ataka irteerako eskaerentzat."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
msgid "Port:"
msgstr "Ataka:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Proxy Options"
msgstr "Proxy-aren aukerak"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "STUN Server:"
msgstr "STUN zerbitzaria:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Server:"
msgstr "Zerbitzaria:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid ""
-"The username for SIP authentication, if different from the SIP URI\n"
-"username."
-msgstr ""
-"Erabiltzaile-izena SIPen autentifikatzeko., SIPeko URIaren \n"
-"erabiltzaile-izenaren desberdina bada."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Transport:"
msgstr "Garraioa:"
-#: ../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 ""
-"Eguneratu erregistroaren lotura bezeroaren kanpoko helbidea lokaleko "
-"loturaren desberdina dela atzematen bada."
-
-#: ../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 ""
-"Erabili bideraketa ez zehatzaren portaera eta bideraketaren goiburukoa RFC "
-"3261-ek gomendatuta bezala."
-
-#: ../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 "Zein da zure SIP kontuaren pasahitza?"
-#: ../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 "Zein da zure SIP saio-hasierako IDa?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "_Username:"
msgstr "_Erabiltzaile-izena:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo! Japan"
-msgstr "Erabili japoniako _Yahoo!"
+msgid "I_gnore conference and chat room invitations"
+msgstr "_Ez ikusi egin konferentzi eta berriketa-gelen gonbiteei"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! ID?"
msgstr "Zein da zure Yahoo! IDa?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Zein da zure Yahoo! pasahitza?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "Yahoo! _IDa:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "_Ez ikusi egin konferentzi eta berriketa-gelen gonbiteei"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "_Gelen zerrenda lokala:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
msgid "Couldn't convert image"
msgstr "Ezin izan da irudia bihurtu"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
msgid "None of the accepted image formats are supported on your system"
msgstr "Sistemak ez du onartzen onartutako irudi-formatuetariko bat bera ere"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:915
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
msgid "Select Your Avatar Image"
msgstr "Hautatu zure avatar irudia"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:918
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "No Image"
msgstr "Irudirik ez"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:980
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
msgid "Images"
msgstr "Irudiak"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:984
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
msgid "All Files"
msgstr "Fitxategi denak"
-#: ../libempathy-gtk/empathy-avatar-image.c:327
+#: ../libempathy-gtk/empathy-avatar-image.c:323
msgid "Click to enlarge"
msgstr "Egin klik handitzeko"
-#: ../libempathy-gtk/empathy-chat.c:233
-msgid "Failed to reconnect this chat"
-msgstr "Huts egin du berriketa honekin berriro konektatzean"
-
-#: ../libempathy-gtk/empathy-chat.c:655
-msgid "Failed to join chat room"
-msgstr "Huts egin du berriketa-gelarekin elkartzean"
-
-#: ../libempathy-gtk/empathy-chat.c:673
+#: ../libempathy-gtk/empathy-chat.c:642
msgid "Failed to open private chat"
msgstr "Huts egin du berriketa pribatua irekitzean"
-#: ../libempathy-gtk/empathy-chat.c:712
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
msgstr "Gaia ez dago onartuta berriketa honetan"
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
msgstr "Ez duzu baimenik gaia aldatzeko"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: mezu guztiak garbitzen ditu uneko berriketan"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <gaia>: ezarri uneko berriketaren gaia"
-#: ../libempathy-gtk/empathy-chat.c:853
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <berriketa-gelaren IDa>: elkartu berriketa-gela berri batekin"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <berriketa-gelaren IDa>: elkartu berriketa-gela berri batekin"
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <kontaktuaren IDa> [<mezua>]: ireki berriketa pribatu bat"
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <kontaktuaren IDa> <mezua>: ireki berriketa pribatu bat"
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <goitizena>: aldatu zure goitizena uneko zerbitzarian"
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <mezua>: bidali ekintzaren mezua uneko berriketara"
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:849
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 "
@@ -1205,7 +1267,7 @@ msgstr ""
"karakterearekin hasten diren mezuak bidaltzeko erabiltzen da. Adibidez, \"/"
"say /join berriketa-gela berri batekin elkartzeko erabiltzen da\""
-#: ../libempathy-gtk/empathy-chat.c:876
+#: ../libempathy-gtk/empathy-chat.c:854
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1213,80 +1275,84 @@ msgstr ""
"/help [<komandoa>]: erakutsi onartutako komando guztiak. <komandoa> "
"definitzen bada, nola erabiltzen den erakusten du."
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:864
#, c-format
msgid "Usage: %s"
msgstr "Erabilera: %s"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "Komando ezezaguna"
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
msgstr "Komando ezezaguna; ikus /help komando erabilgarrientzako"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "lineaz kanpo"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "kontaktu baliogabea"
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "baimena ukatuta"
-#: ../libempathy-gtk/empathy-chat.c:1183
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "mezua luzeegia"
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "inplementatu gabe"
-#: ../libempathy-gtk/empathy-chat.c:1189
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "ezezaguna"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1172
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Errorea '%s' mezua bidaltzean: %s"
-#: ../libempathy-gtk/empathy-chat.c:1228
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+msgid "Topic:"
+msgstr "Gaia:"
+
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "Gaia honela ezarria: %s"
-#: ../libempathy-gtk/empathy-chat.c:1230
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "Ez da gairik definitu"
-#: ../libempathy-gtk/empathy-chat.c:1629
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(Iradokizunik ez)"
-#: ../libempathy-gtk/empathy-chat.c:1683
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "Txertatu aurpegiera"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1701
-#: ../libempathy-gtk/empathy-ui-utils.c:1675
+#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "_Send"
msgstr "_Bidali"
-#: ../libempathy-gtk/empathy-chat.c:1735
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "Iradokizun _ortografikoak"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
msgstr "Huts egin du azken erregistroak eskuratzean"
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "%s deskonektatu egin da"
@@ -1294,12 +1360,12 @@ msgstr "%s deskonektatu egin da"
#. 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:2071
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s(e)k %1$s kanporatu du"
-#: ../libempathy-gtk/empathy-chat.c:1970
+#: ../libempathy-gtk/empathy-chat.c:2074
#, c-format
msgid "%s was kicked"
msgstr "%s kanporatua izan da"
@@ -1307,17 +1373,17 @@ msgstr "%s kanporatua izan da"
#. 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:2082
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s(e)k %1$s debekatu du"
-#: ../libempathy-gtk/empathy-chat.c:1981
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
msgstr "%s debekatua izan da"
-#: ../libempathy-gtk/empathy-chat.c:1985
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
msgstr "%s(e)k gela utzi du"
@@ -1327,81 +1393,79 @@ msgstr "%s(e)k gela utzi du"
#. * 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:2098
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2019
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
msgstr "%s(e)k gelara elkartzea nahi du"
-#: ../libempathy-gtk/empathy-chat.c:2044
+#: ../libempathy-gtk/empathy-chat.c:2148
#, c-format
msgid "%s is now known as %s"
msgstr "%s orain honela ezagutzen da: %s"
-#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1532
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
msgid "Disconnected"
msgstr "Deskonektatuta"
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "Okerreko pasahitza, saiatu berriro:"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "Saiatu berriro"
-#: ../libempathy-gtk/empathy-chat.c:2707
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "Gela hau pasahitz batekin babestuta dago:"
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
msgstr "Elkartu"
-#: ../libempathy-gtk/empathy-chat.c:2848
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "Konektatuta"
-#: ../libempathy-gtk/empathy-chat.c:2901
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "Berriketa"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:672
-msgid "Topic:"
-msgstr "Gaia:"
-
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:318
-#: ../libempathy-gtk/empathy-theme-adium.c:786
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:791
msgid "_Copy Link Address"
msgstr "_Kopiatu estekaren helbidea"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:325
-#: ../libempathy-gtk/empathy-theme-adium.c:793
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:798
msgid "_Open Link"
msgstr "_Ireki esteka"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:423
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
msgid "%A %B %d %Y"
msgstr "%A, %Y %B %d"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:243
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
msgid "Edit Contact Information"
msgstr "Editatu kontaktuaren informazioa"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:301
+#: ../libempathy-gtk/empathy-contact-dialogs.c:295
msgid "Personal Information"
msgstr "Informazio pertsonala"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:406
+#: ../libempathy-gtk/empathy-contact-dialogs.c:401
+#: ../libempathy-gtk/empathy-individual-dialogs.c:112
msgid "New Contact"
msgstr "Kontaktu berria"
@@ -1413,217 +1477,288 @@ msgstr "Erabaki _beranduago"
msgid "Subscription Request"
msgstr "Harpidetza eskaera"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1633
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Banatuta"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Gogoko jendea"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Ziur zaude '%s' taldea kentzea nahi duzula?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1635
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2235
msgid "Removing group"
msgstr "Taldea kentzen"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1684
-#: ../libempathy-gtk/empathy-contact-list-view.c:1761
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-contact-list-view.c:2055
+#: ../libempathy-gtk/empathy-contact-list-view.c:2132
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Kendu"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1714
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2320
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Ziur zaude '%s' kontaktua kendu nahi duzula?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1716
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
msgstr "Kontaktua kentzen"
-#: ../libempathy-gtk/empathy-contact-menu.c:206
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "Gehitu _kontaktua..."
-#: ../libempathy-gtk/empathy-contact-menu.c:233
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "_Berriketa"
-#: ../libempathy-gtk/empathy-contact-menu.c:264
-#| msgid "_Call"
+#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-individual-menu.c:557
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Audio-deia"
-#: ../libempathy-gtk/empathy-contact-menu.c:296
-#| msgid "New Call"
+#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-individual-menu.c:599
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Bideo-deia"
-#: ../libempathy-gtk/empathy-contact-menu.c:347
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "_Aurreko berriketak"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:683
+msgid "Send File"
msgstr "Bidali fitxategia"
-#: ../libempathy-gtk/empathy-contact-menu.c:392
-msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:375
+#: ../libempathy-gtk/empathy-individual-menu.c:725
+msgid "Share My Desktop"
msgstr "Partekatu nire mahaigaina"
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-contact-widget.c:1379
+#: ../libempathy-gtk/empathy-contact-menu.c:415
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
msgstr "Gogokoa"
-#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-contact-menu.c:444
+#: ../libempathy-gtk/empathy-individual-menu.c:786
msgid "Infor_mation"
msgstr "_Informazioa"
-#: ../libempathy-gtk/empathy-contact-menu.c:508
-#| msgid "_Edit"
+#: ../libempathy-gtk/empathy-contact-menu.c:490
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Editatu"
-#: ../libempathy-gtk/empathy-contact-menu.c:562
-#: ../src/empathy-chat-window.c:857
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+#: ../libempathy-gtk/empathy-individual-menu.c:970
+#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "Gela honetara gonbidatzen zaituzte"
-#: ../libempathy-gtk/empathy-contact-menu.c:593
-msgid "_Invite to chat room"
+#: ../libempathy-gtk/empathy-contact-menu.c:575
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+msgid "_Invite to Chat Room"
msgstr "_Gonbidatu berriketa-gelara"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "Hautatu kontaktua"
-#: ../libempathy-gtk/empathy-contact-widget.c:238
-msgid "Select"
-msgstr "Hautatu"
+#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-individual-widget.c:148
+msgid "Full name:"
+msgstr "Izen osoa:"
-#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1050
-msgid "Group"
-msgstr "Taldea"
+#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-individual-widget.c:149
+msgid "Phone number:"
+msgstr "Telefono zenbakia:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-individual-widget.c:150
+msgid "E-mail address:"
+msgstr "Helbide elektronikoa:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-individual-widget.c:151
+msgid "Website:"
+msgstr "Webgunea:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-individual-widget.c:152
+msgid "Birthday:"
+msgstr "Urtebetetzea:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:578
+#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Herrialdearen ISO kodea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:580
+#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Herrialdea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Estatua:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Herria:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Area:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:588
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Posta-kodea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:590
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Kalea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:592
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Eraikuntza:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:594
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Solairua:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:596
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Gela:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:598
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Testua:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Azalpena:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:602
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URIa:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Zehaztasun maila:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Errorea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Errore bertikala (metroak):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Errore horizontala (metroak):"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Abiadura:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Atzerapena:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Igoerako abiadura:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Azken eguneraketa:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Longitudea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Latitudea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Altitudea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Kokalekua"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-msgid "<b>Location</b>, "
-msgstr "<b>Kokalekua</b>, "
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:601
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%Y/%B/%e, %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Gorde avatar-a"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Ezin da avatar-a gorde"
@@ -1631,52 +1766,50 @@ msgstr "Ezin da avatar-a gorde"
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Kokalekua</b> (data)\t"
+#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
msgstr "Aliasa:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "Urtebetetzea:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client Information"
msgstr "Bezeroaren informazioa"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client:"
msgstr "Bezeroa:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
msgid "Contact Details"
msgstr "Kontaktuaren xehetasunak"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "E-mail address:"
-msgstr "Helbide elektronikoa:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Full name:"
-msgstr "Izen osoa:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Groups"
-msgstr "Taldeak"
-
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
msgid "Identifier:"
msgstr "Identifikatzailea:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
msgstr "Informazioa eskatuta..."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "OS:"
msgstr "SE:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "Bertsioa:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "Taldeak"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:344
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -1684,56 +1817,156 @@ msgstr ""
"Hautatu taldeak kontaktu hau talde horietan azaltzeko, talde bat baino "
"gehiago hauta ditzakezu, edo talderik ez."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
-msgid "Version:"
-msgstr "Bertsioa:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Website:"
-msgstr "Webgunea:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-groups-widget.c:363
msgid "_Add Group"
msgstr "_Gehitu taldea"
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+msgid "Select"
+msgstr "Hautatu"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-main-window.c:1247
+msgid "Group"
+msgstr "Taldea"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+msgid "Linked Contacts"
+msgstr "Estekatutako kontaktuak"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+msgid "Select contacts to link"
+msgstr "Hautatu kontaktuak estekatzeko"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:428
+msgid "New contact preview"
+msgstr "Kontaktu berriaren aurrebista"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "Ezkerreko zerrendan hautatutako kontaktuak elkarrekin estekatuko dira."
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:837
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "_Editatu"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:863
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr "_Konektatu kontaktuak..."
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] "Meta-kontaktuak kontaktu %u du"
+msgstr[1] "Meta-kontaktuak %u kontaktu ditu"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>Kokalekua</b> (data)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "Sare berria"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+msgid "Choose an IRC network"
+msgstr "Aukeratu IRC sarea"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "zerbitzari berria"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "Zerbitzaria"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "Ataka"
-
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:700
-#: ../src/empathy-import-widget.c:310
-msgid "Account"
-msgstr "Kontua"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:116
+msgid "Link Contacts"
+msgstr "Konektatu kontaktuak"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "_Deskonektatu..."
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
+msgid "Completely split the displayed meta-contact into the contacts it contains."
+msgstr "Zatitu erabat bistaratutako meta-kontaktua dituen kontaktuetan."
-#: ../libempathy-gtk/empathy-log-window.c:717
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:137
+msgid "_Link"
+msgstr "_Konektatu"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr "Desestekatu '%s' meta-kontaktua?"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr ""
+"Ziur zaude meta-kontaktu hau desestekatzea nahi duzula? Honek erabat "
+"zatituko du meta-kontaktua berak dituen kontaktuetan."
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:191
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "_Deskonektatu"
+
+#: ../libempathy-gtk/empathy-log-window.c:663
msgid "Date"
msgstr "Data"
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
msgid "Conversations"
msgstr "Berriketak"
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "Bilatu hurrengoa"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "Bilatu aurrekoa"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
msgid "Previous Conversations"
msgstr "Aurreko berriketak"
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
msgid "Search"
msgstr "Bilatu"
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "_For:"
msgstr "_Honentzako:"
@@ -1742,28 +1975,27 @@ msgid "Contact ID:"
msgstr "Kontaktuaren IDa:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:144
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
msgid "C_hat"
msgstr "_Berriketa"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:154
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
msgid "New Conversation"
msgstr "Berriketa berria"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
msgid "Send _Video"
msgstr "Bidali _bideoa"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:196
-#: ../src/empathy-call-window.ui.h:17
-msgid "_Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
msgstr "_Deitu"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
msgid "New Call"
msgstr "Dei berria"
@@ -1800,59 +2032,59 @@ msgid "Set your presence and current status"
msgstr "Ezarri zure presentzia eta uneko egoera"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
msgid "Custom messages…"
msgstr "Mezu pertsonalizatuak..."
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Bilatu:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Maiuskula/minuskula"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Ez da esaldia aurkitu"
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound.c:50
msgid "Received an instant message"
msgstr "Jaso berehalako mezua"
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
msgid "Sent an instant message"
msgstr "Bidali berehalako mezua"
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
msgid "Incoming chat request"
msgstr "Sarrerako berriketa eskaera"
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
msgid "Contact connected"
msgstr "Kontaktua konektatuta"
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
msgid "Contact disconnected"
msgstr "Kontaktua deskonektatuta"
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
msgid "Connected to server"
msgstr "Zerbitzarira konektatuta"
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
msgid "Disconnected from server"
msgstr "Zerbitzaritik deskonektatuta"
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
msgid "Incoming voice call"
msgstr "Sarrerako ahots-deia"
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
msgid "Outgoing voice call"
msgstr "Irteerako ahots-deia"
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
msgid "Voice call ended"
msgstr "Ahots-deia amaituta"
@@ -1888,17 +2120,90 @@ msgstr "Garbia"
msgid "Blue"
msgstr "Urdina"
-#: ../libempathy-gtk/empathy-ui-utils.c:1550
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr "Berriketako zerbitzariak emandako identitatea ezin da egiaztatu.\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certificate is not signed by a Certification Authority"
+msgstr "Ziurtagiria ez dago ziurtagiri-emaile batek sinatuta"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "Ziurtagiria iraungituta"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "Ziurtagiria aktibatu gabe dago oraindik"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "Ziurtagiriak ez dauka espero den hatz-marka"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr ""
+"Ziurtagiriak egiaztatzen duen ostalari-izena ez dator bat zerbitzariaren "
+"izenarekin"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "Ziurtagiria bere buruarekin sinatuta"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr "Ziurtagiria errebokatua izan da ziurtagiri-emailearen jaulkipenarengatik"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr "Ziurtagiria kriptografikoki ahula da"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "Ziurtagiriaren luzerak muga egiaztagarria gainditzen du"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "Ziurtagiria gaizki osatuta"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "Espero zen ostalari-izena: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "Ziurtagiriaren ostalari-izena: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "Jarraitu"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "Konexio hau ez da fidagarria. Hala ere, jarraitzea nahi duzu?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "Gogoratu aukera hau etorkizuneko konexioetan"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "Ziurtagiriaren xehetasunak"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1698
msgid "Unable to open URI"
msgstr "Ezin da URIa ireki"
-#: ../libempathy-gtk/empathy-ui-utils.c:1667
+#: ../libempathy-gtk/empathy-ui-utils.c:1793
msgid "Select a file"
msgstr "Hautatu fitxategia"
-#: ../libempathy-gtk/empathy-ui-utils.c:1731
-msgid "Select a destination"
-msgstr "Hautatu helburua"
+#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#, c-format
+msgid "Incoming file from %s"
+msgstr "Sarrerako fitxategia %s(e)ndik"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -2083,15 +2388,15 @@ msgstr "Ez dago errorearen mezurik"
msgid "Instant Message (Empathy)"
msgstr "Berehalako mezularitza (Empathy)"
-#: ../src/empathy.c:596
+#: ../src/empathy.c:414
msgid "Don't connect on startup"
msgstr "Ez konektatu abiatzean"
-#: ../src/empathy.c:600
+#: ../src/empathy.c:418
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Ez bistaratu kontaktu-zerrenda edo bestelako elkarrizketa-koadrorik abiatzean"
-#: ../src/empathy.c:612
+#: ../src/empathy.c:435
msgid "- Empathy IM Client"
msgstr "- Empathy BM bezeroa"
@@ -2168,7 +2473,7 @@ msgstr ""
"morroi honetatik irten eta kontuak geroago gehitu Editatu menuan."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1303
+#: ../src/empathy-account-assistant.c:1316
msgid "An error occurred"
msgstr "Errore bat gertatu da"
@@ -2177,36 +2482,36 @@ msgstr "Errore bat gertatu da"
#. 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:614
#, c-format
msgid "New %s account"
msgstr "%s kontu berria"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:515
msgid "What kind of chat account do you have?"
msgstr "Zein motako berriketa-kontua duzu?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:521
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Baduzu beste berriketako konturik konfiguratzeko?"
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:527
msgid "Enter your account details"
msgstr "Sartu kontuaren xehetasunak"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:532
msgid "What kind of chat account do you want to create?"
msgstr "Zein motako berriketako kontua sortzea nahi duzu?"
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:538
msgid "Do you want to create other chat accounts?"
msgstr "Nahi duzu beste berriketako kontu bat sortzea?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:545
msgid "Enter the details for the new account"
msgstr "Sartu kontu berriaren xehetasunak"
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:660
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 "
@@ -2218,41 +2523,41 @@ msgstr ""
"Empathy-rekin. Mikrofono edo web kamera batekin audio- edo bideo-deiak egin "
"ditzakezu."
-#: ../src/empathy-account-assistant.c:670
+#: ../src/empathy-account-assistant.c:677
msgid "Do you have an account you've been using with another chat program?"
msgstr "Beste berriketako programa batean erabiltzen duzun konturik baduzu?"
-#: ../src/empathy-account-assistant.c:693
+#: ../src/empathy-account-assistant.c:700
msgid "Yes, import my account details from "
msgstr "Bai, inportatu nire kontuko xehetasunak hemendik: "
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:721
msgid "Yes, I'll enter my account details now"
msgstr "Bai, orain sartuko dut nire kontuko xehetasunak"
-#: ../src/empathy-account-assistant.c:736
+#: ../src/empathy-account-assistant.c:743
msgid "No, I want a new account"
msgstr "Ez, kontu berri bat nahi dut"
-#: ../src/empathy-account-assistant.c:746
+#: ../src/empathy-account-assistant.c:753
msgid "No, I just want to see people online nearby for now"
msgstr "Ez, oraingoz inguruko konektatutako jendea ikustea nahi dut"
-#: ../src/empathy-account-assistant.c:767
+#: ../src/empathy-account-assistant.c:774
msgid "Select the accounts you want to import:"
msgstr "Hautatu inportatzea nahi dituzun kontuak:"
-#: ../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:858
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Bai"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:865
msgid "No, that's all for now"
msgstr "Ez, hau izan da guztia"
-#: ../src/empathy-account-assistant.c:1117
+#: ../src/empathy-account-assistant.c:1130
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 "
@@ -2265,16 +2570,16 @@ msgstr ""
"erraz alda ditzakezu (edo eginbide hau desgaitu) 'Kontuak' elkarrizketa-"
"koadroa erabiliz."
-#: ../src/empathy-account-assistant.c:1123
-#: ../src/empathy-account-assistant.c:1179
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
msgid "Edit->Accounts"
msgstr "Editatu->Kontuak"
-#: ../src/empathy-account-assistant.c:1139
+#: ../src/empathy-account-assistant.c:1152
msgid "I don't want to enable this feature for now"
msgstr "Oraingoz ez dut eginbide hau gaitzerik nahi"
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1188
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 "
@@ -2286,66 +2591,66 @@ msgstr ""
"gero, instalatu telepathy-salut paketea eta sortu 'Inguruko jendea' kontu "
"bat 'Kontuak' elkarrizketa-koadroan."
-#: ../src/empathy-account-assistant.c:1181
+#: ../src/empathy-account-assistant.c:1194
msgid "telepathy-salut not installed"
msgstr "telepathy-salut ez dago instalatuta"
-#: ../src/empathy-account-assistant.c:1227
+#: ../src/empathy-account-assistant.c:1240
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Mezularitzako eta VoIP-ko kontuaren laguntzailea"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1274
msgid "Welcome to Empathy"
msgstr "Ongietorri Empathy-ra"
-#: ../src/empathy-account-assistant.c:1270
+#: ../src/empathy-account-assistant.c:1283
msgid "Import your existing accounts"
msgstr "Inportatu dauzkazun kontuak"
-#: ../src/empathy-account-assistant.c:1288
+#: ../src/empathy-account-assistant.c:1301
msgid "Please enter personal details"
msgstr "Sartu xehetasun pertsonalak"
#. 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 "Gorde gabeko eraldaketak daude zure %s kontuan."
#. 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 "Zure kontu berria oraindik gorde gabe dago."
-#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "Konektatzen..."
-#: ../src/empathy-accounts-dialog.c:290
-#, c-format
-msgid "Disconnected — %s"
-msgstr "Deskonektatuta — %s"
-
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:322
#, c-format
msgid "Offline — %s"
msgstr "Lineaz kanpo — %s"
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:334
+#, c-format
+msgid "Disconnected — %s"
+msgstr "Deskonektatuta — %s"
+
+#: ../src/empathy-accounts-dialog.c:345
msgid "Offline — No Network Connection"
msgstr "Lineaz kanpo — Ez dago sareko konexiorik"
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:352
msgid "Unknown Status"
msgstr "Egoera ezezaguna"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:364
msgid "Offline — Account Disabled"
msgstr "Lineaz kanpo — Kontua desgaituta"
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:811
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2353,16 +2658,16 @@ msgstr ""
"Kontu berri bat sortzera zoaz, eta ondorioz zuk egindako\n"
"aldaketak baztertu egingo dira. Ziur zaude jarraitzea nahi duzula?"
-#: ../src/empathy-accounts-dialog.c:1115
+#: ../src/empathy-accounts-dialog.c:1158
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Ziur zaude '%s' kentzea nahi duzula ordenagailutik?"
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1162
msgid "This will not remove your account on the server."
msgstr "Honek ez du zure kontua zerbitzaritik kenduko."
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1400
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2370,7 +2675,7 @@ msgstr ""
"Beste kontu bat hautatzera zoaz, eta ondorioz zuk egindako\n"
"aldaketak baztertu egingo dira Ziur zaude jarraitzea nahi duzula?"
-#: ../src/empathy-accounts-dialog.c:1933
+#: ../src/empathy-accounts-dialog.c:2003
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2379,14 +2684,18 @@ msgstr ""
"aldaketak baztertu egingo dira. Ziur zaude jarraitzea nahi duzula?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "Kontaktuaren informazioa kargatzen"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "No protocol installed"
msgstr "Ez da protokolorik instalatu"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Protocol:"
msgstr "Protokoloa:"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -2394,70 +2703,114 @@ msgstr ""
"Kontu berri bat gehitzeko, aurrenik erabiltzea nahi duzun protokolo "
"bakoitzaren motorra instalatu behar duzu."
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
msgstr "_Gehitu..."
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
msgstr "_Inportatu..."
-#: ../src/empathy-call-window.c:453
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr " - Empathy-ren autentifikazio-bezeroa"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Empathy-ren autentifikazio-bezeroa"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "Inguruko jendea"
+
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr " - Empathy-ren audio/bideo bezeroa"
+
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy-ren audio/bideo bezeroa"
+
+#: ../src/empathy-call-window.c:479
msgid "Contrast"
msgstr "Kontrastea"
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:482
msgid "Brightness"
msgstr "Distira"
-#: ../src/empathy-call-window.c:459
+#: ../src/empathy-call-window.c:485
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:567
+#: ../src/empathy-call-window.c:590
msgid "Volume"
msgstr "Bolumena"
-#: ../src/empathy-call-window.c:1022
+#: ../src/empathy-call-window.c:1173
msgid "_Sidebar"
msgstr "_Albo-barra"
-#: ../src/empathy-call-window.c:1041
+#: ../src/empathy-call-window.c:1192
msgid "Audio input"
msgstr "Audio-sarrera"
-#: ../src/empathy-call-window.c:1045
+#: ../src/empathy-call-window.c:1196
msgid "Video input"
msgstr "Bideo-sarrera"
-#: ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1200
msgid "Dialpad"
msgstr "Dei-teklatua"
+#: ../src/empathy-call-window.c:1205
+msgid "Details"
+msgstr "Xehetasunak"
+
#. 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:1273
#, c-format
msgid "Call with %s"
msgstr "Deitu honekin: %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:1352
msgid "Call"
msgstr "Deitu"
+#: ../src/empathy-call-window.c:1506
+msgid "The IP address as seen by the machine"
+msgstr "Makinak IP helbidea ikusi du"
+
+#: ../src/empathy-call-window.c:1508
+msgid "The IP address as seen by a server on the Internet"
+msgstr "IP helbidea interneteko zerbitzari batek ikusi du"
+
+#: ../src/empathy-call-window.c:1510
+msgid "The IP address of the peer as seen by the other side"
+msgstr "Parekoaren IP helbidea bestaldean ikusi da"
+
+#: ../src/empathy-call-window.c:1512
+msgid "The IP address of a relay server"
+msgstr "Transmisioko ('relay') zerbitzariaren IP helbidea"
+
+#: ../src/empathy-call-window.c:1514
+msgid "The IP address of the multicast group"
+msgstr "Multidifusioko taldearen IP helbidea"
+
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1695
+#: ../src/empathy-call-window.c:2247
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Konektatuta — %d:%02dm"
-#: ../src/empathy-call-window.c:1756
+#: ../src/empathy-call-window.c:2308
msgid "Technical Details"
msgstr "Xehetasun teknikoak"
-#: ../src/empathy-call-window.c:1794
+#: ../src/empathy-call-window.c:2346
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2466,7 +2819,7 @@ msgstr ""
"%s(r)en softwareak ez du ulertzen zure ordenagailuak onartzen dituen audio-"
"formatuak"
-#: ../src/empathy-call-window.c:1799
+#: ../src/empathy-call-window.c:2351
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2475,7 +2828,7 @@ msgstr ""
"%s(r)en softwareak ez du ulertzen zure ordenagailuak onartzen dituen bideo-"
"formatuak"
-#: ../src/empathy-call-window.c:1805
+#: ../src/empathy-call-window.c:2357
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2484,23 +2837,23 @@ msgstr ""
"Ezin da konexiorik ezarri %s(r)ekin. Zuetako bat zuzeneko konexioak "
"baimentzen ez dituen sare batean dago."
-#: ../src/empathy-call-window.c:1811
+#: ../src/empathy-call-window.c:2363
msgid "There was a failure on the network"
msgstr "Hutsegite bat egon da sarean"
-#: ../src/empathy-call-window.c:1815
+#: ../src/empathy-call-window.c:2367
msgid "The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Dei hau egiteko beharrezkoak diren audio-formatuak instalatu gabe daude "
"ordenagailuan"
-#: ../src/empathy-call-window.c:1818
+#: ../src/empathy-call-window.c:2370
msgid "The video formats necessary for this call are not installed on your computer"
msgstr ""
"Dei hau egiteko beharrezkoak diren bideo-formatuak instalatu gabe daude "
"ordenagailuan"
-#: ../src/empathy-call-window.c:1828
+#: ../src/empathy-call-window.c:2380
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2511,115 +2864,147 @@ msgstr ""
"genizuke <a href=\"%s\">akats honen berri emango bazenu</a> eta Laguntza "
"menuko 'Araztu' leihotik eskuratutako erregistroak erantsiko bazenio."
-#: ../src/empathy-call-window.c:1836
+#: ../src/empathy-call-window.c:2388
msgid "There was a failure in the call engine"
msgstr "Hutsegite bat gertatu da deiaren motorrean"
-#: ../src/empathy-call-window.c:1875
+#: ../src/empathy-call-window.c:2391
+msgid "The end of the stream was reached"
+msgstr "Korrontearen amaierara iritsi da"
+
+#: ../src/empathy-call-window.c:2431
msgid "Can't establish audio stream"
msgstr "Ezin da audioaren korrontea ezarri"
-#: ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:2441
msgid "Can't establish video stream"
msgstr "Ezin da bideoaren korrontea ezarri"
#: ../src/empathy-call-window.ui.h:1
+msgid "Audio"
+msgstr "Audioa"
+
+#: ../src/empathy-call-window.ui.h:2
msgid "Call the contact again"
msgstr "Deitu kontaktuari berriro"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:3
msgid "Camera Off"
msgstr "Itzali kamera"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:4
msgid "Camera On"
msgstr "Piztu kamera"
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Deskodeketaren kodeka:"
+
+#: ../src/empathy-call-window.ui.h:6
msgid "Disable camera and stop sending video"
msgstr "Desgaitu kamera eta gelditu bideoa bidaltzea"
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.ui.h:7
msgid "Enable camera and send video"
msgstr "Gaitu kamera eta bidali bideoa"
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:8
msgid "Enable camera but don't send video"
msgstr "Gaitu kamera baina ez bidali bideoa"
-#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Kodeketaren kodeka:"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Hang up"
msgstr "Eseki"
-#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-call-window.ui.h:11
msgid "Hang up current call"
msgstr "Eseki uneko deia"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Lokaleko hautagaia:"
+
+#: ../src/empathy-call-window.ui.h:13
msgid "Preview"
msgstr "Aurrebista"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:14
msgid "Redial"
msgstr "Berriro deitu"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Urruneko hautagaia:"
+
+#: ../src/empathy-call-window.ui.h:16
msgid "Send Audio"
msgstr "Bidali audioa"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Txandakatu audioaren igorpena"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:19
msgid "V_ideo"
msgstr "_Bideoa"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:20
+msgid "Video"
+msgstr "Bideoa"
+
+#: ../src/empathy-call-window.ui.h:21
msgid "Video Off"
msgstr "Itzali bideoa"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:22
msgid "Video On"
msgstr "Piztu bideoa"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:23
msgid "Video Preview"
msgstr "Bideoaren aurrebista"
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr "_Deitu"
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
msgid "_View"
msgstr "_Ikusi"
-#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d irakurri gabe)"
msgstr[1] "%s (%d irakurri gabe)"
-#: ../src/empathy-chat-window.c:448
+#: ../src/empathy-chat-window.c:464
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (eta beste %u)"
msgstr[1] "%s (eta beste %u)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:480
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d irakurri gabe besteengandik)"
msgstr[1] "%s (%d irakurri gabe besteengandik)"
-#: ../src/empathy-chat-window.c:473
+#: ../src/empathy-chat-window.c:489
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d irakurri gabe guztietatik)"
msgstr[1] "%s (%d irakurri gabe guztietatik)"
-#: ../src/empathy-chat-window.c:676
+#: ../src/empathy-chat-window.c:695
msgid "Typing a message."
msgstr "Mezua idazten."
@@ -2651,55 +3036,63 @@ msgstr "Eraman fitxa e_zkerrera"
msgid "Move Tab _Right"
msgstr "Eraman fitxa e_skuinera"
-#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "Jakinarazi mezu guztientzat"
+
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
msgid "_Contents"
msgstr "_Edukia"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "_Berriketa"
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:11
msgid "_Detach Tab"
msgstr "E_zabatu fitxa"
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
msgid "_Edit"
msgstr "_Editatu"
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "_Gogoko berriketa-gela"
-#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
msgid "_Help"
msgstr "_Laguntza"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "_Hurrengo fitxa"
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:16
msgid "_Previous Tab"
msgstr "_Aurreko fitxa"
-#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "_Erakutsi kontaktu-zerrenda"
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:18
msgid "_Tabs"
msgstr "_Fitxak"
-#: ../src/empathy-chatrooms-window.c:256
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "_Desegin fitxa ixtea"
+
+#: ../src/empathy-chatrooms-window.c:241
msgid "Name"
msgstr "Izena"
-#: ../src/empathy-chatrooms-window.c:274
+#: ../src/empathy-chatrooms-window.c:259
msgid "Room"
msgstr "Gela"
-#: ../src/empathy-chatrooms-window.c:282
+#: ../src/empathy-chatrooms-window.c:267
msgid "Auto-Connect"
msgstr "Konektatu automatikoki"
@@ -2707,76 +3100,86 @@ msgstr "Konektatu automatikoki"
msgid "Manage Favorite Rooms"
msgstr "Kudeatu gogoko gelak"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming video call"
msgstr "Sarrerako bideo-deia"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming call"
msgstr "Sarrerako deia"
-#: ../src/empathy-event-manager.c:343
+#: ../src/empathy-event-manager.c:472
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s bideoz deitzen ari zaizu. Nahi duzu erantzutea?"
-#: ../src/empathy-event-manager.c:344
+#: ../src/empathy-event-manager.c:473
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s deitzen ari zaizu. Nahi duzu erantzutea?"
-#: ../src/empathy-event-manager.c:366
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Sarrerako deia %s-(e)ndik"
+
+#: ../src/empathy-event-manager.c:501
msgid "_Reject"
msgstr "Ez ona_rtu"
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:507
msgid "_Answer"
msgstr "_Erantzun"
-#: ../src/empathy-event-manager.c:489
+#: ../src/empathy-event-manager.c:618
#, c-format
msgid "Incoming video call from %s"
msgstr "Sarrerako bideoko deia %s-(e)ndik"
-#: ../src/empathy-event-manager.c:489
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Sarrerako deia %s-(e)ndik"
-
-#: ../src/empathy-event-manager.c:579
+#: ../src/empathy-event-manager.c:695
msgid "Room invitation"
msgstr "Gelarako gonbitea"
-#: ../src/empathy-event-manager.c:582
+#: ../src/empathy-event-manager.c:697
+#, c-format
+msgid "Invitation to join %s"
+msgstr "'%s'(e)ra elkartzeko gonbitea"
+
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s(e)k gonbidatzen zaitu '%s'(e)ra elkartzeko"
-#: ../src/empathy-event-manager.c:590
+#: ../src/empathy-event-manager.c:712
msgid "_Decline"
msgstr "_Ukatu"
-#: ../src/empathy-event-manager.c:595
+#: ../src/empathy-event-manager.c:717
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Elkartu"
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:743
#, c-format
msgid "%s invited you to join %s"
msgstr "%s(e)k gonbidatu zaitu '%s'(e)ra elkartzeko"
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:749
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "'%s'(e)ra elkartzeko gonbidatua izan zara"
+
+#: ../src/empathy-event-manager.c:797
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Sarrerako fitxategi-transferentzia %s-(e)ndik"
-#: ../src/empathy-event-manager.c:818
+#: ../src/empathy-event-manager.c:1005
#, c-format
msgid "Subscription requested by %s"
msgstr "%s-(e)k harpidetzea eskatu du"
-#: ../src/empathy-event-manager.c:822
+#: ../src/empathy-event-manager.c:1009
#, c-format
msgid ""
"\n"
@@ -2785,119 +3188,116 @@ msgstr ""
"\n"
"Mezua: %s"
-#. someone is logging off
-#: ../src/empathy-event-manager.c:862
+#: ../src/empathy-event-manager.c:1052
#, c-format
msgid "%s is now offline."
msgstr "%s lineaz kanpo dago."
-#. someone is logging in
-#: ../src/empathy-event-manager.c:878
+#: ../src/empathy-event-manager.c:1072
#, c-format
msgid "%s is now online."
msgstr "%s linean dago."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u:%02u.%02u"
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:179
-#| msgid "unknown"
+#: ../src/empathy-ft-manager.c:178
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Ezezaguna"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s / %s (%s/s)"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s"
msgstr "%s / %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "\"%s\" hemendik jasotzen: %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "\"%s\" honi bidaltzen: %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Errorea \"%s\" hemendik jasotzean: %s"
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
msgid "Error receiving a file"
msgstr "Errorea fitxategi bat jasotzean"
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Errorea \"%s\" honi bidaltzean: %s"
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
msgid "Error sending a file"
msgstr "Errorea fitxategi bat bidaltzean"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
#, c-format
msgid "\"%s\" received from %s"
msgstr "\"%s\" hemendik jasota: %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
#, c-format
msgid "\"%s\" sent to %s"
msgstr "\"%s\" honi bidalita: %s"
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
msgid "File transfer completed"
msgstr "Fitxategi-transferentzia osatuta"
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
msgid "Waiting for the other participant's response"
msgstr "Beste partaideen erantzunaren zai"
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "\"%s\"(r)en osotasuna egiaztatzen"
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "\"%s\"(r)en hash-a egiten"
-#: ../src/empathy-ft-manager.c:991
+#: ../src/empathy-ft-manager.c:996
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1003
+#: ../src/empathy-ft-manager.c:1008
msgid "File"
msgstr "Fitxategia"
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1030
msgid "Remaining"
msgstr "Falta:"
@@ -2924,160 +3324,159 @@ msgid "Import Accounts"
msgstr "Inportatu kontuak"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:290
+#: ../src/empathy-import-widget.c:292
msgid "Import"
msgstr "Inportatu"
-#: ../src/empathy-import-widget.c:299
+#: ../src/empathy-import-widget.c:301
msgid "Protocol"
msgstr "Protokoloa"
-#: ../src/empathy-import-widget.c:323
+#: ../src/empathy-import-widget.c:325
msgid "Source"
msgstr "Iturburua"
-#: ../src/empathy-import-mc4-accounts.c:106
-#, c-format
-msgid "%s account"
-msgstr "%s kontua"
+#: ../src/empathy-main-window.c:383
+msgid "No match found"
+msgstr "Ez da bat datorrenik aurkitu"
-#: ../src/empathy-main-window.c:437
+#: ../src/empathy-main-window.c:535
msgid "Reconnect"
msgstr "Berriz konektatu"
-#: ../src/empathy-main-window.c:443
+#: ../src/empathy-main-window.c:541
msgid "Edit Account"
msgstr "Editatu kontua"
-#: ../src/empathy-main-window.c:449
+#: ../src/empathy-main-window.c:547
msgid "Close"
msgstr "Itxi"
-#: ../src/empathy-main-window.c:1033
+#: ../src/empathy-main-window.c:1229
msgid "Contact"
msgstr "Kontaktua"
-#: ../src/empathy-main-window.c:1414
+#: ../src/empathy-main-window.c:1554
+msgid "Contact List"
+msgstr "Kontaktuen zerrenda"
+
+#: ../src/empathy-main-window.c:1663
msgid "Show and edit accounts"
msgstr "Erakutsi eta editatu kontuak"
#: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "Kontaktuen zerrenda"
-
-#: ../src/empathy-main-window.ui.h:2
msgid "Contacts on a _Map"
msgstr "Kontaktuak _mapa batean"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
msgid "Context"
msgstr "Testuingurua"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
msgid "Join _Favorites"
msgstr "Elkartu _gogokoetan"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
msgid "Manage Favorites"
msgstr "Kudeatu gogokoak"
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
msgid "N_ormal Size"
msgstr "Tamaina _normala"
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "Dei _berria..."
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
msgid "Normal Size With _Avatars"
msgstr "Tamaina normala _avatarrekin"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
msgid "P_references"
msgstr "_Hobespenak"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
msgid "Show P_rotocols"
msgstr "Erakutsi p_rotokoloak"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
msgid "Sort by _Name"
msgstr "Ordenatu _izenarekiko"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Status"
msgstr "Ordenatu _egoerarekiko"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
msgid "_Accounts"
msgstr "_Kontuak"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
msgid "_Compact Size"
msgstr "Tamaina _trinkoa"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17
msgid "_Debug"
msgstr "_Araztu"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19
msgid "_File Transfers"
msgstr "_Fitxategi-transferentziak"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21
msgid "_Join…"
msgstr "_Elkartu..."
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_Berriketa berria..."
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23
msgid "_Offline Contacts"
msgstr "_Konektatu gabeko kontaktuak"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24
msgid "_Personal Information"
msgstr "_Informazio pertsonala"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26
msgid "_Room"
msgstr "_Gela"
-#: ../src/empathy-new-chatroom-dialog.c:338
+#: ../src/empathy-new-chatroom-dialog.c:379
msgid "Chat Room"
msgstr "Berriketa-gela"
-#: ../src/empathy-new-chatroom-dialog.c:354
+#: ../src/empathy-new-chatroom-dialog.c:395
msgid "Members"
msgstr "Kideak"
#. 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:607
#, c-format
msgid ""
-"<b>%s</b>\n"
+"%s\n"
"Invite required: %s\n"
"Password required: %s\n"
"Members: %s"
msgstr ""
-"<b>%s</b>\n"
+"%s\n"
"Gonbidapena behar da: %s\n"
"Pasahitza behar da: %s\n"
"Kideak: %s"
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "No"
msgstr "Ez"
-#: ../src/empathy-new-chatroom-dialog.c:569
+#: ../src/empathy-new-chatroom-dialog.c:638
msgid "Could not start room listing"
msgstr "Ezin izan da gelen zerrenda abiarazi"
-#: ../src/empathy-new-chatroom-dialog.c:579
+#: ../src/empathy-new-chatroom-dialog.c:648
msgid "Could not stop room listing"
msgstr "Ezin izan da gelen zerrenda gelditu"
@@ -3111,62 +3510,66 @@ msgstr "Gelen zerrenda"
msgid "_Room:"
msgstr "_Gela:"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:138
msgid "Message received"
msgstr "Mezua jasota"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:139
msgid "Message sent"
msgstr "Mezua bidalita"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:140
msgid "New conversation"
msgstr "Berriketa berria"
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:141
msgid "Contact goes online"
msgstr "Kontaktua linean dago"
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:142
msgid "Contact goes offline"
msgstr "Kontaktua lineaz kanpo dago"
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:143
msgid "Account connected"
msgstr "Kontua konektatuta"
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:144
msgid "Account disconnected"
msgstr "Kontua deskonektatuta"
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:445
msgid "Language"
msgstr "Hizkuntza"
+#: ../src/empathy-preferences.c:882
+msgid "Preferences"
+msgstr "Hobespenak"
+
#: ../src/empathy-preferences.ui.h:1
msgid "Appearance"
msgstr "Itxura"
#: ../src/empathy-preferences.ui.h:2
-msgid "Automatically _connect on startup "
-msgstr "Automatikoki _konektatu abiatzean "
-
-#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Portaera"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
msgid "Chat Th_eme:"
msgstr "Berriketa-_gaia:"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
msgid "Disable notifications when _away or busy"
msgstr "Desgaitu jakinarazpenak _aldentzean edo lanpetuta egotean"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable sounds when _away or busy"
msgstr "Desgaitu soinuak _aldentzean edo lanpetuta egotean"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "Bistaratu sarrerako gertaerak jakinarazpen-arean"
+
#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
msgstr "Gaitu jakinarazpenak kontaktu bat konektatzen denean"
@@ -3192,17 +3595,17 @@ msgid "Location sources:"
msgstr "Kokalekuaren iturburuak:"
#: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr "Erregistratu berriketak"
+
+#: ../src/empathy-preferences.ui.h:15
msgid "Notifications"
msgstr "Jakinarazpenak"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:16
msgid "Play sound for events"
msgstr "Jo soinua gertaeretan"
-#: ../src/empathy-preferences.ui.h:16
-msgid "Preferences"
-msgstr "Hobespenak"
-
#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "Pribatutasuna"
@@ -3244,41 +3647,62 @@ msgid "Themes"
msgstr "Gaiak"
#: ../src/empathy-preferences.ui.h:25
+msgid "_Automatically connect on startup"
+msgstr "Automatikoki _konektatu abiatzean"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Cellphone"
msgstr "_Telefono mugikorra"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable bubble notifications"
msgstr "_Gaitu jakinarazpen-burbuilak"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable sound notifications"
msgstr "_Gaitu soinu-jakinarazpenak"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "_Network (IP, Wi-Fi)"
msgstr "_Sarea (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Open new chats in separate windows"
msgstr "_Ireki berriketa berriak beste leihoetan"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Publish location to my contacts"
msgstr "_Erakutsi kokalekua nire kontaktuei"
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
msgid "_Reduce location accuracy"
msgstr "_Murriztu kokalekuaren zehaztasuna"
-#: ../src/empathy-status-icon.c:176
+#: ../src/empathy-status-icon.c:141
msgid "Respond"
msgstr "Erantzun"
+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "Baztertu"
+
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "Erantzun"
+
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "Ukatu"
+
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "Onartu"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Egoera"
@@ -3287,67 +3711,67 @@ msgstr "Egoera"
msgid "_Quit"
msgstr "I_rten"
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:452
msgid "Contact Map View"
msgstr "Kontaktuen maparen ikuspegia"
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1219
msgid "Save"
msgstr "Gorde"
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1395
msgid "Debug Window"
msgstr "Arazketa-leihoa"
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1475
msgid "Pause"
msgstr "Pausatu"
-#: ../src/empathy-debug-window.c:1311
+#: ../src/empathy-debug-window.c:1487
msgid "Level "
msgstr "Maila: "
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1507
msgid "Debug"
msgstr "Arazketa"
-#: ../src/empathy-debug-window.c:1337
+#: ../src/empathy-debug-window.c:1513
msgid "Info"
msgstr "Informazioa"
-#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
msgid "Message"
msgstr "Mezua"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1525
msgid "Warning"
msgstr "Abisua"
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1531
msgid "Critical"
msgstr "Kritikoa"
-#: ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1537
msgid "Error"
msgstr "Errorea"
-#: ../src/empathy-debug-window.c:1380
+#: ../src/empathy-debug-window.c:1556
msgid "Time"
msgstr "Ordua"
-#: ../src/empathy-debug-window.c:1383
+#: ../src/empathy-debug-window.c:1559
msgid "Domain"
msgstr "Domeinua"
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1561
msgid "Category"
msgstr "Kategoria"
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1563
msgid "Level"
msgstr "Maila"
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1600
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3362,31 +3786,35 @@ msgstr "Gonbidatu partaidea"
msgid "Choose a contact to invite into the conversation:"
msgstr "Aukeratu kontaktua berriketara gonbidatzeko:"
-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "Gonbidatu"
+
+#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
"Ez bistaratu inolako elkarrizketa-koadrorik. Landu eginbeharrekoak (adib. "
"inportatzea) eta irten"
-#: ../src/empathy-accounts.c:217
-msgid "Don't display any dialogs if there are any non-salut accounts"
+#: ../src/empathy-accounts.c:186
+msgid "Don't display any dialogs if there are any non-Salut accounts"
msgstr ""
-"Ez bistaratu inolako elkarrizketa-koadrorik 'salut' ez den kontuak egonez "
+"Ez bistaratu inolako elkarrizketa-koadrorik 'Salut' ez den kontuak egonez "
"gero"
-#: ../src/empathy-accounts.c:221
+#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "Hasieran hautatu emandako kontua (adib. gabble/jabber/foo_40adibidea_2eorg0)"
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:192
msgid "<account-id>"
msgstr "<kontuaren-IDa>"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:200
msgid "- Empathy Accounts"
msgstr "- Empathy kontuak"
-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:216
msgid "Empathy Accounts"
msgstr "Empathy kontuak"
diff --git a/po/fr.po b/po/fr.po
index 5fcfa05ed..518931ab1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -27,8 +27,8 @@ 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-09-06 12:29+0000\n"
-"PO-Revision-Date: 2010-09-06 20:23+0200\n"
+"POT-Creation-Date: 2010-09-21 07:37+0000\n"
+"PO-Revision-Date: 2010-09-22 10:51+0200\n"
"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
"Language-Team: GNOME French Team  <gnomefr@traduc.org>\n"
"MIME-Version: 1.0\n"
@@ -513,7 +513,7 @@ msgstr "Gestion des comptes de messagerie et VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2151
+#: ../src/empathy-accounts-dialog.c:2157
msgid "Messaging and VoIP Accounts"
msgstr "Comptes de messagerie et VoIP"
@@ -564,143 +564,143 @@ msgstr "Erreur lors du téléchargement du fichier"
msgid "The other participant is unable to transfer the file"
msgstr "Le correspondant n'est pas capable de transférer le fichier"
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "Raison inconnue"
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Disponible"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Occupé"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Absent"
-#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Invisible"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Déconnecté"
-#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883
-#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885
-#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
+#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
+#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Inconnu"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "Aucune raison n'a été indiquée"
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "L'état est « déconnecté »"
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Erreur réseau"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "L'authentification a échoué"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Erreur de chiffrement"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "Nom déjà utilisé"
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "Certificat non fourni"
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "Certificat non validé"
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "Le certificat a expiré"
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "Certificat non activé"
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "Le nom de l'hôte du certificat ne correspond pas"
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "L'empreinte du certificat ne correspond pas"
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "Certificat auto-signé"
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Erreur de certificat"
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:356
msgid "Encryption is not available"
msgstr "Chiffrement non disponible"
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:358
msgid "Certificate is invalid"
msgstr "Le certificat n'est pas valide"
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:360
msgid "Connection has been refused"
msgstr "La connexion a été refusée"
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:362
msgid "Connection can't be established"
msgstr "La connexion ne peut pas être établie"
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:364
msgid "Connection has been lost"
msgstr "La connexion a été perdue"
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:366
msgid "This resource is already connected to the server"
msgstr "Cette ressource est déjà connectée au serveur"
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:368
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr ""
"La connexion a été remplacée par une nouvelle connexion utilisant la même "
"ressource"
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:371
msgid "The account already exists on the server"
msgstr "Ce compte existe déjà sur le serveur"
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:373
msgid "Server is currently too busy to handle the connection"
msgstr "Le serveur est actuellement trop chargé pour traiter la connexion"
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:375
msgid "Certificate has been revoked"
msgstr "Le certificat a été révoqué"
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:377
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"Le certificat utilise un algorithme de chiffrement douteux ou est "
"cryptographiquement faible"
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:380
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -709,15 +709,16 @@ msgstr ""
"certificat du serveur dépasse les limites imposées par la bibliothèque "
"cryptographique"
-#: ../libempathy/empathy-utils.c:540
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Personnes à proximité"
-#: ../libempathy/empathy-utils.c:545
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! Japon"
-#: ../libempathy/empathy-utils.c:546
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "Discussion Facebook"
@@ -801,16 +802,16 @@ msgstr "%s :"
msgid "Username:"
msgstr "Nom d'utilisateur :"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "A_ppliquer"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "Se _connecter"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -819,19 +820,19 @@ msgstr "Se _connecter"
msgid "Account:"
msgstr "Compte :"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "_Activé"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Ce compte existe déjà sur le serveur"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Créer un nouveau compte sur le serveur"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "A_nnuler"
@@ -840,19 +841,19 @@ msgstr "A_nnuler"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s sur %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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "Compte %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Nouveau compte"
@@ -899,7 +900,7 @@ msgstr "Quel est votre nom à l'écran AIM ?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Port :"
@@ -908,7 +909,7 @@ msgstr "_Port :"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Serveur :"
@@ -1219,22 +1220,18 @@ msgstr ""
"_Ignorer les invitations à des conférences ou à des salons de discussion"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Utiliser _Yahoo! Japan"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "Quel est votre identifiant Yahoo! ?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Quel est votre mot de passe Yahoo! ?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "I_dentifiant Yahoo! :"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "Codage de la liste des _salons :"
@@ -1466,7 +1463,7 @@ msgstr "%s a rejoint le salon"
msgid "%s is now known as %s"
msgstr "%s est maintenant connu sous le nom de %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
msgid "Disconnected"
msgstr "Déconnecté"
@@ -1535,6 +1532,14 @@ msgstr "Décider plus _tard"
msgid "Subscription Request"
msgstr "Requête d'abonnement"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Non groupés"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Contacts favoris"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1606,7 +1611,7 @@ msgid "Share My Desktop"
msgstr "Partager mon bureau"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1662,129 +1667,129 @@ msgstr "Site Web :"
msgid "Birthday:"
msgstr "Anniversaire :"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Code ISO du pays :"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Pays :"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "État :"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Ville :"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Région :"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Code postal :"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Rue :"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Bâtiment :"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Étage :"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Salon :"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Texte :"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Description :"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI :"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Niveau de précision :"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Erreur :"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Erreur verticale (mètres) :"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Erreur horizontale (mètres) :"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Vitesse :"
# http://fr.wikipedia.org/wiki/Rel%C3%A8vement
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Relèvement :"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Vitesse ascensionnelle :"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Dernière mise à jour le :"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Longitude :"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Latitude :"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Altitude :"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1792,23 +1797,23 @@ msgid "Location"
msgstr "Emplacement"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B %Y à %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Enregistrer l'avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Impossible d'enregistrer l'avatar"
@@ -1949,16 +1954,16 @@ msgstr "SSL"
#. Translators: this is the title of the linking dialogue (reached by
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
+#: ../libempathy-gtk/empathy-linking-dialog.c:116
msgid "Link Contacts"
msgstr "Lier des contacts"
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "_Séparer…"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
msgid ""
"Completely split the displayed meta-contact into the contacts it contains."
msgstr ""
@@ -1968,16 +1973,16 @@ msgstr ""
#. Translators: this is an action button in the linking dialogue. "Link" is
#. * used here as a verb meaning "to connect two contacts to form a
#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
+#: ../libempathy-gtk/empathy-linking-dialog.c:137
msgid "_Link"
msgstr "_Lier"
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "Séparer le méta-contact « %s » ?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:185
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
msgid ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
@@ -1985,7 +1990,7 @@ msgstr ""
"Voulez-vous réellement séparer ce méta-contact ? Tous les contacts qu'il "
"contient seront recréés séparément."
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
+#: ../libempathy-gtk/empathy-linking-dialog.c:191
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Séparer"
@@ -2542,7 +2547,7 @@ msgstr ""
"tard à partir du menu Édition."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1310
+#: ../src/empathy-account-assistant.c:1316
msgid "An error occurred"
msgstr "Une erreur est survenue"
@@ -2556,31 +2561,31 @@ msgstr "Une erreur est survenue"
msgid "New %s account"
msgstr "Nouveau compte %s"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:515
msgid "What kind of chat account do you have?"
msgstr "Quel type de compte de discussion possédez-vous ?"
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:521
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Désirez-vous paramétrer d'autres comptes de discussion ?"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:527
msgid "Enter your account details"
msgstr "Saisissez les détails de votre compte"
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:532
msgid "What kind of chat account do you want to create?"
msgstr "Quel type de compte de discussion voulez-vous créer ?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Do you want to create other chat accounts?"
msgstr "Désirez-vous créer d'autres comptes de discussion ?"
-#: ../src/empathy-account-assistant.c:539
+#: ../src/empathy-account-assistant.c:545
msgid "Enter the details for the new account"
msgstr "Saisissez les détails de votre nouveau compte"
-#: ../src/empathy-account-assistant.c:654
+#: ../src/empathy-account-assistant.c:660
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 "
@@ -2592,45 +2597,45 @@ msgstr ""
"et bien d'autres programmes de discussion. À l'aide d'un microphone ou d'une "
"webcam, vous pouvez également leur parler et les voir en vidéo."
-#: ../src/empathy-account-assistant.c:671
+#: ../src/empathy-account-assistant.c:677
msgid "Do you have an account you've been using with another chat program?"
msgstr ""
"Possédez-vous un compte que vous avez utilisé avec un autre programme de "
"discussion ?"
-#: ../src/empathy-account-assistant.c:694
+#: ../src/empathy-account-assistant.c:700
msgid "Yes, import my account details from "
msgstr "Oui, importer les détails de mon compte à partir de "
-#: ../src/empathy-account-assistant.c:715
+#: ../src/empathy-account-assistant.c:721
msgid "Yes, I'll enter my account details now"
msgstr "Oui, je veux saisir les détails de mon compte maintenant"
-#: ../src/empathy-account-assistant.c:737
+#: ../src/empathy-account-assistant.c:743
msgid "No, I want a new account"
msgstr "Non, je veux un nouveau compte"
-#: ../src/empathy-account-assistant.c:747
+#: ../src/empathy-account-assistant.c:753
msgid "No, I just want to see people online nearby for now"
msgstr ""
"Non, je veux seulement voir les personnes connectées à proximité pour "
"l'instant"
-#: ../src/empathy-account-assistant.c:768
+#: ../src/empathy-account-assistant.c:774
msgid "Select the accounts you want to import:"
msgstr "Sélectionnez les comptes à importer :"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Oui"
-#: ../src/empathy-account-assistant.c:859
+#: ../src/empathy-account-assistant.c:865
msgid "No, that's all for now"
msgstr "Non, c'est tout pour l'instant"
-#: ../src/empathy-account-assistant.c:1124
+#: ../src/empathy-account-assistant.c:1130
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 "
@@ -2643,16 +2648,16 @@ msgstr ""
"pourrez facilement modifier ces détails plus tard ou désactiver cette "
"fonctionnalité en utilisant la boîte de dialogue « Comptes »"
-#: ../src/empathy-account-assistant.c:1130
-#: ../src/empathy-account-assistant.c:1186
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
msgid "Edit->Accounts"
msgstr "Édition -> Comptes"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1152
msgid "I don't want to enable this feature for now"
msgstr "Je ne veux pas activer cette fonctionnalité pour l'instant"
-#: ../src/empathy-account-assistant.c:1182
+#: ../src/empathy-account-assistant.c:1188
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 "
@@ -2664,23 +2669,23 @@ msgstr ""
"fonctionnalité, installez le paquet telepathy-salut et créez un compte "
"« Personnes à proximité » à l'aide de la boîte de dialogue Comptes"
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1194
msgid "telepathy-salut not installed"
msgstr "telepathy-salut n'est pas installé"
-#: ../src/empathy-account-assistant.c:1234
+#: ../src/empathy-account-assistant.c:1240
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Assistant des comptes de messagerie et VoIP"
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1274
msgid "Welcome to Empathy"
msgstr "Bienvenue dans Empathy"
-#: ../src/empathy-account-assistant.c:1277
+#: ../src/empathy-account-assistant.c:1283
msgid "Import your existing accounts"
msgstr "Importer vos comptes existants"
-#: ../src/empathy-account-assistant.c:1295
+#: ../src/empathy-account-assistant.c:1301
msgid "Please enter personal details"
msgstr "Saisissez vos détails personnels"
@@ -2697,7 +2702,7 @@ msgstr "Votre compte %s comporte des modifications non enregistrées."
msgid "Your new account has not been saved yet."
msgstr "Votre nouveau compte n'est pas encore enregistré."
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "Connexion en cours…"
@@ -2723,7 +2728,7 @@ msgstr "Statut inconnu"
msgid "Offline — Account Disabled"
msgstr "Hors ligne — Compte désactivé"
-#: ../src/empathy-accounts-dialog.c:805
+#: ../src/empathy-accounts-dialog.c:811
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2731,16 +2736,16 @@ msgstr ""
"Vous êtes sur le point de créer un nouveau compte, ce qui\n"
"annulera vos modifications. Voulez-vous vraiment continuer ?"
-#: ../src/empathy-accounts-dialog.c:1152
+#: ../src/empathy-accounts-dialog.c:1158
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Voulez-vous supprimer %s de votre ordinateur ?"
-#: ../src/empathy-accounts-dialog.c:1156
+#: ../src/empathy-accounts-dialog.c:1162
msgid "This will not remove your account on the server."
msgstr "Cela ne supprimera pas votre compte sur le serveur."
-#: ../src/empathy-accounts-dialog.c:1394
+#: ../src/empathy-accounts-dialog.c:1400
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2748,7 +2753,7 @@ msgstr ""
"Vous êtes sur le point de sélectionner un autre compte, ce qui\n"
"annulera vos modifications. Voulez-vous vraiment continuer ?"
-#: ../src/empathy-accounts-dialog.c:1997
+#: ../src/empathy-accounts-dialog.c:2003
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2820,70 +2825,70 @@ msgstr "Gamma"
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-call-window.c:1163
+#: ../src/empathy-call-window.c:1173
msgid "_Sidebar"
msgstr "Barre _latérale"
-#: ../src/empathy-call-window.c:1182
+#: ../src/empathy-call-window.c:1192
msgid "Audio input"
msgstr "Entrée audio"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1196
msgid "Video input"
msgstr "Entrée vidéo"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1200
msgid "Dialpad"
msgstr "Numéroteur"
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1205
msgid "Details"
msgstr "Détails"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1263
+#: ../src/empathy-call-window.c:1273
#, c-format
msgid "Call with %s"
msgstr "Conversation avec %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1342
+#: ../src/empathy-call-window.c:1352
msgid "Call"
msgstr "Appeler"
-#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-call-window.c:1506
msgid "The IP address as seen by the machine"
msgstr "L'adresse IP vue par la machine"
-#: ../src/empathy-call-window.c:1498
+#: ../src/empathy-call-window.c:1508
msgid "The IP address as seen by a server on the Internet"
msgstr "L'adresse IP vue par un serveur sur Internet"
-#: ../src/empathy-call-window.c:1500
+#: ../src/empathy-call-window.c:1510
msgid "The IP address of the peer as seen by the other side"
msgstr "L'adresse IP du client vue de l'autre côté"
-#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1512
msgid "The IP address of a relay server"
msgstr "L'adresse IP d'un serveur relai"
-#: ../src/empathy-call-window.c:1504
+#: ../src/empathy-call-window.c:1514
msgid "The IP address of the multicast group"
msgstr "L'adresse IP du groupe multidiffusion"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2247
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Connecté — %d:%02dm"
-#: ../src/empathy-call-window.c:2298
+#: ../src/empathy-call-window.c:2308
msgid "Technical Details"
msgstr "Détails techniques"
-#: ../src/empathy-call-window.c:2336
+#: ../src/empathy-call-window.c:2346
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2892,7 +2897,7 @@ msgstr ""
"Le logiciel de %s ne comprend aucun des formats audio pris en charge par "
"votre ordinateur"
-#: ../src/empathy-call-window.c:2341
+#: ../src/empathy-call-window.c:2351
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2901,7 +2906,7 @@ msgstr ""
"Le logiciel de %s ne comprend aucun des formats vidéo pris en charge par "
"votre ordinateur"
-#: ../src/empathy-call-window.c:2347
+#: ../src/empathy-call-window.c:2357
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2910,25 +2915,25 @@ msgstr ""
"Impossible d'établir une connexion avec %s. L'un d'entre vous utilise peut-"
"être un réseau qui n'autorise pas les connexions directes."
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2363
msgid "There was a failure on the network"
msgstr "Il y a eu une panne sur le réseau"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2367
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Les formats audio nécessaires pour cet appel ne sont pas installés sur votre "
"ordinateur"
-#: ../src/empathy-call-window.c:2360
+#: ../src/empathy-call-window.c:2370
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Les formats vidéo nécessaires pour cet appel ne sont pas installés sur votre "
"ordinateur"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2380
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2939,19 +2944,19 @@ msgstr ""
"\"%s\">Signalez cette anomalie</a> et joignez les journaux récupérés à "
"l'aide de la fenêtre « débogage » dans le menu d'aide."
-#: ../src/empathy-call-window.c:2378
+#: ../src/empathy-call-window.c:2388
msgid "There was a failure in the call engine"
msgstr "Erreur dans le moteur d'appel"
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-call-window.c:2391
msgid "The end of the stream was reached"
msgstr "La fin du flux a été atteinte"
-#: ../src/empathy-call-window.c:2421
+#: ../src/empathy-call-window.c:2431
msgid "Can't establish audio stream"
msgstr "Impossible d'établir le flux audio"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2441
msgid "Can't establish video stream"
msgstr "Impossible d'établir le flux vidéo"
@@ -2973,7 +2978,7 @@ msgstr "Caméra en fonctionnement"
#: ../src/empathy-call-window.ui.h:5
msgid "Decoding Codec:"
-msgstr "Codec déchiffrant :"
+msgstr "Décompression :"
#: ../src/empathy-call-window.ui.h:6
msgid "Disable camera and stop sending video"
@@ -2989,7 +2994,7 @@ msgstr "Activer la caméra mais ne pas envoyer la vidéo"
#: ../src/empathy-call-window.ui.h:9
msgid "Encoding Codec:"
-msgstr "Codec chiffrant :"
+msgstr "Compression :"
#: ../src/empathy-call-window.ui.h:10
msgid "Hang up"
diff --git a/po/gl.po b/po/gl.po
index ecdc145ff..cb4f611bf 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,21 +6,21 @@
# Antón Méixome <meixome@mancomun.org>, 2009.
# Antón Méixome <meixome@certima.net>, 2010.
# Francisco Diéguez <frandieguez@ubuntu.com>, 2010.
-# Fran Diéguez <frandieguez@ubuntu.com>,2009, 2010.
# Fran Dieguez <frandieguez@ubuntu.com>, 2009, 2010.
+# Fran Diéguez <frandieguez@ubuntu.com>,2009, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 18:07+0200\n"
-"PO-Revision-Date: 2010-09-06 18:09+0200\n"
-"Last-Translator: Fran Dieguez <frandieguez@ubuntu.com>\n"
+"POT-Creation-Date: 2010-09-21 10:04+0200\n"
+"PO-Revision-Date: 2010-09-21 10:04+0200\n"
+"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
"Language-Team: Galician <gnome-gl-list@gnome.org>\n"
+"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"X-Generator: KBabel 1.11.4\n"
@@ -576,7 +576,7 @@ msgstr "Xestionar as contas de mensaxaría e VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2151
+#: ../src/empathy-accounts-dialog.c:2157
msgid "Messaging and VoIP Accounts"
msgstr "Contas de mensaxaría e VoIP"
@@ -630,158 +630,158 @@ msgstr "Produciuse un erro ao tentar transferir o ficheiro"
msgid "The other participant is unable to transfer the file"
msgstr "O outro participante non pode transferir o ficheiro"
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "Motivo descoñecido"
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Dispoñíbel"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Ocupado"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Ausente"
-#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Invisíbel"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Desconectado"
-#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883
-#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885
-#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
+#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
+#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Descoñecido"
# rever
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "Non se especificou un motivo"
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "O estado está definido a desconectado"
# rever
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Erro de rede"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "Fallou a autenticación"
# rever
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Erro de cifrado"
# rever
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "Nome en uso"
# rever
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "Non se proporcionou o certificado"
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "Certificado non fiábel"
# rever
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "O certificado caducou"
# rever
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "O certificado non está activado"
# rever
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "O nome do host do certificado non coincide"
# rever
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "A impresión dixital do certificado non coincide"
# rever
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "Certificado autoasinado"
# rever
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Erro de certificado"
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:356
msgid "Encryption is not available"
msgstr "O cifrado non está dispoñíbel"
# rever
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:358
msgid "Certificate is invalid"
msgstr "O certificado non é válido"
# rever
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:360
msgid "Connection has been refused"
msgstr "Rexeitouse a conexión"
# rever
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:362
msgid "Connection can't be established"
msgstr "Non é posíbel estabelecer a conexión"
# rever
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:364
msgid "Connection has been lost"
msgstr "Perdeuse a conexión"
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:366
msgid "This resource is already connected to the server"
msgstr "Este recurso xa está conectado ao servidor"
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:368
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr ""
"A conexión foi substituída por unha nova conexión empregando o mesmo recurso"
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:371
msgid "The account already exists on the server"
msgstr "Esta conta xa existe no servidor"
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:373
msgid "Server is currently too busy to handle the connection"
msgstr "Nestes intres o servidor está moi ocupado para xesionar a conexión"
# rever
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:375
msgid "Certificate has been revoked"
msgstr "O certificado foi revocado"
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:377
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"O certificado usa un algoritmo de cifrado inseguro ou cripotograficamente "
"débil."
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:380
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -791,16 +791,17 @@ msgstr ""
"criptografía."
# rever
-#: ../libempathy/empathy-utils.c:540
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Persoas próximas"
# rever
-#: ../libempathy/empathy-utils.c:545
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:546
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "Chat de Facebook"
@@ -884,16 +885,16 @@ msgstr "%s:"
msgid "Username:"
msgstr "Nome de _usuario:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "A_plicar"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "Iniciar sesi_ón"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -902,19 +903,19 @@ msgstr "Iniciar sesi_ón"
msgid "Account:"
msgstr "Conta:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "_Activado"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Esta conta xa existe no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Crear unha nova conta no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "Ca_ncelar"
@@ -924,20 +925,20 @@ msgstr "Ca_ncelar"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s sobre %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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "Conta %s"
# rever
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Conta nova"
@@ -985,7 +986,7 @@ msgstr "Cal é o seu nome en patalla para AIM?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Porto:"
@@ -994,7 +995,7 @@ msgstr "_Porto:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Servidor:"
@@ -1311,26 +1312,21 @@ msgstr "Nome de _usuario:"
msgid "I_gnore conference and chat room invitations"
msgstr "I_gnorar os convites para conferencias e salas de conversa"
-# rever
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Usar o _Yahoo Japan"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "Cal é o seu ID para Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Cal é o seu contrasinal para Yahoo!?"
# rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "I_D de Yahoo:"
# rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "Configuración da lista de _salas:"
@@ -1568,7 +1564,7 @@ msgstr "%s uniuse á sala"
msgid "%s is now known as %s"
msgstr "%s agora é coñecido como %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
msgid "Disconnected"
msgstr "Desconectado"
@@ -1639,6 +1635,15 @@ msgstr "Decidir máis _adiante"
msgid "Subscription Request"
msgstr "Solicitude de subscrición"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Sen grupo"
+
+# rever
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Persoas favoritas"
+
# rever
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
@@ -1716,7 +1721,7 @@ msgstr "Compartir o meu escritorio"
# rever
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1775,129 +1780,129 @@ msgstr "Sitio web:"
msgid "Birthday:"
msgstr "Aniversario:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Código ISO de país:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "País:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Rexión:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Cidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Ãrea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Código postal:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Rúa:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Edificio:"
# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "_Andar:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Sala:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Texto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Descrición:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Nivel de precisión:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Erro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Erro vertical (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Erro horizontal (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Velocidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Orientación:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Velocidade de incremento:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Última actualización:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Lonxitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Latitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Altitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1905,25 +1910,25 @@ msgid "Location"
msgstr "Localización"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y de %R UTC"
# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Gardar o avatar"
# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Non foi posíbel gardar o avatar"
@@ -2072,16 +2077,16 @@ msgstr "SSL"
#. Translators: this is the title of the linking dialogue (reached by
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
+#: ../libempathy-gtk/empathy-linking-dialog.c:116
msgid "Link Contacts"
msgstr "Ligar contactos"
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "_Desligar..."
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
msgid ""
"Completely split the displayed meta-contact into the contacts it contains."
msgstr ""
@@ -2091,16 +2096,16 @@ msgstr ""
#. Translators: this is an action button in the linking dialogue. "Link" is
#. * used here as a verb meaning "to connect two contacts to form a
#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
+#: ../libempathy-gtk/empathy-linking-dialog.c:137
msgid "_Link"
msgstr "_Ligar"
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "Desligar o meta-contacto «%s»?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:185
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
msgid ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
@@ -2108,7 +2113,7 @@ msgstr ""
"Está seguro que quere desligar este meta-contacto? Isto separará por "
"completo o meta-contacto nos contactos que contén."
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
+#: ../libempathy-gtk/empathy-linking-dialog.c:191
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Desligar"
@@ -2683,7 +2688,7 @@ msgstr ""
"deste asistente e engadir as contas máis tarde desde o menú Editar."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1310
+#: ../src/empathy-account-assistant.c:1316
msgid "An error occurred"
msgstr "Produciuse un erro"
@@ -2698,33 +2703,33 @@ msgstr "Produciuse un erro"
msgid "New %s account"
msgstr "Conta nova de %s"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:515
msgid "What kind of chat account do you have?"
msgstr "Que clase de conta de chat ten?"
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:521
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Ten algunha outra conta de chat que queira estabelecer?"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:527
msgid "Enter your account details"
msgstr "Introduza os seus detalles de conta"
# rever
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:532
msgid "What kind of chat account do you want to create?"
msgstr "Que clase de conta de chat quere crear?"
# rever
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Do you want to create other chat accounts?"
msgstr "Quere crear outras contas de chat?"
-#: ../src/empathy-account-assistant.c:539
+#: ../src/empathy-account-assistant.c:545
msgid "Enter the details for the new account"
msgstr "Introduza os detalles para a nova conta"
-#: ../src/empathy-account-assistant.c:654
+#: ../src/empathy-account-assistant.c:660
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 "
@@ -2735,41 +2740,41 @@ msgstr ""
"usen Google Talk, AIM, Windows Live e calquera outro programa de chat. Cun "
"micrófono ou unha cámara web tamén pode ter chamadas de audio ou vídeo."
-#: ../src/empathy-account-assistant.c:671
+#: ../src/empathy-account-assistant.c:677
msgid "Do you have an account you've been using with another chat program?"
msgstr "Ten algunha outra conta que estea usando con outro programa de chat?"
-#: ../src/empathy-account-assistant.c:694
+#: ../src/empathy-account-assistant.c:700
msgid "Yes, import my account details from "
msgstr "Si, importar os detalles da miña conta desde "
-#: ../src/empathy-account-assistant.c:715
+#: ../src/empathy-account-assistant.c:721
msgid "Yes, I'll enter my account details now"
msgstr "Si, introducirei os meus detalles de conta agora"
-#: ../src/empathy-account-assistant.c:737
+#: ../src/empathy-account-assistant.c:743
msgid "No, I want a new account"
msgstr "Non, quero crear unha conta nova"
-#: ../src/empathy-account-assistant.c:747
+#: ../src/empathy-account-assistant.c:753
msgid "No, I just want to see people online nearby for now"
msgstr "Non, só quero ver á xente conectada que estea próxima por agora"
-#: ../src/empathy-account-assistant.c:768
+#: ../src/empathy-account-assistant.c:774
msgid "Select the accounts you want to import:"
msgstr "Seleccione as contas que quere importar:"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Si"
-#: ../src/empathy-account-assistant.c:859
+#: ../src/empathy-account-assistant.c:865
msgid "No, that's all for now"
msgstr "Non, isto é todo por agora"
-#: ../src/empathy-account-assistant.c:1124
+#: ../src/empathy-account-assistant.c:1130
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 "
@@ -2782,16 +2787,16 @@ msgstr ""
"detalles máis tarde ou desactivar esta característica usando o diálogo "
"\"Contas\""
-#: ../src/empathy-account-assistant.c:1130
-#: ../src/empathy-account-assistant.c:1186
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
msgid "Edit->Accounts"
msgstr "Editar->Contas"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1152
msgid "I don't want to enable this feature for now"
msgstr "Non quero activar esta característica agora"
-#: ../src/empathy-account-assistant.c:1182
+#: ../src/empathy-account-assistant.c:1188
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 "
@@ -2803,24 +2808,24 @@ msgstr ""
"Se quere activar esta característica, instale o paquete telepathy-salut e "
"cree unha conta de Xente próxima desde o diálogo Contas"
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1194
msgid "telepathy-salut not installed"
msgstr "telepathy-salut non está instalado"
-#: ../src/empathy-account-assistant.c:1234
+#: ../src/empathy-account-assistant.c:1240
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Asistente de contas de mensaxaría e VoIP"
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1274
msgid "Welcome to Empathy"
msgstr "Benvido/a ao Empathy"
# rever
-#: ../src/empathy-account-assistant.c:1277
+#: ../src/empathy-account-assistant.c:1283
msgid "Import your existing accounts"
msgstr "_Importar as súas contas existentes"
-#: ../src/empathy-account-assistant.c:1295
+#: ../src/empathy-account-assistant.c:1301
msgid "Please enter personal details"
msgstr "Insira os detalles persoais"
@@ -2837,7 +2842,7 @@ msgstr "Hai modificacións sen gardar respecto da súa conta %s."
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:281 ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "Conectando..."
@@ -2864,7 +2869,7 @@ msgid "Offline — Account Disabled"
msgstr "Desconectado — Conta desactivada"
# rever
-#: ../src/empathy-accounts-dialog.c:805
+#: ../src/empathy-accounts-dialog.c:811
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2873,17 +2878,17 @@ msgstr ""
"Está seguro de que quere proceder?"
# rever
-#: ../src/empathy-accounts-dialog.c:1152
+#: ../src/empathy-accounts-dialog.c:1158
#, 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:1156
+#: ../src/empathy-accounts-dialog.c:1162
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:1394
+#: ../src/empathy-accounts-dialog.c:1400
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2892,7 +2897,7 @@ msgstr ""
"Está seguro de que quere proceder?"
# rever
-#: ../src/empathy-accounts-dialog.c:1997
+#: ../src/empathy-accounts-dialog.c:2003
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2970,75 +2975,75 @@ msgstr "Gamma"
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-call-window.c:1163
+#: ../src/empathy-call-window.c:1173
msgid "_Sidebar"
msgstr "Barra _lateral"
# rever
-#: ../src/empathy-call-window.c:1182
+#: ../src/empathy-call-window.c:1192
msgid "Audio input"
msgstr "Entrada de audio"
# rever
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1196
msgid "Video input"
msgstr "Entrada de vídeo"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1200
msgid "Dialpad"
msgstr "Marcador"
# rever
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1205
msgid "Details"
msgstr "Detalles do contacto"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1263
+#: ../src/empathy-call-window.c:1273
#, c-format
msgid "Call with %s"
msgstr "Chamar con %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1342
+#: ../src/empathy-call-window.c:1352
msgid "Call"
msgstr "Chamar"
-#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-call-window.c:1506
msgid "The IP address as seen by the machine"
msgstr "O enderezo IP como é visto polo computador"
-#: ../src/empathy-call-window.c:1498
+#: ../src/empathy-call-window.c:1508
msgid "The IP address as seen by a server on the Internet"
msgstr "O enderezo IP como é visto por un servidor na Internet"
-#: ../src/empathy-call-window.c:1500
+#: ../src/empathy-call-window.c:1510
msgid "The IP address of the peer as seen by the other side"
msgstr "O enderezo IP do par como é visto pola outra parte"
-#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1512
msgid "The IP address of a relay server"
msgstr "O enderezo IP dun servidor de desvío"
-#: ../src/empathy-call-window.c:1504
+#: ../src/empathy-call-window.c:1514
msgid "The IP address of the multicast group"
msgstr "O enderezo IP do grupo multicast"
# rever
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2247
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Conectado — %d:%02dm"
# rever
-#: ../src/empathy-call-window.c:2298
+#: ../src/empathy-call-window.c:2308
msgid "Technical Details"
msgstr "Detalles técnicos"
-#: ../src/empathy-call-window.c:2336
+#: ../src/empathy-call-window.c:2346
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3047,7 +3052,7 @@ msgstr ""
"O software de %s non entende algúns dos formatos de video admitidos polo seu "
"computador"
-#: ../src/empathy-call-window.c:2341
+#: ../src/empathy-call-window.c:2351
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3056,7 +3061,7 @@ msgstr ""
"O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
"computador"
-#: ../src/empathy-call-window.c:2347
+#: ../src/empathy-call-window.c:2357
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3065,44 +3070,44 @@ msgstr ""
"Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede "
"que non permite conexións directas."
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2363
msgid "There was a failure on the network"
msgstr "Produciuse un fallo na rede"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2367
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "Non ten instalados os formatos de audio necesarios neste computador"
-#: ../src/empathy-call-window.c:2360
+#: ../src/empathy-call-window.c:2370
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "Non ten instalados os formatos de vídeo necesarios neste computador"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2380
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
"the Help menu."
msgstr ""
-"Produciuse un fallo non esperado no compoñente Telepathy. <a href=«%"
-"s»>Informe de este erro</a> e anexe os rexistros que pode ollar na xanela "
-"«Depurar» no menú Axuda."
+"Produciuse un fallo non esperado no compoñente Telepathy. <a "
+"href=«%s»>Informe de este erro</a> e anexe os rexistros que pode ollar na "
+"xanela «Depurar» no menú Axuda."
-#: ../src/empathy-call-window.c:2378
+#: ../src/empathy-call-window.c:2388
msgid "There was a failure in the call engine"
msgstr "Produciuse un fallo ao chamar ao motor"
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-call-window.c:2391
msgid "The end of the stream was reached"
msgstr "Chegouse ao final do fluxo"
-#: ../src/empathy-call-window.c:2421
+#: ../src/empathy-call-window.c:2431
msgid "Can't establish audio stream"
msgstr "Non é posíbel estabelecer un fluxo de audio"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2441
msgid "Can't establish video stream"
msgstr "Non é posíbel estabelecer un fluxo de vídeo"
@@ -4120,6 +4125,10 @@ msgstr "Contas de Empathy"
msgid "Empathy Debugger"
msgstr "Depurador de Empathy"
+# rever
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "Usar o _Yahoo Japan"
+
#~ msgctxt "Link individual (contextual menu)"
#~ msgid "_Link…"
#~ msgstr "_Ligar..."
diff --git a/po/he.po b/po/he.po
index f1807d9d5..f39d0587f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 15:26+0300\n"
-"PO-Revision-Date: 2010-09-06 15:28+0200\n"
+"POT-Creation-Date: 2010-09-25 02:28+0200\n"
+"PO-Revision-Date: 2010-09-25 02:33+0200\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -451,7 +451,7 @@ msgstr "ניהול חשבונות התכתבות ו־VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2151
+#: ../src/empathy-accounts-dialog.c:2157
msgid "Messaging and VoIP Accounts"
msgstr "חשבונות התכתבות ו־VoIP"
@@ -499,140 +499,140 @@ msgstr "התרחשה שגי××” בזמן ניסיון העברת הקובץ"
msgid "The other participant is unable to transfer the file"
msgstr "המשתתף ×”×חר ×œ× ×™×›×•×œ להעביר ×ת הקובץ"
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "סיבה ×œ× ×™×“×•×¢×”"
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "זמין"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "עסוק"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "מרוחק"
-#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "בלתי נר××”"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "×œ× ×ž×—×•×‘×¨"
-#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883
-#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885
-#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
+#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
+#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "×œ× ×™×“×•×¢"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "×œ× ×¦×•×™×™× ×” סיבה"
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "המצב מוגדר כמנותק"
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "שגי×ת רשת"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "×”×ימות נכשל"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "שגי×ת הצפנה"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "×”×©× ×‘×©×™×ž×•×©"
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "×œ× ×¡×•×¤×§×” תעודה"
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "התעודה ××™× ×” מ×ובטחת"
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "התעודה ×œ× ×ª×§×¤×”"
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "התעודה ××™× ×” פעילה"
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "×©× ×”×ž×רח בתעודה ×œ× ×ª×•××"
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "טביעת ×”×צבע של התעודה ××™× ×” תו×מת"
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "תעודה בחתימה עצמית"
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "שגי×ת תעודה"
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:356
msgid "Encryption is not available"
msgstr "×ין הצפנה זמינה"
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:358
msgid "Certificate is invalid"
msgstr "התעודה שגויה"
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:360
msgid "Connection has been refused"
msgstr "החיבור נתקל בסירוב"
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:362
msgid "Connection can't be established"
msgstr "×œ× × ×™×ª×Ÿ ×œ×§×™×™× ×ת החיבור"
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:364
msgid "Connection has been lost"
msgstr "החיבור נקטע"
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:366
msgid "This resource is already connected to the server"
msgstr "המש×ב כבר מחובר לשרת"
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:368
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "החיבור הוחלף בחיבור חדש ב×מצעות ×ותו המש×ב"
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:371
msgid "The account already exists on the server"
msgstr "החשבון כבר ×§×™×™× ×‘×©×¨×ª"
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:373
msgid "Server is currently too busy to handle the connection"
msgstr "השרת עסוק מכדי לטפל בחיבור"
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:375
msgid "Certificate has been revoked"
msgstr "התעודה נשללה"
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:377
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"התעודה משתמשת ב××œ×’×•×¨×™×ª× ×”×¦×¤× ×” בלתי מ×ובטח ×ו ×©×”×•× ×—×œ×© מבחינה קריפטוגרפית"
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:380
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -640,15 +640,16 @@ msgstr ""
"×ורך ×ישור ×”×בטחה של השרת ×ו עומק מחרוזת ×ישור ×”×בטחה של השרת ×—×•×¨×’×™× "
"מהמגבלות שהוצבו על ידי ספריית ההצפנה"
-#: ../libempathy/empathy-utils.c:540
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "×× ×©×™× ×§×¨×•×‘×™×"
-#: ../libempathy/empathy-utils.c:545
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "â€Yahoo! יפן"
-#: ../libempathy/empathy-utils.c:546
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "צ׳×ט Facebook"
@@ -732,16 +733,16 @@ msgstr "%s:"
msgid "Username:"
msgstr "ש_× ×ž×©×ª×ž×©:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "ה_חלה"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "_כניסה"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -750,19 +751,19 @@ msgstr "_כניסה"
msgid "Account:"
msgstr "חשבון:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "מו_פעל"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "חשבון ×–×” כבר ×§×™×™× ×¢×œ השרת"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "יצירת חשבון חדש על השרת"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "_ביטול"
@@ -771,19 +772,19 @@ msgstr "_ביטול"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "â€%1$s על גבי %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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "חשבון %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "חשבון חדש"
@@ -830,7 +831,7 @@ msgstr "×©× ×”×ª×¦×•×’×” שלך ב־AIM?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_פתחה:"
@@ -839,7 +840,7 @@ msgstr "_פתחה:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_שרת:"
@@ -1147,22 +1148,18 @@ msgid "I_gnore conference and chat room invitations"
msgstr "ה_תעלמות מהזמנות לשיחות ועידה ולחדרי שיחה"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "שימוש ב־_Yahoo יפן"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "מהו המזהה בחשבון ה־Yahoo! שלך?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "מהי ססמת חשבון ה־Yahoo! שלך?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "מז_הה Yahoo!:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "שפת רשימת ×”_חדרי×:"
@@ -1389,7 +1386,7 @@ msgstr "â€%s הצטרף לחדר"
msgid "%s is now known as %s"
msgstr "â€%s נודע כעת בכינוי %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
msgid "Disconnected"
msgstr "מנותק"
@@ -1434,7 +1431,7 @@ msgstr "_פתיחת קישור"
#. * chat windows (strftime format string)
#: ../libempathy-gtk/empathy-chat-text-view.c:424
msgid "%A %B %d %Y"
-msgstr "%A %d %B %Y"
+msgstr "%A %d ב%B %Y"
#: ../libempathy-gtk/empathy-contact-dialogs.c:243
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
@@ -1458,6 +1455,14 @@ msgstr "×”_חלטה מ×וחר יותר"
msgid "Subscription Request"
msgstr "בקשת הצטרפות"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "×œ×œ× ×§×‘×•×¦×”"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "×× ×©×™× ×ž×•×¢×“×¤×™×"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1487,7 +1492,7 @@ msgstr "להסיר ×ת ×יש הקשר '%s'?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2087
#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
-msgstr "מסיר ×יש קשר"
+msgstr "×יש קשר מוסר"
#: ../libempathy-gtk/empathy-contact-menu.c:203
#: ../src/empathy-main-window.ui.h:13
@@ -1529,7 +1534,7 @@ msgid "Share My Desktop"
msgstr "שיתוף שולחן העבודה שלי"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1585,128 +1590,128 @@ msgstr "×תר ×ינטרנט:"
msgid "Birthday:"
msgstr "×™×•× ×”×•×œ×“×ª:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "קוד המדינה בתקן ISO:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "×רץ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "מדינה:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "עיר:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "×זור:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "מיקוד:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "רחוב:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "מבנה:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "קומה:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "חדר:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "טקסט:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "תי×ור:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "כתובת:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "רמת דיוק:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "שגי××”:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "סטייה ×נכית (מטרי×):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "סטייה ×ופקית (מטרי×):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "מהירות:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "×זימוט:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "מהירות הטיפוס:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "עדכון ×חרון ב־:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "קו ×ורך:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "קו רוחב:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "גובה:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1714,23 +1719,23 @@ msgid "Location"
msgstr "מיקו×"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "â€%B %e, %Y ב־â€%R â€UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "שמירת תמונה ×ישית"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "×œ× × ×™×ª×Ÿ לשמור תמונה ×ישית"
@@ -1871,16 +1876,16 @@ msgstr "SSL"
#. Translators: this is the title of the linking dialogue (reached by
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
+#: ../libempathy-gtk/empathy-linking-dialog.c:116
msgid "Link Contacts"
msgstr "קישור בין ×נשי קשר"
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "ה_פרדה…"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
msgid ""
"Completely split the displayed meta-contact into the contacts it contains."
msgstr "פיצול משתמש העל המוצג ל×נשי הקשר ××•×ª× ×”×•× ×ž×›×™×œ."
@@ -1889,16 +1894,16 @@ msgstr "פיצול משתמש העל המוצג ל×נשי הקשר ××•×ª× ×”×
#. Translators: this is an action button in the linking dialogue. "Link" is
#. * used here as a verb meaning "to connect two contacts to form a
#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
+#: ../libempathy-gtk/empathy-linking-dialog.c:137
msgid "_Link"
msgstr "_קישור"
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "×”×× ×œ×¤×¨×§ ×ת משתמש העל '%s'?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:185
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
msgid ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
@@ -1906,7 +1911,7 @@ msgstr ""
"×”×× ×‘×מת ברצונך לפרק משתמש על ×–×”? פעולה זו תפריד ×ת משתמש העל ל×נשי הקשר "
"×ותו ×”×•× ×ž×›×™×œ."
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
+#: ../libempathy-gtk/empathy-linking-dialog.c:191
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_ניתוק"
@@ -1921,10 +1926,12 @@ msgid "Conversations"
msgstr "שיחות"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "חיפוש הב×"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "חיפוש הקוד×"
@@ -2008,15 +2015,15 @@ msgstr "הגדרת הנוכחות והמצב ×”× ×•×›×—×™×™× ×©×œ×š"
msgid "Custom messages…"
msgstr "הודעות מות×מות ×ישית…"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "חיפוש:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "הת×מת רישיות"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "הביטוי ×œ× × ×ž×¦×"
@@ -2240,7 +2247,7 @@ msgstr "קירילי/רוסי"
#: ../libempathy-gtk/totem-subtitle-encoding.c:227
#: ../libempathy-gtk/totem-subtitle-encoding.c:229
msgid "Cyrillic/Ukrainian"
-msgstr "קרילי/×וקר××™× ×™"
+msgstr "קירילי/×וקר××™× ×™"
#: ../libempathy-gtk/totem-subtitle-encoding.c:232
msgid "Georgian"
@@ -2254,7 +2261,7 @@ msgstr "יוונית"
#: ../libempathy-gtk/totem-subtitle-encoding.c:242
msgid "Gujarati"
-msgstr "גוג'×ר×טית"
+msgstr "גוג׳ר×טית"
#: ../libempathy-gtk/totem-subtitle-encoding.c:245
msgid "Gurmukhi"
@@ -2340,7 +2347,7 @@ msgstr "מערבי"
#: ../libempathy-gtk/totem-subtitle-encoding.c:332
#: ../libempathy-gtk/totem-subtitle-encoding.c:334
msgid "Vietnamese"
-msgstr "וי×טנמית"
+msgstr "וייטנ×מית"
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
msgid "The selected contact cannot receive files."
@@ -2447,7 +2454,7 @@ msgstr ""
"חשבונות מ×וחר יותר מתפריט העריכה."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1310
+#: ../src/empathy-account-assistant.c:1316
msgid "An error occurred"
msgstr "התרחשה שגי××”."
@@ -2461,31 +2468,31 @@ msgstr "התרחשה שגי××”."
msgid "New %s account"
msgstr "חשבון %s חדש"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:515
msgid "What kind of chat account do you have?"
msgstr "×ילו חשבונות יש לך?"
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:521
msgid "Do you have any other chat accounts you want to set up?"
msgstr "×”×× ×™×© לך חשבונות × ×•×¡×¤×™× ×©×‘×¨×¦×•× ×š להגדיר?"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:527
msgid "Enter your account details"
msgstr "× × ×œ×”×–×™×Ÿ ×ת פרטי החשבון שלך"
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:532
msgid "What kind of chat account do you want to create?"
msgstr "××™×–×” חשבון שיחות ברצונך ליצור?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Do you want to create other chat accounts?"
msgstr "×”×× ×‘×¨×¦×•× ×š ליצור חשבונות שיחה ×חרי×?"
-#: ../src/empathy-account-assistant.c:539
+#: ../src/empathy-account-assistant.c:545
msgid "Enter the details for the new account"
msgstr "× × ×œ×”×–×™×Ÿ ×ת ×”×¤×¨×˜×™× ×¢×‘×•×¨ החשבון החדש"
-#: ../src/empathy-account-assistant.c:654
+#: ../src/empathy-account-assistant.c:660
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 "
@@ -2496,41 +2503,41 @@ msgstr ""
"לעבודה ×”×ž×©×ª×ž×©×™× ×‘Ö¾Google Talk, â€AIM,†Windows Live ועוד תוכנות דומות רבות. "
"בעזרת המיקרופון ומצלמת הרשת שלך ניתן ×’× ×œ× ×”×œ שיחות קול וויד×ו."
-#: ../src/empathy-account-assistant.c:671
+#: ../src/empathy-account-assistant.c:677
msgid "Do you have an account you've been using with another chat program?"
msgstr "יש לך חשבון שהשתמשת בו ×¢× ×ª×•×›× ×ª שיחה ×חרת?"
-#: ../src/empathy-account-assistant.c:694
+#: ../src/empathy-account-assistant.c:700
msgid "Yes, import my account details from "
msgstr "כן, × × ×œ×™×™×‘× ×ת פרטי החשבון מ־"
-#: ../src/empathy-account-assistant.c:715
+#: ../src/empathy-account-assistant.c:721
msgid "Yes, I'll enter my account details now"
msgstr "כן, ×× ×™ ×זין ×ת פרטי החשבון עכשיו"
-#: ../src/empathy-account-assistant.c:737
+#: ../src/empathy-account-assistant.c:743
msgid "No, I want a new account"
msgstr "ל×, ×× ×™ רוצה חשבון חדש"
-#: ../src/empathy-account-assistant.c:747
+#: ../src/empathy-account-assistant.c:753
msgid "No, I just want to see people online nearby for now"
msgstr "ל×, ×× ×™ רק רוצה לר×ות ×× ×©×™× ×”×ž×—×•×‘×¨×™× ×‘×§×¨×‘×ª ×ž×§×•× ×œ×¢×ª עתה"
-#: ../src/empathy-account-assistant.c:768
+#: ../src/empathy-account-assistant.c:774
msgid "Select the accounts you want to import:"
msgstr "× × ×œ×‘×—×•×¨ ×ת החשבון שברצונך לייב×:"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "כן"
-#: ../src/empathy-account-assistant.c:859
+#: ../src/empathy-account-assistant.c:865
msgid "No, that's all for now"
msgstr "ל×, ×–×” הכול לעכשיו"
-#: ../src/empathy-account-assistant.c:1124
+#: ../src/empathy-account-assistant.c:1130
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 "
@@ -2541,16 +2548,16 @@ msgstr ""
"ברצונך להשתמש בתכונה זו, × × ×œ×‘×“×•×§ ×©×”×¤×¨×˜×™× ×©×œ×”×œ×Ÿ נכוני×. ניתן לשנות ×¤×¨×˜×™× ×לה "
"בקלות מ×וחר יותר ×ו לבטל תכונה זו ב×מצעות הדו־שיח 'חשבונות'"
-#: ../src/empathy-account-assistant.c:1130
-#: ../src/empathy-account-assistant.c:1186
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
msgid "Edit->Accounts"
msgstr "עריכה->חשבונות"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1152
msgid "I don't want to enable this feature for now"
msgstr "×ין לי כל עניין ל×פשר ×ת התכונה הזו כעת"
-#: ../src/empathy-account-assistant.c:1182
+#: ../src/empathy-account-assistant.c:1188
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 "
@@ -2561,23 +2568,23 @@ msgstr ""
"salut ××™× ×” מותקנת, ×× ×‘×¨×¦×•× ×š להפעיל תכונה זו עליך להתקין ×ת החבילה telepathy-"
"salut וליצור חשבון ב'×× ×©×™× ×‘×§×¨×‘×ª×™' מדו־שיח החשבונות"
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1194
msgid "telepathy-salut not installed"
msgstr "telepathy-salut ××™× ×” מותקנת"
-#: ../src/empathy-account-assistant.c:1234
+#: ../src/empathy-account-assistant.c:1240
msgid "Messaging and VoIP Accounts Assistant"
msgstr "מסייע חשבונות ההתכתבות וה־VoIP"
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1274
msgid "Welcome to Empathy"
msgstr "ברוך בו×ך ×ל Empathy"
-#: ../src/empathy-account-assistant.c:1277
+#: ../src/empathy-account-assistant.c:1283
msgid "Import your existing accounts"
msgstr "×™×™×‘×•× ×—×©×‘×•× ×•×ª קיימי×"
-#: ../src/empathy-account-assistant.c:1295
+#: ../src/empathy-account-assistant.c:1301
msgid "Please enter personal details"
msgstr "× × ×œ×”×–×™×Ÿ ×¤×¨×˜×™× ×ישיי×"
@@ -2594,7 +2601,7 @@ msgstr "×™×©× × ×©×™× ×•×™×™× ×©×œ× × ×©×ž×¨×• בחשבון ×”Ö¾%s שלך."
msgid "Your new account has not been saved yet."
msgstr "החשבון החדש שלך ×œ× × ×©×ž×¨ עדיין."
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "בהתחברות…"
@@ -2620,7 +2627,7 @@ msgstr "מצב ×œ× ×™×“×•×¢"
msgid "Offline — Account Disabled"
msgstr "מנותק — החשבון מנוטרל"
-#: ../src/empathy-accounts-dialog.c:805
+#: ../src/empathy-accounts-dialog.c:811
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2628,16 +2635,16 @@ msgstr ""
"עומד להיווצר חשבון חדש, מה שיבטל\n"
"×ת ×”×©×™× ×•×™×™× ×©×œ×š. ×”×× ×‘×¨×¦×•× ×š להמשיך?"
-#: ../src/empathy-accounts-dialog.c:1152
+#: ../src/empathy-accounts-dialog.c:1158
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "×”×× ×‘×¨×¦×•× ×š להסיר ×ת החשבון '%s' ממחשבך?"
-#: ../src/empathy-accounts-dialog.c:1156
+#: ../src/empathy-accounts-dialog.c:1162
msgid "This will not remove your account on the server."
msgstr "פעולה זו ×œ× ×ª×¡×™×¨ ×ת חשבונך מהשרת."
-#: ../src/empathy-accounts-dialog.c:1394
+#: ../src/empathy-accounts-dialog.c:1400
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2645,7 +2652,7 @@ msgstr ""
"×תה עומד לבחור חשבון חדש, מה שיבטל\n"
"×ת ×”×©×™× ×•×™×™× ×©×œ×š. ×”×ת ×תה בטוח שברצונך להמשיך?"
-#: ../src/empathy-accounts-dialog.c:1997
+#: ../src/empathy-accounts-dialog.c:2003
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2716,84 +2723,84 @@ msgstr "×’×מה"
msgid "Volume"
msgstr "עצמה"
-#: ../src/empathy-call-window.c:1163
+#: ../src/empathy-call-window.c:1173
msgid "_Sidebar"
msgstr "_סרגל צד"
-#: ../src/empathy-call-window.c:1182
+#: ../src/empathy-call-window.c:1192
msgid "Audio input"
msgstr "קלט שמע"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1196
msgid "Video input"
msgstr "קלט ויד×ו"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1200
msgid "Dialpad"
msgstr "מקשי חיוג"
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1205
msgid "Details"
msgstr "פרטי×"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1263
+#: ../src/empathy-call-window.c:1273
#, c-format
msgid "Call with %s"
msgstr "שיחה ×¢× %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1342
+#: ../src/empathy-call-window.c:1352
msgid "Call"
msgstr "שיחה"
-#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-call-window.c:1506
msgid "The IP address as seen by the machine"
msgstr "כתובת ×”Ö¾IP כפי שנר×ית על ידי המחשב"
-#: ../src/empathy-call-window.c:1498
+#: ../src/empathy-call-window.c:1508
msgid "The IP address as seen by a server on the Internet"
msgstr "כתובת ×”Ö¾IP כפי שנר×ית על ידי שרת ב×ינטרנט"
-#: ../src/empathy-call-window.c:1500
+#: ../src/empathy-call-window.c:1510
msgid "The IP address of the peer as seen by the other side"
msgstr "כתובת ×”Ö¾IP כדי שנר×ית על ידי עמית מהצד השני"
-#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1512
msgid "The IP address of a relay server"
msgstr "כתובת ה־IP של שרת הממסר"
-#: ../src/empathy-call-window.c:1504
+#: ../src/empathy-call-window.c:1514
msgid "The IP address of the multicast group"
msgstr "כתובת ה־IP של קבוצת התשדורת"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2247
#, c-format
msgid "Connected — %d:%02dm"
msgstr "מחובר — %d:%02d דק׳"
-#: ../src/empathy-call-window.c:2298
+#: ../src/empathy-call-window.c:2308
msgid "Technical Details"
msgstr "×¤×¨×˜×™× ×˜×›× ×™×™×"
-#: ../src/empathy-call-window.c:2336
+#: ../src/empathy-call-window.c:2346
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "התכנה של %s ××™× ×” מבינה ×ת מבני השמע ×”× ×ª×ž×›×™× ×¢×œ ידי המחשב שלך"
-#: ../src/empathy-call-window.c:2341
+#: ../src/empathy-call-window.c:2351
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "התכנה של %s ××™× ×” מבינה ×ת מבני הוויד×ו ×”× ×ª×ž×›×™× ×¢×œ ידי המחשב שלך"
-#: ../src/empathy-call-window.c:2347
+#: ../src/empathy-call-window.c:2357
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2802,21 +2809,21 @@ msgstr ""
"×œ× × ×™×ª×Ÿ להפעיל ×ת החיבור ×ל %s. כנר××” ×חד ממשתתפי השיחה מחובר לרשת ש××™× ×” "
"מ×פשרת ×—×™×‘×•×¨×™× ×™×©×™×¨×™×."
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2363
msgid "There was a failure on the network"
msgstr "×ירעה שגי××” ברשת"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2367
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "מבני השמע ×”×“×¨×•×©×™× ×œ×§×™×•× ×©×™×—×” זו ××™× × ×ž×•×ª×§× ×™× ×‘×ž×—×©×‘×š"
-#: ../src/empathy-call-window.c:2360
+#: ../src/empathy-call-window.c:2370
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "מבני הוויד×ו ×”×“×¨×•×©×™× ×œ×§×™×•× ×©×™×—×” זו ××™× × ×ž×•×ª×§× ×™× ×‘×ž×—×©×‘×š"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2380
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2826,19 +2833,19 @@ msgstr ""
"משהו בלתי צפוי ×רע ברכיב של Telepathy. × × <a href=\"%s\">לדווח על ב××’ ×–×”</a> "
"ולהוסיף דוחות שנ×ספו מחלון 'ניפוי השגי×ות' שבתפריט העזרה."
-#: ../src/empathy-call-window.c:2378
+#: ../src/empathy-call-window.c:2388
msgid "There was a failure in the call engine"
msgstr "×ירעה שגי××” במנוע הקרי××”"
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-call-window.c:2391
msgid "The end of the stream was reached"
msgstr "×”×ª×–×¨×™× ×”×’×™×¢ לסיומו"
-#: ../src/empathy-call-window.c:2421
+#: ../src/empathy-call-window.c:2431
msgid "Can't establish audio stream"
msgstr "×œ× × ×™×ª×Ÿ ×œ×§×™×™× ×ª×–×¨×™× ×©×ž×¢"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2441
msgid "Can't establish video stream"
msgstr "×œ× × ×™×ª×Ÿ ×œ×§×™×™× ×ª×–×¨×™× ×•×™×“×ו"
@@ -3778,6 +3785,9 @@ msgstr "חשבונות Empathy"
msgid "Empathy Debugger"
msgstr "מנפה השגי×ות של Empathy"
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "שימוש ב־_Yahoo יפן"
+
#~ msgctxt "Link individual (contextual menu)"
#~ msgid "_Link…"
#~ msgstr "_קישור…"
diff --git a/po/hu.po b/po/hu.po
index cd9240a40..eacd53dc1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 15:42+0200\n"
+"POT-Creation-Date: 2010-09-23 14:16+0200\n"
"PO-Revision-Date: 2010-09-06 15:41+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome at fsf dot hu>\n"
@@ -452,7 +452,7 @@ msgstr "Üzenetküldő- és VoIP-fiókok kezelése"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2151
+#: ../src/empathy-accounts-dialog.c:2157
msgid "Messaging and VoIP Accounts"
msgstr "Üzenetküldő- és VoIP-fiókok"
@@ -500,142 +500,142 @@ msgstr "Hiba a fájl átvitelekor"
msgid "The other participant is unable to transfer the file"
msgstr "A partner nem képes a fájl átvitelére"
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "Ismeretlen ok"
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Elérhető"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Elfoglalt"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Távol"
-#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Láthatatlan"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Kilépett"
-#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883
-#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885
-#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
+#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
+#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Ismeretlen"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "Nincs megadva ok"
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "Az állapot beállítva kilépettre"
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Hálózati hiba"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "A hitelesítés meghiúsult"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Titkosítási hiba"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "A név használatban"
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "Nincs megadva tanúsítvány"
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "A tanúsítvány nem megbízható"
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "A tanúsítvány lejárt"
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "A tanúsítvány nincs aktiválva"
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "A tanúsítvány gépneve eltér"
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "A tanúsítvány ujjlenyomata eltér"
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "A tanúsítvány önaláírt"
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Tanúsítványhiba"
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:356
msgid "Encryption is not available"
msgstr "A titkosítás nem érhető el"
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:358
msgid "Certificate is invalid"
msgstr "A tanúsítvány érvénytelen"
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:360
msgid "Connection has been refused"
msgstr "A kapcsolat visszautasítva"
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:362
msgid "Connection can't be established"
msgstr "A kapcsolat nem hozható létre"
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:364
msgid "Connection has been lost"
msgstr "A kapcsolat elveszett"
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:366
msgid "This resource is already connected to the server"
msgstr "Ez az erőforrás már kapcsolódik a kiszolgálóhoz"
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:368
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr ""
"A kapcsolatot leváltotta egy új, ugyanazt az erőforrást használó kapcsolat"
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:371
msgid "The account already exists on the server"
msgstr "A fiók már létezik a kiszolgálón"
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:373
msgid "Server is currently too busy to handle the connection"
msgstr "A kiszolgáló pillanatnyilag túl elfoglalt a kapcsolat kezeléséhez"
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:375
msgid "Certificate has been revoked"
msgstr "A tanúsítvány visszavonva"
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:377
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"A tanúsítvány nem biztonságos titkosító algoritmust használ, vagy "
"titkosításilag gyenge"
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:380
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -643,15 +643,16 @@ msgstr ""
"A kiszolgáló tanúsítványának hossza, vagy a kiszolgáló tanúsítványláncának "
"mélysége túllépi a titkosítási programkönyvtár korlátozásait"
-#: ../libempathy/empathy-utils.c:540
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Közeli emberek"
-#: ../libempathy/empathy-utils.c:545
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:546
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "Facebook csevegés"
@@ -703,7 +704,7 @@ msgstr "a jövőben"
#: ../libempathy-gtk/empathy-account-chooser.c:463
msgid "All"
-msgstr "Minden"
+msgstr "Összes"
#: ../libempathy-gtk/empathy-account-widget.c:514
#: ../libempathy-gtk/empathy-log-window.c:646
@@ -735,16 +736,16 @@ msgstr "%s:"
msgid "Username:"
msgstr "Felhasználónév:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "_Alkalmazás"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "Bejele_ntkezés"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -753,19 +754,19 @@ msgstr "Bejele_ntkezés"
msgid "Account:"
msgstr "Felhasználói fiók:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "_Engedélyezve"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Ez a fiók már létezik a kiszolgálón"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Új fiók létrehozása a kiszolgálón"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "Mé_gse"
@@ -774,19 +775,19 @@ msgstr "Mé_gse"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s ezen: %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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "%s fiók"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Új fiók"
@@ -833,7 +834,7 @@ msgstr "Mi az Ön AIM neve?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Port:"
@@ -842,7 +843,7 @@ msgstr "_Port:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Kiszolgáló:"
@@ -1151,22 +1152,18 @@ msgid "I_gnore conference and chat room invitations"
msgstr "Konferencia- és csevegőszoba-meghívások _figyelmen kívül hagyása"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "A _Yahoo! Japan használata"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "Mi az Ön Yahoo! azonosítója?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Mi az Ön Yahoo! jelszava?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "Yahoo! a_zonosító:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "Sz_obalista területi beállítása:"
@@ -1394,7 +1391,7 @@ msgstr "%s belépett a szobába"
msgid "%s is now known as %s"
msgstr "%s mostantól %s néven ismert"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
msgid "Disconnected"
msgstr "Kapcsolat bontva"
@@ -1463,6 +1460,14 @@ msgstr "_Döntés később"
msgid "Subscription Request"
msgstr "Feliratkozási kérés"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Csoportosítatlan"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Kedvenc partnerek"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1534,7 +1539,7 @@ msgid "Share My Desktop"
msgstr "Az asztalom megosztása"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1590,128 +1595,128 @@ msgstr "Weboldal:"
msgid "Birthday:"
msgstr "Születésnap:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Ország ISO kódja:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Ország:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Ãllapot:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Város:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Terület:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Irányítószám:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Utca:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Épület:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Emelet:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Szoba:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Szöveg:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Leírás:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Pontossági szint:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Hiba:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Függőleges hiba (méter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Vízszintes hiba (méter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Sebesség:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Irány:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Emelkedési sebesség:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Utolsó frissítés:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Hosszúság:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Szélesség:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Magasság:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1719,23 +1724,23 @@ msgid "Location"
msgstr "Hely"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%Y. %B %e, %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Avatar mentése"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Az avatar nem menthető"
@@ -1876,16 +1881,16 @@ msgstr "SSL"
#. Translators: this is the title of the linking dialogue (reached by
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
+#: ../libempathy-gtk/empathy-linking-dialog.c:116
msgid "Link Contacts"
msgstr "Partnerek összekapcsolása"
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "S_zétválasztás…"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
msgid ""
"Completely split the displayed meta-contact into the contacts it contains."
msgstr "A megjelenített metapartner szétvágása az azt alkotó partnerekké."
@@ -1894,16 +1899,16 @@ msgstr "A megjelenített metapartner szétvágása az azt alkotó partnerekké."
#. Translators: this is an action button in the linking dialogue. "Link" is
#. * used here as a verb meaning "to connect two contacts to form a
#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
+#: ../libempathy-gtk/empathy-linking-dialog.c:137
msgid "_Link"
msgstr "Összekap_csolás"
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "Szétválasztja a(z) „%s†metapartnert?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:185
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
msgid ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
@@ -1911,7 +1916,7 @@ msgstr ""
"Biztos, hogy szétválasztja ezt a metapartnert? Ez a metapartnert véglegesen "
"az azt alkotó partnerekké választja szét."
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
+#: ../libempathy-gtk/empathy-linking-dialog.c:191
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "S_zétválasztás"
@@ -1926,10 +1931,12 @@ msgid "Conversations"
msgstr "Társalgások"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "Következő találat"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "Előző találat"
@@ -1945,7 +1952,7 @@ msgstr "Keresés"
#. Searching *for* something
#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "_For:"
-msgstr "_Ehhez:"
+msgstr "_Erre:"
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
msgid "Contact ID:"
@@ -2013,15 +2020,15 @@ msgstr "Jelenlét és aktuális állapot megadása"
msgid "Custom messages…"
msgstr "Egyéni üzenetek…"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Keresés:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Nagybetűérzékeny"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "A kifejezés nem található"
@@ -2449,7 +2456,7 @@ msgstr ""
"fiókokat."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1310
+#: ../src/empathy-account-assistant.c:1316
msgid "An error occurred"
msgstr "Hiba történt"
@@ -2463,31 +2470,31 @@ msgstr "Hiba történt"
msgid "New %s account"
msgstr "Új %s fiók"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:515
msgid "What kind of chat account do you have?"
msgstr "Milyen típusú csevegőfiókja van?"
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:521
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Van más fiókja, amit be szeretne állítani?"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:527
msgid "Enter your account details"
msgstr "Adja meg fiókjának adatait"
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:532
msgid "What kind of chat account do you want to create?"
msgstr "Milyen típusú csevegőfiókot szeretne létrehozni?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Do you want to create other chat accounts?"
msgstr "Szeretne létrehozni más csevegőfiókokat?"
-#: ../src/empathy-account-assistant.c:539
+#: ../src/empathy-account-assistant.c:545
msgid "Enter the details for the new account"
msgstr "Adja meg az új fiók részleteit"
-#: ../src/empathy-account-assistant.c:654
+#: ../src/empathy-account-assistant.c:660
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 "
@@ -2499,41 +2506,41 @@ msgstr ""
"barátaival és kollégáival. Ha rendelkezik mikrofonnal és webkamerával, akkor "
"hang- és videohívásokat is bonyolíthat."
-#: ../src/empathy-account-assistant.c:671
+#: ../src/empathy-account-assistant.c:677
msgid "Do you have an account you've been using with another chat program?"
msgstr "Rendelkezik más csevegőprogramokban már használt fiókkal?"
-#: ../src/empathy-account-assistant.c:694
+#: ../src/empathy-account-assistant.c:700
msgid "Yes, import my account details from "
msgstr "Igen, fiókadatok importálása ebből: "
-#: ../src/empathy-account-assistant.c:715
+#: ../src/empathy-account-assistant.c:721
msgid "Yes, I'll enter my account details now"
msgstr "Igen, megadom a fiókom adatait"
-#: ../src/empathy-account-assistant.c:737
+#: ../src/empathy-account-assistant.c:743
msgid "No, I want a new account"
msgstr "Nem, új fiókot szeretnék készíteni"
-#: ../src/empathy-account-assistant.c:747
+#: ../src/empathy-account-assistant.c:753
msgid "No, I just want to see people online nearby for now"
msgstr "Nem, csak a környezetemben épp elérhető embereket szeretném látni"
-#: ../src/empathy-account-assistant.c:768
+#: ../src/empathy-account-assistant.c:774
msgid "Select the accounts you want to import:"
msgstr "Válassza ki az importálandó fiókot:"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Igen"
-#: ../src/empathy-account-assistant.c:859
+#: ../src/empathy-account-assistant.c:865
msgid "No, that's all for now"
msgstr "Nem, most csak ennyit akartam"
-#: ../src/empathy-account-assistant.c:1124
+#: ../src/empathy-account-assistant.c:1130
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 "
@@ -2546,16 +2553,16 @@ msgstr ""
"később is egyszerűen módosíthatja, vagy letilthatja a „Fiókok†ablak "
"segítségével."
-#: ../src/empathy-account-assistant.c:1130
-#: ../src/empathy-account-assistant.c:1186
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
msgid "Edit->Accounts"
msgstr "Szerkesztés → Fiókok"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1152
msgid "I don't want to enable this feature for now"
msgstr "Egyelőre nem engedélyezem ezt a szolgáltatást"
-#: ../src/empathy-account-assistant.c:1182
+#: ../src/empathy-account-assistant.c:1188
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 "
@@ -2567,23 +2574,23 @@ msgstr ""
"szolgáltatást, akkor telepítse a telepathy-salut csomagot, és hozzon létre "
"egy Közeli emberek fiókot a Fiókok ablakban."
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1194
msgid "telepathy-salut not installed"
msgstr "A telepathy-salut nincs telepítve"
-#: ../src/empathy-account-assistant.c:1234
+#: ../src/empathy-account-assistant.c:1240
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Üzenetküldő- és VoIP-fiók varázsló"
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1274
msgid "Welcome to Empathy"
msgstr "Üdvözöljük az Empathyban"
-#: ../src/empathy-account-assistant.c:1277
+#: ../src/empathy-account-assistant.c:1283
msgid "Import your existing accounts"
msgstr "Meglévő fiókok importálása"
-#: ../src/empathy-account-assistant.c:1295
+#: ../src/empathy-account-assistant.c:1301
msgid "Please enter personal details"
msgstr "Adja meg személyes adatait"
@@ -2600,7 +2607,7 @@ msgstr "Az Ön %s fiókjának módosításai nincsenek elmentve."
msgid "Your new account has not been saved yet."
msgstr "Új fiókja még nincs elmentve."
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "Kapcsolódás…"
@@ -2626,7 +2633,7 @@ msgstr "Ismeretlen állapot"
msgid "Offline — Account Disabled"
msgstr "Kilépett – Fiók letiltva"
-#: ../src/empathy-accounts-dialog.c:805
+#: ../src/empathy-accounts-dialog.c:811
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2634,16 +2641,16 @@ msgstr ""
"Új fiók létrehozására készül, ezzel törölni fogja a módosításokat.\n"
"Biztosan folytatni akarja?"
-#: ../src/empathy-accounts-dialog.c:1152
+#: ../src/empathy-accounts-dialog.c:1158
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Valóban el kívánja távolítani a(z) %s fiókot a számítógépről?"
-#: ../src/empathy-accounts-dialog.c:1156
+#: ../src/empathy-accounts-dialog.c:1162
msgid "This will not remove your account on the server."
msgstr "Ez nem távolítja el a kiszolgálón lévő fiókot."
-#: ../src/empathy-accounts-dialog.c:1394
+#: ../src/empathy-accounts-dialog.c:1400
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2651,7 +2658,7 @@ msgstr ""
"Másik fiók kiválasztására készül, ezzel törölni fogja a módosításokat.\n"
"Biztosan folytatni akarja?"
-#: ../src/empathy-accounts-dialog.c:1997
+#: ../src/empathy-accounts-dialog.c:2003
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2723,70 +2730,70 @@ msgstr "Gamma"
msgid "Volume"
msgstr "Hangerő"
-#: ../src/empathy-call-window.c:1163
+#: ../src/empathy-call-window.c:1173
msgid "_Sidebar"
msgstr "_Oldalsáv"
-#: ../src/empathy-call-window.c:1182
+#: ../src/empathy-call-window.c:1192
msgid "Audio input"
msgstr "Hangbemenet"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1196
msgid "Video input"
msgstr "Videobemenet"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1200
msgid "Dialpad"
msgstr "Tárcsázókészülék"
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1205
msgid "Details"
msgstr "Részletek"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1263
+#: ../src/empathy-call-window.c:1273
#, c-format
msgid "Call with %s"
msgstr "%s hívása"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1342
+#: ../src/empathy-call-window.c:1352
msgid "Call"
msgstr "Hívás"
-#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-call-window.c:1506
msgid "The IP address as seen by the machine"
msgstr "A gép által látott IP-cím"
-#: ../src/empathy-call-window.c:1498
+#: ../src/empathy-call-window.c:1508
msgid "The IP address as seen by a server on the Internet"
msgstr "Az interneten lévő kiszolgáló által látott IP-cím"
-#: ../src/empathy-call-window.c:1500
+#: ../src/empathy-call-window.c:1510
msgid "The IP address of the peer as seen by the other side"
msgstr "A partner másik oldal által látott IP-címe"
-#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1512
msgid "The IP address of a relay server"
msgstr "Közvetítő kiszolgáló IP-címe"
-#: ../src/empathy-call-window.c:1504
+#: ../src/empathy-call-window.c:1514
msgid "The IP address of the multicast group"
msgstr "Üzenetszórási csoport IP-címe"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2247
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Kapcsolódva – %d.%02dp"
-#: ../src/empathy-call-window.c:2298
+#: ../src/empathy-call-window.c:2308
msgid "Technical Details"
msgstr "Technikai részletek"
-#: ../src/empathy-call-window.c:2336
+#: ../src/empathy-call-window.c:2346
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2795,7 +2802,7 @@ msgstr ""
"%s szoftvere nem érti az Ön számítógépe által támogatott egyik "
"hangformátumot sem"
-#: ../src/empathy-call-window.c:2341
+#: ../src/empathy-call-window.c:2351
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2804,7 +2811,7 @@ msgstr ""
"%s szoftvere nem érti az Ön számítógépe által támogatott egyik "
"videoformátumot sem"
-#: ../src/empathy-call-window.c:2347
+#: ../src/empathy-call-window.c:2357
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2813,22 +2820,22 @@ msgstr ""
"Nem hozható létre kapcsolat %s partnerhez. Lehet, hogy egyikük közvetlen "
"kapcsolatot nem engedélyező hálózatot használ."
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2363
msgid "There was a failure on the network"
msgstr "Hálózati hiba történt"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2367
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "A híváshoz szükséges hangformátumok nincsenek telepítve a számítógépre"
-#: ../src/empathy-call-window.c:2360
+#: ../src/empathy-call-window.c:2370
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"A híváshoz szükséges videoformátumok nincsenek telepítve a számítógépre"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2380
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2839,19 +2846,19 @@ msgstr ""
"a hibát</a>, és csatolja a Súgó menü „Hibakeresés†ablakából elérhető "
"naplókat."
-#: ../src/empathy-call-window.c:2378
+#: ../src/empathy-call-window.c:2388
msgid "There was a failure in the call engine"
msgstr "Hiba történt a hívási alrendszerben"
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-call-window.c:2391
msgid "The end of the stream was reached"
msgstr "A folyam vége elérve"
-#: ../src/empathy-call-window.c:2421
+#: ../src/empathy-call-window.c:2431
msgid "Can't establish audio stream"
msgstr "Nem hozható létre a hangfolyam"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2441
msgid "Can't establish video stream"
msgstr "Nem hozható létre a videofolyam"
@@ -3499,11 +3506,11 @@ msgstr "Új társalgás"
#: ../src/empathy-preferences.c:141
msgid "Contact goes online"
-msgstr "A partner belép"
+msgstr "Partner belép"
#: ../src/empathy-preferences.c:142
msgid "Contact goes offline"
-msgstr "A partner kilép"
+msgstr "Partner kilép"
#: ../src/empathy-preferences.c:143
msgid "Account connected"
@@ -3799,3 +3806,14 @@ msgstr "Empathy fiókkezelő"
#: ../src/empathy-debugger.c:40
msgid "Empathy Debugger"
msgstr "Empathy hibakereső"
+
+#, fuzzy
+#~ msgid "Find next"
+#~ msgstr "Következő találat"
+
+#, fuzzy
+#~ msgid "Find previous"
+#~ msgstr "Előző találat"
+
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "A _Yahoo! Japan használata"
diff --git a/po/it.po b/po/it.po
index d41caa3b3..da0970ef2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-09 20:59+0200\n"
-"PO-Revision-Date: 2010-09-11 16:01+0200\n"
+"POT-Creation-Date: 2010-09-25 14:19+0200\n"
+"PO-Revision-Date: 2010-09-25 14:41+0200\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -700,6 +700,7 @@ msgstr ""
"del server supera i limiti imposti dalla libreria di cifratura"
#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Persone nelle vicinanze"
@@ -792,17 +793,17 @@ msgstr "%s:"
msgid "Username:"
msgstr "Nome utente:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "A_pplica"
# (ndt) pulsante
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "Acce_di"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -811,19 +812,19 @@ msgstr "Acce_di"
msgid "Account:"
msgstr "Account:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "_Abilitato"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Questo account esiste già sul server"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Creare un nuovo account sul server"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "A_nnulla"
@@ -832,7 +833,7 @@ msgstr "A_nnulla"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s su %2$s"
@@ -840,12 +841,12 @@ msgstr "%1$s su %2$s"
# (ndt) il %s pare sia il protocollo
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "Account %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Nuovo account"
@@ -894,7 +895,7 @@ msgstr "Qual è il nominativo pubblico AIM?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Porta:"
@@ -903,7 +904,7 @@ msgstr "_Porta:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Server:"
@@ -1220,25 +1221,20 @@ msgstr "_Nome utente:"
msgid "I_gnore conference and chat room invitations"
msgstr "I_gnorare inviti per conferenze e stanze di conversazione"
-# (ndt) opzione
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Usare _Yahoo! Giappone"
-
# (ndt) metto Yahoo!?
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! ID?"
msgstr "Qual è il proprio identificativo Yahoo?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Qual è la password di Yahoo?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "I_D Yahoo:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "_Nazione elenco stanze:"
@@ -1548,6 +1544,16 @@ msgstr "_Decidi successivamente"
msgid "Subscription Request"
msgstr "Richiesta di approvazione"
+# (ndt) inteso come "contatti"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Non raggruppati"
+
+# (ndt) inteso come "contatti"
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Preferiti"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1621,7 +1627,7 @@ msgstr "Condividi desktop"
# (ndt) dovrebbe essere relativo a un contatto
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1677,132 +1683,132 @@ msgstr "Sito web:"
msgid "Birthday:"
msgstr "Compleanno:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Codice ISO del paese:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Paese:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Stato:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Città:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Area:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Codice postale:"
# (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Via:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Edificio:"
# (ndt) questo è prima di una casella di testo
# in cui inserire il criterio di ricerca
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Piano:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Stanza:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Testo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Descrizione:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Livello di precisione:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Errore:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Errore verticale (metri):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Errore orizzontale (metri):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Velocità:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Orientamento:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Velocità di salita:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Ultimo aggiornamento:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Longitudine:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Latitudine:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Altitudine:"
# (ndt) nome della scheda
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1810,23 +1816,23 @@ msgid "Location"
msgstr "Posizione geografica"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, il giorno %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%-d %B %Y alle %H.%M UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Salva immagine"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Impossibile salvare l'immagine"
@@ -2024,11 +2030,13 @@ msgstr "Conversazioni"
# (ndt) è un pulsante, si riferisce alle conversazioni
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "Successiva"
# (ndt) è un pulsante, si riferisce alle conversazioni
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "Precedente"
@@ -2117,15 +2125,15 @@ msgstr "Imposta la presenza e lo stato"
msgid "Custom messages…"
msgstr "Messaggi personalizzati..."
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Trova:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Maiuscole/minuscole"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Stringa non trovata"
@@ -3979,3 +3987,7 @@ msgstr "Account Empathy"
#: ../src/empathy-debugger.c:40
msgid "Empathy Debugger"
msgstr "Debugger Empathy"
+
+# (ndt) opzione
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "Usare _Yahoo! Giappone"
diff --git a/po/ja.po b/po/ja.po
index 50f5ac6c7..599ca8b6e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -24,8 +24,8 @@ msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-09-19 09:08+0000\n"
-"PO-Revision-Date: 2010-09-11 15:06+0900\n"
+"POT-Creation-Date: 2010-09-27 09:05+0000\n"
+"PO-Revision-Date: 2010-09-27 21:03+0900\n"
"Last-Translator: Takayuki KUASNO <AE5T-KSN@asahi-net.or.jp>\n"
"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
"MIME-Version: 1.0\n"
@@ -659,6 +659,7 @@ msgstr ""
"ã‚Œã¦ã„ã‚‹é•·ã•ã‚’越ãˆã¦ã„ã¾ã™"
#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "ã™ãè¿‘ãã«ã„る人é”"
@@ -1469,6 +1470,14 @@ msgstr "ã‚ã¨ã§æ±ºã‚ã‚‹(_L)"
msgid "Subscription Request"
msgstr "登録ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆ"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "グループ無所属"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "ãŠæ°—ã«å…¥ã‚Šã®äººé”"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1540,7 +1549,7 @@ msgid "Share My Desktop"
msgstr "デスクトップを共有ã™ã‚‹"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1596,128 +1605,128 @@ msgstr "ウェブサイト:"
msgid "Birthday:"
msgstr "誕生日:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "ISOã«ã‚ˆã‚‹å›½ã‚³ãƒ¼ãƒ‰:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "国:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "連邦・州:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "都市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "地域:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "郵便番å·:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "通り:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "ビル:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "階:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "部屋番å·:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "テキスト:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "説明:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "精度ã®ãƒ¬ãƒ™ãƒ«:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "エラー:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "垂直誤差 (メートル):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "水平誤差 (メートル):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "æ–¹ä½:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "上昇速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "最後ã®ã‚¢ãƒƒãƒ—デートã¯:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "経度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "高度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1725,23 +1734,23 @@ msgid "Location"
msgstr "場所"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%Yå¹´%B%eæ—¥ %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "ã‚¢ãƒã‚¿ãƒ¼ã®ä¿å­˜"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "ã‚¢ãƒã‚¿ãƒ¼ã‚’ä¿å­˜ã§ãã¾ã›ã‚“"
@@ -1931,10 +1940,12 @@ msgid "Conversations"
msgstr "会話"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "次を検索"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "å‰ã‚’検索"
@@ -2018,15 +2029,15 @@ msgstr "在席中ã«ã—ç¾åœ¨ã®çŠ¶æ…‹ã‚’設定ã™ã‚‹"
msgid "Custom messages…"
msgstr "独自ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸â€¦"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "検索:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "大文字å°æ–‡å­—を区別ã—ã¦ä¸€è‡´"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "フレーズãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ"
@@ -2425,7 +2436,7 @@ msgstr ""
"(Contributed to Moblin by Intel GLS)\n"
"è‰é‡Ž 貴之 <AE5T-KSN@asahi-net.or.jp>\n"
"西堀 清貴 <ml.nishibori.kiyotaka@gmail.com>\n"
-"日本GNOMEユーザ会 <http://www.gnome.gr.jp/>"
+"日本GNOMEユーザー会 <http://www.gnome.gr.jp/>"
#: ../src/empathy-account-assistant.c:167
msgid "There was an error while importing the accounts."
diff --git a/po/lt.po b/po/lt.po
index 159f6e5fd..3fc61ddca 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,16 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: "
-"http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2010-09-15 12:05+0000\n"
-"PO-Revision-Date: 2010-09-17 23:41+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-09-29 14:16+0200\n"
+"PO-Revision-Date: 2010-09-29 14:16+0200\n"
"Last-Translator: Žygimantas BeruÄka <zygis@gnome.org>\n"
"Language-Team: Lithuanian <gnome-lt@lists.akl.lt>\n"
-"Language: lt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
"100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Virtaal 0.6.1\n"
@@ -129,7 +128,6 @@ msgid "Empathy has migrated butterfly logs"
msgstr "Empathy perkėlė butterfly žurnalus"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-#| msgid "Empathy should auto-connect on startup"
msgid "Empathy should auto-away when idle"
msgstr "Nenaudojant Empathy, turėtų būti nustatoma nebuvimo būsena"
@@ -307,8 +305,6 @@ msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Ar Empathy turėtų automatiškai prisijungti prie paskyrų ją paleidus."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-#| msgid ""
-#| "Whether Empathy should automatically log into your accounts on startup."
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
@@ -460,7 +456,7 @@ msgstr "Tvarkyti pokalbių ir VoIP paskyras"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2156
msgid "Messaging and VoIP Accounts"
msgstr "Pokalbių ir VoIP paskyros"
@@ -532,11 +528,9 @@ msgstr "Nematomas (-a)"
msgid "Offline"
msgstr "Atsijungęs (-usi)"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
-#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
-#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
-#| msgctxt "file transfer percent"
-#| msgid "Unknown"
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
+#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
+#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Nežinoma"
@@ -601,27 +595,22 @@ msgid "Encryption is not available"
msgstr "Å ifravimas neprieinamas"
#: ../libempathy/empathy-utils.c:358
-#| msgid "Certificate not activated"
msgid "Certificate is invalid"
msgstr "Liudijimas netinkamas"
#: ../libempathy/empathy-utils.c:360
-#| msgid "Connection managers should be used"
msgid "Connection has been refused"
msgstr "Ryšys atmestas"
#: ../libempathy/empathy-utils.c:362
-#| msgid "Connection managers should be used"
msgid "Connection can't be established"
msgstr "Nepavyko užmegzti ryšio"
#: ../libempathy/empathy-utils.c:364
-#| msgid "Connection managers should be used"
msgid "Connection has been lost"
msgstr "Ryšys nutrūko"
#: ../libempathy/empathy-utils.c:366
-#| msgid "This account already exists on the server"
msgid "This resource is already connected to the server"
msgstr "Šis išteklius jau prisijungęs prie serverio"
@@ -631,7 +620,6 @@ msgid ""
msgstr "Ryšį pakeitė naujas ryšys, naudojantis tą patį išteklių"
#: ../libempathy/empathy-utils.c:371
-#| msgid "This account already exists on the server"
msgid "The account already exists on the server"
msgstr "Å i paskyra jau yra serveryje"
@@ -640,7 +628,6 @@ msgid "Server is currently too busy to handle the connection"
msgstr "Serveris šiuo metu per daug užimtas, kad galėtų apdoroti šį ryšį"
#: ../libempathy/empathy-utils.c:375
-#| msgid "Certificate not provided"
msgid "Certificate has been revoked"
msgstr "Liudijimas atšauktas"
@@ -660,6 +647,7 @@ msgstr ""
"kriptografijos bibliotekos numatytas ribas"
#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Žmonės netoliese"
@@ -734,7 +722,6 @@ msgid "Account"
msgstr "Paskyra"
#: ../libempathy-gtk/empathy-account-widget.c:515
-#| msgid "Password:"
msgid "Password"
msgstr "Slaptažodis"
@@ -777,7 +764,6 @@ msgid "Account:"
msgstr "Paskyra:"
#: ../libempathy-gtk/empathy-account-widget.c:1628
-#| msgid "Enabled"
msgid "_Enabled"
msgstr "Įj_ungta"
@@ -896,7 +882,6 @@ msgstr "<b>Pavyzdys:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-#| msgid "Character set:"
msgid "Ch_aracter set:"
msgstr "_Simbolių koduotė:"
@@ -978,7 +963,6 @@ msgid "Servers"
msgstr "Serveriai"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-#| msgid "What is your AIM screen name?"
msgid "What is your IRC nickname?"
msgstr "Koks jūsų IRC slapyvardis?"
@@ -995,12 +979,10 @@ msgid "<b>Example:</b> user@jabber.org"
msgstr "<b>Pavyzdys:</b> naudotojas@jabber.org"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#| msgid "_Encryption required (TLS/SSL)"
msgid "Encr_yption required (TLS/SSL)"
msgstr "_Reikalingas Å¡ifravimas (TLS/SSL)"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-#| msgid "_Ignore SSL certificate errors"
msgid "I_gnore SSL certificate errors"
msgstr "_Nepaisyti SSL liudijimo klaidų"
@@ -1009,7 +991,6 @@ msgid "Override server settings"
msgstr "Nepaisyti serverio parametrų"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-#| msgid "Pri_ority:"
msgid "Priori_ty:"
msgstr "Pri_oritetas:"
@@ -1079,12 +1060,10 @@ msgid "What is your Windows Live password?"
msgstr "Koks jūsų Windows Live slaptažodis?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-#| msgid "E-mail address:"
msgid "E-_mail address:"
msgstr "El. pašto adresas:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-#| msgid "Nickname:"
msgid "Nic_kname:"
msgstr "Slapy_vardis:"
@@ -1177,7 +1156,6 @@ msgid "_Username:"
msgstr "_Naudotojo vardas:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-#| msgid "_Ignore conference and chat room invitations"
msgid "I_gnore conference and chat room invitations"
msgstr "_Nepaisyti konferencijų ir pokalbių kambarių kvietimų"
@@ -1354,7 +1332,7 @@ msgstr "Įterpti šypsenėlę"
#. send button
#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "_Siųsti"
@@ -1422,7 +1400,7 @@ msgstr "%s prisijungė prie pokalbių kambario"
msgid "%s is now known as %s"
msgstr "%s dabar žinomas (-a) kaip %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
msgid "Disconnected"
msgstr "Atsijungęs(-usi)"
@@ -1469,17 +1447,17 @@ msgstr "_Atverti nuorodÄ…"
msgid "%A %B %d %Y"
msgstr "%Y %B %d (%A)"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Taisyti adresato informacijÄ…"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
msgstr "AsmeninÄ— informacija"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
msgid "New Contact"
msgstr "Naujas adresatas"
@@ -1491,6 +1469,14 @@ msgstr "Nuspręsti _vėliau"
msgid "Subscription Request"
msgstr "Prenumeratos prašymas"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Nesugrupuota"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Mėgiami žmonės"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1553,18 +1539,16 @@ msgstr "_Ankstesni pokalbiai"
#: ../libempathy-gtk/empathy-contact-menu.c:352
#: ../libempathy-gtk/empathy-individual-menu.c:683
-#| msgid "Send file"
msgid "Send File"
msgstr "Siųsti failą"
#: ../libempathy-gtk/empathy-contact-menu.c:375
#: ../libempathy-gtk/empathy-individual-menu.c:725
-#| msgid "Share my desktop"
msgid "Share My Desktop"
msgstr "Dalintis mano darbastaliu"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1570
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1588,7 +1572,6 @@ msgstr "Jus kvieÄia į šį kambarį"
#: ../libempathy-gtk/empathy-contact-menu.c:575
#: ../libempathy-gtk/empathy-individual-menu.c:1017
-#| msgid "_Invite to chat room"
msgid "_Invite to Chat Room"
msgstr "_Pakviesti į pokalbių kambarį"
@@ -1596,153 +1579,153 @@ msgstr "_Pakviesti į pokalbių kambarį"
msgid "Select a contact"
msgstr "Pasirinkite adresatÄ…"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-contact-widget.c:226
#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Full name:"
msgstr "Vardas ir pavardÄ—:"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-contact-widget.c:227
#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "Phone number:"
msgstr "Telefono numeris:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-contact-widget.c:228
#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "E-mail address:"
msgstr "El. pašto adresas:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-contact-widget.c:229
#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Website:"
msgstr "Tinklalapis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-contact-widget.c:230
#: ../libempathy-gtk/empathy-individual-widget.c:152
msgid "Birthday:"
msgstr "Gimtadienis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:609
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Å alies ISO kodas:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:611
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Å alis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:613
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "BÅ«sena:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:615
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Miestas:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:617
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Sritis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:619
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Pašto kodas:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:621
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "GatvÄ—:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:623
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Pastatas:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:625
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Aukštas:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:627
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Kambarys:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:629
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Tekstas:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:631
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Aprašymas:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:633
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:635
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Tikslumo lygis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:637
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Paklaida:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:639
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Vertikali paklaida (metrais):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:641
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Horizontali paklaida (metrais):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:643
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Greitis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:645
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Azimutas:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:647
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Kilimo greitis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:649
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Paskutinįkart atnaujinta:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:651
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Ilguma:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:653
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Platuma:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:655
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "AltitudÄ—:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:718
+#: ../libempathy-gtk/empathy-contact-widget.c:735
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1750,24 +1733,23 @@ msgid "Location"
msgstr "VietovÄ—"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:737
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
-#| msgid "%s of %s"
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:789
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%Y %B %e, %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:872
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "IÅ¡saugoti pseudoportretÄ…"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:928
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Nepavyko išsaugoti pseudoportreto"
@@ -1842,18 +1824,15 @@ msgid "Group"
msgstr "GrupÄ—"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
-#| msgid "_Offline Contacts"
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
msgid "Linked Contacts"
msgstr "Susieti adresatai"
#: ../libempathy-gtk/empathy-individual-linker.c:354
-#| msgid "Select a contact"
msgid "Select contacts to link"
msgstr "Pasirinkite susietinus adresatus"
#: ../libempathy-gtk/empathy-individual-linker.c:428
-#| msgid "New Contact"
msgid "New contact preview"
msgstr "Naujo adresato peržiūra"
@@ -1866,12 +1845,10 @@ msgstr "KairÄ—je esanÄiame sÄ…raÅ¡e pažymÄ—ti adresatai bus susieti kartu."
#. * of the user's account IDs (e.g. me@hotmail.com).
#: ../libempathy-gtk/empathy-individual-menu.c:132
#, c-format
-#| msgid " (%s)"
msgid "%s (%s)"
msgstr "%s (%s)"
#: ../libempathy-gtk/empathy-individual-menu.c:837
-#| msgid "_Edit"
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Taisyti"
@@ -1879,7 +1856,6 @@ msgstr "_Taisyti"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
#: ../libempathy-gtk/empathy-individual-menu.c:863
-#| msgid "_Add Contact…"
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Susieti adresatus…"
@@ -1893,7 +1869,6 @@ msgstr[1] "Metaadresatas, apimantis %u adresatus"
msgstr[2] "Metaadresatas, apimantis %u adresatų"
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
-#| msgid "<b>Location</b> at (date)\t"
msgid "<b>Location</b> at (date)"
msgstr "<b>VietovÄ—</b> (data)"
@@ -1916,18 +1891,16 @@ msgstr "SSL"
#. Translators: this is the title of the linking dialogue (reached by
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:116
-#| msgid "_Offline Contacts"
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
msgid "Link Contacts"
msgstr "Susieti adresatus"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-#| msgid "_Join…"
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "_Išskaidyti…"
-#: ../libempathy-gtk/empathy-linking-dialog.c:122
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgid ""
"Completely split the displayed meta-contact into the contacts it contains."
msgstr "Visiškai išskaidyti parodytą metaadresatą į jo apimamus adresatus."
@@ -1936,17 +1909,16 @@ msgstr "Visiškai išskaidyti parodytą metaadresatą į jo apimamus adresatus."
#. Translators: this is an action button in the linking dialogue. "Link" is
#. * used here as a verb meaning "to connect two contacts to form a
#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:137
-#| msgid "_Open Link"
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
msgid "_Link"
msgstr "_Susieti"
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "Išskaidyti metaadresatą „%s“?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
msgid ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
@@ -1954,7 +1926,7 @@ msgstr ""
"Ar tikrai norite išskaityti šį metaadresatą? Metaadresatas bus visiškai "
"išskaidytas į jo apimamus pavienius adresatus."
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_IÅ¡skaityti"
@@ -1969,11 +1941,12 @@ msgid "Conversations"
msgstr "Pokalbiai"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "Ieškoti kito"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
-#| msgid "Video Preview"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "Ieškoti ankstesnio"
@@ -2057,15 +2030,15 @@ msgstr "Nurodykite savo buvimą ir dabartinę būseną"
msgid "Custom messages…"
msgstr "Pasirinktinės žinutės…"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Ieškoti:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Skirti raidžių registrą"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "FrazÄ— nerasta"
@@ -2150,12 +2123,10 @@ msgid "The certificate is not signed by a Certification Authority"
msgstr "Liudijimo nepasirašiusi jokia liudijimo įstaiga"
#: ../libempathy-gtk/empathy-tls-dialog.c:160
-#| msgid "Certificate expired"
msgid "The certificate has expired"
msgstr "Liudijimas nebegalioja"
#: ../libempathy-gtk/empathy-tls-dialog.c:163
-#| msgid "Certificate not activated"
msgid "The certificate hasn't yet been activated"
msgstr "Liudijimas dar neaktyvuotas"
@@ -2168,7 +2139,6 @@ msgid "The hostname verified by the certificate doesn't match the server name"
msgstr "Liudijimo patvirtinamas kompiuterio vardas nesutampa su serverio vardu"
#: ../libempathy-gtk/empathy-tls-dialog.c:173
-#| msgid "Certificate self-signed"
msgid "The certificate is self-signed"
msgstr "Savo paÄių pasiraÅ¡ytas liudijimas"
@@ -2185,24 +2155,20 @@ msgid "The certificate length exceeds verifiable limits"
msgstr "Liudijimo ilgis viršija patikrinamas ribas"
#: ../libempathy-gtk/empathy-tls-dialog.c:187
-#| msgid "Certificate expired"
msgid "The certificate is malformed"
msgstr "Liudijimas yra netinkamai suformuotas"
#: ../libempathy-gtk/empathy-tls-dialog.c:205
#, c-format
-#| msgid "Certificate hostname mismatch"
msgid "Expected hostname: %s"
msgstr "Laukta kompiuterio vardo: %s"
#: ../libempathy-gtk/empathy-tls-dialog.c:208
#, c-format
-#| msgid "Certificate hostname mismatch"
msgid "Certificate hostname: %s"
msgstr "Liudijimo kompiuterio vardas: %s"
#: ../libempathy-gtk/empathy-tls-dialog.c:263
-#| msgid "Context"
msgid "Continue"
msgstr "Tęsti"
@@ -2215,21 +2181,19 @@ msgid "Remember this choice for future connections"
msgstr "Atsiminti šį pasirinkimą ateityje"
#: ../libempathy-gtk/empathy-tls-dialog.c:294
-#| msgid "Certificate expired"
msgid "Certificate Details"
msgstr "Liudijimo informacija"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "Nepavyko atverti URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "Pasirinkite failÄ…"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
#, c-format
-#| msgid "Incoming call from %s"
msgid "Incoming file from %s"
msgstr "Failas jums nuo %s"
@@ -2502,7 +2466,7 @@ msgstr ""
"uždaryti šį pagelbiklį ir pridėti paskyras vėliau, naudojantis meniu Taisyti."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1315
msgid "An error occurred"
msgstr "Įvyko klaida"
@@ -2516,31 +2480,31 @@ msgstr "Įvyko klaida"
msgid "New %s account"
msgstr "Nauja %s paskyra"
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:514
msgid "What kind of chat account do you have?"
msgstr "Kokio tipo pokalbių paskyrą turite?"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:520
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Ar turite kokių nors kitų pokalbių paskyrų, kurias norite nustatyti?"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:526
msgid "Enter your account details"
msgstr "Įveskite savo paskyros informaciją"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:531
msgid "What kind of chat account do you want to create?"
msgstr "Kokio tipo pokalbių paskyrą norite sukurti?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:537
msgid "Do you want to create other chat accounts?"
msgstr "Ar norite sukurti kitų pokalbių paskyrų?"
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:544
msgid "Enter the details for the new account"
msgstr "Įveskite naujosios paskyros informaciją"
-#: ../src/empathy-account-assistant.c:660
+#: ../src/empathy-account-assistant.c:659
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 "
@@ -2552,42 +2516,42 @@ msgstr ""
"pokalbių programomis. Jeigu turite mikrofoną arba internetine kamerą, taip "
"pat galite naudotis garsinių ir vaizdinių pokalbių galimybe."
-#: ../src/empathy-account-assistant.c:677
+#: ../src/empathy-account-assistant.c:676
msgid "Do you have an account you've been using with another chat program?"
msgstr ""
"Ar turite paskyrÄ…, kuria naudojotÄ—s anksÄiau su kita pokalbių programa?"
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:699
msgid "Yes, import my account details from "
msgstr "Taip, importuoti mano paskyros informaciją iš"
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:720
msgid "Yes, I'll enter my account details now"
msgstr "Taip, įvesiu savo paskyros informaciją dabar"
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:742
msgid "No, I want a new account"
msgstr "Ne, noriu sukurti naujÄ… paskyrÄ…"
-#: ../src/empathy-account-assistant.c:753
+#: ../src/empathy-account-assistant.c:752
msgid "No, I just want to see people online nearby for now"
msgstr "Ne, kol kas noriu tik matyti netoliese prisijungusius asmenis"
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:773
msgid "Select the accounts you want to import:"
msgstr "Pasirinkite pageidaujamas importuoti paskyras:"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:857
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Taip"
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:864
msgid "No, that's all for now"
msgstr "Ne, kol kas viskas"
-#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1129
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 "
@@ -2599,16 +2563,16 @@ msgstr ""
"pažiūrėkite, ar žemiau esantys duomenys yra teisingi. Galite juos pataisyti "
"bet kada vėliau arba išjungti šią funkciją paskyrų dialoge"
-#: ../src/empathy-account-assistant.c:1136
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
msgid "Edit->Accounts"
msgstr "Taisa → Paskyros"
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1151
msgid "I don't want to enable this feature for now"
msgstr "Ne, kol kas nenoriu įjungti šios funkcijos"
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1187
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 "
@@ -2620,23 +2584,23 @@ msgstr ""
"telepathy-salut paketą ir sukurkite paskyrų dialoge paskyrą „Žmonės "
"netoliese“"
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1193
msgid "telepathy-salut not installed"
msgstr "telepathy-salut neįdiegta"
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1239
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Tikralaikių pokalbių ir VoIP paskyrų vediklis"
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1273
msgid "Welcome to Empathy"
msgstr "Sveikame paleidus Empathy"
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1282
msgid "Import your existing accounts"
msgstr "Importuokite savo egzistuojanÄiÄ… paskyrÄ…"
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1300
msgid "Please enter personal details"
msgstr "Įveskite savo asmeninius duomenis"
@@ -2679,7 +2643,7 @@ msgstr "Nežinoma būsena"
msgid "Offline — Account Disabled"
msgstr "Neprisijungta – Paskyra išjungta"
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:810
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2687,16 +2651,16 @@ msgstr ""
"Ketinate sukurti naują paskyrą, bus prarasti jūsų pakeitimai!\n"
"Ar tikrai norite tęsti?"
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1157
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Ar tikrai norite pašalinti %s iš savo kompiuterio?"
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1161
msgid "This will not remove your account on the server."
msgstr "Jūsų paskyros serveryje nebus pašalintos."
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1399
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2704,7 +2668,7 @@ msgstr ""
"Ketinate pasirinkti kitą paskyrą, bus prarasti jūsų pakeitimai.\n"
"Ar tikrai norite tęsti?"
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:2002
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2713,7 +2677,6 @@ msgstr ""
"Ar tikrai norite tęsti?"
#: ../src/empathy-accounts-dialog.ui.h:1
-#| msgid "Edit Contact Information"
msgid "Loading account information"
msgstr "Įkeliama adresato informacija"
@@ -2742,12 +2705,10 @@ msgid "_Import…"
msgstr "_Importuoti…"
#: ../src/empathy-auth-client.c:217
-#| msgid "- Empathy IM Client"
msgid " - Empathy authentication client"
msgstr " – Empathy tapatybės nustatymo klientas"
#: ../src/empathy-auth-client.c:233
-#| msgid "Authentication failed"
msgid "Empathy authentication client"
msgstr "Empathy tapatybÄ—s nustatymo klientas"
@@ -2756,12 +2717,10 @@ msgid "People nearby"
msgstr "Žmonės netoliese"
#: ../src/empathy-av.c:133
-#| msgid "- Empathy IM Client"
msgid "- Empathy Audio/Video Client"
msgstr "– Empathy garso/vaizdo transliavimo klientas"
#: ../src/empathy-av.c:149
-#| msgid "Empathy IM Client"
msgid "Empathy Audio/Video Client"
msgstr "Empathy garso/vaizdo transliavimo klientas"
@@ -2781,71 +2740,70 @@ msgstr "Gama"
msgid "Volume"
msgstr "Garsumas"
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1175
msgid "_Sidebar"
msgstr "Å _oninÄ— juosta"
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1194
msgid "Audio input"
msgstr "Garso įvestis"
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1198
msgid "Video input"
msgstr "Vaizdo įvestis"
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1202
msgid "Dialpad"
msgstr "Tel. klaviatūra"
-#: ../src/empathy-call-window.c:1205
-#| msgid "Contact Details"
+#: ../src/empathy-call-window.c:1207
msgid "Details"
msgstr "IÅ¡sami informacija"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1273
+#: ../src/empathy-call-window.c:1275
#, c-format
msgid "Call with %s"
msgstr "Skambinti su %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1352
+#: ../src/empathy-call-window.c:1354
msgid "Call"
msgstr "Skambutis"
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1508
msgid "The IP address as seen by the machine"
msgstr "Kompiuterio matomas IP adresas"
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1510
msgid "The IP address as seen by a server on the Internet"
msgstr "Interneto serverio matomas IP adresas"
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1512
msgid "The IP address of the peer as seen by the other side"
msgstr "Kitos pusÄ—s matomas lygiarangio IP adresas"
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1514
msgid "The IP address of a relay server"
msgstr "Perdavimo serverio IP adresas"
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1516
msgid "The IP address of the multicast group"
msgstr "Daugiaadresio perdavimo grupÄ—s IP adresas"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2263
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Prisijunta – %d:%02dm"
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2324
msgid "Technical Details"
msgstr "TechninÄ— informacija"
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2362
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2854,7 +2812,7 @@ msgstr ""
"Adresato %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų "
"formatų"
-#: ../src/empathy-call-window.c:2351
+#: ../src/empathy-call-window.c:2367
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2863,7 +2821,7 @@ msgstr ""
"Adresato %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų "
"vaizdo įrašų formatų"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2373
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2872,23 +2830,23 @@ msgstr ""
"Nepavyko užmegzti ryšio su %s. Gali būti, kad vienas iš jūsų yra tinkle, "
"nepriimanÄiame tiesioginių prisijungimų."
-#: ../src/empathy-call-window.c:2363
+#: ../src/empathy-call-window.c:2379
msgid "There was a failure on the network"
msgstr "Tinkle yra triktis"
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2383
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"JÅ«sų kompiuteryje neįdiegti garso įrašų formatai, reikalingi Å¡iam skambuÄiui"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2386
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"JÅ«sų kompiuteryje neįdiegti vaizdo įrašų formatai, reikalingi Å¡iam skambuÄiui"
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-call-window.c:2396
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2899,24 +2857,23 @@ msgstr ""
"apie šią klaidą</a> ir pridėkite žurnalus, kuriuos surinkote meniu Pagalba "
"„Derinimo“ lange."
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-call-window.c:2404
msgid "There was a failure in the call engine"
msgstr "Skambinimo posistemÄ—je yra triktis"
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2407
msgid "The end of the stream was reached"
msgstr "Pasiekta srauto pabaiga"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2447
msgid "Can't establish audio stream"
msgstr "Nepavyko sukurti garso srauto"
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2457
msgid "Can't establish video stream"
msgstr "Nepavyko sukurti vaizdo srauto"
#: ../src/empathy-call-window.ui.h:1
-#| msgid "Auto"
msgid "Audio"
msgstr "Garsas"
@@ -2989,7 +2946,6 @@ msgid "V_ideo"
msgstr "Va_izdas"
#: ../src/empathy-call-window.ui.h:20
-#| msgid "V_ideo"
msgid "Video"
msgstr "Vaizdas"
@@ -3078,7 +3034,6 @@ msgid "Move Tab _Right"
msgstr "Perkelti kortelę _dešinėn"
#: ../src/empathy-chat-window.ui.h:8
-#| msgid "No error message"
msgid "Notify for All Messages"
msgstr "Įspėti apie visus pranešimus"
@@ -3184,7 +3139,6 @@ msgstr "Kvietimas į pokalbių kambarį"
#: ../src/empathy-event-manager.c:697
#, c-format
-#| msgid "%s invited you to join %s"
msgid "Invitation to join %s"
msgstr "Kvietimas prisijungti prie %s"
@@ -3209,7 +3163,6 @@ msgstr "%s pakvietÄ— jus prisijungti %s"
#: ../src/empathy-event-manager.c:749
#, c-format
-#| msgid "%s invited you to join %s"
msgid "You have been invited to join %s"
msgstr "JÅ«s kvieÄiami prisijungti prie %s"
@@ -3379,7 +3332,6 @@ msgid "Source"
msgstr "Å altinis"
#: ../src/empathy-main-window.c:383
-#| msgid "No topic defined"
msgid "No match found"
msgstr "Nerasta atitikmenų"
@@ -3499,11 +3451,6 @@ msgstr "Nariai"
#. yes/no, yes/no and a number.
#: ../src/empathy-new-chatroom-dialog.c:607
#, c-format
-#| msgid ""
-#| "<b>%s</b>\n"
-#| "Invite required: %s\n"
-#| "Password required: %s\n"
-#| "Members: %s"
msgid ""
"%s\n"
"Invite required: %s\n"
@@ -3644,7 +3591,6 @@ msgid "Location sources:"
msgstr "VietovÄ—s Å¡altiniai:"
#: ../src/empathy-preferences.ui.h:14
-#| msgid "Conversations"
msgid "Log conversations"
msgstr "Vesti pokalbių žurnalus"
@@ -3696,7 +3642,6 @@ msgid "Themes"
msgstr "Temos"
#: ../src/empathy-preferences.ui.h:25
-#| msgid "Automatically _connect on startup "
msgid "_Automatically connect on startup"
msgstr "_Automatiškai prisijungti paleidimo metu"
@@ -3738,22 +3683,18 @@ msgid "Respond"
msgstr "Atsakyti"
#: ../src/empathy-status-icon.c:147
-#| msgid "_Reject"
msgid "Reject"
msgstr "Atmesti"
#: ../src/empathy-status-icon.c:151
-#| msgid "_Answer"
msgid "Answer"
msgstr "Atsiliepti"
#: ../src/empathy-status-icon.c:158
-#| msgid "_Decline"
msgid "Decline"
msgstr "Atsisakyti"
#: ../src/empathy-status-icon.c:162
-#| msgid "Account"
msgid "Accept"
msgstr "Priimti"
@@ -3841,7 +3782,6 @@ msgid "Choose a contact to invite into the conversation:"
msgstr "Pasirinkite į pokalbį pakviestiną adresatą:"
#: ../src/empathy-invite-participant-dialog.c:45
-#| msgid "Invisible"
msgid "Invite"
msgstr "Pakviesti"
@@ -3850,7 +3790,6 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "Nerodyti jokių dialogų, atlikti norimas užduotis (pvz., importuoti)"
#: ../src/empathy-accounts.c:186
-#| msgid "Don't display any dialogs if there are any non-salut accounts"
msgid "Don't display any dialogs if there are any non-Salut accounts"
msgstr "Nerodyti jokių dialogų, jei yra ne Salut paskyrų"
diff --git a/po/nb.po b/po/nb.po
index 49a9638dd..cc2516ae1 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy 2.31.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 10:51+0200\n"
-"PO-Revision-Date: 2010-09-11 10:52+0200\n"
+"POT-Creation-Date: 2010-09-25 12:19+0200\n"
+"PO-Revision-Date: 2010-09-25 12:20+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
"Language: no\n"
@@ -637,6 +637,7 @@ msgstr ""
"oversteg grensen som settes av kryptografibiblioteket"
#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Personer i nærheten"
@@ -728,16 +729,16 @@ msgstr "%s:"
msgid "Username:"
msgstr "Brukernavn:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "_Bruk"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "L_ogg inn"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -746,19 +747,19 @@ msgstr "L_ogg inn"
msgid "Account:"
msgstr "Konto:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "Slått _på"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Denne kontoen eksisterer allerede på tjeneren"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Lag en ny konto på tjeneren"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "A_vbryt"
@@ -767,19 +768,19 @@ msgstr "A_vbryt"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, 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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "%s-konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Ny konto"
@@ -826,7 +827,7 @@ msgstr "Hva er ditt skjermnavn for AIM?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Port:"
@@ -835,7 +836,7 @@ msgstr "_Port:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Tjener:"
@@ -1143,22 +1144,18 @@ msgid "I_gnore conference and chat room invitations"
msgstr "I_gnorer invitasjoner til konferanser og praterom"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Bruk _Yahoo! Japan"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "Hva er din Yahoo!-ID?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Hva er ditt passord for Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "Yahoo!-I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "Locale for _romliste:"
@@ -1455,6 +1452,14 @@ msgstr "A_vgjør senere"
msgid "Subscription Request"
msgstr "Abonnementsforespørsel"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Ikke gruppert"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Favorittpersoner"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1526,7 +1531,7 @@ msgid "Share My Desktop"
msgstr "Del mitt skrivebord"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1582,128 +1587,128 @@ msgstr "Nettsted:"
msgid "Birthday:"
msgstr "Fødselsdag:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "ISO-kode for land:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Land:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Tilstand:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "By:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Område:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Postkode:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Gate:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Bygning:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Etasje:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Rom:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Tekst:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Beskrivelse:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Nøyaktighetsnivå:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Feil:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Vertikal feil (meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Horisontal feil (meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Hastighet:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Retning:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Klatrehastighet:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Sist oppdatert:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Lengdegrad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Breddegrad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Høyde:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1711,23 +1716,23 @@ msgid "Location"
msgstr "Sted"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y, %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Lagre personbilder"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Kan ikke lagre personbilde"
@@ -1880,7 +1885,7 @@ msgstr "_Fjern kobling …"
#: ../libempathy-gtk/empathy-linking-dialog.c:122
msgid ""
"Completely split the displayed meta-contact into the contacts it contains."
-msgstr ""
+msgstr "Del opp vist metakontakt i kontaktene den inneholder."
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
@@ -1893,13 +1898,13 @@ msgstr "_Koble"
#: ../libempathy-gtk/empathy-linking-dialog.c:183
#, c-format
msgid "Unlink meta-contact '%s'?"
-msgstr ""
+msgstr "Fjern kobling for metakontakt «%s»?"
#: ../libempathy-gtk/empathy-linking-dialog.c:186
msgid ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
-msgstr ""
+msgstr "Er du sikker på at du vil fjerne kobling for denne metakontakten? Dette vil dele metakontakten opp i kontaktene den inneholder."
#: ../libempathy-gtk/empathy-linking-dialog.c:191
msgctxt "Unlink individual (button)"
@@ -1916,10 +1921,12 @@ msgid "Conversations"
msgstr "Samtaler"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "Finn neste"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "Finn forrige"
@@ -2003,15 +2010,15 @@ msgstr "Sett din tilstedeværelse og aktiv status"
msgid "Custom messages…"
msgstr "Egendefinerte meldinger …"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Finn:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Skill mellom små/store bokstaver"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Teksten ble ikke funnet"
@@ -3787,7 +3794,3 @@ msgstr "Empathy-kontoer"
#: ../src/empathy-debugger.c:40
msgid "Empathy Debugger"
msgstr "Empathy feilsøking"
-
-#~ msgctxt "Link individual (contextual menu)"
-#~ msgid "_Link…"
-#~ msgstr "_Koble…"
diff --git a/po/nl.po b/po/nl.po
index 6bfd8768a..71a1d7693 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -22,378 +22,403 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-31 19:38+0200\n"
-"PO-Revision-Date: 2010-04-22 11:49+0200\n"
-"Last-Translator: Hannie Dumoleyn <lafeber-dumoleyn2@zonnet.nl>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2010-09-28 11:07+0000\n"
+"PO-Revision-Date: 2010-09-28 10:43+0000\n"
+"Last-Translator: Hannie Dumoleyn <Unknown>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
-"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2010-09-28 11:24+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"Language: nl\n"
#: ../data/empathy.desktop.in.in.h:1
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chat op Google Talk, Facebook, MSN en veel andere chat-diensten"
+
+#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy"
msgstr "Empathy"
-#: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
+#: ../data/empathy.desktop.in.in.h:3
+msgid "Empathy Internet Messaging"
msgstr "Empathy chatprogramma"
-#: ../data/empathy.desktop.in.in.h:3
+#: ../data/empathy.desktop.in.in.h:4
msgid "IM Client"
msgstr "Chatprogramma"
-#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "Chatberichten sturen en ontvangen"
-
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
msgid "Always open a separate chat window for new chats."
-msgstr "Altijd een nieuw scherm voor nieuwe gesprekken openen."
+msgstr "Altijd een nieuw scherm openen voor nieuwe gesprekken."
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
msgstr ""
"Te gebruiken achtervoegsel bij auto-afmaken (tab) van bijnaam in groepschat."
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Chat window theme"
msgstr "Thema voor chatvensters"
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"Door komma's gescheiden lijst van talen die door de spellingcontrole "
"gebruikt kunnen worden (bijv. ‘en, fr, nl’)."
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Compact contact list"
msgstr "Compacte contactenlijst"
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Connection managers should be used"
-msgstr "Verbindingsbeheer gebruiken"
+msgstr "Verbindingsbeheer moet gebruikt worden"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Contact list sort criterion"
msgstr "Sorteercriterium contactenlijst"
# avatar? :s (Wouter Bolsterlee)
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "Standaardmap voor het kiezen van gebruikersafbeeldingen"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Disable popup notifications when away"
msgstr "Notificatieberichten uitschakelen indien afwezig"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Disable sounds when away"
msgstr "Geluid uitschakelen indien afwezig"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "Inkomende gebeurtenissen in het statusgebied weergeven"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Toon inkomende gebeurtenissen in het mededelingengebied. Toon deze direct "
+"aan de gebruiker als dit niet is ingesteld."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
-msgstr "Empathy kan de locatie van de gebruiker bekend maken"
+msgstr "Empathy mag de locatie van de gebruiker bekend maken"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy kan gps gebruiken om de locatie te bepalen"
+msgstr "Empathy mag GPS gebruiken om de locatie te bepalen"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy kan het gsm-netwerk gebruiken om de locatie te bepalen"
+msgstr "Empathy mag het mobiele netwerk gebruiken om de locatie te bepalen"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
-msgstr "Empathy kan via het netwerk proberen om de locatie te bepalen"
+msgstr "Empathy mag via het netwerk proberen om de locatie te bepalen"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy default download folder"
msgstr "Standaard downloadmap voor Empathy"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy has asked about importing accounts"
msgstr "Empathy heeft gevraagd of u accounts wilt importeren"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy heeft butterfly-logs gemigreerd"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy automatisch op 'afwezig' instellen bij inactiviteit"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should auto-connect on startup"
-msgstr "Automatisch verbinden bij starten"
+msgstr "Empathy automatisch laten verbinden bij starten"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy moet de nauwkeurigheid van de locatie beperken"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "De gebruikersafbeelding gebruiken als pictogram van het chatvenster"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable WebKit Developer Tools"
msgstr "WebKit-ontwikkelhulpprogramma's inschakelen"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable popup notifications for new messages"
msgstr "Notificatieberichten tonen voor nieuwe berichten"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable spell checker"
msgstr "Spellingcontrole inschakelen"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide main window"
msgstr "Hoofdvenster verbergen"
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Hide the main window."
msgstr "Het hoofdvenster verbergen."
-#: ../data/empathy.schemas.in.h:26
-msgid "MC 4 accounts have been imported"
-msgstr "MC 4-accounts zijn geïmporteerd"
-
-#: ../data/empathy.schemas.in.h:27
-msgid "MC 4 accounts have been imported."
-msgstr "MC 4-accounts zijn geïmporteerd."
-
-#: ../data/empathy.schemas.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Nick completed character"
msgstr "Achtervoegsel auto-afmaken"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Open new chats in separate windows"
-msgstr "Nieuwe chats openen in aparte vensters"
+msgstr "Nieuwe chats in aparte vensters openen"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use"
msgstr "Pad van het te gebruiken Adium-thema"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr ""
"Pad van het te gebruiken Adium-thema als het thema voor chatten Adium is."
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for incoming messages"
msgstr "Geluid afspelen bij nieuwe berichten"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for new conversations"
msgstr "Geluid afspelen bij nieuwe gesprekken"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for outgoing messages"
msgstr "Geluid afspelen bij uitgaande berichten"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs in"
msgstr "Geluid afspelen wanneer contactpersonen zich aanmelden"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when a contact logs out"
msgstr "Geluid afspelen wanneer contactpersonen zich afmelden"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log in"
msgstr "Geluid afspelen bij aanmelden"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when we log out"
msgstr "Geluid afspelen bij afmelden"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications if the chat isn't focused"
msgstr "Notificatieberichten tonen als het chatvenster geen focus heeft"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs in"
msgstr "Notificatiebericht tonen wanneer een contactpersoon zich aanmeldt"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications when a contact logs out"
msgstr "Notificatiebericht tonen wanneer een contactpersoon zich afmeldt"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show avatars"
msgstr "Gebruikersafbeeldingen tonen"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show contact list in rooms"
msgstr "Contactenlijst in chatruimtes tonen"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show hint about closing the main window"
msgstr "Tip tonen bij het sluiten van het hoofdvenster"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show offline contacts"
msgstr "Offline-contacten tonen"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show protocols"
msgstr "Protocollen tonen"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Spell checking languages"
msgstr "Talen voor de spellingcontrole"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The default folder to save file transfers in."
msgstr "De standaardmap waar ontvangen bestanden opgeslagen worden."
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The last directory that an avatar image was chosen from."
msgstr "De laatst gebruikte map voor gebruikersafbeeldingen."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The position for the chat window side pane"
+msgstr "De positie van het chatvenster-zijpaneel"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "De opgeslagen positie (in pixels) van het chatvenster-zijpaneel."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Het thema dat gebruikt wordt voor het tonen van chats in chatvensters."
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use graphical smileys"
msgstr "Smileys grafisch tonen"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use notification sounds"
msgstr "Waarschuwingsgeluiden gebruiken"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Use theme for chat rooms"
msgstr "Thema voor chatruimtes gebruiken"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
"Of Empathy de locatie van de gebruiker aan de contacten mag bekend maken."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Of Empathy gps kan gebruiken om de locatie te bepalen."
+msgstr "Of Empathy gps mag gebruiken om de locatie te bepalen."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Of Empathy het mobiele netwerk kan gebruiken om de locatie te bepalen."
+msgstr "Of Empathy het mobiele netwerk mag gebruiken om de locatie te bepalen."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the network to guess the location."
-msgstr "Of Empathy het netwerk kan gebruiken om de locatie te bepalen."
+msgstr "Of Empathy het netwerk mag gebruiken om de locatie te bepalen."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr ""
"Of Empathy gevraagd heeft accounts van andere programma's te importeren."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Of Empathy butterfly-logs gemigreerd heeft."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Of Empathy u automatisch moet aanmelden bij opstarten."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+"Of Empathy automatisch op 'afwezig' ingesteld moet worden wanneer de "
+"gebruiker niets doet."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Of Empathy de nauwkeurigheid van de locatie moet beperken vanwege de privacy."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Of Empathy gebruikersafbeeldingen moet gebruiken als pictogram voor de "
"chatvensters."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Of WebKit-ontwikkelhulpprogramma's, zoals de Web Inspector, ingeschakeld "
"moeten worden."
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr ""
-"Of verbindingsbeheerders gebruikt moet worden om automatisch opnieuw "
+"Of verbindingsbeheerders gebruikt moeten worden om automatisch opnieuw "
"verbinding te maken of de verbinding te verbreken."
# Bah, wat een lelijke vertaling (Wouter Bolsterlee)
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
"Of ingetypte woorden gecontroleerd moeten worden met de talen die u op "
"spelling wilt controleren."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Of smileys in gesprekken grafisch moeten worden getoond."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Of er geluid afgespeeld moet worden als een contactpersoon zich aanmeldt."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Of er geluid afgespeeld moet worden als een contactpersoon zich afmeldt."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of events."
msgstr "Of er geluid afgespeeld moet worden om gebeurtenissen te melden."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Of er geluid afgespeeld moet worden bij binnenkomende berichten."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of new conversations."
msgstr ""
"Of er geluid afgespeeld moet worden om u op de hoogte te stellen van nieuwe "
"gesprekken."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Of er geluid afgespeeld moet worden bij uitgaande berichten."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound when logging into a network."
msgstr "Of er geluid afgespeeld moet worden bij aanmelden bij een netwerk."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound when logging out of a network."
msgstr "Of er geluid afgespeeld moet worden bij afmelden bij een netwerk."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play sound notifications when away or busy."
msgstr "Of er geluid afgespeeld moet worden indien afwezig of bezig."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
"Of er een notificatiebericht getoond moet worden wanneer een contactpersoon "
"zich afmeldt."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
"Of er een notificatiebericht getoond moet worden wanneer een contactpersoon "
"zich aanmeldt."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -401,45 +426,45 @@ msgstr ""
"Of er een notificatiebericht getoond moet worden bij het ontvangen van een "
"bericht, ook als de chat geopend is, maar geen focus heeft."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Of er een notificatiebericht getoond moet worden bij het ontvangen van een "
"bericht."
-#: ../data/empathy.schemas.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Of gebruikersafbeeldingen van contactpersonen getoond moeten worden in de "
"contactenlijst en chatvensters."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
"Of contactpersonen die offline zijn in de contactenlijst moeten worden "
"getoond."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Of er een notificatiebericht getoond moet worden indien afwezig of bezig."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show protocols for contacts in the contact list."
msgstr ""
"Of er protocollen moeten worden getoond voor contactpersonen in de "
"contactenlijst."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show the contact list in chat rooms."
msgstr "Of de contactenlijst in chatruimtes getoond moet worden."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show the contact list in compact mode."
msgstr "Of de contactenlijst in compacte modus moet worden getoond."
-#: ../data/empathy.schemas.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -447,11 +472,11 @@ msgstr ""
"Of het dialoogvenster over het sluiten van het hoofdvenster met de knop ‘x’ "
"in de titelbalk getoond moet worden."
-#: ../data/empathy.schemas.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to use the theme for chat rooms."
msgstr "Of een thema gebruikt moet worden voor chatruimtes."
-#: ../data/empathy.schemas.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
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 "
@@ -467,149 +492,205 @@ msgstr "Beheer Messaging- en VoIP-accounts"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2069 ../src/cc-empathy-accounts-page.c:243
-#: ../src/cc-empathy-accounts-panel.c:91
+#: ../src/empathy-accounts-dialog.c:2156
msgid "Messaging and VoIP Accounts"
msgstr "Messaging- en VoIP-accounts"
-#: ../libempathy/empathy-ft-handler.c:842
+#: ../libempathy/empathy-ft-handler.c:851
msgid "The hash of the received file and the sent one do not match"
msgstr "Het verzonden en ontvangen bestand komen niet overeen"
-#: ../libempathy/empathy-ft-handler.c:1102
+#: ../libempathy/empathy-ft-handler.c:1111
msgid "File transfer not supported by remote contact"
-msgstr "Bestandsoverdracht wordt niet ondersteund door de contactpersoon"
+msgstr "Bestandsoverdracht wordt niet ondersteund door extern contact"
-#: ../libempathy/empathy-ft-handler.c:1160
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is not a regular file"
msgstr "Het geselecteerde bestand is geen normaal bestand"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is empty"
msgstr "Het geselecteerde bestand is leeg"
-#: ../libempathy/empathy-tp-contact-list.c:911
-#: ../src/empathy-auto-salut-account-helper.c:79
-msgid "People nearby"
-msgstr "Mensen in de buurt"
-
-#: ../libempathy/empathy-tp-file.c:281
+#: ../libempathy/empathy-tp-file.c:283
msgid "Socket type not supported"
msgstr "Sockettype niet ondersteund"
-#: ../libempathy/empathy-tp-file.c:400
+#: ../libempathy/empathy-tp-file.c:402
msgid "No reason was specified"
msgstr "Geen reden opgegeven"
-#: ../libempathy/empathy-tp-file.c:403
+#: ../libempathy/empathy-tp-file.c:405
msgid "The change in state was requested"
msgstr "Een statuswijziging was aangevraagd"
-#: ../libempathy/empathy-tp-file.c:406
+#: ../libempathy/empathy-tp-file.c:408
msgid "You canceled the file transfer"
msgstr "U heeft de bestandsoverdracht geannuleerd"
-#: ../libempathy/empathy-tp-file.c:409
+#: ../libempathy/empathy-tp-file.c:411
msgid "The other participant canceled the file transfer"
msgstr "De andere deelnemer heeft de bestandsoverdracht geannuleerd"
-#: ../libempathy/empathy-tp-file.c:412
+#: ../libempathy/empathy-tp-file.c:414
msgid "Error while trying to transfer the file"
msgstr "Fout bij versturen van bestand"
-#: ../libempathy/empathy-tp-file.c:415
+#: ../libempathy/empathy-tp-file.c:417
msgid "The other participant is unable to transfer the file"
msgstr "De andere deelnemer kan het bestand niet versturen"
-#: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
-msgstr "reden onbekend"
+msgstr "Reden onbekend"
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Beschikbaar"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
-msgstr "Bezig"
+msgstr "Bezet"
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Afwezig"
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Onzichtbaar"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Offline"
-#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
+#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
+#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "Geen reden opgegeven"
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "Status is ingesteld op offline"
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Netwerkprobleem"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
-msgstr "Authenticatie mislukt"
+msgstr "Authenticatie is mislukt"
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Versleutelingsfout"
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "Naam in gebruik"
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "Geen certificaat gegeven"
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "Onbetrouwbaar certificaat"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "Verlopen certificaat"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "Certificaat nog niet geldig"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "Certificaat is niet voor deze server"
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "Vingerafdruk van certificaat klopt niet"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "Zelfondertekend certificaat"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Certificaatfout"
-#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:106
+#: ../libempathy/empathy-utils.c:356
+msgid "Encryption is not available"
+msgstr "Encryptie is niet beschikbaar"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Certificate is invalid"
+msgstr "Certificaat is ongeldig"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been refused"
+msgstr "Verbinding geweigerd"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Connection can't be established"
+msgstr "Er kan geen verbinding gemaakt worden"
+
+#: ../libempathy/empathy-utils.c:364
+msgid "Connection has been lost"
+msgstr "Verbinding verbroken"
+
+#: ../libempathy/empathy-utils.c:366
+msgid "This resource is already connected to the server"
+msgstr "Er is al een verbinding met de server"
+
+#: ../libempathy/empathy-utils.c:368
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+"Verbinding is vervangen door een nieuwe verbinding met dezelfde gegevens"
+
+#: ../libempathy/empathy-utils.c:371
+msgid "The account already exists on the server"
+msgstr "Dit account bestaat al op de server"
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Server is currently too busy to handle the connection"
+msgstr "De server is te druk om de verbinding af te handelen"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Certificate has been revoked"
+msgstr "Certificaat is ingetrokken"
+
+#: ../libempathy/empathy-utils.c:377
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "Het certificaat gebuikt een zwak algoritme, of is slecht beveiligd"
+
+#: ../libempathy/empathy-utils.c:380
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"De lengte van het server-certificaat of de diepte van de certificaat-chain "
+"overschrijdt de grenzen, opgelegd door de cryptografische bibliotheek"
+
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
-msgstr "Mensen in de buurt"
+msgstr "Mensen in uw omgeving"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "Facebook-chat"
@@ -659,62 +740,92 @@ msgstr[1] "%d maanden geleden"
msgid "in the future"
msgstr "in de toekomst"
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:463
msgid "All"
msgstr "Iedereen"
-#: ../libempathy-gtk/empathy-account-widget.c:538
-#: ../libempathy-gtk/empathy-account-widget.c:594
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "Account"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "Server"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "Poort"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1126
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "Gebruikersnaam:"
-#: ../libempathy-gtk/empathy-account-widget.c:1474
+#: ../libempathy-gtk/empathy-account-widget.c:1521
+msgid "A_pply"
+msgstr "Toe_passen"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "_Aanmelden"
-#: ../libempathy-gtk/empathy-account-widget.c:1542
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "Account:"
-#: ../libempathy-gtk/empathy-account-widget.c:1553
-msgid "Enabled"
-msgstr "Ingeschakeld"
+#: ../libempathy-gtk/empathy-account-widget.c:1628
+msgid "_Enabled"
+msgstr "_Ingeschakeld"
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Deze account bestaat al op de server"
-#: ../libempathy-gtk/empathy-account-widget.c:1621
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Nieuwe account aanmaken op de server"
+#: ../libempathy-gtk/empathy-account-widget.c:1789
+msgid "Ca_ncel"
+msgstr "_Annuleren"
+
#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
#. * 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:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s op %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:2103
#, c-format
msgid "%s Account"
msgstr "%s account"
-#: ../libempathy-gtk/empathy-account-widget.c:2043
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Nieuwe account"
@@ -736,11 +847,11 @@ msgstr "Geavanceerd"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "_Wachtwoord:"
@@ -754,14 +865,14 @@ msgstr "Wat is uw AIM-wachtwoord?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
msgid "What is your AIM screen name?"
-msgstr " Wat is uw AIM-schermnaam?"
+msgstr "Wat is uw AIM-schermnaam?"
#: ../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:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Poort:"
@@ -770,7 +881,7 @@ msgstr "_Poort:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Server:"
@@ -781,14 +892,14 @@ msgid "<b>Example:</b> username"
msgstr "<b>Voorbeeld:</b> gebruikersnaam"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
-msgstr "Login I_D"
+msgstr "_Gebruikersnaam:"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
msgid "What is your GroupWise User ID?"
-msgstr "Wat is uw GroupWise-gebruikers-id?"
+msgstr "Wat is uw GroupWise-gebruikersnaam?"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
msgid "What is your GroupWise password?"
@@ -799,56 +910,52 @@ msgid "<b>Example:</b> 123456789"
msgstr "<b>Voorbeeld:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "_Tekenset:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
msgstr "ICQ _UIN:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
msgid "What is your ICQ UIN?"
-msgstr " Wat is uw ICQ-identificatienummer?"
+msgstr "Wat is uw ICQ-identificatienummer?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
msgid "What is your ICQ password?"
msgstr "Wat is uw ICQ-wachtwoord?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "_Tekenset:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
-msgid "New Network"
-msgstr "Nieuw netwerk"
-
-#: ../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 "Registreren"
#. 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 "Opties"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
msgid "None"
msgstr "Geen"
@@ -884,6 +991,14 @@ msgstr "Echte naam:"
msgid "Servers"
msgstr "Servers"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "Wat is uw IRC-bijnaam?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "Welk IRC-netwerk?"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "<b>Example:</b> user@gmail.com"
msgstr "<b>Voorbeeld:</b> gebruiker@gmail.com"
@@ -892,20 +1007,28 @@ msgstr "<b>Voorbeeld:</b> gebruiker@gmail.com"
msgid "<b>Example:</b> user@jabber.org"
msgstr "<b>Voorbeeld:</b> gebruiker@jabber.org"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Encr_yptie vereist (TLS/SSL)"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr "Ne_geer SSL-certificaat foutmeldingen"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Override server settings"
msgstr "Serverinstellingen overschrijven"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
-msgstr "Pri_oriteit:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
+msgstr "Priori_teit:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "Reso_urce:"
msgstr "_Bron:"
#. 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
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -917,50 +1040,42 @@ msgstr ""
"Gebruik <a href=\"http://www.facebook.com/username/\">deze pagina</a> om een "
"Facebook-gebruikersnaam te kiezen als u deze nog niet heeft."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "Use old SS_L"
msgstr "Oude SS_L gebruiken"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Facebook password?"
msgstr "Wat is uw Facebook-wachtwoord?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook username?"
msgstr "Wat is uw Facebook-gebruikersnaam?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Google ID?"
-msgstr "Wat is uw Google-id?"
+msgstr "Wat is uw Google-ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google password?"
msgstr "Wat is uw Google-wachtwoord?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Jabber ID?"
msgstr "Wat is uw Jabber-ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber password?"
msgstr "Wat is uw Jabber-wachtwoord?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your desired Jabber ID?"
-msgstr "Wat is uw gewenste Jabber-id?"
+msgstr "Wat is uw gewenste Jabber-ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber password?"
msgstr "Wat is uw gewenste Jabber-wachtwoord?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Encryption required (TLS/SSL)"
-msgstr "_Versleuteling verplicht (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "_Ignore SSL certificate errors"
-msgstr "SSL-Certificaatproblemen _negeren"
-
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Voorbeeld:</b>gebruiker@hotmail.com"
@@ -974,25 +1089,25 @@ msgid "What is your Windows Live password?"
msgstr "Wat is uw Windows Live-wachtwoord?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr "_E-mailadres:"
+msgid "E-_mail address:"
+msgstr "E-_mailadres:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "_Bijnaam"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_First Name:"
msgstr "_Voornaam:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID:"
-msgstr "_Jabber-id:"
+msgstr "_Jabber-ID:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Last Name:"
msgstr "_Achternaam:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "_Bijnaam:"
-
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "_Weergegeven naam:"
@@ -1047,7 +1162,7 @@ msgstr "Proxy-opties"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "STUN Server:"
-msgstr "STUN-Server:"
+msgstr "STUN-server:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Server:"
@@ -1063,119 +1178,107 @@ msgstr "Wat is uw wachtwoord voor uw SIP-account?"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP login ID?"
-msgstr "Wat is uw SIP-aanmeld-id?"
+msgstr "Wat is uw SIP-aanmeld-ID?"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "_Username:"
-msgstr "_Gebruikersnaam:"
+msgstr "Gebr_uikersnaam:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo! Japan"
-msgstr "_Yahoo! Japan gebruiken"
+msgid "I_gnore conference and chat room invitations"
+msgstr "Ne_geer conferentie- en chatruimte-uitnodigingen"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! ID?"
-msgstr "Wat is uw Yahoo!-id?"
+msgstr "Wat is uw Yahoo!-ID?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Wat is uw Yahoo!-wachtwoord?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
-msgstr "Yahoo!-i_d:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "Uitnodigingen voor groepsgesprekken _negeren"
+msgstr "Yahoo!-I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
-msgstr "Taalgebied voor lijst van _chatruimtes:"
+msgstr "Taalinstelling voor lijst van chat_ruimtes:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-#: ../libempathy-gtk/empathy-avatar-chooser.c:526
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
msgid "Couldn't convert image"
msgstr "Kon afbeelding niet converteren"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:451
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
msgid "None of the accepted image formats are supported on your system"
msgstr ""
"Geen van de toegestane afbeeldingsformaten wordt op uw systeem ondersteund"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:917
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
msgid "Select Your Avatar Image"
msgstr "Kies uw gebruikersafbeelding"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:920
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "No Image"
msgstr "Geen afbeelding"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:982
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
msgid "Images"
msgstr "Afbeeldingen"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:986
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
msgid "All Files"
msgstr "Alle bestanden"
-#: ../libempathy-gtk/empathy-avatar-image.c:325
+#: ../libempathy-gtk/empathy-avatar-image.c:323
msgid "Click to enlarge"
msgstr "Klik om te vergroten"
-#: ../libempathy-gtk/empathy-chat.c:233
-msgid "Failed to reconnect this chat"
-msgstr "Opnieuw verbinden voor deze chat mislukt"
-
-#: ../libempathy-gtk/empathy-chat.c:655
-msgid "Failed to join chat room"
-msgstr "Binnengaan van chatruimte mislukt"
-
-#: ../libempathy-gtk/empathy-chat.c:673
+#: ../libempathy-gtk/empathy-chat.c:642
msgid "Failed to open private chat"
-msgstr "Openen van privé-chat mislukt"
+msgstr "Openen van privé-chat is mislukt"
-#: ../libempathy-gtk/empathy-chat.c:712
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
msgstr "Onderwerp niet ondersteund bij dit gesprek"
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
-msgstr "Het onderwerp mag niet worden gewijzigd"
+msgstr "U mag het onderwerp niet wijzigen"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: alle berichten van de huidige conversatie wissen"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>: bepaal het onderwerp van de huidige conversatie"
-#: ../libempathy-gtk/empathy-chat.c:853
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chat room ID>: een nieuwe chatruimte binnengaan"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chat room ID>: een nieuwe chatruimte binnengaan"
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact ID> [<message>]: een privé-gesprek beginnen"
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact ID> <message>: een privé-gesprek beginnen"
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>: wijzig uw bijnaam op de huidige server"
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <message>: stuur een ACTIE-bericht naar de huidige conversatie"
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:849
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 "
@@ -1185,7 +1288,7 @@ msgstr ""
"gebruikt om een bericht beginnend met een '/' te versturen. Bijvoorbeeld: \"/"
"say /join wordt gebruikt om een nieuwe chatruimte binnen te gaan\""
-#: ../libempathy-gtk/empathy-chat.c:876
+#: ../libempathy-gtk/empathy-chat.c:854
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1193,80 +1296,84 @@ msgstr ""
"/help [<command>]: toon alle bestaande opdrachten. Als <command> bestaat, "
"wordt de uitleg ervan weergegeven."
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:864
#, c-format
msgid "Usage: %s"
msgstr "Gebruik: %s"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "Onbekende opdracht"
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
msgstr "Onbekende opdracht; zie /help voor de beschikbare opdrachten"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "offline"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "ongeldige contactpersoon"
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "toestemming geweigerd"
-#: ../libempathy-gtk/empathy-chat.c:1183
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "bericht te lang"
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "niet geïmplementeerd"
-#: ../libempathy-gtk/empathy-chat.c:1189
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "onbekend"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1172
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Fout bij versturen van bericht '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1228
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+msgid "Topic:"
+msgstr "Onderwerp:"
+
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "Onderwerp ingesteld: %s"
-#: ../libempathy-gtk/empathy-chat.c:1230
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "Geen onderwerp"
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(Geen suggesties)"
-#: ../libempathy-gtk/empathy-chat.c:1680
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "Smiley invoegen"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1698
-#: ../libempathy-gtk/empathy-ui-utils.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "_Sturen"
-#: ../libempathy-gtk/empathy-chat.c:1732
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "_Spellingsuggesties"
-#: ../libempathy-gtk/empathy-chat.c:1826
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
-msgstr "Terughalen recente logs mislukt"
+msgstr "Terughalen van recente logs is mislukt"
-#: ../libempathy-gtk/empathy-chat.c:1957
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "%s heeft de verbinding verbroken"
@@ -1274,12 +1381,12 @@ msgstr "%s heeft de verbinding verbroken"
#. 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:2071
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s werd door %2$s verwijderd"
-#: ../libempathy-gtk/empathy-chat.c:1967
+#: ../libempathy-gtk/empathy-chat.c:2074
#, c-format
msgid "%s was kicked"
msgstr "%s werd verwijderd"
@@ -1287,17 +1394,17 @@ msgstr "%s werd verwijderd"
#. 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:2082
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s werd verbannen door %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1978
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
msgstr "%s werd verbannen"
-#: ../libempathy-gtk/empathy-chat.c:1982
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
msgstr "%s heeft de chatruimte verlaten"
@@ -1307,83 +1414,81 @@ msgstr "%s heeft de chatruimte verlaten"
#. * 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:2098
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2016
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
msgstr "%s is de chatruimte binnengekomen"
-#: ../libempathy-gtk/empathy-chat.c:2041
+#: ../libempathy-gtk/empathy-chat.c:2148
#, c-format
msgid "%s is now known as %s"
msgstr "%s is nu bekend als %s"
-#: ../libempathy-gtk/empathy-chat.c:2176 ../src/empathy-call-window.c:1540
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
msgid "Disconnected"
msgstr "Verbinding verbroken"
-#: ../libempathy-gtk/empathy-chat.c:2698
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "Verkeerd wachtwoord; probeer het opnieuw:"
-#: ../libempathy-gtk/empathy-chat.c:2699
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "Opnieuw proberen"
-#: ../libempathy-gtk/empathy-chat.c:2704
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "Deze ruimte is met een wachtwoord beveiligd:"
-#: ../libempathy-gtk/empathy-chat.c:2705
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
msgstr "_Binnengaan"
-#: ../libempathy-gtk/empathy-chat.c:2845
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "Verbonden"
-#: ../libempathy-gtk/empathy-chat.c:2898
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "Gesprek"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:671
-msgid "Topic:"
-msgstr "Onderwerp:"
-
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:318
-#: ../libempathy-gtk/empathy-theme-adium.c:787
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:791
msgid "_Copy Link Address"
msgstr "Koppelingsadres _kopiëren"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:325
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:798
msgid "_Open Link"
msgstr "Koppeling _openen"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:423
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Contactinformatie bewerken"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:301
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
-msgstr "Persoonlijke gegevens"
+msgstr "Persoonlijke informatie"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:406
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
msgid "New Contact"
-msgstr "Nieuwe contactpersoon"
+msgstr "Nieuw contact"
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
msgid "Decide _Later"
@@ -1393,216 +1498,290 @@ msgstr "_Later besluiten"
msgid "Subscription Request"
msgstr "Inschrijvingsverzoek"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1633
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Groep opgeheven"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Favoriete personen"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Wilt u echt de groep ‘%s’ verwijderen?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1635
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2235
msgid "Removing group"
msgstr "Groep verwijderen"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1684
-#: ../libempathy-gtk/empathy-contact-list-view.c:1761
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-contact-list-view.c:2055
+#: ../libempathy-gtk/empathy-contact-list-view.c:2132
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Verwijderen"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1714
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2320
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Wilt u de contactpersoon ‘%s’ echt verwijderen?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1716
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
msgstr "Contactpersoon wordt verwijderd"
-#: ../libempathy-gtk/empathy-contact-menu.c:206
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
-msgstr "_Contactpersoon toevoegen..."
+msgstr "Cont_actpersoon toevoegen..."
-#: ../libempathy-gtk/empathy-contact-menu.c:233
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "_Chatten"
-#: ../libempathy-gtk/empathy-contact-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-individual-menu.c:557
msgctxt "menu item"
msgid "_Audio Call"
-msgstr "_Geluidsgesprek"
+msgstr "_Audiogesprek"
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-individual-menu.c:599
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videogesprek"
-#: ../libempathy-gtk/empathy-contact-menu.c:347
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "_Eerdere gesprekken"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Send file"
-msgstr "Bestand sturen"
+#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:683
+msgid "Send File"
+msgstr "Bestand versturen"
-#: ../libempathy-gtk/empathy-contact-menu.c:392
-msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:375
+#: ../libempathy-gtk/empathy-individual-menu.c:725
+msgid "Share My Desktop"
msgstr "Mijn bureaublad delen"
# hmmmm (Wouter Bolsterlee)
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-contact-widget.c:1379
+#: ../libempathy-gtk/empathy-contact-menu.c:415
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
msgstr "Favoriet"
-#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-contact-menu.c:444
+#: ../libempathy-gtk/empathy-individual-menu.c:786
msgid "Infor_mation"
msgstr "Infor_matie"
-#: ../libempathy-gtk/empathy-contact-menu.c:508
+#: ../libempathy-gtk/empathy-contact-menu.c:490
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "Be_werken"
-#: ../libempathy-gtk/empathy-contact-menu.c:562
-#: ../src/empathy-chat-window.c:856
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+#: ../libempathy-gtk/empathy-individual-menu.c:970
+#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "In deze ruimte uitnodigen"
-#: ../libempathy-gtk/empathy-contact-menu.c:593
-msgid "_Invite to chat room"
-msgstr "In chatruimte uit_nodigen"
+#: ../libempathy-gtk/empathy-contact-menu.c:575
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+msgid "_Invite to Chat Room"
+msgstr "U_itnodigen naar gespreksruimte"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "Selecteer een contactpersoon"
-#: ../libempathy-gtk/empathy-contact-widget.c:238
-msgid "Select"
-msgstr "Selecteren"
+#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-individual-widget.c:148
+msgid "Full name:"
+msgstr "Volledige naam:"
-#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1053
-msgid "Group"
-msgstr "Groep"
+#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-individual-widget.c:149
+msgid "Phone number:"
+msgstr "Telefoonnummer:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-individual-widget.c:150
+msgid "E-mail address:"
+msgstr "E-mailadres:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-individual-widget.c:151
+msgid "Website:"
+msgstr "Website:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-individual-widget.c:152
+msgid "Birthday:"
+msgstr "Geboortedatum:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:578
+#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Land-ISO-code:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:580
+#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Land:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Provincie:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Woonplaats:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Regio:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:588
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Postcode:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:590
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Straat:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:592
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Gebouw:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:594
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Verdieping:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:596
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Ruimte:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:598
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Tekst:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
-msgstr "Beschrijving:"
+msgstr "Omschrijving:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:602
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Nauwkeurigheidsniveau:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Fout:"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Verticale fout (meters):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Horizontale fout (meters):"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Snelheid:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Koers:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Klimsnelheid:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Voor het laatst bijgewerkt op:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Lengtegraad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Breedtegraad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Hoogte:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Locatie"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-msgid "<b>Location</b>, "
-msgstr "<b>Locatie</b>, "
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:601
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B %Y om %R UTC"
# hier geen 'gebruikersafbeelding', want dat is te groot (Wouter Bolsterlee)
-#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Gebruikersafbeelding opslaan"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Kan gebruikersafbeelding niet opslaan"
@@ -1610,52 +1789,50 @@ msgstr "Kan gebruikersafbeelding niet opslaan"
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Locatie</b> op (datum)\t"
+#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
msgstr "Alias:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "Geboortedatum:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client Information"
-msgstr "Informatie cliënt"
+msgstr "Informatie client"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client:"
-msgstr "Cliënt:"
+msgstr "Client:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
msgid "Contact Details"
-msgstr "Details Contactpersoon"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "E-mail address:"
-msgstr "E-mailadres:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Full name:"
-msgstr "Volledige naam:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Groups"
-msgstr "Groepen"
+msgstr "Gegevens contactpersoon"
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
msgid "Identifier:"
msgstr "Identificatie:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
msgstr "Informatie verzocht…"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "OS:"
msgstr "Besturingssysteem:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "Versie:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "Groepen"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:344
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -1663,86 +1840,187 @@ msgstr ""
"Selecteer de groepen waar u dit contact in wilt plaatsen. U kunt meerdere of "
"zelfs geen groepen kiezen."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
-msgid "Version:"
-msgstr "Versie:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Website:"
-msgstr "Website:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-groups-widget.c:363
msgid "_Add Group"
msgstr "Groep _toevoegen"
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+msgid "Select"
+msgstr "Selecteren"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-main-window.c:1247
+msgid "Group"
+msgstr "Groep"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+msgid "Linked Contacts"
+msgstr "Verbonden contacten"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+msgid "Select contacts to link"
+msgstr "Selecteer contacten om te verbinden"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:428
+msgid "New contact preview"
+msgstr "Nieuw contact inzien"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "Contactpersonen aan de linkerzijde zullen met elkaar worden verbonden."
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:837
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "Be_werken"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:863
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr "Contacten _verbinden…"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] "Meta-contact bevat %u contact"
+msgstr[1] "Meta-contact bevat %u contacten"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>Locatie</b> op (datum)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "Nieuw netwerk"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+msgid "Choose an IRC network"
+msgstr "Kies een IRC-netwerk"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "nieuwe server"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "Server"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "Poort"
-
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:700
-#: ../src/empathy-import-widget.c:312
-msgid "Account"
-msgstr "Account"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
+msgid "Link Contacts"
+msgstr "Contacten verbinden"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "_Verbinding verbreken…"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr ""
+"Splits het weergegeven meta-contact en herstel alle contacten die het bevat."
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
+msgid "_Link"
+msgstr "_Verbinden"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr "Meta-contact '%s' splitsen?"
-#: ../libempathy-gtk/empathy-log-window.c:717
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr ""
+"Weet u zeker dat u dit meta-contact wilt splitsen? Het zal alle verbindingen "
+"tussen uw contacten verwijderen."
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "_Verbinding verbreken"
+
+#: ../libempathy-gtk/empathy-log-window.c:663
msgid "Date"
msgstr "Datum"
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
msgid "Conversations"
msgstr "Gesprekken"
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "Volgende zoeken"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "Vorige zoeken"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
msgid "Previous Conversations"
msgstr "Vorige gesprekken"
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
msgid "Search"
msgstr "Zoeken"
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "_For:"
msgstr "_Voor:"
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
msgid "Contact ID:"
-msgstr "Contact-id:"
+msgstr "Contact-ID:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:144
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
msgid "C_hat"
msgstr "_Chatten"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:154
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
msgid "New Conversation"
msgstr "Nieuw gesprek"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
msgid "Send _Video"
msgstr "_Video sturen"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:196
-#: ../src/empathy-call-window.ui.h:17
-msgid "_Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
msgstr "_Opbellen"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
msgid "New Call"
msgstr "Nieuwe oproep"
@@ -1779,59 +2057,59 @@ msgid "Set your presence and current status"
msgstr "Uw aanwezigheid en huidige status instellen"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
msgid "Custom messages…"
msgstr "Aangepaste berichten…"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Zoeken:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Identieke hoofdletters/kleine letters"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Zoekopdracht niet gevonden"
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound.c:50
msgid "Received an instant message"
msgstr "Expresbericht ontvangen"
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
msgid "Sent an instant message"
msgstr "Expresbericht verzonden"
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
msgid "Incoming chat request"
msgstr "Binnenkomende gespreksoproep"
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
msgid "Contact connected"
msgstr "Verbonden met contact"
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
msgid "Contact disconnected"
-msgstr "Verbinding met contact verbroken"
+msgstr "Verbinding met contactpersoon verbroken"
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
msgid "Connected to server"
msgstr "Verbonden met server"
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
msgid "Disconnected from server"
msgstr "Verbinding met server verbroken"
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
msgid "Incoming voice call"
msgstr "Binnenkomende spraakoproep"
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
msgid "Outgoing voice call"
msgstr "Uitgaande spraakoproep"
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
msgid "Voice call ended"
msgstr "Spraakoproep beëindigd"
@@ -1868,17 +2146,90 @@ msgstr "Helder"
msgid "Blue"
msgstr "Blauw"
-#: ../libempathy-gtk/empathy-ui-utils.c:1511
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr "De identiteit van de chat-server kan niet bevestigd worden.\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certificate is not signed by a Certification Authority"
+msgstr "Het certificaat is niet door een Certification Authority ondertekend"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "Het certificaat is verlopen"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "Het cerificaat is nog niet geactiveerd"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "Het certificaat heeft niet de verwachte vingerafdruk"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr "De hostnaam in het certificaat komt niet overeen met de servernaam"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "Het certifificaat is zelf-ondertekend"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr ""
+"Het certificaat is door de Certification Authority die het heeft uitgegeven "
+"ingetrokken"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr "Het certificaat is cryptografisch zwak"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "De lengte van het certificaat is langer dan bevestigd kan worden"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "Het certificaat is foutief opgesteld"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "De verwachte hostnaam: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "Hostnaam van certificaat: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "Doorgaan"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "Deze verbinding is onbeschermd. Wilt u toch doorgaan ?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "Onthoud deze instelling voor toekomstige verbindingen"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "Certificaatdetails"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "Kan URI niet openen"
-#: ../libempathy-gtk/empathy-ui-utils.c:1628
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "Bestand selecteren"
-#: ../libempathy-gtk/empathy-ui-utils.c:1692
-msgid "Select a destination"
-msgstr "Doel selecteren"
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#, c-format
+msgid "Incoming file from %s"
+msgstr "Binnenkomend bestand van %s"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -2003,7 +2354,7 @@ msgstr "Noord-Europees"
#: ../libempathy-gtk/totem-subtitle-encoding.c:285
msgid "Persian"
-msgstr "Perzisch"
+msgstr "Pers"
#: ../libempathy-gtk/totem-subtitle-encoding.c:288
#: ../libempathy-gtk/totem-subtitle-encoding.c:290
@@ -2063,16 +2414,16 @@ msgstr "Geen foutmelding"
msgid "Instant Message (Empathy)"
msgstr "Instant Message (Empathy)"
-#: ../src/empathy.c:584
+#: ../src/empathy.c:414
msgid "Don't connect on startup"
msgstr "Niet verbinden bij opstarten"
-#: ../src/empathy.c:588
+#: ../src/empathy.c:418
msgid "Don't display the contact list or any other dialogs on startup"
msgstr ""
"De contactenlijst en andere dialoogvensters niet weergeven bij opstarten"
-#: ../src/empathy.c:600
+#: ../src/empathy.c:435
msgid "- Empathy IM Client"
msgstr "- Empathy chatprogramma"
@@ -2085,7 +2436,7 @@ msgid ""
msgstr ""
"Empathy is vrije software; u kunt het verspreiden en/of aanpassen onder de "
"voorwaarden van de GNU General Public License zoals uitgegeven door de Free "
-"Software Foundation; versie 2, ofwel (naar keuze) een latere versie."
+"Software Foundation; versie 2, of (naar keuze) een latere versie."
#: ../src/empathy-about-dialog.c:89
msgid ""
@@ -2107,8 +2458,8 @@ msgid ""
msgstr ""
"U zou een kopie van de GNU General Public License moeten hebben ontvangen "
"bij Empathy; is dit niet het geval, dan kunt u schrijven naar de Free "
-"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-"02110-130159 USA"
+"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
+"130159 USA"
#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
@@ -2121,30 +2472,65 @@ msgstr ""
"Taco Witte\n"
"Wouter Bolsterlee\n"
"Hannie Dumoleyn\n"
-"http://nl.gnome.org/"
-
-#: ../src/empathy-account-assistant.c:168
+"http://nl.gnome.org/\n"
+"\n"
+"Launchpad Contributions:\n"
+" A. Vugts https://launchpad.net/~mail-axelv\n"
+" Benno Schulenberg https://launchpad.net/~bennoschulenberg\n"
+" Danny https://launchpad.net/~danny-fleppuhstein\n"
+" Dennis Groenveld https://launchpad.net/~d3nn1s\n"
+" Elco https://launchpad.net/~eajnab\n"
+" Faperdaper https://launchpad.net/~faperdaper\n"
+" Guus https://launchpad.net/~guus-verbeek\n"
+" Hannie Dumoleyn https://launchpad.net/~lafeber-dumoleyn\n"
+" Heureka https://launchpad.net/~jan-de-ridder\n"
+" Ismael https://launchpad.net/~ismael-grammenidis\n"
+" Jean Waucomont https://launchpad.net/~jean-waucomont\n"
+" Jeroen Adriaanse https://launchpad.net/~jeroenadriaanse\n"
+" Jerry Stevens https://launchpad.net/~jerrystevens\n"
+" Jochem https://launchpad.net/~jochem56\n"
+" Joshua Lückers https://launchpad.net/~joshualuckers\n"
+" Joshua Schroijen https://launchpad.net/~joshuaschroijen\n"
+" Luuk de Leest https://launchpad.net/~luuk58\n"
+" Marcel de Haas https://launchpad.net/~marcel-dehaas\n"
+" Metal724 https://launchpad.net/~terpstra007\n"
+" Michael Kiss https://launchpad.net/~michael-kiss\n"
+" Passant https://launchpad.net/~passant\n"
+" Redmar https://launchpad.net/~redmar\n"
+" Robert Ros https://launchpad.net/~rros\n"
+" Ruud Menken https://launchpad.net/~rmenken\n"
+" SnivleM https://launchpad.net/~yh\n"
+" Twan Coenraad https://launchpad.net/~t-coenraad\n"
+" Ubuntu4life https://launchpad.net/~jeroen-chil\n"
+" UndiFineD https://launchpad.net/~k.dejong\n"
+" Wouter Bolsterlee (uws) https://launchpad.net/~uws\n"
+" Xiao Shi Zi https://launchpad.net/~lionel-bogaert\n"
+" Yentl https://launchpad.net/~yentlvt\n"
+" cumulus007 https://launchpad.net/~cumulus-007\n"
+" rob https://launchpad.net/~rvdb"
+
+#: ../src/empathy-account-assistant.c:167
msgid "There was an error while importing the accounts."
msgstr "Er is een fout opgetreden bij het importeren van de accounts."
-#: ../src/empathy-account-assistant.c:171
+#: ../src/empathy-account-assistant.c:170
msgid "There was an error while parsing the account details."
msgstr "Er is een fout opgetreden bij het ontleden van de account-details."
-#: ../src/empathy-account-assistant.c:174
+#: ../src/empathy-account-assistant.c:173
msgid "There was an error while creating the account."
msgstr "Er is een fout opgetreden bij het aanmaken van de account."
-#: ../src/empathy-account-assistant.c:176
+#: ../src/empathy-account-assistant.c:175
msgid "There was an error."
msgstr "Er is een fout opgetreden."
-#: ../src/empathy-account-assistant.c:180
+#: ../src/empathy-account-assistant.c:179
#, c-format
msgid "The error message was: %s"
msgstr "De foutmelding was: %s"
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:183
msgid ""
"You can either go back and try to enter your accounts' details again or quit "
"this assistant and add accounts later from the Edit menu."
@@ -2152,8 +2538,8 @@ msgstr ""
"U kunt teruggaan en opnieuw de details van uw account invoeren of deze "
"assistent verlaten en later accounts toevoegen via het menu Bewerken."
-#: ../src/empathy-account-assistant.c:221
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1315
msgid "An error occurred"
msgstr "Er is een fout opgetreden"
@@ -2162,36 +2548,36 @@ msgstr "Er is een fout opgetreden"
#. 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:614
#, c-format
msgid "New %s account"
msgstr "Nieuw %s-account"
-#: ../src/empathy-account-assistant.c:511
+#: ../src/empathy-account-assistant.c:514
msgid "What kind of chat account do you have?"
msgstr "Wat voor een chataccount heeft u?"
-#: ../src/empathy-account-assistant.c:517
+#: ../src/empathy-account-assistant.c:520
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Wilt u nog andere chataccounts instellen?"
-#: ../src/empathy-account-assistant.c:523
+#: ../src/empathy-account-assistant.c:526
msgid "Enter your account details"
msgstr "Voer de details van uw account in"
-#: ../src/empathy-account-assistant.c:528
+#: ../src/empathy-account-assistant.c:531
msgid "What kind of chat account do you want to create?"
msgstr "Wat voor een chataccount wilt u aanmaken?"
-#: ../src/empathy-account-assistant.c:534
+#: ../src/empathy-account-assistant.c:537
msgid "Do you want to create other chat accounts?"
-msgstr "Wilt u nog andere chataccounts aanmaken?"
+msgstr "Wilt u nog andere chat-accounts aanmaken?"
-#: ../src/empathy-account-assistant.c:541
+#: ../src/empathy-account-assistant.c:544
msgid "Enter the details for the new account"
msgstr "Voer de details voor de nieuwe account in"
-#: ../src/empathy-account-assistant.c:656
+#: ../src/empathy-account-assistant.c:659
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 "
@@ -2202,41 +2588,41 @@ msgstr ""
"AIM, Windows Live en vele andere chatprogramma's gebruiken. Met een "
"microfoon of een webcam kunt u ook audio- of videogesprekken voeren."
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:676
msgid "Do you have an account you've been using with another chat program?"
msgstr "Heeft u een account dat u gebruikt met een ander chatprogramma?"
-#: ../src/empathy-account-assistant.c:696
+#: ../src/empathy-account-assistant.c:699
msgid "Yes, import my account details from "
msgstr "Ja, importeer de details van mijn account uit "
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:720
msgid "Yes, I'll enter my account details now"
msgstr "Ja, ik voer nu de details van mijn account in"
-#: ../src/empathy-account-assistant.c:739
+#: ../src/empathy-account-assistant.c:742
msgid "No, I want a new account"
msgstr "Nee, ik wil een nieuw account"
-#: ../src/empathy-account-assistant.c:749
+#: ../src/empathy-account-assistant.c:752
msgid "No, I just want to see people online nearby for now"
-msgstr "Nee, ik wil nu alleen personen dichtbij die online zijn zien"
+msgstr "Nee, ik wil nu alleen mensen in de buurt die online zijn zien"
-#: ../src/empathy-account-assistant.c:770
+#: ../src/empathy-account-assistant.c:773
msgid "Select the accounts you want to import:"
msgstr "Selecteer de accounts die u wilt importeren:"
-#: ../src/empathy-account-assistant.c:854
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-account-assistant.c:857
#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Ja"
-#: ../src/empathy-account-assistant.c:861
+#: ../src/empathy-account-assistant.c:864
msgid "No, that's all for now"
msgstr "Nee, dat is voorlopig alles"
-#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1129
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 "
@@ -2248,16 +2634,16 @@ msgstr ""
"gebruiken. U kunt deze details later makkelijk aanpassen en eventueel deze "
"functie uitschakelen via het dialoogvenster ‘Accounts’"
-#: ../src/empathy-account-assistant.c:1136
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
msgid "Edit->Accounts"
msgstr "Bewerken->Accounts"
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1151
msgid "I don't want to enable this feature for now"
msgstr "Ik wil deze functie nu niet inschakelen"
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1187
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 "
@@ -2269,66 +2655,66 @@ msgstr ""
"inschakelen dient u het pakket telepathy-salut te installeren en een account "
"voor ‘Mensen in de buurt’ aan te maken via het dialoogvenster Accounts"
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1193
msgid "telepathy-salut not installed"
msgstr "telepathy-salut is niet geïnstalleerd"
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1239
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Assistent voor Messaging- en VoIP-accounts"
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1273
msgid "Welcome to Empathy"
msgstr "Welkom bij Empathy"
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1282
msgid "Import your existing accounts"
msgstr "Uw bestaande accounts importeren"
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1300
msgid "Please enter personal details"
msgstr "Voer uw persoonlijke gegevens in"
#. 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 "Er zijn wijzigingen in uw %s account die nog niet zijn opgeslagen."
#. 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 "Uw nieuwe account is nog niet opgeslagen."
-#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:730
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "Verbinden…"
-#: ../src/empathy-accounts-dialog.c:290
-#, c-format
-msgid "Disconnected — %s"
-msgstr "Verbinding verbroken — %s"
-
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:322
#, c-format
msgid "Offline — %s"
msgstr "Offline — %s"
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:334
+#, c-format
+msgid "Disconnected — %s"
+msgstr "Verbinding verbroken — %s"
+
+#: ../src/empathy-accounts-dialog.c:345
msgid "Offline — No Network Connection"
msgstr "Offline — Geen netwerkverbinding"
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:352
msgid "Unknown Status"
msgstr "Onbekende status"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:364
msgid "Offline — Account Disabled"
msgstr "Offline — Account uitgeschakeld"
-#: ../src/empathy-accounts-dialog.c:771
+#: ../src/empathy-accounts-dialog.c:810
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2336,16 +2722,16 @@ msgstr ""
"U staat op het punt een nieuw account aan te maken, waardoor uw wijzigingen\n"
"verloren gaan. Weet u zeker dat u door wilt gaan?"
-#: ../src/empathy-accounts-dialog.c:1118
+#: ../src/empathy-accounts-dialog.c:1157
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Wilt u %s van uw computer verwijderen?"
-#: ../src/empathy-accounts-dialog.c:1122
+#: ../src/empathy-accounts-dialog.c:1161
msgid "This will not remove your account on the server."
msgstr "Dit zal niet uw account op de server verwijderen."
-#: ../src/empathy-accounts-dialog.c:1359
+#: ../src/empathy-accounts-dialog.c:1399
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2353,7 +2739,7 @@ msgstr ""
"U staat op het punt een ander account te kiezen, waardoor uw wijzigingen\n"
"verloren gaan. Weet u zeker dat u door wilt gaan?"
-#: ../src/empathy-accounts-dialog.c:1936
+#: ../src/empathy-accounts-dialog.c:2002
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2362,14 +2748,18 @@ msgstr ""
"verloren gaan. Weet u zeker dat u door wilt gaan?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "Opvragen accountinformatie"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "No protocol installed"
msgstr "Geen protocol geïnstalleerd"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Protocol:"
msgstr "Protocol:"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -2377,70 +2767,114 @@ msgstr ""
"Voordat u een nieuw account kunt toevoegen dient u eerst een backend te "
"installeren voor elk protocol dat u wilt gebruiken."
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
msgstr "_Toevoegen…"
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
msgstr "_Importeren…"
-#: ../src/empathy-call-window.c:454
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr " - Empathy authenticatieclient"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Empathy authenticatieclient"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "Mensen in de buurt"
+
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy audio/video-client"
+
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy audio/video-client"
+
+#: ../src/empathy-call-window.c:479
msgid "Contrast"
msgstr "Contrast"
-#: ../src/empathy-call-window.c:457
+#: ../src/empathy-call-window.c:482
msgid "Brightness"
msgstr "Helderheid"
-#: ../src/empathy-call-window.c:460
+#: ../src/empathy-call-window.c:485
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:568
+#: ../src/empathy-call-window.c:590
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-call-window.c:1030
+#: ../src/empathy-call-window.c:1175
msgid "_Sidebar"
msgstr "_Zijpaneel"
-#: ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1194
msgid "Audio input"
msgstr "Audio-input"
-#: ../src/empathy-call-window.c:1053
+#: ../src/empathy-call-window.c:1198
msgid "Video input"
msgstr "Video-input"
-#: ../src/empathy-call-window.c:1057
+#: ../src/empathy-call-window.c:1202
msgid "Dialpad"
msgstr "Toetsenbord"
+#: ../src/empathy-call-window.c:1207
+msgid "Details"
+msgstr "Details"
+
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1125
+#: ../src/empathy-call-window.c:1275
#, c-format
msgid "Call with %s"
msgstr "Bellen met %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1206
+#: ../src/empathy-call-window.c:1354
msgid "Call"
msgstr "Oproep"
+#: ../src/empathy-call-window.c:1508
+msgid "The IP address as seen by the machine"
+msgstr "Het IP-adres zoals gezien door het systeem"
+
+#: ../src/empathy-call-window.c:1510
+msgid "The IP address as seen by a server on the Internet"
+msgstr "Het IP-adres zoals gezien door een server op het internet"
+
+#: ../src/empathy-call-window.c:1512
+msgid "The IP address of the peer as seen by the other side"
+msgstr "Het IP-adres zoals gezien door de andere zijde"
+
+#: ../src/empathy-call-window.c:1514
+msgid "The IP address of a relay server"
+msgstr "Het IP-adres van een relay-server"
+
+#: ../src/empathy-call-window.c:1516
+msgid "The IP address of the multicast group"
+msgstr "Het IP-adres van de multicast groep"
+
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1845
+#: ../src/empathy-call-window.c:2263
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Verbonden — %d:%02dm"
-#: ../src/empathy-call-window.c:1906
+#: ../src/empathy-call-window.c:2324
msgid "Technical Details"
msgstr "Technische details"
-#: ../src/empathy-call-window.c:1944
+#: ../src/empathy-call-window.c:2362
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2449,7 +2883,7 @@ msgstr ""
"De software van %s kent geen van de audioformaten die door uw computer "
"worden ondersteund"
-#: ../src/empathy-call-window.c:1949
+#: ../src/empathy-call-window.c:2367
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2458,7 +2892,7 @@ msgstr ""
"De software van %s kent geen van de videoformaten die door uw computer "
"worden ondersteund"
-#: ../src/empathy-call-window.c:1955
+#: ../src/empathy-call-window.c:2373
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2467,25 +2901,25 @@ msgstr ""
"Kan geen verbinding maken met %s. Eén van u zit mogelijk op een netwerk dat "
"geen directe verbindingen toestaat."
-#: ../src/empathy-call-window.c:1961
+#: ../src/empathy-call-window.c:2379
msgid "There was a failure on the network"
msgstr "Er is een netwerkstoring opgetreden"
-#: ../src/empathy-call-window.c:1965
+#: ../src/empathy-call-window.c:2383
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"De audioformaten, nodig voor dit gesprek, zijn niet geïnstalleerd op uw "
"computer"
-#: ../src/empathy-call-window.c:1968
+#: ../src/empathy-call-window.c:2386
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"De videoformaten, nodig voor dit gesprek, zijn niet geïnstalleerd op uw "
"computer"
-#: ../src/empathy-call-window.c:1978
+#: ../src/empathy-call-window.c:2396
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2496,115 +2930,147 @@ msgstr ""
"href=\"%s\">Een programmafout melden</a> en stuur logs mee uit het venster "
"‘Foutopsporing’ in het menu Hulp."
-#: ../src/empathy-call-window.c:1986
+#: ../src/empathy-call-window.c:2404
msgid "There was a failure in the call engine"
msgstr "Er is een fout in de call-engine opgetreden"
-#: ../src/empathy-call-window.c:2025
+#: ../src/empathy-call-window.c:2407
+msgid "The end of the stream was reached"
+msgstr "Het einde van de stream is bereikt"
+
+#: ../src/empathy-call-window.c:2447
msgid "Can't establish audio stream"
msgstr "Kan geen audiostream tot stand brengen"
-#: ../src/empathy-call-window.c:2035
+#: ../src/empathy-call-window.c:2457
msgid "Can't establish video stream"
msgstr "Kan geen videostream tot stand brengen"
#: ../src/empathy-call-window.ui.h:1
+msgid "Audio"
+msgstr "Geluid"
+
+#: ../src/empathy-call-window.ui.h:2
msgid "Call the contact again"
msgstr "Het contact opnieuw bellen"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:3
msgid "Camera Off"
msgstr "Camera uit"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:4
msgid "Camera On"
msgstr "Camera aan"
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Codec voor decoderen:"
+
+#: ../src/empathy-call-window.ui.h:6
msgid "Disable camera and stop sending video"
msgstr "Camera uitschakelen en stoppen met sturen van video"
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.ui.h:7
msgid "Enable camera and send video"
msgstr "Camera inschakelen en video sturen"
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:8
msgid "Enable camera but don't send video"
msgstr "Camera inschakelen maar geen video sturen"
-#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Codec voor coderen:"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Hang up"
msgstr "Ophangen"
-#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-call-window.ui.h:11
msgid "Hang up current call"
msgstr "Huidige gesprek beëindigen"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Lokale kandidaat"
+
+#: ../src/empathy-call-window.ui.h:13
msgid "Preview"
msgstr "Voorbeeld"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:14
msgid "Redial"
msgstr "Opnieuw bellen"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Kandidaat op afstand"
+
+#: ../src/empathy-call-window.ui.h:16
msgid "Send Audio"
msgstr "Audio sturen"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Schakel audiotransmissie in/uit"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:19
msgid "V_ideo"
msgstr "V_ideo"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:20
+msgid "Video"
+msgstr "Video"
+
+#: ../src/empathy-call-window.ui.h:21
msgid "Video Off"
msgstr "Video uit"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:22
msgid "Video On"
msgstr "Video aan"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:23
msgid "Video Preview"
msgstr "Videovoorbeeld"
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr "_Opbellen"
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
msgid "_View"
msgstr "Beel_d"
-#: ../src/empathy-chat-window.c:435 ../src/empathy-chat-window.c:455
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ongelezen)"
msgstr[1] "%s (%d ongelezen)"
-#: ../src/empathy-chat-window.c:447
+#: ../src/empathy-chat-window.c:464
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (en %u ander)"
msgstr[1] "%s (en %u anderen)"
-#: ../src/empathy-chat-window.c:463
+#: ../src/empathy-chat-window.c:480
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d ongelezen van anderen)"
msgstr[1] "%s (%d ongelezen van anderen)"
-#: ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:489
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d ongelezen van alle)"
msgstr[1] "%s (%d ongelezen van allen)"
-#: ../src/empathy-chat-window.c:675
+#: ../src/empathy-chat-window.c:695
msgid "Typing a message."
msgstr "Intypen van een bericht."
@@ -2636,55 +3102,63 @@ msgstr "Tabblad naar _links verplaatsen"
msgid "Move Tab _Right"
msgstr "Tabblad naar _rechts verplaatsen"
-#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "Melding geven voor alle berichten"
+
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
msgid "_Contents"
msgstr "In_houd"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "_Gesprek"
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:11
msgid "_Detach Tab"
msgstr "Tabblad _losmaken"
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
msgid "_Edit"
msgstr "Be_werken"
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "_Favoriete chatruimte"
-#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
msgid "_Help"
msgstr "_Hulp"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "Vo_lgend tabblad"
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:16
msgid "_Previous Tab"
msgstr "Vo_rig tabblad"
-#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "Contactenlijst _tonen"
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:18
msgid "_Tabs"
msgstr "_Tabbladen"
-#: ../src/empathy-chatrooms-window.c:256
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "Sluiten van tabblad _Ongedaan maken"
+
+#: ../src/empathy-chatrooms-window.c:241
msgid "Name"
msgstr "Naam"
-#: ../src/empathy-chatrooms-window.c:274
+#: ../src/empathy-chatrooms-window.c:259
msgid "Room"
msgstr "Ruimte"
-#: ../src/empathy-chatrooms-window.c:282
+#: ../src/empathy-chatrooms-window.c:267
msgid "Auto-Connect"
msgstr "Automatisch verbinden"
@@ -2692,76 +3166,86 @@ msgstr "Automatisch verbinden"
msgid "Manage Favorite Rooms"
msgstr "Favoriete chatruimtes beheren"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming video call"
msgstr "Inkomende video-oproep"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming call"
msgstr "Binnenkomende oproep"
-#: ../src/empathy-event-manager.c:343
+#: ../src/empathy-event-manager.c:472
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "Er is een video-oproep voor u van %s. Wilt u opnemen?"
-#: ../src/empathy-event-manager.c:344
+#: ../src/empathy-event-manager.c:473
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "U wordt gebeld door %s. Wilt u opnemen?"
-#: ../src/empathy-event-manager.c:366
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Binnenkomende oproep van %s"
+
+#: ../src/empathy-event-manager.c:501
msgid "_Reject"
msgstr "_Afwijzen"
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:507
msgid "_Answer"
msgstr "_Opnemen"
-#: ../src/empathy-event-manager.c:489
+#: ../src/empathy-event-manager.c:618
#, c-format
msgid "Incoming video call from %s"
msgstr "Inkomende video-oproep van %s"
-#: ../src/empathy-event-manager.c:489
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Binnenkomende oproep van %s"
-
-#: ../src/empathy-event-manager.c:579
+#: ../src/empathy-event-manager.c:695
msgid "Room invitation"
msgstr "Uitnodiging voor groepsgesprek"
-#: ../src/empathy-event-manager.c:582
+#: ../src/empathy-event-manager.c:697
+#, c-format
+msgid "Invitation to join %s"
+msgstr "Uitnodiging om mee te doen met %s"
+
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s nodigt u uit deel te nemen aan %s"
-#: ../src/empathy-event-manager.c:590
+#: ../src/empathy-event-manager.c:712
msgid "_Decline"
msgstr "_Weigeren"
-#: ../src/empathy-event-manager.c:595
+#: ../src/empathy-event-manager.c:717
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Binnengaan"
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:743
#, c-format
msgid "%s invited you to join %s"
msgstr "%s heeft u uitgenodigd om deel te nemen aan %s"
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:749
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "U bent uitgenodigd om %s binnen te gaan"
+
+#: ../src/empathy-event-manager.c:797
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Binnenkomende bestandsoverdracht van %s"
-#: ../src/empathy-event-manager.c:818
+#: ../src/empathy-event-manager.c:1005
#, c-format
msgid "Subscription requested by %s"
msgstr "Inschrijvingsverzoek van %s"
-#: ../src/empathy-event-manager.c:822
+#: ../src/empathy-event-manager.c:1009
#, c-format
msgid ""
"\n"
@@ -2770,118 +3254,116 @@ msgstr ""
"\n"
"Bericht: %s"
-#. someone is logging off
-#: ../src/empathy-event-manager.c:862
+#: ../src/empathy-event-manager.c:1052
#, c-format
msgid "%s is now offline."
msgstr "%s is nu offline."
-#. someone is logging in
-#: ../src/empathy-event-manager.c:878
+#: ../src/empathy-event-manager.c:1072
#, c-format
msgid "%s is now online."
msgstr "%s is nu online."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u:%02u:%02u"
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
#, c-format
msgid "%02u.%02u"
msgstr "%02u:%02u"
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Onbekend"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s van %s met %s/s"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s"
msgstr "%s van %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Bezig met ontvangen van ‘%s’ van %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Verzenden van ‘%s’ naar %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Fout bij het ontvangen van ‘%s’ van %s"
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
msgid "Error receiving a file"
msgstr "Fout bij het ontvangen van een bestand"
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Fout bij het verzenden van ‘%s’ naar %s"
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
msgid "Error sending a file"
msgstr "Fout bij het versturen van een bestand"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
#, c-format
msgid "\"%s\" received from %s"
msgstr "‘%s’ ontvangen van %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
#, c-format
msgid "\"%s\" sent to %s"
msgstr "‘%s’ verzonden naar %s"
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
msgid "File transfer completed"
msgstr "Bestandsoverdracht voltooid"
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
msgid "Waiting for the other participant's response"
msgstr "Wachten op antwoord van de andere deelnemer"
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Integriteit van ‘%s’ controleren"
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "Controlebestand van ‘%s’ maken"
-#: ../src/empathy-ft-manager.c:991
+#: ../src/empathy-ft-manager.c:996
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1003
+#: ../src/empathy-ft-manager.c:1008
msgid "File"
msgstr "Bestand"
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1030
msgid "Remaining"
msgstr "Resterend"
@@ -2900,8 +3382,8 @@ msgid ""
"No accounts to import could be found. Empathy currently only supports "
"importing accounts from Pidgin."
msgstr ""
-"Er konden geen accounts om te importeren gevonden worden. Momenteel "
-"ondersteunt Empathy alleen het importeren van accounts van Pidgin."
+"Er konden geen accounts gevonden worden om te importeren. Momenteel "
+"ondersteunt Empathy alleen het importeren van Pidgin-accounts."
#: ../src/empathy-import-dialog.c:199
msgid "Import Accounts"
@@ -2920,148 +3402,147 @@ msgstr "Protocol"
msgid "Source"
msgstr "Bron"
-#: ../src/empathy-import-mc4-accounts.c:108
-#, c-format
-msgid "%s account"
-msgstr "%s-account"
+#: ../src/empathy-main-window.c:383
+msgid "No match found"
+msgstr "Geen overeenkomst gevonden"
-#: ../src/empathy-main-window.c:438
+#: ../src/empathy-main-window.c:535
msgid "Reconnect"
msgstr "Opnieuw verbinden"
-#: ../src/empathy-main-window.c:444
+#: ../src/empathy-main-window.c:541
msgid "Edit Account"
msgstr "Account bewerken"
-#: ../src/empathy-main-window.c:450
+#: ../src/empathy-main-window.c:547
msgid "Close"
msgstr "Sluiten"
-#: ../src/empathy-main-window.c:1036
+#: ../src/empathy-main-window.c:1229
msgid "Contact"
msgstr "Contactpersoon"
-#: ../src/empathy-main-window.c:1417
+#: ../src/empathy-main-window.c:1554
+msgid "Contact List"
+msgstr "Contactenlijst"
+
+#: ../src/empathy-main-window.c:1663
msgid "Show and edit accounts"
msgstr "Accounts tonen en bewerken"
#: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "Contactenlijst"
-
-#: ../src/empathy-main-window.ui.h:2
msgid "Contacts on a _Map"
msgstr "Contacten op een _kaart"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
msgid "Context"
msgstr "Context"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
msgid "Join _Favorites"
msgstr "_Bladwijzers openen"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
msgid "Manage Favorites"
msgstr "Bladwijzers beheren"
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
msgid "N_ormal Size"
msgstr "N_ormale grootte"
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "Nieuwe _oproep…"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
msgid "Normal Size With _Avatars"
msgstr "Normale grootte _Gebruikersafbeeldingen"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
msgid "P_references"
-msgstr " _Voorkeuren"
+msgstr "_Voorkeuren"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
msgid "Show P_rotocols"
msgstr "P_rotocollen tonen"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
msgid "Sort by _Name"
msgstr "Op _naam sorteren"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Status"
msgstr "Op _status sorteren"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
msgid "_Accounts"
msgstr "_Accounts"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
msgid "_Compact Size"
msgstr "_Compact formaat"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17
msgid "_Debug"
msgstr "_Foutopsporing"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19
msgid "_File Transfers"
msgstr "_Bestandsoverdrachten"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21
msgid "_Join…"
msgstr "_Binnengaan…"
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_Nieuw gesprek…"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23
msgid "_Offline Contacts"
msgstr "_Offlinecontacten"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24
msgid "_Personal Information"
msgstr "_Persoonlijke gegevens"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26
msgid "_Room"
msgstr "_Ruimte"
-#: ../src/empathy-new-chatroom-dialog.c:382
+#: ../src/empathy-new-chatroom-dialog.c:379
msgid "Chat Room"
msgstr "Chatruimte"
-#: ../src/empathy-new-chatroom-dialog.c:398
+#: ../src/empathy-new-chatroom-dialog.c:395
msgid "Members"
msgstr "Leden"
#. 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:607
#, c-format
msgid ""
-"<b>%s</b>\n"
+"%s\n"
"Invite required: %s\n"
"Password required: %s\n"
"Members: %s"
msgstr ""
-"<b>%s</b>\n"
+"%s\n"
"Uitnodiging vereist: %s\n"
"Wachtwoord vereist: %s\n"
"Leden: %s"
-#: ../src/empathy-new-chatroom-dialog.c:608
#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "No"
msgstr "Nee"
-#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:638
msgid "Could not start room listing"
msgstr "Kan aanwezigen in chatruimte niet bepalen"
-#: ../src/empathy-new-chatroom-dialog.c:646
+#: ../src/empathy-new-chatroom-dialog.c:648
msgid "Could not stop room listing"
msgstr "Kan bepalen aanwezigen in chatruimte niet voorkomen"
@@ -3095,61 +3576,65 @@ msgstr "Chatruimtelijst"
msgid "_Room:"
msgstr "_Ruimte:"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:138
msgid "Message received"
msgstr "Bericht ontvangen"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:139
msgid "Message sent"
msgstr "Bericht verzonden"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:140
msgid "New conversation"
msgstr "Nieuw gesprek"
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:141
msgid "Contact goes online"
msgstr "Contact komt online"
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:142
msgid "Contact goes offline"
msgstr "Contact gaat offline"
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:143
msgid "Account connected"
msgstr "Account verbonden"
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:144
msgid "Account disconnected"
msgstr "Account niet verbonden"
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:445
msgid "Language"
msgstr "Taal"
+#: ../src/empathy-preferences.c:882
+msgid "Preferences"
+msgstr "Voorkeuren"
+
#: ../src/empathy-preferences.ui.h:1
msgid "Appearance"
msgstr "Uiterlijk"
#: ../src/empathy-preferences.ui.h:2
-msgid "Automatically _connect on startup "
-msgstr "Automatisch _verbinden bij opstarten "
-
-#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Gedrag"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
msgid "Chat Th_eme:"
msgstr "_Chatthema:"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
msgid "Disable notifications when _away or busy"
msgstr "Notificatieberichten _uitschakelen indien afwezig of bezig"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable sounds when _away or busy"
-msgstr "_Geluid uitschakelen indien afwezig of bezig"
+msgstr "Geluid uitschakelen indien _afwezig of bezig"
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "Geef binnenkomende meldingen weer in het mededelingengebied"
#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
@@ -3176,17 +3661,17 @@ msgid "Location sources:"
msgstr "Locatiebronnen:"
#: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr "Gesprekken opslaan"
+
+#: ../src/empathy-preferences.ui.h:15
msgid "Notifications"
msgstr "Notificatieberichten"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:16
msgid "Play sound for events"
msgstr "Geluid afspelen voor gebeurtenissen"
-#: ../src/empathy-preferences.ui.h:16
-msgid "Preferences"
-msgstr "Voorkeuren"
-
#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "Privacy"
@@ -3230,41 +3715,62 @@ msgid "Themes"
msgstr "Thema's"
#: ../src/empathy-preferences.ui.h:25
+msgid "_Automatically connect on startup"
+msgstr "_Automatisch verbinden bij opstarten"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Cellphone"
msgstr "_Mobiele telefoon"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable bubble notifications"
msgstr "Ballon-notificatieberichten _inschakelen"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable sound notifications"
msgstr "_Geluidswaarschuwingen inschakelen"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "_Network (IP, Wi-Fi)"
msgstr "_Netwerk (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Open new chats in separate windows"
msgstr "_Nieuwe chats in eigen vensters openen"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Publish location to my contacts"
msgstr "_Locatie aan mijn contacten bekendmaken"
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
msgid "_Reduce location accuracy"
msgstr "_Nauwkeurigheid van locatie beperken"
-#: ../src/empathy-status-icon.c:153
+#: ../src/empathy-status-icon.c:141
msgid "Respond"
msgstr "Antwoord"
+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "Weigeren"
+
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "Antwoord"
+
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "Afslaan"
+
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "Accepteren"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Status"
@@ -3273,67 +3779,67 @@ msgstr "Status"
msgid "_Quit"
msgstr "_Afsluiten"
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:452
msgid "Contact Map View"
msgstr "Kaartweergave van contactpersonen"
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1219
msgid "Save"
msgstr "Opslaan"
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1395
msgid "Debug Window"
msgstr "Foutopsporingsvenster"
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1475
msgid "Pause"
msgstr "Pauzeren"
-#: ../src/empathy-debug-window.c:1311
+#: ../src/empathy-debug-window.c:1487
msgid "Level "
-msgstr "Niveau"
+msgstr "Niveau "
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1507
msgid "Debug"
msgstr "Foutopsporing"
-#: ../src/empathy-debug-window.c:1337
+#: ../src/empathy-debug-window.c:1513
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
msgid "Message"
msgstr "Bericht"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1525
msgid "Warning"
msgstr "Waarschuwing"
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1531
msgid "Critical"
msgstr "Kritiek"
-#: ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1537
msgid "Error"
msgstr "Fout"
-#: ../src/empathy-debug-window.c:1380
+#: ../src/empathy-debug-window.c:1556
msgid "Time"
msgstr "Tijd"
-#: ../src/empathy-debug-window.c:1383
+#: ../src/empathy-debug-window.c:1559
msgid "Domain"
msgstr "Domein"
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1561
msgid "Category"
msgstr "Categorie"
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1563
msgid "Level"
msgstr "Niveau"
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1600
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3350,34 +3856,118 @@ msgstr "Deelnemer uitnodigen"
msgid "Choose a contact to invite into the conversation:"
msgstr "Een contactpersoon uitnodigen om deel te nemen aan het gesprek:"
-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "Uitnodigen"
+
+#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
"Dialoogvensters niet tonen; handeling verrichten (bijv. importeren) en "
"afsluiten"
-#: ../src/empathy-accounts.c:217
-msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr "Dialoogvensters niet tonen indien er non-salut-accounts zijn"
+#: ../src/empathy-accounts.c:186
+msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgstr "Geen dialogen weergeven als er geen non-Salut-accounts zijn"
-#: ../src/empathy-accounts.c:221
+#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Bij aanvang opgegeven account (bijv. gabble/jabber/foo_40example_2eorg0) "
"selecteren"
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:192
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:200
msgid "- Empathy Accounts"
msgstr "- Empathy-accounts"
-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:216
msgid "Empathy Accounts"
msgstr "Empathy-accounts"
#: ../src/empathy-debugger.c:40
msgid "Empathy Debugger"
msgstr "Empathy foutopsporing"
+
+#~ msgid "Show incoming messages in the messaging menu"
+#~ msgstr "Toon inkomende berichten in het mededelingengebied"
+
+#~ msgid "Pri_ority:"
+#~ msgstr "Pri_oriteit:"
+
+#~ msgid "_Nickname:"
+#~ msgstr "_Bijnaam:"
+
+#~ msgid "Send file"
+#~ msgstr "Bestand sturen"
+
+#~ msgid "Enabled"
+#~ msgstr "Ingeschakeld"
+
+#~ msgid "Automatically _connect on startup "
+#~ msgstr "Automatisch _verbinden bij opstarten "
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>Locatie</b>, "
+
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "MC 4-accounts zijn geïmporteerd"
+
+#~ msgid "Share my desktop"
+#~ msgstr "Mijn bureaublad delen"
+
+#~ msgid "Empathy IM Client"
+#~ msgstr "Empathy chatprogramma"
+
+#~ msgid "_Character set:"
+#~ msgstr "_Tekenset:"
+
+#~ msgid "_E-mail address:"
+#~ msgstr "_E-mailadres:"
+
+#~ msgid ""
+#~ "<b>%s</b>\n"
+#~ "Invite required: %s\n"
+#~ "Password required: %s\n"
+#~ "Members: %s"
+#~ msgstr ""
+#~ "<b>%s</b>\n"
+#~ "Uitnodiging vereist: %s\n"
+#~ "Wachtwoord vereist: %s\n"
+#~ "Leden: %s"
+
+#~ msgid "_Encryption required (TLS/SSL)"
+#~ msgstr "_Versleuteling verplicht (TLS/SSL)"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "MC 4-accounts zijn geïmporteerd."
+
+#~ msgid "Failed to reconnect this chat"
+#~ msgstr "Opnieuw verbinden voor deze chat mislukt"
+
+#~ msgid "_Ignore conference and chat room invitations"
+#~ msgstr "Uitnodigingen voor groepsgesprekken _negeren"
+
+#~ msgid "_Invite to chat room"
+#~ msgstr "In chatruimte uit_nodigen"
+
+#~ msgid "Select a destination"
+#~ msgstr "Doel selecteren"
+
+#~ msgid "Send and receive messages"
+#~ msgstr "Chatberichten sturen en ontvangen"
+
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "_Yahoo! Japan gebruiken"
+
+#~ msgid "Failed to join chat room"
+#~ msgstr "Binnengaan van chatruimte mislukt"
+
+#~ msgid "%s account"
+#~ msgstr "%s-account"
+
+#~ msgid "Don't display any dialogs if there are any non-salut accounts"
+#~ msgstr "Dialoogvensters niet tonen indien er non-salut-accounts zijn"
diff --git a/po/pa.po b/po/pa.po
index 94f9b507e..e2326087c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,8 +8,8 @@ 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-09-06 10:08+0000\n"
-"PO-Revision-Date: 2010-09-06 20:56+0530\n"
+"POT-Creation-Date: 2010-09-21 07:37+0000\n"
+"PO-Revision-Date: 2010-09-22 21:21+0530\n"
"Last-Translator: A S Alam <aalam@users.sf.net>\n"
"Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
"MIME-Version: 1.0\n"
@@ -428,7 +428,7 @@ msgstr "ਸà©à¨¨à©‡à¨¹à©‡ ਅਤੇ VoIP ਅਕਾਊਂਟ ਪਰਬੰਧ"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2151
+#: ../src/empathy-accounts-dialog.c:2157
msgid "Messaging and VoIP Accounts"
msgstr "ਸà©à¨¨à©‡à¨¹à©‡ ਅਤੇ VoIP ਅਕਾਊਂਟ"
@@ -476,137 +476,137 @@ msgstr "ਫਾਇਲ ਸੰਚਾਰ ਦੀ ਕੋਸ਼ਿਸ਼ ਦੌਰਾà¨
msgid "The other participant is unable to transfer the file"
msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਫਾਇਲ ਸੰਚਾਰ ਲਈ ਫੇਲà©à¨¹ ਹੈ"
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "ਅਣਜਾਣ ਕਾਰਨ"
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "ਉਪਲੱਬਧ"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "ਰà©à¨à©‡"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "ਦੂਰ"
-#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "ਅਦਿੱਖ"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "ਆਫਲਾਈਨ"
-#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883
-#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885
-#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
+#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
+#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "ਅਣਜਾਣ"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ"
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "ਹਾਲਤ ਆਫਲਾਈਨ ਸੈੱਟ ਕੀਤਾ"
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "ਨੈੱਟਵਰਕ ਗਲਤੀ"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲà©à¨¹ ਹੈ"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "ਇੰਕà©à¨°à¨¿à¨ªà¨¸à¨¼à¨¨ ਗਲਤੀ"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "ਵਰਤਣ ਲਈ ਨਾਂ"
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਦਿੱਤਾ"
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "ਸਰਟੀਫਿਕੇਟ ਬੇਭਰੋਸੇਯੋਗ"
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪà©à©±à¨—à©€"
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "ਸਰਟੀਫਿਕੇਟ ਸਰਗਰਮ ਨਹੀਂ ਹੈ"
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "ਸਰਟੀਫਿਕੇਟ ਹੋਸਟ-ਨਾਂ ਨਹੀਂ ਮਿਲਦਾ"
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "ਸਰਟੀਫਿਕੇਟ ਫਿੰਗਰ-ਪਰਿੰਟ ਮਿਲਦਾ ਨਹੀਂ"
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "ਸਰਟੀਫਿਕੇਟ ਖà©à¨¦-ਦਸਤਖਤੀ ਹੈ"
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "ਸਰਟੀਫਿਕੇਟ ਗਲਤੀ"
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:356
msgid "Encryption is not available"
msgstr "ਇੰਕà©à¨°à¨¿à¨ªà¨¸à¨¼à¨¨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:358
msgid "Certificate is invalid"
msgstr "ਸਰਟੀਫਿਕੇਟ ਗਲਤ ਹੈ"
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:360
msgid "Connection has been refused"
msgstr "ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ ਗਿਆ"
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:362
msgid "Connection can't be established"
msgstr "ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:364
msgid "Connection has been lost"
msgstr "ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਖਤਮ ਹੋ ਗਿਆ"
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:366
msgid "This resource is already connected to the server"
msgstr "ਇਹ ਸਰੋਤ ਪਹਿਲਾਂ ਹੀ ਸਰਵਰ ਨਾਲ ਕà©à¨¨à©ˆà¨•à¨Ÿ ਹੈ"
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:368
msgid "Connection has been replaced by a new connection using the same resource"
msgstr "ਉਸੇ ਸਰੋਤ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਨੂੰ ਨਵੇਂ ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਨਾਲ ਬਦਲ ਦਿੱਤਾ ਗਿਆ ਹੈ"
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:371
msgid "The account already exists on the server"
msgstr "ਅਕਾਊਂਟ ਸਰਵਰ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:373
msgid "Server is currently too busy to handle the connection"
msgstr "ਸਰਵਰ ਇਸ ਵੇਲੇ à¨à¨¨à¨¾ ਰà©à©±à¨à¨¿à¨† ਹੋਇਆ ਹੈ ਕਿ ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਸੰਭਾਲ ਨਹੀਂ ਸਕਦਾ"
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:375
msgid "Certificate has been revoked"
msgstr "ਸਰਟੀਫਿਕੇਟ ਮਨਸੂਖ ਕੀਤਾ ਜਾ ਚà©à©±à¨•à¨¾ ਹੈ"
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:377
msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr "ਸਰਟੀਫਿਕੇਟ ਅਸà©à¨°à©±à¨–ਿਅਤ ਸੀਫ਼ਰ à¨à¨²à¨—ੋਰਿਥਮ ਵਰਤਦਾ ਹੈ ਜਾਂ ਕਮਜ਼ੋਰ ਕà©à¨°à¨¿à¨ªà¨Ÿà©‹à¨—ਰਾਫਿਕਲ ਵਰਤਦਾ ਹੈ"
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:380
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -614,15 +614,16 @@ msgstr ""
"ਸਰਵਰ ਸਰਟੀਫਿਕੇਟ ਦੀ ਲੰਬਾਈ ਜਾਂ ਸਰਵਰ ਸਰਟੀਫਿਕੇਟ ਚੇਨ ਦੀ ਡੂੰਘਾਈ ਕà©à¨°à¨¿à¨ªà¨Ÿà©‚ਗਰਾਫ਼ੀ ਲਾਇਬਰੇਰੀ ਵਲੋਂ ਰੱਖੀ "
"ਗਈ ਲਿਮਟ ਤੋਂ ਵੱਧ ਗਈ ਹੈ।"
-#: ../libempathy/empathy-utils.c:540
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "ਨੇੜਲੇ ਲੋਕ"
-#: ../libempathy/empathy-utils.c:545
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "ਯਾਹੂ! ਜਾਪਾਨ"
-#: ../libempathy/empathy-utils.c:546
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "ਫੇਸਬà©à©±à¨• ਚੈਟ"
@@ -683,7 +684,6 @@ msgid "Account"
msgstr "ਅਕਾਊਂਟ"
#: ../libempathy-gtk/empathy-account-widget.c:515
-#| msgid "Password:"
msgid "Password"
msgstr "ਪਾਸਵਰਡ"
@@ -707,16 +707,16 @@ msgstr "%s:"
msgid "Username:"
msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "ਲਾਗੂ ਕਰੋ(_p)"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "ਲਾਗਇਨ(_o)"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -725,19 +725,19 @@ msgstr "ਲਾਗਇਨ(_o)"
msgid "Account:"
msgstr "ਅਕਾਊਂਟ:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "ਯੋਗ(_E)"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "ਇਹ ਅਕਾਊਂਟ ਸਰਵਰ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "ਸਰਵਰ ਉੱਤੇ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਓ"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "ਰੱਦ ਕਰੋ(_n)"
@@ -746,19 +746,19 @@ msgstr "ਰੱਦ ਕਰੋ(_n)"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%2$s ਉੱਤੇ %1$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "%s ਅਕਾਊਂਟ"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "ਨਵਾਂ ਅਕਾਊਂਟ"
@@ -805,7 +805,7 @@ msgstr "ਤà©à¨¹à¨¾à¨¡à¨¾ AIM ਸਕਰੀਨ ਨਾਂ ਕੀ ਹੈ?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "ਪੋਰਟ(_P):"
@@ -814,7 +814,7 @@ msgstr "ਪੋਰਟ(_P):"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "ਸਰਵਰ(_S):"
@@ -1122,22 +1122,18 @@ msgid "I_gnore conference and chat room invitations"
msgstr "ਕਨਫਰੰਸ ਅਤੇ ਗੱਲਬਾਤ ਰੂਮ ਸੱਦੇ ਅਣਡਿੱਠੇ(_g)"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "ਯਾਹੂ! ਜਾਪਾਨ ਵਰਤੋਂ(_Y)"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "ਤà©à¨¹à¨¾à¨¡à¨¾ ਯਾਹੂ! ID ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "ਤà©à¨¹à¨¾à¨¡à¨¾ ਯਾਹੂ! ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "ਯਾਹੂ! I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "ਰੂਮ ਲਿਸਟ ਭਾਸ਼ਾ(_R):"
@@ -1365,7 +1361,7 @@ msgstr "%s ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
msgid "%s is now known as %s"
msgstr "%s ਨੂੰ ਹà©à¨£ %s ਵਜੋਂ ਜਾਣਿਆ ਜਾਵੇਗਾ"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
msgid "Disconnected"
msgstr "ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਖਤਮ"
@@ -1434,6 +1430,15 @@ msgstr "ਬਾਅਦ 'ਚ ਸੋਚੂ(_L)"
msgid "Subscription Request"
msgstr "ਮੈਂਬਰੀ ਮੰਗ"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "ਬਿਨ-ਗਰà©à©±à¨ª"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+#| msgid "Favorite"
+msgid "Favorite People"
+msgstr "ਪਸੰਦ ਦੇ ਲੋਕ"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1505,7 +1510,7 @@ msgid "Share My Desktop"
msgstr "ਮੇਰਾ ਡੈਸਕਟਾਪ ਸ਼ੇਅਰ ਕਰੋ"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1561,128 +1566,128 @@ msgstr "ਵੈੱਬਸਾਈਟ:"
msgid "Birthday:"
msgstr "ਜਨਮਦਿਨ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "ਦੇਸ਼ ISO ਕੋਡ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "ਦੇਸ਼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "ਹਾਲਤ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "ਸ਼ਹਿਰ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "à¨à¨°à©€à¨†:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "ਡਾਕ ਕੋਡ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "ਗਲੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "ਇਮਾਰਤ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "ਮੰਜ਼ਲ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "ਘਰ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "ਟੈਕਸਟ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "ਵੇਰਵਾ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "ਸ਼à©à©±à¨§à¨¤à¨¾ ਲੈਵਲ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "ਗਲਤੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "ਵਰਟੀਕਲ ਗਲਤੀ (ਮੀਟਰ):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "ਹਰੀਜੱਟਲ ਗਲਤੀ (ਮੀਟਰ):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "ਗਤੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "ਬੀਰਿੰਗ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "ਚੜà©à¨¹à¨¨ ਗਤੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "ਆਖਰੀ ਅੱਪਡੇਟ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "ਲੰਬਕਾਰੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "ਵਿਥਕਾਰ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "ਉਚਾਈ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1690,23 +1695,23 @@ msgid "Location"
msgstr "ਟਿਕਾਣਾ"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%R UTC %e %B %Y ਨੂੰ"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "ਅਵਤਾਰ ਸੰਭਾਲੋ"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "ਅਵਤਾਰ ਸੰਭਾਲਣ ਲਈ ਅਸਮਰੱਥ"
@@ -1813,7 +1818,6 @@ msgstr "ਸੋਧ(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
#: ../libempathy-gtk/empathy-individual-menu.c:863
-#| msgid "Link Contacts"
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ(_L)…"
@@ -1848,18 +1852,16 @@ msgstr "SSL"
#. Translators: this is the title of the linking dialogue (reached by
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
+#: ../libempathy-gtk/empathy-linking-dialog.c:116
msgid "Link Contacts"
msgstr "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ"
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-#| msgctxt "Unlink individual (button)"
-#| msgid "_Unlink"
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "ਲਿੰਕ ਹਟਾਓ(_U)…"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
msgid "Completely split the displayed meta-contact into the contacts it contains."
msgstr "ਵੇਖਾਠਮੇਟਾ-ਸੰਪਰਕ ਨੂੰ ਇਸ 'ਚ ਮੌਜੂਦਾ ਸੰਪਰਕਾਂ 'ਚ ਪੂਰੀ ਤਰà©à¨¹à¨¾à¨‚ ਵੰਡ ਦਿਉ।"
@@ -1867,24 +1869,22 @@ msgstr "ਵੇਖਾਠਮੇਟਾ-ਸੰਪਰਕ ਨੂੰ ਇਸ 'ਚ ਮà©
#. Translators: this is an action button in the linking dialogue. "Link" is
#. * used here as a verb meaning "to connect two contacts to form a
#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
+#: ../libempathy-gtk/empathy-linking-dialog.c:137
msgid "_Link"
msgstr "ਲਿੰਕ ਕਰੋ(_L)"
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "ਮੇਟਾ-ਸੰਪਰਕ '%s' ਲਿੰਕ ਹਟਾਉਣਾ?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:185
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
msgid ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
-msgstr ""
-"ਕੀ ਤà©à¨¸à©€à¨‚ ਇਹ ਮੇਟਾ-ਲਿੰਕ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ? ਇਹ ਮੇਟਾ-ਸੰਪਰਕਾਂ ਨੂੰ ਮੌਜੂਦ ਸੰਪਰਕਾਂ 'ਚ ਵੰਡ "
-"ਦੇਵੇਗਾ।"
+msgstr "ਕੀ ਤà©à¨¸à©€à¨‚ ਇਹ ਮੇਟਾ-ਲਿੰਕ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ? ਇਹ ਮੇਟਾ-ਸੰਪਰਕਾਂ ਨੂੰ ਮੌਜੂਦ ਸੰਪਰਕਾਂ 'ਚ ਵੰਡ ਦੇਵੇਗਾ।"
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
+#: ../libempathy-gtk/empathy-linking-dialog.c:191
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "ਲਿੰਕ ਹਟਾਓ(_U)"
@@ -2420,7 +2420,7 @@ msgstr ""
"ਬਾਅਦ ਵਿੱਚ ਸੋਧ ਮੇਨੂ ਵਿੱਚੋਂ ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1310
+#: ../src/empathy-account-assistant.c:1316
msgid "An error occurred"
msgstr "ਗਲਤੀ ਆਈ"
@@ -2434,31 +2434,31 @@ msgstr "ਗਲਤੀ ਆਈ"
msgid "New %s account"
msgstr "ਨਵਾਂ %s ਅਕਾਊਂਟ"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:515
msgid "What kind of chat account do you have?"
msgstr "ਤà©à¨¹à¨¾à¨¡à©‡ ਕੋਲ ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਹੈ?"
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:521
msgid "Do you have any other chat accounts you want to set up?"
msgstr "ਕੀ ਤà©à¨¹à¨¾à¨¡à©‡ ਕੋਲ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਤà©à¨¸à©€à¨‚ ਸੈੱਟਅੱਪ ਕਰਨਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:527
msgid "Enter your account details"
msgstr "ਆਪਣੇ ਅਕਾਊਂਟ ਦਾ ਵੇਰਵਾ ਦਿਓ"
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:532
msgid "What kind of chat account do you want to create?"
msgstr "ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਤà©à¨¸à©€à¨‚ ਬਣਾਉਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Do you want to create other chat accounts?"
msgstr "ਕੀ ਤà©à¨¸à©€à¨‚ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਬਣਾਉਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?"
-#: ../src/empathy-account-assistant.c:539
+#: ../src/empathy-account-assistant.c:545
msgid "Enter the details for the new account"
msgstr "ਨਵੇਂ ਅਕਾਊਂਟ ਲਈ ਵੇਰਵਾ ਦਿਓ"
-#: ../src/empathy-account-assistant.c:654
+#: ../src/empathy-account-assistant.c:660
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 "
@@ -2469,41 +2469,41 @@ msgstr ""
"ਲਾਈਨ ਅਤੇ ਹੋਰ ਚੈਤ ਪਰੋਗਰਾਮਾਂ ਨਾਲ ਗੱਲਾਂ ਕਰ ਸਕਦੇ ਹੋ। ਮਾਈਕਰੋਫੋਨ ਜਾਂ ਵੈੱਬ ਕੈਮ ਨਾਲ ਤà©à¨¸à©€à¨‚ ਆਡੀਓ ਅਤੇ "
"ਵਿਡੀਓ ਕਾਲ ਵੀ ਕਰ ਸਕਦੇ ਹੋ।"
-#: ../src/empathy-account-assistant.c:671
+#: ../src/empathy-account-assistant.c:677
msgid "Do you have an account you've been using with another chat program?"
msgstr "ਕੀ ਤà©à¨¹à¨¾à¨¡à©‡ ਕੋਲ ਕੋਈ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਕਿ ਤà©à¨¸à©€à¨‚ ਹੋਰ ਚੈਟ ਪਰੋਗਰਾਮ ਨਾਲ ਵਰਤਦੇ ਰਹੇ ਹੋ?"
-#: ../src/empathy-account-assistant.c:694
+#: ../src/empathy-account-assistant.c:700
msgid "Yes, import my account details from "
msgstr "ਹਾਂ, ਮੇਰਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਲਵੋ "
-#: ../src/empathy-account-assistant.c:715
+#: ../src/empathy-account-assistant.c:721
msgid "Yes, I'll enter my account details now"
msgstr "ਹਾਂ, ਮੈਂ ਆਪਣਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਹà©à¨£ ਦੇਵਾਂਗਾ"
-#: ../src/empathy-account-assistant.c:737
+#: ../src/empathy-account-assistant.c:743
msgid "No, I want a new account"
msgstr "ਨਹੀਂ, ਮੈਂ ਨਵਾਂ ਅਕਾਊਂਟ ਚਾਹà©à©°à¨¦à¨¾ ਹਾਂ"
-#: ../src/empathy-account-assistant.c:747
+#: ../src/empathy-account-assistant.c:753
msgid "No, I just want to see people online nearby for now"
msgstr "ਨਹੀਂ, ਮੈਂ ਸਿਰਫ਼ ਹà©à¨£ ਆਪਣੇ ਨੇੜੇ ਆਨਲਾਈਨ ਲੋਕਾਂ ਨੂੰ ਵੇਖਣਾ ਚਾਹà©à©°à¨¦à¨¾ ਹਾਂ"
-#: ../src/empathy-account-assistant.c:768
+#: ../src/empathy-account-assistant.c:774
msgid "Select the accounts you want to import:"
msgstr "ਅਕਾਊਂਟ ਚà©à¨£à©‹, ਜੋ ਤà©à¨¸à©€à¨‚ ਇੰਪੋਰਟ ਕਰਨੇ ਚਾਹà©à©°à¨¦à©‡ ਹੋ:"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "ਹਾਂ"
-#: ../src/empathy-account-assistant.c:859
+#: ../src/empathy-account-assistant.c:865
msgid "No, that's all for now"
msgstr "ਨਹੀਂ, ਹà©à¨£ ਲਈ ਕਾਫ਼ੀ ਹੈ"
-#: ../src/empathy-account-assistant.c:1124
+#: ../src/empathy-account-assistant.c:1130
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 "
@@ -2514,16 +2514,16 @@ msgstr ""
"ਇਹ ਫੀਚਰ ਵਰਤਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ ਤਾਂ ਚੈੱਕ ਕਰੋ ਕਿ ਹੇਠਾਂ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਪੂਰੀ ਹੈ। ਤà©à¨¸à©€à¨‚ ਇਹ ਵੇਰਵਾ ਬਾਅਦ "
"ਵਿੱਚ ਵੀ ਸੌਖੀ ਤਰà©à¨¹à¨¾à¨‚ ਬਦਲ ਸਕਦੇ ਹੋ ਜਾਂ 'ਅਕਾਊਂਟ' ਡਾਈਲਾਗ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇਹ ਫੀਚਰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"
-#: ../src/empathy-account-assistant.c:1130
-#: ../src/empathy-account-assistant.c:1186
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
msgid "Edit->Accounts"
msgstr "ਸੋਧ->ਅਕਾਊਂਟ"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1152
msgid "I don't want to enable this feature for now"
msgstr "ਮੈਂ ਇਹ ਫੀਚਰ ਹà©à¨£à©‡ ਚਾਲੂ ਨਹੀਂ ਕਰਨਾ ਚਾਹà©à©°à¨¦à¨¾"
-#: ../src/empathy-account-assistant.c:1182
+#: ../src/empathy-account-assistant.c:1188
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 "
@@ -2534,23 +2534,23 @@ msgstr ""
"ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ। ਜੇ ਤà©à¨¸à©€à¨‚ ਇਹ ਫੀਚਰ ਚਾਲੂ ਕਰਨਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ ਤਾਂ telepathy-salut ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰੋ "
"ਅਤੇ ਅਕਾਊਂਟ ਡਾਈਲਾਗ ਤੋਂ ਨੇੜਲੇ ਲੋਕ ਅਕਾਊਂਟ ਬਣਾਓ।"
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1194
msgid "telepathy-salut not installed"
msgstr "telepathy-salut ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ"
-#: ../src/empathy-account-assistant.c:1234
+#: ../src/empathy-account-assistant.c:1240
msgid "Messaging and VoIP Accounts Assistant"
msgstr "ਸà©à¨¨à©‡à¨¹à©‡ ਅਤੇ VoIP ਅਕਾਊਂਟ ਸਹਾਇਕ"
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1274
msgid "Welcome to Empathy"
msgstr "ਇੰਪੈਥੀ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
-#: ../src/empathy-account-assistant.c:1277
+#: ../src/empathy-account-assistant.c:1283
msgid "Import your existing accounts"
msgstr "ਆਪਣੇ ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰੋ"
-#: ../src/empathy-account-assistant.c:1295
+#: ../src/empathy-account-assistant.c:1301
msgid "Please enter personal details"
msgstr "ਨਿੱਜੀ ਵੇਰਵਾ ਦਿਓ"
@@ -2567,7 +2567,7 @@ msgstr "ਤà©à¨¹à¨¾à¨¡à©‡ ਅਕਾਊਂਟ %s ਨਾਲ ਸਬੰਧਿਤ à¨
msgid "Your new account has not been saved yet."
msgstr "ਤà©à¨¹à¨¾à¨¡à¨¾ ਨਵਾਂ ਅਕਾਊਂਟ ਹਾਲੇ ਨਹੀਂ ਸੰਭਾਲਿਆ ਗਿਆ ਹੈ।"
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "ਕà©à¨¨à©ˆà¨•à¨Ÿ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
@@ -2593,7 +2593,7 @@ msgstr "ਅਣਜਾਣ ਹਾਲਤ"
msgid "Offline — Account Disabled"
msgstr "ਆਫਲਾਈਨ — ਅਕਾਊਂਟ ਆਯੋਗ ਹੈ"
-#: ../src/empathy-accounts-dialog.c:805
+#: ../src/empathy-accounts-dialog.c:811
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2601,16 +2601,16 @@ msgstr ""
"ਤà©à¨¸à©€à¨‚ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਉਣ ਜਾ ਰਹੇ ਹੋ, ਜੋ ਕਿ ਤà©à¨¹à¨¾à¨¡à©‡ ਬਦਲਾਅ ਖਤਮ ਕਰ ਦੇਵੇਗਾ।\n"
"ਕੀ ਤà©à¨¸à©€à¨‚ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?"
-#: ../src/empathy-accounts-dialog.c:1152
+#: ../src/empathy-accounts-dialog.c:1158
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "ਕੀ ਤà©à¨¸à©€à¨‚ ਆਪਣੇ ਕੰਪਿਊਟਰ ਤੋਂ %s ਨੂੰ ਹਟਾਉਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?"
-#: ../src/empathy-accounts-dialog.c:1156
+#: ../src/empathy-accounts-dialog.c:1162
msgid "This will not remove your account on the server."
msgstr "ਇਹ ਸਰਵਰ ਤੋਂ ਤà©à¨¹à¨¾à¨¡à¨¾ ਅਕਾਊਂਟ ਨਹੀਂ ਹਟਾà¨à¨—ਾ।"
-#: ../src/empathy-accounts-dialog.c:1394
+#: ../src/empathy-accounts-dialog.c:1400
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2618,7 +2618,7 @@ msgstr ""
"ਤà©à¨¸à©€à¨‚ ਨਵਾਂ ਅਕਾਊਂਟ ਚà©à¨£à¨¨ ਜਾ ਰਹੇ ਹੋ, ਜੋ ਕਿ ਤà©à¨¹à¨¾à¨¡à©‡ ਬਦਲਾਅ ਅਣਡਿੱਠੇ ਕਰ ਦੇਵੇਗਾ।\n"
"ਕੀ ਤà©à¨¸à©€à¨‚ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?"
-#: ../src/empathy-accounts-dialog.c:1997
+#: ../src/empathy-accounts-dialog.c:2003
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2690,84 +2690,84 @@ msgstr "ਗਾਮਾ"
msgid "Volume"
msgstr "ਆਵਾਜ਼"
-#: ../src/empathy-call-window.c:1163
+#: ../src/empathy-call-window.c:1173
msgid "_Sidebar"
msgstr "ਬਾਹੀ(_S)"
-#: ../src/empathy-call-window.c:1182
+#: ../src/empathy-call-window.c:1192
msgid "Audio input"
msgstr "ਆਡੀਓ ਆਉਟਪà©à©±à¨Ÿ"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1196
msgid "Video input"
msgstr "ਵਿਡੀਓ ਆਉਟਪà©à©±à¨Ÿ"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1200
msgid "Dialpad"
msgstr "ਡਾਇਲ-ਪੈਡ"
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1205
msgid "Details"
msgstr "ਵੇਰਵਾ"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1263
+#: ../src/empathy-call-window.c:1273
#, c-format
msgid "Call with %s"
msgstr "%s ਲਈ ਕਾਲ ਕਰੋ"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1342
+#: ../src/empathy-call-window.c:1352
msgid "Call"
msgstr "ਕਾਲ ਕਰੋ"
-#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-call-window.c:1506
msgid "The IP address as seen by the machine"
msgstr "ਮਸ਼ੀਨ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ IP à¨à¨¡à¨°à©ˆà©±à¨¸"
-#: ../src/empathy-call-window.c:1498
+#: ../src/empathy-call-window.c:1508
msgid "The IP address as seen by a server on the Internet"
msgstr "IP à¨à¨¡à¨°à©ˆà©±à¨¸, ਜੋ ਕਿ ਇੰਟਰਨੈੱਟ ਉੱਤੇ ਸਰਵਰ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ ਹੈ"
-#: ../src/empathy-call-window.c:1500
+#: ../src/empathy-call-window.c:1510
msgid "The IP address of the peer as seen by the other side"
msgstr "ਪੀਅਰ ਦਾ IP à¨à¨¡à¨°à©ˆà©±à¨¸, ਜੋ ਦੂਜੇ ਪਾਸੇ ਵਿਖਾਈ ਦਿੰਦਾ ਹੈ"
-#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1512
msgid "The IP address of a relay server"
msgstr "ਰੀਲੇਅ ਸਰਵਰ ਦਾ IP à¨à¨¡à¨°à©ˆà©±à¨¸"
-#: ../src/empathy-call-window.c:1504
+#: ../src/empathy-call-window.c:1514
msgid "The IP address of the multicast group"
msgstr "ਮਲਟੀਕਾਸਟ ਗਰà©à©±à¨ª ਦਾ IP à¨à¨¡à¨°à©ˆà©±à¨¸"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2247
#, c-format
msgid "Connected — %d:%02dm"
msgstr "ਕà©à¨¨à©ˆà¨•à¨Ÿ ਹੈ -- %d:%02dm"
-#: ../src/empathy-call-window.c:2298
+#: ../src/empathy-call-window.c:2308
msgid "Technical Details"
msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ"
-#: ../src/empathy-call-window.c:2336
+#: ../src/empathy-call-window.c:2346
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s ਦਾ ਸਾਫਟਵੇਅਰ ਤà©à¨¹à¨¾à¨¡à©‡ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਆਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮਠਨਹੀਂ ਸਕਦਾ ਹੈ।"
-#: ../src/empathy-call-window.c:2341
+#: ../src/empathy-call-window.c:2351
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s ਦਾ ਸਾਫਟਵੇਅਰ ਤà©à¨¹à¨¾à¨¡à©‡ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਵਿਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮਠਨਹੀਂ ਸਕਦਾ ਹੈ।"
-#: ../src/empathy-call-window.c:2347
+#: ../src/empathy-call-window.c:2357
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2776,19 +2776,19 @@ msgstr ""
"%s ਨਾਲ ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਤà©à¨¹à¨¾à¨¡à©‡ ਵਿੱਚੋਂ ਕੋਈ ਅਜਿਹੇ ਨੈੱਟਵਰਕ ਉੱਤੇ ਹੈ, ਜੋ ਸਿੱਧਾ ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ "
"ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2363
msgid "There was a failure on the network"
msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਮੱਸਿਆ ਆਈ ਹੈ"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2367
msgid "The audio formats necessary for this call are not installed on your computer"
msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਆਡੀਓ ਫਾਰਮੈਟ ਤà©à¨¹à¨¾à¨¡à©‡ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
-#: ../src/empathy-call-window.c:2360
+#: ../src/empathy-call-window.c:2370
msgid "The video formats necessary for this call are not installed on your computer"
msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਵਿਡੀਓ ਫਾਰਮੈਟ ਤà©à¨¹à¨¾à¨¡à©‡ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2380
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2798,19 +2798,19 @@ msgstr ""
"ਟੈਲੀਪੈਥੀ ਭਾਗ ਵਿੱਚ ਕà©à¨ ਗੜਬੜ ਹੋ ਗਈ ਹੈ। <a href=\"%s\">ਇਹ ਬੱਗ ਜਾਣਕਾਰੀ</a> ਦਿਓ ਅਤੇ ਮੱਦਦ "
"ਮੇਨੂ ਵਿੱਚੋਂ 'ਡੀਬੱਗ' ਵਿੰਡੋ ਤੋਂ ਲੈ ਕੇ ਲਾਗ ਨੱਥੀ ਕਰੋ।"
-#: ../src/empathy-call-window.c:2378
+#: ../src/empathy-call-window.c:2388
msgid "There was a failure in the call engine"
msgstr "ਕਾਲ ਇੰਜਣ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆਈ ਹੈ"
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-call-window.c:2391
msgid "The end of the stream was reached"
msgstr "ਸਟਰੀਮ ਦਾ ਅੰਤ ਆ ਗਿਆ ਹੈ"
-#: ../src/empathy-call-window.c:2421
+#: ../src/empathy-call-window.c:2431
msgid "Can't establish audio stream"
msgstr "ਆਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2441
msgid "Can't establish video stream"
msgstr "ਵਿਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
@@ -3745,6 +3745,9 @@ msgstr "ਇੰਪੈਥੀ ਅਕਾਊਂਟ"
msgid "Empathy Debugger"
msgstr "ਇੰਪੈਥੀ ਡੀਬੱਗਰ"
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "ਯਾਹੂ! ਜਾਪਾਨ ਵਰਤੋਂ(_Y)"
+
#~ msgctxt "Link individual (contextual menu)"
#~ msgid "_Link…"
#~ msgstr "ਲਿੰਕ ਕਰੋ(_L)…"
diff --git a/po/pl.po b/po/pl.po
index ea84dba2d..d7c0fda84 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,39 +8,40 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-18 18:44+0100\n"
-"PO-Revision-Date: 2010-03-17 14:56+0100\n"
+"POT-Creation-Date: 2010-09-22 17:47+0200\n"
+"PO-Revision-Date: 2010-09-22 17:32+0200\n"
"Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
"Language-Team: Polish <gnomepl@aviary.pl>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
"X-Poedit-Language: Polish\n"
"X-Poedit-Country: Poland\n"
#: ../data/empathy.desktop.in.in.h:1
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Rozmawianie przez Google Talk, Facebook, MSN i wiele innych usług"
+
+#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy"
msgstr "Empathy"
-#: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
+#: ../data/empathy.desktop.in.in.h:3
+msgid "Empathy Internet Messaging"
msgstr "Komunikator Empathy"
-#: ../data/empathy.desktop.in.in.h:3
+#: ../data/empathy.desktop.in.in.h:4
msgid "IM Client"
msgstr "Komunikator"
-#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "Wysyłanie i odbieranie wiadomości"
-
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
msgid "Always open a separate chat window for new chats."
msgstr "Zawsze otwiera oddzielne okna dla nowych rozmów."
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -48,262 +49,285 @@ msgstr ""
"Znak do dodania po automatycznym uzupełnieniu pseudonimu (klawiszem Tab) "
"podczas rozmowy grupowej."
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Chat window theme"
msgstr "Motyw okna rozmowy"
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"Oddzielana przecinkami lista języków do sprawdzania pisowni (np. \"en, fr, pl"
"\")."
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Compact contact list"
msgstr "Zmniejszona lista kontaktów"
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Connection managers should be used"
msgstr "Użycie menedżerów połączeń"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Contact list sort criterion"
msgstr "Kryterium sortowania listy kontaktów"
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "Domyślny katalog, z którego są wybierane awatary"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Disable popup notifications when away"
msgstr "Wyłączenie wyskakujących powiadomień podczas nieobecności"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Disable sounds when away"
msgstr "Wyłączenie dźwięków podczas nieobecności"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "Wyświetlanie zdarzeń przychodzących w obszarze stanu"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Wyświetlanie zdarzeń przychodzących w obszarze stanu. Jeśli zaznaczone, to "
+"będą natychmiast prezentowane użytkownikowi."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
msgstr "Publikowanie położenia użytkownika"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
msgstr "Używanie urządzenia GPS do odnajdowania położenia"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
msgstr "Używanie sieci komórkowej do odnajdowania położenia"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
msgstr "Używanie sieci do odnajdowania położenia"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy default download folder"
msgstr "Domyślny katalog pobierania programu Empathy"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy has asked about importing accounts"
msgstr "Zapytano o zaimportowanie kont"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Przeprowadzono migrację dzienników butterfly"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Empathy should auto-away when idle"
+msgstr "Automatyczne ustawienie nieobecności podczas bezczynności"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should auto-connect on startup"
msgstr "Automatyczne Å‚Ä…czenie siÄ™ podczas uruchamiania"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should reduce the location's accuracy"
msgstr "Zmniejszenie dokładności położenia"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Używanie awatarów kontaktów jako ikony okna rozmowy"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable WebKit Developer Tools"
msgstr "Włączenie narzędzi programistycznych WebKit"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable popup notifications for new messages"
msgstr "Włączenie wyskakujących powiadomień dla nowych wiadomości"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable spell checker"
msgstr "WÅ‚Ä…czenie sprawdzania pisowni"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide main window"
msgstr "Ukrycie głównego okna"
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Hide the main window."
msgstr "Ukrycie głównego okna."
-#: ../data/empathy.schemas.in.h:26
-msgid "MC 4 accounts have been imported"
-msgstr "Konta MC 4 zostały zaimportowane"
-
-#: ../data/empathy.schemas.in.h:27
-msgid "MC 4 accounts have been imported."
-msgstr "Konta MC 4 zostały zaimportowane."
-
-#: ../data/empathy.schemas.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Nick completed character"
msgstr "Znak do dodania po uzupełnieniu pseudonimu"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Open new chats in separate windows"
msgstr "Otwieranie nowych rozmów w oddzielnych oknach"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use"
msgstr "Ścieżka używanego motywu Adium"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr ""
"Ścieżka używanego motywu Adium, jeśli dla pokoju rozmowy używany jest motyw "
"Adium."
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for incoming messages"
msgstr "Odtworzenie dźwięku dla nadchodzących wiadomości"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for new conversations"
msgstr "Odtworzenie dźwięku dla nowych rozmów"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for outgoing messages"
msgstr "Odtworzenie dźwięku dla wychodzącej wiadomości"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs in"
msgstr "Odtworzenie dźwięku, kiedy kontakt się zaloguje"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when a contact logs out"
msgstr "Odtworzenie dźwięku, kiedy kontakt się wyloguje"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log in"
msgstr "Odtworzenie dźwięku, kiedy użytkownik się zaloguje"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when we log out"
msgstr "Odtworzenie dźwięku, kiedy użytkownik się wyloguje"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications if the chat isn't focused"
msgstr "Wyskakujące powiadomienia, jeśli okno rozmowy nie jest aktywne"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs in"
msgstr "WyskakujÄ…ce powiadomienia, kiedy kontakt siÄ™ zaloguje"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications when a contact logs out"
msgstr "WyskakujÄ…ce powiadomienia, kiedy kontakt siÄ™ wyloguje"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show avatars"
msgstr "Wyświetlanie awatarów"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show contact list in rooms"
msgstr "Wyświetlanie listy kontaktów w pokojach"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show hint about closing the main window"
msgstr "Wyświetlanie podpowiedzi o zamknięciu głównego okna"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show offline contacts"
msgstr "Wyświetlanie kontaktów w trybie offline"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show protocols"
msgstr "Wyświetlanie protokołów"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Spell checking languages"
msgstr "Języki sprawdzania pisowni"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The default folder to save file transfers in."
msgstr "Domyślny katalog zapisu przesyłanych plików."
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The last directory that an avatar image was chosen from."
msgstr "Ostatni katalog, z którego był wybierany awatar."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The position for the chat window side pane"
+msgstr "Położenie panelu bocznego okna rozmowy"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Przechowane położenie (w pikselach) panelu bocznego okna rozmowy."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Motyw używany do wyświetlania rozmowy w oknach rozmowy."
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use graphical smileys"
msgstr "Używanie graficznych emotikon"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use notification sounds"
msgstr "Używanie dźwięków powiadomień"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Use theme for chat rooms"
msgstr "Używanie motywu dla pokoi rozmowy"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Określa, czy publikować położenie użytkownika jego kontaktom."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Określa, czy używać urządzenia GPS do odnajdowania położenia."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Określa, czy używać sieci komórkowej do odnajdowania położenia."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the network to guess the location."
msgstr "Określa, czy używać sieci do odnajdowania położenia."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr "Określa, czy zapytano o zaimportowanie kont z innych programów."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Określa, czy przeprowadzono migrację dzienników butterfly."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Określa, czy automatycznie logować się do kont podczas uruchamiania."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+"Określa, czy automatycznie przechodzić do trybu nieobecności podczas "
+"bezczynności."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Określa, czy zmniejszać dokładność położenia w celu ochrony prywatności."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Określa, czy używać awatarów kontaktów jako ikony okna rozmowy."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Określa, czy włączyć narzędzia programistyczne WebKit, takie jak Web "
"Inspector."
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -311,73 +335,73 @@ msgstr ""
"Określa, czy menedżery łączności powinny być używane do automatycznego "
"rozłączenia/ponownego połączenia."
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "Określa, czy sprawdzać słowa wprowadzane w podanych językach."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
"Określa, czy przekształcać emotikony w rozmowach do postaci graficznej."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Określa, czy odtwarzać dźwięk powiadamiający o zalogowaniu kontaktów do "
"sieci."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Określa, czy odtwarzać dźwięk powiadamiający o wylogowaniu kontaktów z sieci."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of events."
msgstr "Określa, czy odtwarzać dźwięk powiadamiający o zdarzeniach."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of incoming messages."
msgstr ""
"Określa, czy odtwarzać dźwięk powiadamiający o nadchodzących wiadomościach."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of new conversations."
msgstr "Określa, czy odtwarzać dźwięk powiadamiający o nowych rozmowach."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of outgoing messages."
msgstr ""
"Określa, czy odtwarzać dźwięk powiadamiający o wychodzących wiadomościach."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound when logging into a network."
msgstr "Określa, czy odtwarzać dźwięk podczas zalogowania do sieci."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound when logging out of a network."
msgstr "Określa, czy odtwarzać dźwięk podczas wylogowania z sieci."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play sound notifications when away or busy."
msgstr ""
"Określa, czy odtwarzać dźwięki powiadomień podczas nieobecności lub "
"zajętości."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
"Określa, czy wyświetlać wyskakujące powiadomienia, kiedy kontakt przechodzi "
"do trybu offline."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
"Określa, czy wyświetlać wyskakujące powiadomienia, kiedy kontakt przechodzi "
"do trybu online."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -385,41 +409,41 @@ msgstr ""
"Określa, czy wyświetlać wyskakujące powiadomienia podczas otrzymania nowej "
"wiadomości, nawet jeśli okno rozmowy jest już otwarte, lecz nie jest aktywne."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Określa, czy wyświetlać wyskakujące powiadomienia podczas otrzymania nowej "
"wiadomości."
-#: ../data/empathy.schemas.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Określa, czy wyświetlać awatary dla kontaktów na liście i oknach rozmowy."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Określa, czy wyświetlać na liście kontakty w trybie offline."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Określa, czy wyświetlać wyskakujące powiadomienia podczas nieobecności lub "
"zajętości."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Określa, czy wyświetlać protokoły dla kontaktów na liście."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show the contact list in chat rooms."
msgstr "Określa, czy wyświetlać listę kontaktów w pokojach rozmowy."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show the contact list in compact mode."
msgstr "Określa, czy wyświetlać listę kontaktów w trybie zmniejszonym."
-#: ../data/empathy.schemas.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -427,11 +451,11 @@ msgstr ""
"Określa, czy wyświetlać okno dialogowe podczas zamykania głównego okna "
"przyciskiem \"x\" na pasku tytułowym."
-#: ../data/empathy.schemas.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to use the theme for chat rooms."
msgstr "Określa, czy używać motywów dla pokoi rozmowy."
-#: ../data/empathy.schemas.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
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 "
@@ -447,149 +471,207 @@ msgstr "ZarzÄ…dzanie kontami komunikatora i 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/cc-empathy-accounts-panel.c:91
+#: ../src/empathy-accounts-dialog.c:2157
msgid "Messaging and VoIP Accounts"
msgstr "Konta komunikatora i VoIP"
-#: ../libempathy/empathy-ft-handler.c:842
+#: ../libempathy/empathy-ft-handler.c:851
msgid "The hash of the received file and the sent one do not match"
msgstr "Sumy kontrolne pobranego i wysłanego pliku nie zgadzają się"
-#: ../libempathy/empathy-ft-handler.c:1102
+#: ../libempathy/empathy-ft-handler.c:1111
msgid "File transfer not supported by remote contact"
msgstr "Przesyłanie plików nie jest obsługiwane przez zdalnego użytkownika"
-#: ../libempathy/empathy-ft-handler.c:1160
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is not a regular file"
msgstr "Wybrany plik nie jest zwykłym plikiem"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is empty"
msgstr "Wybrany plik jest pusty"
-#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:77
-msgid "People nearby"
-msgstr "Osoby w pobliżu"
-
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:283
msgid "Socket type not supported"
msgstr "Typ gniazda nie jest obsługiwany"
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:402
msgid "No reason was specified"
msgstr "Nie podano powodu"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:405
msgid "The change in state was requested"
msgstr "Zażądano zmiany stanu"
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:408
msgid "You canceled the file transfer"
msgstr "Przesłanie pliku zostało anulowane przez użytkownika"
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:411
msgid "The other participant canceled the file transfer"
msgstr "Przesłanie pliku zostało anulowane przez drugą stronę"
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:414
msgid "Error while trying to transfer the file"
msgstr "Błąd podczas próby przesłania pliku"
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:417
msgid "The other participant is unable to transfer the file"
msgstr "Druga strona nie może odebrać pliku"
-#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "Nieznany powód"
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Dostępny"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Zajęty"
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Nieobecny"
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Niewidoczny"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Offline"
-#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
+#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
+#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "Nie podano powodu"
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "Stan został zmieniony na offline"
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "BÅ‚Ä…d sieci"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "Uwierzytelnienie się nie powiodło"
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "BÅ‚Ä…d szyfrowania"
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "Pseudonim jest już używany"
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "Nie dostarczono certyfikatu"
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "Niezaufany certyfikat"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "Certyfikat wygasł"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "Certyfikat nieaktywny"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "Nazwa komputera w certyfikacie nie zgadza siÄ™"
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "Odcisk palca certyfikatu nie zgadza siÄ™"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "Certyfikat został samodzielnie podpisany"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "BÅ‚Ä…d certyfikatu"
-#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:356
+msgid "Encryption is not available"
+msgstr "Szyfrowanie nie jest dostępne"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Certificate is invalid"
+msgstr "Certyfikat jest nieprawidłowy"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been refused"
+msgstr "Połączenie zostało odrzucone"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Connection can't be established"
+msgstr "Nie można ustanowić połączenia"
+
+#: ../libempathy/empathy-utils.c:364
+msgid "Connection has been lost"
+msgstr "Połączenie zostało utracone"
+
+#: ../libempathy/empathy-utils.c:366
+msgid "This resource is already connected to the server"
+msgstr "Ten zasób jest już połączony z serwerem"
+
+#: ../libempathy/empathy-utils.c:368
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+"Połączenie zostało zastąpione nowym połączeniem używając tego samego zasobu"
+
+#: ../libempathy/empathy-utils.c:371
+msgid "The account already exists on the server"
+msgstr "Konto już istnieje na serwerze"
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Server is currently too busy to handle the connection"
+msgstr "Serwer jest obecnie zbyt zajęty, aby obsłużyć połączenie"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Certificate has been revoked"
+msgstr "Certyfikat został unieważniony"
+
+#: ../libempathy/empathy-utils.c:377
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"Certyfikat używa niebezpiecznego algorytmu szyfrowania lub jest "
+"kryptograficznie słaby"
+
+#: ../libempathy/empathy-utils.c:380
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"Długość certyfikatu serwera lub głębokość łańcucha certyfikatu serwera "
+"przekracza ograniczenie wymuszane przez bibliotekÄ™ kryptograficznÄ…"
+
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Osoby w pobliżu"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! Japonia"
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "Facebook Chat"
@@ -645,62 +727,92 @@ msgstr[2] "%d miesięcy emu"
msgid "in the future"
msgstr "w przyszłości"
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:463
msgid "All"
msgstr "Wszystkie"
-#: ../libempathy-gtk/empathy-account-widget.c:538
-#: ../libempathy-gtk/empathy-account-widget.c:594
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "Konto"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+msgid "Password"
+msgstr "Hasło"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "Serwer"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "Port"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1126
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "Nazwa użytkownika:"
-#: ../libempathy-gtk/empathy-account-widget.c:1474
+#: ../libempathy-gtk/empathy-account-widget.c:1521
+msgid "A_pply"
+msgstr "Za_stosuj"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "Zal_oguj siÄ™"
-#: ../libempathy-gtk/empathy-account-widget.c:1542
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "Konto:"
-#: ../libempathy-gtk/empathy-account-widget.c:1553
-msgid "Enabled"
-msgstr "WÅ‚Ä…czone"
+#: ../libempathy-gtk/empathy-account-widget.c:1628
+msgid "_Enabled"
+msgstr "_WÅ‚Ä…czone"
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "To konto już istnieje na serwerze"
-#: ../libempathy-gtk/empathy-account-widget.c:1621
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Utworzenie nowego konta na serwerze"
+#: ../libempathy-gtk/empathy-account-widget.c:1789
+msgid "Ca_ncel"
+msgstr "A_nuluj"
+
#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
#. * 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:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s na %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:2103
#, c-format
msgid "%s Account"
msgstr "Konto %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2043
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Nowe konto"
@@ -722,11 +834,11 @@ msgstr "Zaawansowane"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "_Hasło:"
@@ -745,18 +857,18 @@ msgstr "Nazwa użytkownika AIM:"
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Port:"
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Serwer:"
@@ -767,7 +879,7 @@ msgid "<b>Example:</b> username"
msgstr "<b>Przykład:</b> nazwa_użytkownika"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "Id_entyfikator logowania:"
@@ -785,56 +897,52 @@ msgid "<b>Example:</b> 123456789"
msgstr "<b>Przykład:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "Zest_aw znaków:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
msgstr "_UIN ICQ:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
msgid "What is your ICQ UIN?"
msgstr "UIN ICQ:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
msgid "What is your ICQ password?"
msgstr "Hasło ICQ:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "_Zestaw znaków:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
-msgid "New Network"
-msgstr "Nowa sieć"
-
-#: ../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 "Automatycznie"
-#: ../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 "Rejestrator"
#. 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 "Opcje"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
msgid "None"
msgstr "Brak"
@@ -870,6 +978,14 @@ msgstr "ImiÄ™ i nazwisko:"
msgid "Servers"
msgstr "Serwery"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "Pseudonim IRC:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "Sieć IRC:"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "<b>Example:</b> user@gmail.com"
msgstr "<b>Przykład:</b> użytkownik@gmail.com"
@@ -878,19 +994,28 @@ msgstr "<b>Przykład:</b> użytkownik@gmail.com"
msgid "<b>Example:</b> user@jabber.org"
msgstr "<b>Przykład:</b> użytkownik@jabber.org"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Wymagane szyfrowanie (TLS/SSL)"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr "Ig_norowanie błędów certyfikatu SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Override server settings"
msgstr "Zastępuje ustawienia serwera"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
msgstr "Pri_orytet:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "Reso_urce:"
msgstr "_Zasób:"
-#: ../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:12
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -903,50 +1028,42 @@ msgstr ""
"aby wybrać nazwę użytkownika serwisu Facebook, jeśli jeszcze jej nie "
"ustawiono."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "Use old SS_L"
msgstr "Stare szyfrowanie SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Facebook password?"
msgstr "Hasło serwisu Facebook:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook username?"
msgstr "Nazwa użytkownika serwisu Facebook:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Google ID?"
msgstr "Identyfikator Google:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google password?"
msgstr "Hasło Google:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Jabber ID?"
msgstr "Identyfikator Jabbera:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber password?"
msgstr "Hasło Jabbera:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your desired Jabber ID?"
msgstr "Żądany identyfikator Jabbera:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber password?"
msgstr "Żądane hasło Jabbera:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
-msgid "_Encryption required (TLS/SSL)"
-msgstr "_Wymagane szyfrowanie (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Ignore SSL certificate errors"
-msgstr "Ig_norowanie błędów certyfikatu SSL"
-
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Przykład:</b> użytkownik@hotmail.com"
@@ -960,25 +1077,25 @@ msgid "What is your Windows Live password?"
msgstr "Hasło Windows Live:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
+msgid "E-_mail address:"
msgstr "Adres _e-mail:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "Pseu_donim:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_First Name:"
msgstr "I_miÄ™:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID:"
msgstr "Identyfikator Ja_bbera:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Last Name:"
msgstr "Na_zwisko:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "_Pseudonim:"
-
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "Nazwa _opublikowana:"
@@ -1000,208 +1117,157 @@ msgid "Discover the STUN server automatically"
msgstr "Automatyczne wykrywanie serwera STUN"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Hostname of the proxy for outbound requests."
-msgstr "Nazwa komputera pośrednika sieciowego dla żądań wychodzących."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "Czas między aktualizacjami (w sekundach)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Keep-Alive Options"
msgstr "Opcje \"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 ""
-"Wyszukiwanie nazwy serwera STUN we wpisie SRV usługi DNS domeny serwisu."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Loose Routing"
msgstr "Swobodne trasowanie"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Mechanism:"
msgstr "Mechanizm:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Miscellaneous Options"
msgstr "Różne opcje"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "NAT Traversal Options"
msgstr "Opcje przechodzenia NAT"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Port of the proxy for outbound requests."
-msgstr "Port pośrednika sieciowego dla żądań wychodzących."
-
-#: ../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 "Opcje pośrednika"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "STUN Server:"
msgstr "Serwer STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Server:"
msgstr "Serwer"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid ""
-"The username for SIP authentication, if different from the SIP URI\n"
-"username."
-msgstr ""
-"Nazwa użytkownika uwierzytelniania SIP, jeśli różni się od\n"
-"nazwy użytkownika."
-
-#: ../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 ""
-"Aktualizacja dowiązania rejestracji, jeśli wykryto, że zewnętrzny adres dla "
-"klienta różni się od lokalnego dowiązania."
-
-#: ../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 ""
-"Użycie swobodnego trasowania i nagłówka trasy zalecanego w dokumencie RFC "
-"3261."
-
-#: ../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 "Hasło konta SIP:"
-#: ../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 "Identyfikator loginu SIP:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "_Username:"
msgstr "Nazwa _użytkownika:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo! Japan"
-msgstr "Użycie _Yahoo! Japonia"
+msgid "I_gnore conference and chat room invitations"
+msgstr "Ig_norowanie zaproszeń konferencyjnych i pokoi rozmowy"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! ID?"
msgstr "Identyfikator Yahoo!:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Hasło Yahoo!:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "Id_entyfikator Yahoo!:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "Ig_norowanie zaproszeń konferencyjnych i pokoi rozmowy"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "_Ustawienia językowe listy pokoi:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
msgid "Couldn't convert image"
msgstr "Nie można przekonwertować obrazu"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
msgid "None of the accepted image formats are supported on your system"
msgstr ""
"Żaden z akceptowanych formatów obrazu nie jest obsługiwany przez ten system"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:915
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
msgid "Select Your Avatar Image"
msgstr "Wybór obrazu awatara"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:918
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "No Image"
msgstr "Brak obrazu"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:980
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
msgid "Images"
msgstr "Obrazy"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:984
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
msgid "All Files"
msgstr "Wszystkie pliki"
-#: ../libempathy-gtk/empathy-avatar-image.c:327
+#: ../libempathy-gtk/empathy-avatar-image.c:323
msgid "Click to enlarge"
msgstr "Kliknięcie powiększy"
-#: ../libempathy-gtk/empathy-chat.c:233
-msgid "Failed to reconnect this chat"
-msgstr "Ponowne połączenie z tą rozmową się nie powiodło"
-
-#: ../libempathy-gtk/empathy-chat.c:655
-msgid "Failed to join chat room"
-msgstr "Dołączenie do pokoju rozmów się nie powiodło"
-
-#: ../libempathy-gtk/empathy-chat.c:673
+#: ../libempathy-gtk/empathy-chat.c:642
msgid "Failed to open private chat"
msgstr "Otwarcie prywatnej rozmowy się nie powiodło"
-#: ../libempathy-gtk/empathy-chat.c:712
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
msgstr "Temat nie jest obsługiwany w czasie tej rozmowy"
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
msgstr "Brak uprawnienia do zmiany tematu"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: usuwa wszystkie wiadomości z bieżącej rozmowy"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <temat>: ustawia temat bieżącej rozmowy"
-#: ../libempathy-gtk/empathy-chat.c:853
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <identyfikator pokoju rozmów>: dołącza do nowego pokoju rozmów"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <identyfikator pokoju rozmów>: dołącza do nowego pokoju rozmów"
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr ""
"/query <identyfikator kontaktu> [<wiadomość>]: otwiera prywatną rozmowę"
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <identyfikator kontaktu> <wiadomość>: otwiera prywatną rozmowę"
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <pseudonim>: zmienia pseudonim na bieżącym serwerze"
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <wiadomość>: wysyÅ‚a wiadomość DZIAÅANIA do bieżącej rozmowy"
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:849
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 "
@@ -1211,7 +1277,7 @@ msgstr ""
"wysyłania wiadomości zaczynającej się od znaku \"/\". Na przykład: \"/say /"
"join jest używane do dołączenia do nowego pokoju rozmowy\""
-#: ../libempathy-gtk/empathy-chat.c:876
+#: ../libempathy-gtk/empathy-chat.c:854
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1219,80 +1285,84 @@ msgstr ""
"/help [<polecenie>]: wyświetla wszystkie obsługiwane polecenia. Jeśli podano "
"<polecenie>, zostanie wyświetlone jej użycie."
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:864
#, c-format
msgid "Usage: %s"
msgstr "Użycie: %s"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "Nieznane polecenie"
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
msgstr "Nieznane polecenie. opcja /help wyświetli dostępne polecenia"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "offline"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "nieprawidłowy kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "brak dostępu"
-#: ../libempathy-gtk/empathy-chat.c:1183
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "za długa wiadomość"
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "niezaimplementowane"
-#: ../libempathy-gtk/empathy-chat.c:1189
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "nieznany"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1172
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Błąd podczas wysyłania wiadomości \"%s\": %s"
-#: ../libempathy-gtk/empathy-chat.c:1228
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+msgid "Topic:"
+msgstr "Temat:"
+
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "Temat ustawiony na: %s"
-#: ../libempathy-gtk/empathy-chat.c:1230
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "Temat nie został określony"
-#: ../libempathy-gtk/empathy-chat.c:1629
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(brak podpowiedzi)"
-#: ../libempathy-gtk/empathy-chat.c:1683
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "Wstaw emotikonÄ™"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1701
-#: ../libempathy-gtk/empathy-ui-utils.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "_Send"
msgstr "_Wyślij"
-#: ../libempathy-gtk/empathy-chat.c:1735
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "Podpowiedzi pi_sowni"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
msgstr "Pobranie ostatnich dzienników się nie powiodło"
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "Użytkownik %s został rozłączony"
@@ -1300,12 +1370,12 @@ msgstr "Użytkownik %s został rozłączony"
#. 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:2071
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "Użytkownik %1$s został wyrzucony przez użytkownika %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1970
+#: ../libempathy-gtk/empathy-chat.c:2074
#, c-format
msgid "%s was kicked"
msgstr "Użytkownik %s został wyrzucony"
@@ -1313,17 +1383,17 @@ msgstr "Użytkownik %s został wyrzucony"
#. 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:2082
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "Użytkownik %1$s został zablokowany przez użytkownika %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1981
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
msgstr "Użytkownik %s został zablokowany"
-#: ../libempathy-gtk/empathy-chat.c:1985
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
msgstr "Użytkownik %s opuścił pokój"
@@ -1333,81 +1403,79 @@ msgstr "Użytkownik %s opuścił pokój"
#. * 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:2098
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2019
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
msgstr "Użytkownik %s dołączył do pokoju"
-#: ../libempathy-gtk/empathy-chat.c:2044
+#: ../libempathy-gtk/empathy-chat.c:2148
#, c-format
msgid "%s is now known as %s"
msgstr "Użytkownik %s jest teraz znany jako %s"
-#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1532
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
msgid "Disconnected"
msgstr "Rozłączony"
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "Błędne hasło. Proszę spróbować ponownie:"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "Ponów"
-#: ../libempathy-gtk/empathy-chat.c:2707
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "Ten pokój jest chroniony hasłem:"
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
msgstr "Dołącz"
-#: ../libempathy-gtk/empathy-chat.c:2848
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "Połączony"
-#: ../libempathy-gtk/empathy-chat.c:2901
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "Rozmowa"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:684
-msgid "Topic:"
-msgstr "Temat:"
-
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:318
-#: ../libempathy-gtk/empathy-theme-adium.c:786
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:791
msgid "_Copy Link Address"
msgstr "S_kopiuj adres odnośnika"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:325
-#: ../libempathy-gtk/empathy-theme-adium.c:793
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:798
msgid "_Open Link"
msgstr "_Otwórz odnośnik"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:423
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:243
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
msgid "Edit Contact Information"
msgstr "Modyfikowanie informacji o kontakcie"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:301
+#: ../libempathy-gtk/empathy-contact-dialogs.c:295
msgid "Personal Information"
msgstr "Informacje osobiste"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:406
+#: ../libempathy-gtk/empathy-contact-dialogs.c:401
+#: ../libempathy-gtk/empathy-individual-dialogs.c:112
msgid "New Contact"
msgstr "Nowy kontakt"
@@ -1419,216 +1487,290 @@ msgstr "Z_decyduj później"
msgid "Subscription Request"
msgstr "Prośba o upoważnienie"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1633
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Nie w grupach"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Ulubione osoby"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Na pewno usunąć grupę \"%s\"?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1635
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2235
msgid "Removing group"
msgstr "Usuwanie grupy"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1684
-#: ../libempathy-gtk/empathy-contact-list-view.c:1761
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-contact-list-view.c:2055
+#: ../libempathy-gtk/empathy-contact-list-view.c:2132
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Usuń"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1714
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2320
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Na pewno usunąć kontakt \"%s\"?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1716
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
msgstr "Usuwanie kontaktu"
-#: ../libempathy-gtk/empathy-contact-menu.c:206
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "_Dodaj kontakt…"
-#: ../libempathy-gtk/empathy-contact-menu.c:233
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "_Rozmowa"
-#: ../libempathy-gtk/empathy-contact-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-individual-menu.c:557
msgctxt "menu item"
msgid "_Audio Call"
msgstr "Rozmow_a głosowa"
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-individual-menu.c:599
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Wideorozmowa"
-#: ../libempathy-gtk/empathy-contact-menu.c:347
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "_Poprzednie rozmowy"
# to jest w menu
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:683
+msgid "Send File"
msgstr "Wyślij plik"
# to jest w menu
-#: ../libempathy-gtk/empathy-contact-menu.c:392
-msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:375
+#: ../libempathy-gtk/empathy-individual-menu.c:725
+msgid "Share My Desktop"
msgstr "Współdziel pulpit"
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-contact-widget.c:1379
+#: ../libempathy-gtk/empathy-contact-menu.c:415
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
msgstr "Ulubione"
-#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-contact-menu.c:444
+#: ../libempathy-gtk/empathy-individual-menu.c:786
msgid "Infor_mation"
msgstr "Infor_macje"
-#: ../libempathy-gtk/empathy-contact-menu.c:508
+#: ../libempathy-gtk/empathy-contact-menu.c:490
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
-msgstr "Z_modyfikuj"
+msgstr "_Modyfikuj"
-#: ../libempathy-gtk/empathy-contact-menu.c:562
-#: ../src/empathy-chat-window.c:869
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+#: ../libempathy-gtk/empathy-individual-menu.c:970
+#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "Zapraszanie do tego pokoju"
-#: ../libempathy-gtk/empathy-contact-menu.c:593
-msgid "_Invite to chat room"
+#: ../libempathy-gtk/empathy-contact-menu.c:575
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+msgid "_Invite to Chat Room"
msgstr "_ZaproÅ› do pokoju rozmowy"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "Wybór kontaktu"
-#: ../libempathy-gtk/empathy-contact-widget.c:238
-msgid "Select"
-msgstr "Wybór"
+#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-individual-widget.c:148
+msgid "Full name:"
+msgstr "ImiÄ™ i nazwisko:"
-#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1050
-msgid "Group"
-msgstr "Grupa"
+#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-individual-widget.c:149
+msgid "Phone number:"
+msgstr "Numer telefonu:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-individual-widget.c:150
+msgid "E-mail address:"
+msgstr "Adres e-mail:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-individual-widget.c:151
+msgid "Website:"
+msgstr "Witryna WWW:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-individual-widget.c:152
+msgid "Birthday:"
+msgstr "Urodziny:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:578
+#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Kod ISO kraju:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:580
+#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Kraj:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Stan/województwo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Miasto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Obszar:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:588
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Kod pocztowy:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:590
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Ulica:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:592
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Budynek:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:594
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Piętro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:596
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Pokój:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:598
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Tekst:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Opis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:602
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "Adres URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Poziom dokładności:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "BÅ‚Ä…d:"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "BÅ‚Ä…d w pionie (metry):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "BÅ‚Ä…d w poziomie (metry):"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Prędkość:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Kierunek:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Prędkość wznoszenia:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Ostatnia aktualizacja:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Długość geograficzna:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Szerokość geograficzna:"
-#: ../libempathy-gtk/empathy-contact-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Wysokość n.p.m.:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Położenie"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-msgid "<b>Location</b>, "
-msgstr "<b>Położenie</b>, "
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:601
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B %Y o %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Zapisanie awatara"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Nie można zapisać awatara"
@@ -1636,52 +1778,50 @@ msgstr "Nie można zapisać awatara"
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Położenie</b> w dniu\t"
+#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
msgstr "Alias:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "Urodziny:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client Information"
msgstr "Informacje o kliencie"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client:"
msgstr "Klient:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
msgid "Contact Details"
msgstr "Szczegóły kontaktu"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "E-mail address:"
-msgstr "Adres e-mail:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Full name:"
-msgstr "ImiÄ™ i nazwisko:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Groups"
-msgstr "Grupy"
-
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
msgid "Identifier:"
msgstr "Identyfikator:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
msgstr "Żądanie informacji…"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "OS:"
msgstr "System operacyjny:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "Wersja:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "Grupy"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:344
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -1689,56 +1829,157 @@ msgstr ""
"Proszę wybrać grupy, w których ma się pojawić ten kontakt. Można wybrać "
"więcej niż jedną grupę lub nie wybierać żadnej."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
-msgid "Version:"
-msgstr "Wersja:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Website:"
-msgstr "Witryna WWW:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-groups-widget.c:363
msgid "_Add Group"
msgstr "Dod_aj grupÄ™"
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+msgid "Select"
+msgstr "Wybór"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-main-window.c:1247
+msgid "Group"
+msgstr "Grupa"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+msgid "Linked Contacts"
+msgstr "Połączone kontakty"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+msgid "Select contacts to link"
+msgstr "Wybór kontaktów do połączenia"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:428
+msgid "New contact preview"
+msgstr "PodglÄ…d nowego kontaktu"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "Kontakty zaznaczone na liście po lewej stronie zostaną połączone."
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:837
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "_Modyfikuj"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:863
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr "_Połącz kontakty…"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] "Metakontakt zawierajÄ…cy %u kontakt"
+msgstr[1] "Metakontakt zawierajÄ…cy %u kontakty"
+msgstr[2] "Metakontakt zawierający %u kontaktów"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>Położenie</b> w (dniu)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "Nowa sieć"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+msgid "Choose an IRC network"
+msgstr "Wybór sieci IRC"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "nowy serwer"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "Serwer"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "Port"
-
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:700
-#: ../src/empathy-import-widget.c:310
-msgid "Account"
-msgstr "Konto"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:116
+msgid "Link Contacts"
+msgstr "Połączenie kontaktów"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "_Rozłącz…"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr ""
+"Całkowicie rozdziela wyświetlany metakontakt w kontakty, które zawiera."
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:137
+msgid "_Link"
+msgstr "_Połącz"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr "Rozłączyć metakontakt \"%s\"?"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr ""
+"Na pewno rozłączyć ten metakontakt? Spowoduje to całkowite rozdzielenie "
+"metakontaktu w kontakty, które zawiera."
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:191
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "_Rozłącz"
-#: ../libempathy-gtk/empathy-log-window.c:717
+#: ../libempathy-gtk/empathy-log-window.c:663
msgid "Date"
msgstr "Data"
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
msgid "Conversations"
msgstr "Rozmowy"
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+msgid "Find Next"
+msgstr "Znajdź następny"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+msgid "Find Previous"
+msgstr "Znajdź poprzedni"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
msgid "Previous Conversations"
msgstr "Poprzednie rozmowy"
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
msgid "Search"
msgstr "Wyszukiwanie"
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "_For:"
msgstr "Wy_szukaj:"
@@ -1747,30 +1988,29 @@ msgid "Contact ID:"
msgstr "Identyfikator kontaktu:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:144
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
msgid "C_hat"
msgstr "_Rozmowa"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:154
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
msgid "New Conversation"
msgstr "Nowa rozmowa"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
msgid "Send _Video"
msgstr "Wyślij obraz _wideo"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:196
-#: ../src/empathy-call-window.ui.h:17
-msgid "_Call"
-msgstr "_Zadzwoń"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
+msgstr "_Rozmowa głosowa"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
msgid "New Call"
-msgstr "Nowa rozmowa"
+msgstr "Nowa rozmowa głosowa"
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
@@ -1805,7 +2045,7 @@ msgid "Set your presence and current status"
msgstr "Ustawienie obecności i obecnego stanu"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
msgid "Custom messages…"
msgstr "Własne wiadomości…"
@@ -1821,43 +2061,43 @@ msgstr "Rozróżnianie wielkości liter"
msgid "Phrase not found"
msgstr "Nie odnaleziono napisu"
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound.c:50
msgid "Received an instant message"
msgstr "Otrzymano wiadomość tekstową"
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
msgid "Sent an instant message"
msgstr "Wysyłano wiadomość tekstową"
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
msgid "Incoming chat request"
msgstr "Przychodzące żądanie rozmowy"
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
msgid "Contact connected"
msgstr "Kontakt połączony"
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
msgid "Contact disconnected"
msgstr "Kontakt rozłączony"
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
msgid "Connected to server"
msgstr "Połączony z serwerem"
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
msgid "Disconnected from server"
msgstr "Rozłączony z serwera"
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
msgid "Incoming voice call"
msgstr "Przychodząca rozmowa głosowa"
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
msgid "Outgoing voice call"
msgstr "Wychodząca rozmowa głosowa"
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
msgid "Voice call ended"
msgstr "Rozmowa głosowa zakończona"
@@ -1893,17 +2133,90 @@ msgstr "Czysty"
msgid "Blue"
msgstr "Niebieski"
-#: ../libempathy-gtk/empathy-ui-utils.c:1501
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr "Nie można sprawdzić tożsamości dostarczanej przez serwer rozmów.\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certificate is not signed by a Certification Authority"
+msgstr "Certyfikat nie został podpisany przez centrum certyfikacji"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "Certyfikat wygasł"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "Certyfikat nie jest jeszcze aktywny"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "Certyfikat nie zawiera oczekiwanego odcisku"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr ""
+"Nazwa komputera sprawdzana przez certyfikat nie pasuje do nazwy serwera"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "Certyfikat został samodzielnie podpisany"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr ""
+"Certyfikat został unieważniony przez centrum certyfikacji, które go wydało"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr "Certyfikat jest słaby kryptograficznie"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "Długość certyfikatu przekracza sprawdzalne ograniczenia"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "Certyfikat jest błędnie sformatowany"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "Oczekiwana nazwa komputera: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "Nazwa komputera w certyfikacie: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "Kontynuuj"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "To połączenie jest niezaufane. Kontynuować mimo to?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "Zapamiętanie tego wyboru dla przyszłych połączeń"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "Szczegóły certyfikatu"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1698
msgid "Unable to open URI"
msgstr "Nie można otworzyć adresu URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1618
+#: ../libempathy-gtk/empathy-ui-utils.c:1793
msgid "Select a file"
msgstr "Wybór pliku"
-#: ../libempathy-gtk/empathy-ui-utils.c:1682
-msgid "Select a destination"
-msgstr "Wybór miejsca docelowego"
+#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#, c-format
+msgid "Incoming file from %s"
+msgstr "Plik przychodzący od użytkownika %s"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -2088,15 +2401,15 @@ msgstr "Brak komunikatu błędu"
msgid "Instant Message (Empathy)"
msgstr "Wiadomość (Empathy)"
-#: ../src/empathy.c:596
+#: ../src/empathy.c:414
msgid "Don't connect on startup"
msgstr "Bez Å‚Ä…czenia podczas uruchamiania"
-#: ../src/empathy.c:600
+#: ../src/empathy.c:418
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Bez wyświetlania listy kontaktów lub innych okien podczas uruchamiania"
-#: ../src/empathy.c:612
+#: ../src/empathy.c:435
msgid "- Empathy IM Client"
msgstr " - komunikator Empathy"
@@ -2173,7 +2486,7 @@ msgstr ""
"tego asystenta i dodać konta później z menu Edycja."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1303
+#: ../src/empathy-account-assistant.c:1316
msgid "An error occurred"
msgstr "Wystąpił błąd"
@@ -2182,36 +2495,36 @@ msgstr "Wystąpił błąd"
#. 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:614
#, c-format
msgid "New %s account"
msgstr "Nowe konto %s"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:515
msgid "What kind of chat account do you have?"
msgstr "Rodzaj posiadanego konta rozmów:"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:521
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Inne posiadane konta rozmów do ustawienia:"
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:527
msgid "Enter your account details"
msgstr "Proszę wprowadzić szczegóły konta"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:532
msgid "What kind of chat account do you want to create?"
msgstr "Rodzaj konta rozmów do utworzenia:"
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:538
msgid "Do you want to create other chat accounts?"
msgstr "Utworzyć inne konta rozmów?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:545
msgid "Enter the details for the new account"
msgstr "Proszę wprowadzić szczegóły nowego konta"
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:660
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 "
@@ -2223,41 +2536,41 @@ msgstr ""
"Windows Live i wielu innych komunikatorów. Za pomocą mikrofonu lub kamery "
"internetowej można także prowadzić rozmowy głosowe i wideokonferencje."
-#: ../src/empathy-account-assistant.c:670
+#: ../src/empathy-account-assistant.c:677
msgid "Do you have an account you've been using with another chat program?"
msgstr "Czy konto było już używane za pomocą innego komunikatora?"
-#: ../src/empathy-account-assistant.c:693
+#: ../src/empathy-account-assistant.c:700
msgid "Yes, import my account details from "
msgstr "Tak, zaimportuj szczegóły konta z "
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:721
msgid "Yes, I'll enter my account details now"
msgstr "Tak, wprowadzę teraz szczegóły konta"
-#: ../src/empathy-account-assistant.c:736
+#: ../src/empathy-account-assistant.c:743
msgid "No, I want a new account"
msgstr "Nie, chcę utworzyć nowe konto"
-#: ../src/empathy-account-assistant.c:746
+#: ../src/empathy-account-assistant.c:753
msgid "No, I just want to see people online nearby for now"
msgstr "Nie, chcę na razie widzieć tylko osoby w sieci będące w pobliżu"
-#: ../src/empathy-account-assistant.c:767
+#: ../src/empathy-account-assistant.c:774
msgid "Select the accounts you want to import:"
msgstr "Proszę wybrać konta do zaimportowania:"
-#: ../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:858
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Tak"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:865
msgid "No, that's all for now"
msgstr "Nie, to na razie wszytko"
-#: ../src/empathy-account-assistant.c:1117
+#: ../src/empathy-account-assistant.c:1130
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 "
@@ -2269,16 +2582,16 @@ msgstr ""
"czy poniższe dane są poprawne. Można je łatwo zmienić w późniejszym czasie "
"lub wyłączyć tę funkcję używając okna \"Konta\""
-#: ../src/empathy-account-assistant.c:1123
-#: ../src/empathy-account-assistant.c:1179
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
msgid "Edit->Accounts"
msgstr "Edycja->Konta"
-#: ../src/empathy-account-assistant.c:1139
+#: ../src/empathy-account-assistant.c:1152
msgid "I don't want to enable this feature for now"
msgstr "Nie chcę na razie włączać tej funkcji"
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1188
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 "
@@ -2290,66 +2603,66 @@ msgstr ""
"proszę zainstalować pakiet telepathy-salut i utworzyć konto \"Osoby w pobliżu"
"\" z okna Konta"
-#: ../src/empathy-account-assistant.c:1181
+#: ../src/empathy-account-assistant.c:1194
msgid "telepathy-salut not installed"
msgstr "Pakiet telepathy-salut nie jest zainstalowany"
-#: ../src/empathy-account-assistant.c:1227
+#: ../src/empathy-account-assistant.c:1240
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Asystent kont komunikatora i VoIP"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1274
msgid "Welcome to Empathy"
msgstr "Witamy w programie Empathy"
-#: ../src/empathy-account-assistant.c:1270
+#: ../src/empathy-account-assistant.c:1283
msgid "Import your existing accounts"
msgstr "Importowanie istniejÄ…cych kont"
-#: ../src/empathy-account-assistant.c:1288
+#: ../src/empathy-account-assistant.c:1301
msgid "Please enter personal details"
msgstr "Proszę wprowadzić dane osobiste"
#. 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 "Modyfikacje konta %s nie zostały zapisane."
#. 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 "Nowe konto nie zostało jeszcze zapisane."
-#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "ÅÄ…czenie…"
-#: ../src/empathy-accounts-dialog.c:290
-#, c-format
-msgid "Disconnected — %s"
-msgstr "Rozłączony — %s"
-
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:322
#, c-format
msgid "Offline — %s"
msgstr "Offline — %s"
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:334
+#, c-format
+msgid "Disconnected — %s"
+msgstr "Rozłączony — %s"
+
+#: ../src/empathy-accounts-dialog.c:345
msgid "Offline — No Network Connection"
msgstr "Offline — brak połączenia z siecią"
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:352
msgid "Unknown Status"
msgstr "Nieznany stan"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:364
msgid "Offline — Account Disabled"
msgstr "Offline — konto jest wyłączone"
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:811
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2357,16 +2670,16 @@ msgstr ""
"Za chwilÄ™ nastÄ…pi utworzenie nowego konta, co\n"
"spowoduje utratę zmian. Na pewno kontynuować?"
-#: ../src/empathy-accounts-dialog.c:1115
+#: ../src/empathy-accounts-dialog.c:1158
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Na pewno usunąć \"%s\" z komputera?"
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1162
msgid "This will not remove your account on the server."
msgstr "Nie usunie to konta na serwerze."
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1400
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2374,7 +2687,7 @@ msgstr ""
"Za chwilÄ™ nastÄ…pi wybranie innego konta, co spowoduje\n"
"utratę zmian. Na pewno kontynuować?"
-#: ../src/empathy-accounts-dialog.c:1933
+#: ../src/empathy-accounts-dialog.c:2003
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2383,14 +2696,18 @@ msgstr ""
"utratę zmian. Na pewno kontynuować?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "Wczytywanie informacji o koncie"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "No protocol installed"
msgstr "Brak zainstalowanych protokołów"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Protocol:"
msgstr "Protokół:"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -2398,70 +2715,114 @@ msgstr ""
"Aby dodać nowe konto należy najpierw zainstalować moduł obsługi dla każdego "
"wymaganego protokołu."
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
msgstr "_Dodaj…"
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
msgstr "_Zaimportuj…"
-#: ../src/empathy-call-window.c:453
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr " - klient uwierzytelniania komunikatora Empathy"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Klient uwierzytelniania komunikatora Empathy"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "Osoby w pobliżu"
+
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr "- klient dźwięku/wideo komunikatora Empathy"
+
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "Klient dźwięku/wideo komunikatora Empathy"
+
+#: ../src/empathy-call-window.c:479
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:482
msgid "Brightness"
msgstr "Jasność"
-#: ../src/empathy-call-window.c:459
+#: ../src/empathy-call-window.c:485
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:567
+#: ../src/empathy-call-window.c:590
msgid "Volume"
msgstr "Głośność"
-#: ../src/empathy-call-window.c:1022
+#: ../src/empathy-call-window.c:1173
msgid "_Sidebar"
msgstr "_Panel"
-#: ../src/empathy-call-window.c:1041
+#: ../src/empathy-call-window.c:1192
msgid "Audio input"
msgstr "Wejście dźwięku"
-#: ../src/empathy-call-window.c:1045
+#: ../src/empathy-call-window.c:1196
msgid "Video input"
msgstr "Wejście obrazu"
-#: ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1200
msgid "Dialpad"
msgstr "Panel wybierania"
+#: ../src/empathy-call-window.c:1205
+msgid "Details"
+msgstr "Szczegóły"
+
#. 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:1273
#, c-format
msgid "Call with %s"
-msgstr "Rozmowa z użytkownikiem %s"
+msgstr "Rozmowa głosowa z użytkownikiem %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:1352
msgid "Call"
-msgstr "Rozmowa"
+msgstr "Rozmowa głosowa"
+
+#: ../src/empathy-call-window.c:1506
+msgid "The IP address as seen by the machine"
+msgstr "Adres IP widziany przez komputer"
+
+#: ../src/empathy-call-window.c:1508
+msgid "The IP address as seen by a server on the Internet"
+msgstr "Adres IP widziany przez serwer w Internecie"
+
+#: ../src/empathy-call-window.c:1510
+msgid "The IP address of the peer as seen by the other side"
+msgstr "Adres IP elementu widziany przez drugÄ… stronÄ™"
+
+#: ../src/empathy-call-window.c:1512
+msgid "The IP address of a relay server"
+msgstr "Adres IP serwera odpowiedzi"
+
+#: ../src/empathy-call-window.c:1514
+msgid "The IP address of the multicast group"
+msgstr "Adres IP grupy multikastowej"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1695
+#: ../src/empathy-call-window.c:2247
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Połączony — %d:%02dm"
-#: ../src/empathy-call-window.c:1756
+#: ../src/empathy-call-window.c:2308
msgid "Technical Details"
msgstr "Szczegóły techniczne"
-#: ../src/empathy-call-window.c:1794
+#: ../src/empathy-call-window.c:2346
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2470,7 +2831,7 @@ msgstr ""
"Oprogramowanie użytkownika %s nie obsługuje żadnego formatu dźwięku "
"używanego przez ten komputer"
-#: ../src/empathy-call-window.c:1799
+#: ../src/empathy-call-window.c:2351
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2479,7 +2840,7 @@ msgstr ""
"Oprogramowanie użytkownika %s nie obsługuje żadnego formatu wideo używanego "
"przez ten komputer"
-#: ../src/empathy-call-window.c:1805
+#: ../src/empathy-call-window.c:2357
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2488,23 +2849,23 @@ msgstr ""
"Nie można nawiązać połączenia z użytkownikiem %s. Jeden z uczestników może "
"się znajdować w sieci, która nie pozwala na bezpośrednie połączenia."
-#: ../src/empathy-call-window.c:1811
+#: ../src/empathy-call-window.c:2363
msgid "There was a failure on the network"
msgstr "Wystąpił błąd sieci"
-#: ../src/empathy-call-window.c:1815
+#: ../src/empathy-call-window.c:2367
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Formaty dźwięku wymagane dla tej rozmowy nie są zainstalowane na komputerze"
-#: ../src/empathy-call-window.c:1818
+#: ../src/empathy-call-window.c:2370
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Formaty wideo wymagane dla tej rozmowy nie sÄ… zainstalowane na komputerze"
-#: ../src/empathy-call-window.c:1828
+#: ../src/empathy-call-window.c:2380
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2515,87 +2876,119 @@ msgstr ""
"\">zgłosić ten błąd</a> i dołączyć dzienniki uzyskane z okna \"Debugowanie\" "
"w menu Pomoc."
-#: ../src/empathy-call-window.c:1836
+#: ../src/empathy-call-window.c:2388
msgid "There was a failure in the call engine"
msgstr "Wystąpił błąd mechanizmu rozmowy"
-#: ../src/empathy-call-window.c:1875
+#: ../src/empathy-call-window.c:2391
+msgid "The end of the stream was reached"
+msgstr "Osiągnięto koniec strumienia"
+
+#: ../src/empathy-call-window.c:2431
msgid "Can't establish audio stream"
msgstr "Nie można utworzyć strumienia dźwięku"
-#: ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:2441
msgid "Can't establish video stream"
msgstr "Nie można utworzyć strumienia obrazu"
#: ../src/empathy-call-window.ui.h:1
+msgid "Audio"
+msgstr "Dźwięk"
+
+#: ../src/empathy-call-window.ui.h:2
msgid "Call the contact again"
msgstr "Zadzwoń jeszcze raz"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:3
msgid "Camera Off"
msgstr "Kamera jest wyłączona"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:4
msgid "Camera On"
msgstr "Kamera jest włączona"
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Dekoder:"
+
+#: ../src/empathy-call-window.ui.h:6
msgid "Disable camera and stop sending video"
msgstr "Wyłączenie kamery i zatrzymanie wysyłania obrazu"
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.ui.h:7
msgid "Enable camera and send video"
msgstr "Włączenie kamery i wysyłania obrazu"
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:8
msgid "Enable camera but don't send video"
msgstr "Włączenie kamery, ale bez wysyłania obrazu"
-#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Koder:"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Hang up"
msgstr "Rozłącz"
-#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-call-window.ui.h:11
msgid "Hang up current call"
msgstr "Rozłącza bieżącą rozmowę"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Lokalny kandydat:"
+
+#: ../src/empathy-call-window.ui.h:13
msgid "Preview"
msgstr "PodglÄ…d"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:14
msgid "Redial"
msgstr "Wybierz ponownie"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Zdalny kandydat:"
+
+#: ../src/empathy-call-window.ui.h:16
msgid "Send Audio"
msgstr "Wyślij dźwięk"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Przełącza przesyłanie dźwięku"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:19
msgid "V_ideo"
msgstr "_Wideo"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:20
+msgid "Video"
+msgstr "Wideo"
+
+#: ../src/empathy-call-window.ui.h:21
msgid "Video Off"
msgstr "Obraz jest wyłączony"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:22
msgid "Video On"
msgstr "Obraz jest włączony"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:23
msgid "Video Preview"
msgstr "PodglÄ…d obrazu"
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr "_Zadzwoń"
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
msgid "_View"
msgstr "_Widok"
-#: ../src/empathy-chat-window.c:440 ../src/empathy-chat-window.c:460
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -2603,7 +2996,7 @@ msgstr[0] "%s (%d nieprzeczytana)"
msgstr[1] "%s (%d nieprzeczytane)"
msgstr[2] "%s (%d nieprzeczytanych)"
-#: ../src/empathy-chat-window.c:452
+#: ../src/empathy-chat-window.c:464
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
@@ -2611,7 +3004,7 @@ msgstr[0] "%s (i %u inna)"
msgstr[1] "%s (i %u inne)"
msgstr[2] "%s (i %u innych)"
-#: ../src/empathy-chat-window.c:468
+#: ../src/empathy-chat-window.c:480
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
@@ -2619,7 +3012,7 @@ msgstr[0] "%s (%d nieprzeczytana od innych)"
msgstr[1] "%s (%d nieprzeczytane od innych)"
msgstr[2] "%s (%d nieprzeczytanych od innych)"
-#: ../src/empathy-chat-window.c:477
+#: ../src/empathy-chat-window.c:489
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
@@ -2627,7 +3020,7 @@ msgstr[0] "%s (%d nieprzeczytana od wszystkich)"
msgstr[1] "%s (%d nieprzeczytane od wszystkich)"
msgstr[2] "%s (%d nieprzeczytanych od wszystkich)"
-#: ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:695
msgid "Typing a message."
msgstr "Pisze wiadomość."
@@ -2659,55 +3052,63 @@ msgstr "PrzenieÅ› kartÄ™ w l_ewo"
msgid "Move Tab _Right"
msgstr "PrzenieÅ› kartÄ™ w p_rawo"
-#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "Powiadamianie o wszystkich wiadomościach"
+
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
msgid "_Contents"
msgstr "_Spis treści"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "_Rozmowa"
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:11
msgid "_Detach Tab"
msgstr "_Odłącz kartę"
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
msgid "_Edit"
msgstr "_Edycja"
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "_Ulubiony pokój rozmowy"
-#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
msgid "_Help"
msgstr "Pomo_c"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "_Następna karta"
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:16
msgid "_Previous Tab"
msgstr "_Poprzednia karta"
-#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "_Lista kontaktów"
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:18
msgid "_Tabs"
msgstr "_Karty"
-#: ../src/empathy-chatrooms-window.c:256
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "_Cofnij zamknięcie karty"
+
+#: ../src/empathy-chatrooms-window.c:241
msgid "Name"
msgstr "Nazwa"
-#: ../src/empathy-chatrooms-window.c:274
+#: ../src/empathy-chatrooms-window.c:259
msgid "Room"
msgstr "Pokój"
-#: ../src/empathy-chatrooms-window.c:282
+#: ../src/empathy-chatrooms-window.c:267
msgid "Auto-Connect"
msgstr "Automatyczne Å‚Ä…czenie"
@@ -2715,76 +3116,86 @@ msgstr "Automatyczne Å‚Ä…czenie"
msgid "Manage Favorite Rooms"
msgstr "ZarzÄ…dzanie ulubionymi pokojami"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming video call"
msgstr "PrzychodzÄ…ca rozmowa wideo"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming call"
-msgstr "Rozmowa przychodzÄ…ca"
+msgstr "Przychodząca rozmowa głosowa"
-#: ../src/empathy-event-manager.c:343
+#: ../src/empathy-event-manager.c:472
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "Wideorozmowa przychodząca od użytkownika %s. Odebrać ją?"
-#: ../src/empathy-event-manager.c:344
+#: ../src/empathy-event-manager.c:473
#, c-format
msgid "%s is calling you. Do you want to answer?"
-msgstr "Rozmowa przychodząca od użytkownika %s. Odebrać ją?"
+msgstr "Przychodząca rozmowa głosowa od użytkownika %s. Odebrać ją?"
+
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Przychodząca rozmowa głosowa od użytkownika %s"
-#: ../src/empathy-event-manager.c:366
+#: ../src/empathy-event-manager.c:501
msgid "_Reject"
msgstr "_Odrzuć"
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:507
msgid "_Answer"
msgstr "_Odbierz"
-#: ../src/empathy-event-manager.c:489
+#: ../src/empathy-event-manager.c:618
#, c-format
msgid "Incoming video call from %s"
msgstr "Wideorozmowa przychodząca od użytkownika %s"
-#: ../src/empathy-event-manager.c:489
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Rozmowa przychodząca od użytkownika %s"
-
-#: ../src/empathy-event-manager.c:579
+#: ../src/empathy-event-manager.c:695
msgid "Room invitation"
msgstr "Zaproszenie do pokoju"
-#: ../src/empathy-event-manager.c:582
+#: ../src/empathy-event-manager.c:697
+#, c-format
+msgid "Invitation to join %s"
+msgstr "Zaproszenie do dołączenia do %s"
+
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "%s is inviting you to join %s"
msgstr "Użytkownik %s zaprasza do dołączenia do %s"
-#: ../src/empathy-event-manager.c:590
+#: ../src/empathy-event-manager.c:712
msgid "_Decline"
msgstr "_Odmów"
-#: ../src/empathy-event-manager.c:595
+#: ../src/empathy-event-manager.c:717
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Dołącz"
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:743
#, c-format
msgid "%s invited you to join %s"
msgstr "%s zaprosił użytkownika do dołączenia do %s"
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:749
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "Zaproszono użytkownika do dołączenia do %s"
+
+#: ../src/empathy-event-manager.c:797
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Plik przychodzący od użytkownika %s"
-#: ../src/empathy-event-manager.c:818
+#: ../src/empathy-event-manager.c:1005
#, c-format
msgid "Subscription requested by %s"
msgstr "Żądanie subskrypcji wysłane przez użytkownika %s"
-#: ../src/empathy-event-manager.c:822
+#: ../src/empathy-event-manager.c:1009
#, c-format
msgid ""
"\n"
@@ -2793,118 +3204,116 @@ msgstr ""
"\n"
"Wiadomość: %s"
-#. someone is logging off
-#: ../src/empathy-event-manager.c:862
+#: ../src/empathy-event-manager.c:1052
#, c-format
msgid "%s is now offline."
msgstr "Użytkownik %s przeszedł do trybu offline."
-#. someone is logging in
-#: ../src/empathy-event-manager.c:878
+#: ../src/empathy-event-manager.c:1072
#, c-format
msgid "%s is now online."
msgstr "Użytkownik %s przeszedł do trybu online."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u:%02u.%02u"
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Nieznany"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s z %s o prędkości %s/s"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s"
msgstr "%s z %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Odbieranie pliku \"%s\" od użytkownika %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Wysyłanie pliku \"%s\" do użytkownika %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Błąd podczas odbierania pliku \"%s\" od użytkownika %s"
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
msgid "Error receiving a file"
msgstr "BÅ‚Ä…d podczas odbierania pliku"
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Błąd podczas wysyłania pliku \"%s\" do użytkownika %s"
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
msgid "Error sending a file"
msgstr "Błąd podczas wysyłania pliku"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
#, c-format
msgid "\"%s\" received from %s"
msgstr "Otrzymano plik \"%s\" od użytkownika %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
#, c-format
msgid "\"%s\" sent to %s"
msgstr "Wysłano \"%s\" do użytkownika %s"
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
msgid "File transfer completed"
msgstr "Ukończono przesyłanie pliku"
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
msgid "Waiting for the other participant's response"
msgstr "Oczekiwanie na odpowiedź drugiej strony"
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Sprawdzanie spójności pliku \"%s\""
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "Obliczanie sumy kontrolnej pliku \"%s\""
-#: ../src/empathy-ft-manager.c:991
+#: ../src/empathy-ft-manager.c:996
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1003
+#: ../src/empathy-ft-manager.c:1008
msgid "File"
msgstr "Plik"
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1030
msgid "Remaining"
msgstr "Pozostało"
@@ -2929,160 +3338,159 @@ msgid "Import Accounts"
msgstr "Importowanie kont"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:290
+#: ../src/empathy-import-widget.c:292
msgid "Import"
msgstr "Zaimportuj"
-#: ../src/empathy-import-widget.c:299
+#: ../src/empathy-import-widget.c:301
msgid "Protocol"
msgstr "Protokół"
-#: ../src/empathy-import-widget.c:323
+#: ../src/empathy-import-widget.c:325
msgid "Source"
msgstr "Źródło"
-#: ../src/empathy-import-mc4-accounts.c:106
-#, c-format
-msgid "%s account"
-msgstr "Konto %s"
+#: ../src/empathy-main-window.c:383
+msgid "No match found"
+msgstr "Nie odnaleziono wyników"
-#: ../src/empathy-main-window.c:437
+#: ../src/empathy-main-window.c:535
msgid "Reconnect"
msgstr "Połącz ponownie"
-#: ../src/empathy-main-window.c:443
+#: ../src/empathy-main-window.c:541
msgid "Edit Account"
-msgstr "Zmodyfikuj konto"
+msgstr "Modyfikuj konto"
-#: ../src/empathy-main-window.c:449
+#: ../src/empathy-main-window.c:547
msgid "Close"
msgstr "Zamknij"
-#: ../src/empathy-main-window.c:1033
+#: ../src/empathy-main-window.c:1229
msgid "Contact"
msgstr "Kontakt"
-#: ../src/empathy-main-window.c:1414
+#: ../src/empathy-main-window.c:1554
+msgid "Contact List"
+msgstr "Lista kontaktów"
+
+#: ../src/empathy-main-window.c:1663
msgid "Show and edit accounts"
msgstr "Wyświetla i umożliwia modyfikowanie kont"
#: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "Lista kontaktów"
-
-#: ../src/empathy-main-window.ui.h:2
msgid "Contacts on a _Map"
msgstr "Kontakty na _mapie"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
msgid "Context"
msgstr "Kontekst"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
msgid "Join _Favorites"
msgstr "Dołącz do _ulubionych"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
msgid "Manage Favorites"
msgstr "ZarzÄ…dzaj ulubionymi"
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
msgid "N_ormal Size"
msgstr "N_ormalny rozmiar"
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
-msgstr "Nowa _rozmowa…"
+msgstr "Nowa _rozmowa głosowa…"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
msgid "Normal Size With _Avatars"
msgstr "Normalny rozmiar z _awatarami"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
msgid "P_references"
msgstr "P_referencje"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
msgid "Show P_rotocols"
msgstr "Wyświetlanie p_rotokołów"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
msgid "Sort by _Name"
msgstr "Porządkowanie według _nazwy"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Status"
msgstr "Porządkowanie według _stanu"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
msgid "_Accounts"
msgstr "_Konta"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
msgid "_Compact Size"
msgstr "Zmniejszony ro_zmiar"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17
msgid "_Debug"
msgstr "_Debugowanie"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19
msgid "_File Transfers"
msgstr "_Przesyłanie plików"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21
msgid "_Join…"
msgstr "_Dołącz…"
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_Nowa rozmowa…"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23
msgid "_Offline Contacts"
msgstr "K_ontakty w trybie offline"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24
msgid "_Personal Information"
msgstr "I_nformacje osobiste"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26
msgid "_Room"
msgstr "_Pokój"
-#: ../src/empathy-new-chatroom-dialog.c:338
+#: ../src/empathy-new-chatroom-dialog.c:379
msgid "Chat Room"
msgstr "Pokój rozmowy"
-#: ../src/empathy-new-chatroom-dialog.c:354
+#: ../src/empathy-new-chatroom-dialog.c:395
msgid "Members"
msgstr "Członkowie"
#. 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:607
#, c-format
msgid ""
-"<b>%s</b>\n"
+"%s\n"
"Invite required: %s\n"
"Password required: %s\n"
"Members: %s"
msgstr ""
-"<b>%s</b>\n"
+"%s\n"
"Wymagane zaproszenie: %s\n"
"Wymagane hasło: %s\n"
"Członkowie: %s"
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "No"
msgstr "Nie"
-#: ../src/empathy-new-chatroom-dialog.c:569
+#: ../src/empathy-new-chatroom-dialog.c:638
msgid "Could not start room listing"
msgstr "Nie można uruchomić listy pokoi"
-#: ../src/empathy-new-chatroom-dialog.c:579
+#: ../src/empathy-new-chatroom-dialog.c:648
msgid "Could not stop room listing"
msgstr "Nie można zatrzymać listy pokoi"
@@ -3117,62 +3525,66 @@ msgstr "Listy pokoi"
msgid "_Room:"
msgstr "_Pokój:"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:138
msgid "Message received"
msgstr "Otrzymano wiadomość"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:139
msgid "Message sent"
msgstr "Wysłano wiadomość"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:140
msgid "New conversation"
msgstr "Nowa rozmowa"
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:141
msgid "Contact goes online"
msgstr "Kontakt przeszedł do trybu online"
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:142
msgid "Contact goes offline"
msgstr "Kontakt przeszedł do trybu offline"
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:143
msgid "Account connected"
msgstr "Konto połączone"
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:144
msgid "Account disconnected"
msgstr "Konto rozłączone"
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:445
msgid "Language"
msgstr "Język"
+#: ../src/empathy-preferences.c:882
+msgid "Preferences"
+msgstr "Preferencje"
+
#: ../src/empathy-preferences.ui.h:1
msgid "Appearance"
msgstr "WyglÄ…d"
#: ../src/empathy-preferences.ui.h:2
-msgid "Automatically _connect on startup "
-msgstr "Automatycznie Å‚Ä…czenie podczas _uruchamiania "
-
-#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Zachowanie"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
msgid "Chat Th_eme:"
msgstr "Motyw _rozmowy:"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
msgid "Disable notifications when _away or busy"
msgstr "_Bez powiadomień podczas nieobecności lub zajętości"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable sounds when _away or busy"
msgstr "B_ez odtwarzania dźwięków podczas nieobecności lub zajętości"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "Wyświetlanie zdarzeń przychodzących w obszarze powiadamiania"
+
#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
msgstr "Powiadomienia, kiedy kontakt przeszedł do trybu online"
@@ -3198,17 +3610,17 @@ msgid "Location sources:"
msgstr "Źródła położenia:"
#: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr "Zapisywanie rozmów do dziennika"
+
+#: ../src/empathy-preferences.ui.h:15
msgid "Notifications"
msgstr "Powiadomienia"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:16
msgid "Play sound for events"
msgstr "Odtwarzanie dźwięków zdarzeń"
-#: ../src/empathy-preferences.ui.h:16
-msgid "Preferences"
-msgstr "Preferencje"
-
#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "Prywatność"
@@ -3250,41 +3662,62 @@ msgid "Themes"
msgstr "Motywy"
#: ../src/empathy-preferences.ui.h:25
+msgid "_Automatically connect on startup"
+msgstr "Automatycznie Å‚Ä…czenie podczas _uruchamiania"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Cellphone"
msgstr "_Telefon komórkowy"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable bubble notifications"
msgstr "Wy_skakujÄ…ce powiadomienia"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable sound notifications"
msgstr "Powia_domienia dźwiękowe"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "_Network (IP, Wi-Fi)"
msgstr "_Sieć (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Open new chats in separate windows"
msgstr "_Otwieranie nowych rozmów w oddzielnych oknach"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Publish location to my contacts"
msgstr "_Publikowanie położenia kontaktom"
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
msgid "_Reduce location accuracy"
msgstr "_Zmniejszenie dokładności położenia"
-#: ../src/empathy-status-icon.c:176
+#: ../src/empathy-status-icon.c:141
msgid "Respond"
msgstr "Odpowiedz"
+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "Odrzuć"
+
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "Odbierz"
+
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "Odmów"
+
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "Zaakceptuj"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Stan"
@@ -3293,67 +3726,67 @@ msgstr "Stan"
msgid "_Quit"
msgstr "Za_kończ"
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:452
msgid "Contact Map View"
msgstr "Widok mapy kontaktów"
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1219
msgid "Save"
msgstr "Zapisz"
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1395
msgid "Debug Window"
msgstr "Okno debugowania"
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1475
msgid "Pause"
msgstr "Wstrzymaj"
-#: ../src/empathy-debug-window.c:1311
+#: ../src/empathy-debug-window.c:1487
msgid "Level "
msgstr "Poziom "
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1507
msgid "Debug"
msgstr "Debugowanie"
-#: ../src/empathy-debug-window.c:1337
+#: ../src/empathy-debug-window.c:1513
msgid "Info"
msgstr "Informacje"
-#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
msgid "Message"
msgstr "Wiadomość"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1525
msgid "Warning"
msgstr "Ostrzeżenie"
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1531
msgid "Critical"
msgstr "Krytyczny"
-#: ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1537
msgid "Error"
msgstr "BÅ‚Ä…d"
-#: ../src/empathy-debug-window.c:1380
+#: ../src/empathy-debug-window.c:1556
msgid "Time"
msgstr "Czas"
-#: ../src/empathy-debug-window.c:1383
+#: ../src/empathy-debug-window.c:1559
msgid "Domain"
msgstr "Domena"
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1561
msgid "Category"
msgstr "Kategoria"
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1563
msgid "Level"
msgstr "Poziom"
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1600
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3369,31 +3802,35 @@ msgstr "Zaproszenie uczestnika"
msgid "Choose a contact to invite into the conversation:"
msgstr "Proszę wybrać kontakt do zaproszenia do rozmowy:"
-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "ZaproÅ›"
+
+#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
"Bez wyświetlania żadnych okien; wykonuje zadanie (np. importowanie) i kończy "
"działanie"
-#: ../src/empathy-accounts.c:217
-msgid "Don't display any dialogs if there are any non-salut accounts"
+#: ../src/empathy-accounts.c:186
+msgid "Don't display any dialogs if there are any non-Salut accounts"
msgstr ""
-"Bez wyświetlania żadnych okien, jeśli istnieją jakieś konta poza kontem salut"
+"Bez wyświetlania żadnych okien, jeśli istnieją jakieś konta poza kontem Salut"
-#: ../src/empathy-accounts.c:221
+#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Początkowo wybiera podane konto (np. gabble/jabber/foo_40przykład_2eorg0)"
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:192
msgid "<account-id>"
msgstr "<identyfikator-konta>"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:200
msgid "- Empathy Accounts"
msgstr "- Konta programu Empathy"
-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:216
msgid "Empathy Accounts"
msgstr "Konta programu Empathy"
diff --git a/po/pt.po b/po/pt.po
index afb560b4e..b9c46aa6f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.32\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 19:38+0100\n"
-"PO-Revision-Date: 2010-09-11 19:45+0000\n"
+"POT-Creation-Date: 2010-09-22 00:58+0100\n"
+"PO-Revision-Date: 2010-09-22 01:00+0000\n"
"Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
"Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,8 @@ msgstr ""
#: ../data/empathy.desktop.in.in.h:1
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Dialoge no Google Talk, Facebook, MSN e muitos outros serviços de diálogo"
+msgstr ""
+"Dialoge no Google Talk, Facebook, MSN e muitos outros serviços de diálogo"
#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy"
@@ -89,8 +90,8 @@ msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
msgstr ""
-"Apresentar eventos recebidos na área de estado. Se falso, apresentá-los "
-"ao utilizador imediatamente."
+"Apresentar eventos recebidos na área de estado. Se falso, apresentá-los ao "
+"utilizador imediatamente."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
@@ -254,7 +255,8 @@ msgstr "A posição do painel lateral da janela de diálogo"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "A posição armazenada (em pixels) do painel lateral da janela de diálogo."
+msgstr ""
+"A posição armazenada (em pixels) do painel lateral da janela de diálogo."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The theme that is used to display the conversation in chat windows."
@@ -659,7 +661,8 @@ msgstr "O certificado foi revogado"
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
-"O certificado utiliza um algoritmo de cifra inseguro ou é criptograficamente fraco"
+"O certificado utiliza um algoritmo de cifra inseguro ou é criptograficamente "
+"fraco"
#: ../libempathy/empathy-utils.c:380
msgid ""
@@ -667,11 +670,13 @@ msgid ""
"chain, exceed the limits imposed by the cryptography library"
msgstr ""
"A dimensão do certificado do servidor, ou a profundidade da cadeia de "
-"certificados do servidor, excede os limites impostos pela biblioteca de criptografia"
+"certificados do servidor, excede os limites impostos pela biblioteca de "
+"criptografia"
# 48x48/emblems/emblem-people.icon.in.h:1
# 48x48/emblems/emblem-people.icon.in.h:1
#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Pessoas por Perto"
@@ -763,16 +768,16 @@ msgstr "%s:"
msgid "Username:"
msgstr "Utilizador:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "A_plicar"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "_Iniciar sessão"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -781,19 +786,19 @@ msgstr "_Iniciar sessão"
msgid "Account:"
msgstr "Conta:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "_Activo"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Esta conta já existe no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Criar uma nova conta no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "Ca_ncelar"
@@ -802,19 +807,19 @@ msgstr "Ca_ncelar"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s em %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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "Conta %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Nova conta"
@@ -861,7 +866,7 @@ msgstr "Qual é o seu nome visível AIM?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Porto:"
@@ -870,7 +875,7 @@ msgstr "_Porto:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Servidor:"
@@ -1178,22 +1183,18 @@ msgid "I_gnore conference and chat room invitations"
msgstr "I_gnorar convites para conferências e salas de diálogo"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Utilizar o _Yahoo! Japão"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "Qual é o seu ID Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Qual é a sua senha Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "I_D Yahoo!:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "Configuração regional da Lista de _Salas:"
@@ -1491,6 +1492,14 @@ msgstr "_Decidir Mais Tarde"
msgid "Subscription Request"
msgstr "Pedido de Subscrição"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Sem Grupo"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Pessoas Favoritas"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1562,7 +1571,7 @@ msgid "Share My Desktop"
msgstr "Partilhar o Meu Ambiente de Trabalho"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1618,128 +1627,128 @@ msgstr "Página web:"
msgid "Birthday:"
msgstr "Data de Nascimento:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Código de País ISO:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "País:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Estado:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Cidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Ãrea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Código Postal:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Rua:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Edifício:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Piso:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Sala:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Texto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Descrição:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Nível de Precisão:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Erro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Erro Vertical (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Erro Horizontal (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Velocidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Orientação:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Velocidade de Escalada:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Última Actualização a:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Longitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Latitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Altitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1747,23 +1756,23 @@ msgid "Location"
msgstr "Localização"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y às %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Gravar Avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Incapaz de gravar o avatar"
@@ -1852,7 +1861,8 @@ msgstr "Antevisão de novo contacto"
#: ../libempathy-gtk/empathy-individual-linker.c:472
msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Os contactos seleccionados na lista à esquerda serão associados entre si."
+msgstr ""
+"Os contactos seleccionados na lista à esquerda serão associados entre si."
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
@@ -1917,7 +1927,8 @@ msgstr "_Desassociar…"
msgid ""
"Completely split the displayed meta-contact into the contacts it contains."
msgstr ""
-"Separar completamente o meta-contacto apresentado nos contactos que o compõem."
+"Separar completamente o meta-contacto apresentado nos contactos que o "
+"compõem."
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
@@ -2128,7 +2139,8 @@ msgstr "Azul"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr "Não é possível verificar a identidade apresentada pelo servidor de diálogo.\n"
+msgstr ""
+"Não é possível verificar a identidade apresentada pelo servidor de diálogo.\n"
#: ../libempathy-gtk/empathy-tls-dialog.c:156
msgid "The certificate is not signed by a Certification Authority"
@@ -2148,7 +2160,9 @@ msgstr "O certificado não contém a impressão digital esperada"
#: ../libempathy-gtk/empathy-tls-dialog.c:169
msgid "The hostname verified by the certificate doesn't match the server name"
-msgstr "O nome de máquina verificado pelo certificado não corresponde ao nome do servidor"
+msgstr ""
+"O nome de máquina verificado pelo certificado não corresponde ao nome do "
+"servidor"
#: ../libempathy-gtk/empathy-tls-dialog.c:173
msgid "The certificate is self-signed"
@@ -3835,6 +3849,9 @@ msgstr "Contas Empathy"
msgid "Empathy Debugger"
msgstr "Depurador Empathy"
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "Utilizar o _Yahoo! Japão"
+
#~ msgid "Send and receive messages"
#~ msgstr "Envie e receba mensagens"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c709d016c..cd9e9f651 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,9 +20,9 @@ msgstr ""
"Project-Id-Version: Empathy\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-09-09 21:16+0000\n"
-"PO-Revision-Date: 2010-09-09 18:54-0300\n"
-"Last-Translator: Henrique P. Machado <hpmachado@gnome.org>\n"
+"POT-Creation-Date: 2010-09-21 07:37+0000\n"
+"PO-Revision-Date: 2010-09-10 18:14-0300\n"
+"Last-Translator: Djavan Fagundes <djavan@comum.org>\n"
"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -87,7 +87,7 @@ msgstr "Critério de ordenação da lista de contatos"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Default directory to select an avatar image from"
-msgstr "Diretório padrão de onde selecionar imagens de avatar"
+msgstr "Diretório padrão para selecionar uma imagem para seu perfil"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Disable popup notifications when away"
@@ -662,6 +662,7 @@ msgstr ""
"criptografia"
#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Pessoas por perto"
@@ -753,16 +754,16 @@ msgstr "%s:"
msgid "Username:"
msgstr "Nome de usuário:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "A_plicar"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "C_onectar"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -771,20 +772,20 @@ msgstr "C_onectar"
msgid "Account:"
msgstr "Conta:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "_Habilitado"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Esta conta já existe no servidor"
# Tooltip.
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Criar uma nova conta no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "_Cancelar"
@@ -793,19 +794,19 @@ msgstr "_Cancelar"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s em %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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "Conta no %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Nova conta"
@@ -852,7 +853,7 @@ msgstr "Qual é o seu apelido do AIM?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Porta:"
@@ -861,7 +862,7 @@ msgstr "_Porta:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Servidor:"
@@ -1172,22 +1173,18 @@ msgid "I_gnore conference and chat room invitations"
msgstr "_Ignorar convites de conferências e bate-papo"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Usar _Yahoo! japonês"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "Qual é o seu ID do Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Qual é a sua senha do Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "I_D do Yahoo!:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "Local da l_ista da sala:"
@@ -1485,6 +1482,15 @@ msgstr "Decidir _depois"
msgid "Subscription Request"
msgstr "Requisição de inscrição"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Sem grupo"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+#| msgid "Favorite"
+msgid "Favorite People"
+msgstr "Amigos prediletos"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1556,7 +1562,7 @@ msgid "Share My Desktop"
msgstr "Compartilhar minha área de trabalho"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1612,129 +1618,129 @@ msgstr "Site da web:"
msgid "Birthday:"
msgstr "Aniversário:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Código ISO do país:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "País:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Estado:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Cidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Ãrea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "CEP:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Endereço:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Construção:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Andar:"
# Evitar colisão com _Salvar
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Sala:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Texto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Descrição:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Nível de eficácia:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Erro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Erro na vertical (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Erro na horizontal (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Velocidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Direção:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Taxa de subida:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Atualizado pela última vez em:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Longitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Latitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Altitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1742,23 +1748,23 @@ msgid "Location"
msgstr "Localização"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y em %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Salvar avatares"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Não foi possível salvar o avatar"
@@ -3846,6 +3852,9 @@ msgstr "Contas do Empathy"
msgid "Empathy Debugger"
msgstr "Depurador do Empathy"
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "Usar _Yahoo! japonês"
+
#~ msgctxt "Link individual (contextual menu)"
#~ msgid "_Link…"
#~ msgstr "Agr_upar..."
@@ -3858,236 +3867,3 @@ msgstr "Depurador do Empathy"
#~ msgid "MC 4 accounts have been imported."
#~ msgstr "Contas do MC 4 foram importadas."
-
-# Changed from Og's "conjunto de caracteres because of little room.
-#~ msgid "_Character set:"
-#~ msgstr "_Codificação:"
-
-#~ msgid "_E-mail address:"
-#~ msgstr "_Endereço de e-mail:"
-
-#~ msgid "_Nickname:"
-#~ msgstr "_Apelido:"
-
-#~ msgid "Failed to reconnect this chat"
-#~ msgstr "Não foi possível reconectar a este bate-papo"
-
-#~ msgid "Failed to join chat room"
-#~ msgstr "Falhou ao entrar na sala de bate-papo"
-
-#~ msgid "<b>Location</b>, "
-#~ msgstr "<b>Localização</b>, "
-
-#~ msgid "Select a destination"
-#~ msgstr "Selecionar destino"
-
-#~ msgid "%s account"
-#~ msgstr "Conta no %s"
-
-#~ msgid "Hostname of the proxy for outbound requests."
-#~ msgstr "Nome do computador do proxy para requisições de saída"
-
-#~ msgid ""
-#~ "Look up the DNS SRV record at the service's domain for the host name of a "
-#~ "STUN server."
-#~ msgstr ""
-#~ "Consulta o registro DNS SRV no serviço de domínio para o nome do "
-#~ "computador de um servidor STUN."
-
-#~ msgid "Port of the proxy for outbound requests."
-#~ msgstr "Porta do proxy para requisições de saída."
-
-#~ msgid ""
-#~ "The username for SIP authentication, if different from the SIP URI\n"
-#~ "username."
-#~ msgstr ""
-#~ "O nome de usuário para autenticação SIP, se diferente do nome de usuário\n"
-#~ "SIP URI."
-
-#~ msgid ""
-#~ "Update the registration binding if the external address for the client is "
-#~ "discovered to be different from the local binding."
-#~ msgstr ""
-#~ "Atualizar o binding de registro se o endereço externo para o cliente "
-#~ "estiver descoberto e for diferente do binding local."
-
-#~ msgid ""
-#~ "Use the loose routing behavior and the Route header as recommended in RFC "
-#~ "3261."
-#~ msgstr ""
-#~ "Usar o comportamento de roteamento frouxo e o cabeçalho do roteador como "
-#~ "recomendado pela RFC 3261."
-
-#~ msgid "Accounts"
-#~ msgstr "Contas"
-
-#~ msgid "_Add&#x2026;"
-#~ msgstr "_Adicionar&#x2026;"
-
-#~ msgid "_Import&#x2026;"
-#~ msgstr "_Importar&#x2026;"
-
-#~ msgid " Accounts"
-#~ msgstr " Contas"
-
-#~ msgid "Salut account is created"
-#~ msgstr "Conta no Salut criada"
-
-#~ msgid "Whether the Salut account has been created on the first Empathy run."
-#~ msgstr "A conta do Salut foi criada na primeira execução do Empathy."
-
-#~ msgid ""
-#~ "Try to import any recognized accounts and display an assistant if that "
-#~ "fails"
-#~ msgstr ""
-#~ "Tente importar quaisquer contas reconhecidas e exibir um assistente se "
-#~ "falhar"
-
-#~ msgid "Show the accounts dialog"
-#~ msgstr "Mostrar o diálogo de contas"
-
-#~ msgid "Can't set an empty display name"
-#~ msgstr "Não é possível definir um nome de exibição vazio"
-
-#~ msgid "Hidden"
-#~ msgstr "Oculto"
-
-#~ msgid "Unsupported command"
-#~ msgstr "Sem suporte a este comando"
-
-#~ msgid "_Add Contact..."
-#~ msgstr "_Adicionar contato..."
-
-#~ msgid "_View Previous Conversations"
-#~ msgstr "_Ver conversas anteriores"
-
-#~ msgid "<b>Location</b>"
-#~ msgstr "<b>Localização</b>"
-
-#~ msgid "Email:"
-#~ msgstr "E-mail:"
-
-#~ msgid "Edit Custom Messages..."
-#~ msgstr "Editar mensagens personalizadas..."
-
-#~ msgid ""
-#~ "The contact to display in the applet. Empty means no contact is displayed."
-#~ msgstr ""
-#~ "O contato para exibir no miniaplicativo. Vazio significa que nenhum "
-#~ "contato será exibido."
-
-#~ msgid "The contact's avatar token. Empty means contact has no avatar."
-#~ msgstr ""
-#~ "O símbolo do avatar do contato. Vazio significa que o contato não possui "
-#~ "um avatar."
-
-#~ msgid "Talk!"
-#~ msgstr "Fale!"
-
-#~ msgid "_Information"
-#~ msgstr "_Informação"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Preferências"
-
-#~ msgid "Please configure a contact."
-#~ msgstr "Por favor configure um contato."
-
-#~ msgid "Select contact..."
-#~ msgstr "Selecionar contato..."
-
-#~ msgid "Presence"
-#~ msgstr "Presença"
-
-#~ msgid "Set your own presence"
-#~ msgstr "Configure sua própria presença"
-
-#~ msgid "The error message was: <span style=\"italic\">%s</span>"
-#~ msgstr "A mensagem do erro foi: <span style=\"italic\">%s</span>"
-
-#~ msgid ""
-#~ "You are about to remove your %s account!\n"
-#~ "Are you sure you want to proceed?"
-#~ msgstr ""
-#~ "Você está prestes a remover sua conta %s!\n"
-#~ "Você tem certeza que deseja prosseguir?"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Quaisquer conversas e salas de bate-papo associadas NÃO serão removidas "
-#~ "se você decidir prosseguir.\n"
-#~ "\n"
-#~ "Caso você decida adicionar a conta novamente mais tarde, elas ainda "
-#~ "estarão disponíveis."
-
-#~ msgid "_Next"
-#~ msgstr "_Próxima"
-
-#~ msgid "Add new"
-#~ msgstr "Adicionar nova"
-
-#~ msgid "Cr_eate"
-#~ msgstr "Cr_iar"
-
-#~ msgid "_Add..."
-#~ msgstr "_Adicionar..."
-
-#~ msgid "_Reuse an existing account"
-#~ msgstr "_Reutilizar uma conta existente"
-
-#~ msgid "Connecting..."
-#~ msgstr "Conectando..."
-
-#~ msgid "Conversations (%d)"
-#~ msgstr "Conversas (%d)"
-
-#~ msgid "_Contact"
-#~ msgstr "_Contato"
-
-#~ msgid "%s is offering you an invitation"
-#~ msgstr "%s está lhe fazendo um convite"
-
-#~ msgid "An external application will be started to handle it."
-#~ msgstr "Um aplicativo externo será iniciado para lidar com o convite."
-
-#~ msgid "You don't have the needed external application to handle it."
-#~ msgstr "Você não tem o aplicativo necessário para lidar com este convite."
-
-#~ msgid "No error specified"
-#~ msgstr "Nenhum erro especificado"
-
-#~ msgid "Unknown error"
-#~ msgstr "Erro desconhecido"
-
-#~ msgid "_Join..."
-#~ msgstr "E_ntrar..."
-
-#~ msgid "_New Conversation..."
-#~ msgstr "_Nova conversa..."
-
-#~ msgid "Allow _GPS usage"
-#~ msgstr "Permitir o uso de _GPS"
-
-#~ msgid "Allow _cellphone usage"
-#~ msgstr "Permitir o uso de _telefone celular"
-
-#~ msgid "Allow _network usage"
-#~ msgstr "Permitir o uso de _rede"
-
-#~ msgid "Geoclue Settings"
-#~ msgstr "Configurações do Geoclue"
-
-#~ msgid "Unable to start application for service %s: %s"
-#~ msgstr "Não foi possível iniciar o aplicativo para o serviço %s: %s"
-
-#~ msgid ""
-#~ "An invitation was offered for service %s, but you don't have the needed "
-#~ "application to handle it"
-#~ msgstr ""
-#~ "Foi feito um convite para o serviço %s, mas você não possui o aplicativo "
-#~ "necessário para manipulá-lo."
diff --git a/po/ro.po b/po/ro.po
index 74e8df5b8..b736688f0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,390 +2,475 @@
# Alex Szasz 2008
# Adi Roiban https://adi.roiban.ro, 2009
# Lucian Adrian Grijincu <lucian.grijincu@gmail.com>, 2009, 2010.
+# Daniel Șerbănescu <cyber19rider@gmail.com>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: Empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2010-03-22 10:25+0000\n"
-"PO-Revision-Date: 2010-03-22 14:27+0200\n"
-"Last-Translator: Adi Roiban <adi@roiban.ro>\n"
-"Language-Team: Romanian GNOME Team <gnomero-list@lists.sourceforge.net>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2010-09-25 19:21+0000\n"
+"PO-Revision-Date: 2010-09-26 00:40+0300\n"
+"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
+"Language-Team: Romanian Gnome Team <gnomero-list@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);;\n"
-"X-Generator: Virtaal 0.5.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Virtaal 0.6.1\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy"
-msgstr "Empathy"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Discută pe Google Talk, Facebook, Yahoo!, MSN sau multe alte servicii de "
+"mesagerie"
#: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
-msgstr "Mesagerie instant Empathy"
+msgid "Empathy"
+msgstr "Empathy"
#: ../data/empathy.desktop.in.in.h:3
-msgid "IM Client"
-msgstr "Client de mesagerie instant"
+msgid "Empathy Internet Messaging"
+msgstr "Empathy – Mesagerie instant"
#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "Trimiteți și primiți mesaje"
+msgid "IM Client"
+msgstr "Client de mesagerie instant"
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
msgid "Always open a separate chat window for new chats."
msgstr "Deschide întotdeauna o fereastră separată pentru discuțiile noi."
-#: ../data/empathy.schemas.in.h:2
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Caracterul de adăugat după un pseudonim când se folosește completarea cu tab în grupurile de discuții."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Caracterul de adăugat după un pseudonim când se folosește completarea cu tab "
+"în grupurile de discuții."
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Chat window theme"
msgstr "Temă ferestră discuții"
-#: ../data/empathy.schemas.in.h:4
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Listă de corectoare ortografice de folosit, separate prin virgulă (de ex: „en, fr, roâ€)."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Listă de corectoare ortografice de folosit, separate prin virgulă (de ex: "
+"„en, fr, roâ€)."
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Compact contact list"
msgstr "Listă de contacte compactă"
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Connection managers should be used"
msgstr "Ar trebui folosiți administratori de conexiune"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Contact list sort criterion"
msgstr "Criteriu de sortare a listei de contacte"
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "Dosar implicit pentru alegerea imaginii avatarului"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Disable popup notifications when away"
msgstr "Dezactivează notificările de tip popup când sunt plecat"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Disable sounds when away"
msgstr "Dezactivează sunetele când sunt plecat"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "Afișează evenimentele primite în zona de stare"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"AfiÈ™ează evenimente sosite în zona de stare. Dacă are valoarea „falsâ€, "
+"prezintă-le utilizatorului imediat."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
msgstr "Empathy poate publica locația utilizatorului"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy poate folosi GPS-ul pentru a estima locația"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy poate folosi rețeaua de telefonie mobilă pentru a estima locația"
+msgstr ""
+"Empathy poate folosi rețeaua de telefonie mobilă pentru a estima locația"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
msgstr "Empathy poate folosi rețeaua pentru a estima locația"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy default download folder"
msgstr "Dosarul implicit de descărcare pentru Empathy"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy has asked about importing accounts"
msgstr "Empathy a întrebat despre importul conturilor"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy a migrat înregistrările butterfly"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Empathy should auto-away when idle"
+msgstr ""
+"Empathy ar trebui să schimbe starea în „plecat†când calculatorul este "
+"inactiv"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should auto-connect on startup"
msgstr "La pornire, Empathy ar trebui să se conecteze automat"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy ar trebui să reducă acuratețea locației"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy ar trebui să folosească avatarul contactului ca iconiță a ferestrei de discuții"
+msgstr ""
+"Empathy ar trebui să folosească avatarul contactului ca iconiță a ferestrei "
+"de discuții"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable WebKit Developer Tools"
msgstr "Activează uneltele de dezvoltare WebKit"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable popup notifications for new messages"
msgstr "Activează notificările de tip popup pentru mesaje noi"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable spell checker"
msgstr "Activează corectorul ortografic"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide main window"
msgstr "Ascunde fereastra principală"
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Hide the main window."
msgstr "Ascunde fereastra principală."
-#: ../data/empathy.schemas.in.h:26
-msgid "MC 4 accounts have been imported"
-msgstr "Conturile MC 4 au fost importate"
-
-#: ../data/empathy.schemas.in.h:27
-msgid "MC 4 accounts have been imported."
-msgstr "Conturile MC 4 au fost importate."
-
-#: ../data/empathy.schemas.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Nick completed character"
msgstr "Caracter de completare a pseudonimului"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Open new chats in separate windows"
msgstr "Deschide discuțiile noi în ferestre separate"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use"
msgstr "Calea către tema Adium de utilizat"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Calea către tema Adium de utilizat, dacă tema utilizată pentru conversații este Adium."
+msgstr ""
+"Calea către tema Adium de utilizat, dacă tema utilizată pentru conversații "
+"este Adium."
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for incoming messages"
msgstr "Redă un sunet la primirea mesajelor"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for new conversations"
msgstr "Redă un sunet pentru conversațiile noi"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for outgoing messages"
msgstr "Redă un sunet pentru mesajele trimise"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs in"
msgstr "Redă un sunet la conectarea unui contact"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when a contact logs out"
msgstr "Redă un sunet la deconectarea unui contact"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log in"
-msgstr "Redă un sunet când la conectarea Empathy"
+msgstr "Redă un sunet când mă conectez"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when we log out"
-msgstr "Redă un sunet la conectarea Empathy"
+msgstr "Redă un sunet când mă deconectez"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications if the chat isn't focused"
msgstr "Notificări popup dacă conversația nu este focalizată"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs in"
msgstr "Notificări popup la autentificarea unui contact"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications when a contact logs out"
msgstr "Notificări popup la deconectarea unui contact"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show avatars"
-msgstr "Arată avataruri"
+msgstr "Arată avatare"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show contact list in rooms"
msgstr "Arată lista contactelor în camerele de discuții"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show hint about closing the main window"
msgstr "Arată un indiciu despre închiderea ferestrei principale"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show offline contacts"
msgstr "Arată contactele deconectate"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show protocols"
msgstr "Arată protocoalele"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Spell checking languages"
msgstr "Limbi corectare ortografică"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The default folder to save file transfers in."
msgstr "Dosarul implicit în care se salvează fișierele transferate."
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The last directory that an avatar image was chosen from."
msgstr "Ultimul dosar de unde a fost aleasă o imagine pentru avatar."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The position for the chat window side pane"
+msgstr "Poziția panoului lateral din fereastra de discuții"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+"Poziția memorată (în pixeli) a panoului lateral din fereastra de discuții."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Tema care este folosită pentru a afișa conversația în ferestrele de discuții."
+msgstr ""
+"Tema care este folosită pentru a afișa conversația în ferestrele de discuții."
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use graphical smileys"
-msgstr "Folosește emoticonuri grafice"
+msgstr "Folosește emoticoane grafice"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use notification sounds"
msgstr "Folosește sunete de notificare"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Use theme for chat rooms"
msgstr "Folosește tema pentru camerele de discuții"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Dacă Empathy poate să publice contactelor locația utilizatorului."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Dacă Empathy poate să utilizeze GPS-ul pentru a estima locația."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Dacă Empathy poate să utilizeze rețeaua de telefonie mobilă pentru a estima locația."
+msgstr ""
+"Dacă Empathy poate să utilizeze rețeaua de telefonie mobilă pentru a estima "
+"locația."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the network to guess the location."
msgstr "Dacă Empathy poate să utilizeze rețeaua pentru a estima locația."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "Dacă Empathy a întrebat despre importarea conturilor din alte programe."
+msgstr ""
+"Dacă Empathy a întrebat despre importarea conturilor din alte programe."
-#: ../data/empathy.schemas.in.h:59
-#| msgid ""
-#| "Whether Empathy has asked about importing accounts from other programs."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Dacă Empathy a migrat înregistrările butterfly."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Dacă Empathy ar trebui să autentifice automat conturile dumneavoastră la pornire."
+msgstr ""
+"Dacă Empathy ar trebui să autentifice automat conturile dumneavoastră la "
+"pornire."
-#: ../data/empathy.schemas.in.h:61
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Dacă Empathy ar trebui să reducă acuratețea locației din motive de intimitate."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+"Dacă Empathy ar trebui să schimbe automat starea în „plecat†când "
+"calculatorul este inactiv."
-#: ../data/empathy.schemas.in.h:62
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Dacă Empathy ar trebui să folosească avatarul contactului ca iconiță a ferestrei de discuții."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Dacă Empathy ar trebui să reducă acuratețea locației din motive de "
+"intimitate."
-#: ../data/empathy.schemas.in.h:63
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Dacă ar trebui activate uneltele de dezvoltare Webkit, cum ar fi Inspectorul Web."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Dacă Empathy ar trebui să folosească avatarul contactului ca iconiță a "
+"ferestrei de discuții."
-#: ../data/empathy.schemas.in.h:64
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
-msgstr "Dacă administratorii conexiunilor de rețea ar trebui folosiți pentru deconectare/reconectare automată."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Dacă ar trebui activate uneltele de dezvoltare Webkit, cum ar fi Inspectorul "
+"Web."
-#: ../data/empathy.schemas.in.h:65
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "Dacă să se verifice, în limbile alese, corectitudinea cuvintelor tastate."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Dacă administratorii conexiunilor de rețea ar trebui folosiți pentru "
+"deconectare/reconectare automată."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Dacă să se verifice, în limbile alese, corectitudinea cuvintelor tastate."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Dacă să se convertească în cadrul conversațiilor emoticonurile în imagini."
+msgstr ""
+"Dacă să se afișeze emoticoanele ca imagini (și nu ca text) în conversații."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Dacă la autentificarea unui contact, să se redea notificări sonore."
+msgstr "Dacă se redau notificări sonore la autentificarea unui contact."
-#: ../data/empathy.schemas.in.h:68
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Dacă la deconectarea unui contact, să se redea notificări sonore."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Dacă se redau notificări sonore la deconectarea unui contact."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of events."
-msgstr "Dacă să se redea, notificări sonore pentru evenimente."
+msgstr "Dacă se redau notificări sonore pentru evenimente."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Dacă să se redea, un sunet la primirea mesajelor."
+msgstr "Dacă se redau un sunet la primirea mesajelor."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of new conversations."
-msgstr "Dacă să se redea, un sunet la începerea unei conversații noi."
+msgstr "Dacă se redau un sunet la începerea unei conversații noi."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Dacă să se redea, un sunet la trimiterea mesajelor."
+msgstr "Dacă se redau un sunet la trimiterea mesajelor."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound when logging into a network."
-msgstr "Dacă să se redea, un sunet la conectarea la rețea."
+msgstr "Dacă se redau un sunet la conectarea la rețea."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound when logging out of a network."
msgstr "Dacă să se redea un sunet, la deconectarea de la o rețea."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play sound notifications when away or busy."
msgstr "Dacă să se redea notificări sonore când sunteți plecat sau ocupat."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Dacă să afișeze o notificare popup, atunci când un contact se deconectează."
+msgstr ""
+"Dacă să afișeze o notificare popup, atunci când un contact se deconectează."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Dacă să afișeze o notificare popup, atunci când un contact se conectează."
+msgstr ""
+"Dacă să afișeze o notificare popup, atunci când un contact se conectează."
-#: ../data/empathy.schemas.in.h:78
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Dacă să fie afișate notificări popup la primirea de mesaje noi, chiar dacă conversația este deja deschisă, dar nu este focalizată."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Dacă să fie afișate notificări popup la primirea de mesaje noi, chiar dacă "
+"conversația este deja deschisă, dar nu este focalizată."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Dacă să fie afișate notificări popup la primirea de mesaje noi."
-#: ../data/empathy.schemas.in.h:80
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Dacă să se afișeze avataruri pentru contacte în lista de contacte și ferestrele de discuții."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Dacă să se afișeze avatare pentru contacte în lista de contacte și "
+"ferestrele de discuții."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Dacă să se arate contactele deconectate în lista de contacte."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show popup notifications when away or busy."
msgstr "Dacă să fie afișate notificări popup când sunteți plecat sau ocupat."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Dacă să se afișeze în lista de contacte și ferestrele de discuții avataruri pentru contacte."
+msgstr ""
+"Dacă să se afișeze în lista de contacte și ferestrele de discuții avatare "
+"pentru contacte."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show the contact list in chat rooms."
msgstr "Dacă să afișeze lista de contacte în camerele de discuții."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show the contact list in compact mode."
msgstr "Dacă să se arate lista de contacte compactă."
-#: ../data/empathy.schemas.in.h:86
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Dacă să se arate un dialog de confirmare la închiderea ferestrei principale de la butonul „x†din bara de titlu."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Dacă să se arate un dialog de confirmare la închiderea ferestrei principale "
+"de la butonul „x†din bara de titlu."
-#: ../data/empathy.schemas.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to use the theme for chat rooms."
msgstr "Dacă să se folosească tema pentru camerele de discuții."
-#: ../data/empathy.schemas.in.h:88
-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 the contact list by state."
-msgstr "Ce criteriu să fie folosit la sortarea listei de contacte. Implicit vor fi sortate după nume, cu valoarea „nameâ€. O valoare „state†va sorta lista de contacte după starea lor."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+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 "
+"the contact list by state."
+msgstr ""
+"Ce criteriu să fie folosit la sortarea listei de contacte. Implicit vor fi "
+"sortate după nume, cu valoarea „nameâ€. O valoare „state†va sorta lista de "
+"contacte după starea lor."
#: ../data/empathy-accounts.desktop.in.in.h:1
msgid "Manage Messaging and VoIP accounts"
@@ -393,152 +478,209 @@ msgstr "Administrare conturi de mesagerie și 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/cc-empathy-accounts-panel.c:91
+#: ../src/empathy-accounts-dialog.c:2157
msgid "Messaging and VoIP Accounts"
msgstr "Conturi de mesagerie și VoIP"
-#: ../libempathy/empathy-ft-handler.c:842
+#: ../libempathy/empathy-ft-handler.c:851
msgid "The hash of the received file and the sent one do not match"
-msgstr "Valoarea de dispersie a fișierului primit nu coincide cu cea a fișierului trimis"
+msgstr ""
+"Valoarea de dispersie a fișierului primit nu coincide cu cea a fișierului "
+"trimis"
-#: ../libempathy/empathy-ft-handler.c:1102
+#: ../libempathy/empathy-ft-handler.c:1111
msgid "File transfer not supported by remote contact"
msgstr "Transferul de fișiere nu este suportat de contactul cu care discutați"
-#: ../libempathy/empathy-ft-handler.c:1160
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is not a regular file"
msgstr "Fișierul ales nu este unul obișnuit"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is empty"
msgstr "Fișierul selectat este gol"
-#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:77
-msgid "People nearby"
-msgstr "Persoane din apropiere"
-
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:283
msgid "Socket type not supported"
msgstr "Tipul socketului nu este suportat"
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:402
msgid "No reason was specified"
msgstr "Nu a fost specificat vreun motiv"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:405
msgid "The change in state was requested"
msgstr "S-a cerut schimbarea de stare"
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:408
msgid "You canceled the file transfer"
msgstr "Ați anulat transferul de fișiere"
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:411
msgid "The other participant canceled the file transfer"
msgstr "Celălalt participant a anulat transferul de fișiere"
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:414
msgid "Error while trying to transfer the file"
msgstr "Eroare la încercarea de a transfera fișierul"
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:417
msgid "The other participant is unable to transfer the file"
msgstr "Celălalt participant nu poate transfera fișierul"
-#: ../libempathy/empathy-tp-file.c:417
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "Motiv necunoscut"
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Disponibil"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Ocupat"
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Plecat"
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Invizibil"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Deconectat"
-#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
+#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
+#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
+msgid "Unknown"
+msgstr "Necunoscut"
+
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "Nu a fost specificat niciun motiv"
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "Mesajul de stare este trecut ca deconectat."
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Eroare de rețea"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "Autentificare eșuată"
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Eroare de criptare"
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "Nume în uz"
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "Nu s-a furnizat un certificat"
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "Certificatul nu e de încredere"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "Certificat expirat"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "Certificat inactiv"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "Nepotrivire de nume de gazdă în certificat"
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "Nepotrivire de amprentă în certificat"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "Certificat semnat de el însuși"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Eroare de certificat"
-#: ../libempathy/empathy-utils.c:429
-#: ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:356
+msgid "Encryption is not available"
+msgstr "Criptarea nu este disponibilă"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Certificate is invalid"
+msgstr "Certificat nevalid"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been refused"
+msgstr "Conexiunea a fost refuzată"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Connection can't be established"
+msgstr "Conexiunea nu poate fi stabilită"
+
+#: ../libempathy/empathy-utils.c:364
+msgid "Connection has been lost"
+msgstr "Conexiunea a fost pierdută"
+
+#: ../libempathy/empathy-utils.c:366
+msgid "This resource is already connected to the server"
+msgstr "Această resursă este deja conectată la server"
+
+#: ../libempathy/empathy-utils.c:368
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+"Conexiunea a fost înlocuită de o nouă conexiune utilizând aceeași resursă"
+
+#: ../libempathy/empathy-utils.c:371
+msgid "The account already exists on the server"
+msgstr "Acest cont există deja de pe server."
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Server is currently too busy to handle the connection"
+msgstr "Serverul este în prezent prea ocupat să se ocupe de conexiune"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Certificate has been revoked"
+msgstr "Certificatul a fost revocat"
+
+#: ../libempathy/empathy-utils.c:377
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"Certificatul folosește un algoritm de criptare nesigur sau este slab "
+"criptografic"
+
+#: ../libempathy/empathy-utils.c:380
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"Lungimea certificatului serverului sau adâncimea lanțului de certificate al "
+"serverului depășește limitele impuse de biblioteca de criptografie"
+
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Persoane din apropiere"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! Japonia"
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "Discuție Facebook"
@@ -546,7 +688,7 @@ msgstr "Discuție Facebook"
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
-msgstr[0] "acum %d secundă"
+msgstr[0] "acum o secundă"
msgstr[1] "acum %d secunde"
msgstr[2] "acum %d de secunde"
@@ -554,7 +696,7 @@ msgstr[2] "acum %d de secunde"
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
-msgstr[0] "acum %d minut"
+msgstr[0] "acum un minut"
msgstr[1] "acum %d minute"
msgstr[2] "acum %d de minute"
@@ -562,7 +704,7 @@ msgstr[2] "acum %d de minute"
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
-msgstr[0] "acum %d oră"
+msgstr[0] "acum o oră"
msgstr[1] "acum %d ore"
msgstr[2] "acum %d de ore"
@@ -570,7 +712,7 @@ msgstr[2] "acum %d de ore"
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
-msgstr[0] "acum %d zi"
+msgstr[0] "acum o zi"
msgstr[1] "acum %d zile"
msgstr[2] "acum %d de zile"
@@ -578,7 +720,7 @@ msgstr[2] "acum %d de zile"
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
-msgstr[0] "acum %d săptămână"
+msgstr[0] "acum o săptămână"
msgstr[1] "acum %d săptămâni"
msgstr[2] "acum %d de săptămâni"
@@ -586,7 +728,7 @@ msgstr[2] "acum %d de săptămâni"
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
-msgstr[0] "acum %d lună"
+msgstr[0] "acum o lună"
msgstr[1] "acum %d luni"
msgstr[2] "acum %d de luni"
@@ -594,62 +736,92 @@ msgstr[2] "acum %d de luni"
msgid "in the future"
msgstr "în viitor"
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:463
msgid "All"
msgstr "Toate"
-#: ../libempathy-gtk/empathy-account-widget.c:538
-#: ../libempathy-gtk/empathy-account-widget.c:594
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "Cont"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+msgid "Password"
+msgstr "Parolă"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "Server"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "Port"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1126
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "Utilizator:"
-#: ../libempathy-gtk/empathy-account-widget.c:1474
+#: ../libempathy-gtk/empathy-account-widget.c:1521
+msgid "A_pply"
+msgstr "A_plică"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "Autent_ificare"
-#: ../libempathy-gtk/empathy-account-widget.c:1542
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "Cont:"
-#: ../libempathy-gtk/empathy-account-widget.c:1553
-msgid "Enabled"
-msgstr "Activat"
+#: ../libempathy-gtk/empathy-account-widget.c:1628
+msgid "_Enabled"
+msgstr "_Activat"
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Acest cont există deja de pe server."
-#: ../libempathy-gtk/empathy-account-widget.c:1621
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Crează un cont nou pe server"
+#: ../libempathy-gtk/empathy-account-widget.c:1789
+msgid "Ca_ncel"
+msgstr "Re_nunță"
+
#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
#. * 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:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s pe %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:2103
#, c-format
msgid "%s Account"
msgstr "Cont %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2043
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Cont nou"
@@ -671,11 +843,11 @@ msgstr "Avansat"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "_Parolă:"
@@ -694,18 +866,18 @@ msgstr "Care este numele de utilizator AIM?"
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Port:"
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Server:"
@@ -716,7 +888,7 @@ msgid "<b>Example:</b> username"
msgstr "<b>Exemplu:</b> numeutilizator"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "I_D autentificare:"
@@ -734,56 +906,52 @@ msgid "<b>Example:</b> 123456789"
msgstr "<b>Exemplu:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "Set c_aractere:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
msgstr "ICQ _UIN:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
msgid "What is your ICQ UIN?"
msgstr "Care este UIN-ul de ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
msgid "What is your ICQ password?"
msgstr "Care este parola ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "Set _caractere:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
-msgid "New Network"
-msgstr "Rețea nouă"
-
-#: ../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 "Opțiuni"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
msgid "None"
msgstr "Niciunul"
@@ -819,6 +987,14 @@ msgstr "Nume real:"
msgid "Servers"
msgstr "Servere"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "Care este pseudonimul IRC?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "Care rețea IRC?"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "<b>Example:</b> user@gmail.com"
msgstr "<b>Exemplu:</b> utilizator@gmail.com"
@@ -827,72 +1003,75 @@ msgstr "<b>Exemplu:</b> utilizator@gmail.com"
msgid "<b>Example:</b> user@jabber.org"
msgstr "<b>Exemplu:</b> utilizator@jabber.org"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Cr_iptare necesară (TLS/SSL)"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "Override server settings"
-msgstr "Suprascrie configurările serverului"
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnoră erorile certificatelor SSL"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
-msgstr "Pri_oritate:"
+msgid "Override server settings"
+msgstr "Impune aceste configurări serverului"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
+msgstr "Priori_tate:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "Reso_urce:"
msgstr "Res_ursă:"
-#: ../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:12
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a Facebook username if you don't have one."
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
msgstr ""
"Acesta este numele de utilizator, nu contul de autentificare Facebook.\n"
"Dacă dețineți pagina facebook.com/<b>badger</b>, introduceți <b>badger</b>.\n"
-"Dacă nu aveți un nume de utilizator Facebook, utilizați <a href=\"http://www.facebook.com/username/\">această pagină</a> pentru a alege unul."
+"Dacă nu aveți un nume de utilizator Facebook, utilizați <a href=\"http://www."
+"facebook.com/username/\">această pagină</a> pentru a alege unul."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "Use old SS_L"
msgstr "Folosește SS_L vechi"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Facebook password?"
msgstr "Care este parola Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook username?"
msgstr "Care este numele de utilizator Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Google ID?"
msgstr "Care este ID-ul Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google password?"
msgstr "Care este parola Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Jabber ID?"
msgstr "Care este ID-ul Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber password?"
msgstr "Care este parola Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your desired Jabber ID?"
msgstr "Care este ID-ul Jabber dorit?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber password?"
msgstr "Care este parola Jabber dorită?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
-msgid "_Encryption required (TLS/SSL)"
-msgstr "Criptar_e necesară (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Ignore SSL certificate errors"
-msgstr "_Ignoră erorile certificatelor SSL"
-
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Exemplu:</b> utilizator@hotmail.com"
@@ -906,25 +1085,25 @@ msgid "What is your Windows Live password?"
msgstr "Care este parola Windows Live?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr "Adresă _email:"
+msgid "E-_mail address:"
+msgstr "Adresă e_mail:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "Pseu_donim:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_First Name:"
msgstr "_Prenume:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID:"
msgstr "ID _Jabber:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Last Name:"
msgstr "Nume de fami_lie:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "Pseudo_nim:"
-
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "Nume _publicat:"
@@ -946,276 +1125,252 @@ msgid "Discover the STUN server automatically"
msgstr "Descoperă serverul STUN automat"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Hostname of the proxy for outbound requests."
-msgstr "Numele proxy-ului pentru conexiuni către exterior."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "Interval (secunde)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Keep-Alive Options"
msgstr "Opțiuni Keep-Alive (menținere în viață a conexiunii)"
-#: ../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 "Citește înregistrarea DNS SRV din domeniul serviciului pentru numele serverului STUN."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Loose Routing"
msgstr "Rutare relaxată"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Mechanism:"
msgstr "Mecanism:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Miscellaneous Options"
msgstr "Opțiuni diverse"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "NAT Traversal Options"
msgstr "Opțiuni de traversare a NAT-ului"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Port of the proxy for outbound requests."
-msgstr "Portul proxy-ului pentru conexiuni către exterior."
-
-#: ../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 "Opțiuni proxy"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "STUN Server:"
msgstr "Server STUN:"
-#: ../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 ""
-"Numele de utilizator pentru autentificare SIP, dacă este diferit\n"
-"de URI-ul numele utilizator SIP."
-
-#: ../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 "Actualizează asocierea înregistrării dacă se descoperă că adresa externă a clientului este diferită de asocierea locală."
-
-#: ../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 "Folosește rutarea relaxată și antetul Route așa cum este recomandat în RFC 3261."
-
-#: ../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 "Care este parola contului SIP?"
-#: ../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 "Care este ID-ul de autentificare SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "_Username:"
msgstr "_Utilizator:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo! Japan"
-msgstr "Folosește _Yahoo! Japonia"
+msgid "I_gnore conference and chat room invitations"
+msgstr "I_gnoră invitații la camere de discuții și conferințe"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! ID?"
msgstr "Care este ID-ul Yahoo! ?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Care este parola Yahoo! ?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "I_D Yahoo!:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "_Ignoră invitații la conferințe și camere de discuții"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
-msgstr "Limbă listă came_re:"
+msgstr "Configurări regionale listă came_re:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
msgid "Couldn't convert image"
msgstr "Nu s-a putut converti imaginea"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
msgid "None of the accepted image formats are supported on your system"
-msgstr "Sistemul dumneavoastră nu suportă niciunul din formatele de imagine acceptate"
+msgstr ""
+"Sistemul dumneavoastră nu suportă niciunul din formatele de imagine acceptate"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:915
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
msgid "Select Your Avatar Image"
msgstr "Alegeți avatarul"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:918
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "No Image"
msgstr "Nicio imagine"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:980
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
msgid "Images"
msgstr "Imagini"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:984
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
msgid "All Files"
msgstr "Toate fișierele"
-#: ../libempathy-gtk/empathy-avatar-image.c:327
+#: ../libempathy-gtk/empathy-avatar-image.c:323
msgid "Click to enlarge"
msgstr "Clic pentru mărire"
-#: ../libempathy-gtk/empathy-chat.c:233
-msgid "Failed to reconnect this chat"
-msgstr "Reconectarea la această conversație a eșuat"
-
-#: ../libempathy-gtk/empathy-chat.c:655
-msgid "Failed to join chat room"
-msgstr "Intrarea în camera de discuții a eșuat"
-
-#: ../libempathy-gtk/empathy-chat.c:673
+#: ../libempathy-gtk/empathy-chat.c:642
msgid "Failed to open private chat"
msgstr "Nu s-a putut deschide conversația privată"
-#: ../libempathy-gtk/empathy-chat.c:712
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
-msgstr "Subiectul nu este suportat în această conversație"
+msgstr "Această conversație nu are un subiect definit"
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
msgstr "Nu aveți dreptul să modificați subiectul"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: curăță toate mesajele din conversația curentă"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>: modifică subiectul conversației curente"
-#: ../libempathy-gtk/empathy-chat.c:853
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
-msgstr "/join <identificator cameră>: intră într-o nouă cameră de discuții"
+msgstr "/join <identificator cameră>: alăturare la o nouă cameră de discuții"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
-msgstr "/j <identificator cameră>: intră într-o nouă cameră de discuții"
+msgstr "/j <identificator cameră>: alăturare la o nouă cameră de discuții"
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <id contact> [<message>]: deschide o conversație privată"
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <id contact> <message>: deschide o conversație privată"
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <pseudonim>: modifică pseudonimul pe serverul curent"
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <mesaj>: trimite un mesaj de tip ACTION conversației curente"
-#: ../libempathy-gtk/empathy-chat.c:871
-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 "/say <mesaj>: trimite <mesaj> conversaÈ›iei curente. Această comandă vă permite să trimiteÈ›i un mesaj ce începe cu „/â€. De exemplu: \"/say /join este folosit pentru a intra într-o cameră de discuÈ›ii nouă\""
+#: ../libempathy-gtk/empathy-chat.c:849
+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 ""
+"/say <mesaj>: trimite <mesaj> conversației curente. Această comandă vă "
+"permite să trimiteÈ›i un mesaj ce începe cu „/â€. De exemplu: „/say /join este "
+"folosit pentru alăturarea la o nouă cameră de discuÈ›iiâ€"
-#: ../libempathy-gtk/empathy-chat.c:876
-msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
-msgstr "/help [<comanda>]: afișează toate comenzile suportate. Dacă <comanda> este definită, se va afișa un ghid de utilizare pentru aceasta."
+#: ../libempathy-gtk/empathy-chat.c:854
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<comanda>]: afișează toate comenzile suportate. Dacă <comanda> este "
+"definită, se va afișa un ghid de utilizare pentru aceasta."
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:864
#, c-format
msgid "Usage: %s"
msgstr "Utlizare: %s"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "Comandă necunoscută"
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
-msgstr "Comandă necunoscută: utilizați /help pentru a vedea comenzile disponibile"
+msgstr ""
+"Comandă necunoscută: utilizați /help pentru a vedea comenzile disponibile"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "deconectat"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "contact nevalid"
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "permisiune respinsă"
-#: ../libempathy-gtk/empathy-chat.c:1183
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "mesaj prea lung"
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "neimplementat"
-#: ../libempathy-gtk/empathy-chat.c:1189
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "necunoscut"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1172
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Eroare la trimiterea mesajului „%sâ€: %s"
-#: ../libempathy-gtk/empathy-chat.c:1228
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+msgid "Topic:"
+msgstr "Subiect:"
+
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "Subiect definit la: %s"
-#: ../libempathy-gtk/empathy-chat.c:1230
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "Niciun subiect definit"
-#: ../libempathy-gtk/empathy-chat.c:1629
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(Nicio sugestie)"
-#: ../libempathy-gtk/empathy-chat.c:1683
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "Inserează un emoticon"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1701
-#: ../libempathy-gtk/empathy-ui-utils.c:1675
+#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "_Send"
msgstr "_Trimite"
-#: ../libempathy-gtk/empathy-chat.c:1735
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "_Sugestii corectare ortografică"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
msgstr "Nu s-a putut obține înregistrările recente"
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "%s s-a deconectat"
@@ -1223,12 +1378,12 @@ msgstr "%s s-a deconectat"
#. 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:2071
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s a fost dat afară de %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1970
+#: ../libempathy-gtk/empathy-chat.c:2074
#, c-format
msgid "%s was kicked"
msgstr "%s a fost dat afară"
@@ -1236,103 +1391,99 @@ msgstr "%s a fost dat afară"
#. 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:2082
#, c-format
msgid "%1$s was banned by %2$s"
-msgstr "%1$s a fost blocat definitiv de %2$s"
+msgstr "%2$s a blocat accesul lui de %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1981
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
msgstr "%s a fost blocat"
-#: ../libempathy-gtk/empathy-chat.c:1985
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
-msgstr "%s a ieșit din cameră"
+msgstr "%s a părăsit camera de discuții"
#. Note to translators: this string is appended to
#. * notifications like "foo has left the room", with the message
#. * 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:2098
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2019
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
-msgstr "%s a intrat în cameră"
+msgstr "%s s-a alăturat camerei de discuții"
-#: ../libempathy-gtk/empathy-chat.c:2044
+#: ../libempathy-gtk/empathy-chat.c:2148
#, c-format
msgid "%s is now known as %s"
msgstr "%s este acum cunoscut ca %s"
-#: ../libempathy-gtk/empathy-chat.c:2179
-#: ../src/empathy-call-window.c:1532
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
msgid "Disconnected"
msgstr "Deconectat"
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "Parolă incorectă; încercați din nou:"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "Încearcă din nou"
-#: ../libempathy-gtk/empathy-chat.c:2707
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "Această cameră este protejată de o parolă:"
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
-msgstr "Intră"
+msgstr "Alăturare"
-#: ../libempathy-gtk/empathy-chat.c:2848
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "Conectat"
-#: ../libempathy-gtk/empathy-chat.c:2901
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "Conversație"
-#: ../libempathy-gtk/empathy-chat.ui.h:1
-#: ../src/empathy-chat-window.c:672
-msgid "Topic:"
-msgstr "Subiect:"
-
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:318
-#: ../libempathy-gtk/empathy-theme-adium.c:786
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:791
msgid "_Copy Link Address"
msgstr "_Copiază adresa legăturii"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:325
-#: ../libempathy-gtk/empathy-theme-adium.c:793
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:798
msgid "_Open Link"
msgstr "_Deschide legătura"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:423
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
msgid "%A %B %d %Y"
msgstr "%A, %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:243
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
msgid "Edit Contact Information"
msgstr "Modifică informațiile contactului"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:301
+#: ../libempathy-gtk/empathy-contact-dialogs.c:295
msgid "Personal Information"
msgstr "Informații personale"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:406
+#: ../libempathy-gtk/empathy-contact-dialogs.c:401
+#: ../libempathy-gtk/empathy-individual-dialogs.c:112
msgid "New Contact"
msgstr "Contact nou"
@@ -1344,215 +1495,290 @@ msgstr "_Decide mai târziu"
msgid "Subscription Request"
msgstr "Cerere de abonare"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1633
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Negrupate"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Persoane favorite"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
msgid "Do you really want to remove the group '%s'?"
-msgstr "Sigur doriți să ștergeți grupul „%s�"
+msgstr "Sigur doriți să eliminați grupul „%s�"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1635
+# LG: aici e titlul unui dialog, deși nu pare :)
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2235
msgid "Removing group"
-msgstr "Ștergere grup"
+msgstr "Eliminare grup"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1684
-#: ../libempathy-gtk/empathy-contact-list-view.c:1761
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-contact-list-view.c:2055
+#: ../libempathy-gtk/empathy-contact-list-view.c:2132
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
-msgstr "Ște_rge"
+msgstr "_Elimină"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1714
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2320
#, c-format
msgid "Do you really want to remove the contact '%s'?"
-msgstr "Sigur doriți să ștergeți contactul „%s�"
+msgstr "Sigur doriți să eliminați contactul „%s�"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1716
+# LG: aici e vorba de titlul unui dialog
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
-msgstr "Ștergere contact"
+msgstr "Eliminare contact"
-#: ../libempathy-gtk/empathy-contact-menu.c:206
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "_Adaugă contact…"
-#: ../libempathy-gtk/empathy-contact-menu.c:233
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "Dis_cuție"
-#: ../libempathy-gtk/empathy-contact-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-individual-menu.c:557
msgctxt "menu item"
msgid "_Audio Call"
msgstr "Apel _audio"
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-individual-menu.c:599
msgctxt "menu item"
msgid "_Video Call"
msgstr "Apel _video"
-#: ../libempathy-gtk/empathy-contact-menu.c:347
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "Conversații an_terioare"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Send file"
-msgstr "Trimite fișier"
+#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:683
+msgid "Send File"
+msgstr "Trimite un fișier"
-#: ../libempathy-gtk/empathy-contact-menu.c:392
-msgid "Share my desktop"
-msgstr "Partajează desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:375
+#: ../libempathy-gtk/empathy-individual-menu.c:725
+msgid "Share My Desktop"
+msgstr "Partajează desktopul"
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-contact-widget.c:1379
-#| msgid "Join _Favorites"
+#: ../libempathy-gtk/empathy-contact-menu.c:415
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
msgstr "Favorite"
-#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-contact-menu.c:444
+#: ../libempathy-gtk/empathy-individual-menu.c:786
msgid "Infor_mation"
msgstr "Infor_mații"
-#: ../libempathy-gtk/empathy-contact-menu.c:508
+#: ../libempathy-gtk/empathy-contact-menu.c:490
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Editare"
-#: ../libempathy-gtk/empathy-contact-menu.c:562
-#: ../src/empathy-chat-window.c:857
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+#: ../libempathy-gtk/empathy-individual-menu.c:970
+#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "Sunteți invitat în această cameră"
-#: ../libempathy-gtk/empathy-contact-menu.c:593
-msgid "_Invite to chat room"
-msgstr "_Invită într-o cameră"
+#: ../libempathy-gtk/empathy-contact-menu.c:575
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+msgid "_Invite to Chat Room"
+msgstr "_Invită într-o cameră de discuții"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "Alege un contact"
-#: ../libempathy-gtk/empathy-contact-widget.c:238
-msgid "Select"
-msgstr "Selectează"
+#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-individual-widget.c:148
+msgid "Full name:"
+msgstr "Nume întreg:"
-#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1050
-msgid "Group"
-msgstr "Grup"
+#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-individual-widget.c:149
+msgid "Phone number:"
+msgstr "Numărul de telefon:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-individual-widget.c:150
+msgid "E-mail address:"
+msgstr "Adresă email:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-individual-widget.c:151
+msgid "Website:"
+msgstr "Pagină web:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-individual-widget.c:152
+msgid "Birthday:"
+msgstr "Zi de naștere:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:578
+#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
-msgstr "Cod ISO țără:"
+msgstr "Codul ISO al țării:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:580
+#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Țară:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Stat:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "OraÈ™:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Zonă:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:588
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Cod poștal:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:590
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Stradă:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:592
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Clădire:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:594
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Etaj:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:596
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
-msgstr "Cameră discuții:"
+msgstr "Cameră de discuții:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:598
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Descriere:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:602
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Nivel acuratețe:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Eroare:"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Eroare verticală (metri):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Eroare orizontală (metri):"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Viteză:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Orientare:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Viteză de urcare:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Actualizat ultima dată pe:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Longitudine:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Latitudine:"
-#: ../libempathy-gtk/empathy-contact-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Altitudine:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Locație"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-msgid "<b>Location</b>, "
-msgstr "<b>Locație</b>, "
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:601
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B %Y la ora %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Salvează avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Nu se poate salva avatarul"
@@ -1560,106 +1786,210 @@ msgstr "Nu se poate salva avatarul"
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Locație</b> la (data)\t"
+#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
msgstr "Alias:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "Zi de naștere:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client Information"
msgstr "Informații client"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client:"
msgstr "Client:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
msgid "Contact Details"
msgstr "Detalii contact"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "E-mail address:"
-msgstr "Adresă email:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Full name:"
-msgstr "Nume întreg:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Groups"
-msgstr "Grupuri"
-
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
msgid "Identifier:"
msgstr "Identificator:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
-#| msgid "Information requested&#x2026;"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
msgstr "Informații cerute..."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "OS:"
msgstr "SO:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
-msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups."
-msgstr "Selectați grupurile în care doriți să apară acest contact. Rețineți că puteți selecta mai mult de un grup sau niciun grup."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
msgid "Version:"
msgstr "Versiune:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Website:"
-msgstr "Pagină web:"
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "Grupuri"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:344
+msgid ""
+"Select the groups you want this contact to appear in. Note that you can "
+"select more than one group or no groups."
+msgstr ""
+"Selectați grupurile în care doriți să apară acest contact. Rețineți că "
+"puteți selecta mai mult de un grup sau niciun grup."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-groups-widget.c:363
msgid "_Add Group"
msgstr "_Adaugă grup"
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+msgid "Select"
+msgstr "Selectează"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-main-window.c:1247
+msgid "Group"
+msgstr "Grup"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+msgid "Linked Contacts"
+msgstr "Contacte îmbinate"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+msgid "Select contacts to link"
+msgstr "Selectați contacte de îmbinat"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:428
+msgid "New contact preview"
+msgstr "Previzualizare contact nou"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr ""
+"Contactele selectate în lista din partea stângă vor fi grupate împreună."
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:837
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "_Editare"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:863
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr "Îm_bină contactele…"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] "Meta-contact conținând un contact"
+msgstr[1] "Meta-contact conținând %u contacte"
+msgstr[2] "Meta-contact conținând %u de contacte"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>Locație</b> la (data)\t"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "Rețea nouă"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+msgid "Choose an IRC network"
+msgstr "Alegeți o rețea IRC"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "server nou"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "Server"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "Port"
-
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:700
-#: ../src/empathy-import-widget.c:310
-msgid "Account"
-msgstr "Cont"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:116
+msgid "Link Contacts"
+msgstr "ÃŽmbinare contacte"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "_Dezbină…"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr "Împarte meta-contactul afișat în contactele pe care le conține"
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:137
+msgid "_Link"
+msgstr "Îm_bină"
-#: ../libempathy-gtk/empathy-log-window.c:717
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr "Dezbinați meta-contactul „%s�"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr ""
+"Sunteți sigur că doriți să dezbinați acest meta-contact? Acest lucru va "
+"împărți meta-contactul în contactele pe care le conține."
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:191
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "_Dezbină"
+
+#: ../libempathy-gtk/empathy-log-window.c:663
msgid "Date"
msgstr "Dată"
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
msgid "Conversations"
msgstr "Conversații"
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "Caută următorul"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "Caută precedentul"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
msgid "Previous Conversations"
msgstr "Conversații anterioare"
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
msgid "Search"
msgstr "Caută"
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "_For:"
msgstr "_După:"
@@ -1668,28 +1998,27 @@ msgid "Contact ID:"
msgstr "ID contact:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:144
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
msgid "C_hat"
msgstr "_Discută"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:154
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
msgid "New Conversation"
msgstr "Conversație nouă"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
msgid "Send _Video"
msgstr "Trimite _video"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:196
-#: ../src/empathy-call-window.ui.h:17
-msgid "_Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
msgstr "_Apelează"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
msgid "New Call"
msgstr "Apel nou"
@@ -1707,11 +2036,11 @@ msgstr "Mesaj personalizat…"
#: ../libempathy-gtk/empathy-presence-chooser.c:221
#: ../libempathy-gtk/empathy-presence-chooser.c:223
msgid "Edit Custom Messages…"
-msgstr "Modificare mesajele personalizate…"
+msgstr "Modifică mesajele personalizate…"
#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
-msgstr "Apăsați pentru a șterge acest mesaj de stare din lista de favorite"
+msgstr "Apăsați pentru a elimina acest mesaj de stare din lista de favorite"
#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
@@ -1726,59 +2055,59 @@ msgid "Set your presence and current status"
msgstr "Definiți preferințele și mesajul de stare curent"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
msgid "Custom messages…"
msgstr "Mesaje personalizate…"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Caută:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Majuscule semnificative"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Fraza n-a fost găsită"
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound.c:50
msgid "Received an instant message"
msgstr "Ați primit un mesaj instant"
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
msgid "Sent an instant message"
-msgstr "S-a trimis un mesaj instant"
+msgstr "Ați trimis un mesaj instant"
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
msgid "Incoming chat request"
msgstr "Cerere de începere a unei discuții"
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
msgid "Contact connected"
msgstr "Contact conectat"
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
msgid "Contact disconnected"
msgstr "Contact deconectat"
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
msgid "Connected to server"
msgstr "Conectat la server"
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
msgid "Disconnected from server"
msgstr "Deconectat de la server"
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
msgid "Incoming voice call"
msgstr "Ați primit un apel vocal"
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
msgid "Outgoing voice call"
msgstr "Ați lansat un apel vocal"
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
msgid "Voice call ended"
msgstr "Apel vocal terminat"
@@ -1814,21 +2143,95 @@ msgstr "Curat"
msgid "Blue"
msgstr "Albastru"
-#: ../libempathy-gtk/empathy-ui-utils.c:1550
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr ""
+"Identitatea furnizată de către serverul de chat nu pot fi verificată.\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certificate is not signed by a Certification Authority"
+msgstr "Certificatul nu este semnat de o Autoritate de Certificare"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "Certificatul a expirat"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "Certificatul nu a fost încă activat"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "Certificatul nu are amprenta așteptată"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr ""
+"Numele de gazdă verificat de certificat nu se potrivește cu numele serverului"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "Certificatul este auto-semnat"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr ""
+"Certificatul a fost revocat de către Autoritatea de Certificare emitentă"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr "Certificatul este slab din punct de vedere criptografic"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "Lungimea certificatului depășește limitele verificabile"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "Certificatul este incorect format"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "Nume de gazdă așteptat: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "Nume gazdă certificat: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "Continuă"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "Această conexiune nu este de încredere. Doriți să continuați oricum?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "Ține minte această alegere pentru viitoarele conexiuni"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "Detalii certificat"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1698
msgid "Unable to open URI"
msgstr "Nu se poate deschide URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1667
+#: ../libempathy-gtk/empathy-ui-utils.c:1793
msgid "Select a file"
msgstr "Alegeți un fișier"
-#: ../libempathy-gtk/empathy-ui-utils.c:1731
-msgid "Select a destination"
-msgstr "Alegeți o destinație"
+#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#, c-format
+msgid "Incoming file from %s"
+msgstr "Se primește un fișier de la %s"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
-msgstr "Limbă curentă"
+msgstr "Configurări regionale curente"
#: ../libempathy-gtk/totem-subtitle-encoding.c:161
#: ../libempathy-gtk/totem-subtitle-encoding.c:163
@@ -1849,7 +2252,7 @@ msgstr "Baltică"
#: ../libempathy-gtk/totem-subtitle-encoding.c:180
msgid "Celtic"
-msgstr "Celtică"
+msgstr "Celtă"
#: ../libempathy-gtk/totem-subtitle-encoding.c:183
#: ../libempathy-gtk/totem-subtitle-encoding.c:185
@@ -2009,29 +2412,51 @@ msgstr "Niciun mesaj de eroare"
msgid "Instant Message (Empathy)"
msgstr "Mesaj instant (Empathy)"
-#: ../src/empathy.c:596
+#: ../src/empathy.c:414
msgid "Don't connect on startup"
msgstr "Nu conecta la pornire"
-#: ../src/empathy.c:600
+#: ../src/empathy.c:418
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Nu arăta lista de contacte sau orice alt dialog la pornire"
-#: ../src/empathy.c:612
+#: ../src/empathy.c:435
msgid "- Empathy IM Client"
msgstr "- Mesagerie instant Empathy"
#: ../src/empathy-about-dialog.c:85
-msgid "Empathy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
-msgstr "Empathy este software liber; îl puteți redistribui și/sau modifica respectând termenii licenței GNU General Public License precum este publicată de fundația Free Software Foundation; fie versiunea 2 a licenței sau, dacă doriți, o versiune ulterioară."
+msgid ""
+"Empathy is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
+msgstr ""
+"Empathy este software liber; îl puteți redistribui și/sau modifica "
+"respectând termenii licenței GNU General Public License precum este "
+"publicată de fundația Free Software Foundation; fie versiunea a 2-a a "
+"licenței sau, dacă doriți, o versiune ulterioară."
#: ../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."
-msgstr "Empathy este distribuit cu speranța că va fi de folos, dar FĂRĂ NICIO GARANȚIE; chiar fără garanția impusă de VANDABILITATE sau CONFORMITATE PENTRU UN ANUMIT SCOP. Vedeți textul licenței GNU General Public License pentru mai multe detalii."
+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."
+msgstr ""
+"Empathy este distribuit cu speranța că va fi de folos, dar FĂRĂ NICIO "
+"GARANȚIE; chiar fără garanția impusă de VANDABILITATE sau CONFORMITATE "
+"PENTRU UN ANUMIT SCOP. Vedeți textul licenței GNU General Public License "
+"pentru mai multe detalii."
#: ../src/empathy-about-dialog.c:93
-msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr "Ar trebui să fi primit o copie a licenței GNU General Public License împreună cu Empathy; dacă nu, scrieți fundației Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr ""
+"Ar trebui să fi primit o copie a licenței GNU General Public License "
+"împreună cu Empathy; dacă nu, scrieți fundației Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
@@ -2044,6 +2469,7 @@ msgstr ""
"Mișu Moldovan\n"
"Adi Roiban\n"
"Lucian Adrian Grijincu\n"
+"Daniel Șerbănescu\n"
"\n"
"Launchpad Contributions:\n"
" Adi Roiban https://launchpad.net/~adiroiban\n"
@@ -2074,11 +2500,16 @@ msgid "The error message was: %s"
msgstr "Mesajul de eroare a fost: %s"
#: ../src/empathy-account-assistant.c:183
-msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
-msgstr "Puteți să vă întoarceți și să încercați să introduceți din nou detaliile contului sau să închideți asistentul și să adăugați mai târziu detaliile contului din meniul Editare."
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"Puteți să vă întoarceți și să încercați să introduceți din nou detaliile "
+"contului sau să închideți asistentul și să adăugați mai târziu detaliile "
+"contului din meniul Editare."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1303
+#: ../src/empathy-account-assistant.c:1316
msgid "An error occurred"
msgstr "S-a produs o eroare"
@@ -2087,153 +2518,176 @@ msgstr "S-a produs o eroare"
#. 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:614
#, c-format
msgid "New %s account"
msgstr "Cont %s nou"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:515
msgid "What kind of chat account do you have?"
msgstr "Ce fel de cont aveți?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:521
msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Aveți alte conturi pe care doriți să le configurați?"
+msgstr "Aveți și alte conturi pe care doriți să le configurați?"
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:527
msgid "Enter your account details"
msgstr "Introduceți detaliile contului"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:532
msgid "What kind of chat account do you want to create?"
msgstr "Ce fel de cont doriți să creați?"
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:538
msgid "Do you want to create other chat accounts?"
msgstr "Doriți să creați alte conturi?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:545
msgid "Enter the details for the new account"
msgstr "Introduceți detaliile noului cont"
-#: ../src/empathy-account-assistant.c:653
-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 programs. With a microphone or a webcam you can also have audio or video calls."
-msgstr "Cu Empathy puteți discuta cu persoane din vecinătate și cu prieteni sau colegi care folosesc Google Talk, AIM, Windows Line și multe alte astfel de programe. Cu un microfon sau o cameră web puteți efectua și apeluri audio sau video."
+#: ../src/empathy-account-assistant.c:660
+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 "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+"Cu Empathy puteți discuta cu persoane din vecinătate și cu prieteni sau "
+"colegi care folosesc Google Talk, AIM, Windows Live și multe alte astfel de "
+"programe. Cu un microfon sau o cameră web puteți efectua și apeluri audio "
+"sau video."
-#: ../src/empathy-account-assistant.c:670
+#: ../src/empathy-account-assistant.c:677
msgid "Do you have an account you've been using with another chat program?"
-msgstr "Aveți un cont pe care l-ați folosit din alt program de mesagerie instant?"
+msgstr ""
+"Aveți un cont pe care l-ați folosit în alt program de mesagerie instant?"
-#: ../src/empathy-account-assistant.c:693
+#: ../src/empathy-account-assistant.c:700
msgid "Yes, import my account details from "
msgstr "Da, importă detaliile contului din "
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:721
msgid "Yes, I'll enter my account details now"
msgstr "Da, voi introduce acum detaliile contului"
-#: ../src/empathy-account-assistant.c:736
+#: ../src/empathy-account-assistant.c:743
msgid "No, I want a new account"
msgstr "Nu, doresc un cont nou"
-#: ../src/empathy-account-assistant.c:746
+#: ../src/empathy-account-assistant.c:753
msgid "No, I just want to see people online nearby for now"
msgstr "Nu, pentru moment vreau doar să descopăr persoane din vecinătate"
-#: ../src/empathy-account-assistant.c:767
+#: ../src/empathy-account-assistant.c:774
msgid "Select the accounts you want to import:"
msgstr "Alegeți conturile pe care doriți să le importați:"
-#: ../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:858
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Da"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:865
msgid "No, that's all for now"
msgstr "Nu, atât pentru acum"
-#: ../src/empathy-account-assistant.c:1117
-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 details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
-msgstr "Empathy poate descoperi automat È™i comunica cu persoane conectate la aceeaÈ™i reÈ›ea ca dumneavoastră. Dacă doriÈ›i să utilizaÈ›i această facilitate, verificaÈ›i dacă detaliile de mai jos sunt corecte. PuteÈ›i modifica cu uÈ™urință aceste detalii mai târziu sau puteÈ›i dezactiva această facilitate utilizând dialogul „Conturiâ€"
-
-#: ../src/empathy-account-assistant.c:1123
-#: ../src/empathy-account-assistant.c:1179
+#: ../src/empathy-account-assistant.c:1130
+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 "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+"Empathy poate descoperi automat și comunica cu persoane conectate la aceeași "
+"rețea ca dumneavoastră. Dacă doriți să utilizați această facilitate, "
+"verificați dacă detaliile de mai jos sunt corecte. Puteți modifica cu "
+"ușurință aceste detalii mai târziu sau puteți dezactiva această facilitate "
+"utilizând dialogul „Conturiâ€"
+
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
msgid "Edit->Accounts"
msgstr "Editare->Conturi"
-#: ../src/empathy-account-assistant.c:1139
+#: ../src/empathy-account-assistant.c:1152
msgid "I don't want to enable this feature for now"
msgstr "Nu vreau să activez această facilitate acum"
-#: ../src/empathy-account-assistant.c:1175
-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 install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
-msgstr "Nu veți putea discuta cu persoane conectate la aceeași rețea ca dumneavoastră pentru că telepathy-salut nu este instalat. Dacă doriți să activați această facilitate, instalați pachetul telepathy-salut și creați un contact „Persoane din apropiere†din dialogul Conturi"
+#: ../src/empathy-account-assistant.c:1188
+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 "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+msgstr ""
+"Nu veți putea discuta cu persoane conectate la aceeași rețea ca "
+"dumneavoastră pentru că telepathy-salut nu este instalat. Dacă doriți să "
+"activați această facilitate, instalați pachetul telepathy-salut și creați un "
+"contact „Persoane din apropiere†din dialogul Conturi"
-#: ../src/empathy-account-assistant.c:1181
+#: ../src/empathy-account-assistant.c:1194
msgid "telepathy-salut not installed"
msgstr "telepathy-salut nu este instalat"
-#: ../src/empathy-account-assistant.c:1227
-#| msgid "Messaging and VoIP Accounts"
+#: ../src/empathy-account-assistant.c:1240
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Asistent conturi de mesagerie și VoIP"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1274
msgid "Welcome to Empathy"
msgstr "Bun venit la Empathy"
-#: ../src/empathy-account-assistant.c:1270
+#: ../src/empathy-account-assistant.c:1283
msgid "Import your existing accounts"
msgstr "Importă conturile existente"
-#: ../src/empathy-account-assistant.c:1288
+#: ../src/empathy-account-assistant.c:1301
msgid "Please enter personal details"
msgstr "Introduceți datele personale"
#. 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 "Există modificări nesalvate pentru contul %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 "Contul nou nu a fost încă salvat."
-#: ../src/empathy-accounts-dialog.c:263
-#: ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "Se conectează…"
-#: ../src/empathy-accounts-dialog.c:290
+#: ../src/empathy-accounts-dialog.c:322
#, c-format
-msgid "Disconnected — %s"
+msgid "Offline — %s"
msgstr "Deconectat – %s"
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:334
#, c-format
-msgid "Offline — %s"
+msgid "Disconnected — %s"
msgstr "Deconectat – %s"
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:345
msgid "Offline — No Network Connection"
msgstr "Deconectat – Nicio conexiune la rețea"
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:352
msgid "Unknown Status"
msgstr "Mesaj de stare necunoscut"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:364
msgid "Offline — Account Disabled"
msgstr "Deconectat – Cont dezactivat"
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:811
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2241,16 +2695,16 @@ msgstr ""
"Sunteți pe cale să creați un nou cont, ceea ce va duce\n"
"la pierderea modificărilor curente. Doriți să continuați?"
-#: ../src/empathy-accounts-dialog.c:1115
+#: ../src/empathy-accounts-dialog.c:1158
#, c-format
msgid "Do you want to remove %s from your computer?"
-msgstr "Doriți să ștergeți %s de pe calculatorul dumneavoastră?"
+msgstr "Doriți să eliminați %s de pe calculatorul dumneavoastră?"
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1162
msgid "This will not remove your account on the server."
-msgstr "Această acțiune nu va șterge contul de pe server."
+msgstr "Această acțiune nu va elimina contul de pe server."
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1400
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2258,7 +2712,7 @@ msgstr ""
"Sunteți pe cale să alegeți un alt cont, ceea ce va duce\n"
"la pierderea modificărilor curente. Doriți să continuați?"
-#: ../src/empathy-accounts-dialog.c:1933
+#: ../src/empathy-accounts-dialog.c:2003
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2267,197 +2721,302 @@ msgstr ""
"la pierderea modificărilor curente. Doriți să continuați?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "Se încarcă informațiile despre cont"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "No protocol installed"
msgstr "Niciun protocol instalat"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Protocol:"
msgstr "Protocol:"
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "To add a new account, you first have to install a backend for each protocol you want to use."
-msgstr "Pentru a adăuga un cont nou, trebuie să instalați întâi suportul pentru fiecare protocol pe care doriți să-l folosiți."
-
#: ../src/empathy-accounts-dialog.ui.h:4
-#| msgid "_Add Contact…"
-msgid "_Add…"
-msgstr "_Adăugare…"
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+"Pentru a adăuga un cont nou, trebuie să instalați întâi suportul pentru "
+"fiecare protocol pe care doriți să-l folosiți."
#: ../src/empathy-accounts-dialog.ui.h:5
-#| msgid "Import"
+msgid "_Add…"
+msgstr "_Adaugă…"
+
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
-msgstr "_Importare..."
+msgstr "_Importă..."
+
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr " - Client de autentificare Empathy"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Client de autentificare Empathy"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "Persoane din apropiere"
-#: ../src/empathy-call-window.c:453
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr "- Client audio/video Empathy"
+
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "Client audio/video Empathy"
+
+#: ../src/empathy-call-window.c:479
msgid "Contrast"
-msgstr "Contast"
+msgstr "Contrast"
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:482
msgid "Brightness"
msgstr "Luminozitate"
-#: ../src/empathy-call-window.c:459
+#: ../src/empathy-call-window.c:485
msgid "Gamma"
msgstr "Gamă"
-#: ../src/empathy-call-window.c:567
+#: ../src/empathy-call-window.c:590
msgid "Volume"
msgstr "Volum"
-#: ../src/empathy-call-window.c:1022
+#: ../src/empathy-call-window.c:1173
msgid "_Sidebar"
msgstr "Bară _laterală"
-#: ../src/empathy-call-window.c:1041
+#: ../src/empathy-call-window.c:1192
msgid "Audio input"
msgstr "Intrare audio"
-#: ../src/empathy-call-window.c:1045
+#: ../src/empathy-call-window.c:1196
msgid "Video input"
msgstr "Intrare video"
-#: ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1200
msgid "Dialpad"
-msgstr "Tastatură"
+msgstr "Tastatură numerică"
+
+#: ../src/empathy-call-window.c:1205
+msgid "Details"
+msgstr "Detalii"
#. 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:1273
#, c-format
msgid "Call with %s"
-msgstr "Apelează cu %s"
+msgstr "Apel către %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:1352
msgid "Call"
-msgstr "Apelează"
+msgstr "Apel"
+
+#: ../src/empathy-call-window.c:1506
+msgid "The IP address as seen by the machine"
+msgstr "Adresa IP așa cum este văzută de mașină"
+
+#: ../src/empathy-call-window.c:1508
+msgid "The IP address as seen by a server on the Internet"
+msgstr "Adresa de IP așa cum este văzută de către un server de pe Internet"
+
+#: ../src/empathy-call-window.c:1510
+msgid "The IP address of the peer as seen by the other side"
+msgstr "Adresa IP așa cum este văzută de către partenerul de conexiune"
+
+#: ../src/empathy-call-window.c:1512
+msgid "The IP address of a relay server"
+msgstr "Adresa IP a unui server releu"
+
+#: ../src/empathy-call-window.c:1514
+msgid "The IP address of the multicast group"
+msgstr "Adresa IP a grupului multicast"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1695
+#: ../src/empathy-call-window.c:2247
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Conectat — %d:%02dm"
-#: ../src/empathy-call-window.c:1756
+#: ../src/empathy-call-window.c:2308
msgid "Technical Details"
msgstr "Detalii tehnice"
-#: ../src/empathy-call-window.c:1794
+#: ../src/empathy-call-window.c:2346
#, c-format
-msgid "%s's software does not understand any of the audio formats supported by your computer"
-msgstr "Software-ul %s nu înțelege niciunul dintre formatele audio suportate de calculatorul dumneavoastră"
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"Software-ul %s nu înțelege niciunul dintre formatele audio suportate de "
+"calculatorul dumneavoastră"
-#: ../src/empathy-call-window.c:1799
+#: ../src/empathy-call-window.c:2351
#, c-format
-msgid "%s's software does not understand any of the video formats supported by your computer"
-msgstr "Software-ul %s nu înțelege niciunul dintre formatele video suportate de calculatorul dumneavoastră"
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"Software-ul %s nu înțelege niciunul dintre formatele video suportate de "
+"calculatorul dumneavoastră"
-#: ../src/empathy-call-window.c:1805
+#: ../src/empathy-call-window.c:2357
#, c-format
-msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
-msgstr "Nu s-a putut realiza o conexiune către %s. Sau calculatorul dumneavoastră sau calculatorul la care încercați să vă conectați se află într-o rețea ce nu permite conexiuni directe."
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Nu s-a putut realiza o conexiune către %s. Fie calculatorul dumneavoastră, "
+"fie calculatorul la care încercați să vă conectați se află într-o rețea ce "
+"nu permite conexiuni directe."
-#: ../src/empathy-call-window.c:1811
+#: ../src/empathy-call-window.c:2363
msgid "There was a failure on the network"
msgstr "A apărut un eșec pe rețea"
-#: ../src/empathy-call-window.c:1815
-msgid "The audio formats necessary for this call are not installed on your computer"
-msgstr "Formatele audio necesare pentru acest apel nu sunt instalate pe calculatorul dumneavoastră"
+#: ../src/empathy-call-window.c:2367
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"Formatele audio necesare pentru acest apel nu sunt instalate pe calculatorul "
+"dumneavoastră"
-#: ../src/empathy-call-window.c:1818
-msgid "The video formats necessary for this call are not installed on your computer"
-msgstr "Formatele video necesare pentru acest apel nu sunt instalate pe calculatorul dumneavoastră"
+#: ../src/empathy-call-window.c:2370
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"Formatele video necesare pentru acest apel nu sunt instalate pe calculatorul "
+"dumneavoastră"
-#: ../src/empathy-call-window.c:1828
+#: ../src/empathy-call-window.c:2380
#, c-format
-msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
-msgstr "Ceva neașteptat a avut loc într-o componentă Telepathy. <a href=\"%s\">Trimiteți un raport al erorii</a> și atașați mesajele din fereastra „Depanare†din meniul Ajutor."
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"Ceva neașteptat a avut loc într-o componentă Telepathy. <a href=\"%s"
+"\">Trimiteți un raport al erorii</a> și atașați mesajele din fereastra "
+"„Depanare†din meniul Ajutor."
-#: ../src/empathy-call-window.c:1836
+#: ../src/empathy-call-window.c:2388
msgid "There was a failure in the call engine"
msgstr "A apărut un eșec în motorul apelurilor"
-#: ../src/empathy-call-window.c:1875
+#: ../src/empathy-call-window.c:2391
+msgid "The end of the stream was reached"
+msgstr "S-a ajuns la sfârșitul fluxului"
+
+#: ../src/empathy-call-window.c:2431
msgid "Can't establish audio stream"
msgstr "Nu s-a putut realiza fluxul audio"
-#: ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:2441
msgid "Can't establish video stream"
msgstr "Nu s-a putut realiza fluxul video"
#: ../src/empathy-call-window.ui.h:1
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/empathy-call-window.ui.h:2
msgid "Call the contact again"
msgstr "Apelează din nou contactul"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:3
msgid "Camera Off"
msgstr "Cameră dezactivată"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:4
msgid "Camera On"
msgstr "Cameră activată"
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Codec de decodificare:"
+
+#: ../src/empathy-call-window.ui.h:6
msgid "Disable camera and stop sending video"
msgstr "Dezactivează camera și oprește transmisia video"
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.ui.h:7
msgid "Enable camera and send video"
msgstr "Activează camera și trimite video"
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:8
msgid "Enable camera but don't send video"
msgstr "Activează camera, dar nu trimite video"
-#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Codec de codificare:"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Hang up"
msgstr "ÃŽnchide"
-#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-call-window.ui.h:11
msgid "Hang up current call"
msgstr "ÃŽnchide apelul curent"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Candidat local:"
+
+#: ../src/empathy-call-window.ui.h:13
msgid "Preview"
msgstr "Previzualizare"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:14
msgid "Redial"
msgstr "Formează din nou"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Candidat la distanță:"
+
+#: ../src/empathy-call-window.ui.h:16
msgid "Send Audio"
msgstr "Trimite audio"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Comută transmisia audio"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:19
msgid "V_ideo"
msgstr "V_ideo"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:20
+msgid "Video"
+msgstr "Video"
+
+#: ../src/empathy-call-window.ui.h:21
msgid "Video Off"
msgstr "Video dezactivat"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:22
msgid "Video On"
msgstr "Video activat"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:23
msgid "Video Preview"
msgstr "Previzualizare video"
-#: ../src/empathy-call-window.ui.h:18
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr "_Apelează"
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
msgid "_View"
msgstr "_Vizualizare"
-#: ../src/empathy-chat-window.c:436
-#: ../src/empathy-chat-window.c:456
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -2465,7 +3024,7 @@ msgstr[0] "%s (%d necitit)"
msgstr[1] "%s (%d necitite)"
msgstr[2] "%s (%d necitite)"
-#: ../src/empathy-chat-window.c:448
+#: ../src/empathy-chat-window.c:464
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
@@ -2473,7 +3032,7 @@ msgstr[0] "%s (și %u altul)"
msgstr[1] "%s (și altele %u)"
msgstr[2] "%s (și altele %u)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:480
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
@@ -2481,7 +3040,7 @@ msgstr[0] "%s (%d necitit de la alții)"
msgstr[1] "%s (%d necitite de la alții)"
msgstr[2] "%s (%d necitite de la alții)"
-#: ../src/empathy-chat-window.c:473
+#: ../src/empathy-chat-window.c:489
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
@@ -2489,9 +3048,9 @@ msgstr[0] "%s (%d necitit de la toți)"
msgstr[1] "%s (%d necitite de la toți)"
msgstr[2] "%s (%d necitite de la toți)"
-#: ../src/empathy-chat-window.c:676
+#: ../src/empathy-chat-window.c:695
msgid "Typing a message."
-msgstr "Scrie un mesaj."
+msgstr "Tastează un mesaj."
#: ../src/empathy-chat-window.ui.h:1
msgid "C_lear"
@@ -2522,58 +3081,62 @@ msgid "Move Tab _Right"
msgstr "Mută tabul în d_reapta"
#: ../src/empathy-chat-window.ui.h:8
-#: ../src/empathy-main-window.ui.h:17
+msgid "Notify for All Messages"
+msgstr "Anunță-mă pentru toate mesajele"
+
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
msgid "_Contents"
msgstr "_Conținut"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "_Conversație"
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:11
msgid "_Detach Tab"
msgstr "_Detașează tab"
-#: ../src/empathy-chat-window.ui.h:11
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
msgid "_Edit"
msgstr "_Editare"
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "Cameră de discuții _favorită"
-#: ../src/empathy-chat-window.ui.h:13
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
msgid "_Help"
msgstr "_Ajutor"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "_Tabul următor"
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:16
msgid "_Previous Tab"
msgstr "Tabul _precedent"
-#: ../src/empathy-chat-window.ui.h:16
-#: ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "Arată li_sta de contacte"
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:18
msgid "_Tabs"
msgstr "_Taburi"
-#: ../src/empathy-chatrooms-window.c:256
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "An_ulează închiderea tabului"
+
+#: ../src/empathy-chatrooms-window.c:241
msgid "Name"
msgstr "Nume"
-#: ../src/empathy-chatrooms-window.c:274
+#: ../src/empathy-chatrooms-window.c:259
msgid "Room"
msgstr "Cameră"
-#: ../src/empathy-chatrooms-window.c:282
+#: ../src/empathy-chatrooms-window.c:267
msgid "Auto-Connect"
msgstr "Conectare automată"
@@ -2581,76 +3144,86 @@ msgstr "Conectare automată"
msgid "Manage Favorite Rooms"
msgstr "Gestionează camerele favorite"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming video call"
msgstr "Ați primit un apel video"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming call"
msgstr "Apel primit"
-#: ../src/empathy-event-manager.c:343
+#: ../src/empathy-event-manager.c:472
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s vă apelează video. Doriți să răspundeți?"
-#: ../src/empathy-event-manager.c:344
+#: ../src/empathy-event-manager.c:473
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s vă apelează. Doriți să răspundeți?"
-#: ../src/empathy-event-manager.c:366
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Apel primit de la %s"
+
+#: ../src/empathy-event-manager.c:501
msgid "_Reject"
msgstr "_Respinge"
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:507
msgid "_Answer"
msgstr "Ră_spunde"
-#: ../src/empathy-event-manager.c:489
+#: ../src/empathy-event-manager.c:618
#, c-format
msgid "Incoming video call from %s"
msgstr "Apel video primit de la %s"
-#: ../src/empathy-event-manager.c:489
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Apel primit de la %s"
-
-#: ../src/empathy-event-manager.c:579
+#: ../src/empathy-event-manager.c:695
msgid "Room invitation"
msgstr "Invitație cameră"
-#: ../src/empathy-event-manager.c:582
+#: ../src/empathy-event-manager.c:697
+#, c-format
+msgid "Invitation to join %s"
+msgstr "Invitație de alăturare la %s"
+
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "%s is inviting you to join %s"
-msgstr "%s vă invită să vă alăturați %s"
+msgstr "%s vă invită să vă alăturați la %s"
-#: ../src/empathy-event-manager.c:590
+#: ../src/empathy-event-manager.c:712
msgid "_Decline"
msgstr "_Refuză"
-#: ../src/empathy-event-manager.c:595
+#: ../src/empathy-event-manager.c:717
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
-msgstr "_Intră"
+msgstr "A_lăturare"
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:743
#, c-format
msgid "%s invited you to join %s"
-msgstr "%s v-a invitat să vă alăturați %s"
+msgstr "%s v-a invitat să vă alăturați la %s"
+
+#: ../src/empathy-event-manager.c:749
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "Ați fost invitat să vă alăturați la %s"
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:797
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Transfer de fișiere primit de la %s"
-#: ../src/empathy-event-manager.c:818
+#: ../src/empathy-event-manager.c:1005
#, c-format
msgid "Subscription requested by %s"
msgstr "Abonare cerută de %s"
-#: ../src/empathy-event-manager.c:822
+#: ../src/empathy-event-manager.c:1009
#, c-format
msgid ""
"\n"
@@ -2659,123 +3232,118 @@ msgstr ""
"\n"
"Mesaj: %s"
-#. someone is logging off
-#: ../src/empathy-event-manager.c:862
+#: ../src/empathy-event-manager.c:1052
#, c-format
msgid "%s is now offline."
msgstr "%s s-a deconectat."
-#. someone is logging in
-#: ../src/empathy-event-manager.c:878
+#: ../src/empathy-event-manager.c:1072
#, c-format
msgid "%s is now online."
msgstr "%s s-a conectat."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u:%02u.%02u"
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Necunoscut"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s din %s cu %s/s"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s"
msgstr "%s din %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Se primește „%s†de la %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Se trimite „%s†la %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Eroare la recepționarea „%s†de la %s"
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
msgid "Error receiving a file"
msgstr "Eroare la primirea unui fișier"
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Eroare la trimiterea „%s†către %s"
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
msgid "Error sending a file"
msgstr "Eroare la trimiterea unui fișier"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
#, c-format
msgid "\"%s\" received from %s"
msgstr "„%s†primit de la %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
#, c-format
msgid "\"%s\" sent to %s"
msgstr "„%s†trimis către %s"
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
msgid "File transfer completed"
msgstr "Transfer de fișiere încheiat"
-#: ../src/empathy-ft-manager.c:616
-#: ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
msgid "Waiting for the other participant's response"
msgstr "Se așteaptă răspunsul celuilalt participant"
-#: ../src/empathy-ft-manager.c:642
-#: ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Se verifică integritatea „%sâ€"
-#: ../src/empathy-ft-manager.c:645
-#: ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "Se calculează valoarea de dispersie pentru „%sâ€"
-#: ../src/empathy-ft-manager.c:991
+#: ../src/empathy-ft-manager.c:996
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1003
+#: ../src/empathy-ft-manager.c:1008
msgid "File"
msgstr "Fișier"
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1030
msgid "Remaining"
-msgstr "Încă"
+msgstr "Rămas"
#: ../src/empathy-ft-manager.ui.h:1
msgid "File Transfers"
@@ -2783,154 +3351,156 @@ msgstr "Transfer fișiere"
#: ../src/empathy-ft-manager.ui.h:2
msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "Elimină din lista de transferuri transferurile complete, anulate și eșuate"
+msgstr ""
+"Elimină din lista de transferuri transferurile complete, anulate și eșuate"
#: ../src/empathy-import-dialog.c:84
-msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
-msgstr "Nu s-au găsit conturi de importat. Empathy suportă actualmente importul de conturi din Pidgin."
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"Nu s-au găsit conturi de importat. Empathy suportă actualmente importul de "
+"conturi din Pidgin."
#: ../src/empathy-import-dialog.c:199
msgid "Import Accounts"
msgstr "Importă conturi"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:290
+#: ../src/empathy-import-widget.c:292
msgid "Import"
msgstr "Import"
-#: ../src/empathy-import-widget.c:299
+#: ../src/empathy-import-widget.c:301
msgid "Protocol"
msgstr "Protocol"
-#: ../src/empathy-import-widget.c:323
+#: ../src/empathy-import-widget.c:325
msgid "Source"
msgstr "Sursă"
-#: ../src/empathy-import-mc4-accounts.c:106
-#, c-format
-msgid "%s account"
-msgstr "Cont %s"
+#: ../src/empathy-main-window.c:383
+msgid "No match found"
+msgstr "Nicio potrivire"
-#: ../src/empathy-main-window.c:437
+#: ../src/empathy-main-window.c:535
msgid "Reconnect"
msgstr "Reconectează"
-#: ../src/empathy-main-window.c:443
+#: ../src/empathy-main-window.c:541
msgid "Edit Account"
msgstr "Editare cont"
-#: ../src/empathy-main-window.c:449
+#: ../src/empathy-main-window.c:547
msgid "Close"
msgstr "ÃŽnchide"
-#: ../src/empathy-main-window.c:1033
+#: ../src/empathy-main-window.c:1229
msgid "Contact"
msgstr "Contact"
-#: ../src/empathy-main-window.c:1414
+#: ../src/empathy-main-window.c:1554
+msgid "Contact List"
+msgstr "Listă contacte"
+
+#: ../src/empathy-main-window.c:1663
msgid "Show and edit accounts"
msgstr "Arată și modifică conturile"
#: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "Listă contacte"
-
-#: ../src/empathy-main-window.ui.h:2
msgid "Contacts on a _Map"
msgstr "Contactele pe o _hartă"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
msgid "Context"
msgstr "Context"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
msgid "Join _Favorites"
-msgstr "Intră în cele _favorite"
+msgstr "Alăturare la camerele de discuții _favorite"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
msgid "Manage Favorites"
msgstr "Gestionează favoritele"
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
msgid "N_ormal Size"
msgstr "Dimensiune n_ormală"
-#: ../src/empathy-main-window.ui.h:7
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "Ape_l nou…"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
msgid "Normal Size With _Avatars"
-msgstr "Dimensiune normală cu _avataruri"
+msgstr "Dimensiune normală cu _avatare"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
msgid "P_references"
msgstr "P_referințe"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
msgid "Show P_rotocols"
msgstr "Arată p_rotocoalele"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
msgid "Sort by _Name"
msgstr "Sortare după _nume"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Status"
msgstr "Sortează după mesajul de _stare"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
msgid "_Accounts"
msgstr "_Conturi"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
msgid "_Compact Size"
msgstr "Dimensiune _compactă"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17
msgid "_Debug"
msgstr "_Depanare"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19
msgid "_File Transfers"
msgstr "Transfer de _fișiere"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21
msgid "_Join…"
-msgstr "_Intră…"
+msgstr "A_lăturare…"
-#: ../src/empathy-main-window.ui.h:23
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "Conversație _nouă…"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23
msgid "_Offline Contacts"
msgstr "C_ontacte deconectate"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24
msgid "_Personal Information"
msgstr "Informații _personale"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26
msgid "_Room"
msgstr "Came_ră"
-#: ../src/empathy-new-chatroom-dialog.c:338
+#: ../src/empathy-new-chatroom-dialog.c:379
msgid "Chat Room"
msgstr "Cameră de discuții"
-#: ../src/empathy-new-chatroom-dialog.c:354
+#: ../src/empathy-new-chatroom-dialog.c:395
msgid "Members"
msgstr "Membri"
#. 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:607
#, c-format
msgid ""
-"<b>%s</b>\n"
+"%s\n"
"Invite required: %s\n"
"Password required: %s\n"
"Members: %s"
@@ -2940,16 +3510,16 @@ msgstr ""
"Parolă necesară: %s\n"
"Membri: %s"
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "No"
msgstr "Nu"
-#: ../src/empathy-new-chatroom-dialog.c:569
+#: ../src/empathy-new-chatroom-dialog.c:638
msgid "Could not start room listing"
msgstr "Nu s-a putut porni afișarea camerei de discuții"
-#: ../src/empathy-new-chatroom-dialog.c:579
+#: ../src/empathy-new-chatroom-dialog.c:648
msgid "Could not stop room listing"
msgstr "Nu s-a putut opri afișarea camerei de discuții"
@@ -2958,16 +3528,23 @@ msgid "Couldn't load room list"
msgstr "Nu s-a putut încărca lista camerei de discuții"
#: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "Introduceți numele camerei în care doriți să intrați sau faceți clic pe una sau mai multe camere din listă."
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+"Introduceți numele camerei la care doriți să vă alăturați sau faceți clic pe "
+"una sau mai multe camere din listă."
#: ../src/empathy-new-chatroom-dialog.ui.h:4
-msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
-msgstr "Introduceți serverul care găzduiește camera sau lăsați spațiul gol dacă camera este pe serverul contului curent"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+"Introduceți serverul care găzduiește camera sau lăsați spațiul gol dacă "
+"camera este pe serverul contului curent"
#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid "Join Room"
-msgstr "Intră în camera de discuții"
+msgstr "Alăturare la camera de discuții"
#: ../src/empathy-new-chatroom-dialog.ui.h:6
msgid "Room List"
@@ -2977,62 +3554,66 @@ msgstr "Listă camere de discuții"
msgid "_Room:"
msgstr "Came_ră:"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:138
msgid "Message received"
msgstr "Mesaj primit"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:139
msgid "Message sent"
msgstr "Mesaj trimis"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:140
msgid "New conversation"
msgstr "Conversație nouă"
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:141
msgid "Contact goes online"
msgstr "Contactul se conectează"
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:142
msgid "Contact goes offline"
msgstr "Contactul se deconectează"
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:143
msgid "Account connected"
msgstr "Cont conectat"
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:144
msgid "Account disconnected"
msgstr "Cont deconectat"
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:445
msgid "Language"
msgstr "Limbă"
+#: ../src/empathy-preferences.c:882
+msgid "Preferences"
+msgstr "Preferințe"
+
#: ../src/empathy-preferences.ui.h:1
msgid "Appearance"
msgstr "Aspect"
#: ../src/empathy-preferences.ui.h:2
-msgid "Automatically _connect on startup "
-msgstr "_Conectare automată la pornire "
-
-#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Comportament"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
msgid "Chat Th_eme:"
-msgstr "T_ema conversații:"
+msgstr "T_ema conversațiilor:"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
msgid "Disable notifications when _away or busy"
msgstr "Dez_activează notificările când sunt plecat sau ocupat"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable sounds when _away or busy"
msgstr "Dez_activează sunetele când sunt plecat sau ocupat"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "Afișează evenimentele primite în zona de notificare"
+
#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
msgstr "Activează notificările când un contact se conectează"
@@ -3055,31 +3636,37 @@ msgstr "Generale"
#: ../src/empathy-preferences.ui.h:13
msgid "Location sources:"
-msgstr "Surse locații"
+msgstr "Surse locații:"
#: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr "Jurnal conversații"
+
+#: ../src/empathy-preferences.ui.h:15
msgid "Notifications"
msgstr "Notificări"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:16
msgid "Play sound for events"
msgstr "Redă sunete pentru evenimente"
-#: ../src/empathy-preferences.ui.h:16
-msgid "Preferences"
-msgstr "Preferințe"
-
#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "Intimitate"
#: ../src/empathy-preferences.ui.h:18
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published. GPS coordinates will be accurate to 1 decimal place."
-msgstr "Acuratețea redusă a locației înseamnă că nimic mai precis decât orașul, statul și țara dumneavoastră nu vor fi publicate. Coordonatele GPS vor avea o prezicie de o cifră zecimală."
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published. GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"Acuratețea redusă a locației înseamnă că nimic mai precis decât orașul, "
+"statul și țara dumneavoastră nu vor fi publicate. Coordonatele GPS vor avea "
+"o precizie de o cifră zecimală."
#: ../src/empathy-preferences.ui.h:19
msgid "Show _smileys as images"
-msgstr "Arată e_moticonurile ca imagini"
+msgstr "Arată e_moticoanele ca imagini"
#: ../src/empathy-preferences.ui.h:20
msgid "Show contact _list in rooms"
@@ -3094,49 +3681,73 @@ msgid "Spell Checking"
msgstr "Verificare ortografică"
#: ../src/empathy-preferences.ui.h:23
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
-msgstr "Lista limbilor reflectă doar limbile pentru care aveți instalat un dicționar."
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Lista limbilor reflectă doar limbile pentru care aveți instalat un dicționar."
#: ../src/empathy-preferences.ui.h:24
msgid "Themes"
msgstr "Teme"
#: ../src/empathy-preferences.ui.h:25
+msgid "_Automatically connect on startup"
+msgstr "Conectare _automată la pornire "
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Cellphone"
msgstr "Telefon mobi_l"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable bubble notifications"
msgstr "Activar_e notificări balon"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable sound notifications"
msgstr "Activ_ează notificările sonore"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "_Network (IP, Wi-Fi)"
msgstr "Rețea (IP, _Wifi)"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Open new chats in separate windows"
msgstr "Deschide discuțiile n_oi în ferestre separate"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Publish location to my contacts"
msgstr "_Publică contactelor locația mea"
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
msgid "_Reduce location accuracy"
msgstr "_Redu acuratețea locației"
-#: ../src/empathy-status-icon.c:176
+#: ../src/empathy-status-icon.c:141
msgid "Respond"
msgstr "Răspunde"
+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "Respinge"
+
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "Răspunde"
+
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "Refuză"
+
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "Acceptă"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Stare"
@@ -3145,70 +3756,73 @@ msgstr "Stare"
msgid "_Quit"
msgstr "_Ieșire"
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:452
msgid "Contact Map View"
msgstr "Vizualizare hartă de contacte"
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1219
msgid "Save"
msgstr "Salvează"
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1395
msgid "Debug Window"
msgstr "Fereastră de depanare"
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1475
msgid "Pause"
msgstr "Pauză"
-#: ../src/empathy-debug-window.c:1311
+#: ../src/empathy-debug-window.c:1487
msgid "Level "
msgstr "Nivel "
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1507
msgid "Debug"
msgstr "Depanare"
-#: ../src/empathy-debug-window.c:1337
+#: ../src/empathy-debug-window.c:1513
msgid "Info"
msgstr "Informativ"
-#: ../src/empathy-debug-window.c:1343
-#: ../src/empathy-debug-window.c:1392
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
msgid "Message"
msgstr "Mesaj"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1525
msgid "Warning"
msgstr "Avertisment"
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1531
msgid "Critical"
msgstr "Critic"
-#: ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1537
msgid "Error"
msgstr "Eroare"
-#: ../src/empathy-debug-window.c:1380
+#: ../src/empathy-debug-window.c:1556
msgid "Time"
msgstr "Timp"
-#: ../src/empathy-debug-window.c:1383
+#: ../src/empathy-debug-window.c:1559
msgid "Domain"
msgstr "Domeniu"
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1561
msgid "Category"
msgstr "Categorie"
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1563
msgid "Level"
msgstr "Nivel"
-#: ../src/empathy-debug-window.c:1424
-msgid "The selected connection manager does not support the remote debugging extension."
-msgstr "Administratorul de conexiuni ales nu suportă extensia de depanare de la distanță."
+#: ../src/empathy-debug-window.c:1600
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"Administratorul de conexiuni ales nu suportă extensia de depanare la "
+"distanță."
#: ../src/empathy-invite-participant-dialog.c:34
#: ../src/empathy-invite-participant-dialog.c:48
@@ -3219,155 +3833,34 @@ msgstr "Invită participant"
msgid "Choose a contact to invite into the conversation:"
msgstr "Alegeți contactul care va fi invitat în conversație:"
-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "Invită"
+
+#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "Nu afișa nici un dialog; fă orice acțiune (ex: importare) și ieși"
+msgstr "Nu afișa niciun dialog; fă orice acțiune (ex: importare) și ieși"
-#: ../src/empathy-accounts.c:217
-msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr "Nu afiÈ™a dialoguri dacă există conturi care nu sunt de tipul „salutâ€"
+#: ../src/empathy-accounts.c:186
+msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgstr "Nu afișa niciun dialog dacă există conturi non-Salut"
-#: ../src/empathy-accounts.c:221
+#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "Alege inițial contul dat (ex: gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:192
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:200
msgid "- Empathy Accounts"
msgstr "- Conturi Empathy"
-#: ../src/empathy-accounts.c:247
-#| msgid "- Empathy Accounts"
+#: ../src/empathy-accounts.c:216
msgid "Empathy Accounts"
msgstr "Conturi Empathy"
#: ../src/empathy-debugger.c:40
-#| msgid "Empathy"
msgid "Empathy Debugger"
msgstr "Depanator Empathy"
-
-#~ msgid "Accounts"
-#~ msgstr "Conturi"
-#~ msgid "_Add&#x2026;"
-#~ msgstr "_Adaugă&#x2026;"
-#~ msgid "_Import&#x2026;"
-#~ msgstr "_Importă&#x2026;"
-#~ msgid " Accounts"
-#~ msgstr "Conturi"
-#~ msgid "Salut account is created"
-#~ msgstr "Contul Salut a fost creat"
-#~ msgid "Whether the Salut account has been created on the first Empathy run."
-#~ msgstr "Dacă la prima pornire a Empathy, contul Salut a fost creat."
-#~ msgid "Show the accounts dialog"
-#~ msgstr "Arată dialoguri cu conturile"
-#~ msgid ""
-#~ "Try to import any recognized accounts and display an assistant if that "
-#~ "fails"
-#~ msgstr ""
-#~ "Încearcă importarea conturilor recunoscute și afișează un asistent dacă "
-#~ "aceasta eșuează"
-#~ msgid "Hidden"
-#~ msgstr "Ascuns"
-#~ msgid "<b>Location</b>"
-#~ msgstr "<b>Locație</b>"
-#~ msgid "Email:"
-#~ msgstr "Email:"
-#~ msgid "C_all"
-#~ msgstr "_Apelează"
-#~ msgid "Edit Custom Messages..."
-#~ msgstr "Modifică mesajul personalizat..."
-#~ msgid "The error message was: <span style=\"italic\">%s</span>"
-#~ msgstr "Mesajul de eroare a fost: <span style=\"italic\">%s</span>"
-#~ msgid "_Next"
-#~ msgstr "ÃŽ_nainte"
-#~ msgid "Add new"
-#~ msgstr "Adaugă cont nou"
-#~ msgid "Cr_eate"
-#~ msgstr "Cr_eează"
-#~ msgid "_Add..."
-#~ msgstr "_Adaugă..."
-#~ msgid "_Import..."
-#~ msgstr "_Importă..."
-#~ msgid "_Reuse an existing account"
-#~ msgstr "_Refolosește un cont existent"
-#~ msgid "%s is offering you an invitation"
-#~ msgstr "%s vă oferă o invitație"
-#~ msgid "An external application will be started to handle it."
-#~ msgstr "Se va porni o aplicație externă pentru gestionarea ei."
-#~ msgid "You don't have the needed external application to handle it."
-#~ msgstr "Nu aveți aplicația externă necesară gestionării ei."
-#~ msgid "No error specified"
-#~ msgstr "Nicio eroare specificată"
-#~ msgid "Unknown error"
-#~ msgstr "Eroare necunoscută"
-#~ msgid "_Join..."
-#~ msgstr "_Intră..."
-#~ msgid "_New Conversation..."
-#~ msgstr "Co_nversație nouă..."
-#~ msgid "Unable to start application for service %s: %s"
-#~ msgstr "Nu se poate porni aplicația pentru serviciul %s: %s"
-#~ msgid ""
-#~ "An invitation was offered for service %s, but you don't have the needed "
-#~ "application to handle it"
-#~ msgstr ""
-#~ "S-a oferit o invitație pentru serviciul %s, dar nu aveți aplicația "
-#~ "necesară pentru a o gestiona"
-#~ msgid "Can't set an empty display name"
-#~ msgstr "Nu se poate defini un nume gol"
-#~ msgid "Unsupported command"
-#~ msgstr "Comandă nesuportată"
-#~ msgid "_View Previous Conversations"
-#~ msgstr "_Vezi conversațiile anterioare"
-#~ msgid ""
-#~ "The contact to display in the applet. Empty means no contact is displayed."
-#~ msgstr ""
-#~ "Contactul de afișat în miniaplicație. Gol înseamnă niciun contact afișat."
-#~ msgid "The contact's avatar token. Empty means contact has no avatar."
-#~ msgstr "Avatarul contactului. Gol înseamnă că nu are niciun avatar."
-#~ msgid "Talk!"
-#~ msgstr "Discutăți!"
-#~ msgid "_Information"
-#~ msgstr "_Informații"
-#~ msgid "_Preferences"
-#~ msgstr "_Preferințe"
-#~ msgid "Please configure a contact."
-#~ msgstr "Configurați un contact."
-#~ msgid "Select contact..."
-#~ msgstr "Alegere contact..."
-#~ msgid "Presence"
-#~ msgstr "Prezență"
-#~ msgid "Set your own presence"
-#~ msgstr "Definiți prezența"
-#~ msgid ""
-#~ "You are about to remove your %s account!\n"
-#~ "Are you sure you want to proceed?"
-#~ msgstr ""
-#~ "Sunteți pe cale să eliminați contul %s!\n"
-#~ "Doriți să continuați?"
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Dacă decideți să continuați, orice conversații asociate sau camere de "
-#~ "discuții NU vor fi șterse.\n"
-#~ "\n"
-#~ "Dacă decideți să adăugați contul din nou, ele vor fi încă disponibile."
-#~ msgid "Conversations (%d)"
-#~ msgstr "Conversații (%d)"
-#~ msgid "_Contact"
-#~ msgstr "_Contact"
-#~ msgid "Allow _GPS usage"
-#~ msgstr "Permite utilizarea _GPS-ului"
-#~ msgid "Allow _cellphone usage"
-#~ msgstr "Permite utilizarea telefonului _celular"
-#~ msgid "Allow _network usage"
-#~ msgstr "Permite utilizarea _rețelei"
-#~ msgid "Geoclue Settings"
-#~ msgstr "Preferințe Geoclue"
-
diff --git a/po/ru.po b/po/ru.po
index 95916871f..60dde3194 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,23 +9,22 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy trunk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 12:02+0300\n"
-"PO-Revision-Date: 2010-05-26 07:01+0300\n"
-"Last-Translator: ÐлекÑандр Семёнов <rotuka@ya.ru>\n"
-"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
+"POT-Creation-Date: 2010-09-22 07:17+0000\n"
+"PO-Revision-Date: 2010-09-22 12:07+0300\n"
+"Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
+"Language-Team: <gnome-cyr@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Poedit-Language: Russian\n"
"X-Poedit-Country: RUSSIAN FEDERATION\n"
"X-Generator: KBabel 1.11.4\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
-msgstr ""
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "ОбщайтеÑÑŒ в Google Talk, Facebook, MSN и во многих других Ñлужбах"
#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy"
@@ -33,7 +32,7 @@ msgstr "Empathy"
#: ../data/empathy.desktop.in.in.h:3
msgid "Empathy Internet Messaging"
-msgstr ""
+msgstr "Программа обмена ÑообщениÑми Empathy"
#: ../data/empathy.desktop.in.in.h:4
msgid "IM Client"
@@ -44,23 +43,16 @@ msgid "Always open a separate chat window for new chats."
msgstr "Ð’Ñегда открывать новую беÑеду в новом окне."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Символ Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле пÑевдонима, еÑли в беÑеде иÑпользуетÑÑ "
-"автодополнение пÑевдонимов по клавише Tab."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Символ Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле пÑевдонима, еÑли в беÑеде иÑпользуетÑÑ Ð°Ð²Ñ‚Ð¾Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ пÑевдонимов по клавише Tab."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Chat window theme"
msgstr "Тема окна беÑеды"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"СпиÑок Ñзыков, иÑпользуемых при проверке орфографии, разделённых запÑтыми "
-"(например «en, fr, ru»)."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "СпиÑок Ñзыков, иÑпользуемых при проверке орфографии, разделённых запÑтыми (например «en, fr, ru»)."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Compact contact list"
@@ -88,13 +80,11 @@ msgstr "Выключить звуки в ÑоÑтоÑнии «отошёл»"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Display incoming events in the status area"
-msgstr ""
+msgstr "Показывать наÑтупающие ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð² облаÑти ÑоÑтоÑниÑ"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid ""
-"Display incoming events in the status area. If false present them right away "
-"to the user."
-msgstr ""
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Показывать наÑтупающие ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð² облаÑти ÑоÑтоÑниÑ. ЕÑли ключ не уÑтановлен, показывать их непоÑредÑтвенно пользователю."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
@@ -174,8 +164,7 @@ msgstr "Путь к иÑпользуемой теме Adium"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Путь к иÑпользуемой теме Adium, еÑли тема, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ð°Ñ Ð´Ð»Ñ Ð±ÐµÑеды — Adium."
+msgstr "Путь к иÑпользуемой теме Adium, еÑли тема, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ð°Ñ Ð´Ð»Ñ Ð±ÐµÑеды — Adium."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for incoming messages"
@@ -251,11 +240,11 @@ msgstr "ПоÑледний каталог, из которого выбиралÐ
#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "The position for the chat window side pane"
-msgstr ""
+msgstr "Положение боковой панели окна беÑеды"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
+msgstr "Положение боковой панели окна беÑеды (в пикÑелах)."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The theme that is used to display the conversation in chat windows."
@@ -275,9 +264,7 @@ msgstr "ИÑпользовать тему Ð´Ð»Ñ Ð±ÐµÑед"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Может ли Empathy публиковать меÑтоположение Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ ÐµÐ³Ð¾ "
-"ÑобеÑедников."
+msgstr "Может ли Empathy публиковать меÑтоположение Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ ÐµÐ³Ð¾ ÑобеÑедников."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the GPS to guess the location."
@@ -285,8 +272,7 @@ msgstr "Может ли Empathy иÑпользовать GPS Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´Ðµ
#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Может ли Empathy иÑпользовать Ñотовую Ñеть Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¼ÐµÑтоположениÑ."
+msgstr "Может ли Empathy иÑпользовать Ñотовую Ñеть Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¼ÐµÑтоположениÑ."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the network to guess the location."
@@ -302,60 +288,42 @@ msgstr "Был ли Ð¿ÐµÑ€ÐµÐ½Ð¾Ñ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ñообщений MSN."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Должен ли Empathy автоматичеÑки входить в ваши учётные запиÑи при запуÑке."
+msgstr "Должен ли Empathy автоматичеÑки входить в ваши учётные запиÑи при запуÑке."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should go into away mode automatically if user is idle."
-msgstr ""
-"Должен ли Empathy автоматичеÑки уÑтанавливать ÑÑ‚Ð°Ñ‚ÑƒÑ Â«Ð¾Ñ‚Ð¾ÑˆÑ‘Ð»Â», когда "
-"компьютер проÑтаивает."
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Должен ли Empathy автоматичеÑки уÑтанавливать ÑÑ‚Ð°Ñ‚ÑƒÑ Â«Ð¾Ñ‚Ð¾ÑˆÑ‘Ð»Â», когда компьютер проÑтаивает."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Должен ли Empathy уменьшать точноÑÑ‚ÑŒ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¼ÐµÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ причинам "
-"приватноÑти."
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Должен ли Empathy уменьшать точноÑÑ‚ÑŒ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¼ÐµÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ причинам приватноÑти."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "ИÑпользовать ли аватар ÑобеÑедника в качеÑтве значка окна беÑеды."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Должны ли быть включены инÑтрументы разработчика WebKit, например Web "
-"Inspector."
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Должны ли быть включены инÑтрументы разработчика WebKit, например Web Inspector."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"ИÑпользовать ли менеджеры ÑвÑзноÑти Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑкого Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ "
-"переподключениÑ."
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "ИÑпользовать ли менеджеры ÑвÑзноÑти Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑкого Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ переподключениÑ."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid ""
-"Whether to check words typed against the languages you want to check with."
+msgid "Whether to check words typed against the languages you want to check with."
msgstr "ПроверÑÑ‚ÑŒ ли введённые Ñлова из ÑпиÑка Ñзыков Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ орфографии."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether to convert smileys into graphical images in conversations."
-msgstr ""
-"Преобразовывать ли текÑтовые улыбки (Ñмайлы) в беÑедах в графичеÑкие "
-"изображениÑ."
+msgstr "Преобразовывать ли текÑтовые улыбки (Ñмайлы) в беÑедах в графичеÑкие изображениÑ."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "ВоÑпроизводить ли звук Ð´Ð»Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ входе ÑобеÑедников в Ñеть."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
+msgid "Whether to play a sound to notify of contacts logging out of the network."
msgstr "ВоÑпроизводить ли звук Ð´Ð»Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ выходе ÑобеÑедников из Ñети."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
@@ -384,36 +352,27 @@ msgstr "ВоÑпроизводить ли звук при выходе из Ñе
#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play sound notifications when away or busy."
-msgstr ""
-"ВоÑпроизводить ли звуковые ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð² ÑоÑтоÑниÑÑ… «отошёл» или «занÑт»."
+msgstr "ВоÑпроизводить ли звуковые ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð² ÑоÑтоÑниÑÑ… «отошёл» или «занÑт»."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Показывать ли вÑплывающее уведомление, когда ÑобеÑедник выходит из Ñети."
+msgstr "Показывать ли вÑплывающее уведомление, когда ÑобеÑедник выходит из Ñети."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when a contact goes online."
-msgstr ""
-"Показывать ли вÑплывающее уведомление, когда ÑобеÑедник выходит в Ñеть."
+msgstr "Показывать ли вÑплывающее уведомление, когда ÑобеÑедник выходит в Ñеть."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Показывать ли вÑплывающее уведомление о получении нового ÑообщениÑ, когда "
-"беÑеда уже ведётÑÑ, но не находитÑÑ Ð² фокуÑе."
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Показывать ли вÑплывающее уведомление о получении нового ÑообщениÑ, когда беÑеда уже ведётÑÑ, но не находитÑÑ Ð² фокуÑе."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Показывать ли вÑплывающее уведомление при получении нового ÑообщениÑ."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Показывать ли аватары ÑобеÑедников в ÑпиÑке ÑобеÑедников и окнах беÑеды."
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Показывать ли аватары ÑобеÑедников в ÑпиÑке ÑобеÑедников и окнах беÑеды."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show contacts that are offline in the contact list."
@@ -436,26 +395,16 @@ msgid "Whether to show the contact list in compact mode."
msgstr "Показывать ли компактный ÑпиÑок ÑобеÑедников."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Показывать ли диалоговое окно при закрытии главного окна Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ кнопки «x» "
-"в Ñтроке заголовка."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Показывать ли диалоговое окно при закрытии главного окна Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ кнопки «x» в Ñтроке заголовка."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to use the theme for chat rooms."
msgstr "ИÑпользовать ли темы Ð´Ð»Ñ ÐºÐ¾Ð¼Ð½Ð°Ñ‚."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-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 "
-"the contact list by state."
-msgstr ""
-"Критерий упорÑÐ´Ð¾Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ ÑпиÑка ÑобеÑедников. По умолчанию упорÑдочиваетÑÑ Ð¿Ð¾ "
-"имени ÑобеÑедника — «name». При значении «state» ÑпиÑок будет упорÑдочен по "
-"ÑтатуÑу."
+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 the contact list by state."
+msgstr "Критерий упорÑÐ´Ð¾Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ ÑпиÑка ÑобеÑедников. По умолчанию упорÑдочиваетÑÑ Ð¿Ð¾ имени ÑобеÑедника — «name». При значении «state» ÑпиÑок будет упорÑдочен по ÑтатуÑу."
#: ../data/empathy-accounts.desktop.in.in.h:1
msgid "Manage Messaging and VoIP accounts"
@@ -463,150 +412,213 @@ msgstr "Управление учётными запиÑÑми Ð´Ð»Ñ Ð¾Ð±Ð¼ÐµÐ½
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2092
+#: ../src/empathy-accounts-dialog.c:2157
msgid "Messaging and VoIP Accounts"
msgstr "Учётные запиÑи обмена ÑообщениÑми и VoIP"
-#: ../libempathy/empathy-ft-handler.c:843
+#: ../libempathy/empathy-ft-handler.c:851
msgid "The hash of the received file and the sent one do not match"
msgstr "Ð¥Ñш принÑтого файла не Ñовпадает Ñ Ñ…Ñшем отправленного"
-#: ../libempathy/empathy-ft-handler.c:1103
+#: ../libempathy/empathy-ft-handler.c:1111
msgid "File transfer not supported by remote contact"
msgstr "Удалённый ÑобеÑедник не поддерживает передачу файлов"
-#: ../libempathy/empathy-ft-handler.c:1161
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is not a regular file"
msgstr "Выбранный файл не ÑвлÑетÑÑ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ файлом"
-#: ../libempathy/empathy-ft-handler.c:1170
+#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is empty"
msgstr "Выбранный файл пуÑÑ‚"
-#: ../libempathy/empathy-tp-file.c:281
+#: ../libempathy/empathy-tp-file.c:283
msgid "Socket type not supported"
msgstr "Тип «Ñокет» не поддерживаетÑÑ"
-#: ../libempathy/empathy-tp-file.c:400
+#: ../libempathy/empathy-tp-file.c:402
msgid "No reason was specified"
msgstr "Причина не указана"
-#: ../libempathy/empathy-tp-file.c:403
+#: ../libempathy/empathy-tp-file.c:405
msgid "The change in state was requested"
msgstr "Получен Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¾Ð± изменении ÑоÑтоÑниÑ"
-#: ../libempathy/empathy-tp-file.c:406
+#: ../libempathy/empathy-tp-file.c:408
msgid "You canceled the file transfer"
msgstr "Передача файла была прервана"
-#: ../libempathy/empathy-tp-file.c:409
+#: ../libempathy/empathy-tp-file.c:411
msgid "The other participant canceled the file transfer"
msgstr "СобеÑедник прервал передачу файла"
-#: ../libempathy/empathy-tp-file.c:412
+#: ../libempathy/empathy-tp-file.c:414
msgid "Error while trying to transfer the file"
msgstr "Во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð¸ файла возникла ошибка"
-#: ../libempathy/empathy-tp-file.c:415
+#: ../libempathy/empathy-tp-file.c:417
msgid "The other participant is unable to transfer the file"
msgstr "СобеÑедник не может передавать файлы"
-#: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-tp-file.c:420
+#: ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°"
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "ДоÑтупен"
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "ЗанÑÑ‚"
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Отошёл"
-#: ../libempathy/empathy-utils.c:250
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Ðевидимый"
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Ðе в Ñети"
-#: ../libempathy/empathy-utils.c:254 ../src/empathy-call-window.c:1763
-#: ../src/empathy-call-window.c:1764 ../src/empathy-call-window.c:1765
-#: ../src/empathy-call-window.c:1766 ../src/empathy-call-window.ui.h:16
-#, fuzzy
+#: ../libempathy/empathy-utils.c:257
+#: ../src/empathy-call-window.c:1893
+#: ../src/empathy-call-window.c:1894
+#: ../src/empathy-call-window.c:1895
+#: ../src/empathy-call-window.c:1896
+#: ../src/empathy-call-window.ui.h:18
msgid "Unknown"
-msgstr "ÐеизвеÑтен"
+msgstr "ÐеизвеÑтно"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "Причина не указана"
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "УÑтановлен ÑÑ‚Ð°Ñ‚ÑƒÑ Â«Ð½Ðµ в Ñети»"
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Ошибка Ñети"
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð½Ðµ удалаÑÑŒ"
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Ошибка шифрованиÑ"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "Ð˜Ð¼Ñ ÑƒÐ¶Ðµ занÑто"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "Сертификат недоÑтупен"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "Сертификат не ÑвлÑетÑÑ Ð´Ð¾Ð²ÐµÑ€ÐµÐ½Ð½Ñ‹Ð¼"
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "Сертификат уÑтарел"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "Сертификат не активирован"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
-msgstr "Сертификат Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹ в имени узла"
+msgstr "Имена узлов Ñертификатов не Ñовпадают"
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "Отпечатки Ñертификатов не Ñовпадают"
-#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "Сертификат подпиÑан ÑамоÑтоÑтельно"
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Ошибка Ñертификата"
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:356
+msgid "Encryption is not available"
+msgstr "Шифрование недоÑтупно"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Certificate is invalid"
+msgstr "Ðеверный Ñертификат"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been refused"
+msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° подключение отклонён"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Connection can't be established"
+msgstr "Ðе удалоÑÑŒ уÑтановить Ñоединение"
+
+#: ../libempathy/empathy-utils.c:364
+msgid "Connection has been lost"
+msgstr "Соединение разорвано"
+
+#: ../libempathy/empathy-utils.c:366
+msgid "This resource is already connected to the server"
+msgstr "Этот реÑÑƒÑ€Ñ ÑƒÐ¶Ðµ подключён к Ñерверу"
+
+#: ../libempathy/empathy-utils.c:368
+msgid "Connection has been replaced by a new connection using the same resource"
+msgstr "Подключение было замещено новым подключение Ñ Ñтим же реÑурÑом"
+
+#: ../libempathy/empathy-utils.c:371
+msgid "The account already exists on the server"
+msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ уже ÑущеÑтвует на Ñервере"
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Server is currently too busy to handle the connection"
+msgstr "Ð’ наÑтоÑщий момент Ñервер Ñлишком загружен, чтобы обработать подключение."
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Certificate has been revoked"
+msgstr "Сертификат аннулирован"
+
+#: ../libempathy/empathy-utils.c:377
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "Сертификат иÑпользует небезопаÑный алгоритм шифра или криптографичеÑки Ñлаб"
+
+#: ../libempathy/empathy-utils.c:380
+msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
+msgstr "Длина Ñертификата Ñервера или глубина цепочки Ñертификатов Ñервера превышает предел, уÑтановленный криптографичеÑкой библиотекой"
+
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Люди поблизоÑти"
-#: ../libempathy/empathy-utils.c:440
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! ЯпониÑ"
-#: ../libempathy/empathy-utils.c:441
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "БеÑеда Facebook"
@@ -666,58 +678,88 @@ msgstr "в будущем"
msgid "All"
msgstr "Ð’Ñе"
-#: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:605
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+msgid "Password"
+msgstr "Пароль"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "Сервер"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "Порт"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1136
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:"
-#: ../libempathy-gtk/empathy-account-widget.c:1479
+#: ../libempathy-gtk/empathy-account-widget.c:1521
+msgid "A_pply"
+msgstr "П_рименить"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "_Войти"
-#: ../libempathy-gtk/empathy-account-widget.c:1547
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ:"
-#: ../libempathy-gtk/empathy-account-widget.c:1558
-msgid "Enabled"
-msgstr "Включено"
+#: ../libempathy-gtk/empathy-account-widget.c:1628
+msgid "_Enabled"
+msgstr "_Включено"
-#: ../libempathy-gtk/empathy-account-widget.c:1623
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Эта ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ уже ÑущеÑтвует на Ñервере"
-#: ../libempathy-gtk/empathy-account-widget.c:1626
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Создать новую учётную запиÑÑŒ на Ñервере"
+#: ../libempathy-gtk/empathy-account-widget.c:1789
+msgid "Ca_ncel"
+msgstr "О_тменить"
+
#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
#. * 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:1995
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s на %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:2021
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2025
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "ÐÐ¾Ð²Ð°Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
@@ -739,11 +781,11 @@ msgstr "Дополнительно"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "_Пароль:"
@@ -764,7 +806,7 @@ msgstr "Какое у Ð²Ð°Ñ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ AIM?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "П_орт:"
@@ -773,7 +815,7 @@ msgstr "П_орт:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Сервер:"
@@ -784,7 +826,7 @@ msgid "<b>Example:</b> username"
msgstr "<b>Пример:</b> имÑ_пользователÑ"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "_Идентификатор:"
@@ -802,26 +844,22 @@ msgid "<b>Example:</b> 123456789"
msgstr "<b>Пример:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "_Кодировка:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
msgstr "ICQ _UIN:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
msgid "What is your ICQ UIN?"
msgstr "Какой у Ð²Ð°Ñ ICQ UIN?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
msgid "What is your ICQ password?"
msgstr "Какой у Ð²Ð°Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "_Кодировка:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
-msgid "New Network"
-msgstr "ÐÐ¾Ð²Ð°Ñ Ñеть"
-
#: ../libempathy-gtk/empathy-account-widget-sip.c:183
#: ../libempathy-gtk/empathy-account-widget-sip.c:216
msgid "Auto"
@@ -857,7 +895,7 @@ msgstr "ОтÑутÑтвует"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
msgid "Character set:"
-msgstr "_Кодировка:"
+msgstr "Кодировка:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Network"
@@ -887,6 +925,14 @@ msgstr "ÐаÑтоÑщее имÑ:"
msgid "Servers"
msgstr "Серверы"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "Какой у Ð²Ð°Ñ Ð¿Ñевдоним в IRC?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "ÐšÐ°ÐºÐ°Ñ Ñеть IRC?"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "<b>Example:</b> user@gmail.com"
msgstr "<b>Пример:</b> пользователь@gmail.com"
@@ -895,75 +941,73 @@ msgstr "<b>Пример:</b> пользователь@gmail.com"
msgid "<b>Example:</b> user@jabber.org"
msgstr "<b>Пример:</b> пользователь@jabber.org"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "ТребуетÑÑ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²_ание (TLS/SSL)"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr "_Игнорировать ошибки Ñертификатов SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Override server settings"
msgstr "Замещать наÑтройки Ñервера"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
msgstr "При_оритет:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "Reso_urce:"
msgstr "Ре_ÑурÑ:"
#. 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
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
-"Facebook username if you don't have one."
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a Facebook username if you don't have one."
msgstr ""
"Это ваше Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, а не Ð¸Ð¼Ñ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° в ÑиÑтему Facebook.\n"
"ЕÑли ваш Ð°Ð´Ñ€ÐµÑ facebook.com/<b>badger</b>, введите <b>badger</b>.\n"
-"ИÑпользуйте <a href=\"http://www.facebook.com/username/\">Ñту Ñтраницу</a> "
-"Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° имени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Facebook, еÑли у Ð²Ð°Ñ ÐµÐ³Ð¾ ещё нет."
+"ИÑпользуйте <a href=\"http://www.facebook.com/username/\">Ñту Ñтраницу</a> Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° имени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Facebook, еÑли у Ð²Ð°Ñ ÐµÐ³Ð¾ ещё нет."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "Use old SS_L"
msgstr "ИÑпользовать Ñтарое _шифрование (SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Facebook password?"
msgstr "Какой у Ð²Ð°Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook username?"
msgstr "Какое у Ð²Ð°Ñ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Google ID?"
msgstr "Какой у Ð²Ð°Ñ Google ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google password?"
msgstr "Какой у Ð²Ð°Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Jabber ID?"
msgstr "Какой у Ð²Ð°Ñ Jabber ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber password?"
msgstr "Какой у Ð²Ð°Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your desired Jabber ID?"
msgstr "Какой Jabber ID вы хотите?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber password?"
msgstr "Какой пароль Jabber вы хотите?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Encryption required (TLS/SSL)"
-msgstr "ТребуетÑÑ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²_ание (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "_Ignore SSL certificate errors"
-msgstr "_Игнорировать ошибки Ñертификатов SSL"
-
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Пример:</b> user@hotmail.com"
@@ -977,25 +1021,25 @@ msgid "What is your Windows Live password?"
msgstr "Какой у Ð²Ð°Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Windows Live?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr "_Ð­Ð»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð°:"
+msgid "E-_mail address:"
+msgstr "Ð_Ð´Ñ€ÐµÑ Ñл. почты:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "_ПÑевдоним:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_First Name:"
msgstr "_ИмÑ:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID:"
msgstr "_Jabber ID:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Last Name:"
msgstr "_ФамилиÑ:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "_ПÑевдоним:"
-
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "_ИмÑ:"
@@ -1073,26 +1117,22 @@ msgid "_Username:"
msgstr "_ИмÑ:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo! Japan"
-msgstr "ИÑпользовать _Yahoo! ЯпониÑ"
+msgid "I_gnore conference and chat room invitations"
+msgstr "_Игнорировать Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ Ðº беÑедам и конференциÑм"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! ID?"
msgstr "Какой у Ð²Ð°Ñ Yahoo! ID?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Какой у Ð²Ð°Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Yahoo! ?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "Yahoo! I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "_Игнорировать Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ Ðº беÑедам и конференциÑм"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "_Локаль ÑпиÑка беÑед:"
@@ -1103,8 +1143,7 @@ msgstr "Ðе удалоÑÑŒ преобразовать изображение"
#: ../libempathy-gtk/empathy-avatar-chooser.c:444
msgid "None of the accepted image formats are supported on your system"
-msgstr ""
-"Ðи один из разрешённых форматов изображений не поддерживаетÑÑ Ð² вашей ÑиÑтеме"
+msgstr "Ðи один из разрешённых форматов изображений не поддерживаетÑÑ Ð² вашей ÑиÑтеме"
#: ../libempathy-gtk/empathy-avatar-chooser.c:935
msgid "Select Your Avatar Image"
@@ -1122,150 +1161,141 @@ msgstr "ИзображениÑ"
msgid "All Files"
msgstr "Ð’Ñе файлы"
-#: ../libempathy-gtk/empathy-avatar-image.c:325
+#: ../libempathy-gtk/empathy-avatar-image.c:323
msgid "Click to enlarge"
msgstr "Щёлкните Ð´Ð»Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð¸Ñ"
-#: ../libempathy-gtk/empathy-chat.c:645
+#: ../libempathy-gtk/empathy-chat.c:642
msgid "Failed to open private chat"
msgstr "Ðе удалоÑÑŒ открыть личную беÑеду"
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
msgstr "Ð’ Ñтой беÑеде темы не поддерживаютÑÑ"
-#: ../libempathy-gtk/empathy-chat.c:691
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
msgstr "Ð’Ñ‹ не можете менÑÑ‚ÑŒ тему"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: очиÑтить вÑе ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² текущей беÑеде"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <тема>: уÑтановить тему текущей беÑеды"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID комнаты>: войти в новую комнату"
-#: ../libempathy-gtk/empathy-chat.c:834
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID комнаты>: войти в новую комнату"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <ID контакта> [<Ñообщение>]: открыть личную беÑеду"
-#: ../libempathy-gtk/empathy-chat.c:842
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <ID контакта> <Ñообщение>: открыть личную беÑеду"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <пÑевдоним>: изменить пÑевдоним на текущем Ñервере"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <Ñообщение>: отправить Ñообщение о ДЕЙСТВИИ"
-#: ../libempathy-gtk/empathy-chat.c:852
-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 ""
-"/say <Ñообщение>: отправить <Ñообщение> в текущей беÑеде. ИÑпользуетÑÑ Ð´Ð»Ñ "
-"отправки ÑообщениÑ, начинающегоÑÑ Ñ Â«/». Ðапример: «/say /join иÑпользуетÑÑ "
-"Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° в новую комнату»"
+#: ../libempathy-gtk/empathy-chat.c:849
+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 "/say <Ñообщение>: отправить <Ñообщение> в текущей беÑеде. ИÑпользуетÑÑ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ ÑообщениÑ, начинающегоÑÑ Ñ Â«/». Ðапример: «/say /join иÑпользуетÑÑ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° в новую комнату»"
-#: ../libempathy-gtk/empathy-chat.c:857
-msgid ""
-"/help [<command>]: show all supported commands. If <command> is defined, "
-"show its usage."
-msgstr ""
-"/help [<команда>]: показать вÑе поддерживаемые команды. ЕÑли <команда> "
-"определена, показать её иÑпользование."
+#: ../libempathy-gtk/empathy-chat.c:854
+msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
+msgstr "/help [<команда>]: показать вÑе поддерживаемые команды. ЕÑли <команда> определена, показать её иÑпользование."
-#: ../libempathy-gtk/empathy-chat.c:867
+#: ../libempathy-gtk/empathy-chat.c:864
#, c-format
msgid "Usage: %s"
msgstr "ИÑпользование: %s"
-#: ../libempathy-gtk/empathy-chat.c:896
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
-#: ../libempathy-gtk/empathy-chat.c:1017
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°; Ð´Ð»Ñ Ð²Ñех доÑтупных команд Ñм. /help"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "не в Ñети"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "неверный ÑобеÑедник"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "отказано"
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "Ñлишком длинное Ñообщение"
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "Ñта возможноÑÑ‚ÑŒ не Ñанкционирована"
-#: ../libempathy-gtk/empathy-chat.c:1170
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "неизвеÑтно"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1172
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Ошибка при отправке ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Â«%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1284 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282
+#: ../src/empathy-chat-window.c:691
msgid "Topic:"
msgstr "Тема:"
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "Тема: %s"
-#: ../libempathy-gtk/empathy-chat.c:1298
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "Тема не уÑтановлена"
-#: ../libempathy-gtk/empathy-chat.c:1777
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(Ðет предположений)"
-#: ../libempathy-gtk/empathy-chat.c:1831
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "Ð’Ñтавить улыбку"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1849
-#: ../libempathy-gtk/empathy-ui-utils.c:1799
+#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "_Send"
msgstr "От_править"
-#: ../libempathy-gtk/empathy-chat.c:1883
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "_Варианты правопиÑаниÑ"
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
msgstr "Ðе удалоÑÑŒ получить поÑледние журналы"
-#: ../libempathy-gtk/empathy-chat.c:2066
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "%s отключилÑÑ"
@@ -1273,12 +1303,12 @@ msgstr "%s отключилÑÑ"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2073
+#: ../libempathy-gtk/empathy-chat.c:2071
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s выгнал %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2076
+#: ../libempathy-gtk/empathy-chat.c:2074
#, c-format
msgid "%s was kicked"
msgstr "%s выгнали"
@@ -1286,17 +1316,17 @@ msgstr "%s выгнали"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2084
+#: ../libempathy-gtk/empathy-chat.c:2082
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s забанил %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2087
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
msgstr "%s забанили"
-#: ../libempathy-gtk/empathy-chat.c:2091
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
msgstr "%s покинул беÑеду"
@@ -1306,47 +1336,48 @@ msgstr "%s покинул беÑеду"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2100
+#: ../libempathy-gtk/empathy-chat.c:2098
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
msgstr "%s приÑоединилÑÑ Ðº беÑеде"
-#: ../libempathy-gtk/empathy-chat.c:2150
+#: ../libempathy-gtk/empathy-chat.c:2148
#, c-format
msgid "%s is now known as %s"
msgstr "%s теперь извеÑтен как %s"
-#: ../libempathy-gtk/empathy-chat.c:2289 ../src/empathy-call-window.c:1802
+#: ../libempathy-gtk/empathy-chat.c:2287
+#: ../src/empathy-call-window.c:1932
msgid "Disconnected"
msgstr "ОтÑоединён"
-#: ../libempathy-gtk/empathy-chat.c:2927
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "Ðеправильный пароль. Попробуйте Ñнова:"
-#: ../libempathy-gtk/empathy-chat.c:2928
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "Повторить"
-#: ../libempathy-gtk/empathy-chat.c:2933
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "Эта комната защищена паролем:"
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
msgstr "Войти"
-#: ../libempathy-gtk/empathy-chat.c:3074
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "Соединён"
-#: ../libempathy-gtk/empathy-chat.c:3127
-#: ../libempathy-gtk/empathy-log-window.c:639
+#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "БеÑеда"
@@ -1369,6 +1400,7 @@ msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
#: ../libempathy-gtk/empathy-contact-dialogs.c:243
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
msgid "Edit Contact Information"
msgstr "Редактировать информацию о ÑобеÑеднике"
@@ -1389,101 +1421,110 @@ msgstr "Решить _позже"
msgid "Subscription Request"
msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° подпиÑку"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:1999
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Без группы"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+#| msgid "Favorite"
+msgid "Favorite People"
+msgstr "Любимые люди"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Вы хотите удалить группу «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2008
-#: ../libempathy-gtk/empathy-individual-view.c:2002
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2235
msgid "Removing group"
-msgstr "УдалÑÑŽ группу"
+msgstr "Удаление группы"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2057
-#: ../libempathy-gtk/empathy-contact-list-view.c:2134
-#: ../libempathy-gtk/empathy-individual-view.c:2056
-#: ../libempathy-gtk/empathy-individual-view.c:2141
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-contact-list-view.c:2055
+#: ../libempathy-gtk/empathy-contact-list-view.c:2132
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Удалить"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2087
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2320
#, c-format
msgid "Do you really want to remove the contact '%s'?"
-msgstr "Ð’Ñ‹ хотите удалить Ñтого ÑобеÑедника «%s» из вашего ÑпиÑка?"
+msgstr "ДейÑтвительно хотите удалить ÑобеÑедника «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2089
-#: ../libempathy-gtk/empathy-individual-view.c:2089
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
-msgstr "УдалÑÑŽ ÑобеÑедника"
+msgstr "Удаление ÑобеÑедника"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../libempathy-gtk/empathy-individual-menu.c:223
#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "_Добавить ÑобеÑедника…"
-#: ../libempathy-gtk/empathy-contact-menu.c:231
-#: ../libempathy-gtk/empathy-individual-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:514
#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "_Разговор"
-#: ../libempathy-gtk/empathy-contact-menu.c:261
-#: ../libempathy-gtk/empathy-individual-menu.c:306
+#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-individual-menu.c:557
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Ðудиовызов"
-#: ../libempathy-gtk/empathy-contact-menu.c:291
-#: ../libempathy-gtk/empathy-individual-menu.c:351
+#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-individual-menu.c:599
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Видеовызов"
-#: ../libempathy-gtk/empathy-contact-menu.c:331
-#: ../libempathy-gtk/empathy-individual-menu.c:403
+#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-individual-menu.c:642
#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "Предыдущие _беÑеды"
-#: ../libempathy-gtk/empathy-contact-menu.c:353
-#: ../libempathy-gtk/empathy-individual-menu.c:444
+#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:683
msgid "Send File"
msgstr "Отправить файл"
-#: ../libempathy-gtk/empathy-contact-menu.c:376
-#: ../libempathy-gtk/empathy-individual-menu.c:486
+#: ../libempathy-gtk/empathy-contact-menu.c:375
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Share My Desktop"
msgstr "ПредоÑтавить доÑтуп к моему рабочему Ñтолу"
-#: ../libempathy-gtk/empathy-contact-menu.c:416
-#: ../libempathy-gtk/empathy-contact-widget.c:1801
-#: ../libempathy-gtk/empathy-individual-menu.c:515
+#: ../libempathy-gtk/empathy-contact-menu.c:415
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
msgstr "Любимый"
-#: ../libempathy-gtk/empathy-contact-menu.c:445
-#: ../libempathy-gtk/empathy-individual-menu.c:547
+#: ../libempathy-gtk/empathy-contact-menu.c:444
+#: ../libempathy-gtk/empathy-individual-menu.c:786
msgid "Infor_mation"
msgstr "Информ_ациÑ"
-#: ../libempathy-gtk/empathy-contact-menu.c:491
+#: ../libempathy-gtk/empathy-contact-menu.c:490
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Правка"
-#: ../libempathy-gtk/empathy-contact-menu.c:545
-#: ../libempathy-gtk/empathy-individual-menu.c:664
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+#: ../libempathy-gtk/empathy-individual-menu.c:970
#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "Приглашение в комнату"
-#: ../libempathy-gtk/empathy-contact-menu.c:576
-#: ../libempathy-gtk/empathy-individual-menu.c:702
+#: ../libempathy-gtk/empathy-contact-menu.c:575
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
msgid "_Invite to Chat Room"
msgstr "_ПриглаÑить в комнату"
@@ -1491,157 +1532,188 @@ msgstr "_ПриглаÑить в комнату"
msgid "Select a contact"
msgstr "Выберите контакт"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Full name:"
msgstr "Полное имÑ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "Phone number:"
-msgstr ""
+msgstr "Ðомер телефона:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "E-mail address:"
msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты:"
-#: ../libempathy-gtk/empathy-contact-widget.c:222
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Website:"
msgstr "Веб-Ñайт:"
-#: ../libempathy-gtk/empathy-contact-widget.c:223
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-individual-widget.c:152
msgid "Birthday:"
msgstr "День рождениÑ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-msgid "Select"
-msgstr "Выбрать"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../src/empathy-main-window.c:1195
-msgid "Group"
-msgstr "Группа"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:578
+#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Код ISO Ñтраны:"
-#: ../libempathy-gtk/empathy-contact-widget.c:843
+#: ../libempathy-gtk/empathy-contact-widget.c:580
+#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Страна:"
-#: ../libempathy-gtk/empathy-contact-widget.c:845
+#: ../libempathy-gtk/empathy-contact-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Штат:"
-#: ../libempathy-gtk/empathy-contact-widget.c:847
+#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Город:"
-#: ../libempathy-gtk/empathy-contact-widget.c:849
+#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "ОблаÑÑ‚ÑŒ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:851
+#: ../libempathy-gtk/empathy-contact-widget.c:588
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Почтовый индекÑ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:853
+#: ../libempathy-gtk/empathy-contact-widget.c:590
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Улица:"
-#: ../libempathy-gtk/empathy-contact-widget.c:855
+#: ../libempathy-gtk/empathy-contact-widget.c:592
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Здание:"
-#: ../libempathy-gtk/empathy-contact-widget.c:857
+#: ../libempathy-gtk/empathy-contact-widget.c:594
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Этаж:"
-#: ../libempathy-gtk/empathy-contact-widget.c:859
+#: ../libempathy-gtk/empathy-contact-widget.c:596
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Комната:"
-#: ../libempathy-gtk/empathy-contact-widget.c:861
+#: ../libempathy-gtk/empathy-contact-widget.c:598
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "ТекÑÑ‚:"
-#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "ОпиÑание:"
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:602
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "ТочноÑÑ‚ÑŒ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:869
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Ошибка:"
-#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Ошибка по вертикали (в метрах):"
-#: ../libempathy-gtk/empathy-contact-widget.c:873
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Ошибка по горизонтали (в метрах):"
-#: ../libempathy-gtk/empathy-contact-widget.c:875
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "СкороÑÑ‚ÑŒ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:877
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Ðзимут:"
-#: ../libempathy-gtk/empathy-contact-widget.c:879
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "СкороÑÑ‚ÑŒ набора выÑоты:"
-#: ../libempathy-gtk/empathy-contact-widget.c:881
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "ПоÑледнее обновление:"
-#: ../libempathy-gtk/empathy-contact-widget.c:883
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Долгота:"
-#: ../libempathy-gtk/empathy-contact-widget.c:885
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Широта:"
-#: ../libempathy-gtk/empathy-contact-widget.c:887
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Ð’Ñ‹Ñота:"
-#: ../libempathy-gtk/empathy-contact-widget.c:950
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "МеÑтоположение"
-#: ../libempathy-gtk/empathy-contact-widget.c:966
-msgid "<b>Location</b>, "
-msgstr "<b>МеÑтоположение</b>,"
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:601
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
+#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%e %b %Y в %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:1100
+#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Сохранить аватар"
-#: ../libempathy-gtk/empathy-contact-widget.c:1156
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
-msgstr "Ðевозможно Ñохранить аватар"
+msgstr "ÐеудалоÑÑŒ Ñохранить аватар"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
msgstr "<b>МеÑтоположение</b> от (дата)\t"
+#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
msgstr "Прозвище:"
@@ -1654,86 +1726,183 @@ msgid "Client:"
msgstr "Программа:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
msgid "Contact Details"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ÑобеÑеднике"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-msgid "Groups"
-msgstr "Группы"
-
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
msgid "Identifier:"
msgstr "Идентификатор:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð°..."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "OS:"
msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ ÑиÑтема:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
-msgid ""
-"Select the groups you want this contact to appear in. Note that you can "
-"select more than one group or no groups."
-msgstr ""
-"Выберите группы, в которых должен поÑвитьÑÑ ÑобеÑедник. Можно выбрать больше "
-"одной группы или не выбирать вообще."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
msgid "Version:"
msgstr "ВерÑиÑ:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "Группы"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:344
+msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups."
+msgstr "Выберите группы, в которых должен поÑвитьÑÑ ÑобеÑедник. Можно выбрать больше одной группы или не выбирать вообще."
+
+#: ../libempathy-gtk/empathy-groups-widget.c:363
msgid "_Add Group"
msgstr "_Добавить группу"
-#: ../libempathy-gtk/empathy-individual-menu.c:603
-#, fuzzy
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+msgid "Select"
+msgstr "Выбрать"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-main-window.c:1247
+msgid "Group"
+msgstr "Группа"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+msgid "Linked Contacts"
+msgstr "Объединённые контакты"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+msgid "Select contacts to link"
+msgstr "Выбрать контакты Ð´Ð»Ñ ÑвÑзи"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:428
+msgid "New contact preview"
+msgstr "ПредпроÑмотр нового ÑобеÑедника"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "Контакты, выбранные в ÑпиÑке Ñлева, будут объединены."
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:837
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Правка"
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:863
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr "_Объединить контакты…"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] "Метаконтакт, Ñодержащий %u контакт"
+msgstr[1] "Метаконтакт, Ñодержащий %u контакта"
+msgstr[2] "Метаконтакт, Ñодержащий %u контактов"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>МеÑтоположение</b> от (дата)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "ÐÐ¾Ð²Ð°Ñ Ñеть"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+msgid "Choose an IRC network"
+msgstr "Выберите Ñеть IRC"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "новый Ñервер"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "Сервер"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "Порт"
-
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "Шифрование SSL"
-#: ../libempathy-gtk/empathy-log-window.c:632
-#: ../src/empathy-import-widget.c:312
-msgid "Account"
-msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:116
+msgid "Link Contacts"
+msgstr "СвÑзь Ñ ÑобеÑедниками"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "_Разъединить…"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
+msgid "Completely split the displayed meta-contact into the contacts it contains."
+msgstr "ПолноÑтью разбить метаконтакт на контакты, которые в нём ÑодержатÑÑ"
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:137
+msgid "_Link"
+msgstr "_СвÑзь"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr "Разъединить метаконтакт «%s»?"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+msgid "Are you sure you want to unlink this meta-contact? This will completely split the meta-contact into the contacts it contains."
+msgstr "ДейÑтвительно разъединить Ñтот метаконтакт? Это полноÑтью разобъёт метаконтакт на контакты, которые в нём ÑодержатÑÑ."
-#: ../libempathy-gtk/empathy-log-window.c:649
+#: ../libempathy-gtk/empathy-linking-dialog.c:191
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "_Разъединить"
+
+#: ../libempathy-gtk/empathy-log-window.c:663
msgid "Date"
msgstr "Дата"
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
msgid "Conversations"
msgstr "БеÑеды"
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+msgid "Find Next"
+msgstr "Ðайти далее"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+msgid "Find Previous"
+msgstr "Ðайти предыдущее"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
msgid "Previous Conversations"
msgstr "Предыдущие беÑеды"
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
msgid "Search"
msgstr "ПоиÑк"
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "_For:"
msgstr "_ДлÑ:"
@@ -1752,18 +1921,17 @@ msgid "New Conversation"
msgstr "ÐÐ¾Ð²Ð°Ñ Ð±ÐµÑеда"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:190
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
msgid "Send _Video"
msgstr "_Передавать видео"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:198
-#: ../src/empathy-call-window.ui.h:22
-msgid "_Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
msgstr "_Вызов"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:208
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
msgid "New Call"
msgstr "Ðовый вызов"
@@ -1838,11 +2006,11 @@ msgstr "Контакт вышел из Ñети"
#: ../libempathy-gtk/empathy-sound.c:60
msgid "Connected to server"
-msgstr "Соединение"
+msgstr "Соединён Ñ Ñервером"
#: ../libempathy-gtk/empathy-sound.c:62
msgid "Disconnected from server"
-msgstr "ОтÑоединение от Ñервера"
+msgstr "ОтÑоединён от Ñервера"
#: ../libempathy-gtk/empathy-sound.c:64
msgid "Incoming voice call"
@@ -1888,18 +2056,88 @@ msgstr "ЯÑнаÑ"
msgid "Blue"
msgstr "ГолубаÑ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1696
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr "ИдентичноÑÑ‚ÑŒ, предоÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ñ‡Ð°Ñ‚-Ñервером, не может быть проверена.\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certificate is not signed by a Certification Authority"
+msgstr "Сертификат не подпиÑан центром Ñертификации"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "Сертификат уÑтарел"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "Сертификат ещё не активирован"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "Сертификат не Ñодержит ожидаемого отпечатка"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr "Ð˜Ð¼Ñ ÑƒÐ·Ð»Ð°, подтверждённое Ñертификатом, не Ñовпадает Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Ñервера"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "Сертификат подпиÑан ÑамоÑтоÑтельно"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr "Сертификат отозван центром Ñертификации"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr "Сертификат криптографичеÑки Ñлаб"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "Длина Ñертификата выходит за контролируемые рамки"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "Ðеверный Ñертификат"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "Ожидаемое Ð¸Ð¼Ñ ÑƒÐ·Ð»Ð°: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "Ð˜Ð¼Ñ ÑƒÐ·Ð»Ð° Ñертификата: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "Продолжить"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "Данное Ñоединение не ÑвлÑетÑÑ Ð´Ð¾Ð²ÐµÑ€ÐµÐ½Ð½Ñ‹Ð¼. Ð’ÑÑ‘ равно продолжить?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "Запомнить выбор Ð´Ð»Ñ Ð¿Ð¾Ñледующих Ñоединений"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "ПодробноÑти о Ñертификате"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1698
msgid "Unable to open URI"
msgstr "Ðевозможно открыть URL"
-#: ../libempathy-gtk/empathy-ui-utils.c:1791
+#: ../libempathy-gtk/empathy-ui-utils.c:1793
msgid "Select a file"
msgstr "Выберите файл"
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#, c-format
msgid "Incoming file from %s"
-msgstr "ВходÑщий вызов от %s"
+msgstr "ВходÑщий файл от %s"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -2080,57 +2318,33 @@ msgstr "Выбранный ÑобеÑедник не в Ñети."
msgid "No error message"
msgstr "Сообщение об ошибке отÑутÑтвует"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
msgid "Instant Message (Empathy)"
msgstr "Мгновенное Ñообщение (Empathy)"
-#: ../src/empathy.c:474
+#: ../src/empathy.c:414
msgid "Don't connect on startup"
msgstr "Ðе ÑоединÑÑ‚ÑŒÑÑ Ð¿Ñ€Ð¸ запуÑке"
-#: ../src/empathy.c:478
+#: ../src/empathy.c:418
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Ðе показывать ÑпиÑок ÑобеÑедников и диалоговые окна при запуÑке"
-#: ../src/empathy.c:490
+#: ../src/empathy.c:435
msgid "- Empathy IM Client"
-msgstr " - клиент обмена мгновенными ÑообщениÑми Empathy"
+msgstr " — клиент обмена мгновенными ÑообщениÑми Empathy"
#: ../src/empathy-about-dialog.c:85
-msgid ""
-"Empathy is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
-msgstr ""
-"Empathy — ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°, вы можете раÑпроÑтранÑÑ‚ÑŒ и/или модифицировать "
-"её на уÑловиÑÑ…, указанных в GNU General Public License опубликованой Free "
-"Software Foundation; либо в верÑии 2 или (по вашему выбору) любой более "
-"поздней верÑии."
+msgid "Empathy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+msgstr "Empathy — ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°, вы можете раÑпроÑтранÑÑ‚ÑŒ и/или модифицировать её на уÑловиÑÑ…, указанных в GNU General Public License опубликованой Free Software Foundation; либо в верÑии 2 или (по вашему выбору) любой более поздней верÑии."
#: ../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."
-msgstr ""
-"Программа Empathy раÑпроÑтранÑетÑÑ Ð² раÑчёте на то, что будет полезной, "
-"однако БЕЗ КÐКИХ ЛИБО ГÐРÐÐТИЙ в том чиÑле подразумеваемых гарантий "
-"ПОЛЕЗÐОСТИ или ПРИГОДÐОСТИ ДЛЯ КÐКИХ_ЛИБО ЦЕЛЕЙ. Смотрите GNU General Public "
-"License."
+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."
+msgstr "Программа Empathy раÑпроÑтранÑетÑÑ Ð² раÑчёте на то, что будет полезной, однако БЕЗ КÐКИХ ЛИБО ГÐРÐÐТИЙ в том чиÑле подразумеваемых гарантий ПОЛЕЗÐОСТИ или ПРИГОДÐОСТИ ДЛЯ КÐКИХ_ЛИБО ЦЕЛЕЙ. Смотрите GNU General Public License."
#: ../src/empathy-about-dialog.c:93
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr ""
-"Ð’Ñ‹ должны были получить копию GNU General Public License вмеÑте Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð¾Ð¹ "
-"Empathy. ЕÑли Ñтого не произошло, напишите в Фонд Свободного Программного "
-"ОбеÑпечениÑ: Free Software Foundation, Inc., 51 Franklin Street, Fifth "
-"Floor, Boston, MA 02110-130159 USA"
+msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr "Ð’Ñ‹ должны были получить копию GNU General Public License вмеÑте Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð¾Ð¹ Empathy. ЕÑли Ñтого не произошло, напишите в Фонд Свободного Программного ОбеÑпечениÑ: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
@@ -2166,16 +2380,11 @@ msgid "The error message was: %s"
msgstr "Сообщение об ошибке: %s"
#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Ð’Ñ‹ можете вернутьÑÑ Ð½Ð°Ð·Ð°Ð´ и попытатьÑÑ Ð²Ð²ÐµÑти информацию об учётной запиÑи "
-"ещё раз, или закрыть Ñтот маÑтер и добавить учётные запиÑи позже из меню "
-"«Правка»."
+msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
+msgstr "Ð’Ñ‹ можете вернутьÑÑ Ð½Ð°Ð·Ð°Ð´ и попытатьÑÑ Ð²Ð²ÐµÑти информацию об учётной запиÑи ещё раз, или закрыть Ñтот маÑтер и добавить учётные запиÑи позже из меню «Правка»."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1315
+#: ../src/empathy-account-assistant.c:1316
msgid "An error occurred"
msgstr "Произошла ошибка"
@@ -2184,132 +2393,108 @@ msgstr "Произошла ошибка"
#. 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:604
+#: ../src/empathy-account-assistant.c:412
+#: ../src/empathy-accounts-dialog.c:614
#, c-format
msgid "New %s account"
msgstr "ÐÐ¾Ð²Ð°Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ %s"
-#: ../src/empathy-account-assistant.c:510
+#: ../src/empathy-account-assistant.c:515
msgid "What kind of chat account do you have?"
msgstr "Какой у Ð²Ð°Ñ Ñ‚Ð¸Ð¿ учётной запиÑи?"
-#: ../src/empathy-account-assistant.c:516
+#: ../src/empathy-account-assistant.c:521
msgid "Do you have any other chat accounts you want to set up?"
msgstr "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ ещё какие-нибудь учётные запиÑи Ð´Ð»Ñ Ð½Ð°Ñтройки?"
-#: ../src/empathy-account-assistant.c:522
+#: ../src/empathy-account-assistant.c:527
msgid "Enter your account details"
msgstr "Введите информацию о вашей учётной запиÑи"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:532
msgid "What kind of chat account do you want to create?"
msgstr "Какой тип учётной запиÑи вы хотите Ñоздать?"
-#: ../src/empathy-account-assistant.c:533
+#: ../src/empathy-account-assistant.c:538
msgid "Do you want to create other chat accounts?"
msgstr "Хотите Ñоздать другие учётные запиÑи?"
-#: ../src/empathy-account-assistant.c:540
+#: ../src/empathy-account-assistant.c:545
msgid "Enter the details for the new account"
msgstr "Введите информацию о новой учётной запиÑи"
-#: ../src/empathy-account-assistant.c:655
-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 "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"С помощью Empathy можно общатьÑÑ Ñ Ð»ÑŽÐ´ÑŒÐ¼Ð¸, находÑщимиÑÑ Ð¿Ð¾Ð±Ð»Ð¸Ð·Ð¾Ñти, а также "
-"Ñ Ð´Ñ€ÑƒÐ·ÑŒÑми и коллегами, иÑпользующими Google Talk, AIM, Windows Live и "
-"многие другие программы. При наличии микрофона и веб-камеры можно Ñовершать "
-"аудио- и видеовызовы."
+#: ../src/empathy-account-assistant.c:660
+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 programs. With a microphone or a webcam you can also have audio or video calls."
+msgstr "С помощью Empathy можно общатьÑÑ Ñ Ð»ÑŽÐ´ÑŒÐ¼Ð¸, находÑщимиÑÑ Ð¿Ð¾Ð±Ð»Ð¸Ð·Ð¾Ñти, а также Ñ Ð´Ñ€ÑƒÐ·ÑŒÑми и коллегами, иÑпользующими Google Talk, AIM, Windows Live и многие другие программы. При наличии микрофона и веб-камеры можно Ñовершать аудио- и видеовызовы."
-#: ../src/empathy-account-assistant.c:672
+#: ../src/empathy-account-assistant.c:677
msgid "Do you have an account you've been using with another chat program?"
msgstr "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ, которую вы иÑпользовали в другой программе?"
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:700
msgid "Yes, import my account details from "
msgstr "Да, импортировать информацию о моей учётной запиÑи"
-#: ../src/empathy-account-assistant.c:716
+#: ../src/empathy-account-assistant.c:721
msgid "Yes, I'll enter my account details now"
msgstr "Да, Ñ ÑÐµÐ¹Ñ‡Ð°Ñ Ð²Ð²ÐµÐ´Ñƒ информацию об учётной запиÑи"
-#: ../src/empathy-account-assistant.c:738
+#: ../src/empathy-account-assistant.c:743
msgid "No, I want a new account"
msgstr "Ðет, Ñ Ñ…Ð¾Ñ‡Ñƒ новую учётную запиÑÑŒ"
-#: ../src/empathy-account-assistant.c:748
+#: ../src/empathy-account-assistant.c:753
msgid "No, I just want to see people online nearby for now"
msgstr "Ðет, Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ хочу найти поблизоÑти людей в Ñети"
-#: ../src/empathy-account-assistant.c:769
+#: ../src/empathy-account-assistant.c:774
msgid "Select the accounts you want to import:"
msgstr "Выберите учётные запиÑи Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ:"
-#: ../src/empathy-account-assistant.c:853
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Да"
-#: ../src/empathy-account-assistant.c:860
+#: ../src/empathy-account-assistant.c:865
msgid "No, that's all for now"
msgstr "Ðет, на данный момент Ñто вÑÑ‘"
-#: ../src/empathy-account-assistant.c:1129
-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 "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy может автоматичеÑки найти людей, подключённых к той же Ñети, что и "
-"вы. ЕÑли вы хотите иÑпользовать Ñту возможноÑÑ‚ÑŒ, отметьте, что информациÑ, "
-"предÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð½Ð¸Ð¶Ðµ ÑвлÑетÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹. Ð’Ñ‹ можете изменить Ñту информацию "
-"позже или отключить Ñту возможноÑÑ‚ÑŒ, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð²Ð¾Ðµ окно «Учётные "
-"запиÑи»."
-
-#: ../src/empathy-account-assistant.c:1135
-#: ../src/empathy-account-assistant.c:1191
+#: ../src/empathy-account-assistant.c:1130
+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 details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
+msgstr "Empathy может автоматичеÑки найти людей, подключённых к той же Ñети, что и вы. ЕÑли вы хотите иÑпользовать Ñту возможноÑÑ‚ÑŒ, отметьте, что информациÑ, предÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð½Ð¸Ð¶Ðµ ÑвлÑетÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹. Ð’Ñ‹ можете изменить Ñту информацию позже или отключить Ñту возможноÑÑ‚ÑŒ, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð²Ð¾Ðµ окно «Учётные запиÑи»."
+
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
msgid "Edit->Accounts"
msgstr "Правка->Учётные запиÑи"
-#: ../src/empathy-account-assistant.c:1151
+#: ../src/empathy-account-assistant.c:1152
msgid "I don't want to enable this feature for now"
msgstr "Я не хочу ÑÐµÐ¹Ñ‡Ð°Ñ Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒ Ñту возможноÑÑ‚ÑŒ"
-#: ../src/empathy-account-assistant.c:1187
-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 "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Ð’Ñ‹ не можете общатьÑÑ Ñ Ð»ÑŽÐ´ÑŒÐ¼Ð¸, подключёнными к вашей локальной Ñети, Ñ‚. к. "
-"telepathy-salut не уÑтановлен. ЕÑли вы хотите включить Ñту возможноÑÑ‚ÑŒ, "
-"уÑтановите пакет telepathy-salut и Ñоздайте учётную запиÑÑŒ «Люди поблизоÑти» "
-"в диалоговом окне «Учётные запиÑи»"
+#: ../src/empathy-account-assistant.c:1188
+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 install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
+msgstr "Ð’Ñ‹ не можете общатьÑÑ Ñ Ð»ÑŽÐ´ÑŒÐ¼Ð¸, подключёнными к вашей локальной Ñети, Ñ‚. к. telepathy-salut не уÑтановлен. ЕÑли вы хотите включить Ñту возможноÑÑ‚ÑŒ, уÑтановите пакет telepathy-salut и Ñоздайте учётную запиÑÑŒ «Люди поблизоÑти» в диалоговом окне «Учётные запиÑи»"
-#: ../src/empathy-account-assistant.c:1193
+#: ../src/empathy-account-assistant.c:1194
msgid "telepathy-salut not installed"
msgstr "telepathy-salut не уÑтановлен"
-#: ../src/empathy-account-assistant.c:1239
+#: ../src/empathy-account-assistant.c:1240
msgid "Messaging and VoIP Accounts Assistant"
msgstr "МаÑтер учётных запиÑей обмена ÑообщениÑми и VoIP"
-#: ../src/empathy-account-assistant.c:1273
+#: ../src/empathy-account-assistant.c:1274
msgid "Welcome to Empathy"
msgstr "Добро пожаловать в Empathy"
-#: ../src/empathy-account-assistant.c:1282
+#: ../src/empathy-account-assistant.c:1283
msgid "Import your existing accounts"
msgstr "Импортировать ÑущеÑтвующие учётные запиÑи"
-#: ../src/empathy-account-assistant.c:1300
+#: ../src/empathy-account-assistant.c:1301
msgid "Please enter personal details"
msgstr "Введите перÑональную информацию"
@@ -2326,33 +2511,34 @@ msgstr "Ð’ учётной запиÑи %s имеютÑÑ Ð½ÐµÑохранённÑ
msgid "Your new account has not been saved yet."
msgstr "Ваша Ð½Ð¾Ð²Ð°Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ ещё не была Ñохранена."
-#: ../src/empathy-accounts-dialog.c:271 ../src/empathy-call-window.c:799
+#: ../src/empathy-accounts-dialog.c:281
+#: ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "Соединение…"
-#: ../src/empathy-accounts-dialog.c:312
+#: ../src/empathy-accounts-dialog.c:322
#, c-format
msgid "Offline — %s"
msgstr "Ðе в Ñети — %s"
-#: ../src/empathy-accounts-dialog.c:324
+#: ../src/empathy-accounts-dialog.c:334
#, c-format
msgid "Disconnected — %s"
msgstr "ОтÑоединён — %s"
-#: ../src/empathy-accounts-dialog.c:335
+#: ../src/empathy-accounts-dialog.c:345
msgid "Offline — No Network Connection"
msgstr "Ðе в Ñети — подключение к Ñети отÑутÑтвует"
-#: ../src/empathy-accounts-dialog.c:342
+#: ../src/empathy-accounts-dialog.c:352
msgid "Unknown Status"
msgstr "ÐеизвеÑтный ÑтатуÑ"
-#: ../src/empathy-accounts-dialog.c:354
+#: ../src/empathy-accounts-dialog.c:364
msgid "Offline — Account Disabled"
msgstr "Ðе в Ñети — ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ отключена"
-#: ../src/empathy-accounts-dialog.c:795
+#: ../src/empathy-accounts-dialog.c:811
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2360,16 +2546,16 @@ msgstr ""
"Ð’Ñ‹ ÑобираетеÑÑŒ Ñоздать новую учётную запиÑÑŒ, Ñто приведёт\n"
"к отмене Ñделанных изменений. Хотите продолжить?"
-#: ../src/empathy-accounts-dialog.c:1142
+#: ../src/empathy-accounts-dialog.c:1158
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Хотите удалить %s Ñо Ñвоего компьютера?"
-#: ../src/empathy-accounts-dialog.c:1146
+#: ../src/empathy-accounts-dialog.c:1162
msgid "This will not remove your account on the server."
msgstr "Это не приведёт к удалению вашей учётной запиÑи Ñ Ñервера."
-#: ../src/empathy-accounts-dialog.c:1383
+#: ../src/empathy-accounts-dialog.c:1400
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2377,7 +2563,7 @@ msgstr ""
"Ð’Ñ‹ ÑобираетеÑÑŒ выбрать другую учётную запиÑÑŒ, Ñто приведёт\n"
"к отмене Ñделанных изменений. Хотите продолжить?"
-#: ../src/empathy-accounts-dialog.c:1960
+#: ../src/empathy-accounts-dialog.c:2003
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2386,175 +2572,179 @@ msgstr ""
"Ñделанных изменений. Хотите продолжить?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "Загрузка информации об учётной запиÑи"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "No protocol installed"
msgstr "Ðет уÑтановленных протоколов"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Protocol:"
msgstr "Протокол:"
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid ""
-"To add a new account, you first have to install a backend for each protocol "
-"you want to use."
-msgstr ""
-"Чтобы добавить новую учётную запиÑÑŒ уÑтановите поддержку каждого "
-"необходимого протокола."
-
#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "To add a new account, you first have to install a backend for each protocol you want to use."
+msgstr "Чтобы добавить новую учётную запиÑÑŒ уÑтановите поддержку каждого необходимого протокола."
+
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
msgstr "_Добавить…"
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
msgstr "_Импорт..."
-#: ../src/empathy-auto-salut-account-helper.c:78
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr " — клиент аутентификации Empathy"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Клиент аутентификации Empathy"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
msgid "People nearby"
msgstr "Люди поблизоÑти"
#: ../src/empathy-av.c:133
-#, fuzzy
msgid "- Empathy Audio/Video Client"
-msgstr " - клиент обмена мгновенными ÑообщениÑми Empathy"
+msgstr " — клиент Empathy Ð´Ð»Ñ Ð°ÑƒÐ´Ð¸Ð¾ и видео"
#: ../src/empathy-av.c:149
-#, fuzzy
msgid "Empathy Audio/Video Client"
-msgstr "Клиент обмена мгновенными ÑообщениÑми Empathy"
+msgstr "Клиент Empathy Ð´Ð»Ñ Ð°ÑƒÐ´Ð¸Ð¾ и видео"
-#: ../src/empathy-call-window.c:470
+#: ../src/empathy-call-window.c:479
msgid "Contrast"
msgstr "КонтраÑÑ‚"
-#: ../src/empathy-call-window.c:473
+#: ../src/empathy-call-window.c:482
msgid "Brightness"
msgstr "ЯркоÑÑ‚ÑŒ"
-#: ../src/empathy-call-window.c:476
+#: ../src/empathy-call-window.c:485
msgid "Gamma"
msgstr "Гамма"
-#: ../src/empathy-call-window.c:581
+#: ../src/empathy-call-window.c:590
msgid "Volume"
msgstr "ГромкоÑÑ‚ÑŒ"
-#: ../src/empathy-call-window.c:1146
+#: ../src/empathy-call-window.c:1173
msgid "_Sidebar"
msgstr "_Ð‘Ð¾ÐºÐ¾Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ"
-#: ../src/empathy-call-window.c:1165
+#: ../src/empathy-call-window.c:1192
msgid "Audio input"
msgstr "Вход звука"
-#: ../src/empathy-call-window.c:1169
+#: ../src/empathy-call-window.c:1196
msgid "Video input"
msgstr "Вход видео"
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1200
msgid "Dialpad"
msgstr "Ð¦Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ"
-#: ../src/empathy-call-window.c:1178
-#, fuzzy
+#: ../src/empathy-call-window.c:1205
msgid "Details"
-msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ÑобеÑеднике"
+msgstr "ПодробноÑти"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1246
+#: ../src/empathy-call-window.c:1273
#, c-format
msgid "Call with %s"
msgstr "Разговор Ñ %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1352
msgid "Call"
msgstr "Вызов"
+#: ../src/empathy-call-window.c:1506
+msgid "The IP address as seen by the machine"
+msgstr "IP-адреÑ, определённый хоÑтом"
+
+#: ../src/empathy-call-window.c:1508
+msgid "The IP address as seen by a server on the Internet"
+msgstr "IP-адреÑ, определённый Ñервером в Интернете"
+
+#: ../src/empathy-call-window.c:1510
+msgid "The IP address of the peer as seen by the other side"
+msgstr "IP-Ð°Ð´Ñ€ÐµÑ Ñ‚Ð¾Ñ‡ÐºÐ¸, определённый Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ñтороны"
+
+#: ../src/empathy-call-window.c:1512
+msgid "The IP address of a relay server"
+msgstr "IP-Ð°Ð´Ñ€ÐµÑ Ñ€ÐµÑ‚Ñ€Ð°Ð½Ñлирующего Ñервера"
+
+#: ../src/empathy-call-window.c:1514
+msgid "The IP address of the multicast group"
+msgstr "Широковещательный IP-Ð°Ð´Ñ€ÐµÑ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
+
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2247
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Соединён — %d:%02dm"
-#: ../src/empathy-call-window.c:2178
+#: ../src/empathy-call-window.c:2308
msgid "Technical Details"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ÑобеÑеднике"
-#: ../src/empathy-call-window.c:2216
+#: ../src/empathy-call-window.c:2346
#, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr ""
-"Программное обеÑпечение %s не понимает аудиоформаты, поддерживаемые вашим "
-"компьютером"
+msgid "%s's software does not understand any of the audio formats supported by your computer"
+msgstr "Программное обеÑпечение %s не понимает аудиоформаты, поддерживаемые вашим компьютером"
-#: ../src/empathy-call-window.c:2221
+#: ../src/empathy-call-window.c:2351
#, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr ""
-"Программное обеÑпечение %s не понимает видеоформаты, поддерживаемые вашим "
-"компьютером"
+msgid "%s's software does not understand any of the video formats supported by your computer"
+msgstr "Программное обеÑпечение %s не понимает видеоформаты, поддерживаемые вашим компьютером"
-#: ../src/empathy-call-window.c:2227
+#: ../src/empathy-call-window.c:2357
#, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-"Ðе удалоÑÑŒ уÑтановить Ñоединение Ñ %s. Один из Ð²Ð°Ñ Ð¼Ð¾Ð¶ÐµÑ‚ находитьÑÑ Ð² Ñети, "
-"ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ðµ поддерживает прÑмые подключениÑ."
+msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
+msgstr "Ðе удалоÑÑŒ уÑтановить Ñоединение Ñ %s. Один из Ð²Ð°Ñ Ð¼Ð¾Ð¶ÐµÑ‚ находитьÑÑ Ð² Ñети, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ðµ поддерживает прÑмые подключениÑ."
-#: ../src/empathy-call-window.c:2233
+#: ../src/empathy-call-window.c:2363
msgid "There was a failure on the network"
msgstr "Сбой Ñети"
-#: ../src/empathy-call-window.c:2237
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr ""
-"Ðудиоформаты, необходимые Ð´Ð»Ñ Ñтого вызова, не уÑтановлены на вашем "
-"компьютере"
+#: ../src/empathy-call-window.c:2367
+msgid "The audio formats necessary for this call are not installed on your computer"
+msgstr "Ðудиоформаты, необходимые Ð´Ð»Ñ Ñтого вызова, не уÑтановлены на вашем компьютере"
-#: ../src/empathy-call-window.c:2240
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr ""
-"Видеоформаты, необходимые Ð´Ð»Ñ Ñтого вызова, не уÑтановлены на вашем "
-"компьютере"
+#: ../src/empathy-call-window.c:2370
+msgid "The video formats necessary for this call are not installed on your computer"
+msgstr "Видеоформаты, необходимые Ð´Ð»Ñ Ñтого вызова, не уÑтановлены на вашем компьютере"
-#: ../src/empathy-call-window.c:2250
+#: ../src/empathy-call-window.c:2380
#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"Что-то неожиданное ÑлучилоÑÑŒ Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¾Ð¼ Telepathy. <a href=\"%s"
-"\">Сообщите об Ñтой ошибке</a> и прикрепите журналы, Ñобранные из окна "
-"отладки в меню «Справка»."
+msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
+msgstr "Что-то неожиданное ÑлучилоÑÑŒ Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¾Ð¼ Telepathy. <a href=\"%s\">Сообщите об Ñтой ошибке</a> и прикрепите журналы, Ñобранные из окна отладки в меню «Справка»."
-#: ../src/empathy-call-window.c:2258
+#: ../src/empathy-call-window.c:2388
msgid "There was a failure in the call engine"
msgstr "Сбой в движке вызова"
-#: ../src/empathy-call-window.c:2297
+#: ../src/empathy-call-window.c:2391
+msgid "The end of the stream was reached"
+msgstr "ДоÑтигнут конец потока"
+
+#: ../src/empathy-call-window.c:2431
msgid "Can't establish audio stream"
msgstr "Ðе удалоÑÑŒ уÑтановить аудиопоток"
-#: ../src/empathy-call-window.c:2307
+#: ../src/empathy-call-window.c:2441
msgid "Can't establish video stream"
msgstr "Ðе удалоÑÑŒ уÑтановить видеопоток"
#: ../src/empathy-call-window.ui.h:1
-#, fuzzy
msgid "Audio"
-msgstr "ÐвтоматичеÑкий"
+msgstr "Ðудио"
#: ../src/empathy-call-window.ui.h:2
msgid "Call the contact again"
@@ -2570,7 +2760,7 @@ msgstr "Камера включена"
#: ../src/empathy-call-window.ui.h:5
msgid "Decoding Codec:"
-msgstr ""
+msgstr "Декодер:"
#: ../src/empathy-call-window.ui.h:6
msgid "Disable camera and stop sending video"
@@ -2586,7 +2776,7 @@ msgstr "Включить камеру, но не отправлÑÑ‚ÑŒ видео
#: ../src/empathy-call-window.ui.h:9
msgid "Encoding Codec:"
-msgstr ""
+msgstr "Кодер:"
#: ../src/empathy-call-window.ui.h:10
msgid "Hang up"
@@ -2597,47 +2787,60 @@ msgid "Hang up current call"
msgstr "Завершить текущий вызов"
#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Локальный кандидат:"
+
+#: ../src/empathy-call-window.ui.h:13
msgid "Preview"
msgstr "Предварительный проÑмотр"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:14
msgid "Redial"
msgstr "Перезвонить"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Удалённый кандидат:"
+
+#: ../src/empathy-call-window.ui.h:16
msgid "Send Audio"
msgstr "Передавать звук"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Включить или выключить передачу звука"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "V_ideo"
msgstr "В_идео"
-#: ../src/empathy-call-window.ui.h:18
-#, fuzzy
+#: ../src/empathy-call-window.ui.h:20
msgid "Video"
-msgstr "В_идео"
+msgstr "Видео"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Video Off"
msgstr "Видео выключено"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Video On"
msgstr "Видео включено"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Video Preview"
msgstr "Предварительный проÑмотр видео"
-#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr "_Вызов"
+
+#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:27
msgid "_View"
msgstr "_Вид"
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:452
+#: ../src/empathy-chat-window.c:472
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -2702,11 +2905,11 @@ msgid "Move Tab _Right"
msgstr "Передвинуть вкладку в_право"
#: ../src/empathy-chat-window.ui.h:8
-#, fuzzy
msgid "Notify for All Messages"
-msgstr "Сообщение об ошибке отÑутÑтвует"
+msgstr "УведомлÑÑ‚ÑŒ обо вÑех ÑообщениÑÑ…"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:16
msgid "_Contents"
msgstr "_Содержание"
@@ -2718,7 +2921,8 @@ msgstr "_БеÑеда"
msgid "_Detach Tab"
msgstr "_ОтÑоединить вкладку"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:18
msgid "_Edit"
msgstr "_Правка"
@@ -2726,7 +2930,8 @@ msgstr "_Правка"
msgid "_Favorite Chat Room"
msgstr "_Ð›ÑŽÐ±Ð¸Ð¼Ð°Ñ ÐºÐ¾Ð¼Ð½Ð°Ñ‚Ð°"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:20
msgid "_Help"
msgstr "_Справка"
@@ -2738,7 +2943,8 @@ msgstr "Ðа Ñлед_ующую вкладку"
msgid "_Previous Tab"
msgstr "Ðа пред_ыдущую вкладку"
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "_Показывать ÑпиÑок ÑобеÑедников"
@@ -2766,81 +2972,87 @@ msgstr "ÐвтоматичеÑкое Ñоединение"
msgid "Manage Favorite Rooms"
msgstr "Управление любимыми комнатами"
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:468
msgid "Incoming video call"
msgstr "ВходÑщий видеовызов"
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:468
msgid "Incoming call"
msgstr "ВходÑщий вызов"
-#: ../src/empathy-event-manager.c:477
+#: ../src/empathy-event-manager.c:472
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s делает видеовызов. Хотите ответить?"
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:473
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s вызывает ваÑ. Хотите ответить?"
-#: ../src/empathy-event-manager.c:481 ../src/empathy-event-manager.c:623
+#: ../src/empathy-event-manager.c:476
+#: ../src/empathy-event-manager.c:618
#, c-format
msgid "Incoming call from %s"
msgstr "ВходÑщий вызов от %s"
-#: ../src/empathy-event-manager.c:506
+#: ../src/empathy-event-manager.c:501
msgid "_Reject"
msgstr "_Отказать"
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:507
msgid "_Answer"
msgstr "_Ответить"
-#: ../src/empathy-event-manager.c:623
+#: ../src/empathy-event-manager.c:618
#, c-format
msgid "Incoming video call from %s"
msgstr "ВходÑщий видеовызов от %s"
-#: ../src/empathy-event-manager.c:700
+#: ../src/empathy-event-manager.c:695
msgid "Room invitation"
msgstr "Приглашение к беÑеде"
-#: ../src/empathy-event-manager.c:702
-#, fuzzy, c-format
+#: ../src/empathy-event-manager.c:697
+#, c-format
msgid "Invitation to join %s"
-msgstr "%s предложил приÑоединитьÑÑ Ðº %s"
+msgstr "Предложение приÑоединитьÑÑ Ðº %s"
-#: ../src/empathy-event-manager.c:709
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s предлагает приÑоединитьÑÑ Ðº %s"
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:712
msgid "_Decline"
msgstr "_Отклонить"
-#: ../src/empathy-event-manager.c:722
+#: ../src/empathy-event-manager.c:717
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Войти"
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:743
#, c-format
msgid "%s invited you to join %s"
msgstr "%s предложил приÑоединитьÑÑ Ðº %s"
-#: ../src/empathy-event-manager.c:787
+#: ../src/empathy-event-manager.c:749
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "Вам предложили приÑоединитьÑÑ Ðº %s"
+
+#: ../src/empathy-event-manager.c:797
#, c-format
msgid "Incoming file transfer from %s"
msgstr "ВходÑщий файл от %s"
-#: ../src/empathy-event-manager.c:988
+#: ../src/empathy-event-manager.c:1005
#, c-format
msgid "Subscription requested by %s"
msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° подпиÑку от %s"
-#: ../src/empathy-event-manager.c:992
+#: ../src/empathy-event-manager.c:1009
#, c-format
msgid ""
"\n"
@@ -2849,12 +3061,12 @@ msgstr ""
"\n"
"Сообщение: %s"
-#: ../src/empathy-event-manager.c:1035
+#: ../src/empathy-event-manager.c:1052
#, c-format
msgid "%s is now offline."
msgstr "%s вышел из Ñети."
-#: ../src/empathy-event-manager.c:1055
+#: ../src/empathy-event-manager.c:1072
#, c-format
msgid "%s is now online."
msgstr "%s в Ñети."
@@ -2936,29 +3148,32 @@ msgstr "«%s» отправлен %s"
msgid "File transfer completed"
msgstr "Передача файла завершена"
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:615
+#: ../src/empathy-ft-manager.c:782
msgid "Waiting for the other participant's response"
msgstr "Ожидание ответа от других учаÑтников"
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:641
+#: ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Проверка целоÑтноÑти «%s»"
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:644
+#: ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "Ð¥Ñширование «%s»"
-#: ../src/empathy-ft-manager.c:990
+#: ../src/empathy-ft-manager.c:996
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1002
+#: ../src/empathy-ft-manager.c:1008
msgid "File"
msgstr "Файл"
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:1030
msgid "Remaining"
msgstr "ОÑталоÑÑŒ"
@@ -2968,16 +3183,11 @@ msgstr "Передачи файлов"
#: ../src/empathy-ft-manager.ui.h:2
msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr ""
-"Удалить из ÑпиÑка завершённые, отменённые или прерванные передачи файлов"
+msgstr "Удалить из ÑпиÑка завершённые, отменённые или прерванные передачи файлов"
#: ../src/empathy-import-dialog.c:84
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"Ðе найдено учётных запиÑей Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ. Ðа данный момент возможно "
-"импортировать учётные запиÑи только из Pidgin."
+msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
+msgstr "Ðе найдено учётных запиÑей Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ. Ðа данный момент возможно импортировать учётные запиÑи только из Pidgin."
#: ../src/empathy-import-dialog.c:199
msgid "Import Accounts"
@@ -2996,27 +3206,31 @@ msgstr "Протокол"
msgid "Source"
msgstr "ИÑточник"
-#: ../src/empathy-main-window.c:476
+#: ../src/empathy-main-window.c:383
+msgid "No match found"
+msgstr "Ðет Ñовпадений"
+
+#: ../src/empathy-main-window.c:535
msgid "Reconnect"
msgstr "ПереподключитьÑÑ"
-#: ../src/empathy-main-window.c:482
+#: ../src/empathy-main-window.c:541
msgid "Edit Account"
msgstr "Правка учётной запиÑи"
-#: ../src/empathy-main-window.c:488
+#: ../src/empathy-main-window.c:547
msgid "Close"
msgstr "Закрыть"
-#: ../src/empathy-main-window.c:1177
+#: ../src/empathy-main-window.c:1229
msgid "Contact"
msgstr "СобеÑедник"
-#: ../src/empathy-main-window.c:1501
+#: ../src/empathy-main-window.c:1554
msgid "Contact List"
msgstr "СпиÑок ÑобеÑедников"
-#: ../src/empathy-main-window.c:1608
+#: ../src/empathy-main-window.c:1663
msgid "Show and edit accounts"
msgstr "_Показать и редактировать учётные запиÑи"
@@ -3040,7 +3254,8 @@ msgstr "ÐаÑтроить любимые"
msgid "N_ormal Size"
msgstr "Обычный _размер"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "Ðовый _вызов…"
@@ -3084,7 +3299,8 @@ msgstr "Передачи _файлов"
msgid "_Join…"
msgstr "_Войти…"
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "ÐÐ¾Ð²Ð°Ñ _беÑеда…"
@@ -3110,29 +3326,29 @@ msgstr "УчаÑтники"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:605
+#: ../src/empathy-new-chatroom-dialog.c:607
#, c-format
msgid ""
-"<b>%s</b>\n"
+"%s\n"
"Invite required: %s\n"
"Password required: %s\n"
"Members: %s"
msgstr ""
-"<b>%s</b>\n"
+"%s\n"
"ТребуетÑÑ Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ: %s\n"
"ТребуетÑÑ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ: %s\n"
"УчаÑтники: %s"
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "No"
msgstr "Ðет"
-#: ../src/empathy-new-chatroom-dialog.c:635
+#: ../src/empathy-new-chatroom-dialog.c:638
msgid "Could not start room listing"
msgstr "Ðе удалоÑÑŒ начать формирование ÑпиÑка комнат"
-#: ../src/empathy-new-chatroom-dialog.c:645
+#: ../src/empathy-new-chatroom-dialog.c:648
msgid "Could not stop room listing"
msgstr "Ðе удалоÑÑŒ оÑтановить формирование ÑпиÑка комнат"
@@ -3141,19 +3357,12 @@ msgid "Couldn't load room list"
msgstr "Ðе удалоÑÑŒ загрузить ÑпиÑок комнат"
#: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"Введите Ð¸Ð¼Ñ Ð±ÐµÑеды, к которой хотите приÑоединитьÑÑ, или выберите одну (или "
-"более) в ÑпиÑке."
+msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgstr "Введите Ð¸Ð¼Ñ Ð±ÐµÑеды, к которой хотите приÑоединитьÑÑ, или выберите одну (или более) в ÑпиÑке."
#: ../src/empathy-new-chatroom-dialog.ui.h:4
-msgid ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-msgstr ""
-"Введите Ñервер беÑеды, или оÑтавьте пуÑтым, еÑли беÑеда находитÑÑ Ð½Ð° Ñервере "
-"текущей учётной запиÑи"
+msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
+msgstr "Введите Ñервер беÑеды, или оÑтавьте пуÑтым, еÑли беÑеда находитÑÑ Ð½Ð° Ñервере текущей учётной запиÑи"
#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid "Join Room"
@@ -3167,39 +3376,39 @@ msgstr "СпиÑок комнат"
msgid "_Room:"
msgstr "_Комната:"
-#: ../src/empathy-preferences.c:136
+#: ../src/empathy-preferences.c:138
msgid "Message received"
msgstr "Сообщение получено"
-#: ../src/empathy-preferences.c:137
+#: ../src/empathy-preferences.c:139
msgid "Message sent"
msgstr "Сообщение отправлено"
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:140
msgid "New conversation"
msgstr "ÐÐ¾Ð²Ð°Ñ Ð±ÐµÑеда"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:141
msgid "Contact goes online"
msgstr "СобеÑедник вошёл в Ñеть"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:142
msgid "Contact goes offline"
msgstr "СобеÑедник вышел из Ñети"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:143
msgid "Account connected"
msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ зарегиÑтрирована"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:144
msgid "Account disconnected"
msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ отключена"
-#: ../src/empathy-preferences.c:437
+#: ../src/empathy-preferences.c:445
msgid "Language"
msgstr "Язык"
-#: ../src/empathy-preferences.c:873
+#: ../src/empathy-preferences.c:882
msgid "Preferences"
msgstr "Параметры"
@@ -3225,7 +3434,7 @@ msgstr "Ð’_ыключить звуки в ÑоÑтоÑнии «отошёл» и
#: ../src/empathy-preferences.ui.h:6
msgid "Display incoming events in the notification area"
-msgstr ""
+msgstr "Показывать приближающиеÑÑ ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð² облаÑти уведомлений"
#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
@@ -3252,88 +3461,83 @@ msgid "Location sources:"
msgstr "ИÑточники меÑтоположений:"
#: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr "ВеÑти журнал беÑед"
+
+#: ../src/empathy-preferences.ui.h:15
msgid "Notifications"
msgstr "УведомлениÑ"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:16
msgid "Play sound for events"
msgstr "ВоÑпроизводить звук Ð´Ð»Ñ Ñобытий"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "ПриватноÑÑ‚ÑŒ"
-#: ../src/empathy-preferences.ui.h:17
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published. GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Примерное определение меÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¾Ð·Ð½Ð°Ñ‡Ð°ÐµÑ‚, что публикуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ваш "
-"город, регион и Ñтрана. Координаты GPS будут отображатьÑÑ Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾Ñтью до 1 "
-"знака поÑле запÑтой."
-
#: ../src/empathy-preferences.ui.h:18
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published. GPS coordinates will be accurate to 1 decimal place."
+msgstr "Примерное определение меÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¾Ð·Ð½Ð°Ñ‡Ð°ÐµÑ‚, что публикуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ваш город, регион и Ñтрана. Координаты GPS будут отображатьÑÑ Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾Ñтью до 1 знака поÑле запÑтой."
+
+#: ../src/empathy-preferences.ui.h:19
msgid "Show _smileys as images"
msgstr "Показывать _графичеÑкие улыбки"
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
msgid "Show contact _list in rooms"
msgstr "Показывать _ÑпиÑок ÑобеÑедников в комнатах"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
msgid "Sounds"
msgstr "Звуки"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
msgid "Spell Checking"
msgstr "Проверка орфографии"
-#: ../src/empathy-preferences.ui.h:22
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Ð’ Ñтом ÑпиÑке показаны только те Ñзыки, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… уÑтановлены Ñловари."
-
#: ../src/empathy-preferences.ui.h:23
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "Ð’ Ñтом ÑпиÑке показаны только те Ñзыки, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… уÑтановлены Ñловари."
+
+#: ../src/empathy-preferences.ui.h:24
msgid "Themes"
msgstr "Темы"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
msgid "_Automatically connect on startup"
msgstr "_ÐвтоматичеÑки ÑоединÑÑ‚ÑŒÑÑ Ð¿Ñ€Ð¸ запуÑке"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
msgid "_Cellphone"
msgstr "С_Ð¾Ñ‚Ð¾Ð²Ð°Ñ Ñеть"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable bubble notifications"
msgstr "Включить _вÑплывающие уведомлениÑ"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable sound notifications"
msgstr "_Включить звуковые уведомлениÑ"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "_Network (IP, Wi-Fi)"
msgstr "С_еть (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Open new chats in separate windows"
msgstr "_Открывать новые беÑеды в отдельном окне"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Publish location to my contacts"
msgstr "Пу_бликовать меÑтоположение Ð´Ð»Ñ ÑобеÑедников"
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
msgid "_Reduce location accuracy"
msgstr "_Снижать точноÑÑ‚ÑŒ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¼ÐµÑтоположениÑ"
@@ -3342,24 +3546,20 @@ msgid "Respond"
msgstr "Ответить"
#: ../src/empathy-status-icon.c:147
-#, fuzzy
msgid "Reject"
-msgstr "_Отказать"
+msgstr "Отказать"
#: ../src/empathy-status-icon.c:151
-#, fuzzy
msgid "Answer"
-msgstr "_Ответить"
+msgstr "Ответить"
#: ../src/empathy-status-icon.c:158
-#, fuzzy
msgid "Decline"
-msgstr "_Отклонить"
+msgstr "Отклонить"
#: ../src/empathy-status-icon.c:162
-#, fuzzy
msgid "Accept"
-msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
+msgstr "ПринÑÑ‚ÑŒ"
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
@@ -3397,7 +3597,8 @@ msgstr "Отладка"
msgid "Info"
msgstr "ИнформациÑ"
-#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+#: ../src/empathy-debug-window.c:1519
+#: ../src/empathy-debug-window.c:1568
msgid "Message"
msgstr "Сообщение"
@@ -3430,11 +3631,8 @@ msgid "Level"
msgstr "Уровень"
#: ../src/empathy-debug-window.c:1600
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr ""
-"Выбранный менеджер Ñоединений не поддерживает раÑширение удалённой отладки."
+msgid "The selected connection manager does not support the remote debugging extension."
+msgstr "Выбранный менеджер Ñоединений не поддерживает раÑширение удалённой отладки."
#: ../src/empathy-invite-participant-dialog.c:34
#: ../src/empathy-invite-participant-dialog.c:48
@@ -3446,26 +3644,20 @@ msgid "Choose a contact to invite into the conversation:"
msgstr "Выберите ÑобеÑедника Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ Ðº беÑеде:"
#: ../src/empathy-invite-participant-dialog.c:45
-#, fuzzy
msgid "Invite"
-msgstr "Ðевидимый"
+msgstr "ПриглаÑить"
#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"Ðе показывать диалоговые окна; выполнить работу (напр., импортирование) и "
-"выйти"
+msgstr "Ðе показывать диалоговые окна; выполнить работу (напр., импортирование) и выйти"
#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr ""
-"Ðе показывать диалоговые окна, еÑли имеютÑÑ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ запиÑи, отличные от salut"
+msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgstr "Ðе показывать диалоговые окна, еÑли имеютÑÑ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ запиÑи, отличные от Salut"
#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"Сначала выберите учётную запиÑÑŒ (например, gabble/jabber/"
-"foo_40example_2eorg0)"
+msgstr "Сначала выберите учётную запиÑÑŒ (например, gabble/jabber/foo_40example_2eorg0)"
#: ../src/empathy-accounts.c:192
msgid "<account-id>"
@@ -3473,7 +3665,7 @@ msgstr "<account-id>"
#: ../src/empathy-accounts.c:200
msgid "- Empathy Accounts"
-msgstr "- Учётные запиÑи Empathy"
+msgstr "— Учётные запиÑи Empathy"
#: ../src/empathy-accounts.c:216
msgid "Empathy Accounts"
@@ -3482,56 +3674,3 @@ msgstr "Учётные запиÑи Empathy"
#: ../src/empathy-debugger.c:40
msgid "Empathy Debugger"
msgstr "Отладчик Empathy"
-
-#~ msgid "Send and receive messages"
-#~ msgstr "Получение и отправка Ñообщений"
-
-#~ msgid "MC 4 accounts have been imported"
-#~ msgstr "Учётные запиÑи MC 4 импортированы"
-
-#~ msgid "MC 4 accounts have been imported."
-#~ msgstr "Учётные запиÑи MC 4 импортированы."
-
-#~ msgid "Failed to reconnect this chat"
-#~ msgstr "Ðе удалÑÑŒ повторно подключитьÑÑ Ðº Ñтому чату"
-
-#~ msgid "Failed to join chat room"
-#~ msgstr "Ðе удалоÑÑŒ войти в комнату"
-
-#~ msgid "Select a destination"
-#~ msgstr "Выберите назначение"
-
-#~ msgid "%s account"
-#~ msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ %s"
-
-#~ msgid "Hostname of the proxy for outbound requests."
-#~ msgstr "Ð˜Ð¼Ñ Ñ…Ð¾Ñта прокÑи Ð´Ð»Ñ Ð¸ÑходÑщих запроÑов"
-
-#~ msgid ""
-#~ "Look up the DNS SRV record at the service's domain for the host name of a "
-#~ "STUN server."
-#~ msgstr "ИÑкать запиÑÑŒ DNS SRV в домене Ñлужбы Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½Ð¸ хоÑта Ñервера STUN."
-
-#~ msgid "Port of the proxy for outbound requests."
-#~ msgstr "Порт прокÑи Ð´Ð»Ñ Ð¸ÑходÑщих запроÑов."
-
-#~ msgid ""
-#~ "The username for SIP authentication, if different from the SIP URI\n"
-#~ "username."
-#~ msgstr ""
-#~ "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ SIP, еÑли оно отличаетÑÑ\n"
-#~ "от имени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ SIP URI."
-
-#~ msgid ""
-#~ "Update the registration binding if the external address for the client is "
-#~ "discovered to be different from the local binding."
-#~ msgstr ""
-#~ "ОбновлÑÑ‚ÑŒ региÑтрационное Ñоединение, еÑли обнаружено, что внешний Ð°Ð´Ñ€ÐµÑ "
-#~ "Ð´Ð»Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð° отличаетÑÑ Ð¾Ñ‚ локального ÑоединениÑ."
-
-#~ msgid ""
-#~ "Use the loose routing behavior and the Route header as recommended in RFC "
-#~ "3261."
-#~ msgstr ""
-#~ "ИÑпользовать Ñвободную маршрутизацию и заголовок маршрута, как "
-#~ "рекомендуетÑÑ Ð² RFC 3261."
diff --git a/po/sl.po b/po/sl.po
index 2f408c4ba..72d8e22b7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,26 +4,31 @@
#
# Bernard Banko <bernard.banko afna t-2.net>, 2009.
# Matej UrbanÄiÄ <mateju@svn.gnome.org>, 2006 - 2010.
+# Andrej ŽnidarÅ¡iÄ <andrej.znidarsic@gmail.com>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2010-09-06 10:08+0000\n"
-"PO-Revision-Date: 2010-09-06 13:59+0100\n"
-"Last-Translator: Matej UrbanÄiÄ <mateju@svn.gnome.org>\n"
-"Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2010-09-22 00:00+0000\n"
+"PO-Revision-Date: 2010-09-30 16:07+0200\n"
+"Last-Translator: Andrej ŽnidarÅ¡iÄ <andrej.znidarsic@gmail.com>\n"
+"Language-Team: SlovenÅ¡Äina <gnome-si@googlegroups.com>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: utf-8\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0)\n"
"X-Poedit-Language: Slovenian\n"
"X-Poedit-Country: SLOVENIA\n"
"X-Poedit-SourceCharset: utf-8\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Klepet na Google Talk, Facebook, MSN in na mnogih drugih klepetalnih storitvah."
+msgstr ""
+"Klepet na Google Talk, Facebook, MSN in na mnogih drugih klepetalnih "
+"storitvah."
#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy"
@@ -42,16 +47,22 @@ msgid "Always open a separate chat window for new chats."
msgstr "Za nov klepet vedno odpri loÄeno klepetalno okno."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Znak, ki naj bo dodan vzdevku ob uporabi možnosti dopolnjevanja vzdevkov (zavihek) v skupinskem klepetu."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak, ki naj bo dodan vzdevku ob uporabi možnosti dopolnjevanja vzdevkov "
+"(zavihek) v skupinskem klepetu."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Chat window theme"
msgstr "Tema klepetalnega okna"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Z vejico loÄen seznam uporabljenih Ärkovalnikov (primer: \"sl, en, fr\")."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Z vejico loÄen seznam uporabljenih Ärkovalnikov (primer: \"sl, en, fr\")."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Compact contact list"
@@ -82,8 +93,12 @@ msgid "Display incoming events in the status area"
msgstr "Prikaz prihajajoÄih dogodkov v vrstici stanja."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Prikaz prihajajoÄih dogodkov v vrstici stanja. V primeru, da možnost ni izbrana, bodo prikazane takoj."
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Prikaz prihajajoÄih dogodkov v vrstici stanja. V primeru, da možnost ni "
+"izbrana, bodo prikazane takoj."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
@@ -95,7 +110,8 @@ msgstr "Program Empathy lahko uporabi GPS za ugotavljanje mesta nahajanja"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
-msgstr "Program Empathy lahko uporabi mobilni telefon za ugotavljanje mesta nahajanja"
+msgstr ""
+"Program Empathy lahko uporabi mobilni telefon za ugotavljanje mesta nahajanja"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
@@ -263,7 +279,8 @@ msgstr "Uporabi temo za klepetalnice"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom."
+msgstr ""
+"Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the GPS to guess the location."
@@ -271,7 +288,9 @@ msgstr "Ali naj program Empathy za pridobivanje mesta nahajanja uporablja GPS."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja podatke mobilnega omrežja."
+msgstr ""
+"Ali naj Empathy za pridobivanje mesta nahajanja uporablja podatke mobilnega "
+"omrežja."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the network to guess the location."
@@ -279,7 +298,9 @@ msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja omrežje."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "Ali naj program Empathy zahteva podrobnosti o uvozu raÄunov iz drugih programov."
+msgstr ""
+"Ali naj program Empathy zahteva podrobnosti o uvozu raÄunov iz drugih "
+"programov."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy has migrated butterfly logs."
@@ -290,27 +311,40 @@ msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Ali naj se ob zagonu program Empathy samodejno prijavi v vaÅ¡e raÄune."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Ali naj ob nedejavnosti program Empathy samodejno vzpostavi stanje odsotnosti."
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+"Ali naj ob nedejavnosti program Empathy samodejno vzpostavi stanje "
+"odsotnosti."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Ali naj program Empathy zaradi zasebnosti zmanjÅ¡uje natanÄnost položaja."
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Ali naj program Empathy zaradi zasebnosti zmanjÅ¡uje natanÄnost položaja."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Ali naj program Empathy uporablja podobe stikov za ikone klepetalnih oken."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Ali naj program Empathy uporablja podobe stikov za ikone klepetalnih oken."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Ali naj bodo vkljuÄena razvijalna orodja WebKit kot je na primer Web Inspector."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Ali naj bodo vkljuÄena razvijalna orodja WebKit kot je na primer Web "
+"Inspector."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
msgstr "Ali naj upravljalnik omrežja samodejno vzpostavi in prekine povezavo."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether to check words typed against the languages you want to check with."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
msgstr "Ali naj se preverja Ärkovanje besed v želenih jezikih."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
@@ -322,7 +356,8 @@ msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "Ali naj se predvaja zvok ob prijavi stika v omrežje."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
msgstr "Ali naj se predvaja zvok ob odjavi stika iz omrežja."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
@@ -362,15 +397,20 @@ msgid "Whether to show a popup notification when a contact goes online."
msgstr "Ali naj se pojavi obvestilo ob vzpostavitvi povezave stika."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporoÄila tudi, kadar je klepetalno okno že odprto, vendar ni v žariÅ¡Äu."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Ali naj se pojavi obvestilo ob prejetju novega sporoÄila tudi, kadar je "
+"klepetalno okno že odprto, vendar ni v žariÅ¡Äu."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporoÄila."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "Ali naj bodo podobe stikov prikazane v seznamih in klepetalnih oknih."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
@@ -379,11 +419,14 @@ msgstr "Ali naj bodo na seznamu stikov prikazani tudi nepovezani stiki."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show popup notifications when away or busy."
-msgstr "Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti."
+msgstr ""
+"Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Ali naj bodo v seznamih stikov in klepetalnih oknih prikazani protokoli stikov."
+msgstr ""
+"Ali naj bodo v seznamih stikov in klepetalnih oknih prikazani protokoli "
+"stikov."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show the contact list in chat rooms."
@@ -394,16 +437,26 @@ msgid "Whether to show the contact list in compact mode."
msgstr "Ali naj bo v skrÄenem pogledu prikazan seznam stikov."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Ali naj bo pogovorno okno sporoÄila o zapiranju glavnega okna prikazano z gumbom 'x' v nazivni vrstici."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Ali naj bo pogovorno okno sporoÄila o zapiranju glavnega okna prikazano z "
+"gumbom 'x' v nazivni vrstici."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to use the theme for chat rooms."
msgstr "Ali naj se za klepetalnice uporablja tema."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-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 the contact list by state."
-msgstr "Kateri kriterij naj se uporabi za razvrÅ¡Äanje seznama stikov. Privzeto je razvrÅ¡Äanje po imenu stika z vrednostjo \"ime\". Vrednost \"stanje\" pa razvrsti seznam glede na stanje stikov."
+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 "
+"the contact list by state."
+msgstr ""
+"Kateri kriterij naj se uporabi za razvrÅ¡Äanje seznama stikov. Privzeto je "
+"razvrÅ¡Äanje po imenu stika z vrednostjo \"ime\". Vrednost \"stanje\" pa "
+"razvrsti seznam glede na stanje stikov."
#: ../data/empathy-accounts.desktop.in.in.h:1
msgid "Manage Messaging and VoIP accounts"
@@ -411,7 +464,7 @@ msgstr "Upravljanje s sporoÄanjem in raÄuni VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2151
+#: ../src/empathy-accounts-dialog.c:2157
msgid "Messaging and VoIP Accounts"
msgstr "SporoÄanje in raÄuni VoIP"
@@ -459,164 +512,157 @@ msgstr "Prišlo je do napake med prenosom datoteke"
msgid "The other participant is unable to transfer the file"
msgstr "Drug uporabnik ne more prenesti datoteke"
-#: ../libempathy/empathy-tp-file.c:420
-#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "Neznan vzrok"
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Na voljo"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Zaposleno"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Odsotno"
-#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Nevidno"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Nepovezano"
-#: ../libempathy/empathy-utils.c:253
-#: ../src/empathy-call-window.c:1883
-#: ../src/empathy-call-window.c:1884
-#: ../src/empathy-call-window.c:1885
-#: ../src/empathy-call-window.c:1886
-#: ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
+#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
+#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Neznano"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "Ni doloÄenega razloga"
-#: ../libempathy/empathy-utils.c:294
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "Stanje je nastavljeno na brez povezave"
-#: ../libempathy/empathy-utils.c:296
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Napaka omrežja"
-#: ../libempathy/empathy-utils.c:298
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "Overitev ni uspela"
-#: ../libempathy/empathy-utils.c:300
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Napaka Å¡ifriranja"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "Ime je v uporabi"
-#: ../libempathy/empathy-utils.c:304
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "Potrdilo ni na voljo"
-#: ../libempathy/empathy-utils.c:306
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "Potrdilo ni overjeno"
-#: ../libempathy/empathy-utils.c:308
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "Potrdilo je preteklo"
-#: ../libempathy/empathy-utils.c:310
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "Potrdilo ni potrjeno"
-#: ../libempathy/empathy-utils.c:312
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "Neustrezno potrdilo gostitelja"
-#: ../libempathy/empathy-utils.c:314
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "Neustrezen prstni odtis potrdila"
-#: ../libempathy/empathy-utils.c:316
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "Potrdilo je samo-podpisano"
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Napaka potrdila"
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:356
msgid "Encryption is not available"
msgstr "Å ifriranje ni na voljo."
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:358
msgid "Certificate is invalid"
msgstr "Potrdilo je neveljavno."
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:360
msgid "Connection has been refused"
msgstr "Omrežna povezava je zavrnjena."
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:362
msgid "Connection can't be established"
msgstr "Povezave ni mogoÄe vzpostaviti."
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:364
msgid "Connection has been lost"
msgstr "Povezava je prekinjena."
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:366
msgid "This resource is already connected to the server"
msgstr "Vir je s strežnikom že povezan"
-#: ../libempathy/empathy-utils.c:364
-msgid "Connection has been replaced by a new connection using the same resource"
+#: ../libempathy/empathy-utils.c:368
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
msgstr "Povezava je zamenjana z novo povezavo, ki uporablja isti vir."
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:371
msgid "The account already exists on the server"
msgstr "RaÄun na strežniku že obstaja"
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:373
msgid "Server is currently too busy to handle the connection"
msgstr "Strežnik je trenutno preveÄ zaposlen za upravljanje s povezavo."
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:375
msgid "Certificate has been revoked"
msgstr "Potrdilo je preklicano"
-#: ../libempathy/empathy-utils.c:373
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr "Potrdilo ne uporablja varnega algoritma ali pa uporablja Å¡ibko Å¡ifriranje."
+#: ../libempathy/empathy-utils.c:377
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"Potrdilo ne uporablja varnega algoritma ali pa uporablja Å¡ibko Å¡ifriranje."
-#: ../libempathy/empathy-utils.c:376
-msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
-msgstr "Dolžina potrdila strežnika ali pa globina verige potrdila presega omejitev, ki je doloÄena s Å¡ifrirno knjižnico."
+#: ../libempathy/empathy-utils.c:380
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"Dolžina potrdila strežnika ali pa globina verige potrdila presega omejitev, "
+"ki je doloÄena s Å¡ifrirno knjižnico."
-#: ../libempathy/empathy-utils.c:540
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Uporabniki v bližini"
-#: ../libempathy/empathy-utils.c:545
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:546
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "Facebook klepetanje"
@@ -712,16 +758,16 @@ msgstr "%s:"
msgid "Username:"
msgstr "Uporabniško ime:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
msgstr "_Uveljavi"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "_Prijava"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -730,19 +776,19 @@ msgstr "_Prijava"
msgid "Account:"
msgstr "RaÄun:"
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
msgstr "_OmogoÄi"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Ta raÄun na strežniku že obstaja"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
-msgstr "_Ustvari nov raÄun na strežniku"
+msgstr "Ustvari nov raÄun na strežniku"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
msgstr "_PrekliÄi"
@@ -751,19 +797,19 @@ msgstr "_PrekliÄi"
#. * like: "MyUserName on freenode".
#. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s na %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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "%s raÄun"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Nov raÄun"
@@ -810,7 +856,7 @@ msgstr "Kakšno je vaše zaslonsko ime AIM?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Vrata:"
@@ -819,7 +865,7 @@ msgstr "_Vrata:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Strežnik:"
@@ -970,11 +1016,13 @@ msgstr "_Vir:"
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a Facebook username if you don't have one."
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
msgstr ""
"To je vaÅ¡e uporabniÅ¡ko ime in ne obiÄajna Facebook prijava.\n"
"V primeru, da ste facebook.com/<b>badger</b>, vnesite <b>badger</b>.\n"
-"Uporabite <a href=\"http://www.facebook.com/username/\">to stran</a> za izbor uporabniškega imena, v kolikor ga še nimate."
+"Uporabite <a href=\"http://www.facebook.com/username/\">to stran</a> za "
+"izbor uporabniškega imena, v kolikor ga še nimate."
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "Use old SS_L"
@@ -1125,22 +1173,18 @@ msgid "I_gnore conference and chat room invitations"
msgstr "_Prezri vabila na konference in v klepetalnice"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Uporabi _Yahoo! Japan"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "Kakšen je vaš uporabniški ID Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Kakšno je vaše geslo Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "Yahoo! I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "_Jezikovne nastavitve seznama klepetalnic:"
@@ -1218,11 +1262,19 @@ msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <sporoÄilo>: poÅ¡lje sporoÄilo DEJANJA v trenutni pogovor"
#: ../libempathy-gtk/empathy-chat.c:849
-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 "/say <sporoÄilo>: poÅ¡lje <sporoÄilo> v trenutni pogovor. Možnost se uporablja za poÅ¡iljanje sporoÄila, ki se zaÄne z '/'. Primer: \"/say /join se uporablja za pridruževanje novi klepetalnici\""
+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 ""
+"/say <sporoÄilo>: poÅ¡lje <sporoÄilo> v trenutni pogovor. Možnost se "
+"uporablja za poÅ¡iljanje sporoÄila, ki se zaÄne z '/'. Primer: \"/say /join "
+"se uporablja za pridruževanje novi klepetalnici\""
#: ../libempathy-gtk/empathy-chat.c:854
-msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
msgstr "/help [<ukaz>], pokaže vse podprte ukaze in njihov naÄin uporabe."
#: ../libempathy-gtk/empathy-chat.c:864
@@ -1267,8 +1319,7 @@ msgstr "neznano"
msgid "Error sending message '%s': %s"
msgstr "Napaka med poÅ¡iljanjem sporoÄila '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1282
-#: ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
msgid "Topic:"
msgstr "Tema:"
@@ -1359,8 +1410,7 @@ msgstr "%s je vstopil v klepetalnico"
msgid "%s is now known as %s"
msgstr "%s je preimenovan v %s"
-#: ../libempathy-gtk/empathy-chat.c:2287
-#: ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
msgid "Disconnected"
msgstr "Prekinjena povezava"
@@ -1429,6 +1479,14 @@ msgstr "OdloÄi se _kasneje"
msgid "Subscription Request"
msgstr "Zahteva po naroÄilu"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Brez skupine"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Priljubljene osebe"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1500,7 +1558,7 @@ msgid "Share My Desktop"
msgstr "Souporaba namizja"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1556,128 +1614,128 @@ msgstr "SpletiÅ¡Äe:"
msgid "Birthday:"
msgstr "Rojstni dan:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "ISO oznaka države:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Država:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Okraj:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Mesto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "PodroÄje:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Poštna številka:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Ulica:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Stavba:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Nadstropje:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Klepetalnica:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Besedilo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Opis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Raven natanÄnosti:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Napaka:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Napaka navpiÄno (v metrih):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Napaka vodoravno (v metrih):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Hitrost:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Smer:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Hitrost dviganja:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "ZadnjiÄ posodobljeno:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Zemljepisna dolžina:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Zemljepisna Å¡irina:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Nadmorska višina:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1685,23 +1743,23 @@ msgid "Location"
msgstr "Mesto"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%e.%B.%Y ob %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Shrani podobo"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Ni mogoÄe shraniti podobe"
@@ -1754,8 +1812,12 @@ msgid "Groups"
msgstr "Skupine"
#: ../libempathy-gtk/empathy-groups-widget.c:344
-msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups."
-msgstr "Izbor skupin, ki jim stik pripada. Izbrati je mogoÄe eno ali veÄ skupin, lahko pa tudi nobene."
+msgid ""
+"Select the groups you want this contact to appear in. Note that you can "
+"select more than one group or no groups."
+msgstr ""
+"Izbor skupin, ki jim stik pripada. Izbrati je mogoÄe eno ali veÄ skupin, "
+"lahko pa tudi nobene."
#: ../libempathy-gtk/empathy-groups-widget.c:363
msgid "_Add Group"
@@ -1806,7 +1868,7 @@ msgstr "_Uredi"
#: ../libempathy-gtk/empathy-individual-menu.c:863
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
-msgstr "_Odstrani povezavo stikov ..."
+msgstr "_Poveži stike ..."
#: ../libempathy-gtk/empathy-individual-widget.c:1569
#, c-format
@@ -1840,37 +1902,43 @@ msgstr "SSL"
#. Translators: this is the title of the linking dialogue (reached by
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
+#: ../libempathy-gtk/empathy-linking-dialog.c:116
msgid "Link Contacts"
msgstr "Poveži stike"
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "_Odstrani povezavo ..."
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed meta-contact into the contacts it contains."
-msgstr "Razdelitev meta-stika na posamezne stike."
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr ""
+"Popolnoma razdeli prikazan meta-stik na posamezne stike, ki jih združuje."
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
#. * used here as a verb meaning "to connect two contacts to form a
#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
+#: ../libempathy-gtk/empathy-linking-dialog.c:137
msgid "_Link"
msgstr "_Povezava"
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "Ali naj se odstrani povezava meta-stika '%s'?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:185
-msgid "Are you sure you want to unlink this meta-contact? This will completely split the meta-contact into the contacts it contains."
-msgstr "Ali res želite odstraniti povezavo meta-stika? S tem bodo vsebina meta-stika razdeljena na posamezne stike."
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr ""
+"Ali ste prepriÄani, da želite odstraniti ta meta-stik? S tem se bo meta-stik "
+"razdelil na posamezne stike, ki jih združuje."
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
+#: ../libempathy-gtk/empathy-linking-dialog.c:191
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Odstrani povezavo"
@@ -2335,16 +2403,38 @@ msgid "- Empathy IM Client"
msgstr "- Empathy sporoÄilnik"
#: ../src/empathy-about-dialog.c:85
-msgid "Empathy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
-msgstr "Empathy je prosta programska oprema; program lahko razÅ¡irjate oz. spreminjate pod pogoji SploÅ¡nega dovoljenja GNU (GNU General Public License), objavljenega pri Free Software Foundation; bodisi razliÄice 2 ali (po svoji izbiri) katerekoli poznejÅ¡e razliÄice."
+msgid ""
+"Empathy is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
+msgstr ""
+"Empathy je prosta programska oprema; program lahko razširjate oz. "
+"spreminjate pod pogoji Splošnega dovoljenja GNU (GNU General Public "
+"License), objavljenega pri Free Software Foundation; bodisi razliÄice 2 ali "
+"(po svoji izbiri) katerekoli poznejÅ¡e razliÄice."
#: ../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."
-msgstr "Empathy se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA DOLOČEN NAMEN. Za podrobnosti glejte besedilo GNU General Public License."
+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."
+msgstr ""
+"Empathy se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA "
+"JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA "
+"DOLOÄŒEN NAMEN. Za podrobnosti glejte besedilo GNU General Public License."
#: ../src/empathy-about-dialog.c:93
-msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr "Skupaj s tem programom bi morali prejeti izvod Splošnega javnega dovoljenja GNU (GNU General Public License); v nasprotnem primeru pišite na: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr ""
+"Skupaj s tem programom bi morali prejeti izvod Splošnega javnega dovoljenja "
+"GNU (GNU General Public License); v nasprotnem primeru pišite na: Free "
+"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-130159 USA"
#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
@@ -2376,11 +2466,15 @@ msgid "The error message was: %s"
msgstr "SporoÄilo o napaki je bilo: %s"
#: ../src/empathy-account-assistant.c:183
-msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
-msgstr "Lahko ponovno vnesete podatke svojega raÄuna ali pa konÄate pomoÄnika in dodate raÄune kasneje preko menija Uredi."
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"Lahko ponovno vnesete podatke svojega raÄuna ali pa konÄate pomoÄnika in "
+"dodate raÄune kasneje preko menija Uredi."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1310
+#: ../src/empathy-account-assistant.c:1316
msgid "An error occurred"
msgstr "Prišlo je do napake"
@@ -2389,108 +2483,130 @@ msgstr "Prišlo je do napake"
#. 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:614
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
#, c-format
msgid "New %s account"
msgstr "Nov raÄun %s"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:515
msgid "What kind of chat account do you have?"
msgstr "KakÅ¡no vrsto klepetalnega raÄuna imate?"
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:521
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Ali želite nastaviti Å¡e kakÅ¡en drug raÄun?"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:527
msgid "Enter your account details"
msgstr "Vnesite podrobnosti svojega raÄuna"
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:532
msgid "What kind of chat account do you want to create?"
msgstr "KakÅ¡ne vrste klepetalni raÄun naj bo ustvarjen?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Do you want to create other chat accounts?"
msgstr "Ali želite ustvariti druge klepetalne raÄune?"
-#: ../src/empathy-account-assistant.c:539
+#: ../src/empathy-account-assistant.c:545
msgid "Enter the details for the new account"
msgstr "Vnesite podrobnosti novega raÄuna"
-#: ../src/empathy-account-assistant.c:654
-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 programs. With a microphone or a webcam you can also have audio or video calls."
-msgstr "S programom Empathy lahko klepetate s posamezniki, ki uporabljajo Google Talk, AIM, Windows Live in mnogo drugih klepetalnih programov. S spletno kamero in mikrofonom lahko uporabljate tudi zvoÄne ali video klice."
+#: ../src/empathy-account-assistant.c:660
+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 "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+"S programom Empathy lahko klepetate s posamezniki, ki uporabljajo Google "
+"Talk, AIM, Windows Live in mnogo drugih klepetalnih programov. S spletno "
+"kamero in mikrofonom lahko uporabljate tudi zvoÄne ali video klice."
-#: ../src/empathy-account-assistant.c:671
+#: ../src/empathy-account-assistant.c:677
msgid "Do you have an account you've been using with another chat program?"
msgstr "Ali imate raÄun, ki ste ga uporabljali z drugim programom?"
-#: ../src/empathy-account-assistant.c:694
+#: ../src/empathy-account-assistant.c:700
msgid "Yes, import my account details from "
msgstr "Da, uvoziti želim podrobnosti raÄuna iz"
-#: ../src/empathy-account-assistant.c:715
+#: ../src/empathy-account-assistant.c:721
msgid "Yes, I'll enter my account details now"
msgstr "Da, takoj želim vnesti podrobnosti raÄuna"
-#: ../src/empathy-account-assistant.c:737
+#: ../src/empathy-account-assistant.c:743
msgid "No, I want a new account"
msgstr "Ne, ustvariti želim nov raÄun"
-#: ../src/empathy-account-assistant.c:747
+#: ../src/empathy-account-assistant.c:753
msgid "No, I just want to see people online nearby for now"
msgstr "Ne, želim le videti ljudi, povezane v bližini"
-#: ../src/empathy-account-assistant.c:768
+#: ../src/empathy-account-assistant.c:774
msgid "Select the accounts you want to import:"
msgstr "Izbor raÄune za uvoz:"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Da"
-#: ../src/empathy-account-assistant.c:859
+#: ../src/empathy-account-assistant.c:865
msgid "No, that's all for now"
msgstr "Ne, to je trenutno vse"
-#: ../src/empathy-account-assistant.c:1124
-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 details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
-msgstr "Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki istega omrežja. V primeru, da želite uporabljati to možnost, preverite spodnje podatke. Možnosti je mogoÄe spreminjati tudi kasneje v pogovornemu oknu 'raÄuni'."
-
#: ../src/empathy-account-assistant.c:1130
-#: ../src/empathy-account-assistant.c:1186
+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 "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+"Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki "
+"istega omrežja. V primeru, da želite uporabljati to možnost, preverite "
+"spodnje podatke. Možnosti je mogoÄe spreminjati tudi kasneje v pogovornemu "
+"oknu 'raÄuni'."
+
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
msgid "Edit->Accounts"
msgstr "Uredi->RaÄuni"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1152
msgid "I don't want to enable this feature for now"
msgstr "Te možnosti ne želim omogoÄiti"
-#: ../src/empathy-account-assistant.c:1182
-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 install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
-msgstr "Ni mogoÄe klepetati z uporabniki, povezanimi v krajevnem omrežju, saj paket telepathy-salut ni nameÅ¡Äen. V primeru, da želite to možnost omogoÄiti, namestite zahtevani paket in ustvarite raÄun bližnjih uporabnikov med možnostmi raÄuna."
-
#: ../src/empathy-account-assistant.c:1188
+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 "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+msgstr ""
+"Ni mogoÄe klepetati z uporabniki, povezanimi v krajevnem omrežju, saj paket "
+"telepathy-salut ni nameÅ¡Äen. V primeru, da želite to možnost omogoÄiti, "
+"namestite zahtevani paket in ustvarite raÄun bližnjih uporabnikov med "
+"možnostmi raÄuna."
+
+#: ../src/empathy-account-assistant.c:1194
msgid "telepathy-salut not installed"
msgstr "telepathy-salut ni nameÅ¡Äen"
-#: ../src/empathy-account-assistant.c:1234
+#: ../src/empathy-account-assistant.c:1240
msgid "Messaging and VoIP Accounts Assistant"
msgstr "PomoÄnik sporoÄanja in raÄunov VoIP"
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1274
msgid "Welcome to Empathy"
msgstr "Dobrodošli v program Empathy"
-#: ../src/empathy-account-assistant.c:1277
+#: ../src/empathy-account-assistant.c:1283
msgid "Import your existing accounts"
msgstr "Uvozite svoje obstojeÄe raÄune"
-#: ../src/empathy-account-assistant.c:1295
+#: ../src/empathy-account-assistant.c:1301
msgid "Please enter personal details"
msgstr "Vnesite osebne podatke"
@@ -2507,8 +2623,7 @@ msgstr "Obstajajo neshranjene spremembe vaÅ¡ega %s raÄuna."
msgid "Your new account has not been saved yet."
msgstr "Novi raÄun Å¡e ni bil shranjen."
-#: ../src/empathy-accounts-dialog.c:281
-#: ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "Povezovanje ..."
@@ -2534,7 +2649,7 @@ msgstr "Neznano stanje"
msgid "Offline — Account Disabled"
msgstr "Brez povezave - raÄun je onemogoÄen"
-#: ../src/empathy-accounts-dialog.c:805
+#: ../src/empathy-accounts-dialog.c:811
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2542,16 +2657,16 @@ msgstr ""
"Ustvarjen bo nov raÄun, trenutne spremembe pa bodo izgubljene!\n"
"Ali ste prepriÄani, da želite nadaljevati?"
-#: ../src/empathy-accounts-dialog.c:1152
+#: ../src/empathy-accounts-dialog.c:1158
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Ali želite odstraniti %s iz raÄunalnika?"
-#: ../src/empathy-accounts-dialog.c:1156
+#: ../src/empathy-accounts-dialog.c:1162
msgid "This will not remove your account on the server."
msgstr "To ne bo odstranilo vaÅ¡ega raÄuna s strežnika."
-#: ../src/empathy-accounts-dialog.c:1394
+#: ../src/empathy-accounts-dialog.c:1400
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2559,7 +2674,7 @@ msgstr ""
"Izbran bo nov raÄun, trenutne spremembe pa bodo izgubljene\n"
"Ali ste prepriÄani, da želite nadaljevati?"
-#: ../src/empathy-accounts-dialog.c:1997
+#: ../src/empathy-accounts-dialog.c:2003
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2580,8 +2695,12 @@ msgid "Protocol:"
msgstr "Protokol:"
#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "To add a new account, you first have to install a backend for each protocol you want to use."
-msgstr "Za dodajanje novega raÄuna morate najprej namestiti zaledje za vsak protokol, ki ga želite uporabiti."
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+"Za dodajanje novega raÄuna morate najprej namestiti zaledje za vsak "
+"protokol, ki ga želite uporabiti."
#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
@@ -2627,114 +2746,130 @@ msgstr "Gama"
msgid "Volume"
msgstr "Glasnost"
-#: ../src/empathy-call-window.c:1163
+#: ../src/empathy-call-window.c:1173
msgid "_Sidebar"
msgstr "_Stranska vrstica"
-#: ../src/empathy-call-window.c:1182
+#: ../src/empathy-call-window.c:1192
msgid "Audio input"
msgstr "ZvoÄni vhod"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1196
msgid "Video input"
msgstr "Video vhod"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1200
msgid "Dialpad"
msgstr "Å tevilÄnica"
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1205
msgid "Details"
msgstr "Podrobnosti"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1263
+#: ../src/empathy-call-window.c:1273
#, c-format
msgid "Call with %s"
msgstr "PokliÄi z %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1342
+#: ../src/empathy-call-window.c:1352
msgid "Call"
msgstr "KliÄi"
-#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-call-window.c:1506
msgid "The IP address as seen by the machine"
msgstr "Naslov IP kot ga zazna strojna oprema"
-#: ../src/empathy-call-window.c:1498
+#: ../src/empathy-call-window.c:1508
msgid "The IP address as seen by a server on the Internet"
msgstr "Naslov IP kot ga zazna strežnik v omrežju"
-#: ../src/empathy-call-window.c:1500
+#: ../src/empathy-call-window.c:1510
msgid "The IP address of the peer as seen by the other side"
msgstr "Naslov IP kot ga zazna uporabnik na drugi strani"
-#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1512
msgid "The IP address of a relay server"
msgstr "Naslov IP posredovalnega strežnika"
-#: ../src/empathy-call-window.c:1504
+#: ../src/empathy-call-window.c:1514
msgid "The IP address of the multicast group"
msgstr "Naslov IP skupine za veÄsmerno oddajanje"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2247
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Povezan - %d:%02d m"
-#: ../src/empathy-call-window.c:2298
+#: ../src/empathy-call-window.c:2308
msgid "Technical Details"
msgstr "TehniÄne podrobnosti"
-#: ../src/empathy-call-window.c:2336
+#: ../src/empathy-call-window.c:2346
#, c-format
-msgid "%s's software does not understand any of the audio formats supported by your computer"
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
msgstr "Program stika %s ne prepozna zvoÄnih zapisov podprtih na vaÅ¡em sistemu"
-#: ../src/empathy-call-window.c:2341
+#: ../src/empathy-call-window.c:2351
#, c-format
-msgid "%s's software does not understand any of the video formats supported by your computer"
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
msgstr "Program stika %s ne prepozna video zapisov podprtih na vašem sistemu"
-#: ../src/empathy-call-window.c:2347
+#: ../src/empathy-call-window.c:2357
#, c-format
-msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
-msgstr "Ni mogoÄe vzpostaviti povezave z %s. Morda je eden od odjemalcev je v omrežju, ki ne dovoli neposrednih povezav."
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Ni mogoÄe vzpostaviti povezave z %s. Morda je eden od odjemalcev je v "
+"omrežju, ki ne dovoli neposrednih povezav."
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2363
msgid "There was a failure on the network"
msgstr "Prišlo je do napake na omrežju"
-#: ../src/empathy-call-window.c:2357
-msgid "The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:2367
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
msgstr "ZvoÄni zapisi za ta klic niso nameÅ¡Äeni"
-#: ../src/empathy-call-window.c:2360
-msgid "The video formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:2370
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
msgstr "Video zapisi za ta klic niso nameÅ¡Äeni"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2380
#, c-format
-msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
-msgstr "PriÅ¡lo je do nepriÄakovane napake v delu programa Telepathy. PoÅ¡ljite <a href=\"%s\">poroÄilo o hroÅ¡Äu</a> in pripnite dnevnik razhroÅ¡Äevanja iz menija pomoÄi."
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"PriÅ¡lo je do nepriÄakovane napake v delu programa Telepathy. PoÅ¡ljite <a "
+"href=\"%s\">poroÄilo o hroÅ¡Äu</a> in pripnite dnevnik razhroÅ¡Äevanja iz "
+"menija pomoÄi."
-#: ../src/empathy-call-window.c:2378
+#: ../src/empathy-call-window.c:2388
msgid "There was a failure in the call engine"
msgstr "Prišlo je do napake v klicnem programniku"
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-call-window.c:2391
msgid "The end of the stream was reached"
msgstr "Dosežen je konec pretoka"
-#: ../src/empathy-call-window.c:2421
+#: ../src/empathy-call-window.c:2431
msgid "Can't establish audio stream"
msgstr "Ni mogoÄe vzpostaviti zvoÄnega pretoka"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2441
msgid "Can't establish video stream"
msgstr "Ni mogoÄe vzpostaviti video pretoka"
@@ -2830,13 +2965,11 @@ msgstr "Predogled videa"
msgid "_Call"
msgstr "Po_kliÄi"
-#: ../src/empathy-call-window.ui.h:25
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
msgid "_View"
msgstr "_Pogled"
-#: ../src/empathy-chat-window.c:452
-#: ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -2908,8 +3041,7 @@ msgstr "Premakni zavihek _desno"
msgid "Notify for All Messages"
msgstr "Obvesti o vseh novih sporoÄilih"
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
msgid "_Contents"
msgstr "_Vsebina"
@@ -2921,8 +3053,7 @@ msgstr "_Pogovor"
msgid "_Detach Tab"
msgstr "_Odpni zavihek"
-#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
msgid "_Edit"
msgstr "_Uredi"
@@ -2930,8 +3061,7 @@ msgstr "_Uredi"
msgid "_Favorite Chat Room"
msgstr "_Priljubljena klepetalnica"
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
msgid "_Help"
msgstr "Pomo_Ä"
@@ -2943,8 +3073,7 @@ msgstr "_Naslednji zavihek"
msgid "_Previous Tab"
msgstr "_Predhodni zavihek"
-#: ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "_Pokaži seznam stikov"
@@ -2990,8 +3119,7 @@ msgstr "%s vas kliÄe preko video kanala. Ali se želite javiti?"
msgid "%s is calling you. Do you want to answer?"
msgstr "%s vas kliÄe. Ali se želite javiti?"
-#: ../src/empathy-event-manager.c:476
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
#, c-format
msgid "Incoming call from %s"
msgstr "Dohodni klic od %s"
@@ -3148,19 +3276,16 @@ msgstr "\"%s\" poslano %s"
msgid "File transfer completed"
msgstr "Prenos datoteke je konÄan"
-#: ../src/empathy-ft-manager.c:615
-#: ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
msgid "Waiting for the other participant's response"
msgstr "Čakanje na odziv drugega udeleženca"
-#: ../src/empathy-ft-manager.c:641
-#: ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Preverjanje celovitosti \"%s\""
-#: ../src/empathy-ft-manager.c:644
-#: ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "Ustvarjanje razpršila \"%s\""
@@ -3186,8 +3311,12 @@ msgid "Remove completed, canceled and failed file transfers from the list"
msgstr "S seznama odstrani konÄane, preklicane in spodletele prenose datotek"
#: ../src/empathy-import-dialog.c:84
-msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
-msgstr "Ni mogoÄe najti raÄuna za uvoz. Program trenutno podpira le uvoz raÄunov programa Pidgin."
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"Ni mogoÄe najti raÄuna za uvoz. Program trenutno podpira le uvoz raÄunov "
+"programa Pidgin."
#: ../src/empathy-import-dialog.c:199
msgid "Import Accounts"
@@ -3254,8 +3383,7 @@ msgstr "Uredi priljubljene"
msgid "N_ormal Size"
msgstr "_ObiÄajna velikost"
-#: ../src/empathy-main-window.ui.h:6
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "Nov _klic ..."
@@ -3299,8 +3427,7 @@ msgstr "Prenosi _datotek"
msgid "_Join…"
msgstr "_Pridruži se"
-#: ../src/empathy-main-window.ui.h:22
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_Nov pogovor ..."
@@ -3357,12 +3484,19 @@ msgid "Couldn't load room list"
msgstr "Seznama klepetalnic ni bilo mogoÄe naložiti"
#: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "Vnesite ime klepetalnice, ki se ji želite pridružiti, ali pa kliknite na eno ali veÄ klepetalnic s seznama."
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+"Vnesite ime klepetalnice, ki se ji želite pridružiti, ali pa kliknite na eno "
+"ali veÄ klepetalnic s seznama."
#: ../src/empathy-new-chatroom-dialog.ui.h:4
-msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
-msgstr "Vnesite gostujoÄi strežnik klepetalnice ali pa pustite polje prazno, Äe se klepetalnica nahaja na strežniku raÄuna"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+"Vnesite gostujoÄi strežnik klepetalnice ali pa pustite polje prazno, Äe se "
+"klepetalnica nahaja na strežniku raÄuna"
#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid "Join Room"
@@ -3477,8 +3611,14 @@ msgid "Privacy"
msgstr "Zasebnost"
#: ../src/empathy-preferences.ui.h:18
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published. GPS coordinates will be accurate to 1 decimal place."
-msgstr "ZmanjÅ¡ana natanÄnost mesta pomeni, da ne bo objavljenih podatkov natanÄnejÅ¡ih od mesta in države. Koordinate GPS bodo natanÄne na eno decimalno mesto."
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published. GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"ZmanjÅ¡ana natanÄnost mesta pomeni, da ne bo objavljenih podatkov "
+"natanÄnejÅ¡ih od mesta in države. Koordinate GPS bodo natanÄne na eno "
+"decimalno mesto."
#: ../src/empathy-preferences.ui.h:19
msgid "Show _smileys as images"
@@ -3497,7 +3637,9 @@ msgid "Spell Checking"
msgstr "Preverjanje Ärkovanja"
#: ../src/empathy-preferences.ui.h:23
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
msgstr "Na seznamu jezikov so le tisti, za katere imate nameÅ¡Äene slovarje."
#: ../src/empathy-preferences.ui.h:24
@@ -3597,8 +3739,7 @@ msgstr "RazhroÅ¡Äevanje"
msgid "Info"
msgstr "Podrobnosti"
-#: ../src/empathy-debug-window.c:1519
-#: ../src/empathy-debug-window.c:1568
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
msgid "Message"
msgstr "SporoÄilo"
@@ -3631,8 +3772,12 @@ msgid "Level"
msgstr "Raven"
#: ../src/empathy-debug-window.c:1600
-msgid "The selected connection manager does not support the remote debugging extension."
-msgstr "Izbrani upravljalnik povezav ne podpira razÅ¡iritve za oddaljeno razhroÅ¡Äevanje."
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"Izbrani upravljalnik povezav ne podpira razširitve za oddaljeno "
+"razhroÅ¡Äevanje."
#: ../src/empathy-invite-participant-dialog.c:34
#: ../src/empathy-invite-participant-dialog.c:48
@@ -3649,7 +3794,8 @@ msgstr "Povabi"
#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "Ne pokaži pogovornih oken; opravi nalogo (na primer: uvažanje) in konÄaj"
+msgstr ""
+"Ne pokaži pogovornih oken; opravi nalogo (na primer: uvažanje) in konÄaj"
#: ../src/empathy-accounts.c:186
msgid "Don't display any dialogs if there are any non-Salut accounts"
@@ -3657,7 +3803,8 @@ msgstr "Ne prikaži pogovornega okna, Äe so na voljo raÄuni ne-Salut"
#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "Predhodno izberite raÄun (na primer: gabble/jabber/foo_40primer_2eorg0)"
+msgstr ""
+"Predhodno izberite raÄun (na primer: gabble/jabber/foo_40primer_2eorg0)"
#: ../src/empathy-accounts.c:192
msgid "<account-id>"
@@ -3675,59 +3822,80 @@ msgstr "Empathy raÄuni"
msgid "Empathy Debugger"
msgstr "Empathy razhroÅ¡Äevalnik"
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "Uporabi _Yahoo! Japan"
+
#~ msgctxt "Link individual (contextual menu)"
#~ msgid "_Link…"
#~ msgstr "_Poveži ..."
+
#~ msgid "_Character set:"
#~ msgstr "_Znakovni nabor:"
+
#~ msgid "_E-mail address:"
#~ msgstr "_Elektronski naslov:"
+
#~ msgid "_Nickname:"
#~ msgstr "_Vzdevek:"
+
#~ msgid "<b>Location</b>, "
#~ msgstr "<b>Mesto</b>, "
+
#~ msgid "Your contact list is empty"
#~ msgstr "Seznam stikov je prazen"
+
#~ msgid "Send and receive messages"
#~ msgstr "PoÅ¡iljanje in prejemanje hipnih sporoÄil"
+
#~ msgid "Failed to reconnect this chat"
#~ msgstr "Ponovna povezava s tem klepetom ni bila uspešna"
+
#~ msgid "Failed to join chat room"
#~ msgstr "Napaka med pridruževanjem klepetalnici"
+
#~ msgid "Select a destination"
#~ msgstr "Izbor cilja"
+
#~ msgid "Important Room"
#~ msgstr "Pomembna klepetalnica"
+
#~ msgid "MC 4 accounts have been imported"
#~ msgstr "MC 4 raÄuni so boli uvoženi"
+
#~ msgid "MC 4 accounts have been imported."
#~ msgstr "MC 4 raÄuni so bili uvoženi."
+
#~ msgid "Hostname of the proxy for outbound requests."
#~ msgstr "Ime gostitelja posredniškega strežnika odhodnih zahtev."
+
#~ msgid ""
#~ "Look up the DNS SRV record at the service's domain for the host name of a "
#~ "STUN server."
#~ msgstr ""
#~ "Preglej vpis DNS SRV domene storitve za ime gostitelja strežnika STUN."
+
#~ msgid "Port of the proxy for outbound requests."
#~ msgstr "Ime gostitelja posredniškega strežnika odhodnih zahtev."
+
#~ msgid ""
#~ "The username for SIP authentication, if different from the SIP URI\n"
#~ "username."
#~ msgstr ""
#~ "UporabniÅ¡ko ime za SIP overitev v kolikor, da je drugaÄno od SIP URI\n"
#~ "uporabniškega imena."
+
#~ msgid ""
#~ "Update the registration binding if the external address for the client is "
#~ "discovered to be different from the local binding."
#~ msgstr ""
#~ "Posodobi povezavo vpisnika v primeru, da je zunanji naslov odjemalca "
#~ "drugaÄen od krajevne povezave."
+
#~ msgid ""
#~ "Use the loose routing behavior and the Route header as recommended in RFC "
#~ "3261."
#~ msgstr ""
#~ "Uporabi ohlapno usmerjanje in glavo usmerjevalnika kot priporoÄa RFC 3261."
+
#~ msgid "%s account"
#~ msgstr "%s raÄun"
-
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4823c9004..9d700bf4c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,15 +13,16 @@
# Richard Ma <richard.ma.19850509@gmail.com>, 2009.
# Tao Wei <weitao1979@gmail.com>, 2009.
# Tao Wang <dancefire@gmail.com>, 2010.
-# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
# Dean Lee <xslidian@gmail.com>, 2010.
+# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 23:16+0800\n"
-"PO-Revision-Date: 2010-09-16 23:18+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2010-09-24 07:49+0000\n"
+"PO-Revision-Date: 2010-09-23 14:48+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -622,8 +623,7 @@ msgstr "è¯ä¹¦å·²è¢«åŠé”€"
#: ../libempathy/empathy-utils.c:377
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
-"è¯ä¹¦ä½¿ç”¨ä¸å®‰å…¨çš„加密算法或者是弱加密的"
+msgstr "è¯ä¹¦ä½¿ç”¨ä¸å®‰å…¨çš„加密算法或者是弱加密的"
#: ../libempathy/empathy-utils.c:380
msgid ""
@@ -632,6 +632,7 @@ msgid ""
msgstr "æœåŠ¡å™¨è¯ä¹¦çš„长度——或æœåŠ¡å™¨è¯ä¹¦é“¾çš„深度——超出了加密库的硬性é™åˆ¶"
#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "附近的人"
@@ -1438,6 +1439,14 @@ msgstr "以åŽå†å†³å®š(_L)"
msgid "Subscription Request"
msgstr "订阅请求"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "未分组"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "收è—夹"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1509,11 +1518,11 @@ msgid "Share My Desktop"
msgstr "共享我的桌é¢"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
-msgstr "收è—夹"
+msgstr "收è—"
#: ../libempathy-gtk/empathy-contact-menu.c:444
#: ../libempathy-gtk/empathy-individual-menu.c:786
@@ -1565,128 +1574,128 @@ msgstr "网站:"
msgid "Birthday:"
msgstr "生日:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "包括 ISO ç¼–ç ï¼š"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "国家:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "çœï¼š"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "城市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "地区:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "邮政编ç ï¼š"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "è¡—é“:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "建筑物:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "楼层:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "房间:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "文本:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "æ述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "准确程度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "错误:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "垂直误差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "水平误差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "æ–¹ä½æœå‘:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "爬å‡é€Ÿåº¦ï¼š"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "最近更新于:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "ç»åº¦ï¼š"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "纬度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "海拔:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1694,23 +1703,23 @@ msgid "Location"
msgstr "ä½ç½®"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e,%Y 于 %R UTC 时间"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "ä¿å­˜å¤´åƒ"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "无法ä¿å­˜å¤´åƒ"
@@ -1896,10 +1905,12 @@ msgid "Conversations"
msgstr "对è¯"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "å‘下查找"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "å‘上查找"
@@ -1983,15 +1994,15 @@ msgstr "设置你的状æ€ä¿¡æ¯å’ŒçŽ°åœ¨çš„状æ€"
msgid "Custom messages…"
msgstr "自定义消æ¯..."
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "查找:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "区分大å°å†™"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "未找到短语"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index dec407570..849f4b29f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy 2.31.92\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-17 19:36+0800\n"
-"PO-Revision-Date: 2010-09-17 19:36+0800\n"
+"POT-Creation-Date: 2010-09-25 13:49+0800\n"
+"PO-Revision-Date: 2010-09-25 13:50+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
"MIME-Version: 1.0\n"
@@ -616,6 +616,7 @@ msgid ""
msgstr "伺æœå™¨è­‰æ›¸çš„長度,或是伺æœå™¨è­‰æ›¸éˆçš„深度超éŽå¯†ç¢¼å‡½å¼åº«æ‰€èƒ½è™•ç†çš„範åœ"
#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "附近的人"
@@ -1418,6 +1419,14 @@ msgstr "ç¨å¾Œå†æ±ºå®š"
msgid "Subscription Request"
msgstr "訂閱è¦æ±‚"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "未羣組"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "喜好的人"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1489,7 +1498,7 @@ msgid "Share My Desktop"
msgstr "分享我的桌é¢"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1545,128 +1554,128 @@ msgstr "網站:"
msgid "Birthday:"
msgstr "生日:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "國家 ISO 碼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "國家:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "州:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "å€åŸŸï¼š"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "郵éžå€è™Ÿï¼š"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "街:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "建築:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "樓層:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "室:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "文字:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "æ述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "準確度等級:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "錯誤:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "垂直誤差 (米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "水平誤差 (米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "æ–¹ä½ï¼š"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "爬å‡é€Ÿåº¦ï¼š"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "上次更新於:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "經度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1674,23 +1683,23 @@ msgid "Location"
msgstr "ä½ç½®"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%sã€%s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y æ–¼ %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
@@ -1876,10 +1885,12 @@ msgid "Conversations"
msgstr "談話"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "尋找下一個"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "尋找上一個"
@@ -1963,15 +1974,15 @@ msgstr "設定你的上線與目å‰çš„狀態"
msgid "Custom messages…"
msgstr "自é¸è¨Šæ¯â€¦"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "尋找:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "符åˆæ¢ä»¶"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "找ä¸åˆ°è©žå½™"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 964745246..56ddd1888 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy 2.31.92\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-17 19:36+0800\n"
-"PO-Revision-Date: 2010-09-10 19:16+0800\n"
+"POT-Creation-Date: 2010-09-25 13:49+0800\n"
+"PO-Revision-Date: 2010-09-23 20:50+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -618,6 +618,7 @@ msgid ""
msgstr "伺æœå™¨æ†‘證的長度,或是伺æœå™¨æ†‘è­‰éˆçš„深度超éŽå¯†ç¢¼å‡½å¼åº«æ‰€èƒ½è™•ç†çš„範åœ"
#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "附近的人"
@@ -1425,6 +1426,14 @@ msgstr "ç¨å¾Œå†æ±ºå®š"
msgid "Subscription Request"
msgstr "訂閱è¦æ±‚"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "未群組"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "喜好的人"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
@@ -1496,7 +1505,7 @@ msgid "Share My Desktop"
msgstr "分享我的桌é¢"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539
#: ../libempathy-gtk/empathy-individual-menu.c:759
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
@@ -1552,128 +1561,128 @@ msgstr "網站:"
msgid "Birthday:"
msgstr "生日:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578
#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "國家 ISO 碼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580
#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "國家:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "州:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584
#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "å€åŸŸï¼š"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588
#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "郵éžå€è™Ÿï¼š"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590
#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "街:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592
#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "建築:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594
#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "樓層:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596
#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "室:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598
#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "文字:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600
#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "æ述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602
#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604
#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "準確度等級:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606
#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "錯誤:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608
#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "垂直誤差 (公尺):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610
#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "水平誤差 (公尺):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "æ–¹ä½ï¼š"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "爬å‡é€Ÿåº¦ï¼š"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "上次更新於:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "經度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:582
#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
@@ -1681,23 +1690,23 @@ msgid "Location"
msgstr "ä½ç½®"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%sã€%s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y æ–¼ %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841
#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897
#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
@@ -1884,10 +1893,12 @@ msgid "Conversations"
msgstr "談話"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "尋找下一個"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "尋找上一個"
@@ -1971,15 +1982,15 @@ msgstr "設定您的上線與目å‰çš„狀態"
msgid "Custom messages…"
msgstr "自訂訊æ¯â€¦"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "尋找:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "符åˆæ¢ä»¶"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "找ä¸åˆ°è©žå½™"
diff --git a/src/Makefile.am b/src/Makefile.am
index c77b63a91..378bdee67 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,13 +106,16 @@ empathy_debugger_SOURCES = \
empathy-debugger.c \
$(NULL)
-empathy_av_SOURCES = \
+empathy_handwritten_av_source = \
empathy-av.c \
empathy-call-window-fullscreen.c empathy-call-window-fullscreen.h \
empathy-call-window.c empathy-call-window.h \
- empathy-sidebar.c empathy-sidebar.h \
$(NULL)
+empathy_av_SOURCES = \
+ $(empathy_handwritten_av_source) \
+ ev-sidebar.c ev-sidebar.h
+
empathy_auth_client_SOURCES = \
empathy-auth-client.c
@@ -152,7 +155,7 @@ nodist_empathy_SOURCES = $(BUILT_SOURCES)
check_c_sources = \
$(empathy_handwritten_source) \
$(empathy_logs_SOURCES) \
- $(empathy_av_SOURCES)
+ $(empathy_handwritten_av_source)
include $(top_srcdir)/tools/check-coding-style.mk
check-local: check-coding-style
diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c
index e3176c057..c1e18487c 100644
--- a/src/empathy-about-dialog.c
+++ b/src/empathy-about-dialog.c
@@ -33,10 +33,6 @@
#define WEB_SITE "http://live.gnome.org/Empathy"
-static void about_dialog_activate_link_cb (GtkAboutDialog *about,
- const gchar *link,
- gpointer data);
-
static const char *authors[] = {
"Alban Crequy",
"Andreas Lööw",
@@ -95,21 +91,11 @@ static const char *license[] = {
"51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA")
};
-static void
-about_dialog_activate_link_cb (GtkAboutDialog *about,
- const gchar *link_,
- gpointer data)
-{
- empathy_url_show (GTK_WIDGET (about), link_);
-}
-
void
empathy_about_dialog_new (GtkWindow *parent)
{
gchar *license_trans;
- gtk_about_dialog_set_url_hook (about_dialog_activate_link_cb, NULL, NULL);
-
license_trans = g_strconcat (_(license[0]), "\n\n",
_(license[1]), "\n\n",
_(license[2]), "\n\n",
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 0f7bf4d25..926f6e09a 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -381,63 +381,19 @@ static void
account_assistant_protocol_changed_cb (GtkComboBox *chooser,
EmpathyAccountAssistant *self)
{
- TpConnectionManager *cm;
- TpConnectionManagerProtocol *proto;
EmpathyAccountSettings *settings;
EmpathyAccountAssistantPriv *priv;
- char *str;
GtkWidget *account_widget;
EmpathyAccountWidget *widget_object = NULL;
- gboolean is_gtalk, is_facebook;
- const gchar *name;
priv = GET_PRIV (self);
- cm = empathy_protocol_chooser_dup_selected (
- EMPATHY_PROTOCOL_CHOOSER (chooser), &proto, &is_gtalk, &is_facebook);
+ settings = empathy_protocol_chooser_create_account_settings (
+ EMPATHY_PROTOCOL_CHOOSER (chooser));
- if (cm == NULL || proto == NULL)
- /* we are not ready yet */
+ if (settings == NULL)
return;
- /* Create account */
- if (is_gtalk)
- name = "gtalk";
- else if (is_facebook)
- name = "facebook";
- else
- name = proto->name;
-
- /* To translator: %s is the protocol name */
- str = g_strdup_printf (_("New %s account"),
- empathy_protocol_name_to_display_name (name));
-
- settings = empathy_account_settings_new (cm->name, proto->name, str);
-
- if (is_gtalk)
- {
- gchar *fallback_servers[] = {
- "talkx.l.google.com",
- "talkx.l.google.com:443,oldssl",
- "talkx.l.google.com:80",
- NULL};
-
- empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
- NULL, NULL);
-
- empathy_account_settings_set_string (settings, "server", NULL);
- empathy_account_settings_set_strv (settings, "fallback-servers",
- fallback_servers);
- }
- else if (is_facebook)
- {
- empathy_account_settings_set_icon_name_async (settings, "im-facebook",
- NULL, NULL);
-
- empathy_account_settings_set_string (settings, "server",
- "chat.facebook.com");
- }
-
if (priv->first_resp == RESPONSE_CREATE_ACCOUNT)
empathy_account_settings_set_boolean (settings, "register", TRUE);
@@ -471,16 +427,13 @@ account_assistant_protocol_changed_cb (GtkComboBox *chooser,
gtk_box_pack_start (GTK_BOX (priv->enter_or_create_page), account_widget,
FALSE, FALSE, 0);
gtk_widget_show (account_widget);
-
- g_free (str);
}
static gboolean
account_assistant_chooser_enter_details_filter_func (
TpConnectionManager *cm,
TpConnectionManagerProtocol *protocol,
- gboolean is_gtalk,
- gboolean is_facebook,
+ const gchar *service,
gpointer user_data)
{
if (!tp_strdiff (protocol->name, "local-xmpp"))
@@ -493,11 +446,10 @@ static gboolean
account_assistant_chooser_create_account_filter_func (
TpConnectionManager *cm,
TpConnectionManagerProtocol *protocol,
- gboolean is_gtalk,
- gboolean is_facebook,
+ const gchar *service,
gpointer user_data)
{
- if (is_gtalk || is_facebook)
+ if (service != NULL)
return FALSE;
return tp_connection_manager_protocol_can_register (protocol);
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 98301a485..9f2f97a41 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -39,7 +39,6 @@
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-connection-managers.h>
#include <libempathy/empathy-connectivity.h>
-#include <libempathy/empathy-gsettings.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include <libempathy-gtk/empathy-protocol-chooser.h>
@@ -584,61 +583,11 @@ accounts_dialog_setup_ui_to_add_account (EmpathyAccountsDialog *dialog)
{
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
EmpathyAccountSettings *settings;
- gchar *str;
- const gchar *name, *display_name;
- TpConnectionManager *cm;
- TpConnectionManagerProtocol *proto;
- gboolean is_gtalk, is_facebook;
-
- cm = empathy_protocol_chooser_dup_selected (
- EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto, &is_gtalk,
- &is_facebook);
- if (cm == NULL)
- return;
-
- if (is_gtalk)
- name = "gtalk";
- else if (is_facebook)
- name ="facebook";
- else
- name = proto->name;
-
- display_name = empathy_protocol_name_to_display_name (name);
- if (display_name == NULL)
- display_name = proto->name;
-
- /* Create account */
- /* To translator: %s is the name of the protocol, such as "Google Talk" or
- * "Yahoo!"
- */
- str = g_strdup_printf (_("New %s account"), display_name);
- settings = empathy_account_settings_new (cm->name, proto->name, str);
-
- g_free (str);
- if (is_gtalk)
- {
- gchar *fallback_servers[] = {
- "talkx.l.google.com",
- "talkx.l.google.com:443,oldssl",
- "talkx.l.google.com:80",
- NULL};
-
- empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
- NULL, NULL);
-
- empathy_account_settings_set_string (settings, "server", NULL);
- empathy_account_settings_set_strv (settings, "fallback-servers",
- fallback_servers);
- }
- else if (is_facebook)
- {
- empathy_account_settings_set_icon_name_async (settings, "im-facebook",
- NULL, NULL);
-
- empathy_account_settings_set_string (settings, "server",
- "chat.facebook.com");
- }
+ settings = empathy_protocol_chooser_create_account_settings (
+ EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol));
+ if (settings == NULL)
+ return;
accounts_dialog_add (dialog, settings);
accounts_dialog_model_set_selected (dialog, settings);
@@ -646,7 +595,6 @@ accounts_dialog_setup_ui_to_add_account (EmpathyAccountsDialog *dialog)
gtk_widget_show_all (priv->hbox_protocol);
g_object_unref (settings);
- g_object_unref (cm);
}
static void
@@ -2161,11 +2109,6 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
- /* FIXME: Remove this once we unconditionally depend on GTK+ 3 */
-#ifndef HAVE_GTK3
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-#endif
-
/* add dialog buttons */
gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_END);
@@ -2262,7 +2205,6 @@ do_constructed (GObject *object)
EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (object);
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
GtkTreeModel *model;
- GSettings *gsettings = g_settings_new (EMPATHY_PREFS_SCHEMA);
accounts_dialog_build_ui (dialog);
accounts_dialog_model_setup (dialog);
@@ -2279,24 +2221,7 @@ do_constructed (GObject *object)
tp_account_manager_prepare_async (priv->account_manager, NULL,
accounts_dialog_manager_ready_cb, dialog);
- if (empathy_import_accounts_to_import ())
- {
- gtk_widget_show (priv->button_import);
-
- if (!g_settings_get_boolean (gsettings, EMPATHY_PREFS_IMPORT_ASKED))
- {
- GtkWidget *import_dialog;
-
- g_settings_set_boolean (gsettings, EMPATHY_PREFS_IMPORT_ASKED, TRUE);
- import_dialog = empathy_import_dialog_new (GTK_WINDOW (dialog),
- FALSE);
- gtk_widget_show (import_dialog);
- }
- }
-
priv->connectivity = empathy_connectivity_dup_singleton ();
-
- g_object_unref (gsettings);
}
static void
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 89673ee48..788bc89e4 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -222,10 +222,12 @@ main (int argc, char *argv[])
if (unique_app_is_running (unique_app))
{
- unique_app_send_message (unique_app, UNIQUE_ACTIVATE, NULL);
-
- g_object_unref (unique_app);
- return EXIT_SUCCESS;
+ if (unique_app_send_message (unique_app, UNIQUE_ACTIVATE, NULL) ==
+ UNIQUE_RESPONSE_OK)
+ {
+ g_object_unref (unique_app);
+ return EXIT_SUCCESS;
+ }
}
account_manager = tp_account_manager_dup ();
diff --git a/src/empathy-auto-salut-account-helper.c b/src/empathy-auto-salut-account-helper.c
index 57d39879e..409b6936c 100644
--- a/src/empathy-auto-salut-account-helper.c
+++ b/src/empathy-auto-salut-account-helper.c
@@ -79,7 +79,7 @@ create_salut_account_settings (void)
GError *error = NULL;
#endif
- settings = empathy_account_settings_new ("salut", "local-xmpp",
+ settings = empathy_account_settings_new ("salut", "local-xmpp", NULL,
_("People nearby"));
#if HAVE_EDS
diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c
index e1c3d7a39..966d49add 100644
--- a/src/empathy-call-window-fullscreen.c
+++ b/src/empathy-call-window-fullscreen.c
@@ -68,14 +68,17 @@ empathy_call_window_fullscreen_set_cursor_visible (
gboolean show_cursor)
{
EmpathyCallWindowFullscreenPriv *priv = GET_PRIV (fs);
+ GdkWindow *window;
- if (priv->video_widget != NULL && !show_cursor)
- {
- gdk_window_set_cursor (gtk_widget_get_window (priv->video_widget),
- gdk_cursor_new (GDK_BLANK_CURSOR));
- }
+ if (priv->video_widget == NULL)
+ return;
+
+ window = gtk_widget_get_window (priv->video_widget);
+
+ if (!show_cursor)
+ gdk_window_set_cursor (window, gdk_cursor_new (GDK_BLANK_CURSOR));
else
- gdk_window_set_cursor (gtk_widget_get_window (priv->video_widget), NULL);
+ gdk_window_set_cursor (window, NULL);
}
static void
@@ -284,6 +287,15 @@ empathy_call_window_fullscreen_set_fullscreen (EmpathyCallWindowFullscreen *fs,
fs->is_fullscreen = set_fullscreen;
}
+static void
+video_widget_destroy_cb (GtkWidget *widget,
+ EmpathyCallWindowFullscreen *self)
+{
+ EmpathyCallWindowFullscreenPriv *priv = GET_PRIV (self);
+
+ priv->video_widget = NULL;
+}
+
void
empathy_call_window_fullscreen_set_video_widget (
EmpathyCallWindowFullscreen *fs,
@@ -291,4 +303,7 @@ empathy_call_window_fullscreen_set_video_widget (
{
EmpathyCallWindowFullscreenPriv *priv = GET_PRIV (fs);
priv->video_widget = video_widget;
+
+ tp_g_signal_connect_object (video_widget, "destroy",
+ G_CALLBACK (video_widget_destroy_cb), fs, 0);
}
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 81c7d54a9..00ea56728 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -53,7 +53,7 @@
#include "empathy-call-window.h"
#include "empathy-call-window-fullscreen.h"
-#include "empathy-sidebar.h"
+#include "ev-sidebar.h"
#define BUTTON_ID "empathy-call-dtmf-button-id"
@@ -245,10 +245,10 @@ static void empathy_call_window_set_send_video (EmpathyCallWindow *window,
static void empathy_call_window_mic_toggled_cb (
GtkToggleToolButton *toggle, EmpathyCallWindow *window);
-static void empathy_call_window_sidebar_hidden_cb (EmpathySidebar *sidebar,
+static void empathy_call_window_sidebar_hidden_cb (EvSidebar *sidebar,
EmpathyCallWindow *window);
-static void empathy_call_window_sidebar_shown_cb (EmpathySidebar *sidebar,
+static void empathy_call_window_sidebar_shown_cb (EvSidebar *sidebar,
EmpathyCallWindow *window);
static void empathy_call_window_hangup_cb (gpointer object,
@@ -603,17 +603,8 @@ empathy_call_window_create_audio_input (EmpathyCallWindow *self)
priv->volume_progress_bar = gtk_progress_bar_new ();
- /* FIXME: Once we unconditionally depend on GTK+ 3, we can remove the fallback
- * for GTK+ 2 here. GtkProgressBar doesn't implement GtkOrientable in GTK+ 2,
- * unfortunately. */
-#ifndef HAVE_GTK3
- gtk_progress_bar_set_orientation (
- GTK_PROGRESS_BAR (priv->volume_progress_bar),
- GTK_PROGRESS_BOTTOM_TO_TOP);
-#else
gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->volume_progress_bar),
GTK_ORIENTATION_VERTICAL);
-#endif
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->volume_progress_bar),
0);
@@ -1094,6 +1085,8 @@ empathy_call_window_init (EmpathyCallWindow *self)
"action_camera_off", "changed", action_camera_change_cb,
NULL);
+ gtk_action_set_sensitive (priv->menu_fullscreen, FALSE);
+
priv->lock = g_mutex_new ();
gtk_container_add (GTK_CONTAINER (self), top_vbox);
@@ -1181,7 +1174,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
gtk_box_pack_end (GTK_BOX (priv->vbox), h, FALSE, FALSE, 3);
gtk_box_pack_end (GTK_BOX (h), priv->sidebar_button, FALSE, FALSE, 3);
- priv->sidebar = empathy_sidebar_new ();
+ priv->sidebar = ev_sidebar_new ();
g_signal_connect (G_OBJECT (priv->sidebar),
"hide", G_CALLBACK (empathy_call_window_sidebar_hidden_cb), self);
g_signal_connect (G_OBJECT (priv->sidebar),
@@ -1189,21 +1182,21 @@ empathy_call_window_init (EmpathyCallWindow *self)
gtk_paned_pack2 (GTK_PANED (priv->pane), priv->sidebar, FALSE, FALSE);
page = empathy_call_window_create_audio_input (self);
- empathy_sidebar_add_page (EMPATHY_SIDEBAR (priv->sidebar), _("Audio input"),
- page);
+ ev_sidebar_add_page (EV_SIDEBAR (priv->sidebar), "audio-input",
+ _("Audio input"), page);
page = empathy_call_window_create_video_input (self);
- empathy_sidebar_add_page (EMPATHY_SIDEBAR (priv->sidebar), _("Video input"),
- page);
+ ev_sidebar_add_page (EV_SIDEBAR (priv->sidebar), "video-input",
+ _("Video input"), page);
priv->dtmf_panel = empathy_call_window_create_dtmf (self);
- empathy_sidebar_add_page (EMPATHY_SIDEBAR (priv->sidebar), _("Dialpad"),
- priv->dtmf_panel);
+ ev_sidebar_add_page (EV_SIDEBAR (priv->sidebar), "dialpad",
+ _("Dialpad"), priv->dtmf_panel);
gtk_widget_set_sensitive (priv->dtmf_panel, FALSE);
- empathy_sidebar_add_page (EMPATHY_SIDEBAR (priv->sidebar), _("Details"),
- priv->details_vbox);
+ ev_sidebar_add_page (EV_SIDEBAR (priv->sidebar), "details",
+ _("Details"), priv->details_vbox);
gtk_widget_show_all (top_vbox);
@@ -1773,10 +1766,9 @@ empathy_call_window_dispose (GObject *object)
G_OBJECT_CLASS (empathy_call_window_parent_class)->dispose (object);
}
-void
-empathy_call_window_finalize (GObject *object)
+static void
+disconnect_video_output_motion_handler (EmpathyCallWindow *self)
{
- EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (object);
EmpathyCallWindowPriv *priv = GET_PRIV (self);
if (priv->video_output_motion_handler_id != 0)
@@ -1785,6 +1777,15 @@ empathy_call_window_finalize (GObject *object)
priv->video_output_motion_handler_id);
priv->video_output_motion_handler_id = 0;
}
+}
+
+void
+empathy_call_window_finalize (GObject *object)
+{
+ EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (object);
+ EmpathyCallWindowPriv *priv = GET_PRIV (self);
+
+ disconnect_video_output_motion_handler (self);
/* free any data held directly by the object here */
g_mutex_free (priv->lock);
@@ -1904,6 +1905,11 @@ empathy_call_window_disconnected (EmpathyCallWindow *self,
EmpathyCallWindowPriv *priv = GET_PRIV (self);
gboolean could_reset_pipeline;
+ /* Leave full screen mode if needed */
+ gtk_window_unfullscreen (GTK_WINDOW (self));
+
+ gtk_action_set_sensitive (priv->menu_fullscreen, FALSE);
+
could_reset_pipeline = empathy_call_window_reset_pipeline (self);
if (priv->call_state == CONNECTING)
@@ -1958,6 +1964,7 @@ empathy_call_window_disconnected (EmpathyCallWindow *self,
GTK_PROGRESS_BAR (priv->volume_progress_bar), 0);
/* destroy the video output; it will be recreated when we'll redial */
+ disconnect_video_output_motion_handler (self);
gtk_widget_destroy (priv->video_output);
priv->video_output = NULL;
@@ -2492,6 +2499,8 @@ empathy_call_window_connected (gpointer user_data)
empathy_call_window_update_timer (self);
+ gtk_action_set_sensitive (priv->menu_fullscreen, TRUE);
+
return FALSE;
}
@@ -2921,10 +2930,15 @@ show_borders (EmpathyCallWindow *window, gboolean set_fullscreen)
set_fullscreen ? 0 : CONTENT_HBOX_BORDER_WIDTH);
gtk_box_set_spacing (GTK_BOX (priv->content_hbox),
set_fullscreen ? 0 : CONTENT_HBOX_SPACING);
- gtk_box_set_child_packing (GTK_BOX (priv->content_hbox),
- priv->video_output, TRUE, TRUE,
- set_fullscreen ? 0 : CONTENT_HBOX_CHILDREN_PACKING_PADDING,
- GTK_PACK_START);
+
+ if (priv->video_output != NULL)
+ {
+ gtk_box_set_child_packing (GTK_BOX (priv->content_hbox),
+ priv->video_output, TRUE, TRUE,
+ set_fullscreen ? 0 : CONTENT_HBOX_CHILDREN_PACKING_PADDING,
+ GTK_PACK_START);
+ }
+
gtk_box_set_child_packing (GTK_BOX (priv->content_hbox),
priv->vbox, TRUE, TRUE,
set_fullscreen ? 0 : CONTENT_HBOX_CHILDREN_PACKING_PADDING,
@@ -2968,12 +2982,7 @@ empathy_call_window_state_event_cb (GtkWidget *widget,
}
else
{
- if (priv->video_output_motion_handler_id != 0)
- {
- g_signal_handler_disconnect (G_OBJECT (priv->video_output),
- priv->video_output_motion_handler_id);
- priv->video_output_motion_handler_id = 0;
- }
+ disconnect_video_output_motion_handler (window);
}
empathy_call_window_fullscreen_set_fullscreen (priv->fullscreen,
@@ -3082,7 +3091,7 @@ empathy_call_window_mic_toggled_cb (GtkToggleToolButton *toggle,
}
static void
-empathy_call_window_sidebar_hidden_cb (EmpathySidebar *sidebar,
+empathy_call_window_sidebar_hidden_cb (EvSidebar *sidebar,
EmpathyCallWindow *window)
{
EmpathyCallWindowPriv *priv = GET_PRIV (window);
@@ -3092,7 +3101,7 @@ empathy_call_window_sidebar_hidden_cb (EmpathySidebar *sidebar,
}
static void
-empathy_call_window_sidebar_shown_cb (EmpathySidebar *sidebar,
+empathy_call_window_sidebar_shown_cb (EvSidebar *sidebar,
EmpathyCallWindow *window)
{
EmpathyCallWindowPriv *priv = GET_PRIV (window);
@@ -3118,6 +3127,10 @@ empathy_call_window_restart_call (EmpathyCallWindow *window)
{
EmpathyCallWindowPriv *priv = GET_PRIV (window);
+ /* Remove error info bars */
+ gtk_container_forall (GTK_CONTAINER (priv->errors_vbox),
+ (GtkCallback) gtk_widget_destroy, NULL);
+
create_video_output_widget (window);
g_signal_connect (G_OBJECT (priv->audio_input_adj), "value-changed",
@@ -3196,7 +3209,7 @@ empathy_call_window_key_press_cb (GtkWidget *video_output,
{
EmpathyCallWindowPriv *priv = GET_PRIV (window);
- if (priv->is_fullscreen && event->keyval == GDK_Escape)
+ if (priv->is_fullscreen && event->keyval == GDK_KEY_Escape)
{
/* Since we are in fullscreen mode, toggling will bring us back to
normal mode. */
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index dd87236ca..fe2783667 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -116,8 +116,8 @@ typedef struct {
static GList *chat_windows = NULL;
static const guint tab_accel_keys[] = {
- GDK_1, GDK_2, GDK_3, GDK_4, GDK_5,
- GDK_6, GDK_7, GDK_8, GDK_9, GDK_0
+ GDK_KEY_1, GDK_KEY_2, GDK_KEY_3, GDK_KEY_4, GDK_KEY_5,
+ GDK_KEY_6, GDK_KEY_7, GDK_KEY_8, GDK_KEY_9, GDK_KEY_0
};
typedef enum {
@@ -146,6 +146,20 @@ static const GtkTargetEntry drag_types_dest_file[] = {
static void chat_window_update (EmpathyChatWindow *window);
+static void empathy_chat_window_add_chat (EmpathyChatWindow *window,
+ EmpathyChat *chat);
+
+static void empathy_chat_window_remove_chat (EmpathyChatWindow *window,
+ EmpathyChat *chat);
+
+static void empathy_chat_window_move_chat (EmpathyChatWindow *old_window,
+ EmpathyChatWindow *new_window,
+ EmpathyChat *chat);
+
+static void empathy_chat_window_get_nb_chats (EmpathyChatWindow *self,
+ guint *nb_rooms,
+ guint *nb_private);
+
G_DEFINE_TYPE (EmpathyChatWindow, empathy_chat_window, G_TYPE_OBJECT);
static void
@@ -1154,6 +1168,12 @@ chat_window_tabs_right_activate_cb (GtkAction *action,
chat_window_menu_context_update (priv, num_pages);
}
+static EmpathyChatWindow *
+empathy_chat_window_new (void)
+{
+ return EMPATHY_CHAT_WINDOW (g_object_new (EMPATHY_TYPE_CHAT_WINDOW, NULL));
+}
+
static void
chat_window_detach_activate_cb (GtkAction *action,
EmpathyChatWindow *window)
@@ -1348,6 +1368,21 @@ chat_window_set_highlight_room_tab_label (EmpathyChat *chat)
g_free (markup);
}
+static gboolean
+empathy_chat_window_has_focus (EmpathyChatWindow *window)
+{
+ EmpathyChatWindowPriv *priv;
+ gboolean has_focus;
+
+ g_return_val_if_fail (EMPATHY_IS_CHAT_WINDOW (window), FALSE);
+
+ priv = GET_PRIV (window);
+
+ g_object_get (priv->dialog, "has-toplevel-focus", &has_focus, NULL);
+
+ return has_focus;
+}
+
static void
chat_window_new_message_cb (EmpathyChat *chat,
EmpathyMessage *message,
@@ -1428,12 +1463,13 @@ chat_window_new_message_cb (EmpathyChat *chat,
chat_window_show_or_update_notification (window, message, chat);
}
- /* update the number of unread messages */
+ /* update the number of unread messages and the window icon */
chat_window_title_update (priv);
+ chat_window_icon_update (priv);
}
static GtkNotebook *
-chat_window_detach_hook (GtkNotebook *source,
+notebook_create_window_cb (GtkNotebook *source,
GtkWidget *page,
gint x,
gint y,
@@ -1883,8 +1919,6 @@ empathy_chat_window_class_init (EmpathyChatWindowClass *klass)
" ythickness = 0\n"
"}\n"
"widget \"*.empathy-close-button\" style \"empathy-close-button-style\"");
-
- gtk_notebook_set_window_creation_hook (chat_window_detach_hook, NULL, NULL);
}
static void
@@ -1954,7 +1988,12 @@ empathy_chat_window_init (EmpathyChatWindow *window)
priv->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
priv->notebook = gtk_notebook_new ();
- gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow");
+
+ g_signal_connect (priv->notebook, "create-window",
+ G_CALLBACK (notebook_create_window_cb), window);
+
+ gtk_notebook_set_group_name (GTK_NOTEBOOK (priv->notebook),
+ "EmpathyChatWindow");
gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), TRUE);
gtk_notebook_popup_enable (GTK_NOTEBOOK (priv->notebook));
gtk_box_pack_start (GTK_BOX (chat_vbox), priv->notebook, TRUE, TRUE, 0);
@@ -2061,17 +2100,23 @@ empathy_chat_window_init (EmpathyChatWindow *window)
window);
}
-EmpathyChatWindow *
-empathy_chat_window_new (void)
+static GtkWidget *
+empathy_chat_window_get_dialog (EmpathyChatWindow *window)
{
- return EMPATHY_CHAT_WINDOW (g_object_new (EMPATHY_TYPE_CHAT_WINDOW, NULL));
+ EmpathyChatWindowPriv *priv;
+
+ g_return_val_if_fail (window != NULL, NULL);
+
+ priv = GET_PRIV (window);
+
+ return priv->dialog;
}
/* Returns the window to open a new tab in if there is only one window
* visble, otherwise, returns NULL indicating that a new window should
* be added.
*/
-EmpathyChatWindow *
+static EmpathyChatWindow *
empathy_chat_window_get_default (gboolean room)
{
GSettings *gsettings = g_settings_new (EMPATHY_PREFS_UI_SCHEMA);
@@ -2117,19 +2162,7 @@ empathy_chat_window_get_default (gboolean room)
return NULL;
}
-GtkWidget *
-empathy_chat_window_get_dialog (EmpathyChatWindow *window)
-{
- EmpathyChatWindowPriv *priv;
-
- g_return_val_if_fail (window != NULL, NULL);
-
- priv = GET_PRIV (window);
-
- return priv->dialog;
-}
-
-void
+static void
empathy_chat_window_add_chat (EmpathyChatWindow *window,
EmpathyChat *chat)
{
@@ -2158,12 +2191,29 @@ empathy_chat_window_add_chat (EmpathyChatWindow *window,
g_object_unref (gsettings);
+ if (empathy_chat_is_room (chat))
+ name = "room-window";
+
if (separate_windows) {
+ gint x, y;
+
+ /* Save current position of the window */
+ gtk_window_get_position (GTK_WINDOW (priv->dialog), &x, &y);
+
+ /* First bind to the 'generic' name. So new window for which we didn't
+ * save a geometry yet will have the geometry of the last saved
+ * window (bgo #601191). */
+ empathy_geometry_bind (GTK_WINDOW (priv->dialog), name);
+
+ /* Restore previous position of the window so the newly created window
+ * won't be in the same position as the latest saved window and so
+ * completely hide it. */
+ gtk_window_move (GTK_WINDOW (priv->dialog), x, y);
+
+ /* Then bind it to the name of the contact/room so we'll save the
+ * geometry specific to this window */
name = empathy_chat_get_id (chat);
}
- else if (empathy_chat_is_room (chat)) {
- name = "room-window";
- }
empathy_geometry_bind (GTK_WINDOW (priv->dialog), name);
}
@@ -2198,7 +2248,7 @@ empathy_chat_window_add_chat (EmpathyChatWindow *window,
DEBUG ("Chat added (%d references)", G_OBJECT (chat)->ref_count);
}
-void
+static void
empathy_chat_window_remove_chat (EmpathyChatWindow *window,
EmpathyChat *chat)
{
@@ -2236,7 +2286,7 @@ empathy_chat_window_remove_chat (EmpathyChatWindow *window,
g_object_unref (chat);
}
-void
+static void
empathy_chat_window_move_chat (EmpathyChatWindow *old_window,
EmpathyChatWindow *new_window,
EmpathyChat *chat)
@@ -2265,7 +2315,7 @@ empathy_chat_window_move_chat (EmpathyChatWindow *old_window,
g_object_unref (chat);
}
-void
+static void
empathy_chat_window_switch_to_chat (EmpathyChatWindow *window,
EmpathyChat *chat)
{
@@ -2283,21 +2333,6 @@ empathy_chat_window_switch_to_chat (EmpathyChatWindow *window,
page_num);
}
-gboolean
-empathy_chat_window_has_focus (EmpathyChatWindow *window)
-{
- EmpathyChatWindowPriv *priv;
- gboolean has_focus;
-
- g_return_val_if_fail (EMPATHY_IS_CHAT_WINDOW (window), FALSE);
-
- priv = GET_PRIV (window);
-
- g_object_get (priv->dialog, "has-toplevel-focus", &has_focus, NULL);
-
- return has_focus;
-}
-
EmpathyChat *
empathy_chat_window_find_chat (TpAccount *account,
const gchar *id)
@@ -2379,7 +2414,7 @@ empathy_chat_window_present_chat (EmpathyChat *chat,
gtk_widget_grab_focus (chat->input_text_view);
}
-void
+static void
empathy_chat_window_get_nb_chats (EmpathyChatWindow *self,
guint *nb_rooms,
guint *nb_private)
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 4cbd2094a..5477479ac 100644
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -57,28 +57,12 @@ struct _EmpathyChatWindowClass {
};
GType empathy_chat_window_get_type (void);
-EmpathyChatWindow *empathy_chat_window_get_default (gboolean room);
-EmpathyChatWindow *empathy_chat_window_new (void);
-GtkWidget * empathy_chat_window_get_dialog (EmpathyChatWindow *window);
-void empathy_chat_window_add_chat (EmpathyChatWindow *window,
- EmpathyChat *chat);
-void empathy_chat_window_remove_chat (EmpathyChatWindow *window,
- EmpathyChat *chat);
-void empathy_chat_window_move_chat (EmpathyChatWindow *old_window,
- EmpathyChatWindow *new_window,
- EmpathyChat *chat);
-void empathy_chat_window_switch_to_chat (EmpathyChatWindow *window,
- EmpathyChat *chat);
-gboolean empathy_chat_window_has_focus (EmpathyChatWindow *window);
+
EmpathyChat * empathy_chat_window_find_chat (TpAccount *account,
const gchar *id);
void empathy_chat_window_present_chat (EmpathyChat *chat,
gint64 timestamp);
-void empathy_chat_window_get_nb_chats (EmpathyChatWindow *window,
- guint *nb_rooms,
- guint *nb_private);
-
G_END_DECLS
#endif /* __EMPATHY_CHAT_WINDOW_H__ */
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index affb25974..ddebf233b 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -1328,8 +1328,8 @@ debug_window_key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
gpointer user_data)
{
- if ((event->state & GDK_CONTROL_MASK && event->keyval == GDK_w)
- || event->keyval == GDK_Escape)
+ if ((event->state & GDK_CONTROL_MASK && event->keyval == GDK_KEY_w)
+ || event->keyval == GDK_KEY_Escape)
{
gtk_widget_destroy (widget);
return TRUE;
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 6b9e5372c..126ad8795 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -927,8 +927,8 @@ ft_manager_key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
gpointer user_data)
{
- if ((event->state & GDK_CONTROL_MASK && event->keyval == GDK_w)
- || event->keyval == GDK_Escape)
+ if ((event->state & GDK_CONTROL_MASK && event->keyval == GDK_KEY_w)
+ || event->keyval == GDK_KEY_Escape)
{
gtk_widget_destroy (widget);
return TRUE;
diff --git a/src/empathy-ft-manager.ui b/src/empathy-ft-manager.ui
index fa72af949..fe8a18a82 100644
--- a/src/empathy-ft-manager.ui
+++ b/src/empathy-ft-manager.ui
@@ -9,7 +9,6 @@
<property name="role">empathy-ft-manager</property>
<property name="icon_name">document-send</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox31">
<property name="visible">True</property>
diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index 1fc00c0e5..da0c9d3ea 100644
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -198,11 +198,6 @@ empathy_import_dialog_init (EmpathyImportDialog *self)
gtk_container_set_border_width (GTK_CONTAINER (self), 5);
gtk_window_set_title (GTK_WINDOW (self), _("Import Accounts"));
gtk_window_set_modal (GTK_WINDOW (self), TRUE);
-
- /* FIXME: Remove this once we unconditionally depend on GTK+ 3 */
-#ifndef HAVE_GTK3
- gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
-#endif
}
static void
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 9a336a3aa..6519a50d4 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -725,7 +725,7 @@ main_window_key_press_event_cb (GtkWidget *window,
{
EmpathyChatManager *chat_manager;
- if (event->keyval == GDK_T
+ if (event->keyval == GDK_KEY_T
&& event->state & GDK_SHIFT_MASK
&& event->state & GDK_CONTROL_MASK) {
chat_manager = empathy_chat_manager_dup_singleton ();
@@ -1661,7 +1661,6 @@ empathy_main_window_init (EmpathyMainWindow *window)
priv->throbber = gtk_spinner_new ();
gtk_widget_set_size_request (priv->throbber, 16, -1);
gtk_widget_set_tooltip_text (priv->throbber, _("Show and edit accounts"));
- gtk_widget_set_has_window (GTK_WIDGET (priv->throbber), TRUE);
gtk_widget_set_events (priv->throbber, GDK_BUTTON_PRESS_MASK);
g_signal_connect (priv->throbber, "button-press-event",
G_CALLBACK (main_window_throbber_button_press_event_cb),
diff --git a/src/empathy-new-chatroom-dialog.ui b/src/empathy-new-chatroom-dialog.ui
index 6162d526d..e2b6a814a 100644
--- a/src/empathy-new-chatroom-dialog.ui
+++ b/src/empathy-new-chatroom-dialog.ui
@@ -12,7 +12,6 @@
<property name="role">join_new_chatroom</property>
<property name="default_width">350</property>
<property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox4">
<property name="visible">True</property>
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index edc405974..89133edb5 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -885,11 +885,6 @@ empathy_preferences_init (EmpathyPreferences *preferences)
GTK_WIN_POS_CENTER_ON_PARENT);
gtk_window_set_icon_name (GTK_WINDOW (preferences), "gtk-preferences");
- /* FIXME: Remove this once we unconditionally depend on GTK+ 3 */
-#ifndef HAVE_GTK3
- gtk_dialog_set_has_separator (GTK_DIALOG (preferences), FALSE);
-#endif
-
filename = empathy_file_lookup ("empathy-preferences.ui", "src");
gui = empathy_builder_get_file (filename,
"notebook", &priv->notebook,
diff --git a/src/empathy-sidebar.c b/src/empathy-sidebar.c
deleted file mode 100644
index 8c979213c..000000000
--- a/src/empathy-sidebar.c
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
- * Copyright (C) 2004 Red Hat, Inc.
- * Copyright (C) 2007 The Free Software Foundation
- * Copyright (C) 2008 Marco Barisione <marco@barisione.org>
- *
- * Based on evince code (shell/ev-sidebar.c) by:
- * - Jonathan Blandford <jrb@alum.mit.edu>
- *
- * Base on eog code (src/eog-sidebar.c) by:
- * - Lucas Rocha <lucasr@gnome.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include "empathy-sidebar.h"
-
-enum
-{
- PROP_0,
- PROP_CURRENT_PAGE
-};
-
-enum
-{
- PAGE_COLUMN_TITLE,
- PAGE_COLUMN_MENU_ITEM,
- PAGE_COLUMN_MAIN_WIDGET,
- PAGE_COLUMN_NOTEBOOK_INDEX,
- PAGE_COLUMN_NUM_COLS
-};
-
-enum
-{
- SIGNAL_PAGE_ADDED,
- SIGNAL_PAGE_REMOVED,
- SIGNAL_LAST
-};
-
-static gint signals[SIGNAL_LAST];
-
-struct _EmpathySidebarPrivate
-{
- GtkWidget *notebook;
- GtkWidget *select_button;
- GtkWidget *menu;
- GtkWidget *hbox;
- GtkWidget *label;
-
- GtkTreeModel *page_model;
-};
-
-G_DEFINE_TYPE (EmpathySidebar, empathy_sidebar, GTK_TYPE_VBOX)
-
-#define EMPATHY_SIDEBAR_GET_PRIVATE(object) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((object), EMPATHY_TYPE_SIDEBAR, EmpathySidebarPrivate))
-
-static void
-empathy_sidebar_destroy (GtkObject *object)
-{
- EmpathySidebar *sidebar = EMPATHY_SIDEBAR (object);
-
- if (sidebar->priv->menu)
- {
- gtk_menu_detach (GTK_MENU (sidebar->priv->menu));
- sidebar->priv->menu = NULL;
- }
-
- if (sidebar->priv->page_model)
- {
- g_object_unref (sidebar->priv->page_model);
- sidebar->priv->page_model = NULL;
- }
-
- (* GTK_OBJECT_CLASS (empathy_sidebar_parent_class)->destroy) (object);
-}
-
-static void
-empathy_sidebar_select_page (EmpathySidebar *sidebar,
- GtkTreeIter *iter)
-{
- gchar *title;
- gint index_;
-
- gtk_tree_model_get (sidebar->priv->page_model, iter,
- PAGE_COLUMN_TITLE, &title,
- PAGE_COLUMN_NOTEBOOK_INDEX, &index_,
- -1);
-
- gtk_notebook_set_current_page (GTK_NOTEBOOK (sidebar->priv->notebook),
- index_);
- gtk_label_set_text (GTK_LABEL (sidebar->priv->label), title);
-
- g_free (title);
-}
-
-void
-empathy_sidebar_set_page (EmpathySidebar *sidebar,
- GtkWidget *main_widget)
-{
- GtkTreeIter iter;
- gboolean valid;
-
- valid = gtk_tree_model_get_iter_first (sidebar->priv->page_model, &iter);
-
- while (valid)
- {
- GtkWidget *widget;
-
- gtk_tree_model_get (sidebar->priv->page_model, &iter,
- PAGE_COLUMN_MAIN_WIDGET, &widget,
- -1);
-
- if (widget == main_widget)
- {
- empathy_sidebar_select_page (sidebar, &iter);
- valid = FALSE;
- }
- else
- {
- valid = gtk_tree_model_iter_next (sidebar->priv->page_model, &iter);
- }
-
- g_object_unref (widget);
- }
-
- g_object_notify (G_OBJECT (sidebar), "current-page");
-}
-
-static GtkWidget *
-empathy_sidebar_get_current_page (EmpathySidebar *sidebar)
-{
- GtkNotebook *notebook = GTK_NOTEBOOK (sidebar->priv->notebook);
-
- return gtk_notebook_get_nth_page (
- notebook, gtk_notebook_get_current_page (notebook));
-}
-
-static void
-empathy_sidebar_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- EmpathySidebar *sidebar = EMPATHY_SIDEBAR (object);
-
- switch (prop_id)
- {
- case PROP_CURRENT_PAGE:
- empathy_sidebar_set_page (sidebar, g_value_get_object (value));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- }
-}
-
-static void
-empathy_sidebar_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- EmpathySidebar *sidebar = EMPATHY_SIDEBAR (object);
-
- switch (prop_id)
- {
- case PROP_CURRENT_PAGE:
- g_value_set_object (value,
- empathy_sidebar_get_current_page (sidebar));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- }
-}
-
-static void
-empathy_sidebar_class_init (EmpathySidebarClass *empathy_sidebar_class)
-{
- GObjectClass *g_object_class;
- GtkWidgetClass *widget_class;
- GtkObjectClass *gtk_object_klass;
-
- g_object_class = G_OBJECT_CLASS (empathy_sidebar_class);
- widget_class = GTK_WIDGET_CLASS (empathy_sidebar_class);
- gtk_object_klass = GTK_OBJECT_CLASS (empathy_sidebar_class);
-
- g_type_class_add_private (g_object_class, sizeof (EmpathySidebarPrivate));
-
- gtk_object_klass->destroy = empathy_sidebar_destroy;
- g_object_class->get_property = empathy_sidebar_get_property;
- g_object_class->set_property = empathy_sidebar_set_property;
-
- g_object_class_install_property (g_object_class,
- PROP_CURRENT_PAGE,
- g_param_spec_object ("current-page",
- "Current page",
- "The currently visible page",
- GTK_TYPE_WIDGET,
- G_PARAM_READWRITE));
-
- signals[SIGNAL_PAGE_ADDED] = g_signal_new ("page-added",
- EMPATHY_TYPE_SIDEBAR, G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EmpathySidebarClass, page_added),
- NULL, NULL, g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1, GTK_TYPE_WIDGET);
-
- signals[SIGNAL_PAGE_REMOVED] = g_signal_new ("page-removed",
- EMPATHY_TYPE_SIDEBAR, G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EmpathySidebarClass, page_removed),
- NULL, NULL, g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1, GTK_TYPE_WIDGET);
-}
-
-static void
-empathy_sidebar_menu_position_under (GtkMenu *menu,
- gint *x,
- gint *y,
- gboolean *push_in,
- gpointer user_data)
-{
- GtkWidget *widget;
- GtkAllocation allocation;
-
- g_return_if_fail (GTK_IS_BUTTON (user_data));
- g_return_if_fail (!gtk_widget_get_has_window (user_data));
-
- widget = GTK_WIDGET (user_data);
-
- gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
-
- gtk_widget_get_allocation (widget, &allocation);
- *x += allocation.x;
- *y += allocation.y + allocation.height;
-
- *push_in = FALSE;
-}
-
-static gboolean
-empathy_sidebar_select_button_press_cb (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data)
-{
- EmpathySidebar *sidebar = EMPATHY_SIDEBAR (user_data);
-
- if (event->button == 1)
- {
- GtkRequisition requisition;
- gint width;
- GtkAllocation allocation;
-
- gtk_widget_get_allocation (widget, &allocation);
- width = allocation.width;
-
- gtk_widget_set_size_request (sidebar->priv->menu, -1, -1);
- gtk_widget_size_request (sidebar->priv->menu, &requisition);
- gtk_widget_set_size_request (sidebar->priv->menu,
- MAX (width, requisition.width), -1);
-
- gtk_widget_grab_focus (widget);
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
-
- gtk_menu_popup (GTK_MENU (sidebar->priv->menu),
- NULL, NULL, empathy_sidebar_menu_position_under, widget,
- event->button, event->time);
-
- return TRUE;
- }
-
- return FALSE;
-}
-
-static gboolean
-empathy_sidebar_select_button_key_press_cb (GtkWidget *widget,
- GdkEventKey *event,
- gpointer user_data)
-{
- EmpathySidebar *sidebar = EMPATHY_SIDEBAR (user_data);
-
- if (event->keyval == GDK_space ||
- event->keyval == GDK_KP_Space ||
- event->keyval == GDK_Return ||
- event->keyval == GDK_KP_Enter)
- {
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
-
- gtk_menu_popup (GTK_MENU (sidebar->priv->menu),
- NULL, NULL, empathy_sidebar_menu_position_under, widget,
- 1, event->time);
-
- return TRUE;
- }
-
- return FALSE;
-}
-
-static void
-empathy_sidebar_close_clicked_cb (GtkWidget *widget,
- gpointer user_data)
-{
- EmpathySidebar *sidebar = EMPATHY_SIDEBAR (user_data);
-
- gtk_widget_hide (GTK_WIDGET (sidebar));
-}
-
-static void
-empathy_sidebar_menu_deactivate_cb (GtkWidget *widget,
- gpointer user_data)
-{
- GtkWidget *menu_button;
-
- menu_button = GTK_WIDGET (user_data);
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (menu_button), FALSE);
-}
-
-static void
-empathy_sidebar_menu_detach_cb (GtkWidget *widget,
- GtkMenu *menu)
-{
- EmpathySidebar *sidebar = EMPATHY_SIDEBAR (widget);
-
- sidebar->priv->menu = NULL;
-}
-
-static void
-empathy_sidebar_menu_item_activate_cb (GtkWidget *widget,
- gpointer user_data)
-{
- EmpathySidebar *sidebar = EMPATHY_SIDEBAR (user_data);
- GtkTreeIter iter;
- GtkWidget *menu_item, *item;
- gboolean valid;
-
- menu_item = gtk_menu_get_active (GTK_MENU (sidebar->priv->menu));
- valid = gtk_tree_model_get_iter_first (sidebar->priv->page_model, &iter);
-
- while (valid)
- {
- gtk_tree_model_get (sidebar->priv->page_model, &iter,
- PAGE_COLUMN_MENU_ITEM, &item,
- -1);
-
- if (item == menu_item)
- {
- empathy_sidebar_select_page (sidebar, &iter);
- valid = FALSE;
- }
- else
- {
- valid = gtk_tree_model_iter_next (sidebar->priv->page_model, &iter);
- }
-
- g_object_unref (item);
- }
-
- g_object_notify (G_OBJECT (sidebar), "current-page");
-}
-
-static void
-empathy_sidebar_init (EmpathySidebar *sidebar)
-{
- GtkWidget *hbox;
- GtkWidget *close_button;
- GtkWidget *select_hbox;
- GtkWidget *arrow;
- GtkWidget *image;
-
- sidebar->priv = EMPATHY_SIDEBAR_GET_PRIVATE (sidebar);
-
- /* data model */
- sidebar->priv->page_model = (GtkTreeModel *) gtk_list_store_new (
- PAGE_COLUMN_NUM_COLS,
- G_TYPE_STRING,
- GTK_TYPE_WIDGET,
- GTK_TYPE_WIDGET,
- G_TYPE_INT);
-
- /* top option menu */
- hbox = gtk_hbox_new (FALSE, 0);
- sidebar->priv->hbox = hbox;
- gtk_box_pack_start (GTK_BOX (sidebar), hbox, FALSE, FALSE, 0);
- gtk_widget_show (hbox);
-
- sidebar->priv->select_button = gtk_toggle_button_new ();
- gtk_button_set_relief (GTK_BUTTON (sidebar->priv->select_button),
- GTK_RELIEF_NONE);
-
- g_signal_connect (sidebar->priv->select_button, "button_press_event",
- G_CALLBACK (empathy_sidebar_select_button_press_cb),
- sidebar);
-
- g_signal_connect (sidebar->priv->select_button, "key_press_event",
- G_CALLBACK (empathy_sidebar_select_button_key_press_cb),
- sidebar);
-
- select_hbox = gtk_hbox_new (FALSE, 0);
-
- sidebar->priv->label = gtk_label_new (NULL);
-
- gtk_box_pack_start (GTK_BOX (select_hbox),
- sidebar->priv->label,
- FALSE, FALSE, 0);
-
- gtk_widget_show (sidebar->priv->label);
-
- arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
- gtk_box_pack_end (GTK_BOX (select_hbox), arrow, FALSE, FALSE, 0);
- gtk_widget_show (arrow);
-
- gtk_container_add (GTK_CONTAINER (sidebar->priv->select_button), select_hbox);
- gtk_widget_show (select_hbox);
-
- gtk_box_pack_start (GTK_BOX (hbox), sidebar->priv->select_button, TRUE, TRUE, 0);
- gtk_widget_show (sidebar->priv->select_button);
-
- close_button = gtk_button_new ();
-
- gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
-
- g_signal_connect (close_button, "clicked",
- G_CALLBACK (empathy_sidebar_close_clicked_cb),
- sidebar);
-
- image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
- GTK_ICON_SIZE_MENU);
- gtk_container_add (GTK_CONTAINER (close_button), image);
- gtk_widget_show (image);
-
- gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
- gtk_widget_show (close_button);
-
- sidebar->priv->menu = gtk_menu_new ();
-
- g_signal_connect (sidebar->priv->menu, "deactivate",
- G_CALLBACK (empathy_sidebar_menu_deactivate_cb),
- sidebar->priv->select_button);
-
- gtk_menu_attach_to_widget (GTK_MENU (sidebar->priv->menu),
- GTK_WIDGET (sidebar),
- empathy_sidebar_menu_detach_cb);
-
- gtk_widget_show (sidebar->priv->menu);
-
- sidebar->priv->notebook = gtk_notebook_new ();
-
- gtk_notebook_set_show_border (GTK_NOTEBOOK (sidebar->priv->notebook), FALSE);
- gtk_notebook_set_show_tabs (GTK_NOTEBOOK (sidebar->priv->notebook), FALSE);
-
- gtk_box_pack_start (GTK_BOX (sidebar), sidebar->priv->notebook,
- TRUE, TRUE, 0);
-
- gtk_widget_show (sidebar->priv->notebook);
-}
-
-GtkWidget *
-empathy_sidebar_new (void)
-{
- GtkWidget *sidebar;
-
- sidebar = g_object_new (EMPATHY_TYPE_SIDEBAR, NULL);
-
- return sidebar;
-}
-
-void
-empathy_sidebar_add_page (EmpathySidebar *sidebar,
- const gchar *title,
- GtkWidget *main_widget)
-{
- GtkTreeIter iter;
- GtkWidget *menu_item;
- gchar *label_title;
- gint index_;
-
- g_return_if_fail (EMPATHY_IS_SIDEBAR (sidebar));
- g_return_if_fail (GTK_IS_WIDGET (main_widget));
-
- index_ = gtk_notebook_append_page (GTK_NOTEBOOK (sidebar->priv->notebook),
- main_widget, NULL);
-
- menu_item = gtk_image_menu_item_new_with_label (title);
-
- g_signal_connect (menu_item, "activate",
- G_CALLBACK (empathy_sidebar_menu_item_activate_cb),
- sidebar);
-
- gtk_widget_show (menu_item);
-
- gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->priv->menu),
- menu_item);
-
- /* Insert and move to end */
- gtk_list_store_insert_with_values (GTK_LIST_STORE (sidebar->priv->page_model),
- &iter, 0,
- PAGE_COLUMN_TITLE, title,
- PAGE_COLUMN_MENU_ITEM, menu_item,
- PAGE_COLUMN_MAIN_WIDGET, main_widget,
- PAGE_COLUMN_NOTEBOOK_INDEX, index_,
- -1);
-
- gtk_list_store_move_before (GTK_LIST_STORE(sidebar->priv->page_model),
- &iter,
- NULL);
-
- /* Set the first item added as active */
- gtk_tree_model_get_iter_first (sidebar->priv->page_model, &iter);
- gtk_tree_model_get (sidebar->priv->page_model,
- &iter,
- PAGE_COLUMN_TITLE, &label_title,
- PAGE_COLUMN_NOTEBOOK_INDEX, &index_,
- -1);
-
- gtk_menu_set_active (GTK_MENU (sidebar->priv->menu), index_);
-
- gtk_label_set_text (GTK_LABEL (sidebar->priv->label), label_title);
-
- gtk_notebook_set_current_page (GTK_NOTEBOOK (sidebar->priv->notebook),
- index_);
-
- g_free (label_title);
-
- g_signal_emit (G_OBJECT (sidebar), signals[SIGNAL_PAGE_ADDED],
- 0, main_widget);
-}
-
-void
-empathy_sidebar_remove_page (EmpathySidebar *sidebar,
- GtkWidget *main_widget)
-{
- GtkTreeIter iter;
- GtkWidget *widget, *menu_item;
- gboolean valid;
- gint index_;
-
- g_return_if_fail (EMPATHY_IS_SIDEBAR (sidebar));
- g_return_if_fail (GTK_IS_WIDGET (main_widget));
-
- valid = gtk_tree_model_get_iter_first (sidebar->priv->page_model, &iter);
-
- while (valid)
- {
- gtk_tree_model_get (sidebar->priv->page_model, &iter,
- PAGE_COLUMN_NOTEBOOK_INDEX, &index_,
- PAGE_COLUMN_MENU_ITEM, &menu_item,
- PAGE_COLUMN_MAIN_WIDGET, &widget,
- -1);
-
- if (widget == main_widget)
- break;
- else
- valid = gtk_tree_model_iter_next (sidebar->priv->page_model, &iter);
-
- g_object_unref (menu_item);
- g_object_unref (widget);
- }
-
- if (valid)
- {
- gtk_notebook_remove_page (GTK_NOTEBOOK (sidebar->priv->notebook),
- index_);
-
- gtk_container_remove (GTK_CONTAINER (sidebar->priv->menu), menu_item);
-
- gtk_list_store_remove (GTK_LIST_STORE (sidebar->priv->page_model),
- &iter);
-
- g_signal_emit (G_OBJECT (sidebar),
- signals[SIGNAL_PAGE_REMOVED], 0, main_widget);
- }
-}
-
-gint
-empathy_sidebar_get_n_pages (EmpathySidebar *sidebar)
-{
- g_return_val_if_fail (EMPATHY_IS_SIDEBAR (sidebar), TRUE);
-
- return gtk_tree_model_iter_n_children (
- GTK_TREE_MODEL (sidebar->priv->page_model), NULL);
-}
-
-gboolean
-empathy_sidebar_is_empty (EmpathySidebar *sidebar)
-{
- g_return_val_if_fail (EMPATHY_IS_SIDEBAR (sidebar), TRUE);
-
- return gtk_tree_model_iter_n_children (
- GTK_TREE_MODEL (sidebar->priv->page_model), NULL) == 0;
-}
diff --git a/src/empathy-sidebar.h b/src/empathy-sidebar.h
deleted file mode 100644
index 095336fac..000000000
--- a/src/empathy-sidebar.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2004 Red Hat, Inc.
- * Copyright (C) 2007 The Free Software Foundation
- * Copyright (C) 2008 Marco Barisione <marco@barisione.org>
- *
- * Based on evince code (shell/ev-sidebar.h) by:
- * - Jonathan Blandford <jrb@alum.mit.edu>
- *
- * Base on eog code (src/eog-sidebar.c) by:
- * - Lucas Rocha <lucasr@gnome.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef __EMPATHY_SIDEBAR_H__
-#define __EMPATHY_SIDEBAR_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathySidebar EmpathySidebar;
-typedef struct _EmpathySidebarClass EmpathySidebarClass;
-typedef struct _EmpathySidebarPrivate EmpathySidebarPrivate;
-
-#define EMPATHY_TYPE_SIDEBAR (empathy_sidebar_get_type())
-#define EMPATHY_SIDEBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_SIDEBAR, EmpathySidebar))
-#define EMPATHY_SIDEBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_SIDEBAR, EmpathySidebarClass))
-#define EMPATHY_IS_SIDEBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_SIDEBAR))
-#define EMPATHY_IS_SIDEBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_SIDEBAR))
-#define EMPATHY_SIDEBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EMPATHY_TYPE_SIDEBAR, EmpathySidebarClass))
-
-struct _EmpathySidebar
-{
- GtkVBox base_instance;
-
- EmpathySidebarPrivate *priv;
-};
-
-struct _EmpathySidebarClass
-{
- GtkVBoxClass base_class;
-
- void (* page_added) (EmpathySidebar *sidebar,
- GtkWidget *main_widget);
-
- void (* page_removed) (EmpathySidebar *sidebar,
- GtkWidget *main_widget);
-};
-
-GType empathy_sidebar_get_type (void);
-
-GtkWidget *empathy_sidebar_new (void);
-
-void empathy_sidebar_add_page (EmpathySidebar *sidebar,
- const gchar *title,
- GtkWidget *main_widget);
-
-void empathy_sidebar_remove_page (EmpathySidebar *sidebar,
- GtkWidget *main_widget);
-
-void empathy_sidebar_set_page (EmpathySidebar *sidebar,
- GtkWidget *main_widget);
-
-gint empathy_sidebar_get_n_pages (EmpathySidebar *sidebar);
-
-gboolean empathy_sidebar_is_empty (EmpathySidebar *sidebar);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_SIDEBAR_H__ */
-
-
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 97ab255e6..a062f5169 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -466,7 +466,7 @@ status_icon_key_press_event_cb (GtkWidget *window,
GdkEventKey *event,
EmpathyStatusIcon *icon)
{
- if (event->keyval == GDK_Escape) {
+ if (event->keyval == GDK_KEY_Escape) {
status_icon_set_visibility (icon, FALSE, TRUE);
}
return FALSE;
diff --git a/src/empathy.c b/src/empathy.c
index 0128b7b00..f22d69b25 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -461,10 +461,12 @@ main (int argc, char *argv[])
if (unique_app_is_running (unique_app))
{
- unique_app_send_message (unique_app, UNIQUE_ACTIVATE, NULL);
-
- g_object_unref (unique_app);
- return EXIT_SUCCESS;
+ if (unique_app_send_message (unique_app, UNIQUE_ACTIVATE, NULL) ==
+ UNIQUE_RESPONSE_OK)
+ {
+ g_object_unref (unique_app);
+ return EXIT_SUCCESS;
+ }
}
notify_init (_(PACKAGE_NAME));
diff --git a/src/ev-sidebar.c b/src/ev-sidebar.c
new file mode 100644
index 000000000..d0dd2b615
--- /dev/null
+++ b/src/ev-sidebar.c
@@ -0,0 +1,338 @@
+/* this file is part of evince, a gnome document viewer
+ *
+ * Copyright (C) 2004 Red Hat, Inc.
+ * (C) 2007 Jan Arne Petersen
+ *
+ * Authors:
+ * Jonathan Blandford <jrb@alum.mit.edu>
+ * Jan Arne Petersen <jpetersen@jpetersen.org>
+ *
+ * Evince is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Evince 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA.
+ *
+ * Thursday 03 May 2007: Bastien Nocera: Add exception clause.
+ * See license_change file for details.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "ev-sidebar.h"
+
+enum
+{
+ PAGE_COLUMN_ID,
+ PAGE_COLUMN_TITLE,
+ PAGE_COLUMN_NUM_COLS
+};
+
+struct _EvSidebarPrivate {
+ GtkWidget *combobox;
+ GtkWidget *notebook;
+};
+
+enum {
+ CLOSED,
+ LAST_SIGNAL
+};
+
+static int ev_sidebar_table_signals[LAST_SIGNAL] = { 0 };
+
+G_DEFINE_TYPE (EvSidebar, ev_sidebar, GTK_TYPE_VBOX)
+
+#define EV_SIDEBAR_GET_PRIVATE(object) \
+ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_SIDEBAR, EvSidebarPrivate))
+
+static void
+ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class)
+{
+ GObjectClass *g_object_class;
+ GtkWidgetClass *widget_class;
+
+ g_object_class = G_OBJECT_CLASS (ev_sidebar_class);
+ widget_class = GTK_WIDGET_CLASS (ev_sidebar_class);
+
+ g_type_class_add_private (g_object_class, sizeof (EvSidebarPrivate));
+
+ ev_sidebar_table_signals[CLOSED] =
+ g_signal_new ("closed",
+ G_TYPE_FROM_CLASS (g_object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (EvSidebarClass, closed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
+}
+
+static void
+ev_sidebar_close_clicked_cb (GtkWidget *widget,
+ gpointer user_data)
+{
+ EvSidebar *ev_sidebar = EV_SIDEBAR (user_data);
+
+ g_signal_emit (G_OBJECT (ev_sidebar),
+ ev_sidebar_table_signals[CLOSED], 0, NULL);
+ gtk_widget_hide (GTK_WIDGET (ev_sidebar));
+}
+
+static void
+ev_sidebar_combobox_changed_cb (GtkComboBox *combo_box,
+ gpointer user_data)
+{
+ EvSidebar *ev_sidebar = EV_SIDEBAR (user_data);
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ model = gtk_combo_box_get_model (combo_box);
+
+ if (gtk_combo_box_get_active_iter (combo_box, &iter)) {
+ GtkTreePath *path;
+ gint *indices;
+
+ path = gtk_tree_model_get_path (model, &iter);
+ indices = gtk_tree_path_get_indices (path);
+
+ if (indices != NULL) {
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (ev_sidebar->priv->notebook), indices[0]);
+ }
+
+ gtk_tree_path_free (path);
+ }
+}
+
+static void
+ev_sidebar_init (EvSidebar *ev_sidebar)
+{
+ GtkTreeModel *page_model;
+ GtkWidget *vbox, *hbox;
+ GtkWidget *close_button;
+ GtkCellRenderer *renderer;
+ GtkWidget *image;
+
+ ev_sidebar->priv = EV_SIDEBAR_GET_PRIVATE (ev_sidebar);
+
+ /* data model */
+ page_model = (GtkTreeModel *)
+ gtk_list_store_new (PAGE_COLUMN_NUM_COLS,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ GTK_TYPE_WIDGET,
+ G_TYPE_INT);
+
+ /* create a 6 6 6 0 border with GtkBoxes */
+ hbox = gtk_hbox_new (FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (ev_sidebar), hbox, TRUE, TRUE, 6);
+
+ vbox = gtk_vbox_new (FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), gtk_vbox_new (FALSE, 0), FALSE, FALSE, 0);
+
+ /* top option menu */
+ hbox = gtk_hbox_new (FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_widget_show (hbox);
+
+ ev_sidebar->priv->combobox = gtk_combo_box_new_with_model (page_model);
+ g_signal_connect (ev_sidebar->priv->combobox, "changed",
+ G_CALLBACK (ev_sidebar_combobox_changed_cb),
+ ev_sidebar);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (ev_sidebar->priv->combobox), renderer, TRUE);
+ gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (ev_sidebar->priv->combobox), renderer, "text", PAGE_COLUMN_TITLE);
+
+ gtk_box_pack_start (GTK_BOX (hbox), ev_sidebar->priv->combobox, TRUE, TRUE, 0);
+ gtk_widget_show (ev_sidebar->priv->combobox);
+
+ g_object_unref (G_OBJECT (page_model));
+
+ close_button = gtk_button_new ();
+ gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
+ g_signal_connect (close_button, "clicked",
+ G_CALLBACK (ev_sidebar_close_clicked_cb),
+ ev_sidebar);
+
+ image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
+ GTK_ICON_SIZE_MENU);
+ gtk_container_add (GTK_CONTAINER (close_button), image);
+ gtk_widget_show (image);
+
+ gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
+ gtk_widget_show (close_button);
+
+ ev_sidebar->priv->notebook = gtk_notebook_new ();
+ gtk_notebook_set_show_border (GTK_NOTEBOOK (ev_sidebar->priv->notebook), FALSE);
+ gtk_notebook_set_show_tabs (GTK_NOTEBOOK (ev_sidebar->priv->notebook), FALSE);
+ gtk_box_pack_start (GTK_BOX (vbox), ev_sidebar->priv->notebook,
+ TRUE, TRUE, 0);
+ gtk_widget_show (ev_sidebar->priv->notebook);
+}
+
+/* Public functions */
+
+GtkWidget *
+ev_sidebar_new (void)
+{
+ GtkWidget *ev_sidebar;
+
+ ev_sidebar = g_object_new (EV_TYPE_SIDEBAR, NULL);
+
+ return ev_sidebar;
+}
+
+/* NOTE: Return values from this have to be g_free()d */
+char *
+ev_sidebar_get_current_page (EvSidebar *ev_sidebar)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ char *id;
+
+ g_return_val_if_fail (EV_IS_SIDEBAR (ev_sidebar), NULL);
+ g_return_val_if_fail (ev_sidebar->priv != NULL, NULL);
+
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (ev_sidebar->priv->combobox));
+
+ if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (ev_sidebar->priv->combobox), &iter)) {
+ gtk_tree_model_get (model, &iter, PAGE_COLUMN_ID, &id, -1);
+
+ return id;
+ }
+
+ return NULL;
+}
+
+static gboolean
+ev_sidebar_get_iter_for_page_id (EvSidebar *ev_sidebar,
+ const char *new_page_id,
+ GtkTreeIter *iter)
+{
+ GtkTreeModel *model;
+ gboolean valid;
+ gchar *page_id;
+
+ g_return_val_if_fail (EV_IS_SIDEBAR (ev_sidebar), FALSE);
+ g_return_val_if_fail (ev_sidebar->priv != NULL, FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (ev_sidebar->priv->combobox));
+
+ valid = gtk_tree_model_get_iter_first (model, iter);
+
+ while (valid) {
+ gtk_tree_model_get (model, iter, PAGE_COLUMN_ID, &page_id, -1);
+
+ if (page_id != NULL && strcmp (new_page_id, page_id) == 0) {
+ g_free (page_id);
+ return TRUE;
+ }
+ g_free (page_id);
+
+ valid = gtk_tree_model_iter_next (model, iter);
+ }
+
+ return FALSE;
+}
+
+void
+ev_sidebar_set_current_page (EvSidebar *ev_sidebar, const char *new_page_id)
+{
+ GtkTreeIter iter;
+
+ g_return_if_fail (EV_IS_SIDEBAR (ev_sidebar));
+ g_return_if_fail (new_page_id != NULL);
+
+
+ if (ev_sidebar_get_iter_for_page_id (ev_sidebar, new_page_id, &iter)) {
+ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (ev_sidebar->priv->combobox), &iter);
+ }
+}
+
+void
+ev_sidebar_add_page (EvSidebar *ev_sidebar,
+ const gchar *page_id,
+ const gchar *title,
+ GtkWidget *main_widget)
+{
+ GtkTreeIter iter, iter2;
+ GtkTreeModel *model;
+
+ g_return_if_fail (EV_IS_SIDEBAR (ev_sidebar));
+ g_return_if_fail (page_id != NULL);
+ g_return_if_fail (title != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (main_widget));
+
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (ev_sidebar->priv->combobox));
+
+ gtk_widget_set_sensitive (GTK_WIDGET (ev_sidebar), TRUE);
+
+ gtk_widget_show (main_widget);
+ gtk_notebook_append_page (GTK_NOTEBOOK (ev_sidebar->priv->notebook), main_widget, NULL);
+
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ PAGE_COLUMN_ID, page_id,
+ PAGE_COLUMN_TITLE, title,
+ -1);
+
+ if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (ev_sidebar->priv->combobox), &iter2)) {
+ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (ev_sidebar->priv->combobox), &iter);
+ }
+}
+
+void
+ev_sidebar_remove_page (EvSidebar *ev_sidebar,
+ const gchar *page_id)
+{
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+
+ g_return_if_fail (EV_IS_SIDEBAR (ev_sidebar));
+ g_return_if_fail (page_id != NULL);
+
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (ev_sidebar->priv->combobox));
+
+ if (ev_sidebar_get_iter_for_page_id (ev_sidebar, page_id, &iter)) {
+ GtkTreePath *path;
+ gint *indices;
+
+ path = gtk_tree_model_get_path (model, &iter);
+ indices = gtk_tree_path_get_indices (path);
+
+ g_assert (indices != NULL);
+ gtk_notebook_remove_page (GTK_NOTEBOOK (ev_sidebar->priv->notebook), indices[0]);
+
+ gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+
+ if (gtk_tree_model_iter_n_children (model, NULL) != 0) {
+ gtk_tree_path_prev (path);
+
+ if (gtk_tree_model_get_iter (model, &iter, path)) {
+ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (ev_sidebar->priv->combobox), &iter);
+ }
+ } else {
+ gtk_widget_set_sensitive (GTK_WIDGET (ev_sidebar), FALSE);
+ }
+
+ gtk_tree_path_free (path);
+ }
+}
+
diff --git a/src/ev-sidebar.h b/src/ev-sidebar.h
new file mode 100644
index 000000000..cfb57f2eb
--- /dev/null
+++ b/src/ev-sidebar.h
@@ -0,0 +1,76 @@
+/* ev-sidebar.h
+ * this file is part of evince, a gnome document viewer
+ *
+ * Copyright (C) 2004 Red Hat, Inc.
+ *
+ * Author:
+ * Jonathan Blandford <jrb@alum.mit.edu>
+ *
+ * Evince is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Evince 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA.
+ *
+ * Thursday 03 May 2007: Bastien Nocera: Add exception clause.
+ * See license_change file for details.
+ *
+ */
+
+#ifndef __EV_SIDEBAR_H__
+#define __EV_SIDEBAR_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+typedef struct _EvSidebar EvSidebar;
+typedef struct _EvSidebarClass EvSidebarClass;
+typedef struct _EvSidebarPrivate EvSidebarPrivate;
+
+#define EV_TYPE_SIDEBAR (ev_sidebar_get_type())
+#define EV_SIDEBAR(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_SIDEBAR, EvSidebar))
+#define EV_SIDEBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_SIDEBAR, EvSidebarClass))
+#define EV_IS_SIDEBAR(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_SIDEBAR))
+#define EV_IS_SIDEBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_SIDEBAR))
+#define EV_SIDEBAR_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_SIDEBAR, EvSidebarClass))
+
+struct _EvSidebar {
+ GtkVBox base_instance;
+
+ EvSidebarPrivate *priv;
+};
+
+struct _EvSidebarClass {
+ GtkVBoxClass base_class;
+
+ void (*closed) (EvSidebar *sidebar);
+};
+
+GType ev_sidebar_get_type (void);
+GtkWidget *ev_sidebar_new (void);
+void ev_sidebar_add_page (EvSidebar *ev_sidebar,
+ const gchar *page_id,
+ const gchar *title,
+ GtkWidget *main_widget);
+void ev_sidebar_set_current_page
+ (EvSidebar *ev_sidebar,
+ const char *page_id);
+char *ev_sidebar_get_current_page
+ (EvSidebar *ev_sidebar);
+void ev_sidebar_remove_page (EvSidebar *ev_sidebar,
+ const gchar *page_id);
+
+G_END_DECLS
+
+#endif /* __EV_SIDEBAR_H__ */
+
+